| Message ID | 1556170489-131927-6-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:41AM +0200, Igor Mammedov wrote: >If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch >FACS as it's not provided by the board. > >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> >--- > tests/bios-tables-test.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c >index ed62a17..e944d00 100644 >--- a/tests/bios-tables-test.c >+++ b/tests/bios-tables-test.c >@@ -146,9 +146,13 @@ static void test_acpi_fadt_table(test_data *data) > g_assert(compare_signature(&table, "FACP")); > > /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */ >- acpi_fetch_table(data->qts, &table.aml, &table.aml_len, >- fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false); >- g_array_append_val(data->tables, table); >+ memcpy(&val, fadt_aml + 112 /* Flags */, 4); >+ val = le32_to_cpu(val); >+ if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) { >+ acpi_fetch_table(data->qts, &table.aml, &table.aml_len, >+ 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); >-- >2.7.4
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index ed62a17..e944d00 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -146,9 +146,13 @@ static void test_acpi_fadt_table(test_data *data) g_assert(compare_signature(&table, "FACP")); /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */ - acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false); - g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + 112 /* Flags */, 4); + val = le32_to_cpu(val); + if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) { + acpi_fetch_table(data->qts, &table.aml, &table.aml_len, + 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);