[PATCH] gpio: omap: Fix external abort on non-linefetch
From: Tony Lindgren
Date: Tue Jul 11 2017 - 09:40:50 EST
Commit 46e48e257360 ("genirq: Move irq resource handling out of spinlocked
region") caused external abort on non-linefetch for n900 and droid 4. Turns
out this was caused by runtime PM use in gpio-omap in chip_bus_lock:
* Thomas Gleixner <tglx@xxxxxxxxxxxxx> [170711 08:07]:
> > Unpatched the ordering is:
> >
> > chip_bus_lock(desc);
> > irq_request_resources(desc);
> >
> > Now the offending change reordered the calls. OMAP gpio has:
> >
> > omap_gpio_irq_bus_lock()
> > pm_runtime_get_sync(bank->chip.parent);
> >
> > So that at least explains the error. So that omap gpio irq chip (ab)uses
> > the bus_lock() callback to do runtime power management. Sigh, I did not
> > expect that.
Let's fix it with pm_runtime_get_sync() for now, then further improvments
can be done when we have a better way to deal with it.
Reported-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
---
drivers/gpio/gpio-omap.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -917,13 +917,24 @@ static int omap_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
struct gpio_bank *bank;
unsigned long flags;
void __iomem *reg;
- int dir;
+ int error, dir;
bank = gpiochip_get_data(chip);
reg = bank->base + bank->regs->direction;
+ error = pm_runtime_get_sync(bank->chip.parent);
+ if (error < 0) {
+ dev_err(bank->chip.parent,
+ "Could not enable gpio bank %p: %d\n",
+ bank, error);
+ pm_runtime_put_noidle(bank->chip.parent);
+
+ return error;
+ }
raw_spin_lock_irqsave(&bank->lock, flags);
dir = !!(readl_relaxed(reg) & BIT(offset));
raw_spin_unlock_irqrestore(&bank->lock, flags);
+ pm_runtime_put_sync(bank->chip.parent);
+
return dir;
}
--
2.13.2