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 DA1E9C25B0F for ; Sun, 14 Aug 2022 16:29:02 +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=ZfjidWh4AGXp6JAHsGb6WnQcgGct51+4uyOc5pbxDrs=; b=p898rBMHeQIp2v ENBzoq66f+14Sz5ltR65OnHKPP/1YDrBh58xVIlD5xvE7fCwfBP5FQq9zkZBLXmVb6icZ7KF4Iz9f rFMC350+8aP9X/89krs59+NOjUvkCaVLpGgPG1ERK6T/xRXTOAj9PjoZIR4hzOfEubUWeia2JD2Qc hLAOxDer1/74tEK6YPat6NlMIcQgxCO+OVB50qHXQIag67Yj1CbQkVMbYUWUwr6GwwzrsVPE+K6/H cV/G1S4W585Xvr76e8SWPA35A3zRQj+IapTuAtqx0vg6PMzv8aFz77EFguUOKgZcWIXWBjRJORW71 1utKF3v9MwF7HNNMXAhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNGTr-007v8Y-Ob; Sun, 14 Aug 2022 16:28:51 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNGTm-007v49-Ua for linux-riscv@lists.infradead.org; Sun, 14 Aug 2022 16:28:49 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 79AB460FC1; Sun, 14 Aug 2022 16:28:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12DB4C433C1; Sun, 14 Aug 2022 16:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494525; bh=tP8nyLUZMqeNmRgDheb7Nrl0KDTu9tGn+e/8TFk4Paw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d+ARdsISzluwrk/FH7SwQNEA7l1hjiQBerug6dsB196tY1X7Gx7no/0ynqPtdPH+4 PUDjliAEVW+5OrEALh8DE+mNjSRYOw18HHDV/jSgWOVMPIg5Bvhb5cHr0MQcEVBiy2 0wVtZPBM4pfDnTJ83t6eABUQdtmoXQwyn22+4aSc+3pGBcGB0Wah4qaCcC30TSb3+b uJVyqUOgqIikamv2uwhSsl+rDsoLu5k9nUOYIhde2ULnx+zJ7E8CTzLhM46mbrjTaT 3fyrcHWHEDo6RVT3kfp8aNP1eP4+qbslZ9oFaqISnyUjfymqCwi5oTrR4FZ4a5iPqS q4yM+Dd69wk9Q== 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.4 05/16] riscv: dts: sifive: Add fu540 topology information Date: Sun, 14 Aug 2022 12:28:20 -0400 Message-Id: <20220814162833.2398478-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814162833.2398478-1-sashal@kernel.org> References: <20220814162833.2398478-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_092847_093516_8A875EBE 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 afa43c7ea369..0e4514f32576 100644 --- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi +++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi @@ -129,6 +129,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