From patchwork Tue Aug 13 21:05:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 171218 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1400451ily; Tue, 13 Aug 2019 14:12:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqyo+MPJIxjH4Jmgq7yTdnmC7P4xzvGdEWKHxJDF2Y5TgryUTrsrPgKdLF7+eMGD7UolQRep X-Received: by 2002:a05:6214:1447:: with SMTP id b7mr202104qvy.89.1565730760958; Tue, 13 Aug 2019 14:12:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565730760; cv=none; d=google.com; s=arc-20160816; b=cGtp64Ltx1sq9xHo5Pug5PF0EEY+0KyZdX/4OQOmvfWmSx4wsFP2kCuaUUYcGHyIlO SvBZnA8w/v/C6cEnyK2GJZXDnpA9yQJoJwARurhIkOwvO6JsLv9eCbrUti0M65RJIlkm /94H9SlPVD6MUZIsOuTu6Nh2LaunsDqvPbIuUuHH7PURJPzbYWAwCDsOgXH0C4LCnPsp YJTf4R/MWum1+WwluQe0wiFT0GHfnc8gaVv7i/8e/vVD04sNbEKIVFrXknVzUbhChJGz Tllka0tVYZYi5dxxi16RU+NAtMN8RCpkT0SvGlWTwzOZcqzhqDJpWVIitABbM0YdNxy2 chiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:mime-version:references :in-reply-to:message-id:date:to:from; bh=uftxv5ZWfB4oXgjJMG+CxRkuwojbJUaZfZoxhvhXDsw=; b=UMABjAJK7I5NgPPGISB65IrBdFUaDDfNBSblXpDOc70C9rbM3PyFzpE/bgt1t8v6xU CkvGKTAUVY8qlA+l6Ec4xTLWiAMhVn8dMw+4SUZMIziyUDTvd4T2nvN3SU8TfGz8KAgM I3EpV6lKoHzfDVnFZtE/VOtqpm+dpWPiE4tF94wSJYIW0zcgfCqHmTOl0JHDc/yTelvK gBM/KosZDdgBS3PNK5I6MzuFYs9vl3z3J9AAo9EwNAEPObnokSe+2/cZJhUiVCgdmWWV FIyeK/4wVZYIEClT3WS/afGhH+OH/p4Nl0NfODK6UzxlsUm08XXC/kMstufPPuP9Ptk1 ACFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f33si8891925qvd.65.2019.08.13.14.12.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Aug 2019 14:12:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:55526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxe5w-00043g-Ey for patch@linaro.org; Tue, 13 Aug 2019 17:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42107) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxe1X-0005Ia-Dc for qemu-devel@nongnu.org; Tue, 13 Aug 2019 17:08:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxe1V-0001oO-Db for qemu-devel@nongnu.org; Tue, 13 Aug 2019 17:08:06 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2253 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxe1P-0001dE-37; Tue, 13 Aug 2019 17:08:00 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 0E3FEE996CB23ADEC89A; Wed, 14 Aug 2019 05:07:57 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.47.94.0) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Wed, 14 Aug 2019 05:07:47 +0800 From: Shameer Kolothum To: , , , Date: Tue, 13 Aug 2019 22:05:39 +0100 Message-ID: <20190813210539.31164-13-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190813210539.31164-1-shameerali.kolothum.thodi@huawei.com> References: <20190813210539.31164-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.94.0] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.191 Subject: [Qemu-devel] [PATCH-for-4.2 v9 12/12] tests: Add bios tests to arm/virt X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, sameo@linux.intel.com, ard.biesheuvel@linaro.org, linuxarm@huawei.com, xuwei5@hisilicon.com, shannon.zhaosl@gmail.com, sebastien.boeuf@intel.com, lersek@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds numamem and memhp tests for arm/virt platform Signed-off-by: Shameer Kolothum --- tests/bios-tables-test-allowed-diff.h | 1 + tests/bios-tables-test.c | 49 +++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) -- 2.17.1 diff --git a/tests/bios-tables-test-allowed-diff.h b/tests/bios-tables-test-allowed-diff.h index 7b4adbc822..d181a4da4a 100644 --- a/tests/bios-tables-test-allowed-diff.h +++ b/tests/bios-tables-test-allowed-diff.h @@ -1,2 +1,3 @@ /* List of comma-separated changed AML files to ignore */ "tests/data/acpi/virt/DSDT", +"tests/data/acpi/virt/SRAT", diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index a356ac3489..1d6f330d53 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -871,6 +871,53 @@ static void test_acpi_piix4_tcg_dimm_pxm(void) test_acpi_tcg_dimm_pxm(MACHINE_PC); } +static void test_acpi_virt_tcg_memhp(void) +{ + test_data data = { + .machine = "virt", + .accel = "tcg", + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", + .ram_start = 0x40000000ULL, + .scan_len = 256ULL * 1024 * 1024, + }; + + data.variant = ".memhp"; + test_acpi_one(" -cpu cortex-a57" + " -m 256M,slots=3,maxmem=1G" + " -object memory-backend-ram,id=ram0,size=128M" + " -object memory-backend-ram,id=ram1,size=128M" + " -numa node,memdev=ram0 -numa node,memdev=ram1" + " -numa dist,src=0,dst=1,val=21", + &data); + + free_test_data(&data); + +} + +static void test_acpi_virt_tcg_numamem(void) +{ + test_data data = { + .machine = "virt", + .accel = "tcg", + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", + .ram_start = 0x40000000ULL, + .scan_len = 128ULL * 1024 * 1024, + }; + + data.variant = ".numamem"; + test_acpi_one(" -cpu cortex-a57" + " -object memory-backend-ram,id=ram0,size=128M" + " -numa node,memdev=ram0", + &data); + + free_test_data(&data); + +} + static void test_acpi_virt_tcg(void) { test_data data = { @@ -917,6 +964,8 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); } else if (strcmp(arch, "aarch64") == 0) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); + qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); + qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); } ret = g_test_run(); boot_sector_cleanup(disk);