From: Amelie Delaunay <amelie.delaunay@st.com> To: Vinod Koul <vkoul@kernel.org>, Dan Williams <dan.j.williams@intel.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Alexandre Torgue <alexandre.torgue@st.com> Cc: <dmaengine@vger.kernel.org>, <linux-stm32@st-md-mailman.stormreply.com>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, Amelie Delaunay <amelie.delaunay@st.com>, Pierre-Yves MORDRET <pierre-yves.mordret@st.com> Subject: [PATCH 3/8] dmaengine: stm32-dma: driver defers probe for reset Date: Wed, 29 Jan 2020 16:36:23 +0100 [thread overview] Message-ID: <20200129153628.29329-4-amelie.delaunay@st.com> (raw) In-Reply-To: <20200129153628.29329-1-amelie.delaunay@st.com> From: Etienne Carriere <etienne.carriere@st.com> Change STM32 DMA driver to defer its probe operation when reset controller is expected but has not been probed yet when DMA device is probed. Changes error traces when failing to get a system resource so that it is not printed on failure with deferred probing. Signed-off-by: Etienne Carriere <etienne.carriere@st.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- drivers/dma/stm32-dma.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index e31414796ec4..c8bbe08b8e32 100644 --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -1296,8 +1296,10 @@ static int stm32_dma_probe(struct platform_device *pdev) dmadev->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(dmadev->clk)) { - dev_err(&pdev->dev, "Error: Missing controller clock\n"); - return PTR_ERR(dmadev->clk); + ret = PTR_ERR(dmadev->clk); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "Can't get clock\n"); + return ret; } ret = clk_prepare_enable(dmadev->clk); @@ -1310,7 +1312,11 @@ static int stm32_dma_probe(struct platform_device *pdev) "st,mem2mem"); rst = devm_reset_control_get(&pdev->dev, NULL); - if (!IS_ERR(rst)) { + if (IS_ERR(rst)) { + ret = PTR_ERR(rst); + if (ret == -EPROBE_DEFER) + goto clk_free; + } else { reset_control_assert(rst); udelay(2); reset_control_deassert(rst); @@ -1470,10 +1476,11 @@ static struct platform_driver stm32_dma_driver = { .of_match_table = stm32_dma_of_match, .pm = &stm32_dma_pm_ops, }, + .probe = stm32_dma_probe, }; static int __init stm32_dma_init(void) { - return platform_driver_probe(&stm32_dma_driver, stm32_dma_probe); + return platform_driver_register(&stm32_dma_driver); } subsys_initcall(stm32_dma_init); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Amelie Delaunay <amelie.delaunay@st.com> To: Vinod Koul <vkoul@kernel.org>, Dan Williams <dan.j.williams@intel.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Alexandre Torgue <alexandre.torgue@st.com> Cc: Amelie Delaunay <amelie.delaunay@st.com>, linux-kernel@vger.kernel.org, Pierre-Yves MORDRET <pierre-yves.mordret@st.com>, dmaengine@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/8] dmaengine: stm32-dma: driver defers probe for reset Date: Wed, 29 Jan 2020 16:36:23 +0100 [thread overview] Message-ID: <20200129153628.29329-4-amelie.delaunay@st.com> (raw) In-Reply-To: <20200129153628.29329-1-amelie.delaunay@st.com> From: Etienne Carriere <etienne.carriere@st.com> Change STM32 DMA driver to defer its probe operation when reset controller is expected but has not been probed yet when DMA device is probed. Changes error traces when failing to get a system resource so that it is not printed on failure with deferred probing. Signed-off-by: Etienne Carriere <etienne.carriere@st.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- drivers/dma/stm32-dma.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index e31414796ec4..c8bbe08b8e32 100644 --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -1296,8 +1296,10 @@ static int stm32_dma_probe(struct platform_device *pdev) dmadev->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(dmadev->clk)) { - dev_err(&pdev->dev, "Error: Missing controller clock\n"); - return PTR_ERR(dmadev->clk); + ret = PTR_ERR(dmadev->clk); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "Can't get clock\n"); + return ret; } ret = clk_prepare_enable(dmadev->clk); @@ -1310,7 +1312,11 @@ static int stm32_dma_probe(struct platform_device *pdev) "st,mem2mem"); rst = devm_reset_control_get(&pdev->dev, NULL); - if (!IS_ERR(rst)) { + if (IS_ERR(rst)) { + ret = PTR_ERR(rst); + if (ret == -EPROBE_DEFER) + goto clk_free; + } else { reset_control_assert(rst); udelay(2); reset_control_deassert(rst); @@ -1470,10 +1476,11 @@ static struct platform_driver stm32_dma_driver = { .of_match_table = stm32_dma_of_match, .pm = &stm32_dma_pm_ops, }, + .probe = stm32_dma_probe, }; static int __init stm32_dma_init(void) { - return platform_driver_probe(&stm32_dma_driver, stm32_dma_probe); + return platform_driver_register(&stm32_dma_driver); } subsys_initcall(stm32_dma_init); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-01-29 15:37 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-29 15:36 [PATCH 0/8] STM32 DMA driver fixes and improvements Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-01-29 15:36 ` [PATCH 1/8] dmaengine: stm32-dma: add suspend/resume power management support Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-01-29 15:36 ` [PATCH 2/8] dmaengine: stm32-dma: use reset controller only at probe time Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay [this message] 2020-01-29 15:36 ` [PATCH 3/8] dmaengine: stm32-dma: driver defers probe for reset Amelie Delaunay 2020-01-29 15:36 ` [PATCH 4/8] dmaengine: stm32-dma: enable descriptor_reuse Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-01-29 15:36 ` [PATCH 5/8] dmaengine: stm32-dma: use dma_set_max_seg_size to set the sg limit Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-01-29 15:36 ` [PATCH 6/8] dmaengine: stm32-dma: add copy_align constraint Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-01-29 15:36 ` [PATCH 7/8] dmaengine: stm32-dma: fix sleeping function called from invalid context Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-01-29 15:36 ` [PATCH 8/8] dmaengine: stm32-dma: use vchan_terminate_vdesc() in .terminate_all Amelie Delaunay 2020-01-29 15:36 ` Amelie Delaunay 2020-02-25 5:45 ` [PATCH 0/8] STM32 DMA driver fixes and improvements Vinod Koul 2020-02-25 5:45 ` Vinod Koul
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=20200129153628.29329-4-amelie.delaunay@st.com \ --to=amelie.delaunay@st.com \ --cc=alexandre.torgue@st.com \ --cc=dan.j.williams@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=pierre-yves.mordret@st.com \ --cc=vkoul@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.