Skip to content

Commit 2a5d68b

Browse files
sathya-nujellaCommit Bot
authored andcommitted
FROMLIST: ASoC: rt5682: Fix panic in rt5682_jack_detect_handler happening during system shutdown
During Coldboot stress tests, system encountered the following panic. Panic logs depicts rt5682_i2c_shutdown() happened first and then later jack detect handler workqueue function triggered. This situation causes panic as rt5682_i2c_shutdown() resets codec. Fix this panic by cancelling all jack detection delayed work. Panic log: [ 20.936124] sof_pci_shutdown [ 20.940248] snd_sof_device_shutdown [ 20.945023] snd_sof_shutdown [ 21.126849] rt5682_i2c_shutdown [ 21.286053] rt5682_jack_detect_handler [ 21.291235] BUG: kernel NULL pointer dereference, address: 000000000000037c [ 21.299302] #PF: supervisor read access in kernel mode [ 21.305254] #PF: error_code(0x0000) - not-present page [ 21.311218] PGD 0 P4D 0 [ 21.314155] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 21.319206] CPU: 2 PID: 123 Comm: kworker/2:3 Tainted: G U 5.4.68 thesofproject#10 [ 21.333687] ACPI: Preparing to enter system sleep state S5 [ 21.337669] Workqueue: events_power_efficient rt5682_jack_detect_handler [snd_soc_rt5682] [ 21.337671] RIP: 0010:rt5682_jack_detect_handler+0x6c/0x279 [snd_soc_rt5682] Fixes: a50067d ('ASoC: rt5682: split i2c driver into separate module') Signed-off-by: Jairaj Arava <jairaj.arava@intel.com> Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@intel.com> Reviewed-by: Shuming Fan <shumingf@realtek.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Chintan Patel <chintan.m.patel@intel.com> (am from https://patchwork.kernel.org/patch/12070519/) BUG=b:179059827 TEST=Cold boot test should pass Change-Id: I9f71be96e902732324e29a554dd9c0124fd03b80 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2679468 Reviewed-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Tested-by: Jairaj Arava <jairaj.arava@intel.corp-partner.google.com> Tested-by: Srikanth Nandamuri <srikanth.nandamuri@intel.corp-partner.google.com> Commit-Queue: Curtis Malainey <cujomalainey@chromium.org>
1 parent bde15e9 commit 2a5d68b

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

sound/soc/codecs/rt5682-i2c.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ static void rt5682_i2c_shutdown(struct i2c_client *client)
273273
{
274274
struct rt5682_priv *rt5682 = i2c_get_clientdata(client);
275275

276+
cancel_delayed_work_sync(&rt5682->jack_detect_work);
277+
cancel_delayed_work_sync(&rt5682->jd_check_work);
278+
276279
rt5682_reset(rt5682);
277280
}
278281

0 commit comments

Comments
 (0)