acpi: Move the xsdt pointer to acpi_ctx

Put this in the context along with the other important pointers.

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

diff --git a/include/dm/acpi.h b/include/dm/acpi.h
index c6c63b8183928adc00debfe2ab1659b9ab331f74..7563a4c60a72d0852dac168ae134d52cc172eaa2 100644 (file)
--- a/include/dm/acpi.h
+++ b/include/dm/acpi.h
@@ -33,11 +33,13 @@
  * @rsdp: Pointer to the Root System Description Pointer, typically used when
  *     adding a new table. The RSDP holds pointers to the RSDT and XSDT.
  * @rsdt: Pointer to the Root System Description Table
+ * @xsdt: Pointer to the Extended System Description Table
  */
 struct acpi_ctx {
        void *current;
        struct acpi_rsdp *rsdp;
        struct acpi_rsdt *rsdt;
+       struct acpi_xsdt *xsdt;
 };
 
 /**

diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c
index 59980bc0e1fa9f87153816aeb28458e089de0690..e86df76e2d7be01bf2f70c94032a5ac4449a60e7 100644 (file)
--- a/lib/acpi/acpi_table.c
+++ b/lib/acpi/acpi_table.c
@@ -165,7 +165,7 @@ int acpi_add_table(struct acpi_ctx *ctx, void *table)
         * And now the same thing for the XSDT. We use the same index as for
         * now we want the XSDT and RSDT to always be in sync in U-Boot
         */
-       xsdt = map_sysmem(ctx->rsdp->xsdt_address, sizeof(*xsdt));
+       xsdt = ctx->xsdt;
 
        /* Add table to the XSDT */
        xsdt->entry[i] = map_to_sysmem(table);
@@ -236,8 +236,6 @@ static void acpi_write_xsdt(struct acpi_xsdt *xsdt)
 
 void acpi_setup_base_tables(struct acpi_ctx *ctx, void *start)
 {
-       struct acpi_xsdt *xsdt;
-
        ctx->current = start;
 
        /* Align ACPI tables to 16 byte */
@@ -248,15 +246,15 @@ void acpi_setup_base_tables(struct acpi_ctx *ctx, void *start)
        acpi_inc_align(ctx, sizeof(struct acpi_rsdp));
        ctx->rsdt = ctx->current;
        acpi_inc_align(ctx, sizeof(struct acpi_rsdt));
-       xsdt = ctx->current;
+       ctx->xsdt = ctx->current;
        acpi_inc_align(ctx, sizeof(struct acpi_xsdt));
 
        /* clear all table memory */
        memset((void *)start, '\0', ctx->current - start);
 
-       acpi_write_rsdp(ctx->rsdp, ctx->rsdt, xsdt);
+       acpi_write_rsdp(ctx->rsdp, ctx->rsdt, ctx->xsdt);
        acpi_write_rsdt(ctx->rsdt);
-       acpi_write_xsdt(xsdt);
+       acpi_write_xsdt(ctx->xsdt);
        /*
         * Per ACPI spec, the FACS table address must be aligned to a 64 byte
         * boundary (Windows checks this, but Linux does not).

diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index beb1b6da7373166b78efd775f8f3e4729fada43b..a29c3cab3e02f7240d3a3231670b841bfd38b086 100644 (file)
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -160,6 +160,10 @@ static int dm_test_acpi_write_tables(struct unit_test_state *uts)
        ut_asserteq(map_to_sysmem(dmar + 1), ctx.rsdt->entry[1]);
        ut_asserteq(0, ctx.rsdt->entry[2]);
 
+       ut_asserteq(map_to_sysmem(dmar), ctx.xsdt->entry[0]);
+       ut_asserteq(map_to_sysmem(dmar + 1), ctx.xsdt->entry[1]);
+       ut_asserteq(0, ctx.xsdt->entry[2]);
+
        return 0;
 }
 DM_TEST(dm_test_acpi_write_tables, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
@@ -223,6 +227,7 @@ static int dm_test_acpi_setup_base_tables(struct unit_test_state *uts)
        ut_assertok(table_compute_checksum(rsdt, sizeof(*rsdt)));
 
        xsdt = PTR_ALIGN((void *)rsdt + sizeof(*rsdt), 16);
+       ut_asserteq_ptr(xsdt, ctx.xsdt);
        ut_assertok(memcmp("XSDT", xsdt->header.signature, ACPI_NAME_LEN));
        ut_asserteq(sizeof(*xsdt), xsdt->header.length);
        ut_assertok(table_compute_checksum(xsdt, sizeof(*xsdt)));