From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4C-000562-RC for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4B-0002na-OE for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4B-0002nE-G6 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:07 -0400 From: Igor Mammedov Date: Thu, 2 May 2019 16:51:52 +0200 Message-Id: <1556808723-226478-5-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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 04/15] tests: acpi: make pointer to RSDP 64bit 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 In case of UEFI, RSDP doesn't have to be located in lowmem, it could be placed at any address. Make sure that test won't break if it is placed above the first 4Gb of address space. PS: While at it cleanup some local variables as we don't really need them. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v4: - move acpi_fetch_rsdp_table(s/uint32_t addr/uint64_t addr/) to this patch where it belongs from "tests: acpi: make RSDT test routine handle XSDT" (Wei Yang ) v2: - s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek = ) --- tests/acpi-utils.h | 2 +- tests/acpi-utils.c | 2 +- tests/bios-tables-test.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index f55ccf9..1da6c10 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,7 @@ typedef struct { =20 uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp= _table); +void acpi_fetch_rsdp_table(QTestState *qts, uint64_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, bool verify_checksum); diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index a0d49c4..c216b9e 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } =20 -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp= _table) +void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp= _table) { uint8_t revision; =20 diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d6ab121..a164d27 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -26,7 +26,7 @@ typedef struct { const char *machine; const char *variant; - uint32_t rsdp_addr; + uint64_t rsdp_addr; uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; GArray *tables; uint32_t smbios_ep_addr; @@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data) =20 static void test_acpi_rsdp_table(test_data *data) { - uint8_t *rsdp_table =3D data->rsdp_table, revision; - uint32_t addr =3D data->rsdp_addr; + uint8_t *rsdp_table =3D data->rsdp_table; =20 - acpi_fetch_rsdp_table(data->qts, addr, rsdp_table); - revision =3D rsdp_table[15 /* Revision offset */]; + acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table); =20 - switch (revision) { + switch (rsdp_table[15 /* Revision offset */]) { case 0: /* ACPI 1.0 RSDP */ /* With rev 1, checksum is only for the first 20 bytes */ g_assert(!acpi_calc_checksum(rsdp_table, 20)); --=20 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 E03CCC43219 for ; Thu, 2 May 2019 15:06:37 +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 B61832075E for ; Thu, 2 May 2019 15:06:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B61832075E 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]:52758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMDID-0008I0-0O for qemu-devel@archiver.kernel.org; Thu, 02 May 2019 11:06:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4C-000562-RC for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4B-0002na-OE for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4B-0002nE-G6 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:07 -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 AF8C0C05B1CD; Thu, 2 May 2019 14:52:06 +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 408367DA23; Thu, 2 May 2019 14:52:04 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:51:52 +0200 Message-Id: <1556808723-226478-5-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> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" 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.32]); Thu, 02 May 2019 14:52:06 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 04/15] tests: acpi: make pointer to RSDP 64bit 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" Message-ID: <20190502145152.BGKl-QGjUc_pNFzjy1m0AsS-B7mYpHWqllLwKl_bQ8Y@z> In case of UEFI, RSDP doesn't have to be located in lowmem, it could be placed at any address. Make sure that test won't break if it is placed above the first 4Gb of address space. PS: While at it cleanup some local variables as we don't really need them. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v4: - move acpi_fetch_rsdp_table(s/uint32_t addr/uint64_t addr/) to this patch where it belongs from "tests: acpi: make RSDT test routine handle XSDT" (Wei Yang ) v2: - s/In case of UEFI/In case of UEFI,/ (Laszlo Ersek = ) --- tests/acpi-utils.h | 2 +- tests/acpi-utils.c | 2 +- tests/bios-tables-test.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index f55ccf9..1da6c10 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,7 @@ typedef struct { =20 uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp= _table); +void acpi_fetch_rsdp_table(QTestState *qts, uint64_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, bool verify_checksum); diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index a0d49c4..c216b9e 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } =20 -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp= _table) +void acpi_fetch_rsdp_table(QTestState *qts, uint64_t addr, uint8_t *rsdp= _table) { uint8_t revision; =20 diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d6ab121..a164d27 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -26,7 +26,7 @@ typedef struct { const char *machine; const char *variant; - uint32_t rsdp_addr; + uint64_t rsdp_addr; uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; GArray *tables; uint32_t smbios_ep_addr; @@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data) =20 static void test_acpi_rsdp_table(test_data *data) { - uint8_t *rsdp_table =3D data->rsdp_table, revision; - uint32_t addr =3D data->rsdp_addr; + uint8_t *rsdp_table =3D data->rsdp_table; =20 - acpi_fetch_rsdp_table(data->qts, addr, rsdp_table); - revision =3D rsdp_table[15 /* Revision offset */]; + acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table); =20 - switch (revision) { + switch (rsdp_table[15 /* Revision offset */]) { case 0: /* ACPI 1.0 RSDP */ /* With rev 1, checksum is only for the first 20 bytes */ g_assert(!acpi_calc_checksum(rsdp_table, 20)); --=20 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, 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 C9DC3C04AAF for ; Thu, 16 May 2019 12:35:11 +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 A053E20848 for ; Thu, 16 May 2019 12:35:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A053E20848 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]:54043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFbK-0005y3-Ts for qemu-devel@archiver.kernel.org; Thu, 16 May 2019 08:35:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFND-0001Wp-Kt for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRFNA-0002h3-JW for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:35 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:40597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hRFNA-0002go-Ga for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:32 -0400 Received: by mail-qt1-f195.google.com with SMTP id k24so3553365qtq.7 for ; Thu, 16 May 2019 05:20:32 -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:content-transfer-encoding :in-reply-to; bh=EaZtsbTWjI4op/djAS3AYZwZClSpbt1M5dRk0R/KbMo=; b=h3TSA6S6npUbkvVaqdOygRS+f7OXxNyTY0XOzcBSgcA0C5L4s2efxSdsuW9BWkcOw4 gqcd1cIfMuDfwYrYAjonpRCAmj+0hovH1LXCvFxmf/WqFww7Rv8LrYqOb8ng83aXEDbN 0sux7y/4A2tIPlsLUUs8pmn6rOpmLPCkylxhZ84b0FdQ490DJG53kh8KPQdg7wSsmy2f CnML7FaoYg470lX7OZJ1GURHRQ96Z9kQJQz03YDcFg+eYRlWbhTvrtupq2ApfVSPwr2Y e7YQ7649xQ1DI9EtXqHHoUj28WkdYHZ/A5Yx93MMo+gN7GH7MTbDa7Fe4Hg+Mrv1m1kC P5CA== X-Gm-Message-State: APjAAAVyszlEckUvJjNvJy76vriIaw9DTepS3Te7muJFeWwtKtfrkqm0 +h8MOu8YFKnrblpAQgp++KWmeeii8EQ= X-Google-Smtp-Source: APXvYqxAR1GigdMiniEbMK42vrnNSJBLfL/KlNDUA/UY8LtgnxFlGwaY9Mc+FmcFiwwhxWT/MDjH4Q== X-Received: by 2002:ac8:17eb:: with SMTP id r40mr26935954qtk.140.1558009231677; Thu, 16 May 2019 05:20:31 -0700 (PDT) Received: from redhat.com ([185.54.206.10]) by smtp.gmail.com with ESMTPSA id q66sm2571815qke.66.2019.05.16.05.20.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 16 May 2019 05:20:30 -0700 (PDT) Date: Thu, 16 May 2019 08:20:28 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-5-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 Content-Transfer-Encoding: 8bit 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.195 Subject: [Qemu-devel] [PULL 26/37] tests: acpi: make pointer to RSDP 64bit 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 , Paolo Bonzini , Igor Mammedov , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190516122028.pogK3kU8Ima8xSO3k9Ymaoj9pYcI20Dl-lLu8NMybrk@z> From: Igor Mammedov In case of UEFI, RSDP doesn't have to be located in lowmem, it could be placed at any address. Make sure that test won't break if it is placed above the first 4Gb of address space. PS: While at it cleanup some local variables as we don't really need them. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Message-Id: <1556808723-226478-5-git-send-email-imammedo@redhat.com> Reviewed-by: Wei Yang Tested-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/acpi-utils.h | 2 +- tests/acpi-utils.c | 2 +- tests/bios-tables-test.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index f55ccf9ff7..1da6c100a4 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,7 @@ typedef struct { uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); +void acpi_fetch_rsdp_table(QTestState *qts, uint64_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, bool verify_checksum); diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index a0d49c4371..c216b9e0e9 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) +void acpi_fetch_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 d6ab1218da..a164d274a2 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -26,7 +26,7 @@ typedef struct { const char *machine; const char *variant; - uint32_t rsdp_addr; + uint64_t rsdp_addr; uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; GArray *tables; uint32_t smbios_ep_addr; @@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data) static void test_acpi_rsdp_table(test_data *data) { - uint8_t *rsdp_table = data->rsdp_table, revision; - uint32_t addr = data->rsdp_addr; + uint8_t *rsdp_table = data->rsdp_table; - acpi_fetch_rsdp_table(data->qts, addr, rsdp_table); - revision = rsdp_table[15 /* Revision offset */]; + acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table); - switch (revision) { + switch (rsdp_table[15 /* Revision offset */]) { case 0: /* ACPI 1.0 RSDP */ /* With rev 1, checksum is only for the first 20 bytes */ g_assert(!acpi_calc_checksum(rsdp_table, 20)); -- 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, 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 D8066C04AAC for ; Mon, 20 May 2019 23:43:50 +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 A97CB21479 for ; Mon, 20 May 2019 23:43:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A97CB21479 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]:43803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSrwb-0000Yx-VA for qemu-devel@archiver.kernel.org; Mon, 20 May 2019 19:43:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSrRB-0007kU-QG for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSrRA-0008Hq-Rq for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:21 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:41840) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hSrRA-0008H9-Mc for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:20 -0400 Received: by mail-qt1-f196.google.com with SMTP id y22so18334039qtn.8 for ; Mon, 20 May 2019 16:11:19 -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:content-transfer-encoding :in-reply-to; bh=AA6TCSyeHGpA1YTEQq8+big2sU8sv1fUdc6SF09NwiI=; b=I3q6cQFyA0+1TC0Kybl72TwbCqk5qLaHYZUeyRbDBrtbNnh5YZzupMrgnsOuiVBS0r WLPy7YANIvHKyQarAculWLziDg1cXv4UBRpnu6juX41yt+E3F5fKaV1WQy9lzPNhqOkJ mCAP+FdduhrYLn0nvkedAds1lme3OI38vQ/hh00EsQZS91luaIwLe97BmQMwLW7dQa16 wp2xlqq3fRBdIzsIhgprn/CEXbvPNLkrUqEVoz7wo26k61rAbkaPNY/JMPqV3ST47OxK e8PxKaCeHXwpbDvpjo2ZQ3H2LDbqH1vAuqK4MCOiAKCROQcVb/J/tBPfpQJwMdGOJytz 93jA== X-Gm-Message-State: APjAAAXxeqZq+EEEEnYctGFIZwxsbp6qIR6cjilFy8niQFfiZ1b7VxTb 3fRT6u/rTYYkZLavyYqI3E8uOZ5FWT0= X-Google-Smtp-Source: APXvYqweO2FSf0KBGfsyOLamyL6ph93dcAE15sECr94j0y8FXYuWHwb7WtfCcH4bsErdVwDCSOeXCA== X-Received: by 2002:ac8:313d:: with SMTP id g58mr58182578qtb.289.1558393879125; Mon, 20 May 2019 16:11:19 -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 x6sm9127190qti.88.2019.05.20.16.11.17 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 20 May 2019 16:11:18 -0700 (PDT) Date: Mon, 20 May 2019 19:11:17 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-5-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 Content-Transfer-Encoding: 8bit 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.160.196 Subject: [Qemu-devel] [PULL v2 25/36] tests: acpi: make pointer to RSDP 64bit 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 , Paolo Bonzini , Igor Mammedov , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190520231117.Z4A_VKu7lY8R5nCNEq7ejZGQbUJYftPjNtOfUwElNUc@z> From: Igor Mammedov In case of UEFI, RSDP doesn't have to be located in lowmem, it could be placed at any address. Make sure that test won't break if it is placed above the first 4Gb of address space. PS: While at it cleanup some local variables as we don't really need them. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Message-Id: <1556808723-226478-5-git-send-email-imammedo@redhat.com> Reviewed-by: Wei Yang Tested-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/acpi-utils.h | 2 +- tests/acpi-utils.c | 2 +- tests/bios-tables-test.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h index a4f43a18ae..0ceb499469 100644 --- a/tests/acpi-utils.h +++ b/tests/acpi-utils.h @@ -46,7 +46,7 @@ typedef struct { uint8_t acpi_calc_checksum(const uint8_t *data, int len); uint32_t acpi_find_rsdp_address(QTestState *qts); -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table); +void acpi_fetch_rsdp_table(QTestState *qts, uint64_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, bool verify_checksum); diff --git a/tests/acpi-utils.c b/tests/acpi-utils.c index a0d49c4371..c216b9e0e9 100644 --- a/tests/acpi-utils.c +++ b/tests/acpi-utils.c @@ -51,7 +51,7 @@ uint32_t acpi_find_rsdp_address(QTestState *qts) return off; } -void acpi_fetch_rsdp_table(QTestState *qts, uint32_t addr, uint8_t *rsdp_table) +void acpi_fetch_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 d6ab1218da..a164d274a2 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -26,7 +26,7 @@ typedef struct { const char *machine; const char *variant; - uint32_t rsdp_addr; + uint64_t rsdp_addr; uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; GArray *tables; uint32_t smbios_ep_addr; @@ -86,13 +86,11 @@ static void test_acpi_rsdp_address(test_data *data) static void test_acpi_rsdp_table(test_data *data) { - uint8_t *rsdp_table = data->rsdp_table, revision; - uint32_t addr = data->rsdp_addr; + uint8_t *rsdp_table = data->rsdp_table; - acpi_fetch_rsdp_table(data->qts, addr, rsdp_table); - revision = rsdp_table[15 /* Revision offset */]; + acpi_fetch_rsdp_table(data->qts, data->rsdp_addr, rsdp_table); - switch (revision) { + switch (rsdp_table[15 /* Revision offset */]) { case 0: /* ACPI 1.0 RSDP */ /* With rev 1, checksum is only for the first 20 bytes */ g_assert(!acpi_calc_checksum(rsdp_table, 20)); -- MST