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 25FBFC2BBC5 for ; Sun, 14 Aug 2022 16:33:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242303AbiHNQcr (ORCPT ); Sun, 14 Aug 2022 12:32:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243080AbiHNQbz (ORCPT ); Sun, 14 Aug 2022 12:31:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B101924081; Sun, 14 Aug 2022 09:26: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 dfw.source.kernel.org (Postfix) with ESMTPS id 4DE3560F49; Sun, 14 Aug 2022 16:26:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37F2BC433C1; Sun, 14 Aug 2022 16:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494401; bh=EQ1NnPX8MJeaFiLoKQL45wdz28k3pAbXNj+YBpRii8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q1AYukjlLxgny5QcZxg3boPa3H7iKnMNUHLHM/oIQnxSuW21r+1tDe02duvXlDSAJ DDTvvLBM5Ue2pdSy6CZqY2paGDgiSlJ4zLobxqtPVfiVZATB7U3cb6CW1bzsiWZA0Z Jn0RxNcz5JROznwRQnZ45WGnJcxcOuNslkp2E0K0V4/xpAq5YPxGimc1+0bXOpDqvR yoRFqn3AxtXhtSqWzmLSdmf/U0AThJ/XtwIEz1GfJpHL/Qm0+lmL3v/31h96efSVBV w4WS3/gOsWGRZ6r3/POBLpWhmPdaMTtAY+wrOxXhv8JuCwXQkGir+DMNdtk2qQKpR4 3KOi0rED+PdhA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Conor Dooley , Brice Goglin , Damien Le Moal , Palmer Dabbelt , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, geert@linux-m68k.org, niklas.cassel@wdc.com, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 11/28] riscv: dts: canaan: Add k210 topology information Date: Sun, 14 Aug 2022 12:25:51 -0400 Message-Id: <20220814162610.2397644-11-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814162610.2397644-1-sashal@kernel.org> References: <20220814162610.2397644-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 d9d193dea8666bbf69fc21c5bdcdabaa34a466e3 ] The k210 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: Damien Le Moal Link: https://lore.kernel.org/r/20220705190435.1790466-6-mail@conchuod.ie Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/boot/dts/canaan/k210.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/canaan/k210.dtsi index 780416d489aa..fa9162e3afa3 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -65,6 +65,18 @@ cpu1_intc: interrupt-controller { compatible = "riscv,cpu-intc"; }; }; + + cpu-map { + cluster0 { + core0 { + cpu = <&cpu0>; + }; + + core1 { + cpu = <&cpu1>; + }; + }; + }; }; sram: memory@80000000 { -- 2.35.1