From nobody Mon Feb 9 11:57:01 2026 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=1667207271; cv=none; d=zohomail.com; s=zohoarc; b=XHxb0i0aalcnN1zNeFwWLOwoOfzrcndggzFYToTkEEOeJ2wRs6OH5vZ0qe5+Qow7qFlk2EuCITZSHK60cePM0YCEQrwvYjlkcX2X+eQk16ZZ9nzv3gYCK43FUiQllbWTQhFQxBHCLe3XjmJPKi2RnBwV3nSgSs+9BiAusw969JA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667207271; 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=6zyNlgqaYKzh5ZQah6e5PihwtU5HttpT2Jq06SJpO0A=; b=Dn938QtU2zqEEthpQO9PbQttbWRogjAdgq1/HAKO8ALBkkfbUpDYKPNi+UNmjtJcIbRkodJghIQH/HcfZneN/x8irSroyKRQTljXcuM5I9DsNAjP2TLWzqjQMOE6DmxPqAg3u1Q3kUI7RJqtOdf9mzSJmslo2rwCLWufnybC+Bk= 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 1667207271026529.2149939959345; Mon, 31 Oct 2022 02:07:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opQkZ-0008RC-Ob; Mon, 31 Oct 2022 05:06:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkP-0008LT-18 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:21 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkG-0005qf-Nh for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:18 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N16c94pn7zpWDQ; Mon, 31 Oct 2022 17:02:33 +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; Mon, 31 Oct 2022 17:06:04 +0800 To: , , , , , , , , CC: , , , , , , Subject: [PATCH v3 1/5] hw/acpi/aml-build: Only generate cluster node in PPTT when specified Date: Mon, 31 Oct 2022 17:05:19 +0800 Message-ID: <20221031090523.34146-2-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20221031090523.34146-1-yangyicong@huawei.com> References: <20221031090523.34146-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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: , Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1667207272576100006 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 will participant the building of Linux scheduling domains and only appears on a few platforms. It's unncessary to always build it which cannot reflect the real topology on platforms have no cluster and to avoid affecting the linux scheduling domains in the VM. So only generate it when user specified explicitly. Tested qemu-system-aarch64 with `-smp 8` and linux 6.1-rc1, without this patch: estuary:/sys/devices/system/cpu/cpu0/topology$ cat cluster_* ff # cluster_cpus 0-7 # cluster_cpus_list 56 # cluster_id with this patch: estuary:/sys/devices/system/cpu/cpu0/topology$ cat cluster_* ff # cluster_cpus 0-7 # cluster_cpus_list 36 # cluster_id, with no cluster node kernel will make it to physical package id Acked-by: Michael S. Tsirkin Signed-off-by: Yicong Yang --- hw/acpi/aml-build.c | 2 +- hw/core/machine-smp.c | 3 +++ include/hw/boards.h | 3 +++ qemu-options.hx | 3 +++ tests/qtest/bios-tables-test-allowed-diff.h | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index e6bfac95c7..60c1acf3da 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 && mc->smp_props.has_clusters= ) { 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..9c8950b2b0 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) + mc->smp_props.has_clusters =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 311ed17e18..06ed66453f 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -130,11 +130,14 @@ typedef struct { * @prefer_sockets - whether sockets are preferred over cores in smp parsi= ng * @dies_supported - whether dies are supported by the machine * @clusters_supported - whether clusters are supported by the machine + * @has_clusters - whether clusters are explicitly specified in the user + * provided SMP configuration */ typedef struct { bool prefer_sockets; bool dies_supported; bool clusters_supported; + bool has_clusters; } SMPCompatProps; =20 /** diff --git a/qemu-options.hx b/qemu-options.hx index eb38e5dc40..bbdbdef0af 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -349,6 +349,9 @@ SRST :: =20 -smp 2 + + Note: The cluster topology will only be generated in ACPI and exposed + to guest if it's explicitly specified in -smp. ERST =20 DEF("numa", HAS_ARG, QEMU_OPTION_numa, diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..cb143a55a6 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/PPTT", --=20 2.24.0 From nobody Mon Feb 9 11:57:01 2026 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=1667207258; cv=none; d=zohomail.com; s=zohoarc; b=LSj79BOk3IdgmTxzsclrPSdDuOkaHv/I+kFZUJScSIbyyXhbxc1uY+xpnR6tjDR3LGx6Hcn5PSrWqZNUzqU3vsLXsfnphWf7GIRsrDv6K2sz7C97eHv2q31jZeCV53YP956ZFjSFTYseJW7k9yEJ0BQr9WTqMZTRkJMmFDyVo2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667207258; 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=j3pKW8B0uowttfXStZ+nZgv7lBT9oIaf9xWLzRgmleU=; b=Mdd7BdsYLHaqnHa+FpM/SlkFR0xwwcoP8/Yhf0sYAs0R0+7bLckTA+5282WY8vdOxQSKwQ0f6y9VauWoReVxLBAwvEeMW2pQtpTL9Mu+nzPKIifLQS8A1mFqW1t/C+gTKBYj/hfYJGQAMJQcyWx8ayNrdtbDim7q/XLyYaqb010= 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 1667207258225384.6248661165955; Mon, 31 Oct 2022 02:07:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opQkR-0008Mb-0m; Mon, 31 Oct 2022 05:06:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkK-0008KJ-Cd for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:17 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkG-0005qO-TF for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:16 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N16ZT3yXsz15MH9; Mon, 31 Oct 2022 17:01:05 +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; Mon, 31 Oct 2022 17:06:04 +0800 To: , , , , , , , , CC: , , , , , , Subject: [PATCH v3 2/5] tests: virt: update expected ACPI tables for virt test Date: Mon, 31 Oct 2022 17:05:20 +0800 Message-ID: <20221031090523.34146-3-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20221031090523.34146-1-yangyicong@huawei.com> References: <20221031090523.34146-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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: , Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1667207258724100006 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Update the ACPI tables according to the acpi aml_build change. Acked-by: Michael S. Tsirkin Signed-off-by: Yicong Yang --- tests/data/acpi/virt/PPTT | Bin 96 -> 76 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/PPTT index f56ea63b369a604877374ad696c396e796ab1c83..7a1258ecf123555b24462c98ccb= b76b4ac1d0c2b 100644 GIT binary patch delta 32 fcmYfB;R*-{3GrcIU|?D?k;`ae01J-_kOKn%ZFdCM delta 53 pcmeZC;0g!`2}xjJU|{l?$YrDgWH5jU5Ca567#O&Klm(arApowi1QY-O diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index cb143a55a6..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/PPTT", --=20 2.24.0 From nobody Mon Feb 9 11:57:01 2026 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=1667207257; cv=none; d=zohomail.com; s=zohoarc; b=mcxvwYxPYf5jBAGp3FlIxru5w1PjKH9Bp7wx96ssgps5WILLZpCgQ6ipAcLZ38pUvh8A8eXNYAIt5QTKjlvt6051TX5OBzcgtLuAHCCrBvL0+Y0z2W75jpvVlmrO6WC/fMc9Te1GNzoje6nYs8wN1aPqzqUuwlt2v+9Aac9cTkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667207257; 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=Q/4q2AdzE9J0IjCqb3oN3Ie6x19SmFllD3tbdTnsAgI=; b=NtybhvyyxUQ6eqXr2jT+CG/8hlmoupXAuqy5gkzYvl6YtHpy7FbkognpfskvehozYvz+EP1Q+YHdkHSjTRU0OQNw/jP762XDkhTxqSNnLhHQshbhDA8cq7E1+4hy5xfZEtCoBBKzvbeJVgncukqj6yF18IaETUydL3F1h02cRpo= 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 1667207257264144.6505338494037; Mon, 31 Oct 2022 02:07:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opQkY-0008Qj-IW; Mon, 31 Oct 2022 05:06:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkP-0008LS-0Z for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:21 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkG-0005qV-R2 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:18 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N16ZZ3gThzVjMr; Mon, 31 Oct 2022 17:01:10 +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; Mon, 31 Oct 2022 17:06:04 +0800 To: , , , , , , , , CC: , , , , , , Subject: [PATCH v3 3/5] tests: acpi: add and whitelist *.topology blobs Date: Mon, 31 Oct 2022 17:05:21 +0800 Message-ID: <20221031090523.34146-4-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20221031090523.34146-1-yangyicong@huawei.com> References: <20221031090523.34146-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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: , Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1667207258731100007 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Add and whitelist *.topology blobs, prepares for the aarch64's ACPI topology building test. Signed-off-by: Yicong Yang --- tests/data/acpi/virt/APIC.topology | 0 tests/data/acpi/virt/DSDT.topology | 0 tests/data/acpi/virt/PPTT.topology | 0 tests/qtest/bios-tables-test-allowed-diff.h | 3 +++ 4 files changed, 3 insertions(+) create mode 100644 tests/data/acpi/virt/APIC.topology create mode 100644 tests/data/acpi/virt/DSDT.topology create mode 100644 tests/data/acpi/virt/PPTT.topology diff --git a/tests/data/acpi/virt/APIC.topology b/tests/data/acpi/virt/APIC= .topology new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/virt/DSDT.topology b/tests/data/acpi/virt/DSDT= .topology new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/virt/PPTT.topology b/tests/data/acpi/virt/PPTT= .topology new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..90f53f9c1d 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,4 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/APIC.topology", +"tests/data/acpi/virt/DSDT.topology", +"tests/data/acpi/virt/PPTT.topology", --=20 2.24.0 From nobody Mon Feb 9 11:57:01 2026 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=1667207257; cv=none; d=zohomail.com; s=zohoarc; b=HS8ltMcFEc+jHGGzlFg2oPOVEM89RSK5M7UjLYYEEgH1NH51mp0deH3fHEkokdN87fb2gFzAcmClbprB22fnAbuSSIktOPz6huEgBn5re6qiiOfI6iSsbMySp+wV6kSNGLH5m4H0tlHnKIaUyyH7MJzbcYvtCbw3K4VY8s0/14k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667207257; 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=F9BYJZ56MptLkq+9NqlCXsezP1T3uzripI5jcV8kOf4=; b=N5/ghy3O0nVVF8hnJ4FLwQLi4x9PYpQmvqCZ9BA1Wck4DpEgf4EILniBzhzFKc7xeMuPonNK4GVuEISSgFglHVLZPlhNfYqG0IRslwZCpFe98qKrxMvv0sEumptRYYUt2jHjhRXbApHlcOxtuKh8wRO3+R4BBVNvVFFonmITPG8= 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 166720725727499.17041469773596; Mon, 31 Oct 2022 02:07:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opQkV-0008QW-QM; Mon, 31 Oct 2022 05:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkP-0008LR-0U for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:21 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkH-0005qM-21 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:18 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N16gw2RCCzHvPR; Mon, 31 Oct 2022 17:05:48 +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; Mon, 31 Oct 2022 17:06:05 +0800 To: , , , , , , , , CC: , , , , , , Subject: [PATCH v3 4/5] tests: acpi: aarch64: add topology test for aarch64 Date: Mon, 31 Oct 2022 17:05:22 +0800 Message-ID: <20221031090523.34146-5-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20221031090523.34146-1-yangyicong@huawei.com> References: <20221031090523.34146-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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: , Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1667207258721100005 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Add test for aarch64's ACPI topology building for all the supported levels. Acked-by: Michael S. Tsirkin 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 e6096e7f73..099b723444 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1533,6 +1533,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 { @@ -1864,6 +1885,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 Mon Feb 9 11:57:01 2026 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=1667207270; cv=none; d=zohomail.com; s=zohoarc; b=magwx0qT+bGl7yHWpczzHA+VOFxy+jshKuU91QewWycEINhVv4do2SkW2OHXSZYTxqQzb+q4kMx9Yq/OYkdN6KNJ+6zOIglCqWnlFHHTNRixtn8UL4P832mQ53185CyecJ2MiQl/oLFfbQaGfCa0E4xEBpULlHSk44PUon0Y+jg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667207270; 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=PIPrZOeQAibNN6JpqtDfwc5owKQg8e2fDbourewSnNA=; b=aVr9+nviTrMigYvSrH6hb1FzWRTUh2Nl6JW4G0VsZU8J4PwRHeRSeHtfw5DKgMF6hq9HLDHHb83gvxuJk/BZnMukd9DYnUWFpK/jxumkHFaALbP8OSXsOwbQYzYcBph7kMl+TSpDreIEsJlGwqsbZwwcryfXCaFT1YIXL+YnKS4= 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 1667207270610490.0443123161755; Mon, 31 Oct 2022 02:07:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opQkZ-0008RA-6V; Mon, 31 Oct 2022 05:06:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkP-0008LU-1B for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:21 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opQkG-0005qP-R2 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 05:06:18 -0400 Received: from canpemm500009.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N16cx6XsmzJnN0; Mon, 31 Oct 2022 17:03:13 +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; Mon, 31 Oct 2022 17:06:05 +0800 To: , , , , , , , , CC: , , , , , , Subject: [PATCH v3 5/5] tests: acpi: aarch64: add *.topology tables Date: Mon, 31 Oct 2022 17:05:23 +0800 Message-ID: <20221031090523.34146-6-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20221031090523.34146-1-yangyicong@huawei.com> References: <20221031090523.34146-1-yangyicong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.164.66] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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: -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: , Sender: "Qemu-devel" Reply-to: Yicong Yang From: Yicong Yang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1667207272557100005 Content-Type: text/plain; charset="utf-8" From: Yicong Yang Add *.topology tables for the aarch64's topology test. Acked-by: Michael S. Tsirkin Signed-off-by: Yicong Yang --- tests/data/acpi/virt/APIC.topology | Bin 0 -> 700 bytes tests/data/acpi/virt/DSDT.topology | Bin 0 -> 5398 bytes tests/data/acpi/virt/PPTT.topology | Bin 0 -> 336 bytes tests/qtest/bios-tables-test-allowed-diff.h | 3 --- 4 files changed, 3 deletions(-) diff --git a/tests/data/acpi/virt/APIC.topology b/tests/data/acpi/virt/APIC= .topology index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..558a1856981531b0e18e6d4aa12= 569cd80aa0015 100644 GIT binary patch literal 700 zcmbV~OA5k35JW4P_<@+UE_0Na*(d}Y$i~BZHNk$8j<`%06xH*o$1LVr?)gEFlh__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/PPTT.topology b/tests/data/acpi/virt/PPTT= .topology index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3fbcae5ff08aaf16fedf4da45e9= 41661d79c1174 100644 GIT binary patch literal 336 zcmWFt2nh*bWME*baq@Te2v%^42yj*a0-z8Bhz+6{L>L&rG>8oYKrs+dflv?45YUMh?!vef$Csl%t&G&Cde(wdO>1GKm-gx_1*yTS+Iz)B8h>R aAic=3Duf$S9l3b27BK>%tVNQ@mK!T