From nobody Mon Feb 9 10:30:25 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=fail(p=none dis=none) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1618302874; cv=none; d=zohomail.com; s=zohoarc; b=bxX581YCgDd49Rp1M6qZY5QxTRmqeHcECM7s9T7gYNxCzH78pBRxrUvpw/tc9fvpkCe+9Jb+Fr9Vgyt+XBIxPZNK2sFNCTQ8hz1zqaKdLlN/wDTq8g9+Lj0kzBiB9MSDVX9g7jGlH27q3bjgt+yLM0BAXI9e9GDWgywZojBZY6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618302874; h=Content-Type: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; bh=bRB60EnF1NT6WyiVHr5sl82zuH4DpC+/74HP5IqnhYI=; b=C0VPNV1QY9KSjj+5oVEAFC0oy06APDHUru47s82MnP6ELSYhyiC3TTBSlJkhNIhtMImNRGfzZjf4seljg2/0jldRDqI+VpNnEb6lnQNLo0Lx019ZGEMv9ELo+pCiVLsE/RVb7xlAY+ZRTxDJ6+P/Z9UD6zTYYlInnCDrLFAND7o= 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618302874707895.6474843381865; Tue, 13 Apr 2021 01:34:34 -0700 (PDT) Received: from localhost ([::1]:35874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWEVF-00027R-Dz for importer@patchew.org; Tue, 13 Apr 2021 04:34:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWESz-0008Pj-K6; Tue, 13 Apr 2021 04:32:13 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:5358) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWESw-0004tJ-MU; Tue, 13 Apr 2021 04:32:13 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FKJgd1jVPz1BGYB; Tue, 13 Apr 2021 16:29:49 +0800 (CST) Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.498.0; Tue, 13 Apr 2021 16:31:56 +0800 From: Yanan Wang To: , Subject: [RFC PATCH v2 3/4] hw/arm/virt-acpi-build: Add cluster level for PPTT table Date: Tue, 13 Apr 2021 16:31:46 +0800 Message-ID: <20210413083147.34236-4-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20210413083147.34236-1-wangyanan55@huawei.com> References: <20210413083147.34236-1-wangyanan55@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.128] 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.190; envelope-from=wangyanan55@huawei.com; helo=szxga04-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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Barry Song , Peter Maydell , Andrew Jones , "Michael S . Tsirkin" , wanghaibin.wang@huawei.com, yangyicong@huawei.com, Yanan Wang , Shannon Zhao , Alistair Francis , prime.zeng@hisilicon.com, Paolo Bonzini , yuzenghui@huawei.com, Igor Mammedov , zhukeqian1@huawei.com, Jiajie Li , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a Processor Hierarchy Node of cluster level between core level and package level for ARM PPTT table. Signed-off-by: Yanan Wang Reviewed-by: Andrew Jones --- hw/arm/virt-acpi-build.c | 55 ++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 03fd812d5a..2b745711d1 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -443,6 +443,7 @@ build_pptt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) int pptt_start =3D table_data->len; int uid =3D 0, cpus =3D 0, socket =3D 0; MachineState *ms =3D MACHINE(vms); + unsigned int smp_clusters =3D vms->smp_clusters; unsigned int smp_cores =3D ms->smp.cores; unsigned int smp_threads =3D ms->smp.threads; =20 @@ -450,42 +451,52 @@ build_pptt(GArray *table_data, BIOSLinker *linker, Vi= rtMachineState *vms) =20 for (socket =3D 0; cpus < ms->possible_cpus->len; socket++) { uint32_t socket_offset =3D table_data->len - pptt_start; - int core; + int cluster; =20 build_processor_hierarchy_node( table_data, 1, /* Physical package */ 0, socket, /* No parent */ NULL, 0); /* No private resources */ =20 - for (core =3D 0; core < smp_cores; core++) { - uint32_t core_offset =3D table_data->len - pptt_start; - int thread; - - if (smp_threads <=3D 1) { - build_processor_hierarchy_node( - table_data, - (1 << 1) | /* ACPI Processor ID valid */ - (1 << 3), /* ACPI 6.3 - Node is a Leaf */ - socket_offset, uid++, /* Parent is a Socket */ - NULL, 0); /* No private resources */ - } else { - build_processor_hierarchy_node( - table_data, 0, - socket_offset, core, /* Parent is a Socket */ - NULL, 0); /* No private resources */ - - for (thread =3D 0; thread < smp_threads; thread++) { + for (cluster =3D 0; cluster < smp_clusters; cluster++) { + uint32_t cluster_offset =3D table_data->len - pptt_start; + int core; + + build_processor_hierarchy_node( + table_data, 0, + socket_offset, cluster, /* Parent is a Socket */ + NULL, 0); /* No private resources */ + + for (core =3D 0; core < smp_cores; core++) { + uint32_t core_offset =3D table_data->len - pptt_start; + int thread; + + if (smp_threads <=3D 1) { build_processor_hierarchy_node( table_data, (1 << 1) | /* ACPI Processor ID valid */ - (1 << 2) | /* ACPI 6.3 - Processor is a Thread */ (1 << 3), /* ACPI 6.3 - Node is a Leaf */ - core_offset, uid++, /* Parent is a Core */ + cluster_offset, uid++, /* Parent is a Cluster */ NULL, 0); /* No private resources */ + } else { + build_processor_hierarchy_node( + table_data, 0, + cluster_offset, core, /* Parent is a Cluster */ + NULL, 0); /* No private resources */ + + for (thread =3D 0; thread < smp_threads; thread++) { + build_processor_hierarchy_node( + table_data, + (1 << 1) | /* ACPI Processor ID valid */ + (1 << 2) | /* ACPI 6.3 - Processor is a Thread= */ + (1 << 3), /* ACPI 6.3 - Node is a Leaf */ + core_offset, uid++, /* Parent is a Core */ + NULL, 0); /* No private resources */ + } } } } - cpus +=3D smp_cores * smp_threads; + cpus +=3D smp_clusters * smp_cores * smp_threads; } =20 build_header(linker, table_data, --=20 2.19.1