On 16/05/2021 17:30, Dmitry Osipenko wrote:
> The refcounting of the gate clocks has a bug causing the enable_refcnt
> to underflow when unused clocks are disabled. This happens because clk
> provider erroneously bumps the refcount if clock is enabled at a boot
> time, which it shouldn't be doing, and it does this only for the gate
> clocks, while peripheral clocks are using the same gate ops and the
> peripheral clocks are missing the initial bump. Hence the refcount of
> the peripheral clocks is 0 when unused clocks are disabled and then the
> counter is decremented further by the gate ops, causing the integer
> underflow.
>
> Fix this problem by removing the erroneous bump and by implementing the
> disable_unused() callback, which disables the unused gates properly.
>
> The visible effect of the bug is such that the unused clocks are never
> gated if a loaded kernel module grabs the unused clocks and starts to use
> them. In practice this shouldn't cause any real problems for the drivers
> and boards supported by the kernel today.
>
> Acked-by: Thierry Reding <treding@xxxxxxxxxx>
> Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx>
> ---
> drivers/clk/tegra/clk-periph-gate.c | 72 +++++++++++++++++++----------
> drivers/clk/tegra/clk-periph.c | 11 +++++
> 2 files changed, 58 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/clk/tegra/clk-periph-gate.c b/drivers/clk/tegra/clk-periph-gate.c
> index 4b31beefc9fc..dc3f92678407 100644
> --- a/drivers/clk/tegra/clk-periph-gate.c
> +++ b/drivers/clk/tegra/clk-periph-gate.c
> @@ -48,18 +48,9 @@ static int clk_periph_is_enabled(struct clk_hw *hw)
> return state;
> }
>
> -static int clk_periph_enable(struct clk_hw *hw)
> +static void clk_periph_enable_locked(struct clk_hw *hw)
> {
> struct tegra_clk_periph_gate *gate = to_clk_periph_gate(hw);
> - unsigned long flags = 0;
> -
> - spin_lock_irqsave(&periph_ref_lock, flags);
> -
> - gate->enable_refcnt[gate->clk_num]++;
> - if (gate->enable_refcnt[gate->clk_num] > 1) {
> - spin_unlock_irqrestore(&periph_ref_lock, flags);
> - return 0;
> - }
>
> write_enb_set(periph_clk_to_bit(gate), gate);
> udelay(2);
> @@ -78,6 +69,32 @@ static int clk_periph_enable(struct clk_hw *hw)
> udelay(1);
> writel_relaxed(0, gate->clk_base + LVL2_CLK_GATE_OVRE);
> }
> +}
> +
> +static void clk_periph_disable_locked(struct clk_hw *hw)
> +{
> + struct tegra_clk_periph_gate *gate = to_clk_periph_gate(hw);
> +
> + /*
> + * If peripheral is in the APB bus then read the APB bus to
> + * flush the write operation in apb bus. This will avoid the
> + * peripheral access after disabling clock
> + */
> + if (gate->flags & TEGRA_PERIPH_ON_APB)
> + tegra_read_chipid();
> +
> + write_enb_clr(periph_clk_to_bit(gate), gate);
> +}
> +
> +static int clk_periph_enable(struct clk_hw *hw)
> +{
> + struct tegra_clk_periph_gate *gate = to_clk_periph_gate(hw);
> + unsigned long flags = 0;
> +
> + spin_lock_irqsave(&periph_ref_lock, flags);
> +
> + if (!gate->enable_refcnt[gate->clk_num]++)
> + clk_periph_enable_locked(hw);
>
> spin_unlock_irqrestore(&periph_ref_lock, flags);
>
> @@ -91,21 +108,28 @@ static void clk_periph_disable(struct clk_hw *hw)
>
> spin_lock_irqsave(&periph_ref_lock, flags);
>
> - gate->enable_refcnt[gate->clk_num]--;
> - if (gate->enable_refcnt[gate->clk_num] > 0) {
> - spin_unlock_irqrestore(&periph_ref_lock, flags);
> - return;
> - }
> + WARN_ON(!gate->enable_refcnt[gate->clk_num]);
> +
> + if (--gate->enable_refcnt[gate->clk_num] == 0)
> + clk_periph_disable_locked(hw);
> +
> + spin_unlock_irqrestore(&periph_ref_lock, flags);
> +}
A consequence of this change is now I see the following on Tegra210
Jetson Nano ...
[ 8.138810] ------------[ cut here ]------------
[ 8.150529] WARNING: CPU: 3 PID: 1 at /dvs/git/dirty/git-master_l4t-upstream/kernel/drivers/clk/tegra/clk-periph-gate.c:103 clk_periph_disable+0x68/0x90
[ 8.164279] Modules linked in:
[ 8.167373] CPU: 3 PID: 1 Comm: swapper/0 Not tainted 5.14.0-rc1-gb34c0e9111d0 #1
[ 8.174905] Hardware name: NVIDIA Jetson Nano Developer Kit (DT)
[ 8.180934] pstate: 000000c5 (nzcv daIF -PAN -UAO -TCO BTYPE=--)
[ 8.186983] pc : clk_periph_disable+0x68/0x90
[ 8.191388] lr : clk_periph_disable+0x20/0x90
[ 8.195788] sp : ffff8000120abca0
[ 8.199123] x29: ffff8000120abca0 x28: 0000000000000000 x27: ffff800011791070
[ 8.206331] x26: ffff8000116e0458 x25: ffff800011fe3000 x24: ffff800011fe3000
[ 8.213527] x23: ffff000080138000 x22: 0000000000000000 x21: 00000000000000c0
[ 8.220725] x20: ffff0000800391b8 x19: ffff800012047000 x18: 0000000000000068
[ 8.227920] x17: 0000000000000007 x16: 0000000000000001 x15: ffff800011222000
[ 8.235116] x14: ffff8000120ab940 x13: ffff800011f629b8 x12: ffff000000000001
[ 8.242313] x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000000
[ 8.249507] x8 : 0000000000000000 x7 : 0000000000000000 x6 : 0000000000000004
[ 8.256700] x5 : ffff800011040d10 x4 : 0000000000000000 x3 : 000000000000000f
[ 8.263892] x2 : ffff00008000c400 x1 : 0000000000000000 x0 : 0000000000000000
[ 8.271088] Call trace:
[ 8.273557] clk_periph_disable+0x68/0x90
[ 8.277615] clk_sdmmc_mux_disable+0x1c/0x28
[ 8.281924] clk_disable_unused_subtree+0xac/0xe4
[ 8.286685] clk_disable_unused_subtree+0x3c/0xe4
[ 8.291433] clk_disable_unused_subtree+0x3c/0xe4
[ 8.296182] clk_disable_unused_subtree+0x3c/0xe4
[ 8.300931] clk_disable_unused_subtree+0x3c/0xe4
[ 8.305678] clk_disable_unused+0x5c/0xe8
[ 8.309730] do_one_initcall+0x58/0x1b8
[ 8.313607] kernel_init_freeable+0x22c/0x29c
[ 8.318002] kernel_init+0x20/0x120
[ 8.321536] ret_from_fork+0x10/0x18
[ 8.325150] ---[ end trace b5b8bc7cd88ff097 ]---
Any thoughts on how to resolve this?
I now see this has been picked up for stable, but I don't see where
this was tagged for stable and so I am not sure how that happened?
Jon
--
nvpublic
