| Message ID | 1687433656-7892-5-git-send-email-spujar@nvidia.com |
|---|---|
| State | New |
| Headers | show |
| Series | Few audio fixes on Tegra platforms | expand |
On Thu, Jun 22, 2023 at 05:04:12PM +0530, Sameer Pujar wrote: > The IRQ handler rt5640_irq() runs in interrupt context and can sleep > during cancel_delayed_work_sync(). > Fix this by running IRQ handler, rt5640_irq(), in thread context. > Hence replace request_irq() calls with devm_request_threaded_irq(). > - ret = request_irq(rt5640->jd_gpio_irq, rt5640_jd_gpio_irq, > - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, > - "rt5640-jd-gpio", rt5640); > + ret = devm_request_threaded_irq(component->dev, > + rt5640->jd_gpio_irq, > + NULL, rt5640_jd_gpio_irq, > + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, > + "rt5640-jd-gpio", rt5640); This is rt5640_jd_gpio_irq() which just does a queue_delayed_work() not a cancel. Why is it being changed?
On 22-06-2023 17:42, Mark Brown wrote: > On Thu, Jun 22, 2023 at 05:04:12PM +0530, Sameer Pujar wrote: > >> The IRQ handler rt5640_irq() runs in interrupt context and can sleep >> during cancel_delayed_work_sync(). >> Fix this by running IRQ handler, rt5640_irq(), in thread context. >> Hence replace request_irq() calls with devm_request_threaded_irq(). >> - ret = request_irq(rt5640->jd_gpio_irq, rt5640_jd_gpio_irq, >> - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, >> - "rt5640-jd-gpio", rt5640); >> + ret = devm_request_threaded_irq(component->dev, >> + rt5640->jd_gpio_irq, >> + NULL, rt5640_jd_gpio_irq, >> + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, >> + "rt5640-jd-gpio", rt5640); > This is rt5640_jd_gpio_irq() which just does a queue_delayed_work() not > a cancel. Why is it being changed? Will drop this part in v2. Thanks.
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index c7d2f31..a54d2bd 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2552,9 +2552,11 @@ static void rt5640_enable_jack_detect(struct snd_soc_component *component, rt5640->jd_gpio = jack_data->jd_gpio; rt5640->jd_gpio_irq = gpiod_to_irq(rt5640->jd_gpio); - ret = request_irq(rt5640->jd_gpio_irq, rt5640_jd_gpio_irq, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, - "rt5640-jd-gpio", rt5640); + ret = devm_request_threaded_irq(component->dev, + rt5640->jd_gpio_irq, + NULL, rt5640_jd_gpio_irq, + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + "rt5640-jd-gpio", rt5640); if (ret) { dev_warn(component->dev, "Failed to request jd GPIO IRQ %d: %d\n", rt5640->jd_gpio_irq, ret); @@ -2567,9 +2569,10 @@ static void rt5640_enable_jack_detect(struct snd_soc_component *component, if (jack_data && jack_data->use_platform_clock) rt5640->use_platform_clock = jack_data->use_platform_clock; - ret = request_irq(rt5640->irq, rt5640_irq, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, - "rt5640", rt5640); + ret = devm_request_threaded_irq(component->dev, rt5640->irq, + NULL, rt5640_irq, + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + "rt5640", rt5640); if (ret) { dev_warn(component->dev, "Failed to reguest IRQ %d: %d\n", rt5640->irq, ret); rt5640_disable_jack_detect(component); @@ -2622,8 +2625,9 @@ static void rt5640_enable_hda_jack_detect( rt5640->jack = jack; - ret = request_irq(rt5640->irq, rt5640_irq, - IRQF_TRIGGER_RISING | IRQF_ONESHOT, "rt5640", rt5640); + ret = devm_request_threaded_irq(component->dev, rt5640->irq, + NULL, rt5640_irq, IRQF_TRIGGER_RISING | IRQF_ONESHOT, + "rt5640", rt5640); if (ret) { dev_warn(component->dev, "Failed to reguest IRQ %d: %d\n", rt5640->irq, ret); rt5640->irq = -ENXIO;
Following prints are observed while testing audio on Jetson AGX Orin which has onboard RT5640 audio codec: BUG: sleeping function called from invalid context at kernel/workqueue.c:3027 in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 0, name: swapper/0 preempt_count: 10001, expected: 0 RCU nest depth: 0, expected: 0 ------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at kernel/irq/handle.c:159 __handle_irq_event_percpu+0x1e0/0x270 ---[ end trace ad1c64905aac14a6 ]- The IRQ handler rt5640_irq() runs in interrupt context and can sleep during cancel_delayed_work_sync(). Fix this by running IRQ handler, rt5640_irq(), in thread context. Hence replace request_irq() calls with devm_request_threaded_irq(). Fixes: 051dade34695 ("ASoC: rt5640: Fix the wrong state of JD1 and JD2") Cc: stable@vger.kernel.org Cc: Oder Chiou <oder_chiou@realtek.com> Signed-off-by: Sameer Pujar <spujar@nvidia.com> --- sound/soc/codecs/rt5640.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)