Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp1637423imw; Tue, 5 Jul 2022 12:50:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vTwWdW0HagKpuU5Q7kaegAbNBFDfx4GHYqnYL8hq9auWVBZBWWpeuDFwC+k7RKk8x0KqK9 X-Received: by 2002:a17:907:1dc2:b0:72a:efdb:2c4a with SMTP id og2-20020a1709071dc200b0072aefdb2c4amr2404146ejc.25.1657050653308; Tue, 05 Jul 2022 12:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657050653; cv=none; d=google.com; s=arc-20160816; b=fTREOe3ms00rLd1ZFcj1vnGv/VMkh2KSxiE/IYcqNI7O3vwC0pTENAlM4ap/6/59Ih wAnDS86JynExsJyqQ80nj36K22jKrtRsaAh1CUNagRVr9zZVy+sOh8nw3laptq+cWj9T Z1DIF4zJx8ZIJfP0xR5wUuWsDs4C/43lBYzUvlA9qQgTVn0sw2421pnQEtCftV5Ks5UW hpSvPhQNk2wjxz3TazEyhOZK6qap0mFNuHNYiciCCQHfB3V2fKqbRoCgWErMHXNZ8qc3 wTEQODcnptv83mFU6TAsZrXTt+NTxNXjxRXXu4K4/4KUZLQWyCvENOdJLVUO41X2ZIz5 ei0Q== 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=ofJfdtzmNhmvEWJSidzM2l5f2gdgrg4wmjMzsjAB6EY=; b=SZKQKTIUFI2tLU6qDrlkrEr2CqPMCp8BFp4Y2EfjJa2oIY5OY8Dx4YwBEJjkej5Tlj V1KRkoO9ly8CZcSrZAJUfI34C9ZeaQs2rs9oz768KGGZmI+P+btLLFzj84jdagqbrJ9n sDXXvld1Lpe96dtgyUDwEBviuOUn2eW1YQk7YK6cPw1MKWaWbGSJXfr7bi517l20Rylo HMGc9arscLlFLPND51IliyhgLl3S0xKPaCVXoTOr8x/cnFOV7jiGPZ4cw+WLCmtephMi 0GzOHcle2Nfx7YRDaGwxd0tHdn6NO9QPpvJMeRwOBOdJqbRrr81HYYbnaPeaoPNgpafo DI8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@conchuod.ie header.s=google header.b=KPRE2Mqx; 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 n13-20020a05640206cd00b0043a4c9f648fsi8743795edy.515.2022.07.05.12.50.28; Tue, 05 Jul 2022 12:50:53 -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=KPRE2Mqx; 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 S233273AbiGETFJ (ORCPT + 99 others); Tue, 5 Jul 2022 15:05:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233225AbiGETE4 (ORCPT ); Tue, 5 Jul 2022 15:04:56 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E65D91F2F4 for ; Tue, 5 Jul 2022 12:04:54 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id g39-20020a05600c4ca700b003a03ac7d540so10280238wmp.3 for ; Tue, 05 Jul 2022 12:04:54 -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=ofJfdtzmNhmvEWJSidzM2l5f2gdgrg4wmjMzsjAB6EY=; b=KPRE2MqxrWAyJ5KFiyW7W2wK/Qp+4RPmBjBPEqd1Ad/RcYiR5eQ4b0SjLC8+sW6c5P qCe+z2nKJvGF2GFscoJorSvxk3sNLrfiQ670bUOmB+jACJp9lOakMIuOoOquUdd1Qxyv 4EDm71nI0XdHb50X7lVmgkNNA8h+QeAqqFaZRYx0mt4T9wPF4HSxuJSZVFf6rY0oqkVT u6puW3UWxcyi0rIhc0wj0mC6W6JuMvcvCDBN9Ol1AIcLjv5JSGeLkYTCy1WUs9jLAU6j QEfjz7TawPKt6zY2D5YLcdcoWm1Upk/knSsY46BnHYsWbDiw7/Xji7ElmxcyNbFD2ayK sg4g== 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=ofJfdtzmNhmvEWJSidzM2l5f2gdgrg4wmjMzsjAB6EY=; b=1ws7X6WYG+o9W1u+05uYTk9ZRcoA8mKQIkbavekZHc2wL52dKA7Eb26XsQok/j9x5b pLZHgck/w5hvRE8sjt3xfqJUkl7PzaHkJpIWHSX7EJ6V3Sc66qe+U7fG+oPRBtUez/bN BWWuul9c/XMe1zn3mRxw3BY4uIAcmQvxhCq0ApCXPTyskm8rBgmuCva+AR7/g86WXtHL 3uG4HHPWVS9h68OQqZdqq6K1X54ce0tq9vomjN1pb40guUVnXGc8+4mMNDHtMnXwfeCt KMqw929nUqN/xEYP45EwXgfXdswfY5s82eHhSl00HsdL6ruUexlC6A/6Ue7XbpvOAnIh jdkw== X-Gm-Message-State: AJIora/8fH02i1Wyn6Jvvfx9T3yNH6wS7Zx7lpbhvrq/67q6sX9gmKHC wa3jEIWNOnRuB/3fBEZ+7QNzDw== X-Received: by 2002:a7b:c381:0:b0:3a2:aef9:8df4 with SMTP id s1-20020a7bc381000000b003a2aef98df4mr11492100wmj.7.1657047893260; Tue, 05 Jul 2022 12:04:53 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id d7-20020a5d5387000000b0021d5c52f4b4sm9912961wrv.34.2022.07.05.12.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 12:04:52 -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 4/5] riscv: dts: microchip: Add mpfs' topology information Date: Tue, 5 Jul 2022 20:04:35 +0100 Message-Id: <20220705190435.1790466-5-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 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 --- 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 45efd35d50c5..0a17d30bb3f2 100644 --- a/arch/riscv/boot/dts/microchip/mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi @@ -138,6 +138,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.37.0