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>,
        Serge Semin <fancer.lancer@gmail.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Marc Zyngier <maz@kernel.org>, linux-mips@vger.kernel.org,
        linux-kernel@vger.kernel.org, Chao-ying Fu <cfu@wavecomp.com>
Subject: [PATCH 04/12] irqchip: mips-gic: Support multi-cluster in gic_with_each_online_cpu()
Date:   Thu, 19 May 2022 20:51:17 +0200
Message-Id: <20220519185125.11686-5-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?d2/rcLu65mIAP/ViHYx4IRQKoElbIu1DRCuOQWhJIhFU3wo+wVrh6jri34+o?=
 =?us-ascii?Q?eEwn8A9mCb92+THFlLeY2kK+C5fToLHnrfBS/M8OXVU7fqb3gLOw41s0CIT4?=
 =?us-ascii?Q?1aNBIF5RJMbOKtMydq8W9TSx7OSuweo7OpTygZjxNxcORpEZFv4kOKmmrZJE?=
 =?us-ascii?Q?7AKCK9nJSzqpR29hq7iMDY9e/cJPowpMwmvDNLqS2WeLaZ3QpfEOKXlzFYCX?=
 =?us-ascii?Q?OIr1TvVmann60juidGRQp5IdCun0M0gu8DyBu0wMxATW75MeAfo6rQdQv+yX?=
 =?us-ascii?Q?STCn74M2o23BQoJZ5iAGScN3fd1z6JF7BeVdkOeNWVCaUoVeJ+/HuUTM22Bp?=
 =?us-ascii?Q?RSEDtejEL5vfyg6vSTYIM+RB7nDh8Yy9VGkZ6qYCO/PBvPehjxWq02ipHj68?=
 =?us-ascii?Q?1rYlHMQtlnbT2dUIRpWxTsbC8hWnSiHg0jPnUDjYyS7c5s8Zn+SvMoBEagHV?=
 =?us-ascii?Q?syA4CtsUg9TRTBjMS/jk6WApborZTz4CNKdh4lfWd19balU9PVgkibwlNC6V?=
 =?us-ascii?Q?zHwCy1/ftwU3SWY0V/7sEZEC19m0sF14arRffkiDsZDuumfNcIBIepsQAh2d?=
 =?us-ascii?Q?YNLzY+OEmoMxxLEhurxSDrivpHUH2vi6l+aX/a9poFpe6V0c3vbk2LVMK2gQ?=
 =?us-ascii?Q?Ay4zTpSMPxZi3wIrM2NpNG9IRphPY8Y2M4FsKXFWQXVVCLeX5yTg10oAtkFY?=
 =?us-ascii?Q?LexyBy7HAodF+CgXkOipzYKf79FZm7l4zP3Tf4wm/G3lL//4fRM8hA/1Wu6h?=
 =?us-ascii?Q?17Q4qzuGDaSLRFeC2ehekkMNOQqFOHWYsLCRLiT44DH8Kyupoaf4HIB5GSt5?=
 =?us-ascii?Q?Deo8H4G3bB/bh9lqXfTe7zrWZQK7Agvs14GqzXLVgvLW3bbhgZUSlOHPdqop?=
 =?us-ascii?Q?qhgVDet/1AV/bPnbbvCrbv4ReRTrs+9sNMnwuhlB3n5pe8HNUGDEo5JLS7TE?=
 =?us-ascii?Q?daK0tWVUTfUuMt6JrJ9o7qw6Ee/iG34B+VdfuV8l9/IYSNPX3PcOavC+nqAm?=
 =?us-ascii?Q?QSAcmikqIIacW735PVGEily57HHYzHPkF71aAxCcnEN2VyVjGGXnR+g1zJMy?=
 =?us-ascii?Q?uFx4Y+s96Q2cbHTi2xFP13BV6fHoMWGa4qEP1hGsTpVmBldHo+KOp/Nfi9MX?=
 =?us-ascii?Q?1eDmNjbCTi5RKqCPXcABcmvNwkjgacUV9/D5UR0WCNzI90a6+7xccqd4GCn2?=
 =?us-ascii?Q?H+uAP5gwGSpGh8Shc5/wTwlEyPca25CiJuX+4EiW6KR/vE8IodxMVTKXutKo?=
 =?us-ascii?Q?PrSc5myQWKfaro+6rqM7h9JksaorUbVjtfO5COR+9nLGk8Fy+2/Uc+wpI8kU?=
 =?us-ascii?Q?ztFvnwWy9totrz7VqhDDCnL2CqHfLCNckDLtZrRLMSzOTS36AcyDGjR2+dhN?=
 =?us-ascii?Q?v3i6IDqeBK1esYn8X9hMO/AfGpkBK2Pjqdw9krFW9WIWdNyn+gqLi1qy62gg?=
 =?us-ascii?Q?l656GRm1uGARyyTRaP0/rN9OmL3sguBN9NrWUxRJQwQb6FUE/fD41pjNna/d?=
 =?us-ascii?Q?F28DY/rcpHoZsGrGLJd+R+IcMFt/5es7g+wC32uFecTlh1X5NIuNnZSE1WMP?=
 =?us-ascii?Q?mRnFDd25OTzjhXBVSQg6ZGe3wHNuHYIDKFMkCB2buHbLDysXFBZriZIvirBw?=
 =?us-ascii?Q?pN4FeSsB0usUXI1ts33bu6IDwT93ls6CDIpnea8/Fcvd009GszGv4HvrJrsN?=
 =?us-ascii?Q?GFcvq5Hm2cHgPqmaPd5bW2IgYzBMNaCc0EqHNiPMveb+mTWBBUbdfEswkl4w?=
 =?us-ascii?Q?CCerSr6OS0UMKOq0Pk/RSxx/0tZVU1k=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 543c2d76-11f5-4dec-5409-08da39c89f08
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:45.1805
 (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: yeJUwvaCCwrMzffxXSW6exPkSsoZHiqTA/EXsEWuTCs5oVOuweyD6INUrigFSR4MDOM0s+K6eeBgixS7qk5KxaFRWRle4Kbq+/vjWSvl1po=
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>

Introduce support for multi-cluster GIC register access in
__gic_with_next_online_cpu(), and therefore in its user
gic_with_each_online_cpu(). 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>

diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 4872bebe24cf..89a3c6d04e09 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -69,6 +69,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);
 
@@ -79,10 +93,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;
 }
-- 
2.17.1