Received-SPF: pass (google.com: domain of linux-kernel+bounces-32266-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Mon, 22 Jan 2024 10:06:25 +0800
Subject: [PATCH 2/3] mailbox: imx: get RR/TR registers num from Parameter
 register
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240122-imx-mailbox-v1-2-81413f655210@nxp.com>
References: <20240122-imx-mailbox-v1-0-81413f655210@nxp.com>
In-Reply-To: <20240122-imx-mailbox-v1-0-81413f655210@nxp.com>
To: Jassi Brar <jassisinghbrar@gmail.com>, Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Dong Aisheng <aisheng.dong@nxp.com>, 
 Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, 
 linux-arm-kernel@lists.infradead.org, Peng Fan <peng.fan@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DB9PR04MB8153:EE_
X-MS-Office365-Filtering-Correlation-Id: 6f7b6291-00a5-40f1-a548-08dc1aee2543
X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	ntZM5BGuUHlDRZyguZWqqTarD/HQnYydv4KjRN7d/5SM6PjEeL6VZi3axQBbqm/rMVBSswp64x5xCddZTEDcLXncPetRMmz+huJpJIhxYn9nhEM+NcfKp7Ql/JiEE8IYjtRmd187KvkCEoDgX/fL3AdylGGVT3eniUAMvuBeWT2lTbwYLKt6IzatjAGLMLlO0Km5ywrcuwY0ANnzCSl+j4h6z+GLf5STCHk7uwdNQdQmxC7qFZcC1DLI4xAXZVV8N2Za4bdeWTVq0ipWp4e21eku5ZG7wPWLs0TwvxCvYLayfDTqjI3tMpjxJzE+oBmv4LqdtUViuEME9sOEzxFtOFTOegP4f4ihcqCXSwqRx5HvzAwM70683k5rhX4ziHiDsvO+gu+skslG77kTGPa7kjpumVMivV0+9MPy9CnXn3/zWuhHI/yctkTskfurdQxm25XJAvXKiNCAMiYyK1BAEuxExSWK0dCS9pQA8nGaGRNXsxFb+ViZe6L3VkLwDMx8nJBU9xVcBhi3xcJ4HP+d8oev0xTCoevj+o5LiZSGGor0bInBPAuDcmWa84jrcaNdMkLFRn9IL9LUClfvgkoJLeDoQO/eVMLDOuu7ZoTOCdowqD2XcZ47YMDv4YZh2y5yuqYOtcfMKSiDCr+Fv68ykQ==
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(396003)(366004)(39860400002)(376002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(26005)(6506007)(6666004)(6512007)(9686003)(52116002)(83380400001)(478600001)(5660300002)(7416002)(15650500001)(2906002)(41300700001)(6486002)(110136005)(8936002)(4326008)(66556008)(66476007)(316002)(66946007)(8676002)(921011)(36756003)(38100700002)(86362001)(38350700005);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?UlcyZ1VRY2NHYkVRaEhHMVdkaC9uc3Z5STREa2Z3Rk1ReGFob0xmQ0J6Z1Rq?=
 =?utf-8?B?OHZwNTJFM2x1UXNmNmkxeXVOZ0dOa3phYm1xWCtON2pHT1I3SXVGOG1rbXRz?=
 =?utf-8?B?YmZEZlF1c2RBNjJzdUM1N25DVmp0MzhISjVCZFdpekc3ZHluN2ZsRGxhYlJ4?=
 =?utf-8?B?bWluYWNjc3RrZHJ0aVltbmo4bVlNS201ek1kVzhCSm5LRXUwWHRvbS9vdW5i?=
 =?utf-8?B?T2tKN3Uycm5neVQxbGxoMFlxOU01VFd4ZjdWdkNXYjNsSDFTTkdsbmtkR0xt?=
 =?utf-8?B?R3djczNFQ3gzTXZVTjF6K3RqNDlwcGZFMmhxL3YvRzRJYUJWV2VyNUQ2Vloz?=
 =?utf-8?B?L2FaQlpaVE4wU1JxUVVkbDhvWG9PeEdILzN2bUtLdGpVdFV1a1hmSzRtRGxv?=
 =?utf-8?B?ZXNsc2x3cTByaEZZTjVPMmxPT24xbEZqalJVbDBSanYrWXFaWU5obUVUY1h0?=
 =?utf-8?B?M3Y3WGdmVnArM1NnbmFxalNlWkVka21jdHZZeDB2Mm1qb2JSeXdYZm5Ddy9S?=
 =?utf-8?B?ZUE2MjVQVWJ4N1ZMeUxxM004RVc5WjRBSlRTVGoxdkFvR0RBUW5EQXNad1pp?=
 =?utf-8?B?ZEluZzdtMWdBQWM5dENFcmpnTW03K21XUVlWSzJieFhnTGEyTzJrSzAzOUFQ?=
 =?utf-8?B?QUFITVBneThqc0VwYUN1NE93UUlBYjlLOVhITDg1amQ5WlM0b21RNWFmOGt6?=
 =?utf-8?B?TTlZUG56NEptR3BLTHRNcWtMQUw1bFA4R2hHeDNGUHVNK3o5eWdQcnRnSlVM?=
 =?utf-8?B?Zys1VENHaHI4M1RXOTl4SFk4OTI5UHZ4VjBLcjR4S014dEZ1NEpvdlpBWko0?=
 =?utf-8?B?aEJFb0VUSlhwbXFpTEtDNzYzS2xLaWp0bVlNSXM0VDFJRTNwK1ZrL1dnMm5X?=
 =?utf-8?B?U3BZQ3Z5SkhGTFM4R2xjVXJid05oQWVvTDdwNzBjZm5JZjBkamw2RGh4Qktn?=
 =?utf-8?B?aWlZcXJ3ajZ6c3FxL1gxZnQrd0ZTdkdISkcxTCtUV25GVW9TaWJxNkdXNnN1?=
 =?utf-8?B?U1hwZ3JxMk1FemJMdzd6dUpRZUcrQTFzUzJ2bmIyRGYwTklHZEZ0OGd2Vzhh?=
 =?utf-8?B?Q0hjSlFLQkdMTm1zRHZqRitvSlpEVkQ3RGEwTzYvc2VpZHF3bG1VNWVhSU1r?=
 =?utf-8?B?TElpblNDeTJ0aWJwL3FJVkE2UFl1SWlJclZ6aytob1NqclE2cktELzdSUWNB?=
 =?utf-8?B?Mi94Mjl1cnJscTFML0I4ekU3amVYT0tQaFN6VjR6eG8waVczby9UamZ5UjZz?=
 =?utf-8?B?aS8zNDNLZGR4U2paY1VkQWIzMFU2RC9Yang2dHdTMTZzWDRRa3hCelB0bmlp?=
 =?utf-8?B?VjlrTTMrK2dEMEVHM3pDRVFWOENhRGFVaXNCR3FjY1FHdEhjb2hZbnZvTzhF?=
 =?utf-8?B?ZmU4V2VrdnFxczM5RnB2YkpXeHJUZ09GOTZDV091Ny9GdGZNNHVRYzRMeGl6?=
 =?utf-8?B?S1d1eDhMSkxoQmEwS01OMEZNV3J5WmNrVkZXczczN0dQcHRURmJpWVFBMDI0?=
 =?utf-8?B?MnJhS2NqRlFQRzByRFFaOEtzdysyc2VqYUF1RkpOVWJxNXRLMmRaWjlKWGJI?=
 =?utf-8?B?aGFuUHQ4Q1hoVTl4UUxSODFEZE5RNTJPb1lET3dXSHV2b0NIRThxbHNWaUlS?=
 =?utf-8?B?VmtiL0dxVFJXTzlueE5iS0JuSTUxTHRhakhvdXJGM3ptSkxNbWQxbG1tUFRx?=
 =?utf-8?B?SElCUm4yZlJDVHZjbGVydjI3L0g3blcxa3dCVXMrRnMyNW5CSzBaQ0dKQURo?=
 =?utf-8?B?OTBuN01SRU1qTEVwdHZHSmtGRzlqZ0p4YlV6dEVwRXNyNjlQOHgvWDROMldC?=
 =?utf-8?B?a1dNdElkZzJHR2pUMTNZcFZ5aHQ2K2pOZVZ0ZXJsTExwV1BzYytPbmNaVDFN?=
 =?utf-8?B?Q3h4c2Q3SVhRaDNycWNDVDZXRW9PcS9VTWlQNXZmRDZQUEUvNnVkY1FTUTFK?=
 =?utf-8?B?NWFHRHNUQkFCZWZ3YnNaUk9nK3l1d0M1d1F5bkJFMm5ScDJEU0R3MHhjQ1Rx?=
 =?utf-8?B?VC9FankwOUVUeWcxYkM2TXF6OUMyUFdzcjFldStsMXc2ZXRBSWp0Ym16MXNH?=
 =?utf-8?B?c1ZERVV3dGdIUGl3NmxhWjVlNGFvVWhIby9vLzhSaGJmZWV1Y2lzSzAxU05z?=
 =?utf-8?Q?fob5XuLP8N1pcFlPh12g6C5Nd?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6f7b6291-00a5-40f1-a548-08dc1aee2543
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2024 02:02:11.0629
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wOESyfKIYr2ai24U8tVkdK3QdZvYrxbpuhydCyoyMqW5gxHt+ZWg91ySo5Syqw7aw1qqpKyXqwZkXzo/CDp+dg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8153

From: Peng Fan <peng.fan@nxp.com>

i.MX8ULP, i.MX93 MU has a Parameter register encoded as below:
BIT: 15 --- 8 | 7 --- 0
      RR_NUM    TR_NUM

So to make driver easy to support more variants, get the RR/TR
registers number from Parameter register.

The patch only adds support the specific MU, such as ELE MU.
For generic MU, not add support for number larger than 4.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/mailbox/imx-mailbox.c | 46 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index 656171362fe9..f2a21baded29 100644
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -29,7 +29,9 @@
 #define IMX_MU_S4_CHANS		2
 #define IMX_MU_CHAN_NAME_SIZE	20
 
-#define IMX_MU_NUM_RR		4
+#define IMX_MU_V2_PAR_OFF	0x4
+#define IMX_MU_V2_TR_MASK	GENMASK(7, 0)
+#define IMX_MU_V2_RR_MASK	GENMASK(15, 8)
 
 #define IMX_MU_SECO_TX_TOUT (msecs_to_jiffies(3000))
 #define IMX_MU_SECO_RX_TOUT (msecs_to_jiffies(3000))
@@ -93,10 +95,11 @@ struct imx_mu_priv {
 	struct clk		*clk;
 	int			irq[IMX_MU_CHANS];
 	bool			suspend;
-
-	u32 xcr[IMX_MU_xCR_MAX];
-
 	bool			side_b;
+
+	u32			xcr[IMX_MU_xCR_MAX];
+	u32			num_tr;
+	u32			num_rr;
 };
 
 enum imx_mu_type {
@@ -264,18 +267,17 @@ static int imx_mu_generic_rxdb(struct imx_mu_priv *priv,
 static int imx_mu_specific_tx(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp, void *data)
 {
 	u32 *arg = data;
+	u32 num_tr = priv->num_tr;
 	int i, ret;
 	u32 xsr;
-	u32 size, max_size, num_tr;
+	u32 size, max_size;
 
 	if (priv->dcfg->type & IMX_MU_V2_S4) {
 		size = ((struct imx_s4_rpc_msg_max *)data)->hdr.size;
 		max_size = sizeof(struct imx_s4_rpc_msg_max);
-		num_tr = 8;
 	} else {
 		size = ((struct imx_sc_rpc_msg_max *)data)->hdr.size;
 		max_size = sizeof(struct imx_sc_rpc_msg_max);
-		num_tr = 4;
 	}
 
 	switch (cp->type) {
@@ -324,6 +326,7 @@ static int imx_mu_specific_rx(struct imx_mu_priv *priv, struct imx_mu_con_priv *
 	int i, ret;
 	u32 xsr;
 	u32 size, max_size;
+	u32 num_rr = priv->num_rr;
 
 	data = (u32 *)priv->msg;
 
@@ -345,13 +348,13 @@ static int imx_mu_specific_rx(struct imx_mu_priv *priv, struct imx_mu_con_priv *
 
 	for (i = 1; i < size; i++) {
 		ret = readl_poll_timeout(priv->base + priv->dcfg->xSR[IMX_MU_RSR], xsr,
-					 xsr & IMX_MU_xSR_RFn(priv->dcfg->type, i % 4), 0,
+					 xsr & IMX_MU_xSR_RFn(priv->dcfg->type, i % num_rr), 0,
 					 5 * USEC_PER_SEC);
 		if (ret) {
 			dev_err(priv->dev, "timeout read idx %d\n", i);
 			return ret;
 		}
-		*data++ = imx_mu_read(priv, priv->dcfg->xRR + (i % 4) * 4);
+		*data++ = imx_mu_read(priv, priv->dcfg->xRR + (i % num_rr) * 4);
 	}
 
 	imx_mu_xcr_rmw(priv, IMX_MU_RCR, IMX_MU_xCR_RIEn(priv->dcfg->type, 0), 0);
@@ -737,11 +740,30 @@ static struct mbox_chan *imx_mu_seco_xlate(struct mbox_controller *mbox,
 	return imx_mu_xlate(mbox, sp);
 }
 
+static void imx_mu_get_tr_rr(struct imx_mu_priv *priv)
+{
+	u32 val;
+
+	if (priv->dcfg->type & IMX_MU_V2) {
+		val = imx_mu_read(priv, IMX_MU_V2_PAR_OFF);
+		priv->num_tr = FIELD_GET(IMX_MU_V2_TR_MASK, val);
+		priv->num_rr = FIELD_GET(IMX_MU_V2_RR_MASK, val);
+	} else {
+		priv->num_tr = 4;
+		priv->num_rr = 4;
+	}
+}
+
 static void imx_mu_init_generic(struct imx_mu_priv *priv)
 {
 	unsigned int i;
 	unsigned int val;
 
+	if (priv->num_rr > 4 || priv->num_tr > 4) {
+		WARN_ONCE(true, "%s not support TR/RR larger than 4\n", __func__);
+		return;
+	}
+
 	for (i = 0; i < IMX_MU_CHANS; i++) {
 		struct imx_mu_con_priv *cp = &priv->con_priv[i];
 
@@ -768,8 +790,8 @@ static void imx_mu_init_generic(struct imx_mu_priv *priv)
 	imx_mu_write(priv, val, priv->dcfg->xSR[IMX_MU_GSR]);
 
 	/* Clear any pending RSR */
-	for (i = 0; i < IMX_MU_NUM_RR; i++)
-		imx_mu_read(priv, priv->dcfg->xRR + (i % 4) * 4);
+	for (i = 0; i < priv->num_rr; i++)
+		imx_mu_read(priv, priv->dcfg->xRR + i * 4);
 }
 
 static void imx_mu_init_specific(struct imx_mu_priv *priv)
@@ -864,6 +886,8 @@ static int imx_mu_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	imx_mu_get_tr_rr(priv);
+
 	priv->side_b = of_property_read_bool(np, "fsl,mu-side-b");
 
 	priv->dcfg->init(priv);

-- 
2.37.1