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 <[email protected]>
---
v1->v2:
Extracted this patch from the following series:
https://lore.kernel.org/all/[email protected]/
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 <[email protected]> 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 <[email protected]>
Reviewed-by: Kevin Hilman <[email protected]>
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 <[email protected]>
> ---
> v1->v2:
> Extracted this patch from the following series:
> https://lore.kernel.org/all/[email protected]/
>
> 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
--
~Vinod
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 <[email protected]>
>> ---
>> v1->v2:
>> Extracted this patch from the following series:
>> https://lore.kernel.org/all/[email protected]/
>>
>> 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
Le jeu. 29 déc. 2022 à 17:27, Péter Ujfalusi
<[email protected]> 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 <[email protected]>
> >> ---
> >> v1->v2:
> >> Extracted this patch from the following series:
> >> https://lore.kernel.org/all/[email protected]/
> >>
> >> 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