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:     Paul Burton <paulburton@kernel.org>,
        Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>,
        Hauke Mehrtens <hauke@hauke-m.de>,
        Tiezhu Yang <yangtiezhu@loongson.cn>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
        Chao-ying Fu <cfu@wavecomp.com>
Subject: [PATCH 11/12] MIPS: Report cluster in /proc/cpuinfo
Date:   Thu, 19 May 2022 20:51:24 +0200
Message-Id: <20220519185125.11686-12-Dragan.Mladjenovic@syrmia.com>
In-Reply-To: <20220519185125.11686-1-Dragan.Mladjenovic@syrmia.com>
References: <20220519185125.11686-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?/L+kARcVJ2+GfMTM81nLVbrcOgm2BRvsIEb2igmx367A5gmieTyz3dLD5ijm?=
 =?us-ascii?Q?QNFHRB0MwQLWdYoJy6fFUiQCTmxxK1UmiDh63co87MieyB1GweiIuH7ezbel?=
 =?us-ascii?Q?hJI1F+yp3lFyvFQiUD7BWc/mc8vwa7kTRYc5O+yFyjSaUhNOyqIRCzvkIlOw?=
 =?us-ascii?Q?sahmE0J5CLDTtr5ZJTfsF5j5nJpiSSxT1q32cgCSCN+7cih7M0E8toBV5DlL?=
 =?us-ascii?Q?/ch8PyLQ+IuUUwTti2siB9ROyRxvpsej/5sx6wEdIFMjAhhJ1bAfuCa8/XuI?=
 =?us-ascii?Q?6scOQtYanr8bTOfLGWqv1n/O9d0L5vx46+gzRdDpaYm5eeT8QDiqzYUrjjBF?=
 =?us-ascii?Q?EKNjxpGEDM/UM3taEuo08WngqYG6f4vYh9/i/6OruWNGYjcJ+n0/ajxn3JsM?=
 =?us-ascii?Q?GHOAeMLpTwRTe/R6xVP4+37Or5TSuJmGl9i1qmVEmW7AMwpSz0GfnTYSDXZt?=
 =?us-ascii?Q?HsdCrO2zeHa6rqWddcv+PNkZFDg+86XtO0Ybuwf8S6x8PjNcyTjc3AORYnlp?=
 =?us-ascii?Q?G2ZJlYZ3H/euQsbnB3jq5Hhm7WzL07nQOcbuOJCD0ykAtbD7PyJZ2975S/UO?=
 =?us-ascii?Q?K9ori+25IzOOsXs96dhiD+p97PlOEor12DRBVA1qbfTamouPrfeXpnSpZmk5?=
 =?us-ascii?Q?3S5BAQrVIx/AWuMR2JHRufDX+UHx0X1HmobaryRndDB9UdNoBfiWaH40Bok5?=
 =?us-ascii?Q?3E8TxdTKqZBt7Xi3E0M0EH5DGs5KkMFBmd7vjNzw6uuOwh5G4UtXJkfUi0/L?=
 =?us-ascii?Q?iTuTUOKG6fw3Ln/0z69gk2OhnQgZBI3TfqRjec8r6upaVD4TR6ADk0SxTeC0?=
 =?us-ascii?Q?1DJZ4hzm7iT6q3taDS8PFvmcd80AWtaGe2LZl74WjggYrzLjvbus1PuFTj0J?=
 =?us-ascii?Q?eDesqfKjCK7T9Tnsrs8EW2rLFMM2fThY0AImnK1ZG6J1NtreBykiSy2ybKwX?=
 =?us-ascii?Q?X5U0F/lfIShFSD2/MDBHbZz9zh+YpQICLLVysPNWMK/uAaAf8gvAzfgPuBQ4?=
 =?us-ascii?Q?yRaBVLuRYFJrprDKl67BaNlpit1Z9SnmVBmX1W3iTJ7mgx0+APL45jlXuenH?=
 =?us-ascii?Q?xMKRX19V8bqSqLPIX9Os73xnz0IITCTRsq1+Ae/mT3FOhyYd/ONWZ2ePwSQx?=
 =?us-ascii?Q?AobSw7WMcDcm1j89RiIQG3pk8Z+Xg4grJI+e/IEmO+sm8g7w3rGpNoJRQ/pR?=
 =?us-ascii?Q?fjOq+kTfnBR9Y5Hf9XOvHqYkRz0AWXjYzg5qBhKy1zt1iDytRxPJTEsfnUNT?=
 =?us-ascii?Q?OnpRYK9TSsIA5X2VsBTNkalP3Pu+/Z9oH4FfmKynlABectyupZVBtqWx4ppq?=
 =?us-ascii?Q?sHUCPB/EW8+PnXZ8MYlTNlcAAafDfe29DWoskENKPVHY295qD+X7mHH6688O?=
 =?us-ascii?Q?gKAEjDcJ4GvgtvftbuDX5XXb8LH/yzu88WL3/5+WGBuaRbeCAFOjP3STEyaS?=
 =?us-ascii?Q?bnSSe2jIQ4uBKhNdWbt5f0b6E2XTFZrI3Le4e/VIOMetoh5Ah0is2+BQDYqj?=
 =?us-ascii?Q?8LPavGjyhbbojsoFNlzHjU3GtoeQxTMvdWieWOZqfznAfNc3UiCtkL3yF+pn?=
 =?us-ascii?Q?5alkJfzChikKBsjhnlJHCn5HmFwsxyBhiKSH7E3MmH5bR83mzm5CNjGVwlsf?=
 =?us-ascii?Q?d6eQha5wogmPvb8m/h3c0bOA0j36uw+2Thu3M+TI2fArEZO5JC/GymcUWZ5Q?=
 =?us-ascii?Q?vfwUTvPcvTGtzg4Wq/XKM5RLXiezm9edC28J3kmSJ84ydu5yBK7hg032XtdY?=
 =?us-ascii?Q?OMcfX4JHakR3MOyjdjBxifsJ4qYvguvBNsYbW3CiZmr7LizBCrVx?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1dfc7e15-7b79-499a-e963-08da39c8a0ca
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4208.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 18:51:48.1335
 (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: BzN2LFE1zuBTHUOra/DhrntNuGopN4xyg/rC/Xv2o0tcYHevHrq4akH7Qxc3gE7GTQ9NXWPoyiKCrfpgSBzE8Rtc3G1TKE1weDMDYybzTDM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0301MB2546
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_PASS,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: Chao-ying Fu <cfu@wavecomp.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