Patch "ASoC: rt5640: Fix sleep in atomic context" has been added to the 6.5-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ASoC: rt5640: Fix sleep in atomic context

to the 6.5-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     asoc-rt5640-fix-sleep-in-atomic-context.patch
and it can be found in the queue-6.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 643be49e845e34f48f59e17b4269d3816ae07c97
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Sep 12 13:32:41 2023 +0200

    ASoC: rt5640: Fix sleep in atomic context
    
    [ Upstream commit df7d595f6bd9dc96cc275cc4b0f313fcfa423c58 ]
    
    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: 051dade34695 ("ASoC: rt5640: Fix the wrong state of JD1 and JD2")
    Reported-by: Sameer Pujar <spujar@xxxxxxxxxx>
    Closes: https://lore.kernel.org/r/1688015537-31682-4-git-send-email-spujar@xxxxxxxxxx
    Cc: Oder Chiou <oder_chiou@xxxxxxxxxxx>
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230912113245.320159-3-hdegoede@xxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 7ec930fb9aab5..24c1ed1c40589 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2404,13 +2404,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;
 }