acpi: Add an acpi command to list/dump generated ACPI items

Add a command that shows the individual blocks of data generated by each
device, effectively splitting the full table into its component parts.
This can be helpful for debugging.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/cmd/acpi.c b/cmd/acpi.c
index e9a9161a9131928406586b6b83b30bb131258492..085a3a650d1ad3e52027def7c314878ae07603d5 100644 (file)
--- a/cmd/acpi.c
+++ b/cmd/acpi.c
@@ -153,6 +153,17 @@ static int do_acpi_list(struct cmd_tbl *cmdtp, int flag, int argc,
        return 0;
 }
 
+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[])
 {
@@ -160,8 +171,6 @@ static int do_acpi_dump(struct cmd_tbl *cmdtp, int flag, int argc,
        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);
@@ -179,8 +188,10 @@ static int do_acpi_dump(struct cmd_tbl *cmdtp, int flag, int argc,
 
 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";
 
 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));

diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 076fb4f1b4754de219028ddb530d83d605234cd0..b566f4f18646fc715fd8a4bf06484883c7c1662e 100644 (file)
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -119,6 +119,22 @@ static int acpi_add_item(struct acpi_ctx *ctx, struct udevice *dev,
        return 0;
 }
 
+void acpi_dump_items(enum acpi_dump_option option)
+{
+       int i;
+
+       for (i = 0; i < item_count; i++) {
+               struct acpi_item *item = &acpi_item[i];
+
+               printf("dev '%s', type %d, size %x\n", item->dev->name,
+                      item->type, item->size);
+               if (option == ACPI_DUMP_CONTENTS) {
+                       print_buffer(0, item->buf, 1, item->size, 0);
+                       printf("\n");
+               }
+       }
+}
+
 static struct acpi_item *find_acpi_item(const char *devname)
 {
        int i;

diff --git a/include/dm/acpi.h b/include/dm/acpi.h
index fceb1ae95c26185b3b4c9a295ec7066a87b12794..aa1071ae3544ca68a579918d755336a33da8bee4 100644 (file)
--- a/include/dm/acpi.h
+++ b/include/dm/acpi.h
@@ -27,6 +27,12 @@
 
 #if !defined(__ACPI__)
 
+/** enum acpi_dump_option - selects what ACPI information to dump */
+enum acpi_dump_option {
+       ACPI_DUMP_LIST,         /* Just the list of items */
+       ACPI_DUMP_CONTENTS,     /* Include the binary contents also */
+};
+
 /**
  * struct acpi_ctx - Context used for writing ACPI tables
  *
@@ -171,6 +177,16 @@ int acpi_fill_ssdt(struct acpi_ctx *ctx);
  */
 int acpi_inject_dsdt(struct acpi_ctx *ctx);
 
+/**
+ * acpi_dump_items() - Dump out the collected ACPI items
+ *
+ * This lists the ACPI DSDT and SSDT items generated by the various U-Boot
+ * drivers.
+ *
+ * @option: Sets what should be dumpyed
+ */
+void acpi_dump_items(enum acpi_dump_option option);
+
 #endif /* __ACPI__ */
 
 #endif

diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 69ca0902aab6fe67b29a01df7c514526ec44ff12..7768f9514cfe2f20d9fd3cc8d8d7c423221dfc64 100644 (file)
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -525,3 +525,42 @@ static int dm_test_acpi_inject_dsdt(struct unit_test_state *uts)
        return 0;
 }
 DM_TEST(dm_test_acpi_inject_dsdt, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+
+/* Test 'acpi items' command */
+static int dm_test_acpi_cmd_items(struct unit_test_state *uts)
+{
+       struct acpi_ctx ctx;
+       void *buf;
+
+       buf = malloc(BUF_SIZE);
+       ut_assertnonnull(buf);
+
+       ctx.current = buf;
+       ut_assertok(acpi_fill_ssdt(&ctx));
+       console_record_reset();
+       run_command("acpi items", 0);
+       ut_assert_nextline("dev 'acpi-test', type 1, size 2");
+       ut_assert_nextline("dev 'acpi-test2', type 1, size 2");
+       ut_assert_console_end();
+
+       ctx.current = buf;
+       ut_assertok(acpi_inject_dsdt(&ctx));
+       console_record_reset();
+       run_command("acpi items", 0);
+       ut_assert_nextline("dev 'acpi-test', type 2, size 2");
+       ut_assert_nextline("dev 'acpi-test2', type 2, size 2");
+       ut_assert_console_end();
+
+       console_record_reset();
+       run_command("acpi items -d", 0);
+       ut_assert_nextline("dev 'acpi-test', type 2, size 2");
+       ut_assert_nextlines_are_dump(2);
+       ut_assert_nextline("%s", "");
+       ut_assert_nextline("dev 'acpi-test2', type 2, size 2");
+       ut_assert_nextlines_are_dump(2);
+       ut_assert_nextline("%s", "");
+       ut_assert_console_end();
+
+       return 0;
+}
+DM_TEST(dm_test_acpi_cmd_items, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);