Patch "clk: tegra: Use readl_relaxed_poll_timeout_atomic() in tegra210_clock_init()" has been added to the 4.14-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
clk: tegra: Use readl_relaxed_poll_timeout_atomic() in tegra210_clock_init()
to the 4.14-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:
clk-tegra-use-readl_relaxed_poll_timeout_atomic-in-tegra210_clock_init.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Dec 18 13:28:59 CET 2017
From: Nicolin Chen <[email protected]>
Date: Fri, 15 Sep 2017 12:10:13 -0700
Subject: clk: tegra: Use readl_relaxed_poll_timeout_atomic() in tegra210_clock_init()
From: Nicolin Chen <[email protected]>
[ Upstream commit 22ef01a203d27fee8b7694020b7e722db7efd2a7 ]
Below is the call trace of tegra210_init_pllu() function:
start_kernel()
-> time_init()
--> of_clk_init()
---> tegra210_clock_init()
----> tegra210_pll_init()
-----> tegra210_init_pllu()
Because the preemption is disabled in the start_kernel before calling time_init, tegra210_init_pllu is actually in an atomic context while it includes a readl_relaxed_poll_timeout that might sleep.
So this patch just changes this readl_relaxed_poll_timeout() to its atomic version.
--- drivers/clk/tegra/clk-tegra210.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/tegra/clk-tegra210.c +2 -2
@@ -2566,8 +2566,8 @@ static int tegra210_enable_pllu(void) reg |=PLL_ENABLE ;writel (reg, clk_base +PLLU_BASE ); -readl_relaxed_poll_timeout (clk_base +PLLU_BASE , reg, - reg &PLL_BASE_LOCK ,2 ,1000 ); +readl_relaxed_poll_timeout_atomic (clk_base +PLLU_BASE , reg, + reg &PLL_BASE_LOCK ,2 ,1000 );if (!(reg &PLL_BASE_LOCK )) {pr_err ("Timed out waiting for PLL_U to lock\n" );return -ETIMEDOUT ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/clk-tegra-use-readl_relaxed_poll_timeout_atomic-in-tegra210_clock_init.patch