From: Peng Ma <peng.ma@nxp.com> To: "linux@rempel-privat.de" <linux@rempel-privat.de>, "kernel@pengutronix.de" <kernel@pengutronix.de>, "shawnguo@kernel.org" <shawnguo@kernel.org>, "s.hauer@pengutronix.de" <s.hauer@pengutronix.de> Cc: "festevam@gmail.com" <festevam@gmail.com>, dl-linux-imx <linux-imx@nxp.com>, "linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Peng Ma <peng.ma@nxp.com> Subject: [PATCH] i2c: imx: Defer probing if EDMA not available Date: Wed, 27 Nov 2019 07:12:09 +0000 [thread overview] Message-ID: <20191127071136.5240-1-peng.ma@nxp.com> (raw) EDMA may be not available or defered due to dependencies on other modules, If these scenarios is encountered, we should defer probing. Signed-off-by: Peng Ma <peng.ma@nxp.com> --- drivers/i2c/busses/i2c-imx.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 40111a3..c2b0693 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -369,8 +369,8 @@ static void i2c_imx_reset_regs(struct imx_i2c_struct *i2c_imx) } /* Functions for DMA support */ -static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, - dma_addr_t phy_addr) +static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, + dma_addr_t phy_addr) { struct imx_i2c_dma *dma; struct dma_slave_config dma_sconfig; @@ -379,7 +379,7 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dma = devm_kzalloc(dev, sizeof(*dma), GFP_KERNEL); if (!dma) - return; + return -ENOMEM; dma->chan_tx = dma_request_chan(dev, "tx"); if (IS_ERR(dma->chan_tx)) { @@ -424,7 +424,7 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dev_info(dev, "using %s (tx) and %s (rx) for DMA transfers\n", dma_chan_name(dma->chan_tx), dma_chan_name(dma->chan_rx)); - return; + return 0; fail_rx: dma_release_channel(dma->chan_rx); @@ -432,6 +432,8 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dma_release_channel(dma->chan_tx); fail_al: devm_kfree(dev, dma); + + return ret; } static void i2c_imx_dma_callback(void *arg) @@ -1605,10 +1607,14 @@ static int i2c_imx_probe(struct platform_device *pdev) dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n"); /* Init DMA config if supported */ - i2c_imx_dma_request(i2c_imx, phy_addr); + ret = i2c_imx_dma_request(i2c_imx, phy_addr); + if (ret == -EPROBE_DEFER) + goto i2c_adapter_remove; return 0; /* Return OK */ +i2c_adapter_remove: + i2c_del_adapter(&i2c_imx->adapter); clk_notifier_unregister: clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb); rpm_disable: -- 2.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Peng Ma <peng.ma@nxp.com> To: "linux@rempel-privat.de" <linux@rempel-privat.de>, "kernel@pengutronix.de" <kernel@pengutronix.de>, "shawnguo@kernel.org" <shawnguo@kernel.org>, "s.hauer@pengutronix.de" <s.hauer@pengutronix.de> Cc: Peng Ma <peng.ma@nxp.com>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, dl-linux-imx <linux-imx@nxp.com>, "festevam@gmail.com" <festevam@gmail.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org> Subject: [PATCH] i2c: imx: Defer probing if EDMA not available Date: Wed, 27 Nov 2019 07:12:09 +0000 [thread overview] Message-ID: <20191127071136.5240-1-peng.ma@nxp.com> (raw) EDMA may be not available or defered due to dependencies on other modules, If these scenarios is encountered, we should defer probing. Signed-off-by: Peng Ma <peng.ma@nxp.com> --- drivers/i2c/busses/i2c-imx.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 40111a3..c2b0693 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -369,8 +369,8 @@ static void i2c_imx_reset_regs(struct imx_i2c_struct *i2c_imx) } /* Functions for DMA support */ -static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, - dma_addr_t phy_addr) +static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, + dma_addr_t phy_addr) { struct imx_i2c_dma *dma; struct dma_slave_config dma_sconfig; @@ -379,7 +379,7 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dma = devm_kzalloc(dev, sizeof(*dma), GFP_KERNEL); if (!dma) - return; + return -ENOMEM; dma->chan_tx = dma_request_chan(dev, "tx"); if (IS_ERR(dma->chan_tx)) { @@ -424,7 +424,7 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dev_info(dev, "using %s (tx) and %s (rx) for DMA transfers\n", dma_chan_name(dma->chan_tx), dma_chan_name(dma->chan_rx)); - return; + return 0; fail_rx: dma_release_channel(dma->chan_rx); @@ -432,6 +432,8 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dma_release_channel(dma->chan_tx); fail_al: devm_kfree(dev, dma); + + return ret; } static void i2c_imx_dma_callback(void *arg) @@ -1605,10 +1607,14 @@ static int i2c_imx_probe(struct platform_device *pdev) dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n"); /* Init DMA config if supported */ - i2c_imx_dma_request(i2c_imx, phy_addr); + ret = i2c_imx_dma_request(i2c_imx, phy_addr); + if (ret == -EPROBE_DEFER) + goto i2c_adapter_remove; return 0; /* Return OK */ +i2c_adapter_remove: + i2c_del_adapter(&i2c_imx->adapter); clk_notifier_unregister: clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb); rpm_disable: -- 2.9.5 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-11-27 7:12 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-27 7:12 Peng Ma [this message] 2019-11-27 7:12 ` [PATCH] i2c: imx: Defer probing if EDMA not available Peng Ma 2019-11-27 7:12 ` Peng Ma 2019-11-27 7:27 ` Uwe Kleine-König 2019-11-27 7:27 ` Uwe Kleine-König 2019-11-27 7:27 ` Uwe Kleine-König 2019-11-28 2:45 ` [EXT] " Peng Ma 2019-11-28 2:45 ` Peng Ma 2019-11-28 2:45 ` Peng Ma 2019-11-28 10:06 ` Russell King - ARM Linux admin 2019-11-28 10:06 ` Russell King - ARM Linux admin 2019-11-28 10:06 ` Russell King - ARM Linux admin 2019-12-11 10:25 ` [EXT] " Peng Ma 2019-12-11 10:25 ` Peng Ma 2019-12-11 10:25 ` Peng Ma 2019-12-11 10:43 ` Russell King - ARM Linux admin 2019-12-11 10:43 ` Russell King - ARM Linux admin 2019-12-11 10:43 ` Russell King - ARM Linux admin 2019-12-11 11:22 ` Peng Ma 2019-12-11 11:22 ` Peng Ma 2019-12-11 11:42 ` Russell King - ARM Linux admin 2019-12-11 11:42 ` Russell King - ARM Linux admin 2019-12-11 11:42 ` Russell King - ARM Linux admin 2019-12-12 3:09 ` Peng Ma 2019-12-12 3:09 ` Peng Ma 2019-12-12 3:09 ` Peng Ma 2019-12-12 10:58 ` Russell King - ARM Linux admin 2019-12-12 10:58 ` Russell King - ARM Linux admin 2019-12-12 10:58 ` Russell King - ARM Linux admin 2019-12-13 10:33 ` Peng Ma 2019-12-13 10:33 ` Peng Ma 2019-12-13 10:33 ` Peng Ma 2019-12-13 10:50 ` Russell King - ARM Linux admin 2019-12-13 10:50 ` Russell King - ARM Linux admin 2019-12-13 10:50 ` Russell King - ARM Linux admin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191127071136.5240-1-peng.ma@nxp.com \ --to=peng.ma@nxp.com \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@rempel-privat.de \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.