From patchwork Sun May 16 10:32:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yanan Wang X-Patchwork-Id: 12260253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78032C433B4 for ; Sun, 16 May 2021 10:37:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0ED6461185 for ; Sun, 16 May 2021 10:37:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ED6461185 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liE9a-0001Qm-2W for qemu-devel@archiver.kernel.org; Sun, 16 May 2021 06:37:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liE4h-0008To-J0; Sun, 16 May 2021 06:32:43 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liE4b-0000mI-5S; Sun, 16 May 2021 06:32:43 -0400 Received: from dggems704-chm.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Fjdm23s16zPxrT; Sun, 16 May 2021 18:29:06 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggems704-chm.china.huawei.com (10.3.19.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Sun, 16 May 2021 18:32:33 +0800 Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Sun, 16 May 2021 18:32:32 +0800 From: Yanan Wang To: Peter Maydell , Paolo Bonzini , Andrew Jones , "Michael S . Tsirkin" , Igor Mammedov , Shannon Zhao , , Subject: [RFC PATCH v3 2/4] hw/arm/virt: Add cluster level to device tree Date: Sun, 16 May 2021 18:32:26 +0800 Message-ID: <20210516103228.37792-3-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20210516103228.37792-1-wangyanan55@huawei.com> References: <20210516103228.37792-1-wangyanan55@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=wangyanan55@huawei.com; helo=szxga05-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 , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Yanan Wang , prime.zeng@hisilicon.com, wanghaibin.wang@huawei.com, yuzenghui@huawei.com, yangyicong@huawei.com, zhukeqian1@huawei.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add a cluster level between core level and socket level to ARM device tree. This is also consistent with content in Linux Doc "Documentation/devicetree/bindings/cpu/cpu-topology.txt". Reviewed-by: Andrew Jones Signed-off-by: Yanan Wang --- hw/arm/virt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 44e990e3be..7de822e491 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -431,14 +431,18 @@ static void fdt_add_cpu_nodes(const VirtMachineState *vms) if (ms->smp.threads > 1) { map_path = g_strdup_printf( - "/cpus/cpu-map/%s%d/%s%d/%s%d", - "socket", cpu / (ms->smp.cores * ms->smp.threads), + "/cpus/cpu-map/%s%d/%s%d/%s%d/%s%d", + "socket", cpu / (vms->smp_clusters * ms->smp.cores * + ms->smp.threads), + "cluster", (cpu / (ms->smp.cores * ms->smp.threads)) % + vms->smp_clusters, "core", (cpu / ms->smp.threads) % ms->smp.cores, "thread", cpu % ms->smp.threads); } else { map_path = g_strdup_printf( - "/cpus/cpu-map/%s%d/%s%d", - "socket", cpu / ms->smp.cores, + "/cpus/cpu-map/%s%d/%s%d/%s%d", + "socket", cpu / (vms->smp_clusters * ms->smp.cores), + "cluster", (cpu / ms->smp.cores) % vms->smp_clusters, "core", cpu % ms->smp.cores); } qemu_fdt_add_path(ms->fdt, map_path);