Skip to content

Commit 4bfee93

Browse files
author
Desnes Nunes
committed
usb: typec: fusb302: fix scheduling while atomic when using virtio-gpio
JIRA: https://issues.redhat.com/browse/RHEL-122021 Conflicts: * Avoiding 3646730 ("usb: typec: tcpm/fusb302: Convert to i2c's .probe_new()") that changes the parameters of fusb302_probe() function. The probe_new function pointer was purged completely upstream. commit 1c2d81b Author: Yongbo Zhang <giraffesnn123@gmail.com> Date: Mon, 26 May 2025 12:34:33 +0800 When the gpio irqchip connected to a slow bus(e.g., i2c bus or virtio bus), calling disable_irq_nosync() in top-half ISR handler will trigger the following kernel BUG: BUG: scheduling while atomic: RenderEngine/253/0x00010002 ... Call trace: dump_backtrace+0x0/0x1c8 show_stack+0x1c/0x2c dump_stack_lvl+0xdc/0x12c dump_stack+0x1c/0x64 __schedule_bug+0x64/0x80 schedule_debug+0x98/0x118 __schedule+0x68/0x704 schedule+0xa0/0xe8 schedule_timeout+0x38/0x124 wait_for_common+0xa4/0x134 wait_for_completion+0x1c/0x2c _virtio_gpio_req+0xf8/0x198 virtio_gpio_irq_bus_sync_unlock+0x94/0xf0 __irq_put_desc_unlock+0x50/0x54 disable_irq_nosync+0x64/0x94 fusb302_irq_intn+0x24/0x84 __handle_irq_event_percpu+0x84/0x278 handle_irq_event+0x64/0x14c handle_level_irq+0x134/0x1d4 generic_handle_domain_irq+0x40/0x68 virtio_gpio_event_vq+0xb0/0x130 vring_interrupt+0x7c/0x90 vm_interrupt+0x88/0xd8 __handle_irq_event_percpu+0x84/0x278 handle_irq_event+0x64/0x14c handle_fasteoi_irq+0x110/0x210 __handle_domain_irq+0x80/0xd0 gic_handle_irq+0x78/0x154 el0_irq_naked+0x60/0x6c This patch replaces request_irq() with devm_request_threaded_irq() to avoid the use of disable_irq_nosync(). Signed-off-by: Yongbo Zhang <giraffesnn123@gmail.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20250526043433.673097-1-giraffesnn123@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Desnes Nunes <desnesn@redhat.com>
1 parent 7dca038 commit 4bfee93

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

drivers/usb/typec/tcpm/fusb302.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,9 +1477,6 @@ static irqreturn_t fusb302_irq_intn(int irq, void *dev_id)
14771477
struct fusb302_chip *chip = dev_id;
14781478
unsigned long flags;
14791479

1480-
/* Disable our level triggered IRQ until our irq_work has cleared it */
1481-
disable_irq_nosync(chip->gpio_int_n_irq);
1482-
14831480
spin_lock_irqsave(&chip->irq_lock, flags);
14841481
if (chip->irq_suspended)
14851482
chip->irq_while_suspended = true;
@@ -1622,7 +1619,6 @@ static void fusb302_irq_work(struct work_struct *work)
16221619
}
16231620
done:
16241621
mutex_unlock(&chip->lock);
1625-
enable_irq(chip->gpio_int_n_irq);
16261622
}
16271623

16281624
static int init_gpio(struct fusb302_chip *chip)
@@ -1748,9 +1744,10 @@ static int fusb302_probe(struct i2c_client *client,
17481744
goto destroy_workqueue;
17491745
}
17501746

1751-
ret = request_irq(chip->gpio_int_n_irq, fusb302_irq_intn,
1752-
IRQF_ONESHOT | IRQF_TRIGGER_LOW,
1753-
"fsc_interrupt_int_n", chip);
1747+
ret = devm_request_threaded_irq(dev, chip->gpio_int_n_irq,
1748+
NULL, fusb302_irq_intn,
1749+
IRQF_ONESHOT | IRQF_TRIGGER_LOW,
1750+
"fsc_interrupt_int_n", chip);
17541751
if (ret < 0) {
17551752
dev_err(dev, "cannot request IRQ for GPIO Int_N, ret=%d", ret);
17561753
goto tcpm_unregister_port;
@@ -1775,7 +1772,6 @@ static int fusb302_remove(struct i2c_client *client)
17751772
struct fusb302_chip *chip = i2c_get_clientdata(client);
17761773

17771774
disable_irq_wake(chip->gpio_int_n_irq);
1778-
free_irq(chip->gpio_int_n_irq, chip);
17791775
cancel_work_sync(&chip->irq_work);
17801776
cancel_delayed_work_sync(&chip->bc_lvl_handler);
17811777
tcpm_unregister_port(chip->tcpm_port);

0 commit comments

Comments
 (0)