Merge tag 'efi-2022-07-rc4-4' of https://source.denx.de/u-boot/custodians/u-boot-efi

[platform/kernel/u-boot.git] / cmd / acpi.c

diff --git a/cmd/acpi.c b/cmd/acpi.c
index 203bd93..0e473b4 100644 (file)
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -8,6 +8,7 @@
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi_table.h>
+#include <asm/global_data.h>
 #include <dm/acpi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -23,10 +24,10 @@ static void dump_hdr(struct acpi_table_header *hdr)
 {
        bool has_hdr = memcmp(hdr->signature, "FACS", ACPI_NAME_LEN);
 
-       printf("%.*s %08lx %06x", ACPI_NAME_LEN, hdr->signature,
+       printf("%.*s  %08lx  %5x", ACPI_NAME_LEN, hdr->signature,
               (ulong)map_to_sysmem(hdr), hdr->length);
        if (has_hdr) {
-               printf(" (v%02d %.6s %.8s %u %.4s %d)\n", hdr->revision,
+               printf("  v%02d %.6s %.8s %x %.4s %x\n", hdr->revision,
                       hdr->oem_id, hdr->oem_table_id, hdr->oem_revision,
                       hdr->aslc_id, hdr->aslc_revision);
        } else {
@@ -38,7 +39,7 @@ static void dump_hdr(struct acpi_table_header *hdr)
  * find_table() - Look up an ACPI table
  *
  * @sig: Signature of table (4 characters, upper case)
- * @return pointer to table header, or NULL if not found
+ * Return: pointer to table header, or NULL if not found
  */
 struct acpi_table_header *find_table(const char *sig)
 {
@@ -46,7 +47,7 @@ struct acpi_table_header *find_table(const char *sig)
        struct acpi_rsdt *rsdt;
        int len, i, count;
 
-       rsdp = map_sysmem(gd->arch.acpi_start, 0);
+       rsdp = map_sysmem(gd_acpi_start(), 0);
        if (!rsdp)
                return NULL;
        rsdt = map_sysmem(rsdp->rsdt_address, 0);
@@ -128,7 +129,7 @@ static int list_rsdp(struct acpi_rsdp *rsdp)
        struct acpi_rsdt *rsdt;
        struct acpi_xsdt *xsdt;
 
-       printf("RSDP %08lx %06x (v%02d %.6s)\n", (ulong)map_to_sysmem(rsdp),
+       printf("RSDP  %08lx  %5x  v%02d %.6s\n", (ulong)map_to_sysmem(rsdp),
               rsdp->length, rsdp->revision, rsdp->oem_id);
        rsdt = map_sysmem(rsdp->rsdt_address, 0);
        xsdt = map_sysmem(rsdp->xsdt_address, 0);
@@ -137,37 +138,47 @@ static int list_rsdp(struct acpi_rsdp *rsdp)
        return 0;
 }
 
-static int do_acpi_list(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_acpi_list(struct cmd_tbl *cmdtp, int flag, int argc,
                        char *const argv[])
 {
        struct acpi_rsdp *rsdp;
 
-       rsdp = map_sysmem(gd->arch.acpi_start, 0);
+       rsdp = map_sysmem(gd_acpi_start(), 0);
        if (!rsdp) {
                printf("No ACPI tables present\n");
                return 0;
        }
-       printf("ACPI tables start at %lx\n", gd->arch.acpi_start);
+       printf("Name      Base   Size  Detail\n");
+       printf("----  --------  -----  ------\n");
        list_rsdp(rsdp);
 
        return 0;
 }
 
-static int do_acpi_dump(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_acpi_items(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
+{
+       bool dump_contents;
+
+       dump_contents = argc >= 2 && !strcmp("-d", argv[1]);
+       acpi_dump_items(dump_contents ? ACPI_DUMP_CONTENTS : ACPI_DUMP_LIST);
+
+       return 0;
+}
+
+static int do_acpi_dump(struct cmd_tbl *cmdtp, int flag, int argc,
                        char *const argv[])
 {
        const char *name;
        char sig[ACPI_NAME_LEN];
        int ret;
 
-       if (argc < 2)
-               return CMD_RET_USAGE;
        name = argv[1];
        if (strlen(name) != ACPI_NAME_LEN) {
                printf("Table name '%s' must be four characters\n", name);
                return CMD_RET_FAILURE;
        }
-       str_to_upper(name, sig, -1);
+       str_to_upper(name, sig, ACPI_NAME_LEN);
        ret = dump_table_name(sig);
        if (ret) {
                printf("Table '%.*s' not found\n", ACPI_NAME_LEN, sig);
@@ -177,10 +188,14 @@ static int do_acpi_dump(cmd_tbl_t *cmdtp, int flag, int argc,
        return 0;
 }
 
+#ifdef CONFIG_SYS_LONGHELP
 static char acpi_help_text[] =
        "list - list ACPI tables\n"
+       "acpi items [-d]  - List/dump each piece of ACPI data from devices\n"
        "acpi dump <name> - Dump ACPI table";
+#endif
 
 U_BOOT_CMD_WITH_SUBCMDS(acpi, "ACPI tables", acpi_help_text,
        U_BOOT_SUBCMD_MKENT(list, 1, 1, do_acpi_list),
+       U_BOOT_SUBCMD_MKENT(items, 2, 1, do_acpi_items),
        U_BOOT_SUBCMD_MKENT(dump, 2, 1, do_acpi_dump));