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;
From:   Dragan Mladjenovic <Dragan.Mladjenovic@syrmia.com>
To:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc:     Chao-ying Fu <cfu@wavecomp.com>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        Greg Ungerer <gerg@kernel.org>,
        Hauke Mehrtens <hauke@hauke-m.de>,
        Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>,
        Jiaxun Yang <jiaxun.yang@flygoat.com>,
        linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
        Marc Zyngier <maz@kernel.org>,
        Paul Burton <paulburton@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Serge Semin <fancer.lancer@gmail.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Tiezhu Yang <yangtiezhu@loongson.cn>,
        Dragan Mladjenovic <dragan.mladjenovic@syrmia.com>
Subject: [PATCH v2 11/12] MIPS: Report cluster in /proc/cpuinfo
Date:   Wed, 25 May 2022 14:10:29 +0200
Message-Id: <20220525121030.16054-12-Dragan.Mladjenovic@syrmia.com>
In-Reply-To: <20220525121030.16054-1-Dragan.Mladjenovic@syrmia.com>
References: <20220525121030.16054-1-Dragan.Mladjenovic@syrmia.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vDDCGyG19l7vZzTs04oIbzH7dL1iWghHSkxGkrHv/MtNH4RokfQigrTQXjVA?=
 =?us-ascii?Q?jqTPRDR0viXugs87cZSg3Rpb70d3DfKwQn/dM5Fz6p4y6MF7+brYp2KO/UDe?=
 =?us-ascii?Q?pVrVaGNnY+KHINtehAMnzs3/pmURRlfG1rd5tDsrCdHvrF4Wl+1ZRoNMqyej?=
 =?us-ascii?Q?TTQH60xMYaH+V73MsPIhTztgv1gyXkwahYUMafsBXM6gP6/ISEGYtomu/a6P?=
 =?us-ascii?Q?wVQWXCa4ckaO0BFFQ7X+e3QgjIhoR1KUbhrkFknSaYUtpv9hq+AHAH/8XZ8m?=
 =?us-ascii?Q?wLXnqYFy/cEMfUyxWnK6AGezxHV0yGDPuKP6eSBlkjXl4gLW841FMXWSeOqb?=
 =?us-ascii?Q?IvLK5V/suARuznOFRRMNH5mcsRbzhbtX/KX92guLp6b61iXOPQ+RlxSFfpfD?=
 =?us-ascii?Q?DIbji1pNcYsC8aUbNr8fcqZscDDX93UevDeswFU1N7gAYUvG4nJE9xjSOkq+?=
 =?us-ascii?Q?3Jmjd0Tl5Rc14qUJC/VFEfzRQU6VzhhF50sQrGnJIic7ASew90gZQ+5Owa29?=
 =?us-ascii?Q?IxqmWLpb4Yrwj1HIomqR8dtYoI+V5eytlv2nkuq8WECCbWToFRbXG8oMQ1QD?=
 =?us-ascii?Q?LduJnWiDyf537rIv8gvwb2WXOMgkVP9YHmOpPaI07L0I+iWFCxUtrydH7B0X?=
 =?us-ascii?Q?VyQRMTO/SVu2gGWXv/FmlXf8pxc/pvz17hg3uvRLcbk6StiT5VKVGZY+gKfF?=
 =?us-ascii?Q?Bf8pkgwcR1WRhK4rtDoLnC7Fsf67Q0S6t1Ilgk8YMKNpATWO2zcCJCSXyzDg?=
 =?us-ascii?Q?sYV/vFDMX3GF6WAD/752B/qO+c1ZPvXtx65AvI6adRoqGYO0z46w0dGwj9WF?=
 =?us-ascii?Q?4C3AGVCQKlarIlz0hOL/Kp7tL56MFg+FBJzb4yT3D+pHS1ffnlGXt+J7GdxY?=
 =?us-ascii?Q?Nx3PKIn0zDVGRN5xJoV36LwMHUWcSgCVI/eQszqw/UjZAO2ul9COEe3VBzSW?=
 =?us-ascii?Q?XVrSXRqVROIloj/gqXRb/jw45otpOjNNWr9QjfVmV/O+Y6K83t+MxXzhoq9F?=
 =?us-ascii?Q?b50UsGLi4eKfwbqbzcpUt+5p7s7PAzUoP3lukdEg3HXNwo+JDeIcm+ujAWfk?=
 =?us-ascii?Q?+0abnoQVE/TNuIs5ZabJOrupHLnt5vmAvM/x4TjKThXY/RNBgIRXYY+Xk1XW?=
 =?us-ascii?Q?gfMaLPNpIZzpGyZOeZvE/5dxT4fRhnhRO4ejsZvokhaK2hnY+Qj/MYpI/XFA?=
 =?us-ascii?Q?SzNWTrTxx+FRD161bLn7NC0imPUZCrqPMpijbr2uey9I07wJ3gKWQG4cIi14?=
 =?us-ascii?Q?IIgRExNL8vC48FwLMNSuuJI0aJavm84fKrPtSnOqAkdR9njGBeFmE9tfxOej?=
 =?us-ascii?Q?93C+WdKxiWZ1glKVTVNatGYjsmNvtHLgIo/RmrEhQHbFqr2NkPGwoR/mNYjZ?=
 =?us-ascii?Q?UGgi5bD1dKMxY+TWlFOiMb5iXgTzYYShIeQuPW4VVNoBHYVH28cpbKp7kEvm?=
 =?us-ascii?Q?WxsgfWqpIDJ8x+3AnWo+fwGjzwxbRXAVDxCqI5Vty7mqbyjwM6u8FrhpRmMo?=
 =?us-ascii?Q?hu6VsZPkSdSkucKQE51MsfdLzyMX8KwJFhOilFI8h7uvO13tHDZSM4KHidKX?=
 =?us-ascii?Q?aLjuxziB/XawcxDXX1ygxeCXouH8xNnyVasg+/jPC0eWdmKWORs94KUGDP9V?=
 =?us-ascii?Q?w6xAWFjh9pXMKvEfb9360V0t7Ta0NnavFWiMDb6SRaAf837qWNuEjeumeTTj?=
 =?us-ascii?Q?y1RZ9MjrK5eSNcQPtXx5zzIvsJNahoyWl8n94DdFys6ee/ptVbINrqIHS9O/?=
 =?us-ascii?Q?9QEPwq+Hs3wxvL0LDUPelbLgint+1Fj58uNqij8KExdVXpv7tzQq?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8285ba3b-7220-4ddb-73ca-08da3e479fd9
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4208.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 12:10:57.3024
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: GoTVAjb5j9hYJEIAqfSZITfrl85SQCYnic55GWQlp7CMLQqNnwGWgi4LZoHbuvJJgNdrwR2Xum5a1MoRJzPmjWsWovIqcYKqOcm6qxUL4eE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR03MB5439
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,
        RCVD_IN_MSPIKE_H2,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Paul Burton <paulburton@kernel.org>

When >= CM3.5 output cluster number.

Signed-off-by: Paul Burton <paulburton@kernel.org>
Signed-off-by: Dragan Mladjenovic <dragan.mladjenovic@syrmia.com>

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index bb43bf850314..a66e7705315d 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -12,6 +12,7 @@
 #include <asm/cpu.h>
 #include <asm/cpu-features.h>
 #include <asm/idle.h>
+#include <asm/mips-cps.h>
 #include <asm/mipsregs.h>
 #include <asm/processor.h>
 #include <asm/prom.h>
@@ -282,6 +283,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	seq_printf(m, "kscratch registers\t: %d\n",
 		      hweight8(cpu_data[n].kscratch_mask));
 	seq_printf(m, "package\t\t\t: %d\n", cpu_data[n].package);
+	if (mips_cm_revision() >= CM_REV_CM3_5)
+		seq_printf(m, "cluster\t\t\t: %d\n", cpu_cluster(&cpu_data[n]));
 	seq_printf(m, "core\t\t\t: %d\n", cpu_core(&cpu_data[n]));
 
 #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_CPU_MIPSR6)
-- 
2.17.1