Received-SPF: pass (google.com: domain of linux-kernel+bounces-176481-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Aleksandar Rikalo <arikalo@gmail.com>,
	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>
Subject: [PATCH v4 04/14] irqchip: mips-gic: Support multi-cluster in for_each_online_cpu_gic()
Date: Sat, 11 May 2024 12:43:31 +0200
Message-Id: <20240511104341.151550-5-aleksandar.rikalo@syrmia.com>
In-Reply-To: <20240511104341.151550-1-aleksandar.rikalo@syrmia.com>
References: <20240511104341.151550-1-aleksandar.rikalo@syrmia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?Ey/OXwESgnjowZ8Dk6HHSE7IPTWJ5C+GRtwsOW7ttgXXfviFJEg8kQF4bfp8?=
 =?us-ascii?Q?Pc8K1oGPdQzE2Z3RPg2aN5Z/PWiDZNPm56S+oeDD1XQHI8c905bmolrTsHpI?=
 =?us-ascii?Q?Hf/u2Nev8e3+ixv25NMlda7u8ytxl9u4GG2HgbqbMqE0lsI4J3LiqzTu0Hjh?=
 =?us-ascii?Q?q5JhEUQe1pfi6jQ+4+u4/J1TBgTZCa9Nb4LIRy7T4ISUx+1R4er0YlBfVLMm?=
 =?us-ascii?Q?dsEIX2/0w1qE/lluw8I1fvpR0naTtXXAEWigjJeBCqC3ehBOUh9U8TS+Y0MC?=
 =?us-ascii?Q?EbOMUgplo3cRZhwswf6x4BIVJX1kAm70t6Cqx3mpImfwl75NV3RohfEVR7k2?=
 =?us-ascii?Q?rjPOt6XlULJ6I8TqIOl850zGF01fsxR2gotWVJXXw0gdVn47q+ARM1zidz0x?=
 =?us-ascii?Q?4MGDO31hxCKVXxkw+vRQS3JfV1+kBcsyZdDb7oK3ByFG7vnxEilonpB/Hph8?=
 =?us-ascii?Q?dcs5z1CSUZf0Arb2gokhJxRhaKfRNeC0ZM3QB/cBx2fMwCTl/uKK44VyHhJe?=
 =?us-ascii?Q?AtKuWwFy6YOuS3jyetvR308f2yJ1wY5IVhqwLnfGP+fYthcAx9WuJpITBaY3?=
 =?us-ascii?Q?ryJEa8oMRbCUTYHoTmKuhWGWqBm5MdODFYiSTNU06re8ISN0pTRbmul7Rj1b?=
 =?us-ascii?Q?2Mnfq2kRjAnufKjihbZOeTYHTiyapvdk6adQ8aOBUPoOUqzDbfcKtqxY3gKY?=
 =?us-ascii?Q?hI6J4rmQ3J0v0LLxSVdT5ZoIFSGDJYWYtGXU+92bMxZwr9pdnCTxeJCnL9gy?=
 =?us-ascii?Q?SPWbHdakJKW0VN7XOR3N4JZbup2/cZdlyEjEKIcelttQjI0XLw22XbbszUHY?=
 =?us-ascii?Q?7g5xL6Qm286f5NMNuDDUQMHz7S+GlNTf8ousEahzGuLWct3BjBs1j8ArDfTT?=
 =?us-ascii?Q?C36mcESxyf1OA5YIu2G199voiZzNGmDguzeWeZfvdHPRHggzXiIH+mhnT+JG?=
 =?us-ascii?Q?2u4A283zdW9CxOi74h58f0dkPYul9f3hCvUON4yZnM5tkk/IaCUU3Yfq8xvZ?=
 =?us-ascii?Q?bfL2kUrdtwEWK1PPgF8ZTUkhoScAlxXg3lyOIemGPx2W2GETvXdbBrAgA3/f?=
 =?us-ascii?Q?mVqepZigU8k3vTjQd18lNoXkRRif8N6UTfwfo8V2RSlFphgjE8f+HIgLn5mM?=
 =?us-ascii?Q?qyFgOnYR8fn0w1zPWD8y8yVLkDrv2/LWu+pm3iNN/+FZ6gvayoE0SiWsWzFx?=
 =?us-ascii?Q?18aKNanR5TNr483eYGn7fctpTwleK5We1Lmq782aTTTwKDdr9oTMbNAbeByu?=
 =?us-ascii?Q?/pzrjBUK4ICxtH1UswF8PgY1tahuJ28b/Hc5nOJvccdakYMriAuciQG5+1YE?=
 =?us-ascii?Q?Jc1k/SxzCTWoxn4ZEcSXyC8CyHw4z0HYdbROaQRmEz0KalW2xP8/Do//hJAc?=
 =?us-ascii?Q?WAxP3sMVKXrQ6Xq1Jaa4h6oWDlIUQMH1mT9Bja6Y3SS9M5+kA0I0HxhN/Q2i?=
 =?us-ascii?Q?1TZnGaGlkbK2vgIPgBbZDAl8pgr56IUd+rnkaZlD2AAK7KefA5sfOoKbbYC5?=
 =?us-ascii?Q?oCmjbWSaYELg0sJd36pXNdqaXIOEkCjyIp2VtZSUll68xHOTZtBy+wZLI7hu?=
 =?us-ascii?Q?8TdBk8MoRGkgs82fgDV+JN23rnMLe+y1ICgnUgPig855D/s0d0jGtkAj9QaF?=
 =?us-ascii?Q?tw=3D=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 13cc836a-64c5-44ec-51b1-08dc71a73fe2
X-MS-Exchange-CrossTenant-AuthSource: AM9PR03MB6916.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 10:43:52.5817
 (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: OhI1qYa7YF8aYUrfLTugBbKavtAz9aqI9z6zArGsONiBSTj7y/0qWcCnHRq75IAoASHfJXJyqoBKku7nkQxYriIkXsRvp+PB4m813q0dcgw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8449

From: Paul Burton <paulburton@kernel.org>

Introduce support for multi-cluster GIC register access in
__gic_with_next_online_cpu(), and therefore in its user
for_each_online_cpu_gic(). We access registers in remote clusters
using the CM's GCR_CL_REDIRECT register, and so here we delegate
to mips_cm_lock_other() in order to configure this access.

With this done, users of gic_with_each_online_cpu() gain support
for multi-cluster with no further changes.

Signed-off-by: Paul Burton <paulburton@kernel.org>
Signed-off-by: Chao-ying Fu <cfu@wavecomp.com>
Signed-off-by: Dragan Mladjenovic <dragan.mladjenovic@syrmia.com>
Signed-off-by: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
---
 drivers/irqchip/irq-mips-gic.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 9e7182150b5c..317ccc2593d1 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -70,6 +70,20 @@ static int __gic_with_next_online_cpu(int prev)
 {
 	unsigned int cpu;
 
+	/*
+	 * Unlock access to the previous CPU's GIC local register block.
+	 *
+	 * Delegate to the CM locking code in the multi-cluster case, since
+	 * other clusters can only be accessed using GCR_CL_REDIRECT.
+	 *
+	 * In the single cluster case we don't need to do anything; the caller
+	 * is responsible for maintaining gic_lock & nothing should be
+	 * expecting any particular value of GIC_VL_OTHER so we can leave it
+	 * as-is.
+	 */
+	if ((prev != -1) && mips_cps_multicluster_cpus())
+		mips_cm_unlock_other();
+
 	/* Discover the next online CPU */
 	cpu = cpumask_next(prev, cpu_online_mask);
 
@@ -80,10 +94,16 @@ static int __gic_with_next_online_cpu(int prev)
 	/*
 	 * Lock access to the next CPU's GIC local register block.
 	 *
+	 * Delegate to the CM locking code in the multi-cluster case, since
+	 * other clusters can only be accessed using GCR_CL_REDIRECT.
+	 *
 	 * In the single cluster case we simply set GIC_VL_OTHER. The caller
 	 * holds gic_lock so nothing can clobber the value we write.
 	 */
-	write_gic_vl_other(mips_cm_vp_id(cpu));
+	if (mips_cps_multicluster_cpus())
+		mips_cm_lock_other_cpu(cpu, CM_GCR_Cx_OTHER_BLOCK_LOCAL);
+	else
+		write_gic_vl_other(mips_cm_vp_id(cpu));
 
 	return cpu;
 }
@@ -105,6 +125,9 @@ static inline void __lockdep_assert_held(raw_spinlock_t *gic_lock)
  *
  * The caller must hold gic_lock throughout the loop, such that GIC_VL_OTHER
  * cannot be clobbered.
+ *
+ * Please note that if you start a loop this way, it must be completed to the
+ * end, otherwise, GIC local register block will remain locked.
  */
 #define for_each_online_cpu_gic(cpu, gic_lock)		\
 	for (__lockdep_assert_held(gic_lock),		\
-- 
2.25.1