2021-12-16 21:47:57

by Prabhakar Mahadev Lad

Subject: [PATCH v2] watchdog: s3c2410: Use platform_get_irq() to get the interrupt

platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
allocation of IRQ resources in DT core code, this causes an issue
when using hierarchical interrupt domains using "interrupts" property
in the node as this bypassed the hierarchical setup and messed up the
irq chaining.

In preparation for removal of static setup of IRQ resource from DT core
code use platform_get_irq().

Signed-off-by: Lad Prabhakar <[email protected]>
---
v1->v2
* Dropped goto and directly returned on error
---
drivers/watchdog/s3c2410_wdt.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 2395f353e52d..d92bc1c24182 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -513,9 +513,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct s3c2410_wdt *wdt;
- struct resource *wdt_irq;
unsigned int wtcon;
int started = 0;
+ int wdt_irq;
int ret;

wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
@@ -536,12 +536,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
}
}

- wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- if (wdt_irq == NULL) {
- dev_err(dev, "no irq resource specified\n");
- ret = -ENOENT;
- goto err;
- }
+ wdt_irq = platform_get_irq(pdev, 0);
+ if (wdt_irq < 0)
+ return wdt_irq;

/* get the memory region for the watchdog timer */
wdt->reg_base = devm_platform_ioremap_resource(pdev, 0);
@@ -592,8 +589,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
dev_info(dev, "default timer value is out of range, cannot start\n");
}

- ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0,
- pdev->name, pdev);
+ ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0,
+ pdev->name, pdev);
if (ret != 0) {
dev_err(dev, "failed to install irq (%d)\n", ret);
goto err_cpufreq;
--
2.17.1

2021-12-17 00:26:11

by Guenter Roeck

Subject: Re: [PATCH v2] watchdog: s3c2410: Use platform_get_irq() to get the interrupt

On 12/16/21 1:47 PM, Lad Prabhakar wrote:
> platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
> allocation of IRQ resources in DT core code, this causes an issue
> when using hierarchical interrupt domains using "interrupts" property
> in the node as this bypassed the hierarchical setup and messed up the
> irq chaining.
>
> In preparation for removal of static setup of IRQ resource from DT core
> code use platform_get_irq().
>
> Signed-off-by: Lad Prabhakar <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> v1->v2
> * Dropped goto and directly returned on error
> ---
> drivers/watchdog/s3c2410_wdt.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
> index 2395f353e52d..d92bc1c24182 100644
> --- a/drivers/watchdog/s3c2410_wdt.c
> +++ b/drivers/watchdog/s3c2410_wdt.c
> @@ -513,9 +513,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct s3c2410_wdt *wdt;
> - struct resource *wdt_irq;
> unsigned int wtcon;
> int started = 0;
> + int wdt_irq;
> int ret;
>
> wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
> @@ -536,12 +536,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> }
> }
>
> - wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
> - if (wdt_irq == NULL) {
> - dev_err(dev, "no irq resource specified\n");
> - ret = -ENOENT;
> - goto err;
> - }
> + wdt_irq = platform_get_irq(pdev, 0);
> + if (wdt_irq < 0)
> + return wdt_irq;
>
> /* get the memory region for the watchdog timer */
> wdt->reg_base = devm_platform_ioremap_resource(pdev, 0);
> @@ -592,8 +589,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
> dev_info(dev, "default timer value is out of range, cannot start\n");
> }
>
> - ret = devm_request_irq(dev, wdt_irq->start, s3c2410wdt_irq, 0,
> - pdev->name, pdev);
> + ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0,
> + pdev->name, pdev);
> if (ret != 0) {
> dev_err(dev, "failed to install irq (%d)\n", ret);
> goto err_cpufreq;
>

2021-12-17 09:35:16

by Krzysztof Kozlowski

Subject: Re: [PATCH v2] watchdog: s3c2410: Use platform_get_irq() to get the interrupt

On 16/12/2021 22:47, Lad Prabhakar wrote:
> platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
> allocation of IRQ resources in DT core code, this causes an issue
> when using hierarchical interrupt domains using "interrupts" property
> in the node as this bypassed the hierarchical setup and messed up the
> irq chaining.
>
> In preparation for removal of static setup of IRQ resource from DT core
> code use platform_get_irq().
>
> Signed-off-by: Lad Prabhakar <[email protected]>
> ---
> v1->v2
> * Dropped goto and directly returned on error
> ---
> drivers/watchdog/s3c2410_wdt.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>


Reviewed-by: Krzysztof Kozlowski <[email protected]>


Best regards,
Krzysztof