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 9CD3EC25B0F for ; Sun, 14 Aug 2022 16:29:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241563AbiHNQ3Z (ORCPT ); Sun, 14 Aug 2022 12:29:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242475AbiHNQ2o (ORCPT ); Sun, 14 Aug 2022 12:28:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4731312AE2; Sun, 14 Aug 2022 09:24:06 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 8B69760F49; Sun, 14 Aug 2022 16:24:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A8E9C433D6; Sun, 14 Aug 2022 16:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494244; bh=mpgV44W9oPgeOIfAwZf+8Ykl1kdhKi1YF35CAqj3NRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r2KK1stoS1v1GMxa6yTqVpV5QsHOkBLETM4IYNPPMalNpIYdRd3wjYFSyGqZRa9aN fNbbzop4SuDV8n8RIzJdcTzuY2UeVm+WaSjU8rjNvKRn+iY8Kwt1Ubdj9qv9hln27B L6yhneq2YZOteoFMFCzogsPkO22oYfqE2v/6/OBwQJt0AamjrA5090ZMXtREGk8XsM 18wpJsTKoXQNTzuMIXA8D4NOMinKTQAQAFA19BQkdd4HBdTSD5DPS2K5pSfnhssVO3 ymI+j6QzDTJtzsAiKfcEO1LHE+4X8QsaD4zeqn6gaC5b1Rt+i7JvhqD0fmQcW9Zktd CWpdhAyfBkgaw== 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, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.18 11/39] riscv: dts: sifive: Add fu540 topology information Date: Sun, 14 Aug 2022 12:23:00 -0400 Message-Id: <20220814162332.2396012-11-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814162332.2396012-1-sashal@kernel.org> References: <20220814162332.2396012-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 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 5c638fd5b35c..48423cd8f544 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