diff options
| author | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2023-08-13 03:25:59 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-22 15:17:52 -0400 |
| commit | 5ebe790ff02eb21fe74e0f3992b3b2416c609d18 (patch) | |
| tree | eabff37a0138932e2e1b11657755a35fd8fc2ad0 | |
| parent | c8659ca88c52acb2c00928f4534402b69b1e64a5 (diff) | |
| download | u-boot-5ebe790ff02eb21fe74e0f3992b3b2416c609d18.zip u-boot-5ebe790ff02eb21fe74e0f3992b3b2416c609d18.tar.gz u-boot-5ebe790ff02eb21fe74e0f3992b3b2416c609d18.tar.bz2 | |
test: acpi: Handle both 32bit and 64bit ACPI tables
Handle both 32bit and 64bit systems, i.e. sandbox and sandbox64
the same way drivers/cpu/cpu_sandbox.c sets those ACPI tables up.
This fixes "$ ./u-boot -Tc 'ut dm dm_test_acpi_write_tables'"
test failure on sandbox64.
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | test/dm/acpi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 77eb524..5997bda 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -221,7 +221,8 @@ static int dm_test_acpi_create_dmar(struct unit_test_state *uts) ut_assertnonnull(cpu); ut_assertok(acpi_create_dmar(&dmar, DMAR_INTR_REMAP)); ut_asserteq(DMAR_INTR_REMAP, dmar.flags); - ut_asserteq(32 - 1, dmar.host_address_width); + ut_asserteq((IS_ENABLED(CONFIG_PHYS_64BIT) ? 64 : 32) - 1, + dmar.host_address_width); return 0; } @@ -277,13 +278,16 @@ static int dm_test_acpi_write_tables(struct unit_test_state *uts) */ ut_asserteq_ptr(dmar + 3, ctx.current); ut_asserteq(DMAR_INTR_REMAP, dmar->flags); - ut_asserteq(32 - 1, dmar->host_address_width); + ut_asserteq((IS_ENABLED(CONFIG_PHYS_64BIT) ? 64 : 32) - 1, + dmar->host_address_width); ut_asserteq(DMAR_INTR_REMAP, dmar[1].flags); - ut_asserteq(32 - 1, dmar[1].host_address_width); + ut_asserteq((IS_ENABLED(CONFIG_PHYS_64BIT) ? 64 : 32) - 1, + dmar[1].host_address_width); ut_asserteq(DMAR_INTR_REMAP, dmar[2].flags); - ut_asserteq(32 - 1, dmar[2].host_address_width); + ut_asserteq((IS_ENABLED(CONFIG_PHYS_64BIT) ? 64 : 32) - 1, + dmar[2].host_address_width); /* Check that the pointers were added correctly */ for (i = 0; i < 3; i++) { |