From: Igor Mammedov <imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: "Laszlo Ersek" <lersek@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Gonglei <arei.gonglei@huawei.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Shannon Zhao" <shannon.zhaosl@gmail.com>, "Wei Yang" <richardw.yang@linux.intel.com>, "Andrew Jones" <drjones@redhat.com>, "Shameer Kolothum" <shameerali.kolothum.thodi@huawei.com>, "Ben Warren" <ben@skyportsystems.com> Subject: [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile Date: Thu, 25 Apr 2019 07:34:41 +0200 [thread overview] Message-ID: <1556170489-131927-6-git-send-email-imammedo@redhat.com> (raw) In-Reply-To: <1556170489-131927-1-git-send-email-imammedo@redhat.com> 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> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Igor Mammedov <imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: "Andrew Jones" <drjones@redhat.com>, "Ben Warren" <ben@skyportsystems.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Laszlo Ersek" <lersek@redhat.com>, "Shameer Kolothum" <shameerali.kolothum.thodi@huawei.com>, "Shannon Zhao" <shannon.zhaosl@gmail.com>, Gonglei <arei.gonglei@huawei.com>, "Wei Yang" <richardw.yang@linux.intel.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile Date: Thu, 25 Apr 2019 07:34:41 +0200 [thread overview] Message-ID: <1556170489-131927-6-git-send-email-imammedo@redhat.com> (raw) Message-ID: <20190425053441.Og7BAHxqzYF2oaCDsTUyyvR2z5opE842iriXkWG6eO0@z> (raw) In-Reply-To: <1556170489-131927-1-git-send-email-imammedo@redhat.com> 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> --- 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
next prev parent reply other threads:[~2019-04-25 5:36 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-25 5:34 [Qemu-devel] [PATCH v3 00/13] tests: acpi: add UEFI (ARM) testing support Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 7:22 ` Wei Yang 2019-04-25 7:22 ` Wei Yang 2019-04-25 8:07 ` Igor Mammedov 2019-04-25 8:07 ` Igor Mammedov 2019-04-25 8:23 ` Wei Yang 2019-04-25 8:23 ` Wei Yang 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 02/13] tests: acpi: rename acpi_parse_rsdp_table() into acpi_fetch_rsdp_table() Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 7:24 ` Wei Yang 2019-04-25 7:24 ` Wei Yang 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 03/13] tests: acpi: make pointer to RSDP 64bit Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 7:31 ` Wei Yang 2019-04-25 7:31 ` Wei Yang 2019-04-25 10:38 ` Igor Mammedov 2019-04-25 10:38 ` Igor Mammedov 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0 Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 7:44 ` Wei Yang 2019-04-25 7:44 ` Wei Yang 2019-04-25 5:34 ` Igor Mammedov [this message] 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 05/13] tests: acpi: skip FACS table if board uses hw reduced ACPI profile Igor Mammedov 2019-04-25 7:48 ` Wei Yang 2019-04-25 7:48 ` Wei Yang 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 06/13] tests: acpi: move boot_sector_init() into x86 tests branch Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 07/13] tests: acpi: add acpi_find_rsdp_address_uefi() helper Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 8:00 ` Wei Yang 2019-04-25 8:00 ` Wei Yang 2019-04-25 10:56 ` Igor Mammedov 2019-04-25 10:56 ` Igor Mammedov 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 08/13] tests: acpi: add a way to start tests with UEFI firmware Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 8:08 ` Wei Yang 2019-04-25 8:08 ` Wei Yang 2019-04-25 11:19 ` Igor Mammedov 2019-04-25 11:19 ` Igor Mammedov 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 09/13] tests: acpi: ignore SMBIOS tests when UEFI firmware is used Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 12:37 ` Philippe Mathieu-Daudé 2019-04-25 12:37 ` Philippe Mathieu-Daudé 2019-04-25 13:28 ` Igor Mammedov 2019-04-25 13:28 ` Igor Mammedov 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 10/13] tests: add expected ACPI tables for arm/virt board Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 12:40 ` Philippe Mathieu-Daudé 2019-04-25 12:40 ` Philippe Mathieu-Daudé 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 11/13] tests: acpi: add simple arm/virt testcase Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 12:41 ` Philippe Mathieu-Daudé 2019-04-25 12:41 ` Philippe Mathieu-Daudé 2019-04-25 13:31 ` Igor Mammedov 2019-04-25 13:31 ` Igor Mammedov 2019-04-25 16:51 ` x00249684 2019-04-25 16:51 ` x00249684 2019-04-26 11:54 ` Igor Mammedov 2019-04-26 11:54 ` Igor Mammedov 2019-04-26 16:28 ` Wei Xu 2019-04-26 16:28 ` Wei Xu 2019-05-02 14:24 ` Igor Mammedov 2019-05-02 14:24 ` Igor Mammedov 2019-05-02 14:30 ` Wei Xu 2019-05-02 14:30 ` Wei Xu 2019-04-26 17:11 ` Laszlo Ersek 2019-04-26 17:11 ` Laszlo Ersek 2019-05-02 14:27 ` Igor Mammedov 2019-05-02 14:27 ` Igor Mammedov 2019-05-02 14:42 ` Laszlo Ersek 2019-05-02 14:42 ` Laszlo Ersek 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 12/13] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 8:20 ` Wei Yang 2019-04-25 8:20 ` Wei Yang 2019-04-25 11:32 ` Igor Mammedov 2019-04-25 11:32 ` Igor Mammedov 2019-04-25 11:46 ` Igor Mammedov 2019-04-25 11:46 ` Igor Mammedov 2019-04-25 5:34 ` [Qemu-devel] [PATCH v3 13/13] tests: acpi: print error unable to dump ACPI table during rebuild Igor Mammedov 2019-04-25 5:34 ` Igor Mammedov 2019-04-25 8:22 ` Wei Yang 2019-04-25 8:22 ` Wei Yang 2019-04-25 11:26 ` Philippe Mathieu-Daudé 2019-04-25 11:26 ` Philippe Mathieu-Daudé
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1556170489-131927-6-git-send-email-imammedo@redhat.com \ --to=imammedo@redhat.com \ --cc=arei.gonglei@huawei.com \ --cc=ben@skyportsystems.com \ --cc=drjones@redhat.com \ --cc=lersek@redhat.com \ --cc=mst@redhat.com \ --cc=philmd@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=richardw.yang@linux.intel.com \ --cc=shameerali.kolothum.thodi@huawei.com \ --cc=shannon.zhaosl@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).