From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CBF8BC47422 for ; Thu, 25 Jan 2024 09:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iEE8THSRyBxG/nywTqADnQS4eVmrb046RKMPxAxKh4Y=; b=zVRpdaCYmEUWk5 O4PHuWWXbudIlKOdVygJxQk9BgzPRtRDx5jw5mEgkhEXC45pFQsUXZYlsj3Pa1OHtlBg3G+m7ZfI3 KHno+ftxa6mpAOhiA7VIPB0jguU++gzlpvhk74+wjdUxSHBNHRtjPgOzSfOFTsDq6M+xScGvXkm9m KQPjovRalZjzfsNhmSX87pfZjXB+CEWhPJkTz8TN9PGFZ/5MHYHWtiJDIVxsIvqeCDApkpnHbcndq rNNuNQp4YR7jDD1DwR0ax1/kQF1fuDRnngn8UupRQdQv5Zm8ZME2Hsk7ZIjxemomHXIQE9ATSdHbM H/7kpyfXZFCDdVCh6hBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSvmU-007UDE-0V; Thu, 25 Jan 2024 09:12:18 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSvmI-007U5y-0z for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 09:12:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1706173926; x=1737709926; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FeUFODrwDWTHKBoEZylP9hxRYVHRbSJKlDURreDdsJk=; b=P+dwIYGI0Av6XjvqTZmFs8N0mhivgWjyJ85qZdBDqplqMxRn4QtVKgrq xnS4Lf8taCLqi3W+qwv6DbuWhzyzZ/hW2ml6Is2fNfzOyJYjgQ7I918ja o4dZo/1Zwv536Dp9cB59jOrPmiyKsoycOlNITwBWxTsgjGKSIQheefsGK OrWwUDs6qG/bkcRCRxV4uzBpTp2ErB8PgLUNYNGWLP3/2agvjV6uMFv0E bF6P5gijIgsb9+ltB+RDzkASVmwJxqsP3b5J5Vk56nBp0kBSsyavrRFUd LXtVhtJkFVln327u+e0UIik1zSX1LDA16zAT6a9Zukc6ODFIh6VH/jOPU g==; X-IronPort-AV: E=Sophos;i="6.05,216,1701126000"; d="scan'208";a="35071346" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 25 Jan 2024 10:11:58 +0100 Received: from steina-w.localnet (steina-w.tq-net.de [10.123.53.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 62619280075; Thu, 25 Jan 2024 10:11:55 +0100 (CET) From: Alexander Stein To: Jassi Brar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dong Aisheng , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peng Fan , "Peng Fan (OSS)" Subject: Re: [PATCH v4 2/4] mailbox: imx: support return value of init Date: Thu, 25 Jan 2024 10:11:54 +0100 Message-ID: <5774190.DvuYhMxLoT@steina-w> Organization: TQ-Systems GmbH In-Reply-To: <20240125-imx-mailbox-v4-2-800be5383c20@nxp.com> References: <20240125-imx-mailbox-v4-0-800be5383c20@nxp.com> <20240125-imx-mailbox-v4-2-800be5383c20@nxp.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_011206_963443_59A806FC X-CRM114-Status: GOOD ( 21.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Peng, Am Donnerstag, 25. Januar 2024, 06:20:04 CET schrieb Peng Fan (OSS): > From: Peng Fan > = > There will be changes that init may fail, so adding return value for > init function. > = > Signed-off-by: Peng Fan > --- > 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 =3D imx_mu_xlate; > = > if (priv->side_b) > - return; > + return 0; > = > /* Set default MU configuration */ > for (i =3D 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 =3D 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 =3D 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 =3D 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 =3D imx_mu_init_generic(priv); > + if (ret) > + return ret; > priv->mbox.of_xlate =3D 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 =3D of_property_read_bool(np, "fsl,mu-side-b"); > = > - priv->dcfg->init(priv); > + ret =3D priv->dcfg->init(priv); > + if (ret) { > + dev_err(dev, "Failed to init MU\n"); As this is during probe, I rather use dev_err_probe right away. Even if dcf= g- >init won't return -EPROBE_DEFER for now. Best regards, Alexander > + 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 =3D 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; > } -- = TQ-Systems GmbH | M=FChlstra=DFe 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht M=FCnchen, HRB 105018 Gesch=E4ftsf=FChrer: Detlef Schneider, R=FCdiger Stahl, Stefan Schneider http://www.tq-group.com/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel