From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46C6CC25B06 for ; Sun, 14 Aug 2022 16:37:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242971AbiHNQhE (ORCPT ); Sun, 14 Aug 2022 12:37:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242910AbiHNQgA (ORCPT ); Sun, 14 Aug 2022 12:36:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F395D357D7; Sun, 14 Aug 2022 09:27:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8DA4660FBC; Sun, 14 Aug 2022 16:27:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56982C433C1; Sun, 14 Aug 2022 16:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494473; bh=iWJWUz344lCyYNJJ7lliPy3Fs2pinpwuoHwp3qll1kA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QV2xRd0XauXIUFbS5TxJisiQrYzb7iFFuyxjew5KFX0XbW+t+9ahtyrIMjVUVhJHE FMpVyzspmJPAVPWDpM1bkfByi4fMEtcKfINUhag2+uYNIkOPSkXEpIHG5nLOZAMppR S+VRRjsKoEFAOHK3E9YYbB6vED7fhVUcIpO2AX11SY5VOHGW1hqcIdLce0JNZgtKjM JiuxlOXHK54jLGkqal7I00dYWLfTm+xYZUhhzoRxMDd4Y9GaXV/BbRv5qIqaTe0RzW x085p12QyeU5FsY70TqZ/ynVaRd9p1IoIpxgWd4SoQJiCpdeQpaw4mgst+9KWRYJ2c SkDLVQEVr8mFg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Conor Dooley , Brice Goglin , Palmer Dabbelt , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, palmer@dabbelt.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu, geert@linux-m68k.org, zong.li@sifive.com, bmeng.cn@gmail.com, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 06/19] riscv: dts: sifive: Add fu540 topology information Date: Sun, 14 Aug 2022 12:27:25 -0400 Message-Id: <20220814162739.2398217-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814162739.2398217-1-sashal@kernel.org> References: <20220814162739.2398217-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Conor Dooley [ Upstream commit af8f260abc608c06e4466a282b53f1e2dc09f042 ] The fu540 has no cpu-map node, so tools like hwloc cannot correctly parse the topology. Add the node using the existing node labels. Reported-by: Brice Goglin Link: https://github.com/open-mpi/hwloc/issues/536 Signed-off-by: Conor Dooley Link: https://lore.kernel.org/r/20220705190435.1790466-3-mail@conchuod.ie Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi index 64c06c9b41dc..87d6e5a4253f 100644 --- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi +++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi @@ -133,6 +133,30 @@ cpu4_intc: interrupt-controller { interrupt-controller; }; }; + + cpu-map { + cluster0 { + core0 { + cpu = <&cpu0>; + }; + + core1 { + cpu = <&cpu1>; + }; + + core2 { + cpu = <&cpu2>; + }; + + core3 { + cpu = <&cpu3>; + }; + + core4 { + cpu = <&cpu4>; + }; + }; + }; }; soc { #address-cells = <2>; -- 2.35.1