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 05/12] irqchip: mips-gic: Setup defaults in each cluster
Date:   Wed, 25 May 2022 14:10:23 +0200
Message-Id: <20220525121030.16054-6-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?LlYHyZ1v1HwtfWIbgk4O0y6Nh9wX04waqdT1zP5YL7Ea5j5/PpHNCY1K9wX1?=
 =?us-ascii?Q?nFPhH1bqFEG7r9u0JVjaehudaAIq61/vbC4161RpMe/sFBGe6i6WAnRO2xMh?=
 =?us-ascii?Q?3euAj6HRegMx0VRWkWWpfkOD5NxTLmGSam0PinbqaOWVHbpFjWggG2BHR9ME?=
 =?us-ascii?Q?H3OtGfY0lms7imnucpKa/BufHdQcUMPbhMQG2dBas/RQOoZGNFqujK0aHWbb?=
 =?us-ascii?Q?UXQkp7oD+gtEkCerHOogc3p/fcMyYhm9YyuqlH+FPYOPv+Ti4fZhc7A3YMHV?=
 =?us-ascii?Q?QAVd0n2mGMjvOlPtwatMiTYXE1s/kuG/goQaFyrQ+BjRtCPlx7tdPCbgg1W/?=
 =?us-ascii?Q?nRpEVObEjw3vb5pXj5j+ZuN7YBCSMtToy1sIbKJbBxDJxJgQbpr2gI88GSFP?=
 =?us-ascii?Q?LULw1Yp9k+FguDvp+A0y9QJH2CyeimkLoaHX0lhedHolQ828Cwrqc6pY2CkS?=
 =?us-ascii?Q?c9Y5gY8BwmTgs/r2Z/AB8bZ/rX/kkh5HnY/FFbER/0IdRLhdDj78Uun80xgP?=
 =?us-ascii?Q?ZRvXxhK7+gQQRfH8zvXSR6aq71jlnqqr1CN6mxryY+ujeCOaghYCzKTW5RDO?=
 =?us-ascii?Q?E3cTxoIS9X6+RUoyQPunPrSdJ4SHxkqLo0mfv1n/UQQdr4cvip+usYpnh7rp?=
 =?us-ascii?Q?0tAEc5bpFpWY0oyWWdf9vND2VIHkg93QjGlSme0QmxFhggMljhZWQU0iHxh5?=
 =?us-ascii?Q?FHAIy/4l6jBRDCFTkIS/kpakjASrl1Poo8WLphNa7ieXe2YDAmtbKKFI+phh?=
 =?us-ascii?Q?QKEJn0unEy1LZ+peDkidTL+nr3lnVAhJyqzr/T+uVNPI8VJJhdCCgItkHdbv?=
 =?us-ascii?Q?gi+DDav4ZPmx9/2O+z7C4njvOEIeHpQ+taE8ozbEqDI649F4rvr32iy33pz+?=
 =?us-ascii?Q?9I/JOp1Wr1k70XY3eYzMMgvLfDaBXBlS8ZvH36L13OWWkdNiI4CgXBHmyB5E?=
 =?us-ascii?Q?urS4HU+/j2/YsqCcmZdL3y2XBS3+IaY2dFQo57yTkMUnhEbbJD24SF3ykAZD?=
 =?us-ascii?Q?NsE0ysHc3ApemVzqe92OigGbTnpUrJJhoCbWNW4i3RU6x0a0U0AEgIlZnx/M?=
 =?us-ascii?Q?m9Sb4dnc+nl7dmm/OX5Du5VttGZdbhC3DBYvzQGtsVRg+GQppB5HMgNQH1oN?=
 =?us-ascii?Q?SzfM/BDggwJKQ4A+9VGZdqPzeuuGz8uhnaOZ86w2MuXlYCB0gb/rYC++rQCO?=
 =?us-ascii?Q?PUF1AVeCgR5M/l3VBLo4F3wgzScPp54iSZMQjaRdFt3/H/oe7Mb9uUe32Vc7?=
 =?us-ascii?Q?H3MZ79Ojdo0E8g6vAQdzF5UzUNGChtJVx/PzZ3O1gtC41Mup4oyrWh1+1OQU?=
 =?us-ascii?Q?jrHmHkSWxYDPW70tRVzsFQySzF2c6iiLlrCrKiDF9u/m4wkdL2fXVIWoKYjH?=
 =?us-ascii?Q?as23csl5IJ4z5sZJzCzUBdzmhpD3ysfcQcivMhvnsqk2ys/6YU3wzsCFgz1A?=
 =?us-ascii?Q?qW5svJ2xn/5fWpAA/Kbyk85M2SC7bR03sKXu9wb1DVksMivfPiuadPZWSaQV?=
 =?us-ascii?Q?lxcZNIWOwXbxTSLthXR08b1TC51z1RYnS+HILByY3i9nGS1gCJ/VglO2NCs7?=
 =?us-ascii?Q?TWFicvETijK5p5HAjNQACy8yi0zMHBRT18/1QdwEvWXq9b4pc7gs/urDeHUV?=
 =?us-ascii?Q?F3pVyCAdweQAYeOF46+mUzuTxPAUi7cY4Vu/6H1CIfn5bOE6NaZuChn/Wghr?=
 =?us-ascii?Q?zNWZb2pUHc9MeaFa13i1sh341fJOXt8uXmDdI+p+K+eRcBMmw3+PDcSo2+Ls?=
 =?us-ascii?Q?DhcY0ECw1iNDmQJhPKTT8sCIjBFwTQk=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 039eb4ac-a435-4a41-5ad5-08da3e479db0
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:53.6620
 (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: TFHHOhRT+y+o5TQPRncnXPjs4xbVq2zNhjHG5k0xHW6OeEJQKnqUHEjdMrPtXHShvUPyf/yy36waoKBnmwEVcWPNc01o7rEnGfyzV93nUWo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7859
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: 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>

diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 89a3c6d04e09..f692392666a2 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -741,7 +741,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, v[2], num_ipis;
+	unsigned int cpu_vec, i, gicconfig, v[2], num_ipis, cl, nclusters;
 	unsigned long reserved;
 	phys_addr_t gic_base;
 	struct resource res;
@@ -860,11 +860,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.17.1