From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4A-00053V-6u for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD49-0002mb-0k for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58414) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD48-0002mC-O7 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:04 -0400 From: Igor Mammedov Date: Thu, 2 May 2019 16:51:51 +0200 Message-Id: <1556808723-226478-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1556808723-226478-1-git-send-email-imammedo@redhat.com> References: <1556808723-226478-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v4 03/15] tests: acpi: make RSDT test routine handle XSDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laszlo Ersek , "Michael S. Tsirkin" , Gonglei , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Shannon Zhao , Wei Yang , Andrew Jones , Shameer Kolothum , Ben Warren , xuwei5@hisilicon.com, xuwei5@huawei.com, linuxarm@huawei.com 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 --- PS: it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0 but it will be used by followup patch to enable testing arm/virt board which uses provides XSDT table. v4: * move out acpi_parse_rsdp_table() hunk to "tests: acpi: make pointer to RSDP 64bit" where it belongs --- tests/acpi-utils.h | 1 - tests/acpi-utils.c | 12 ------------ tests/bios-tables-test.c | 20 ++++++++++++++------ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index 92285b7..f55ccf9 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,6 @@ typedef struct { uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table); void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len, const uint8_t *addr_ptr, int addr_size, const char *sig, diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index 644c87b..a0d49c4 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,18 +51,6 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table) -{ - uint64_t xsdt_physical_address; - uint8_t revision = rsdp_table[15 /* Revision offset */]; - - /* We must have revision 2 if we're looking for an XSDT pointer */ - g_assert(revision == 2); - - memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8); - return le64_to_cpu(xsdt_physical_address); -} - void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) { uint8_t revision; diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 86b592c..d6ab121 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -107,21 +107,29 @@ static void test_acpi_rsdp_table(test_data *data) } } -static void test_acpi_rsdt_table(test_data *data) +static void test_acpi_rxsdt_table(test_data *data) { + const char *sig = "RSDT"; AcpiSdtTable rsdt = {}; + int entry_size = 4; + int addr_off = 16 /* RsdtAddress */; uint8_t *ent; - /* read RSDT table */ + if (data->rsdp_table[15 /* Revision offset */] != 0) { + addr_off = 24 /* XsdtAddress */; + entry_size = 8; + sig = "XSDT"; + } + /* read [RX]SDT table */ acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len, - &data->rsdp_table[16 /* RsdtAddress */], 4, "RSDT", true); + &data->rsdp_table[addr_off], entry_size, sig, true); /* Load all tables and add to test list directly RSDT referenced tables */ - 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 = {}; acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent, - 4, NULL, true); + entry_size, NULL, true); /* Add table to ASL test tables list */ g_array_append_val(data->tables, ssdt_table); } @@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data) data->tables = 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); if (iasl) { -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56C3BC43219 for ; Thu, 2 May 2019 15:11:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B1E420675 for ; Thu, 2 May 2019 15:11:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B1E420675 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:52835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMDMa-0004YM-A8 for qemu-devel@archiver.kernel.org; Thu, 02 May 2019 11:11:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4A-00053V-6u for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD49-0002mb-0k for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58414) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD48-0002mC-O7 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ECB42307EA8B; Thu, 2 May 2019 14:52:03 +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 74A0C71C80; Thu, 2 May 2019 14:51:56 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:51:51 +0200 Message-Id: <1556808723-226478-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1556808723-226478-1-git-send-email-imammedo@redhat.com> References: <1556808723-226478-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 02 May 2019 14:52:04 +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 v4 03/15] 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 , Ben Warren , "Michael S. Tsirkin" , Laszlo Ersek , linuxarm@huawei.com, Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , xuwei5@huawei.com, xuwei5@hisilicon.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190502145151.DB2tWgE0gSHr1ITpQG6EkUs3iTotBblo6MKKaJ5XcO0@z> 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 --- PS: it doesn't affect existing pc/q35 machines as they use RSDP.revision == 0 but it will be used by followup patch to enable testing arm/virt board which uses provides XSDT table. v4: * move out acpi_parse_rsdp_table() hunk to "tests: acpi: make pointer to RSDP 64bit" where it belongs --- tests/acpi-utils.h | 1 - tests/acpi-utils.c | 12 ------------ tests/bios-tables-test.c | 20 ++++++++++++++------ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index 92285b7..f55ccf9 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,6 @@ typedef struct { uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table); void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len, const uint8_t *addr_ptr, int addr_size, const char *sig, diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index 644c87b..a0d49c4 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,18 +51,6 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table) -{ - uint64_t xsdt_physical_address; - uint8_t revision = rsdp_table[15 /* Revision offset */]; - - /* We must have revision 2 if we're looking for an XSDT pointer */ - g_assert(revision == 2); - - memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8); - return le64_to_cpu(xsdt_physical_address); -} - void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) { uint8_t revision; diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 86b592c..d6ab121 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -107,21 +107,29 @@ static void test_acpi_rsdp_table(test_data *data) } } -static void test_acpi_rsdt_table(test_data *data) +static void test_acpi_rxsdt_table(test_data *data) { + const char *sig = "RSDT"; AcpiSdtTable rsdt = {}; + int entry_size = 4; + int addr_off = 16 /* RsdtAddress */; uint8_t *ent; - /* read RSDT table */ + if (data->rsdp_table[15 /* Revision offset */] != 0) { + addr_off = 24 /* XsdtAddress */; + entry_size = 8; + sig = "XSDT"; + } + /* read [RX]SDT table */ acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len, - &data->rsdp_table[16 /* RsdtAddress */], 4, "RSDT", true); + &data->rsdp_table[addr_off], entry_size, sig, true); /* Load all tables and add to test list directly RSDT referenced tables */ - 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 = {}; acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent, - 4, NULL, true); + entry_size, NULL, true); /* Add table to ASL test tables list */ g_array_append_val(data->tables, ssdt_table); } @@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data) data->tables = 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); if (iasl) { -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD5AFC04AAF for ; Thu, 16 May 2019 12:55:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AEC2720833 for ; Thu, 16 May 2019 12:55:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AEC2720833 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:54724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFux-0005nY-S5 for qemu-devel@archiver.kernel.org; Thu, 16 May 2019 08:55:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFNB-0001Va-IF for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRFN8-0002fn-HX for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:33 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:41513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hRFN6-0002eN-Pm for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:30 -0400 Received: by mail-qt1-f178.google.com with SMTP id y22so3543412qtn.8 for ; Thu, 16 May 2019 05:20:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=uWaDRe7+LF+zrJ+Tf/oQtPH1jlenE8wNIJt9AIDqefY=; b=HdaiTfynb3TYh0fI8fDtSGTFFoZMUTgzRv1ykgc6FcIxycyUB2w8CFaLe1oDcEIb41 4j3kmdC8S5UrwmTmdn3MnCT+byAvJUCtM1s7yo05fPhHgFu1JZI6qeprNCM/3hnEPZyD 22Gq0zfZgPeI6OMPYFcIOdCkWxA8OhPr7LXlmA9La/xjiOEJ3gs+qI3CzhC2duDKkbFz 9/GYXVDInjX4cGRSYFQBiyfis7WeF8KfEX41NL07ICL+1lUEy0XNQzeKav0Irkp7rkml o/rZrRlUZfIzCb/C3mvKGMM24DhdQQTalc4fF5lnb9BuS+j6b6GtAuzrgE9VMoVgijFm fm3A== X-Gm-Message-State: APjAAAXaz7tBLzE0eZ7mEVuydx5LaiUMiUch23PNSw1X/PSjLch1HAa8 yUOYCdDYrgdhikBxDrEKWrk8yLjp+pg= X-Google-Smtp-Source: APXvYqz9TV2609jZpPXpHjoiTDdJhSvz2BMDW+Mgnjc/UCokD755IXObKMhfdlgc9IpgUo6o+ouhzw== X-Received: by 2002:ac8:1671:: with SMTP id x46mr18972263qtk.240.1558009227932; Thu, 16 May 2019 05:20:27 -0700 (PDT) Received: from redhat.com ([185.54.206.10]) by smtp.gmail.com with ESMTPSA id v3sm4229465qtc.97.2019.05.16.05.20.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 16 May 2019 05:20:27 -0700 (PDT) Date: Thu, 16 May 2019 08:20:24 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-4-git-send-email-imammedo@redhat.com> References: <20190515121146.7248-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190515121146.7248-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.178 Subject: [Qemu-devel] [PULL 25/37] 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: Laurent Vivier , Peter Maydell , Thomas Huth , Wei Yang , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190516122024.R_tm97YG_riFG2z5bdPMVHIKjcSjia0-yI-Y-Bu5vMw@z> From: Igor Mammedov 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 Message-Id: <1556808723-226478-4-git-send-email-imammedo@redhat.com> Reviewed-by: Wei Yang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/acpi-utils.h | 1 - tests/acpi-utils.c | 12 ------------ tests/bios-tables-test.c | 20 ++++++++++++++------ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index 92285b75b3..f55ccf9ff7 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,6 @@ typedef struct { uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table); void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len, const uint8_t *addr_ptr, int addr_size, const char *sig, diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index 644c87b5f9..a0d49c4371 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,18 +51,6 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table) -{ - uint64_t xsdt_physical_address; - uint8_t revision = rsdp_table[15 /* Revision offset */]; - - /* We must have revision 2 if we're looking for an XSDT pointer */ - g_assert(revision == 2); - - memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8); - return le64_to_cpu(xsdt_physical_address); -} - void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) { uint8_t revision; diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 86b592c67f..d6ab1218da 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -107,21 +107,29 @@ static void test_acpi_rsdp_table(test_data *data) } } -static void test_acpi_rsdt_table(test_data *data) +static void test_acpi_rxsdt_table(test_data *data) { + const char *sig = "RSDT"; AcpiSdtTable rsdt = {}; + int entry_size = 4; + int addr_off = 16 /* RsdtAddress */; uint8_t *ent; - /* read RSDT table */ + if (data->rsdp_table[15 /* Revision offset */] != 0) { + addr_off = 24 /* XsdtAddress */; + entry_size = 8; + sig = "XSDT"; + } + /* read [RX]SDT table */ acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len, - &data->rsdp_table[16 /* RsdtAddress */], 4, "RSDT", true); + &data->rsdp_table[addr_off], entry_size, sig, true); /* Load all tables and add to test list directly RSDT referenced tables */ - 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 = {}; acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent, - 4, NULL, true); + entry_size, NULL, true); /* Add table to ASL test tables list */ g_array_append_val(data->tables, ssdt_table); } @@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data) data->tables = 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); if (iasl) { -- MST From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83C38C04AAC for ; Mon, 20 May 2019 23:25:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5599920862 for ; Mon, 20 May 2019 23:25:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5599920862 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:43545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSrfJ-0002mG-E1 for qemu-devel@archiver.kernel.org; Mon, 20 May 2019 19:25:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSrR9-0007jN-Pj for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSrR8-0008Gh-NC for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:19 -0400 Received: from mail-qk1-f174.google.com ([209.85.222.174]:33209) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hSrR8-0008GK-Go for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:18 -0400 Received: by mail-qk1-f174.google.com with SMTP id p18so9359847qkk.0 for ; Mon, 20 May 2019 16:11:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=1u4F24iMwr4UIuWY61+gweTUoTVvnMuAMFaKH+Oei18=; b=eHmjOlAFCSCpADNBebamroUzzvwhlZKg68QbY00mdN7IypXwQ2VlHA5e5fYgWCzRMv mU5ckznnniXeSe06jBeykEUH9CkDxyZYOkQjWtg79H93psXYEsgD4En2RtcNw3kT4Tlz km3IFaIzbf6KEb2Is8rNbZBEJhZmTwIKF8YKoGQjyrR5WpY7EDI5ttB2Rw0fCV2KjXwB l0a/OMj/Wq2gsEc7haCN3SCFjqyQ3oOfmuVDXDuDGML1wtrFiHeaOGYFpTS7/2PY/zzh lqVewRwuC3+qB8dvF6KK96xNR32oml7P+dpjxig7dDSN1aIWtSRhsrbP2Q4NCoYHvF9y FcvA== X-Gm-Message-State: APjAAAWHg3K1XcUA0QFbkis+TLU54vTiHJUlS9FXPVq6vIn6az5sZGh/ +uOqMJ4s8fUUGbYutdoNOgTwYKuUtcQ= X-Google-Smtp-Source: APXvYqxJ7YavNkf2oi7LXInl4NPS9GMUD23178Kh/pLMYXpR8JWkEQJsSbNIUIkvsCwDmUNuZjL8Xg== X-Received: by 2002:a37:4bc9:: with SMTP id y192mr13344940qka.178.1558393877104; Mon, 20 May 2019 16:11:17 -0700 (PDT) Received: from redhat.com (pool-173-76-105-71.bstnma.fios.verizon.net. [173.76.105.71]) by smtp.gmail.com with ESMTPSA id k8sm4984944qke.16.2019.05.20.16.11.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 20 May 2019 16:11:16 -0700 (PDT) Date: Mon, 20 May 2019 19:11:15 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-4-git-send-email-imammedo@redhat.com> References: <20190520231008.20140-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190520231008.20140-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.222.174 Subject: [Qemu-devel] [PULL v2 24/36] 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: Laurent Vivier , Peter Maydell , Thomas Huth , Wei Yang , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190520231115.HstEya0dTCo2U5dV0BbBWB06pjvPEfrexu1qap_8mAc@z> From: Igor Mammedov 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 Message-Id: <1556808723-226478-4-git-send-email-imammedo@redhat.com> Reviewed-by: Wei Yang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/acpi-utils.h | 1 - tests/acpi-utils.c | 12 ------------ tests/bios-tables-test.c | 20 ++++++++++++++------ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index 7c5c0be379..a4f43a18ae 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,6 @@ typedef struct { uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table); void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); void acpi_fetch_table(QTestState *qts, uint8_t **aml, uint32_t *aml_len, const uint8_t *addr_ptr, int addr_size, const char *sig, diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index 644c87b5f9..a0d49c4371 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,18 +51,6 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } -uint64_t acpi_get_xsdt_address(uint8_t *rsdp_table) -{ - uint64_t xsdt_physical_address; - uint8_t revision = rsdp_table[15 /* Revision offset */]; - - /* We must have revision 2 if we're looking for an XSDT pointer */ - g_assert(revision == 2); - - memcpy(&xsdt_physical_address, &rsdp_table[24 /* XsdtAddress offset */], 8); - return le64_to_cpu(xsdt_physical_address); -} - void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) { uint8_t revision; diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 86b592c67f..d6ab1218da 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -107,21 +107,29 @@ static void test_acpi_rsdp_table(test_data *data) } } -static void test_acpi_rsdt_table(test_data *data) +static void test_acpi_rxsdt_table(test_data *data) { + const char *sig = "RSDT"; AcpiSdtTable rsdt = {}; + int entry_size = 4; + int addr_off = 16 /* RsdtAddress */; uint8_t *ent; - /* read RSDT table */ + if (data->rsdp_table[15 /* Revision offset */] != 0) { + addr_off = 24 /* XsdtAddress */; + entry_size = 8; + sig = "XSDT"; + } + /* read [RX]SDT table */ acpi_fetch_table(data->qts, &rsdt.aml, &rsdt.aml_len, - &data->rsdp_table[16 /* RsdtAddress */], 4, "RSDT", true); + &data->rsdp_table[addr_off], entry_size, sig, true); /* Load all tables and add to test list directly RSDT referenced tables */ - 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 = {}; acpi_fetch_table(data->qts, &ssdt_table.aml, &ssdt_table.aml_len, ent, - 4, NULL, true); + entry_size, NULL, true); /* Add table to ASL test tables list */ g_array_append_val(data->tables, ssdt_table); } @@ -521,7 +529,7 @@ static void test_acpi_one(const char *params, test_data *data) data->tables = 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); if (iasl) { -- MST