Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f6714f0e5ab64ebfb32fee00c84e058ca19103f8

Authored by Daniel Baluta
1 parent fd4a0405a9
Exists in smarc_8mm_imx_4.14.98_2.0.0_ga and in 4 other branches smarc-imx6_4.14.98_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga

MLK-21144 ASoC: fsl: Fix crash with multiple open/close 

Because we are re-initializing the proxy at close it might
happen that work is still pending which causes the following crash:

[   94.699835] Unable to handle kernel NULL pointer dereference at virtual address 00000008
[   94.707923] Mem abort info:
[   94.710722]   Exception class = DABT (current EL), IL = 32 bits
[   94.716637]   SET = 0, FnV = 0
[   94.719686]   EA = 0, S1PTW = 0
[   94.722822] Data abort info:
[   94.725698]   ISV = 0, ISS = 0x00000005
[   94.729530]   CM = 0, WnR = 0
[   94.732504] user pgtable: 4k pages, 48-bit VAs, pgd = ffff8008d9ba3000
[   94.739035] [0000000000000008] *pgd=0000000938419003, *pud=0000000000000000
[   94.746015] Internal error: Oops: 96000005 [#1] PREEMPT SMP
[   94.751589] Modules linked in:
[   94.754652] CPU: 0 PID: 2068 Comm: kworker/0:2 Not tainted 4.14.98-dirty #75
[   94.761700] Hardware name: Freescale i.MX8QM MEK (DT)
[   94.766768] task: ffff8008f23ae200 task.stack: ffff000014378000
[   94.772705] PC is at process_one_work+0x34/0x414
[   94.777325] LR is at process_one_work+0x1e0/0x414

In order to fix this, we make sure that no work is pending before starting
the re-initialization.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
(cherry picked from commit 2c00c24be5f8b63636e3f9005e15a3de42058438)

Showing 1 changed file with 5 additions and 1 deletions Side-by-side Diff

sound/soc/fsl/fsl_dsp.c
Diff comments   View file @ f6714f0
... ... @@ -431,8 +431,12 @@
431 431 /* If device is free, reinitialize the resource of
432 432 * dsp driver and framework
433 433 */
434   - if (atomic_long_read(&dsp_priv->refcnt) <= 0)
  434 + if (atomic_long_read(&dsp_priv->refcnt) <= 0) {
  435 + /* we are closing up, wait for proxy processing
  436 + * function to finish */
  437 + cancel_work_sync(&dsp_priv->proxy.work);
435 438 resource_release(dsp_priv);
  439 + }
436 440  
437 441 mutex_unlock(&dsp_priv->dsp_mutex);
438 442