Received-SPF: pass (google.com: domain of linux-kernel+bounces-37973-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Thu, 25 Jan 2024 13:20:04 +0800
Subject: [PATCH v4 2/4] mailbox: imx: support return value of init
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240125-imx-mailbox-v4-2-800be5383c20@nxp.com>
References: <20240125-imx-mailbox-v4-0-800be5383c20@nxp.com>
In-Reply-To: <20240125-imx-mailbox-v4-0-800be5383c20@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_|AM9PR04MB8275:EE_
X-MS-Office365-Filtering-Correlation-Id: fd8404d7-f91a-4935-e6bd-08dc1d64b6bb
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:
	0XLVHGm0TQtfyZ+GRaHKsRhGF+/pMX3u1nP3TzZaDYXL7xiHEbibeFl335IbROGydLawBqisWyADKxFrTYcDT5hnegbj3DGNwSICZ63BVLnm+UlN6vz3HHsewpljDIu9lTA+Wr0+vMfpC22E3sJv7TLae2gr7BHBcOCDYV5NfJYKQ74KbwLEBs9SY1NakFG3OQtzp4mwmd7O6tZdZ40dCQEm+fHjJhSkRoJJjJCZLELLvU1DwF1g6w7Z6FK5BplsJDLTBSTcT8lyRJ6Yjw0+oFXe3QzEwJ6zS8r/nasKHN49qfVKU1gWFWWm6EpASPdpQBIzjahN4W/bPPdBTnH3Twq1ioJvD2ZEiMI4wpU9gOmNYYh9yitcgZpqyrte+q3naHdcKD3jmy4eyl6/mREgD0OpUVgzGrHqqCrd945wFZG/MYxfO4uKEHDGB8ocIBE6UTkAKsQcGEeXgjf+AIGxF1obfaKhZ/6T9Z8nuucj2lBC5B/QJuLA4iG6hOvjKOHs/r60GzGzwVRQk+/r7eUxeDHl6r3qKAoo6BpHq+eHPr+cEMRjl9bEV8U8YOnGNzJLav5kEnZkV/iiGs2/ufDGnA92rm37GsgcN2ZszN6CykDpHXUzlf5kTzKqDWLUVOji
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)(39860400002)(366004)(376002)(230922051799003)(1800799012)(186009)(64100799003)(451199024)(921011)(41300700001)(26005)(38350700005)(36756003)(9686003)(52116002)(6512007)(6506007)(6666004)(478600001)(6486002)(83380400001)(38100700002)(316002)(5660300002)(66476007)(15650500001)(66556008)(66946007)(7416002)(86362001)(110136005)(2906002)(4326008)(8676002)(8936002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?UGhma3FPeFF2SXdSQjZNQTNNYzV6QTJ2WE5WejNPeHYrdXZyRWxvdEFsUElT?=
 =?utf-8?B?dWgyRzBNbk5KNjdURDdRZTB3SVVNU3E5SkpoZ0tPWWJXZjlPQjc3endXUlVW?=
 =?utf-8?B?eGdHTmVEMElCZk9nY3VMWHhrb2s3eVg1UU5aTTVTc1h4MEtlMFlXeGF6QllL?=
 =?utf-8?B?b1JLVWxkTUJCUnhWK1RnSDJUOTQ3SkJRYXVyWWpuemtQaHM2M3pOdzFQYmll?=
 =?utf-8?B?ZXZTQ1c5TE1NSjg0OXhEZ3NTTUhRWHYyN1RlanVhQnFaN2VQWWFqQXpId0U4?=
 =?utf-8?B?RzQvYlVUMUk3YTgwTkFPWUYvRkJVZFFLWWZkZ2w1ZEVzQ0lIM0FOVVY0aUtM?=
 =?utf-8?B?VCtnU3V0LzBJQzN4d3ZZdjJkc0YyS05rZmRKbFBORWpGcEdldDVWdmhab2Nk?=
 =?utf-8?B?UTdjaDlaTjZNc0FEb3ZPcHdBNkh1MW9lL1U0NWUybUxsQXdoRVU0T1lQTG5t?=
 =?utf-8?B?Y3dNRXJUTE04blNTNW13TjRPZ3E1V3NRdGV6VzdxZmp2Ylp2VDdUT21wWURY?=
 =?utf-8?B?YlpUWVkvTW4wWnJVMnhpWVMyUi9tbkhWQ1o3RlQ0b3lJWlFrWkJXMUVhUUF2?=
 =?utf-8?B?bTNTQ1A3VFFVY1FYWlZzNG5GcHB6TC9OUmNrempGeVM2QUtkeDZNUnNPTnI4?=
 =?utf-8?B?d05RRWovdVRVSy92cWdaNzllTFRqSC9EU0dibkFWU2Jxa1kwbUZSTEtPSmRW?=
 =?utf-8?B?V2xIaVJmaVVOMmNod215dEtuaVVZUUlzSVNNMEtYYm1PbFJDSE5HREh0Rlpo?=
 =?utf-8?B?aTNKdTJhdUlPeGhmSWtjMzZqb0NsdTduckU5VzJ2NlFNYWwvSkRSeHZNdCto?=
 =?utf-8?B?TU8zUzFzdFNHNjhTVVpPNTlubHJac1piWm5Td0RjWXlDRzl3b0kyL3Zkdlll?=
 =?utf-8?B?YnZMZE1DcGp3UWNHblF6REkwQmtYSktRYkZVeFVRaXUvY0ZqcEY5cHluNFRQ?=
 =?utf-8?B?Um5qTnNaZXBadmFsazRBOW1oQkpyNC9JbkJiWnNuM0NjMFIzcUpXdWdGTUNo?=
 =?utf-8?B?a3lIcStkRkxUaGZ5dTYwdWw3bE9oVENTakpiQS9IdStGYUcrWFQvY3l2RmNE?=
 =?utf-8?B?RS9xUmErMUNOSk1QNGV5T3VQZXRKYW0yVnNhM3RaUmQ1YnV2cXNaeVpNY0xa?=
 =?utf-8?B?a0dLY2txSE55WEI4U3BZbzVvd3NSZ0Q2VkVyRkhaOUdjMWZwckptZEMxclVH?=
 =?utf-8?B?MEZyUUVERXgwNjl5Z25xblR1QnlUUDluSnZuVU9MWVZWV3ZUNEIxUzBLUUkv?=
 =?utf-8?B?UldaWWRDcURMckNkM1FKMnV5VXduNm4zeWlFaDZFcy82VGp1UUhFWkgxSENI?=
 =?utf-8?B?Q1M1N0FrNkQ4UzVJVTdmL0J3RTdxMWplUkRDOWpId1dleW1sVFlKcWJNOU1W?=
 =?utf-8?B?VHlyYzlEMTQ4UUg1Zmx6NjArK1g2aWZCMWQrbDhiWWFENXR1aDQ2QkVxTFAy?=
 =?utf-8?B?MmUrMUtvQ1VkeGZLeERKQkhyVUpnd2NuY2tRTkg3c004aGxJV3RBM0gzQ0xO?=
 =?utf-8?B?bUlDM29PWmd4OTJYNTdVZGtxVXo1cEg1WlZGOU9xMWkyaDd1TGErQ0VjZTlK?=
 =?utf-8?B?OG9PcnVvRmZmV1d5Ny91eFA0MDBHOHYwYW5vMGdiUXZxRWpSZlppbWU1VGpG?=
 =?utf-8?B?VmtCc1RyUDVPcTNsai9MdVBDMHJQWGVOMmpiV1h5dm93ZCtvMGptdlhDV2tE?=
 =?utf-8?B?cXQ3ck9NVkNtbC9hNGUrOVZRVjJjK1hFR3JnYTNvdUIyWjdLMW9LL2VXUXlQ?=
 =?utf-8?B?ZHBCYm1QYjdKZ0lBdkpydmR0cnlEYy9qYWpDNnM3Y0hBR0RuYWpTRTBqTkZR?=
 =?utf-8?B?UGpPVkprZVI3cjRCZmx0akk1MVNXY2s4SUQyNU80R3hVclc4d0dBVTA0R0JZ?=
 =?utf-8?B?R3ptZnNjRERDdzhwbGJWUGJqaCtMRFVvUlA5WDJZUHVSUGYyZEgwME1vS3Zp?=
 =?utf-8?B?M2JsMllpMGpMU1d3cHUzUEltd1oxQm1BZW9FbDJSdUlYckVjbU8wOStXKzV5?=
 =?utf-8?B?NkloM2ZzVVVEQ1dJU20wMXZzTGpNck1EZ082Rk1jTCt3aWczVkk2ZkQ0eXpD?=
 =?utf-8?B?STJkRGVCU09kQk1iSGE4NEwwbnVKdWk3V0hUZkpnb3Jiczg5SEcrcUlUUGFK?=
 =?utf-8?Q?rLFHTxfHuoavMYmUfUKT4DjGx?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fd8404d7-f91a-4935-e6bd-08dc1d64b6bb
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 05:15:58.0460
 (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: pcxfgHzifFWKwc4xx7I5CJuTBUDhoEF4auJ4qkPLuTGTmGcfVbKVgT6rieC5BAEBYVUA/CsUI0+5aENyrCyhlw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8275

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

There will be changes that init may fail, so adding return value for
init function.

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

diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index 656171362fe9..dced4614065f 100644
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -110,7 +110,7 @@ struct imx_mu_dcfg {
 	int (*tx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp, void *data);
 	int (*rx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp);
 	int (*rxdb)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp);
-	void (*init)(struct imx_mu_priv *priv);
+	int (*init)(struct imx_mu_priv *priv);
 	enum imx_mu_type type;
 	u32	xTR;		/* Transmit Register0 */
 	u32	xRR;		/* Receive Register0 */
@@ -737,7 +737,7 @@ static struct mbox_chan *imx_mu_seco_xlate(struct mbox_controller *mbox,
 	return imx_mu_xlate(mbox, sp);
 }
 
-static void imx_mu_init_generic(struct imx_mu_priv *priv)
+static int imx_mu_init_generic(struct imx_mu_priv *priv)
 {
 	unsigned int i;
 	unsigned int val;
@@ -757,7 +757,7 @@ static void imx_mu_init_generic(struct imx_mu_priv *priv)
 	priv->mbox.of_xlate = imx_mu_xlate;
 
 	if (priv->side_b)
-		return;
+		return 0;
 
 	/* Set default MU configuration */
 	for (i = 0; i < IMX_MU_xCR_MAX; i++)
@@ -770,9 +770,11 @@ static void imx_mu_init_generic(struct imx_mu_priv *priv)
 	/* Clear any pending RSR */
 	for (i = 0; i < IMX_MU_NUM_RR; i++)
 		imx_mu_read(priv, priv->dcfg->xRR + (i % 4) * 4);
+
+	return 0;
 }
 
-static void imx_mu_init_specific(struct imx_mu_priv *priv)
+static int imx_mu_init_specific(struct imx_mu_priv *priv)
 {
 	unsigned int i;
 	int num_chans = priv->dcfg->type & IMX_MU_V2_S4 ? IMX_MU_S4_CHANS : IMX_MU_SCU_CHANS;
@@ -794,12 +796,20 @@ static void imx_mu_init_specific(struct imx_mu_priv *priv)
 	/* Set default MU configuration */
 	for (i = 0; i < IMX_MU_xCR_MAX; i++)
 		imx_mu_write(priv, 0, priv->dcfg->xCR[i]);
+
+	return 0;
 }
 
-static void imx_mu_init_seco(struct imx_mu_priv *priv)
+static int imx_mu_init_seco(struct imx_mu_priv *priv)
 {
-	imx_mu_init_generic(priv);
+	int ret;
+
+	ret = imx_mu_init_generic(priv);
+	if (ret)
+		return ret;
 	priv->mbox.of_xlate = imx_mu_seco_xlate;
+
+	return 0;
 }
 
 static int imx_mu_probe(struct platform_device *pdev)
@@ -866,7 +876,11 @@ static int imx_mu_probe(struct platform_device *pdev)
 
 	priv->side_b = of_property_read_bool(np, "fsl,mu-side-b");
 
-	priv->dcfg->init(priv);
+	ret = priv->dcfg->init(priv);
+	if (ret) {
+		dev_err(dev, "Failed to init MU\n");
+		goto disable_clk;
+	}
 
 	spin_lock_init(&priv->xcr_lock);
 
@@ -878,10 +892,8 @@ static int imx_mu_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, priv);
 
 	ret = devm_mbox_controller_register(dev, &priv->mbox);
-	if (ret) {
-		clk_disable_unprepare(priv->clk);
-		return ret;
-	}
+	if (ret)
+		goto disable_clk;
 
 	pm_runtime_enable(dev);
 
@@ -899,6 +911,7 @@ static int imx_mu_probe(struct platform_device *pdev)
 
 disable_runtime_pm:
 	pm_runtime_disable(dev);
+disable_clk:
 	clk_disable_unprepare(priv->clk);
 	return ret;
 }

-- 
2.37.1