2020-10-16 18:49:10

by Justin He

Subject: [PATCH] gpio: dwapb: Fix missing conversion to GPIO-lib-based IRQ-chip

Commit 0ea683931adb ("gpio: dwapb: Convert driver to using the
GPIO-lib-based IRQ-chip") missed the case in dwapb_irq_set_wake().

Without this fix, probing the dwapb gpio driver will hit a error:
"address between user and kernel address ranges" on a Ampere armv8a
server and cause a panic.

Fixes: 0ea683931adb ("gpio: dwapb: Convert driver to using the
GPIO-lib-based IRQ-chip")
Signed-off-by: Jia He <[email protected]>
---
drivers/gpio/gpio-dwapb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index a5b326754124..2a9046c0fb16 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -343,8 +343,8 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
#ifdef CONFIG_PM_SLEEP
static int dwapb_irq_set_wake(struct irq_data *d, unsigned int enable)
{
- struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
- struct dwapb_gpio *gpio = igc->private;
+ struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+ struct dwapb_gpio *gpio = to_dwapb_gpio(gc);
struct dwapb_context *ctx = gpio->ports[0].ctx;
irq_hw_number_t bit = irqd_to_hwirq(d);

--
2.17.1

2020-10-26 17:57:23

by Bartosz Golaszewski

Subject: Re: [PATCH] gpio: dwapb: Fix missing conversion to GPIO-lib-based IRQ-chip

On Fri, Oct 16, 2020 at 5:36 PM Jia He <[email protected]> wrote:
>
> Commit 0ea683931adb ("gpio: dwapb: Convert driver to using the
> GPIO-lib-based IRQ-chip") missed the case in dwapb_irq_set_wake().
>
> Without this fix, probing the dwapb gpio driver will hit a error:
> "address between user and kernel address ranges" on a Ampere armv8a
> server and cause a panic.
>
> Fixes: 0ea683931adb ("gpio: dwapb: Convert driver to using the
> GPIO-lib-based IRQ-chip")

No need to break the line in Fixes: tag.

> Signed-off-by: Jia He <[email protected]>
> ---
> drivers/gpio/gpio-dwapb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
> index a5b326754124..2a9046c0fb16 100644
> --- a/drivers/gpio/gpio-dwapb.c
> +++ b/drivers/gpio/gpio-dwapb.c
> @@ -343,8 +343,8 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
> #ifdef CONFIG_PM_SLEEP
> static int dwapb_irq_set_wake(struct irq_data *d, unsigned int enable)
> {
> - struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
> - struct dwapb_gpio *gpio = igc->private;
> + struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
> + struct dwapb_gpio *gpio = to_dwapb_gpio(gc);
> struct dwapb_context *ctx = gpio->ports[0].ctx;
> irq_hw_number_t bit = irqd_to_hwirq(d);
>
> --
> 2.17.1
>

Applied for fixes, thanks!

Bartosz