| Message ID | 1556170489-131927-5-git-send-email-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests: acpi: add UEFI (ARM) testing support | expand |
On Thu, Apr 25, 2019 at 07:34:40AM +0200, Igor Mammedov wrote: >that way it would be possible to test a DSDT pointed by >64bit X_DSDT field in FADT. > >PS: >it will allow to enable testing arm/virt board, which sets >only newer X_DSDT field. > >Signed-off-by: Igor Mammedov <imammedo@redhat.com> >Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Wei Yang <richardw.yang@linux.intel.com> >--- >v2: > add 'val = le32_to_cpu(val)' even if it doesn't necessary > it works as reminder that value copied from table is in > little-endian format (Philippe Mathieu-Daudé <philmd@redhat.com>) >--- > tests/bios-tables-test.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c >index c29dcf4..ed62a17 100644 >--- a/tests/bios-tables-test.c >+++ b/tests/bios-tables-test.c >@@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data) > AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0); > uint8_t *fadt_aml = table.aml; > uint32_t fadt_len = table.aml_len; >+ uint32_t val; >+ int dsdt_offset = 40 /* DSDT */; > > g_assert(compare_signature(&table, "FACP")); > >@@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data) > fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false); > g_array_append_val(data->tables, table); > >+ memcpy(&val, fadt_aml + dsdt_offset, 4); >+ val = le32_to_cpu(val); >+ if (!val) { >+ dsdt_offset = 140 /* X_DSDT */; >+ } > acpi_fetch_table(data->qts, &table.aml, &table.aml_len, >- fadt_aml + 40 /* DSDT */, "DSDT", true); >+ fadt_aml + dsdt_offset, "DSDT", true); > g_array_append_val(data->tables, table); > > memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ >-- >2.7.4
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index c29dcf4..ed62a17 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data) AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0); uint8_t *fadt_aml = table.aml; uint32_t fadt_len = table.aml_len; + uint32_t val; + int dsdt_offset = 40 /* DSDT */; g_assert(compare_signature(&table, "FACP")); @@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data) fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false); g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + dsdt_offset, 4); + val = le32_to_cpu(val); + if (!val) { + dsdt_offset = 140 /* X_DSDT */; + } acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, "DSDT", true); + fadt_aml + dsdt_offset, "DSDT", true); g_array_append_val(data->tables, table); memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */