Commit 9f911392 authored by Tony Lindgren's avatar Tony Lindgren

bus: ti-sysc: Fix wakeirq sleeping function called from invalid context

With CONFIG_DEBUG_ATOMIC_SLEEP enabled we can see the following with
wakeirqs and serial console idled:

BUG: sleeping function called from invalid context at drivers/bus/ti-sysc.c:242
...
(sysc_wait_softreset) from [<c0606894>] (sysc_enable_module+0x48/0x274)
(sysc_enable_module) from [<c0606c5c>] (sysc_runtime_resume+0x19c/0x1d8)
(sysc_runtime_resume) from [<c0606cf0>] (sysc_child_runtime_resume+0x58/0x84)
(sysc_child_runtime_resume) from [<c06eb7bc>] (__rpm_callback+0x30/0x12c)
(__rpm_callback) from [<c06eb8d8>] (rpm_callback+0x20/0x80)
(rpm_callback) from [<c06eb434>] (rpm_resume+0x638/0x7fc)
(rpm_resume) from [<c06eb658>] (__pm_runtime_resume+0x60/0x9c)
(__pm_runtime_resume) from [<c06edc08>] (handle_threaded_wake_irq+0x24/0x60)
(handle_threaded_wake_irq) from [<c01befec>] (irq_thread_fn+0x1c/0x78)
(irq_thread_fn) from [<c01bf30c>] (irq_thread+0x140/0x26c)

We have __pm_runtime_resume() call the sysc_runtime_resume() with spinlock
held and interrupts disabled.

Fixes: d46f9fbe ("bus: ti-sysc: Use optional clocks on for enable and wait for softreset bit")
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a352fe37
...@@ -236,15 +236,14 @@ static int sysc_wait_softreset(struct sysc *ddata) ...@@ -236,15 +236,14 @@ static int sysc_wait_softreset(struct sysc *ddata)
syss_done = ddata->cfg.syss_mask; syss_done = ddata->cfg.syss_mask;
if (syss_offset >= 0) { if (syss_offset >= 0) {
error = readx_poll_timeout(sysc_read_sysstatus, ddata, rstval, error = readx_poll_timeout_atomic(sysc_read_sysstatus, ddata,
(rstval & ddata->cfg.syss_mask) == rstval, (rstval & ddata->cfg.syss_mask) ==
syss_done, syss_done, 100, MAX_MODULE_SOFTRESET_WAIT);
100, MAX_MODULE_SOFTRESET_WAIT);
} else if (ddata->cfg.quirks & SYSC_QUIRK_RESET_STATUS) { } else if (ddata->cfg.quirks & SYSC_QUIRK_RESET_STATUS) {
error = readx_poll_timeout(sysc_read_sysconfig, ddata, rstval, error = readx_poll_timeout_atomic(sysc_read_sysconfig, ddata,
!(rstval & sysc_mask), rstval, !(rstval & sysc_mask),
100, MAX_MODULE_SOFTRESET_WAIT); 100, MAX_MODULE_SOFTRESET_WAIT);
} }
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment