From nobody Fri Sep 5 20:16:50 2025 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 DFAC5C32792 for ; Tue, 23 Aug 2022 12:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359175AbiHWMEr (ORCPT ); Tue, 23 Aug 2022 08:04:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359292AbiHWMBG (ORCPT ); Tue, 23 Aug 2022 08:01:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 416C595E58; Tue, 23 Aug 2022 02:35:30 -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 ams.source.kernel.org (Postfix) with ESMTPS id E0122B81C9E; Tue, 23 Aug 2022 09:34:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52172C433C1; Tue, 23 Aug 2022 09:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661247271; bh=k5okc+zVslx3PutPnaZoy3YGfFGkTasVTIwBgkj4g38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n7NkAbBcM2HMNrgnmPsuvC15tksQ0IPopk012sUPme6QnLieKXci/Hj1QCeCrM7Tu usqLDxyUpHBGU1hYb+yrY6yhHEZH26TMUK9pQNHAdo3Ghit0S4EXIxb0053ZBYQc3l ydr5IFiGFC/aFfIOI40dW47utvQDDe0d1UXb9rBU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brice Goglin , Conor Dooley , Palmer Dabbelt , Sasha Levin Subject: [PATCH 5.4 373/389] riscv: dts: sifive: Add fu540 topology information Date: Tue, 23 Aug 2022 10:27:31 +0200 Message-Id: <20220823080131.131270250@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080115.331990024@linuxfoundation.org> References: <20220823080115.331990024@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/d= ts/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 @@ interrupt-controller; }; }; + + cpu-map { + cluster0 { + core0 { + cpu =3D <&cpu0>; + }; + + core1 { + cpu =3D <&cpu1>; + }; + + core2 { + cpu =3D <&cpu2>; + }; + + core3 { + cpu =3D <&cpu3>; + }; + + core4 { + cpu =3D <&cpu4>; + }; + }; + }; }; soc { #address-cells =3D <2>; --=20 2.35.1