Skip to content

Commit ebe7561

Browse files
Demon000geertu
authored andcommitted
pinctrl: renesas: rzt2h: Fix invalid wait context
The rzt2h_gpio_get_direction() function is called from gpiod_get_direction(), which ends up being used within the __setup_irq() call stack when requesting an interrupt. __setup_irq() holds a raw_spinlock_t with IRQs disabled, which creates an atomic context. spinlock_t cannot be used within atomic context when PREEMPT_RT is enabled, since it may become a sleeping lock. An "[ BUG: Invalid wait context ]" splat is observed when running with CONFIG_PROVE_LOCKING enabled, describing exactly the aforementioned call stack. __setup_irq() needs to hold a raw_spinlock_t with IRQs disabled to serialize access against a concurrent hard interrupt. Switch to raw_spinlock_t to fix this. Fixes: 829dde3 ("pinctrl: renesas: rzt2h: Add GPIO IRQ chip to handle interrupts") Signed-off-by: Cosmin Tanislav <[email protected]> Reviewed-by: Sebastian Andrzej Siewior <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent e825c79 commit ebe7561

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/pinctrl/renesas/pinctrl-rzt2h.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ struct rzt2h_pinctrl {
8585
struct gpio_chip gpio_chip;
8686
struct pinctrl_gpio_range gpio_range;
8787
DECLARE_BITMAP(used_irqs, RZT2H_INTERRUPTS_NUM);
88-
spinlock_t lock; /* lock read/write registers */
88+
raw_spinlock_t lock; /* lock read/write registers */
8989
struct mutex mutex; /* serialize adding groups and functions */
9090
bool safety_port_enabled;
9191
atomic_t wakeup_path;
@@ -145,7 +145,7 @@ static void rzt2h_pinctrl_set_pfc_mode(struct rzt2h_pinctrl *pctrl,
145145
u64 reg64;
146146
u16 reg16;
147147

148-
guard(spinlock_irqsave)(&pctrl->lock);
148+
guard(raw_spinlock_irqsave)(&pctrl->lock);
149149

150150
/* Set pin to 'Non-use (Hi-Z input protection)' */
151151
reg16 = rzt2h_pinctrl_readw(pctrl, port, PM(port));
@@ -474,7 +474,7 @@ static int rzt2h_gpio_request(struct gpio_chip *chip, unsigned int offset)
474474
if (ret)
475475
return ret;
476476

477-
guard(spinlock_irqsave)(&pctrl->lock);
477+
guard(raw_spinlock_irqsave)(&pctrl->lock);
478478

479479
/* Select GPIO mode in PMC Register */
480480
rzt2h_pinctrl_set_gpio_en(pctrl, port, bit, true);
@@ -487,7 +487,7 @@ static void rzt2h_gpio_set_direction(struct rzt2h_pinctrl *pctrl, u32 port,
487487
{
488488
u16 reg;
489489

490-
guard(spinlock_irqsave)(&pctrl->lock);
490+
guard(raw_spinlock_irqsave)(&pctrl->lock);
491491

492492
reg = rzt2h_pinctrl_readw(pctrl, port, PM(port));
493493
reg &= ~PM_PIN_MASK(bit);
@@ -509,7 +509,7 @@ static int rzt2h_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
509509
if (ret)
510510
return ret;
511511

512-
guard(spinlock_irqsave)(&pctrl->lock);
512+
guard(raw_spinlock_irqsave)(&pctrl->lock);
513513

514514
if (rzt2h_pinctrl_readb(pctrl, port, PMC(port)) & BIT(bit)) {
515515
/*
@@ -547,7 +547,7 @@ static int rzt2h_gpio_set(struct gpio_chip *chip, unsigned int offset,
547547
u8 bit = RZT2H_PIN_ID_TO_PIN(offset);
548548
u8 reg;
549549

550-
guard(spinlock_irqsave)(&pctrl->lock);
550+
guard(raw_spinlock_irqsave)(&pctrl->lock);
551551

552552
reg = rzt2h_pinctrl_readb(pctrl, port, P(port));
553553
if (value)
@@ -965,7 +965,7 @@ static int rzt2h_pinctrl_probe(struct platform_device *pdev)
965965
if (ret)
966966
return ret;
967967

968-
spin_lock_init(&pctrl->lock);
968+
raw_spin_lock_init(&pctrl->lock);
969969
mutex_init(&pctrl->mutex);
970970
platform_set_drvdata(pdev, pctrl);
971971

0 commit comments

Comments
 (0)