From nobody Fri Nov 7 10:26:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547567730306115.1582317560833; Tue, 15 Jan 2019 07:55:30 -0800 (PST) Received: from localhost ([127.0.0.1]:58230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjR3p-0002s6-8B for importer@patchew.org; Tue, 15 Jan 2019 10:55:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjR1t-0001WX-G9 for qemu-devel@nongnu.org; Tue, 15 Jan 2019 10:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjR1n-0006Ik-35 for qemu-devel@nongnu.org; Tue, 15 Jan 2019 10:53:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjR1h-0006H7-DI for qemu-devel@nongnu.org; Tue, 15 Jan 2019 10:53:21 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2B41F8046C; Tue, 15 Jan 2019 15:53:15 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 793285D776; Tue, 15 Jan 2019 15:53:13 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 15 Jan 2019 16:40:54 +0100 Message-Id: <1547566866-129386-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1547566866-129386-1-git-send-email-imammedo@redhat.com> References: <1547566866-129386-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 15 Jan 2019 15:53:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 02/14] tests: acpi: make RSDT test routine handle XSDT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Samuel Ortiz , "Michael S. Tsirkin" , Laszlo Ersek , Shannon Zhao , Gonglei , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If RSDP revision is more than 0 fetch table pointed by XSDT and fallback to legacy RSDT table otherwise. While at it drop unused acpi_get_xsdt_address(). Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- PS: it doesn't affect existing pc/q35 machines as they use RSDP.revision =3D= =3D 0 but it will be used by followup patch to enable testing arm/virt board which uses provides XSDT table. --- tests/acpi-utils.h | 3 +-- tests/acpi-utils.c | 14 +------------- tests/bios-tables-test.c | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index 3b11f47..398900c 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -47,8 +47,7 @@ typedef struct { uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); uint64_t uefi_find_rsdp_addr(QTestState *qts, uint64_t start, uint64_t siz= e); -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table); -void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_t= able); +void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_t= able); void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len, const uint8_t *addr_ptr, const char *sig, bool verify_checksum); diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index b9ff9df..84068a8 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,19 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } =20 -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table) -{ - uint64_t xsdt_physical_address; - uint8_t revision =3D rsdp_table[15 /* Revision offset */]; - - /* We must have revision 2 if we're looking for an XSDT pointer */ - g_assert(revision =3D=3D 2); - - memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */= ], 8); - return le64_to_cpu(xsdt_physical_address); -} - -void acpi_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_t= able) +void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_t= able) { uint8_t revision; =20 diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 0bf7164..529bfc4 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -107,17 +107,25 @@ static void test_acpi_rsdp_table(test_data *data) } } =20 -static void test_acpi_rsdt_table(test_data *data) +static void test_acpi_rxsdt_table(test_data *data) { + const char *sig =3D "RSDT"; AcpiSdtTable rsdt =3D {}; + int entry_size =3D 4; + int addr_off =3D 16 /* RsdtAddress */; uint8_t *ent; =20 - /* read RSDT table */ + if (data->rsdp_table[15 /* Revision offset */] !=3D 0) { + addr_off =3D 24 /* XsdtAddress */; + entry_size =3D 8; + sig =3D "XSDT"; + } + /* read [RX]SDT table */ acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len, - &data->rsdp_table[16 /* RsdtAddress */], "RSDT", true= ); + &data->rsdp_table[addr_off], sig, true); =20 /* Load all tables and add to test list directly RSDT referenced table= s */ - ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, 4 /* Entry size *= /) { + ACPI_FOREACH_RSDT_ENTRY(rsdt.aml, rsdt.aml_len, ent, entry_size) { AcpiSdtTable ssdt_table =3D {}; =20 acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, = ent, @@ -519,7 +527,7 @@ static void test_acpi_one(const char *params, test_data= *data) data->tables =3D g_array_new(false, true, sizeof(AcpiSdtTable)); test_acpi_rsdp_address(data); test_acpi_rsdp_table(data); - test_acpi_rsdt_table(data); + test_acpi_rxsdt_table(data); test_acpi_fadt_table(data); =20 if (iasl) { --=20 2.7.4