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 2E78DC2BB43 for ; Sun, 14 Aug 2022 16:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241406AbiHNQWD (ORCPT ); Sun, 14 Aug 2022 12:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240818AbiHNQVi (ORCPT ); Sun, 14 Aug 2022 12:21:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94944140CC; Sun, 14 Aug 2022 09:20:04 -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 4B786B80B37; Sun, 14 Aug 2022 16:20:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62147C433C1; Sun, 14 Aug 2022 16:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494002; bh=DwkobU+BMVJXJJWUeB8LPhbQL15JLQM4IwAWMPhJRpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HC9Lo8NuhW6O6Mwvx067K3FL1AXcnyMxHJS7PzeUuabs2gmN7Ndidh5oMuuzEdNOs vUEP4mGag/Wo1gEraZI72BTihkdNML5XaFlO/Q3s+ylHjK+yFYoeWc/1a7Vrw4u7Wz Uxz15VPgUst+H0WK8oxOo3o+ttMWqxOXG/ffc27K8hOikdPVSHV9/X9TeY2Vvaqac0 duOBPMWrqtDwKMmUe3+jivpOaIYwF1G+UFQNAAXwvrKjGwdXOnho55mc2Eo81bSPjN Lux4AtDH/By1qqnBPeml6iXe8BSpq6eRTU4AcWAgfI8XJ6NFOCm5h6qmhgfGZI8WyC Yovb1FFDBrNGw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Conor Dooley , Brice Goglin , Sudeep Holla , Sasha Levin , daire.mcnamara@microchip.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 08/48] riscv: dts: microchip: Add mpfs' topology information Date: Sun, 14 Aug 2022 12:19:01 -0400 Message-Id: <20220814161943.2394452-8-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 88d319c6abaeb37f0e2323275eaf57a8388e0265 ] The mpfs 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 Reviewed-by: Sudeep Holla Signed-off-by: Sasha Levin --- arch/riscv/boot/dts/microchip/mpfs.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi index 496d3b7642bd..e3793916a1e5 100644 --- a/arch/riscv/boot/dts/microchip/mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi @@ -142,6 +142,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>; + }; + }; + }; }; refclk: mssrefclk { -- 2.35.1