From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:52437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJZft-0001uL-12 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 04:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJZfp-0008Nz-UL for qemu-devel@nongnu.org; Thu, 25 Apr 2019 04:24:08 -0400 Received: from mga12.intel.com ([192.55.52.136]:21131) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJZfm-0008LB-Gq for qemu-devel@nongnu.org; Thu, 25 Apr 2019 04:24:03 -0400 Date: Thu, 25 Apr 2019 16:23:31 +0800 From: Wei Yang Message-ID: <20190425082331.GH24829@richard> Reply-To: Wei Yang References: <1556170489-131927-1-git-send-email-imammedo@redhat.com> <1556170489-131927-2-git-send-email-imammedo@redhat.com> <20190425072256.GA24344@richard> <20190425100751.11ac20bf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190425100751.11ac20bf@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 01/13] tests: acpi: make RSDT test routine handle XSDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: Wei Yang , Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Laszlo Ersek , qemu-devel@nongnu.org, Shameer Kolothum , Shannon Zhao , Gonglei , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= On Thu, Apr 25, 2019 at 10:07:51AM +0200, Igor Mammedov wrote: >On Thu, 25 Apr 2019 15:22:56 +0800 >Wei Yang wrote: > >> On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote: >> >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(). >> >> Would it be proper to split this into another patch? > >it should be fine to remove code that's being replaced by new one >which substitutes the former within the same patch. >but if you insist I can split it into another patch. I am fine with this included. > >> > >> >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. >> >--- >> > 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 ef388bb..8c68201 100644 >> >--- a/tests/acpi-utils.h >> >+++ b/tests/acpi-utils.h >> >@@ -46,8 +46,7 @@ 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_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); >> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table); >> >> Would you mind giving some hint of this change? >thanks for spotting it. IT certainly doesn't belong to this patch. >I'll need to recheck if supporting 64bit address fields is done properly >and find another place where to move this hunk. > >> >> > 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 cc33b46..9a6d1d3 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; >> > } >> > >> >-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_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) >> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table) >> > { >> > uint8_t revision; >> > >> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c >> >index a506dcb..24bd102 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) >> > } >> > } >> > >> >-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 */], "RSDT", true); >> >+ &data->rsdp_table[addr_off], 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, >> >@@ -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 >> -- Wei Yang Help you, Help me 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=-8.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT 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 63788C10F03 for ; Thu, 25 Apr 2019 08:25:33 +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 23405214AE for ; Thu, 25 Apr 2019 08:25:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23405214AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.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]:53763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJZhE-0002m3-D4 for qemu-devel@archiver.kernel.org; Thu, 25 Apr 2019 04:25:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJZft-0001uL-12 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 04:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJZfp-0008Nz-UL for qemu-devel@nongnu.org; Thu, 25 Apr 2019 04:24:08 -0400 Received: from mga12.intel.com ([192.55.52.136]:21131) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJZfm-0008LB-Gq for qemu-devel@nongnu.org; Thu, 25 Apr 2019 04:24:03 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 01:23:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,393,1549958400"; d="scan'208";a="164698650" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 25 Apr 2019 01:23:58 -0700 Date: Thu, 25 Apr 2019 16:23:31 +0800 From: Wei Yang To: Igor Mammedov Message-ID: <20190425082331.GH24829@richard> References: <1556170489-131927-1-git-send-email-imammedo@redhat.com> <1556170489-131927-2-git-send-email-imammedo@redhat.com> <20190425072256.GA24344@richard> <20190425100751.11ac20bf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190425100751.11ac20bf@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.136 Subject: Re: [Qemu-devel] [PATCH v3 01/13] 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: , Reply-To: Wei Yang Cc: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , qemu-devel@nongnu.org, Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , Laszlo Ersek Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190425082331.KtrRP6138MLX263xzFfHou6e8D_sj14VntwK0MOiD8I@z> On Thu, Apr 25, 2019 at 10:07:51AM +0200, Igor Mammedov wrote: >On Thu, 25 Apr 2019 15:22:56 +0800 >Wei Yang wrote: > >> On Thu, Apr 25, 2019 at 07:34:37AM +0200, Igor Mammedov wrote: >> >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(). >> >> Would it be proper to split this into another patch? > >it should be fine to remove code that's being replaced by new one >which substitutes the former within the same patch. >but if you insist I can split it into another patch. I am fine with this included. > >> > >> >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. >> >--- >> > 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 ef388bb..8c68201 100644 >> >--- a/tests/acpi-utils.h >> >+++ b/tests/acpi-utils.h >> >@@ -46,8 +46,7 @@ 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_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); >> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table); >> >> Would you mind giving some hint of this change? >thanks for spotting it. IT certainly doesn't belong to this patch. >I'll need to recheck if supporting 64bit address fields is done properly >and find another place where to move this hunk. > >> >> > 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 cc33b46..9a6d1d3 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; >> > } >> > >> >-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_parse_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) >> >+void acpi_parse_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp_table) >> > { >> > uint8_t revision; >> > >> >diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c >> >index a506dcb..24bd102 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) >> > } >> > } >> > >> >-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 */], "RSDT", true); >> >+ &data->rsdp_table[addr_off], 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, >> >@@ -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 >> -- Wei Yang Help you, Help me