Skip to content

Commit b011165

Browse files
Sean Andersongregkh
Sean Anderson
authored andcommitted
gpio: xilinx: Convert gpio_lock to raw spinlock
commit 9860370 upstream. irq_chip functions may be called in raw spinlock context. Therefore, we must also use a raw spinlock for our own internal locking. This fixes the following lockdep splat: [ 5.349336] ============================= [ 5.353349] [ BUG: Invalid wait context ] [ 5.357361] 6.13.0-rc5+ #69 Tainted: G W [ 5.363031] ----------------------------- [ 5.367045] kworker/u17:1/44 is trying to lock: [ 5.371587] ffffff88018b02c0 (&chip->gpio_lock){....}-{3:3}, at: xgpio_irq_unmask (drivers/gpio/gpio-xilinx.c:433 (discriminator 8)) [ 5.380079] other info that might help us debug this: [ 5.385138] context-{5:5} [ 5.387762] 5 locks held by kworker/u17:1/44: [ 5.392123] #0: ffffff8800014958 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work (kernel/workqueue.c:3204) [ 5.402260] #1: ffffffc082fcbdd8 (deferred_probe_work){+.+.}-{0:0}, at: process_one_work (kernel/workqueue.c:3205) [ 5.411528] #2: ffffff880172c900 (&dev->mutex){....}-{4:4}, at: __device_attach (drivers/base/dd.c:1006) [ 5.419929] #3: ffffff88039c8268 (request_class#2){+.+.}-{4:4}, at: __setup_irq (kernel/irq/internals.h:156 kernel/irq/manage.c:1596) [ 5.428331] #4: ffffff88039c80c8 (lock_class#2){....}-{2:2}, at: __setup_irq (kernel/irq/manage.c:1614) [ 5.436472] stack backtrace: [ 5.439359] CPU: 2 UID: 0 PID: 44 Comm: kworker/u17:1 Tainted: G W 6.13.0-rc5+ #69 [ 5.448690] Tainted: [W]=WARN [ 5.451656] Hardware name: xlnx,zynqmp (DT) [ 5.455845] Workqueue: events_unbound deferred_probe_work_func [ 5.461699] Call trace: [ 5.464147] show_stack+0x18/0x24 C [ 5.467821] dump_stack_lvl (lib/dump_stack.c:123) [ 5.471501] dump_stack (lib/dump_stack.c:130) [ 5.474824] __lock_acquire (kernel/locking/lockdep.c:4828 kernel/locking/lockdep.c:4898 kernel/locking/lockdep.c:5176) [ 5.478758] lock_acquire (arch/arm64/include/asm/percpu.h:40 kernel/locking/lockdep.c:467 kernel/locking/lockdep.c:5851 kernel/locking/lockdep.c:5814) [ 5.482429] _raw_spin_lock_irqsave (include/linux/spinlock_api_smp.h:111 kernel/locking/spinlock.c:162) [ 5.486797] xgpio_irq_unmask (drivers/gpio/gpio-xilinx.c:433 (discriminator 8)) [ 5.490737] irq_enable (kernel/irq/internals.h:236 kernel/irq/chip.c:170 kernel/irq/chip.c:439 kernel/irq/chip.c:432 kernel/irq/chip.c:345) [ 5.494060] __irq_startup (kernel/irq/internals.h:241 kernel/irq/chip.c:180 kernel/irq/chip.c:250) [ 5.497645] irq_startup (kernel/irq/chip.c:270) [ 5.501143] __setup_irq (kernel/irq/manage.c:1807) [ 5.504728] request_threaded_irq (kernel/irq/manage.c:2208) Fixes: a32c7ca ("gpio: gpio-xilinx: Add interrupt support") Signed-off-by: Sean Anderson <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bartosz Golaszewski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a5a2ee8 commit b011165

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Diff for: drivers/gpio/gpio-xilinx.c

+16-16
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct xgpio_instance {
6666
DECLARE_BITMAP(state, 64);
6767
DECLARE_BITMAP(last_irq_read, 64);
6868
DECLARE_BITMAP(dir, 64);
69-
spinlock_t gpio_lock; /* For serializing operations */
69+
raw_spinlock_t gpio_lock; /* For serializing operations */
7070
int irq;
7171
DECLARE_BITMAP(enable, 64);
7272
DECLARE_BITMAP(rising_edge, 64);
@@ -180,14 +180,14 @@ static void xgpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
180180
struct xgpio_instance *chip = gpiochip_get_data(gc);
181181
int bit = xgpio_to_bit(chip, gpio);
182182

183-
spin_lock_irqsave(&chip->gpio_lock, flags);
183+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
184184

185185
/* Write to GPIO signal and set its direction to output */
186186
__assign_bit(bit, chip->state, val);
187187

188188
xgpio_write_ch(chip, XGPIO_DATA_OFFSET, bit, chip->state);
189189

190-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
190+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
191191
}
192192

193193
/**
@@ -211,15 +211,15 @@ static void xgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
211211
bitmap_remap(hw_mask, mask, chip->sw_map, chip->hw_map, 64);
212212
bitmap_remap(hw_bits, bits, chip->sw_map, chip->hw_map, 64);
213213

214-
spin_lock_irqsave(&chip->gpio_lock, flags);
214+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
215215

216216
bitmap_replace(state, chip->state, hw_bits, hw_mask, 64);
217217

218218
xgpio_write_ch_all(chip, XGPIO_DATA_OFFSET, state);
219219

220220
bitmap_copy(chip->state, state, 64);
221221

222-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
222+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
223223
}
224224

225225
/**
@@ -237,13 +237,13 @@ static int xgpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
237237
struct xgpio_instance *chip = gpiochip_get_data(gc);
238238
int bit = xgpio_to_bit(chip, gpio);
239239

240-
spin_lock_irqsave(&chip->gpio_lock, flags);
240+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
241241

242242
/* Set the GPIO bit in shadow register and set direction as input */
243243
__set_bit(bit, chip->dir);
244244
xgpio_write_ch(chip, XGPIO_TRI_OFFSET, bit, chip->dir);
245245

246-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
246+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
247247

248248
return 0;
249249
}
@@ -266,7 +266,7 @@ static int xgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
266266
struct xgpio_instance *chip = gpiochip_get_data(gc);
267267
int bit = xgpio_to_bit(chip, gpio);
268268

269-
spin_lock_irqsave(&chip->gpio_lock, flags);
269+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
270270

271271
/* Write state of GPIO signal */
272272
__assign_bit(bit, chip->state, val);
@@ -276,7 +276,7 @@ static int xgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
276276
__clear_bit(bit, chip->dir);
277277
xgpio_write_ch(chip, XGPIO_TRI_OFFSET, bit, chip->dir);
278278

279-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
279+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
280280

281281
return 0;
282282
}
@@ -404,7 +404,7 @@ static void xgpio_irq_mask(struct irq_data *irq_data)
404404
int bit = xgpio_to_bit(chip, irq_offset);
405405
u32 mask = BIT(bit / 32), temp;
406406

407-
spin_lock_irqsave(&chip->gpio_lock, flags);
407+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
408408

409409
__clear_bit(bit, chip->enable);
410410

@@ -414,7 +414,7 @@ static void xgpio_irq_mask(struct irq_data *irq_data)
414414
temp &= ~mask;
415415
xgpio_writereg(chip->regs + XGPIO_IPIER_OFFSET, temp);
416416
}
417-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
417+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
418418

419419
gpiochip_disable_irq(&chip->gc, irq_offset);
420420
}
@@ -434,7 +434,7 @@ static void xgpio_irq_unmask(struct irq_data *irq_data)
434434

435435
gpiochip_enable_irq(&chip->gc, irq_offset);
436436

437-
spin_lock_irqsave(&chip->gpio_lock, flags);
437+
raw_spin_lock_irqsave(&chip->gpio_lock, flags);
438438

439439
__set_bit(bit, chip->enable);
440440

@@ -453,7 +453,7 @@ static void xgpio_irq_unmask(struct irq_data *irq_data)
453453
xgpio_writereg(chip->regs + XGPIO_IPIER_OFFSET, val);
454454
}
455455

456-
spin_unlock_irqrestore(&chip->gpio_lock, flags);
456+
raw_spin_unlock_irqrestore(&chip->gpio_lock, flags);
457457
}
458458

459459
/**
@@ -518,7 +518,7 @@ static void xgpio_irqhandler(struct irq_desc *desc)
518518

519519
chained_irq_enter(irqchip, desc);
520520

521-
spin_lock(&chip->gpio_lock);
521+
raw_spin_lock(&chip->gpio_lock);
522522

523523
xgpio_read_ch_all(chip, XGPIO_DATA_OFFSET, all);
524524

@@ -535,7 +535,7 @@ static void xgpio_irqhandler(struct irq_desc *desc)
535535
bitmap_copy(chip->last_irq_read, all, 64);
536536
bitmap_or(all, rising, falling, 64);
537537

538-
spin_unlock(&chip->gpio_lock);
538+
raw_spin_unlock(&chip->gpio_lock);
539539

540540
dev_dbg(gc->parent, "IRQ rising %*pb falling %*pb\n", 64, rising, 64, falling);
541541

@@ -626,7 +626,7 @@ static int xgpio_probe(struct platform_device *pdev)
626626
bitmap_set(chip->hw_map, 0, width[0]);
627627
bitmap_set(chip->hw_map, 32, width[1]);
628628

629-
spin_lock_init(&chip->gpio_lock);
629+
raw_spin_lock_init(&chip->gpio_lock);
630630

631631
chip->gc.base = -1;
632632
chip->gc.ngpio = bitmap_weight(chip->hw_map, 64);

0 commit comments

Comments
 (0)