diff mbox series

[v3] dmaengine: ti: k3-udma: Deferring probe when soc_device_match() returns NULL

Message ID 20221117184406.292416-1-nfrayer@baylibre.com
State New
Headers
Series [v3] dmaengine: ti: k3-udma: Deferring probe when soc_device_match() returns NULL |

Commit Message

Nicolas Frayer Nov. 17, 2022, 6:44 p.m. UTC 
  When the k3 socinfo driver is built as a module, there is a possibility
that it will probe after the k3 udma driver and the later returns -ENODEV.
By deferring the k3 udma probe we allow the k3 socinfo to probe and
register the soc_device_attribute structure needed by the k3 udma driver.
Removed the dev_err() message as well as it's deferring and not failing.

Signed-off-by: Nicolas Frayer <nfrayer@baylibre.com>
---
v1->v2:
Extracted this patch from the following series:
https://lore.kernel.org/all/20221108181144.433087-1-nfrayer@baylibre.com/

v2->v3:
Removed the dev_err() message

 drivers/dma/ti/k3-udma.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Kevin Hilman Nov. 18, 2022, 8:11 p.m. UTC | #1 
Nicolas Frayer <nfrayer@baylibre.com> writes:

> When the k3 socinfo driver is built as a module, there is a possibility
> that it will probe after the k3 udma driver and the later returns -ENODEV.
> By deferring the k3 udma probe we allow the k3 socinfo to probe and
> register the soc_device_attribute structure needed by the k3 udma driver.
> Removed the dev_err() message as well as it's deferring and not failing.
>
> Signed-off-by: Nicolas Frayer <nfrayer@baylibre.com>

Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Vinod Koul Dec. 28, 2022, 11:16 a.m. UTC | #2 
On 17-11-22, 19:44, Nicolas Frayer wrote:
> When the k3 socinfo driver is built as a module, there is a possibility
> that it will probe after the k3 udma driver and the later returns -ENODEV.
> By deferring the k3 udma probe we allow the k3 socinfo to probe and
> register the soc_device_attribute structure needed by the k3 udma driver.
> Removed the dev_err() message as well as it's deferring and not failing.

lgtm, but need rebase as I already picked commit 3f58e10615f3 dmaengine: ti:
k3-udma: Add support for BCDMA CSI RX

> 
> Signed-off-by: Nicolas Frayer <nfrayer@baylibre.com>
> ---
> v1->v2:
> Extracted this patch from the following series:
> https://lore.kernel.org/all/20221108181144.433087-1-nfrayer@baylibre.com/
> 
> v2->v3:
> Removed the dev_err() message
> 
>  drivers/dma/ti/k3-udma.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
> index ce8b80bb34d7..ca1512eb9910 100644
> --- a/drivers/dma/ti/k3-udma.c
> +++ b/drivers/dma/ti/k3-udma.c
> @@ -5271,10 +5271,10 @@ static int udma_probe(struct platform_device *pdev)
>  	ud->match_data = match->data;
>  
>  	soc = soc_device_match(k3_soc_devices);
> -	if (!soc) {
> -		dev_err(dev, "No compatible SoC found\n");
> -		return -ENODEV;
> -	}
> +
> +	if (!soc)
> +		return -EPROBE_DEFER;
> +
>  	ud->soc_data = soc->data;
>  
>  	ret = udma_get_mmrs(pdev, ud);
> -- 
> 2.25.1
Péter Ujfalusi Dec. 29, 2022, 4:29 p.m. UTC | #3 
On 28/12/2022 13:16, Vinod Koul wrote:
> On 17-11-22, 19:44, Nicolas Frayer wrote:
>> When the k3 socinfo driver is built as a module, there is a possibility
>> that it will probe after the k3 udma driver and the later returns -ENODEV.
>> By deferring the k3 udma probe we allow the k3 socinfo to probe and
>> register the soc_device_attribute structure needed by the k3 udma driver.
>> Removed the dev_err() message as well as it's deferring and not failing.
> 
> lgtm, but need rebase as I already picked commit 3f58e10615f3 dmaengine: ti:
> k3-udma: Add support for BCDMA CSI RX

Is this path needed at all? afaik the k3 socinfo is not going to be 
module built.

> 
>>
>> Signed-off-by: Nicolas Frayer <nfrayer@baylibre.com>
>> ---
>> v1->v2:
>> Extracted this patch from the following series:
>> https://lore.kernel.org/all/20221108181144.433087-1-nfrayer@baylibre.com/
>>
>> v2->v3:
>> Removed the dev_err() message
>>
>>   drivers/dma/ti/k3-udma.c | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
>> index ce8b80bb34d7..ca1512eb9910 100644
>> --- a/drivers/dma/ti/k3-udma.c
>> +++ b/drivers/dma/ti/k3-udma.c
>> @@ -5271,10 +5271,10 @@ static int udma_probe(struct platform_device *pdev)
>>   	ud->match_data = match->data;
>>   
>>   	soc = soc_device_match(k3_soc_devices);
>> -	if (!soc) {
>> -		dev_err(dev, "No compatible SoC found\n");
>> -		return -ENODEV;
>> -	}
>> +
>> +	if (!soc)
>> +		return -EPROBE_DEFER;
>> +
>>   	ud->soc_data = soc->data;
>>   
>>   	ret = udma_get_mmrs(pdev, ud);
>> -- 
>> 2.25.1
>
Nicolas Frayer Dec. 29, 2022, 11:31 p.m. UTC | #4 
Le jeu. 29 déc. 2022 à 17:27, Péter Ujfalusi
<peter.ujfalusi@gmail.com> a écrit :
>
>
>
> On 28/12/2022 13:16, Vinod Koul wrote:
> > On 17-11-22, 19:44, Nicolas Frayer wrote:
> >> When the k3 socinfo driver is built as a module, there is a possibility
> >> that it will probe after the k3 udma driver and the later returns -ENODEV.
> >> By deferring the k3 udma probe we allow the k3 socinfo to probe and
> >> register the soc_device_attribute structure needed by the k3 udma driver.
> >> Removed the dev_err() message as well as it's deferring and not failing.
> >
> > lgtm, but need rebase as I already picked commit 3f58e10615f3 dmaengine: ti:
> > k3-udma: Add support for BCDMA CSI RX
>
> Is this path needed at all? afaik the k3 socinfo is not going to be
> module built.
>
> >
> >>
> >> Signed-off-by: Nicolas Frayer <nfrayer@baylibre.com>
> >> ---
> >> v1->v2:
> >> Extracted this patch from the following series:
> >> https://lore.kernel.org/all/20221108181144.433087-1-nfrayer@baylibre.com/
> >>
> >> v2->v3:
> >> Removed the dev_err() message
> >>
> >>   drivers/dma/ti/k3-udma.c | 8 ++++----
> >>   1 file changed, 4 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
> >> index ce8b80bb34d7..ca1512eb9910 100644
> >> --- a/drivers/dma/ti/k3-udma.c
> >> +++ b/drivers/dma/ti/k3-udma.c
> >> @@ -5271,10 +5271,10 @@ static int udma_probe(struct platform_device *pdev)
> >>      ud->match_data = match->data;
> >>
> >>      soc = soc_device_match(k3_soc_devices);
> >> -    if (!soc) {
> >> -            dev_err(dev, "No compatible SoC found\n");
> >> -            return -ENODEV;
> >> -    }
> >> +
> >> +    if (!soc)
> >> +            return -EPROBE_DEFER;
> >> +
> >>      ud->soc_data = soc->data;
> >>
> >>      ret = udma_get_mmrs(pdev, ud);
> >> --
> >> 2.25.1
> >
>
> --
> Péter
Hi Vinod, Péter,

This patch needs to be dropped as the k3 socinfo patch has been dropped.

Thanks,
Nicolas
diff mbox series

Patch

diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index ce8b80bb34d7..ca1512eb9910 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -5271,10 +5271,10 @@  static int udma_probe(struct platform_device *pdev)
 	ud->match_data = match->data;
 
 	soc = soc_device_match(k3_soc_devices);
-	if (!soc) {
-		dev_err(dev, "No compatible SoC found\n");
-		return -ENODEV;
-	}
+
+	if (!soc)
+		return -EPROBE_DEFER;
+
 	ud->soc_data = soc->data;
 
 	ret = udma_get_mmrs(pdev, ud);