From patchwork Wed Sep 4 08:56:29 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: 172906 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp968200ily; Wed, 4 Sep 2019 02:12:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5scSx4g1D2RCtBdVxxg+pjk4ItoqZ/RkzrbPB5YQC1R5oyDpeL6HhAxlcPnPGx/DUh2m7 X-Received: by 2002:a17:906:1385:: with SMTP id f5mr6963212ejc.145.1567588335852; Wed, 04 Sep 2019 02:12:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567588335; cv=none; d=google.com; s=arc-20160816; b=MtTP9Kx90HyORIPyYIziQvOjXDdj53VHaEoKw/DipfchGLfqGF5JGdTh7PLoJ+0ky8 YJuXZofMpt0DpFQSiXVr6HOn7GHkXr+4p/0iABG+E8zHh8mS90CJRKPdpZ7dZ/SRkPJ9 M0SC2/dbRJ8WLLywAezy5VYIzCMSj9AQPu/PGcmEC1oYS8u2G7hQKKbjL8J0H0pC5INs LGOeBE3bfJV6cejvzXyRVe1p/iMcXEfPEr8Ow20p1Usk2cCFgL3xeh4bfIxLP2d4hhRZ guqx5gCgGH9Fs1kE0ZUIUIY/wQtXfyne5cvYh4JMYT0PG3eMyBOaLbvx+UEfFwcabFkl zhjA== 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=KZvzE56hZxv4wwz1yDmKwDbcqhj6DAbXrzcNTyXr4jsTtJAQ3fV/Y6UDUaSDgMES33 QQ9G3+qcVIBfDkjSdipInEZPSEMo4/uz0YWZZKsxxxWalcYX8oc455wcx/kGjnnopXXZ RmSa89lSn0v64YY9cUM59/07DhPBzlFl2nDMR8qOKOS/UQcAAu8WFb58tkz+uDJtlw81 tUk7SKY+gD6CQLfbsM+eog+1HQg1+/sbCMJRunkNcdxmPvfPQUnbIc5WzDyATfAsx1Vp aB0ydGyeAt+tvkAoH8Qxi0v9ZHqbekTCvC/bXPubCGc3VsNwZwEFDPQGzXRYWZLfeTfI rjCA== 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 f9si2344019ejx.375.2019.09.04.02.12.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 02:12:15 -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]:54852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5RKo-0003zA-5t for patch@linaro.org; Wed, 04 Sep 2019 05:12:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38771) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5R9Q-0001pX-Iv for qemu-devel@nongnu.org; Wed, 04 Sep 2019 05:00:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5R9P-0008OR-Bb for qemu-devel@nongnu.org; Wed, 04 Sep 2019 05:00:28 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:35262 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i5R7I-0007KQ-Sb; Wed, 04 Sep 2019 05:00:17 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 3C46460C48E5AA9265DA; Wed, 4 Sep 2019 16:58:14 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Wed, 4 Sep 2019 16:58:03 +0800 From: Shameer Kolothum To: , , , Date: Wed, 4 Sep 2019 09:56:29 +0100 Message-ID: <20190904085629.13872-12-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190904085629.13872-1-shameerali.kolothum.thodi@huawei.com> References: <20190904085629.13872-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] 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.35 Subject: [Qemu-devel] [PATCH-for-4.2 v10 11/11] 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 Reviewed-by: Igor Mammedov 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);