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 3AF3DC282E7 for ; Sun, 14 Aug 2022 16:23:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242166AbiHNQXQ (ORCPT ); Sun, 14 Aug 2022 12:23:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241359AbiHNQWD (ORCPT ); Sun, 14 Aug 2022 12:22:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2BB6EBF; Sun, 14 Aug 2022 09:20:42 -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 6C800B80B4D; Sun, 14 Aug 2022 16:20:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63A67C433D6; Sun, 14 Aug 2022 16:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494040; bh=9DPDtYyccClLJs//EdauPupiVQGXhPthx19K2X2kN90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J0zKAoOwTa8sdALUr3SM6UINnCjEzE+LrixIp9JKn5BhxfnCStp4JUWIta7SoDSPQ Y5W2KV4sDj35wbKML9Bt7smNpNSb4fvZ18YjUYCkq7gxEBVZtI+V0RJ5NCQUddMrXX 1Q9fA52aUdIFykn3o3tY24UQzJT8BT1CbnvBfmN/yNr0oiNM5u+HLCO1U2UpEenerM UE5K1YzrqVqh3awH9vFSY6M/gh8z7U4HWLiKOIaVU7Z+WC9zMUT0/Rv8yQWXTdzbvW T/6WNPtdxJ+ixSs1cZwISK+9QCO2zsV3sQylHKsnXUgr47SdfzznEWuZ3V+j6C3zFo PFU0NCztaMBYA== 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, sboyd@kernel.org, zong.li@sifive.com, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.19 17/48] riscv: dts: sifive: Add fu740 topology information Date: Sun, 14 Aug 2022 12:19:10 -0400 Message-Id: <20220814161943.2394452-17-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814161943.2394452-1-sashal@kernel.org> References: <20220814161943.2394452-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: devicetree@vger.kernel.org From: Conor Dooley [ Upstream commit bf6cd1c01c959a31002dfa6784c0d8caffed4cf1 ] The fu740 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-4-mail@conchuod.ie Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/riscv/boot/dts/sifive/fu740-c000.dtsi b/arch/riscv/boot/dts/sifive/fu740-c000.dtsi index 7b77c13496d8..43bed6c0a84f 100644 --- a/arch/riscv/boot/dts/sifive/fu740-c000.dtsi +++ b/arch/riscv/boot/dts/sifive/fu740-c000.dtsi @@ -134,6 +134,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