From nobody Thu Apr 25 05:44:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1663856922; cv=none; d=zohomail.com; s=zohoarc; b=I32VdHkqMeR/3tmRGCxlQjwbeOU6c2nLKf6HXE8WZySAyTRtRFjz+JVhmTYRblQTWEOeS1l+4AXUER0kt4xyLRlsk9ytiaRnJQoWLEJjIf2A2Lbs8QdldS6T6cvJNszDLi3YPWNAS4ZTl3cgcV7Se0074Tjd8o+2kB12ds94Lz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663856922; 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:Reply-To:References:Sender:Subject:To; bh=lhzaYD+IM8cTxuo0CePIjSlBXmg6HSCt+fZjnLMK6FQ=; b=VCbia1aWSc8UJSYbpNVDiByqlmC1fEpDNXfo2khH/ySCgc1zYD8gdsffHqpm+5fqJBTiKFcm2d9ZEDJB+P8SlS/Ju8MzK5B770IQZzRza0o2o1mckZYrxywYx0+gG1eSyKG6ZXcRYz/aDFONlPZZUR4/kxozcs33KT0Nht8gxOc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663856922237362.08738433698795; Thu, 22 Sep 2022 07:28:42 -0700 (PDT) Received: from localhost ([::1]:56738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obNBx-0002Ws-Es for importer@patchew.org; Thu, 22 Sep 2022 10:28:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM26-0005Te-8n for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:26 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:3878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM23-0001Fy-Kx for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:26 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4MYFxg5F96z14S3x; Thu, 22 Sep 2022 21:09:59 +0800 (CST) Received: from localhost.localdomain (10.67.164.66) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 21:14:07 +0800 To: , , , , , , , CC: , , , , , , Subject: [PATCH 1/4] hw/acpi/aml-build: Only generate cluster node in PPTT when specified Date: Thu, 22 Sep 2022 21:11:40 +0800 Message-ID: <20220922131143.58003-2-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20220922131143.58003-1-yangyicong@huawei.com> References: <20220922131143.58003-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=45.249.212.255; envelope-from=yangyicong@huawei.com; helo=szxga08-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via X-ZM-MESSAGEID: 1663856924758100003 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Currently we'll always generate a cluster node no matter user has specified '-smp clusters=3DX' or not. Cluster is an optional level and it's unncessary to build it if user don't need. So only generate it when user specify explicitly. Also update the test ACPI tables. Signed-off-by: Yicong Yang --- hw/acpi/aml-build.c | 2 +- hw/core/machine-smp.c | 3 +++ include/hw/boards.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index e6bfac95c7..aab73af66d 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -2030,7 +2030,7 @@ void build_pptt(GArray *table_data, BIOSLinker *linke= r, MachineState *ms, 0, socket_id, NULL, 0); } =20 - if (mc->smp_props.clusters_supported) { + if (mc->smp_props.clusters_supported && ms->smp.build_cluster) { if (cpus->cpus[n].props.cluster_id !=3D cluster_id) { assert(cpus->cpus[n].props.cluster_id > cluster_id); cluster_id =3D cpus->cpus[n].props.cluster_id; diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c index b39ed21e65..5d37e8d07a 100644 --- a/hw/core/machine-smp.c +++ b/hw/core/machine-smp.c @@ -158,6 +158,9 @@ void machine_parse_smp_config(MachineState *ms, ms->smp.threads =3D threads; ms->smp.max_cpus =3D maxcpus; =20 + if (config->has_clusters) + ms->smp.build_cluster =3D true; + /* sanity-check of the computed topology */ if (sockets * dies * clusters * cores * threads !=3D maxcpus) { g_autofree char *topo_msg =3D cpu_hierarchy_to_string(ms); diff --git a/include/hw/boards.h b/include/hw/boards.h index 7b416c9787..24aafc213d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -305,6 +305,7 @@ typedef struct DeviceMemoryState { * @cores: the number of cores in one cluster * @threads: the number of threads in one core * @max_cpus: the maximum number of logical processors on the machine + * @build_cluster: build cluster topology or not */ typedef struct CpuTopology { unsigned int cpus; @@ -314,6 +315,7 @@ typedef struct CpuTopology { unsigned int cores; unsigned int threads; unsigned int max_cpus; + bool build_cluster; } CpuTopology; =20 /** --=20 2.24.0 From nobody Thu Apr 25 05:44:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1663854314; cv=none; d=zohomail.com; s=zohoarc; b=j7tfm5Rx3oH5i6W2eo0drzs4w7PevWcyI+wYC8xhpr3aF9dD88nmDNQiFoPHch6S4iYhDP2pmk9AcftYYN+7XUwQmB164ZNTeRxH+m/m5dSwcN0RTNtopi6BqNfJEHbDkJoHOAFdKDXArSL4O259HFotvNKyeiT+VHEKMj/JaAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663854314; 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:Reply-To:References:Sender:Subject:To; bh=nAMsiV9ImJ1a9pj2o1eC6OvjGy4abcDC9oeU1M5BzfA=; b=mZbi7jPZAb5+CH3qshjmmz5zYGrmeZkuDD/Jj06xmSe9ZRieNUByUbHaV42pbPXcYjUZ7pM5n2BX+SjIFFo/Rr3zZlq8A03x5362xrFJj11tEZeV8Adqi5UjY7L6o7le1wgZA/Ix0q1bliZfB6+kGhw7zF2TTDlh5g4fgSWJ5XY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663854314232650.9148847991581; Thu, 22 Sep 2022 06:45:14 -0700 (PDT) Received: from localhost ([::1]:48294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obMVs-0007eY-DW for importer@patchew.org; Thu, 22 Sep 2022 09:45:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM2L-0005k0-9G for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:41 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:5174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM23-0001Ft-N8 for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:41 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MYFzx3HClzHpmX; Thu, 22 Sep 2022 21:11:57 +0800 (CST) Received: from localhost.localdomain (10.67.164.66) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 21:14:07 +0800 To: , , , , , , , CC: , , , , , , Subject: [PATCH 2/4] tests: virt: update expected ACPI tables for virt test Date: Thu, 22 Sep 2022 21:11:41 +0800 Message-ID: <20220922131143.58003-3-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20220922131143.58003-1-yangyicong@huawei.com> References: <20220922131143.58003-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=45.249.212.189; envelope-from=yangyicong@huawei.com; helo=szxga03-in.huawei.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via X-ZM-MESSAGEID: 1663854315706100001 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Update the ACPI tables according to the acpi aml_build change. Signed-off-by: Yicong Yang --- tests/data/acpi/virt/APIC.pxb | Bin 0 -> 168 bytes tests/data/acpi/virt/DBG2.memhp | Bin 0 -> 87 bytes tests/data/acpi/virt/DBG2.numamem | Bin 0 -> 87 bytes tests/data/acpi/virt/DBG2.pxb | Bin 0 -> 87 bytes tests/data/acpi/virt/FACP.pxb | Bin 0 -> 268 bytes tests/data/acpi/virt/GTDT.pxb | Bin 0 -> 96 bytes tests/data/acpi/virt/MCFG.pxb | Bin 0 -> 60 bytes tests/data/acpi/virt/PPTT | Bin 96 -> 76 bytes tests/data/acpi/virt/PPTT.memhp | Bin 0 -> 76 bytes tests/data/acpi/virt/PPTT.numamem | Bin 0 -> 76 bytes tests/data/acpi/virt/PPTT.pxb | Bin 0 -> 76 bytes tests/data/acpi/virt/SPCR.pxb | Bin 0 -> 80 bytes 12 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/acpi/virt/APIC.pxb create mode 100644 tests/data/acpi/virt/DBG2.memhp create mode 100644 tests/data/acpi/virt/DBG2.numamem create mode 100644 tests/data/acpi/virt/DBG2.pxb create mode 100644 tests/data/acpi/virt/FACP.pxb create mode 100644 tests/data/acpi/virt/GTDT.pxb create mode 100644 tests/data/acpi/virt/MCFG.pxb create mode 100644 tests/data/acpi/virt/PPTT.memhp create mode 100644 tests/data/acpi/virt/PPTT.numamem create mode 100644 tests/data/acpi/virt/PPTT.pxb create mode 100644 tests/data/acpi/virt/SPCR.pxb diff --git a/tests/data/acpi/virt/APIC.pxb b/tests/data/acpi/virt/APIC.pxb new file mode 100644 index 0000000000000000000000000000000000000000..023f15f12e74fb9a3a6d3d9dc99= 4541016947d6a GIT binary patch literal 168 zcmZ<^@N{0mz`(#9;N9ayJTR0D|*Q{>~o33QiFL&I&-l2owUbL9`AKgJ=3DeA21Zr}H4uw|p@A7lh%qQJ TFmQk+Il-a=3D3=3DGcxz6J~c3~mVl literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/DBG2.numamem b/tests/data/acpi/virt/DBG2.= numamem new file mode 100644 index 0000000000000000000000000000000000000000..86e6314f7b0235ef8ed3e0221e0= 9f996c41f5e98 GIT binary patch literal 87 zcmZ>9ayJTR0D|*Q{>~o33QiFL&I&-l2owUbL9`AKgJ=3DeA21Zr}H4uw|p@A7lh%qQJ TFmQk+Il-a=3D3=3DGcxz6J~c3~mVl literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/DBG2.pxb b/tests/data/acpi/virt/DBG2.pxb new file mode 100644 index 0000000000000000000000000000000000000000..86e6314f7b0235ef8ed3e0221e0= 9f996c41f5e98 GIT binary patch literal 87 zcmZ>9ayJTR0D|*Q{>~o33QiFL&I&-l2owUbL9`AKgJ=3DeA21Zr}H4uw|p@A7lh%qQJ TFmQk+Il-a=3D3=3DGcxz6J~c3~mVl literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/FACP.pxb b/tests/data/acpi/virt/FACP.pxb new file mode 100644 index 0000000000000000000000000000000000000000..1f764220f8533c427168e80ccf2= 98604826a00b4 GIT binary patch literal 268 ycmZ>BbPnKQWME(ob@F%i2v%^42yj*a0-z8Bhz+8t3j|P&V`iYf6{t24%>w}Cy9NOO literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/GTDT.pxb b/tests/data/acpi/virt/GTDT.pxb new file mode 100644 index 0000000000000000000000000000000000000000..9408b71b59c0e0f2991c0053562= 280155b47bc0b GIT binary patch literal 96 zcmZ<{aS2IaU|?YCaq@Te2v%^42yj*a0!E-1hz+8Vfh?3G2c%hmSQ^Tgg3{;|04K!< A0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/MCFG.pxb b/tests/data/acpi/virt/MCFG.pxb new file mode 100644 index 0000000000000000000000000000000000000000..f4ae3203a4e9258a397c9912332= 178640209637b GIT binary patch literal 60 scmeZuc5}C3U|?W; B2LS*8 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/PPTT.numamem b/tests/data/acpi/virt/PPTT.= numamem new file mode 100644 index 0000000000000000000000000000000000000000..7a1258ecf123555b24462c98ccb= b76b4ac1d0c2b GIT binary patch literal 76 zcmWFt2nq3FU|?Wc;pFe^5v<@85#X!<1dKp25F11@h%hjKX%HI*fMQ%gwhD|7qyeJ> B2LS*8 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/PPTT.pxb b/tests/data/acpi/virt/PPTT.pxb new file mode 100644 index 0000000000000000000000000000000000000000..7a1258ecf123555b24462c98ccb= b76b4ac1d0c2b GIT binary patch literal 76 zcmWFt2nq3FU|?Wc;pFe^5v<@85#X!<1dKp25F11@h%hjKX%HI*fMQ%gwhD|7qyeJ> B2LS*8 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/SPCR.pxb b/tests/data/acpi/virt/SPCR.pxb new file mode 100644 index 0000000000000000000000000000000000000000..24e0a579e7d73f432a614380e29= aa95113344186 GIT binary patch literal 80 zcmWFza1IJ!U|?W6?d0$55v<@85#X!<1dKp25F11@12F>!1Bl59VJZSCW(Gzk28RDY I01|@%0RBM>0RR91 literal 0 HcmV?d00001 --=20 2.24.0 From nobody Thu Apr 25 05:44:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1663853784; cv=none; d=zohomail.com; s=zohoarc; b=P8ZD96JpgZ994mtYpCAb0bUmVXlpd8WVj9dvG5rp3nDZBGiBk1ZvE/LAUq8TB3Ye+tLkFvDIXllsh40JAVpKaRkapJJ8278BPJ30m/dGQHkNmmCMFaxduUgRq4KzaVQXTABooeWjDe0BtM5LKrkeBnrYOVltWHjHxCMkNdDD9E8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663853784; 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:Reply-To:References:Sender:Subject:To; bh=pqSu/uAmIwMb1eb9+XQYtNzYB03T5arSDoojYOJI4Qw=; b=JYTOtaASf9chNnj2HlPLRRXDRK8588G9qHvkXEJJHptI6ymtDV8W6btHlC34mOnMhw44DYAZUWTnS2JdxgGEzux1auhfmkYIo1S90CJp1kSi9mUbZJrtoHxU6ywVdsoGyyd8gn1hKIpZvpDOTmFnUShHqnwY4qO4D7SR/IXLKK8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663853784107358.7791328730882; Thu, 22 Sep 2022 06:36:24 -0700 (PDT) Received: from localhost ([::1]:54968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obMNK-0003ch-Oz for importer@patchew.org; Thu, 22 Sep 2022 09:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM26-0005TY-0g for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:26 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:4524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM21-0001Fz-LB for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:25 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MYFxg58lNzlXP4; Thu, 22 Sep 2022 21:09:59 +0800 (CST) Received: from localhost.localdomain (10.67.164.66) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 21:14:08 +0800 To: , , , , , , , CC: , , , , , , Subject: [PATCH 3/4] tests: acpi: aarch64: add topology test for aarch64 Date: Thu, 22 Sep 2022 21:11:42 +0800 Message-ID: <20220922131143.58003-4-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20220922131143.58003-1-yangyicong@huawei.com> References: <20220922131143.58003-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=45.249.212.187; envelope-from=yangyicong@huawei.com; helo=szxga01-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via X-ZM-MESSAGEID: 1663853785488100001 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Add test for aarch64's ACPI topology building for all the supported levels. Signed-off-by: Yicong Yang --- tests/qtest/bios-tables-test.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 7c5f736b51..8579b43491 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1531,6 +1531,27 @@ static void test_acpi_virt_tcg(void) free_test_data(&data); } =20 +static void test_acpi_virt_tcg_topology(void) +{ + test_data data =3D { + .machine =3D "virt", + .variant =3D ".topology", + .tcg_only =3D true, + .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, + }; + + data.smbios_cpu_max_speed =3D 2900; + data.smbios_cpu_curr_speed =3D 2700; + test_acpi_one("-cpu cortex-a57 " + "-smbios type=3D4,max-speed=3D2900,current-speed=3D2700 " + "-smp sockets=3D1,clusters=3D2,cores=3D2,threads=3D2", &= data); + free_test_data(&data); +} + static void test_acpi_q35_viot(void) { test_data data =3D { @@ -1831,6 +1852,7 @@ int main(int argc, char *argv[]) } else if (strcmp(arch, "aarch64") =3D=3D 0) { if (has_tcg) { qtest_add_func("acpi/virt", test_acpi_virt_tcg); + qtest_add_func("acpi/virt/topology", test_acpi_virt_tcg_topolo= gy); qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem= ); qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); --=20 2.24.0 From nobody Thu Apr 25 05:44:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1663854038; cv=none; d=zohomail.com; s=zohoarc; b=Vi8jnuG7HM+reygwY57U24GM5yEhK4PMGfZZaYUAdw9pG/mKYBVUdhXJ35v0iD+xVpgMm94T+3vKoSZhHft56RCRa7oUJheSjJYr2K7lX8q3QL4c+rHMWP1jy94bOF1jFJnlSf0/u4aKDrZkc+BUKp0OhPMNL+VROZpTxagkikA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663854038; 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:Reply-To:References:Sender:Subject:To; bh=A/KuZEBQO2ngSh99D8Ze8pWGj3FfMd683ZwjhNgTSFc=; b=L9UUIBwZyvuveK8kskKQtXo+ixHuFW9PZwgf/yOfqhNiRsj74HA+lLglpSa7MrWzfo20pcBRpnsM1Rlp2iUMBsYZ+HmecofIIYeTCugivNgxEH+tyoUkNvPEzVUixtx1nkaY1iW66Ed7Y52Lb9Ma0Ku/lkdREMZrxyMlHDxE/8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663854038256596.3351354077392; Thu, 22 Sep 2022 06:40:38 -0700 (PDT) Received: from localhost ([::1]:36988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obMRO-0001LB-E0 for importer@patchew.org; Thu, 22 Sep 2022 09:40:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM27-0005Xf-T6 for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:27 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:6091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obM23-0001Fw-Mg for qemu-devel@nongnu.org; Thu, 22 Sep 2022 09:14:27 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MYFx16mx7zMp9Y; Thu, 22 Sep 2022 21:09:25 +0800 (CST) Received: from localhost.localdomain (10.67.164.66) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 21:14:08 +0800 To: , , , , , , , CC: , , , , , , Subject: [PATCH 4/4] tests: acpi: aarch64: add *.topology tables Date: Thu, 22 Sep 2022 21:11:43 +0800 Message-ID: <20220922131143.58003-5-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20220922131143.58003-1-yangyicong@huawei.com> References: <20220922131143.58003-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=45.249.212.188; envelope-from=yangyicong@huawei.com; helo=szxga02-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via X-ZM-MESSAGEID: 1663854039061100001 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Add *.topology tables for the aarch64's topology test. Signed-off-by: Yicong Yang --- tests/data/acpi/virt/APIC.topology | Bin 0 -> 700 bytes tests/data/acpi/virt/DBG2.topology | Bin 0 -> 87 bytes tests/data/acpi/virt/DSDT.topology | Bin 0 -> 5398 bytes tests/data/acpi/virt/FACP.topology | Bin 0 -> 268 bytes tests/data/acpi/virt/GTDT.topology | Bin 0 -> 96 bytes tests/data/acpi/virt/IORT.topology | Bin 0 -> 128 bytes tests/data/acpi/virt/MCFG.topology | Bin 0 -> 60 bytes tests/data/acpi/virt/PPTT.topology | Bin 0 -> 336 bytes tests/data/acpi/virt/SPCR.topology | Bin 0 -> 80 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/acpi/virt/APIC.topology create mode 100644 tests/data/acpi/virt/DBG2.topology create mode 100644 tests/data/acpi/virt/DSDT.topology create mode 100644 tests/data/acpi/virt/FACP.topology create mode 100644 tests/data/acpi/virt/GTDT.topology create mode 100644 tests/data/acpi/virt/IORT.topology create mode 100644 tests/data/acpi/virt/MCFG.topology create mode 100644 tests/data/acpi/virt/PPTT.topology create mode 100644 tests/data/acpi/virt/SPCR.topology diff --git a/tests/data/acpi/virt/APIC.topology b/tests/data/acpi/virt/APIC= .topology new file mode 100644 index 0000000000000000000000000000000000000000..558a1856981531b0e18e6d4aa12= 569cd80aa0015 GIT binary patch literal 700 zcmbV~OA5k35JW4P_<@+UE_0Na*(d}Y$i~BZHNk$8j<`%06xH*o$1LVr?)g9ayJTR0D|*Q{>~o33QiFL&I&-l2owUbL9`AKgJ=3DeA21Zr}H4uw|p@A7lh%qQJ TFmQk+Il-a=3D3=3DGcxz6J~c3~mVl literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/DSDT.topology b/tests/data/acpi/virt/DSDT= .topology new file mode 100644 index 0000000000000000000000000000000000000000..501314c91be01d927fd125e0c72= e919fdd85592e GIT binary patch literal 5398 zcmZvg%WoT16o>EFlh__VVmr?J;S@^6vl`n?la>}@kDbINPK+mQkX*@?5QvgZB`Ty+ zA*ERq=3D#EBW9i&M78%V6!v17rS4gUZ;%(-)ClHYO9NEy$Wd(SuX%^YWrr|CEMr>B&P zoiz5mZGWZlN!MGU#ZpS?ZT*>lwrAZR_>DpTc;0heH#yjDH?wuG+ooVmB?ougO=3DZR^ z(wNmhUZA|HH0H$2U`-s1o55@1plt?M#lbN%cwHPEH-l^9V4{C~)7$Grmc7ol>sBhE zWpd#4{KC95^E{>WrAev0Qa_9<%eq9-6S@lPn+M*e0e{@;+@&j2rCfi%?xZQ%t6K(9 zaB>C_OU;Ivb^Bf~y0|;Ly*)}@y*TW7=3DEcDs6$=3DmUA|kv89H9^U3L>U15S0+o&}R|e zDvoes62k^Y6&c|j9bv>J#yBu)$Ov!z2*Z{bNnl(zR@(?8Au)2mSVP9TDXbAjQexzRv5t%zA|oX+iom!5j7s?B7 |Vw8Y!6B%Ne z@-InL>eIk@9~p9;W~B3&1;#C8$aR{P81ulmjSRU?a}r|_7#|=3D*uG0yLu?&n4ks;S< zUSg~OV*?p-ofagz}P{CT&GJC<0ddVz^KV}x-2nn0b>^#a-EhX#s|RI3mLn=3D zbiH z3nQIH6LV%P$fK!Is56Nl%%v{L%nc)*8BL`YNFR}=3D2ALG<%;+fbATv6HxYC)?)VRr{ zsX-=3D%I+M;QIEo!)MrU9LnbA~gnL^7TlS1?yW1eF{X5=3D|$GNY5H5Ix74CpD#XKG9Ta zvCxx3^h_|%1oKRAPYTg9$vl(HlUg$Lq!2w*%#+$_bM=3DBtlH#5eqNl?=3D9p*_b9C}iS zo@wTpW}a#8Ng;Y>m}iE0Qp<;)6ryLAd1jesmU~i&o;l{3W1iF^q9=3DvuIl(+9nCArd zq!2yn=3DZvZGpo;U%lUhpjq!2v|%(K8e3*3`J^ei&ZBJ-pc6g??K&q?Mv$vh{yCxz%) zVxA@DNi8dSQiz`PW0|f{^dDl1c}{Up3ej_#c}_D=3DYH`t%LiC(ro-@pIhI>+op7i4q z?&mD?q?Q;xDMZgX<~hea=3DeQ?@=3DsC|k=3Db0z9(CA4adM+@}1?IWHJt;)bMdrE4JgMbI zPYTgLGEjoHqh@NHUS!SMP?n$BX>>syneJjn+H~mod+|Ba` zahG08=3D+n|-V-3|vVb!C&QW*tS%nQQL+SSg z$a+IynSGoUHoBZe?+uW3MPQkIA*+-hc#XO`qyM2Qzd-$9U!Fws%AgYI@7Sl8%-Q_0_WR%d>NlMqXa4ET{pNK}Qzu`lvqIdm^om||b?jctXVs`* zbm^L_IqoahC%6Z6b;=3DtTmqu^V^Txb4Yb5Sp)$bU$TFrqear1()q8m?o!I-6ikZ@GArKLgZ-hS$l4j!E5Po6$-bien!d(dk*NB!eD My@B5+&m2qr5A>`*Jpcdz literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/FACP.topology b/tests/data/acpi/virt/FACP= .topology new file mode 100644 index 0000000000000000000000000000000000000000..1f764220f8533c427168e80ccf2= 98604826a00b4 GIT binary patch literal 268 ycmZ>BbPnKQWME(ob@F%i2v%^42yj*a0-z8Bhz+8t3j|P&V`iYf6{t24%>w}Cy9NOO literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/GTDT.topology b/tests/data/acpi/virt/GTDT= .topology new file mode 100644 index 0000000000000000000000000000000000000000..9408b71b59c0e0f2991c0053562= 280155b47bc0b GIT binary patch literal 96 zcmZ<{aS2IaU|?YCaq@Te2v%^42yj*a0!E-1hz+8Vfh?3G2c%hmSQ^Tgg3{;|04K!< A0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/IORT.topology b/tests/data/acpi/virt/IORT= .topology new file mode 100644 index 0000000000000000000000000000000000000000..7efd0ce8a6b3928efa7e1373f68= 8ab4c5f50543b GIT binary patch literal 128 zcmebD4+?2uU|?Y0?Bwt45v<@85#X!<1dKp25F11@0kHuPgMkDCNC*yK93~3}W)K^M VRiHGGVg_O`aDdYP|3ers^8jQz3IPBB literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/MCFG.topology b/tests/data/acpi/virt/MCFG= .topology new file mode 100644 index 0000000000000000000000000000000000000000..f4ae3203a4e9258a397c9912332= 178640209637b GIT binary patch literal 60 scmeZuc5}C3U|?W;L&rG>8oYKrs+dflv?45YUMh?!vef$Csl%t&G&Cde(wdO>1GKm-gx_1*yTS+Iz)B8h>R aAic=3Duf$S9l3b27BK>%tVNQ@mK!T!1Bl59VJZSCW(Gzk28RDY I01|@%0RBM>0RR91 literal 0 HcmV?d00001 --=20 2.24.0