From nobody Thu May 16 19:23:29 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1559561080; cv=none; d=zoho.com; s=zohoarc; b=cmOp3wPIiF12BPFBMlPc+TuI/rOTpHXfpVQKPt2EeMXpTbqutf18hJAIp8udbsD/jG0GK0qThm/GMaBPjajYth2qxhSbgGi+nJx2fgw6LmOEEfuLQJJaGjq7696UlxQwemhFl22N9SSxAC/kvHA6WgIMBhJLgObsBUSq6KBBddI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559561080; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=LES5Em2CK3n7oy5gHuOiX34LyRonasEJ70EhNfkzuoI=; b=Qn/zN64fBiPjNE5y1BLgJ+OaehDrQ4W0I0KcmK3N+4l7SEU8Qa5fObLNDkJYnYD7BjNVw2oEBcq5JPche21usby4wCrcobwL6iOyxHE7C6TK+ZwU+Az66fPpTGSPkg4XyfyUaAmk5EKPtL8icTY/Nw1tY3Cjeq035GqLmldTzNM= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155956108040989.26620064721908; Mon, 3 Jun 2019 04:24:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:33297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXl4E-0003fY-L2 for importer@patchew.org; Mon, 03 Jun 2019 07:23:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXl2a-0002jP-Ez for qemu-devel@nongnu.org; Mon, 03 Jun 2019 07:22:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXl2C-0000tE-3N for qemu-devel@nongnu.org; Mon, 03 Jun 2019 07:21:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51616) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hXl2B-0000qS-LL for qemu-devel@nongnu.org; Mon, 03 Jun 2019 07:21:47 -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 3C07DC04BD44; Mon, 3 Jun 2019 11:21:38 +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 4A5C667263; Mon, 3 Jun 2019 11:21:36 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 3 Jun 2019 13:22:08 +0200 Message-Id: <1559560929-260254-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1559560929-260254-1-git-send-email-imammedo@redhat.com> References: <1559560929-260254-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 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.31]); Mon, 03 Jun 2019 11:21:38 +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 v6 1/2] tests: add expected ACPI tables for arm/virt board 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 , Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Igor Mammedov Tested-by: Philippe Mathieu-Daud=C3=A9 --- this patch is ahead fo "tests: acpi: add simple arm/virt testcase" to keep 'make check' working during bisection and not to pollute code with binary blobs which are not reviewable. tests/data/acpi/virt/APIC | Bin 0 -> 168 bytes tests/data/acpi/virt/DSDT | Bin 0 -> 18476 bytes tests/data/acpi/virt/FACP | Bin 0 -> 268 bytes tests/data/acpi/virt/GTDT | Bin 0 -> 96 bytes tests/data/acpi/virt/MCFG | Bin 0 -> 60 bytes tests/data/acpi/virt/SPCR | Bin 0 -> 80 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/acpi/virt/APIC create mode 100644 tests/data/acpi/virt/DSDT create mode 100644 tests/data/acpi/virt/FACP create mode 100644 tests/data/acpi/virt/GTDT create mode 100644 tests/data/acpi/virt/MCFG create mode 100644 tests/data/acpi/virt/SPCR diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/APIC new file mode 100644 index 0000000000000000000000000000000000000000..797dfde2841c51b7e72065602e9= 9ce1714347f0d GIT binary patch literal 168 zcmZ<^@N{0mz`($~*~#D8BUr&HBEZ=3DZD8>jB1F=3DCg4Dd+6SPUF6788)c?E~X6Fu>G{ hBZPn~MyPrgD9sGlkD?67;f3451Xcqw&w(L;0RYV=3D2>}2A literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT new file mode 100644 index 0000000000000000000000000000000000000000..20e85c7f89f645c69935c615c07= 084e221419960 GIT binary patch literal 18476 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 B2mt^9 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/MCFG new file mode 100644 index 0000000000000000000000000000000000000000..e8987e1af0ec3829770bf4fe11f= ab02b06160dd2 GIT binary patch literal 60 scmeZuc5}C3U|?YMck*}k2v%^42ypfViZKGkKx`0=3D1Oyx)oc|yS05YNo0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/SPCR new file mode 100644 index 0000000000000000000000000000000000000000..377271a0e7817cc21a28c02123a= 89facad63604f GIT binary patch literal 80 zcmWFza1IJ!U|?VpcJg=3Dj2v%^42yhMtiZKGkKx`1r48#l^3?L>agsBLmm>C$E7#RKo I0Z0r60QF4^0RR91 literal 0 HcmV?d00001 --=20 2.7.4 From nobody Thu May 16 19:23:29 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1559561081; cv=none; d=zoho.com; s=zohoarc; b=bbSc0JKuJYVsKTTOZ+MJ5jzJhES4fP/LbBml8pUA5IJBigAUayIf/fQHZip0SvZ+tSZ7M2YgT1nwgo9WBb7mZvwyw1AzKUatNfuMxW+XzsXgS7VQYd0Aas4Tgls4FJfV0XOJKA81IZqsjwIdyEb8UHTUPisN3K938mXnTuGcQEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559561081; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=wKk4MkZEiqmjbxrTAJm3EjFV6ax6gezga2apFHllJ+E=; b=omKBjjkaaxklGt/3cUp8e9ePPWk1tC8s/agg7Vv9zvvVYiYjcQ5+DfTg/ou5Wml4f4hAj+Zu1Wd5Q+7+zAV8xVdpMaSSubE1xqQYXjsAn4T1mJjNINP4Rgb5xrlNexy7hMAsHLAZbJQ1G/SHymcTJG8ufHAG4cqUJ/wh4O4fHTg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559561081155877.1147568798286; Mon, 3 Jun 2019 04:24:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:33299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXl4E-0003fb-1N for importer@patchew.org; Mon, 03 Jun 2019 07:23:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXl2b-0002jQ-Kf for qemu-devel@nongnu.org; Mon, 03 Jun 2019 07:22:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXl2A-0000nX-D9 for qemu-devel@nongnu.org; Mon, 03 Jun 2019 07:21:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hXl2A-0000lk-5o for qemu-devel@nongnu.org; Mon, 03 Jun 2019 07:21:46 -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 6F2C3309266D; Mon, 3 Jun 2019 11:21:40 +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 815BD67262; Mon, 3 Jun 2019 11:21:38 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 3 Jun 2019 13:22:09 +0200 Message-Id: <1559560929-260254-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1559560929-260254-1-git-send-email-imammedo@redhat.com> References: <1559560929-260254-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.43]); Mon, 03 Jun 2019 11:21:45 +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 v6 2/2] tests: acpi: add simple arm/virt testcase 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 , Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , =?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" adds simple arm/virt test case that starts guest with bios-tables-test.aarch64.iso.qcow2 boot image which initializes UefiTestSupport* structure in RAM once guest is booted. * see commit: tests: acpi: add acpi_find_rsdp_address_uefi() helper Signed-off-by: Igor Mammedov Reviewed-by: Laszlo Ersek --- v6: * Since aarch64 TCG is broken on 32 bit arm host, blacklist it till it's fixed * add aarch64 to rebuild script list v4: * force test to use TCG accelerator v3: * use firmware blobs directly from pc-bios directory * use bios-tables-test.aarch64.iso.qcow2 as test boot image * drop leftover qtest-uefi-images-aarch64 iMakefile rule from previos version (Laszlo) * add Makefile rule to include bios-tables-test into check-qtest-aarch64 target v2: * specify in test_data where board's RAM starts and RAM size tests/Makefile.include | 4 ++++ tests/bios-tables-test.c | 18 ++++++++++++++++++ tests/data/acpi/rebuild-expected-aml.sh | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 1865f6b..2334969 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -267,6 +267,10 @@ check-qtest-arm-y +=3D tests/hexloader-test$(EXESUF) check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) check-qtest-aarch64-y +=3D tests/migration-test$(EXESUF) +# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make test unconditio= nal +ifneq ($(ARCH),arm) +check-qtest-aarch64-y +=3D tests/bios-tables-test$(EXESUF) +endif =20 check-qtest-microblazeel-y +=3D $(check-qtest-microblaze-y) =20 diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 28d7d42..1242d63 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -830,6 +830,22 @@ static void test_acpi_piix4_tcg_dimm_pxm(void) test_acpi_tcg_dimm_pxm(MACHINE_PC); } =20 +static void test_acpi_virt_tcg(void) +{ + test_data data =3D { + .machine =3D "virt", + .accel =3D "tcg", + .uefi_fl1 =3D "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 =3D "pc-bios/edk2-arm-vars.fd", + .cd =3D "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.= qcow2", + .ram_start =3D 0x40000000ULL, + .scan_len =3D 128ULL * 1024 * 1024, + }; + + test_acpi_one("-cpu cortex-a57", &data); + free_test_data(&data); +} + int main(int argc, char *argv[]) { const char *arch =3D qtest_get_arch(); @@ -858,6 +874,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); + } else if (strcmp(arch, "aarch64") =3D=3D 0) { + qtest_add_func("acpi/virt", test_acpi_virt_tcg); } ret =3D g_test_run(); boot_sector_cleanup(disk); diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebu= ild-expected-aml.sh index ff7e622..d285321 100755 --- a/tests/data/acpi/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -12,7 +12,7 @@ # This work is licensed under the terms of the GNU GPLv2. # See the COPYING.LIB file in the top-level directory. =20 -qemu_bins=3D"x86_64-softmmu/qemu-system-x86_64" +qemu_bins=3D"x86_64-softmmu/qemu-system-x86_64 aarch64-softmmu/qemu-system= -aarch64" =20 if [ ! -e "tests/bios-tables-test" ]; then echo "Test: bios-tables-test is required! Run make check before this s= cript." --=20 2.7.4