Received-SPF: pass (google.com: domain of linux-kernel+bounces-176482-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 05/14] irqchip: mips-gic: Setup defaults in each cluster
Date: Sat, 11 May 2024 12:43:32 +0200
Message-Id: <20240511104341.151550-6-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?jSvjFFkB36GxMI+cyPBaMEseydDVphh5JaBLO9XJ7lBxMESV8EN/lLssDkF/?=
 =?us-ascii?Q?3yoH48Q2agWZ6P5ycmuaEnt5Hh1WOD4dLfoWkhRl9Y+M9Nd7r9Sjn6rmT5mV?=
 =?us-ascii?Q?TTtWpyoZfzCY8qB0U6cdmnAkXiFd/vejkw82M8eqOhvj09PyU4lQCtRP9la6?=
 =?us-ascii?Q?GNjAqSCxFMwb7mEZH9GfL1P6/dCv99qdPFEG/0gcy+LHwYllHhjtTu+PjxJt?=
 =?us-ascii?Q?sDPd3yf2Qia3kFeXamNoAv8OAkLKVEBSLKi6hGLkaMCWQff/58UBdm/JB5Yx?=
 =?us-ascii?Q?0sP6kAGlYyVLUB4Kw/EV24HaDSGk8xkSlc9mFN67O6j5IjjjzZ8ahOu9rJO5?=
 =?us-ascii?Q?KE3s9kCktXwBN9zeF2JQsxEV5/Tt07ZoxYy93H2+jNa3KdNgY8JCCAfF+QnJ?=
 =?us-ascii?Q?QTbx0C2IVmzm2BQTDqHtwaFF8UIe6KMPLMdEbhBFB0gxqbrMx1rZW0cvXyDv?=
 =?us-ascii?Q?4HAh0P5L4nink7mIGmjir3/uzM0kky6C6ScuHfhkGjK/+L2kHDHBOjJbr9ze?=
 =?us-ascii?Q?2Omqx/aGS1mJFubhAnnILWL0OiJ0+YnAp/t/dvo0tUaTfhPvLfOHmqFELWTZ?=
 =?us-ascii?Q?A5PM393upYJ+lpJmQqHWsQ8/Ms0nkUhEVTCbpiXEuOGA5B6+58vO7hagh/fO?=
 =?us-ascii?Q?JuvhJd3vxhT2dWBYE/t0lRU0Zd4zA2jHuN53EEvVIZooqVxBoqc+eSUQKAUQ?=
 =?us-ascii?Q?Clp/gZ8++eztepA1zZecyVix1caWnwOcvRsjJkEHEEKwIZoIs5+nV9OglRV3?=
 =?us-ascii?Q?erWDq4BJgnB4RZLqBahgJnatT5vURd47kIqPgFS20ORjkBzhAAUCO/sb+bvU?=
 =?us-ascii?Q?7/5EYU2wqs1O+/1fqTZN3m/pySFuB4W84uSK7Bt+glYsOXOF7qnLTV2gRxW+?=
 =?us-ascii?Q?gi9MHD8RbEOYzzo3TWJucO+GDsEpk3F2CYWVUlcxSQXByvcW8w+NWSvN3Y3y?=
 =?us-ascii?Q?ub5zDV5kczWl77z2ochGX9fSV1aPNv7FF8St8MpXxolx41K7PeJ2qFdQmYN2?=
 =?us-ascii?Q?ipbMfK01WMTtc0dgwOJOiyLN++fkoXi4mErNw9AK/pwiJed8ACFNlTrPeHcV?=
 =?us-ascii?Q?dm72gv049WI9+uFGSUidYhcSpV5VVKGzb8Uu+RgD0253g1m/qQMRo8WETh6E?=
 =?us-ascii?Q?DqlVnzDZUcjven7v0DLwrOCihmQk8+pBPD+Aqtu/hMevKyv+yMSolP++tbW2?=
 =?us-ascii?Q?YV+o7Jxcd3lwQgcCQkWU3gRaXMCQl01NDctLsx5cXhf4L7srGdAdUt6VuFok?=
 =?us-ascii?Q?GUICM+HLrupcVkpG4XJz66mpyQx5P8c3wN9B4HNmJblk0+ZSruG0dbzXCgl6?=
 =?us-ascii?Q?eeOCtC068NYAUyCns2+q9mVaT/dXxP9shpQFYmLovwVrxSN1RD/cHC80pOCv?=
 =?us-ascii?Q?JdLSjy20hMZ6iKIYcFdxsRaTmwfVOGpkC9z/TAiLIstpdw3vmQv5jCElXrVb?=
 =?us-ascii?Q?9LAMtyKvqXa+6KCpTP6kk4EoI9jBLgza2IjD0jo5TfGjztyiXQ54zm43+UmF?=
 =?us-ascii?Q?nUVwzbQ/6I3V8oJJXuX+13w2gLxUSelGZuFdeDL/+T1stxDINrGgK6hKxzbg?=
 =?us-ascii?Q?hNwWCdw8ec84mkIiomvumorxaZdE85ptDf4QJGi3Iw92l/HpHFjdDyhGFNR/?=
 =?us-ascii?Q?4Q=3D=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 24ecd299-eb87-4122-6ee5-08dc71a74074
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:53.5451
 (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: O0qafwxkOLVdF/Bm/QPpZ5moOXJtjV//Vb6v6FRFXiSlCQ92Ood/ZPtCNeMGk3EXcO4uGgqHBYZtSxH6KQX4VdMvZ2d8AOcIcAwdvvU+2cE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8449

From: Chao-ying Fu <cfu@wavecomp.com>

In multi-cluster MIPS I6500 systems we have a GIC per cluster. The
default shared interrupt setup that we configure in gic_of_init() will
only apply to the GIC in the cluster containing the boot CPU, leaving
the GICs of other clusters unconfigured. Similarly configure other
clusters here.

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 | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 317ccc2593d1..cdd8973912a9 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -800,7 +800,7 @@ static int gic_cpu_startup(unsigned int cpu)
 static int __init gic_of_init(struct device_node *node,
 			      struct device_node *parent)
 {
-	unsigned int cpu_vec, i, gicconfig;
+	unsigned int cpu_vec, i, gicconfig, cl, nclusters;
 	unsigned long reserved;
 	phys_addr_t gic_base;
 	struct resource res;
@@ -881,11 +881,30 @@ static int __init gic_of_init(struct device_node *node,
 
 	board_bind_eic_interrupt = &gic_bind_eic_interrupt;
 
-	/* Setup defaults */
-	for (i = 0; i < gic_shared_intrs; i++) {
-		change_gic_pol(i, GIC_POL_ACTIVE_HIGH);
-		change_gic_trig(i, GIC_TRIG_LEVEL);
-		write_gic_rmask(i);
+	/*
+	 * Initialise each cluster's GIC shared registers to sane default
+	 * values.
+	 * Otherwise, the IPI set up will be erased if we move code
+	 * to gic_cpu_startup for each cpu.
+	 */
+	nclusters = mips_cps_numclusters();
+	for (cl = 0; cl < nclusters; cl++) {
+		if (cl == cpu_cluster(&current_cpu_data)) {
+			for (i = 0; i < gic_shared_intrs; i++) {
+				change_gic_pol(i, GIC_POL_ACTIVE_HIGH);
+				change_gic_trig(i, GIC_TRIG_LEVEL);
+				write_gic_rmask(i);
+			}
+		} else {
+			mips_cm_lock_other(cl, 0, 0,
+					   CM_GCR_Cx_OTHER_BLOCK_GLOBAL);
+			for (i = 0; i < gic_shared_intrs; i++) {
+				change_gic_redir_pol(i, GIC_POL_ACTIVE_HIGH);
+				change_gic_redir_trig(i, GIC_TRIG_LEVEL);
+				write_gic_redir_rmask(i);
+			}
+			mips_cm_unlock_other();
+		}
 	}
 
 	return cpuhp_setup_state(CPUHP_AP_IRQ_MIPS_GIC_STARTING,
-- 
2.25.1