Unverified Commit df7d595f authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: rt5640: Fix sleep in atomic context 



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().

The only thing which rt5640_irq() does is cancel + (re-)queue
the jack_work delayed_work. This can be done in a single non sleeping
call by replacing queue_delayed_work() with mod_delayed_work(),
avoiding the sleep in atomic context.

Fixes: 051dade3 ("ASoC: rt5640: Fix the wrong state of JD1 and JD2")
Reported-by: default avatarSameer Pujar <spujar@nvidia.com>
Closes: https://lore.kernel.org/r/1688015537-31682-4-git-send-email-spujar@nvidia.com


Cc: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230912113245.320159-3-hdegoede@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fa6a0c0c

sound/soc/codecs/rt5640.c

+2 −4
Original line number Diff line number Diff line
@@ -2403,13 +2403,11 @@ static irqreturn_t rt5640_irq(int irq, void *data) 
	struct rt5640_priv *rt5640 = data;

	int delay = 0;



	if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) {

		cancel_delayed_work_sync(&rt5640->jack_work);

	if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER)

		delay = 100;

	}



	if (rt5640->jack)

		queue_delayed_work(system_long_wq, &rt5640->jack_work, delay);

		mod_delayed_work(system_long_wq, &rt5640->jack_work, delay);



	return IRQ_HANDLED;

}