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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E656DC25B06 for ; Sun, 14 Aug 2022 16:21:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=M08L9ijoOngWZUnOqp4ZonmWOEMfsBtRAYHcRbgOcJI=; b=sUN1eP0jxw7lQ8 Fw47XWqEcEZ6C6YJryNm1sq3ooolLx6uWga4zJhx6i4Vl19BmfjlSJcO+NxQT9/V5oJFBM7StLjOJ A3anC9li7Ev8E8SrPOFAqLvbRJFoaKi3/KvwTZ1wEXOt03W/bvFG9kLwdEszXs4ce1f6gYi8IVoPs ejaMJd2wM1G4KYaIn4U87jJr+o5CO8XS5rj2H4Cd5qQkHpIBGf9Pe0rfo7gsXgnTKcmvxIrY8pnSu uBP9UooNjk7SZ1UMIjc6OxOTQvce1aYR1m/h5FTQLPMXae1BwkbW13hHg85xINOiJSZtRXnToZlXp 0v3U4IWpR/Nv5UW04Gdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNGM5-007pht-UC; Sun, 14 Aug 2022 16:20:49 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNGM2-007pf2-Dx for linux-riscv@lists.infradead.org; Sun, 14 Aug 2022 16:20:48 +0000 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 1D30FB80AEE; Sun, 14 Aug 2022 16:20:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01B3BC433D6; Sun, 14 Aug 2022 16:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660494043; bh=t3xlxbpc+pSeSGh1Ge9cevaG2rWDIJOPlc1y8yJahgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pID84kgD9Nv32PRGYuHUs04X1lgSb8g4LaeXl4u8cPG9sUNX3iSE/3gTaw3ucOJNP DjsXUL8oFIIDu4hDFZnHYj07DTTudZwTP4Hwol2o3dm/7VaONfHKepO2cttH6GDG3t 0sVu8kzjO4aKYQ/5qEVTUO+hK+Rdw+lVcUQD9d568kJEmeWtFjyPwDM5oSRWFT0D9U xoAFvAmsuqXyKuvMudUM6yc45svPYuh37XN1Makzhg2neEyTCFsXMhE50n43Vm7xFg V1Jup/4T8F3VhHMhl3XIXKznM+j8Hq+zfZPZC3BE9L616e+S1V0yctrpNOqAPc0sjt 3iYCTzjtI9WHg== 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, niklas.cassel@wdc.com, geert@linux-m68k.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.19 18/48] riscv: dts: canaan: Add k210 topology information Date: Sun, 14 Aug 2022 12:19:11 -0400 Message-Id: <20220814161943.2394452-18-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220814_092046_666036_5E3C4D6A X-CRM114-Status: UNSURE ( 8.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.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 44d338514761..ec944d1537dc 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 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv