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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5E532C25B06 for ; Sun, 14 Aug 2022 16:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JKPwTZTKyNnrc8RmxLujcybmtM0dHc+kobFwF8lo+Rg=; b=vcEW1IBOVB+k8w SZ28O2+0P4VFHbZOrqFUtpDLO3OT7pLsjWiiz6h7CDMYGgA95kmz5V6WEjd6Ok1j3uXCWQ0BD7uVz esHNwD+31t4YBT12BRlOjsaMKVo8FS9lZLtpOHD/QYFc+LwtwpZ48O9oJBse/EMHj/rWhCDl5wVTd bR4rhFPSiY5iMlwBOH6eYnZwlDVxQcjlsqP3BCUKRBkOiUUVwvbBzDohQiX233Y8Ng1Brkx2Os+Wi o86IEGWWPAzSeA2MWc+tveha9kZvxECJIgAh2V177IL8EsLbX77Bx4AOsivbYOmLFHs1bUW5lFpnm 9d9q4YzoLac09ilmgr4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNGS4-007thR-NG; Sun, 14 Aug 2022 16:27:01 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNGRg-007tSl-93 for linux-riscv@lists.infradead.org; Sun, 14 Aug 2022 16:26:38 +0000 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 ams.source.kernel.org (Postfix) with ESMTPS id A44D1B80B7C; Sun, 14 Aug 2022 16:26:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC2D7C433D6; Sun, 14 Aug 2022 16:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494393; bh=iWJWUz344lCyYNJJ7lliPy3Fs2pinpwuoHwp3qll1kA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XBpahoM8DGAQdzgJT7jMktWsovag1CjEeLaB5sKs3tAa5PPBFXW1U6Y9SaAlJyhky 7scG5ooqslVNEvuHAfWCtNEoGIa03mXHJ0ZUyE4ZR+k1MNI+X+82z8E2MbizkfILVB f39Dr9gDzYap5r9NcTxh/LlSgWbAkj6p2+t5ijTTzzLSgiSd+5susB4KYzCUx/0MWB 7Ri7rIf0ttuqeuDfJkjRFbUeJV6Td01QY85a4elps4L9eTrqU0ViFdmgnyGcJAWmZ2 83t+pidvnPc8Uk5WqYG8nPnGNpcMgQ6ewktpm+GIWRxCdxgTBDsV+RGr0FSpOtWWOA quIIsvtGBVPQQ== 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.15 09/28] riscv: dts: sifive: Add fu540 topology information Date: Sun, 14 Aug 2022 12:25:49 -0400 Message-Id: <20220814162610.2397644-9-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814162610.2397644-1-sashal@kernel.org> References: <20220814162610.2397644-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220814_092636_542116_48FD7FFA X-CRM114-Status: UNSURE ( 8.58 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv