diff mbox series

dmaengine: tegra: Use platform_get_irq() to get IRQ resource

Message ID 20220505091440.12981-1-akhilrajeev@nvidia.com
State Accepted
Headers show
Series dmaengine: tegra: Use platform_get_irq() to get IRQ resource | expand

Commit Message

Akhil R May 5, 2022, 9:14 a.m. UTC
Use platform_irq_get() instead platform_get_resource() for IRQ resource
to fix the probe failure. platform_get_resource() fails to fetch the IRQ
resource as it might not be ready at that time.

platform_irq_get() is also the recommended way to get interrupt as it
directly gives the IRQ number and no conversion from resource is
required.

Fixes: ee17028009d4 ("dmaengine: tegra: Add tegra gpcdma driver")
Reported-by: Jonathan Hunter <jonathanh@nvidia.com>
Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
---
 drivers/dma/tegra186-gpc-dma.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Comments

Jon Hunter May 5, 2022, 9:18 a.m. UTC | #1
On 05/05/2022 10:14, Akhil R wrote:
> Use platform_irq_get() instead platform_get_resource() for IRQ resource
> to fix the probe failure. platform_get_resource() fails to fetch the IRQ
> resource as it might not be ready at that time.
> 
> platform_irq_get() is also the recommended way to get interrupt as it
> directly gives the IRQ number and no conversion from resource is
> required.
> 
> Fixes: ee17028009d4 ("dmaengine: tegra: Add tegra gpcdma driver")
> Reported-by: Jonathan Hunter <jonathanh@nvidia.com>
> Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
> ---
>   drivers/dma/tegra186-gpc-dma.c | 12 ++++--------
>   1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
> index 97fe0e9e9b83..3951db527dec 100644
> --- a/drivers/dma/tegra186-gpc-dma.c
> +++ b/drivers/dma/tegra186-gpc-dma.c
> @@ -1328,7 +1328,6 @@ static int tegra_dma_probe(struct platform_device *pdev)
>   	struct iommu_fwspec *iommu_spec;
>   	unsigned int stream_id, i;
>   	struct tegra_dma *tdma;
> -	struct resource	*res;
>   	int ret;
>   
>   	cdata = of_device_get_match_data(&pdev->dev);
> @@ -1367,16 +1366,13 @@ static int tegra_dma_probe(struct platform_device *pdev)
>   	for (i = 0; i < cdata->nr_channels; i++) {
>   		struct tegra_dma_channel *tdc = &tdma->channels[i];
>   
> +		tdc->irq = platform_get_irq(pdev, i);
> +		if (tdc->irq < 0)
> +			return tdc->irq;
> +
>   		tdc->chan_base_offset = TEGRA_GPCDMA_CHANNEL_BASE_ADD_OFFSET +
>   					i * cdata->channel_reg_size;
> -		res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
> -		if (!res) {
> -			dev_err(&pdev->dev, "No irq resource for chan %d\n", i);
> -			return -EINVAL;
> -		}
> -		tdc->irq = res->start;
>   		snprintf(tdc->name, sizeof(tdc->name), "gpcdma.%d", i);
> -
>   		tdc->tdma = tdma;
>   		tdc->id = i;
>   		tdc->slave_id = -1;


Thanks!

Reviewed-by: Jon Hunter <jonathanh@nvidia.com>

Jon
Thierry Reding May 5, 2022, 1:38 p.m. UTC | #2
On Thu, May 05, 2022 at 02:44:40PM +0530, Akhil R wrote:
> Use platform_irq_get() instead platform_get_resource() for IRQ resource
> to fix the probe failure. platform_get_resource() fails to fetch the IRQ
> resource as it might not be ready at that time.
> 
> platform_irq_get() is also the recommended way to get interrupt as it
> directly gives the IRQ number and no conversion from resource is
> required.
> 
> Fixes: ee17028009d4 ("dmaengine: tegra: Add tegra gpcdma driver")
> Reported-by: Jonathan Hunter <jonathanh@nvidia.com>
> Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
> ---
>  drivers/dma/tegra186-gpc-dma.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)

Acked-by: Thierry Reding <treding@nvidia.com>
Jon Hunter May 16, 2022, 8:42 a.m. UTC | #3
Vinod,

On 05/05/2022 10:18, Jon Hunter wrote:
> 
> On 05/05/2022 10:14, Akhil R wrote:
>> Use platform_irq_get() instead platform_get_resource() for IRQ resource
>> to fix the probe failure. platform_get_resource() fails to fetch the IRQ
>> resource as it might not be ready at that time.
>>
>> platform_irq_get() is also the recommended way to get interrupt as it
>> directly gives the IRQ number and no conversion from resource is
>> required.
>>
>> Fixes: ee17028009d4 ("dmaengine: tegra: Add tegra gpcdma driver")
>> Reported-by: Jonathan Hunter <jonathanh@nvidia.com>
>> Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
>> ---
>>   drivers/dma/tegra186-gpc-dma.c | 12 ++++--------
>>   1 file changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/dma/tegra186-gpc-dma.c 
>> b/drivers/dma/tegra186-gpc-dma.c
>> index 97fe0e9e9b83..3951db527dec 100644
>> --- a/drivers/dma/tegra186-gpc-dma.c
>> +++ b/drivers/dma/tegra186-gpc-dma.c
>> @@ -1328,7 +1328,6 @@ static int tegra_dma_probe(struct 
>> platform_device *pdev)
>>       struct iommu_fwspec *iommu_spec;
>>       unsigned int stream_id, i;
>>       struct tegra_dma *tdma;
>> -    struct resource    *res;
>>       int ret;
>>       cdata = of_device_get_match_data(&pdev->dev);
>> @@ -1367,16 +1366,13 @@ static int tegra_dma_probe(struct 
>> platform_device *pdev)
>>       for (i = 0; i < cdata->nr_channels; i++) {
>>           struct tegra_dma_channel *tdc = &tdma->channels[i];
>> +        tdc->irq = platform_get_irq(pdev, i);
>> +        if (tdc->irq < 0)
>> +            return tdc->irq;
>> +
>>           tdc->chan_base_offset = TEGRA_GPCDMA_CHANNEL_BASE_ADD_OFFSET +
>>                       i * cdata->channel_reg_size;
>> -        res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
>> -        if (!res) {
>> -            dev_err(&pdev->dev, "No irq resource for chan %d\n", i);
>> -            return -EINVAL;
>> -        }
>> -        tdc->irq = res->start;
>>           snprintf(tdc->name, sizeof(tdc->name), "gpcdma.%d", i);
>> -
>>           tdc->tdma = tdma;
>>           tdc->id = i;
>>           tdc->slave_id = -1;
> 
> 
> Thanks!
> 
> Reviewed-by: Jon Hunter <jonathanh@nvidia.com>


OK to pick this up for -next/5.19? This is preventing the GPC DMA driver 
from working.

Jon
Vinod Koul May 16, 2022, 11:29 a.m. UTC | #4
On 05-05-22, 14:44, Akhil R wrote:
> Use platform_irq_get() instead platform_get_resource() for IRQ resource
> to fix the probe failure. platform_get_resource() fails to fetch the IRQ
> resource as it might not be ready at that time.
> 
> platform_irq_get() is also the recommended way to get interrupt as it
> directly gives the IRQ number and no conversion from resource is
> required.

Applied, thanks
diff mbox series

Patch

diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
index 97fe0e9e9b83..3951db527dec 100644
--- a/drivers/dma/tegra186-gpc-dma.c
+++ b/drivers/dma/tegra186-gpc-dma.c
@@ -1328,7 +1328,6 @@  static int tegra_dma_probe(struct platform_device *pdev)
 	struct iommu_fwspec *iommu_spec;
 	unsigned int stream_id, i;
 	struct tegra_dma *tdma;
-	struct resource	*res;
 	int ret;
 
 	cdata = of_device_get_match_data(&pdev->dev);
@@ -1367,16 +1366,13 @@  static int tegra_dma_probe(struct platform_device *pdev)
 	for (i = 0; i < cdata->nr_channels; i++) {
 		struct tegra_dma_channel *tdc = &tdma->channels[i];
 
+		tdc->irq = platform_get_irq(pdev, i);
+		if (tdc->irq < 0)
+			return tdc->irq;
+
 		tdc->chan_base_offset = TEGRA_GPCDMA_CHANNEL_BASE_ADD_OFFSET +
 					i * cdata->channel_reg_size;
-		res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
-		if (!res) {
-			dev_err(&pdev->dev, "No irq resource for chan %d\n", i);
-			return -EINVAL;
-		}
-		tdc->irq = res->start;
 		snprintf(tdc->name, sizeof(tdc->name), "gpcdma.%d", i);
-
 		tdc->tdma = tdma;
 		tdc->id = i;
 		tdc->slave_id = -1;