Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp1610854imw; Tue, 5 Jul 2022 12:19:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1skbZ7AsA6sYjX3mF+JTIiIvf8x3RhM8lhdDjRlSiLGTROJSS1fWjuTJUPDupntznyeMjdX X-Received: by 2002:a63:1454:0:b0:412:8ea1:a96f with SMTP id 20-20020a631454000000b004128ea1a96fmr1523615pgu.212.1657048776763; Tue, 05 Jul 2022 12:19:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657048776; cv=none; d=google.com; s=arc-20160816; b=Noa8LV9vwIfJDDrnoEgYR49wgOb/WzaGENIX62nK9i4kMyUvUg3idjCDWVZI/LNj1v pZ1F/TyraJDUShxcMtjMTt1WEaInnVECznT71mvr74wQbqlgmqRhYcQjnlIcoODaW6Hv FXJjhy6pKDJ8OwB75zqqHMjvRjONLg4pdZPy3b4vwCwJgO+J4+l5h/bmdPafAJ/oH6nB /rRszthFb+ux48r2jQrKnZILwjOXue9VGgzTPHqU5sJ2JZRriXEwjIJeFAMesTcefReI ZTxlxX5CDSK1xJSWRK+9CSqgelOoTM+od45ZxxtSbB/jS1eAE4RAlgJXLNzVJAq5UmWq f3zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EAejLaRmDI7ahw+8pWedR3a7Dpv7oYIzED6NiiTc7a0=; b=g41qvyOl8rTNCR+wk72wzFJHUKF39Y7NoIVM0B/vgngZFJxgjx76neEI2N79/OprdG qQAsPWvyM2ivnYmKOKsZuN4f6J2U8OqmAdt7MMDozZYrX0wjCzoze6/tyh2NTUSsE6MW 5kL5oqfSxdtMsl+Kjjul5x3hdiUmf1mUgtS7X22elCw3zAEo/6NEb0eKnKJZ0yLaLE0v BLF3oE0X0f3UnzT2mw14R0vBolOf2PrT/VRYD0LHm409A1v1U7fqqVsXq6PZqsY/+hUB pJNqV0Hd64J61RSHwD1tio43nD6CEMNGD65xISr8yge3jrDAqK8+EaRTPRe3aFxeEJvs Zq0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@conchuod.ie header.s=google header.b=gH8Eh0uS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=conchuod.ie Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 1-20020a630901000000b00403fbc9167bsi26314389pgj.623.2022.07.05.12.19.25; Tue, 05 Jul 2022 12:19:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@conchuod.ie header.s=google header.b=gH8Eh0uS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=conchuod.ie Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229537AbiGETFQ (ORCPT + 99 others); Tue, 5 Jul 2022 15:05:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231326AbiGETE7 (ORCPT ); Tue, 5 Jul 2022 15:04:59 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 021A0205DB for ; Tue, 5 Jul 2022 12:04:56 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id t17-20020a1c7711000000b003a0434b0af7so7811872wmi.0 for ; Tue, 05 Jul 2022 12:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EAejLaRmDI7ahw+8pWedR3a7Dpv7oYIzED6NiiTc7a0=; b=gH8Eh0uSyp1pd8lYOTghOMpllbsaSKtH0LZfoePu+NLFoGUnlrt/bMlxOQW8M9nYhm 2RcpqIr/5SHSJXL1yLCB6PqDhUDzggWiwdYDbx5v3OTdAqaVLNZekmK5HwJU8AM+QJrV /T44OnuWF5AME4PsrRs8vhQbGU4Onl26sSNn1wqmfQ2bn6F3OggSTLoCL33SK/nWdIaP 7Z5v0Aza1Kf+VxyRjvGNLOltssWMr9PoSSvETyshYXAkAsZuPzMlFI9rZ7+27fy75akx 9uMzCdfvFIU+oAjoE3bdvC7hculNfq448yw1hlj7Rc0xgBHMq3tap751KKBP09thts6R rdcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EAejLaRmDI7ahw+8pWedR3a7Dpv7oYIzED6NiiTc7a0=; b=B5PAkqrB6v5SRISBHL3A16M2R4hluOyuousILocwxZtct3wcUvcFTpDqSLukafalfm 0l0qKYr1j3yeqQ3bEH40Y4eGEYv1vQa2jYaylbIElpYyXW+dFh/8GQK0/kXPpYy2rZuL /O4IwdSKwsFnkk56uwul86TbT5a+l0bjfcRL5CSoMjeOGJ0hkhi0efUrt2aKYOkMkIMe kzVQTWyH5e6+bkSC9+FuEC+BKzpBahg2iR7MJkhnnUpVF/CkgfEWmryOAxIX0VHCgWnU bUfdoylFo2QPP9eaZTN0v/clqwjKVbxDDXQkj2tND+/JCxC6M8u89Si5YhEKkRTfkoIn XdGQ== X-Gm-Message-State: AJIora9ZfSC+cKwkGa7Ok0UuFhWVhTS10kNXV/lsq/SACGBMLQVAK7F0 5dQAhPDoont+d9OAA/wq50ynBg== X-Received: by 2002:a05:600c:2284:b0:3a2:b7d6:609b with SMTP id 4-20020a05600c228400b003a2b7d6609bmr5625866wmf.83.1657047894458; Tue, 05 Jul 2022 12:04:54 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id d7-20020a5d5387000000b0021d5c52f4b4sm9912961wrv.34.2022.07.05.12.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 12:04:54 -0700 (PDT) From: Conor Dooley To: Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Daire McNamara , Conor Dooley , Niklas Cassel , Damien Le Moal , Geert Uytterhoeven , Zong Li , Emil Renner Berthing , Jonas Hahnfeld Cc: devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Brice Goglin Subject: [PATCH 5/5] riscv: dts: canaan: Add k210 topology information Date: Tue, 5 Jul 2022 20:04:36 +0100 Message-Id: <20220705190435.1790466-6-mail@conchuod.ie> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220705190435.1790466-1-mail@conchuod.ie> References: <20220705190435.1790466-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Conor Dooley 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 --- 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.37.0