Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47ba4278 authored by Tony Lindgren's avatar Tony Lindgren Committed by Greg Kroah-Hartman
Browse files

bus: ti-sysc: Fix sleeping function called from invalid context for RTC quirk 



[ Upstream commit afe6f1eeb08f85e57f0a02b71efb5a0839606aac ]

With CONFIG_DEBUG_ATOMIC_SLEEP enabled we can see the following with RTC probe:

BUG: sleeping function called from invalid context at drivers/bus/ti-sysc.c:1736
...
(sysc_quirk_rtc) from [<c060d01c>] (sysc_write_sysconfig+0x1c/0x60)
(sysc_write_sysconfig) from [<c060d9f4>] (sysc_enable_module+0x11c/0x274)
(sysc_enable_module) from [<c060f37c>] (sysc_probe+0xe9c/0x1380)
(sysc_probe) from [<c06e9384>] (platform_drv_probe+0x48/0x98)

Fixes: e8639e1c986a ("bus: ti-sysc: Handle module unlock quirk needed for some RTC")
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5a23897f

drivers/bus/ti-sysc.c

+2 −2
Original line number Diff line number Diff line
@@ -1571,7 +1571,7 @@ static void sysc_quirk_rtc(struct sysc *ddata, bool lock) 


	local_irq_save(flags);

	/* RTC_STATUS BUSY bit may stay active for 1/32768 seconds (~30 usec) */

	error = readl_poll_timeout(ddata->module_va + 0x44, val,

	error = readl_poll_timeout_atomic(ddata->module_va + 0x44, val,

					  !(val & BIT(0)), 100, 50);

	if (error)

		dev_warn(ddata->dev, "rtc busy timeout\n");