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>,
        Chao-ying Fu <cfu@wavecomp.com>, linux-mips@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 02/12] MIPS: GIC: Generate redirect block accessors
Date:   Thu, 19 May 2022 20:51:15 +0200
Message-Id: <20220519185125.11686-3-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?VcbzS+EzdGiEQVl/p3LlBwN8w5BN6LJ+zoLR5rlug4poDVh7IzSMsjHQcLjJ?=
 =?us-ascii?Q?vrypN1Hcswy3+Be4muFalLhWOLklsaXHcWMNlPPTtAj8GMp6RCMZw4jS/XKC?=
 =?us-ascii?Q?mnT2/IOTRvR1mP4Ku3rdjPJKZEpH4LtPbfrpaIoJMDdW2AbHx+vjyi0rK9rK?=
 =?us-ascii?Q?dst+ykAGynWe4RJQ22vlEpg9XiBwE3ID6z9Bx4gGkf++jPnavfxgbfrxLQ5O?=
 =?us-ascii?Q?oIQN9Aq+2J2+d9Sx93Em2W9HPQ8ZGSm2TJw4bKSh6AJ+857lVSXqZuqdMBI0?=
 =?us-ascii?Q?xpks+AZFXg9599iMxIR4QLA5oZY8k/n+lP/HChHPVLvZr8EIfLvmE8VlJwhG?=
 =?us-ascii?Q?p744tAOz3r6x/Qs0mxi0uL+T0WrYRpmKQ3N47aQS1d0b3Wmfq97utLtZYx62?=
 =?us-ascii?Q?r0iTCnrU1DNTV77ApwHnsWyK8cdwP60iPaO2G2V8rkd2TP7zMO5/N+QvLpK3?=
 =?us-ascii?Q?yoy3jeCTDsY6cFADZptk1NEnn4yeCJMRyyzIrGEIhAjUrv1gzLLZMid9Ijdv?=
 =?us-ascii?Q?lIMu+53z4xeXVjqbA91nlJRUkOybbSoU3eWHLiVkr21XuAh3Tn8p6/tMr4NN?=
 =?us-ascii?Q?co7wr0l1lZdG+FixPGfxuoVcJi9kTufcxb3KYzxDR5WZFlATNflGjMPFZAP0?=
 =?us-ascii?Q?BQSvnojR97i4vsJhW1yD74tiKXyGcvDXAkqi8g1/I0B0N/Btd3GI3avgSobK?=
 =?us-ascii?Q?u145+y+4N+7LeU+GmFqwXSfVIWieosth9jckcsYvWfJMogg4mpXj1PD8x2Ce?=
 =?us-ascii?Q?bbmik13xFJ4hrk8AXy7METzZOTH0RiJi4m7MA2OQjmE+5woixx7oMd+fJtk8?=
 =?us-ascii?Q?N8RtgQdFPU+PAsEbIMdJIjQqoK9cNIdH0e1jCKpj6arsJaxUQ99WOT83MI17?=
 =?us-ascii?Q?wB2sZ3qAwHwi1n7A5RKY6NbDj4dYD/TR4447Y18tsT8ZXghh3eKJftX9zczQ?=
 =?us-ascii?Q?JdIvQtVSeSxkAx6QrgMv0EaVUEXnwi4iq0V+pc2TdfhJl2nj/w1TylLkdp2h?=
 =?us-ascii?Q?L/lPwYHHXqAYQDOVdFkFaZRw+/qIJnDFR2PHptCGgo+BHFE2inSF7xf5pQp0?=
 =?us-ascii?Q?nqRjgUXZXBXDMIcJekS7EHQT6qqS2Ak7y9qPc7vGyRskMkKXdx+MhTse3M6W?=
 =?us-ascii?Q?azmyTXgI3c/9yY6iO4tg0xdhpFNAa9Uh2h7cMwCn5GjmX8ZAKvWN4E/UUGzp?=
 =?us-ascii?Q?o6ExmOqgadH8M5TLz2d3xbRrJz+3i+iWtY5vV9wsiVnRNdGrCtuvCAha31LX?=
 =?us-ascii?Q?rtx+r6XUFAYawsAL8ftP3Juj7WXJIkA19k1AQems4gw12TPSJgZ3JgMocK3e?=
 =?us-ascii?Q?RsyRIqbgOnY9KIJiJYKPsEgaIQDGJw+a/KSx12+MlAobmLR3IAQrtEzTrZZM?=
 =?us-ascii?Q?UUKnDlY1gReoORFLX1vgET6on8cpsYDv5faJs/3CJlqhQ57mSoJD297ENqsa?=
 =?us-ascii?Q?c05YVe67xYfVROHOBF/4foEC3oXWxpWR2kpnAEElKt33DF8UXY7r0dRJb9ue?=
 =?us-ascii?Q?DJNmgMF+K8u557H6gwm+cuFeCZY0B1w+AV6j3cv67woBjT7BQC9UaITiS+lG?=
 =?us-ascii?Q?U8uriJ+KjJiwCA3/6idivFTHjvTtDfG8jOSLZRdGhT3kVZl0iaujkvqSfIsA?=
 =?us-ascii?Q?jgbakJvINIOl2Z2GlLP4GRf0B+I7Il8BgcRG7rYNPOD+4MrPJ3h/qVkHx5dH?=
 =?us-ascii?Q?yjqJRv7Nh+8QaOoSMgSsTCBTMyXQxuPNAr4TKrrap2hBhfbqzRFrkbn2vXXy?=
 =?us-ascii?Q?xFZSq/ViAMUWQWLfpCfysBHy/iWr0ag=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 173b34ee-6bbd-4cb8-e6e0-08da39c89e76
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:44.2587
 (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: Sd4R1DUUL2Ry9xQdMKDsXrOm/FhlVreHZPNI/I/HUx187V8OPQbQmoLaM3JFmoOm3ZDNmV/gKFvfqRQWu4aIf3PjEP4EJqEGB7mIAHrX/c0=
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>

With CM 3.5 the "core-other" register block evolves into the "redirect"
register block, which is capable of accessing not only the core local
registers of other cores but also the shared/global registers of other
clusters.

This patch generates accessor functions for shared/global registers
accessed via the redirect block, with "redir_" inserted after "gic_" in
their names. For example the accessor function:

  read_gic_config()

...accesses the GIC_CONFIG register of the GIC in the local cluster.
With this patch a new function:

  read_gic_redir_config()

...is added which accesses the GIC_CONFIG register of the GIC in
whichever cluster the GCR_CL_REDIRECT register is configured to access.

This mirrors the similar redirect block accessors already provided for
the CM & CPC.

Signed-off-by: Paul Burton <paulburton@kernel.org>
Signed-off-by: Chao-ying Fu <cfu@wavecomp.com>

diff --git a/arch/mips/include/asm/mips-gic.h b/arch/mips/include/asm/mips-gic.h
index 084cac1c5ea2..fd9da5e3beaa 100644
--- a/arch/mips/include/asm/mips-gic.h
+++ b/arch/mips/include/asm/mips-gic.h
@@ -28,11 +28,13 @@ extern void __iomem *mips_gic_base;
 
 /* For read-only shared registers */
 #define GIC_ACCESSOR_RO(sz, off, name)					\
-	CPS_ACCESSOR_RO(gic, sz, MIPS_GIC_SHARED_OFS + off, name)
+	CPS_ACCESSOR_RO(gic, sz, MIPS_GIC_SHARED_OFS + off, name)	\
+	CPS_ACCESSOR_RO(gic, sz, MIPS_GIC_REDIR_OFS + off, redir_##name)
 
 /* For read-write shared registers */
 #define GIC_ACCESSOR_RW(sz, off, name)					\
-	CPS_ACCESSOR_RW(gic, sz, MIPS_GIC_SHARED_OFS + off, name)
+	CPS_ACCESSOR_RW(gic, sz, MIPS_GIC_SHARED_OFS + off, name)	\
+	CPS_ACCESSOR_RW(gic, sz, MIPS_GIC_REDIR_OFS + off, redir_##name)
 
 /* For read-only local registers */
 #define GIC_VX_ACCESSOR_RO(sz, off, name)				\
@@ -45,7 +47,7 @@ extern void __iomem *mips_gic_base;
 	CPS_ACCESSOR_RW(gic, sz, MIPS_GIC_REDIR_OFS + off, vo_##name)
 
 /* For read-only shared per-interrupt registers */
-#define GIC_ACCESSOR_RO_INTR_REG(sz, off, stride, name)			\
+#define _GIC_ACCESSOR_RO_INTR_REG(sz, off, stride, name)		\
 static inline void __iomem *addr_gic_##name(unsigned int intr)		\
 {									\
 	return mips_gic_base + (off) + (intr * (stride));		\
@@ -58,8 +60,8 @@ static inline unsigned int read_gic_##name(unsigned int intr)		\
 }
 
 /* For read-write shared per-interrupt registers */
-#define GIC_ACCESSOR_RW_INTR_REG(sz, off, stride, name)			\
-	GIC_ACCESSOR_RO_INTR_REG(sz, off, stride, name)			\
+#define _GIC_ACCESSOR_RW_INTR_REG(sz, off, stride, name)		\
+	_GIC_ACCESSOR_RO_INTR_REG(sz, off, stride, name)		\
 									\
 static inline void write_gic_##name(unsigned int intr,			\
 				    unsigned int val)			\
@@ -68,22 +70,30 @@ static inline void write_gic_##name(unsigned int intr,			\
 	__raw_writel(val, addr_gic_##name(intr));			\
 }
 
+#define GIC_ACCESSOR_RO_INTR_REG(sz, off, stride, name)			\
+	_GIC_ACCESSOR_RO_INTR_REG(sz, off, stride, name)		\
+	_GIC_ACCESSOR_RO_INTR_REG(sz, MIPS_GIC_REDIR_OFS + off, stride, redir_##name)
+
+#define GIC_ACCESSOR_RW_INTR_REG(sz, off, stride, name)			\
+	_GIC_ACCESSOR_RW_INTR_REG(sz, off, stride, name)		\
+	_GIC_ACCESSOR_RW_INTR_REG(sz, MIPS_GIC_REDIR_OFS + off, stride, redir_##name)
+
 /* For read-only local per-interrupt registers */
 #define GIC_VX_ACCESSOR_RO_INTR_REG(sz, off, stride, name)		\
-	GIC_ACCESSOR_RO_INTR_REG(sz, MIPS_GIC_LOCAL_OFS + off,		\
+	_GIC_ACCESSOR_RO_INTR_REG(sz, MIPS_GIC_LOCAL_OFS + off,		\
 				 stride, vl_##name)			\
-	GIC_ACCESSOR_RO_INTR_REG(sz, MIPS_GIC_REDIR_OFS + off,		\
+	_GIC_ACCESSOR_RO_INTR_REG(sz, MIPS_GIC_REDIR_OFS + off,		\
 				 stride, vo_##name)
 
 /* For read-write local per-interrupt registers */
 #define GIC_VX_ACCESSOR_RW_INTR_REG(sz, off, stride, name)		\
-	GIC_ACCESSOR_RW_INTR_REG(sz, MIPS_GIC_LOCAL_OFS + off,		\
+	_GIC_ACCESSOR_RW_INTR_REG(sz, MIPS_GIC_LOCAL_OFS + off,		\
 				 stride, vl_##name)			\
-	GIC_ACCESSOR_RW_INTR_REG(sz, MIPS_GIC_REDIR_OFS + off,		\
+	_GIC_ACCESSOR_RW_INTR_REG(sz, MIPS_GIC_REDIR_OFS + off,		\
 				 stride, vo_##name)
 
 /* For read-only shared bit-per-interrupt registers */
-#define GIC_ACCESSOR_RO_INTR_BIT(off, name)				\
+#define _GIC_ACCESSOR_RO_INTR_BIT(off, name)				\
 static inline void __iomem *addr_gic_##name(void)			\
 {									\
 	return mips_gic_base + (off);					\
@@ -106,8 +116,8 @@ static inline unsigned int read_gic_##name(unsigned int intr)		\
 }
 
 /* For read-write shared bit-per-interrupt registers */
-#define GIC_ACCESSOR_RW_INTR_BIT(off, name)				\
-	GIC_ACCESSOR_RO_INTR_BIT(off, name)				\
+#define _GIC_ACCESSOR_RW_INTR_BIT(off, name)				\
+	_GIC_ACCESSOR_RO_INTR_BIT(off, name)				\
 									\
 static inline void write_gic_##name(unsigned int intr)			\
 {									\
@@ -146,6 +156,14 @@ static inline void change_gic_##name(unsigned int intr,			\
 	}								\
 }
 
+#define GIC_ACCESSOR_RO_INTR_BIT(off, name)				\
+	_GIC_ACCESSOR_RO_INTR_BIT(off, name)				\
+	_GIC_ACCESSOR_RO_INTR_BIT(MIPS_GIC_REDIR_OFS + off, redir_##name)
+
+#define GIC_ACCESSOR_RW_INTR_BIT(off, name)				\
+	_GIC_ACCESSOR_RW_INTR_BIT(off, name)				\
+	_GIC_ACCESSOR_RW_INTR_BIT(MIPS_GIC_REDIR_OFS + off, redir_##name)
+
 /* For read-only local bit-per-interrupt registers */
 #define GIC_VX_ACCESSOR_RO_INTR_BIT(sz, off, name)			\
 	GIC_ACCESSOR_RO_INTR_BIT(sz, MIPS_GIC_LOCAL_OFS + off,		\
@@ -155,10 +173,10 @@ static inline void change_gic_##name(unsigned int intr,			\
 
 /* For read-write local bit-per-interrupt registers */
 #define GIC_VX_ACCESSOR_RW_INTR_BIT(sz, off, name)			\
-	GIC_ACCESSOR_RW_INTR_BIT(sz, MIPS_GIC_LOCAL_OFS + off,		\
-				 vl_##name)				\
-	GIC_ACCESSOR_RW_INTR_BIT(sz, MIPS_GIC_REDIR_OFS + off,		\
-				 vo_##name)
+	_GIC_ACCESSOR_RW_INTR_BIT(sz, MIPS_GIC_LOCAL_OFS + off,		\
+				  vl_##name)				\
+	_GIC_ACCESSOR_RW_INTR_BIT(sz, MIPS_GIC_REDIR_OFS + off,		\
+				  vo_##name)
 
 /* GIC_SH_CONFIG - Information about the GIC configuration */
 GIC_ACCESSOR_RW(32, 0x000, config)
-- 
2.17.1