Received-SPF: pass (google.com: domain of linux-kernel+bounces-176478-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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 02/14] MIPS: GIC: Generate redirect block accessors
Date: Sat, 11 May 2024 12:43:29 +0200
Message-Id: <20240511104341.151550-3-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?UUXb9FGQWhIQUDfma9SZRSIZdEFZ7VmrD52y+Gx7pudZ2T4Sea361k2KgEQJ?=
 =?us-ascii?Q?+w1zRG7UbEYYIuE1sn2hl4SVX93lkv06wg30nCrSiwYwfQrjL4ehOW9oxApF?=
 =?us-ascii?Q?zjwovVVPEch64Spi13t7BJycSFz5ki+0dus/yIM9fM7a0Hc38COwK9H0IDdl?=
 =?us-ascii?Q?LwH3t65ssFHvf7W1f7bqGdL3fjz6ojxvJD5P+BbSYWTK0s+OGyzPdgG2x/r+?=
 =?us-ascii?Q?2hu8KdIZCsSA9P5cexiz8/Tuv8r9llBG3hls7MpUAnmRPkFzbEx1v4G9j2+n?=
 =?us-ascii?Q?jV9u0ZxAZdRQylK73wTCKnFJkhi2MnLHAL+zM+d3+RE6ZACY/+CGRu3aAest?=
 =?us-ascii?Q?DbR9/4K75pVU6Vn1JYVTGLqL27XZdXcdGcZST3HPUZRWEOo6cUHjAphJhHY/?=
 =?us-ascii?Q?EId49uQJs+KyaD1gMt4hMwbO1Z9ab1xst/1uktw1350C4AV3WbvYKfrlhI1R?=
 =?us-ascii?Q?hdZNXzWpnKbVrpvHnxTuGjm+OwyfOGQ9mr0olcfMqEK6xQG1gR7fguvLibrT?=
 =?us-ascii?Q?Iz7APj6JW5TulR+yurNZ+/Lf/6YRth1LKA1W4yLjOx7c0tlU1FzyCZWK3GlN?=
 =?us-ascii?Q?O5vORZpp0CLqfZnyIyIIhrfyzbquFv+EZWsHUCHDbpd5M6hUYXghqm007bHP?=
 =?us-ascii?Q?cImKWzM8mB48mCNzPUW2bQPqHZRHbkf2wdHWSd2ZuYmcYj3KF2tBlcCimpMx?=
 =?us-ascii?Q?4iWlpptLs4k1km2OzOHez8NP0pe109CENyExTiX+B5qe+gEh4oWmeZJoY9yf?=
 =?us-ascii?Q?IGumpHR8tfGzPL+9hT7KsRsnaAFhuweoS0B4Z1s1WMS9pVdk4Arg7F9yFSp7?=
 =?us-ascii?Q?BM1SW2Umz/LGPitJfV0OLb4nyjRRPIqfKjHSQ1gYEubYnVegO4N3pXbD/bxT?=
 =?us-ascii?Q?4QZucSi1uJq+CO8HOzQG1UB3lP0RiUzkIfcWH88A7pGqUAxKzAWp0h7dpygQ?=
 =?us-ascii?Q?Tzq+/7JI+bgCos7OxFoDZh37bXowCUoLzwvz57rDb/XtEn8vFmt5YEeplQz3?=
 =?us-ascii?Q?4oeu4W0ZvFWhxd5qi27nQbd/QEQtR9cqPXYvBlys6hHXZbAUv+aWiMI13hCR?=
 =?us-ascii?Q?I5c4i37A2ZJmRJTnc3cjSN3QyMUrkw7xmaqz959bRiDfxdj22d19+R1PiZQx?=
 =?us-ascii?Q?U+RhJ5DGfOtTOPurIvVHc/mTK0O6EP8f52hcEK53RYgkpzx5KskXH+MlPsjO?=
 =?us-ascii?Q?EZAg1d68Y1t0QJLAnyG0slwoeC3x6qWT17sFGnRw1rrcweJPte1FxPALHqmZ?=
 =?us-ascii?Q?todtQQ0FocoVkIq3ktiqDJKB6sqt2GMZZcZQTO24zRT7ZO3dsbn+KmN0Mxlv?=
 =?us-ascii?Q?Wd0vZcHeBRF9s87UiBX+8dyzKi5rxQszTgCa9+0GCsp30PouqievAEsyU397?=
 =?us-ascii?Q?y6Su7sryHBjQ9LEmypYL3CNSvKpHh2ggrm2eU3PchIlnS/Ae5pKvAHXdwjl3?=
 =?us-ascii?Q?DBk4qc35iP8GLpq4LfLoq2/8U7AVuhG2o+tilNWETIYwkgPnb6N56Wjo/meF?=
 =?us-ascii?Q?MdUzqaF6I59TU+FV4Fd5aWIJnbAoInoJ5v4uHPOAWtuEJe0+Yh+vX1yVHwGz?=
 =?us-ascii?Q?5btM7vmLiYt7xg5NEarQdYT8YupZK7PGHVBqUsa+r6irqx5MlmnFv1uaFBjJ?=
 =?us-ascii?Q?fA=3D=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 51756a92-7ff1-43b3-70a3-08dc71a73e72
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:50.6741
 (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: Z5xiCgwIGGFM17toWaPWTLwZcKJYJJv2W7rs/Ji/fk/KljKyNIKEkm4jLVRQOIlD8hPBpqi6IF8vgL2u4YVdIJ4bXMOXbtZQ5HzXM94h0lk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8449

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.

Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
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>
---
 arch/mips/include/asm/mips-gic.h | 50 ++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 16 deletions(-)

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.25.1