This is a note to let you know that I've just added the patch titled
ARM: imx: fix .is_enabled() of shared gate clock
to the 3.16-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:
arm-imx-fix-.is_enabled-of-shared-gate-clock.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9e1ac462b982f496ed3b491f02c417dcc8e40347 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Date: Tue, 16 Sep 2014 09:35:33 +0800
Subject: ARM: imx: fix .is_enabled() of shared gate clock
From: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
commit 9e1ac462b982f496ed3b491f02c417dcc8e40347 upstream.
Commit 63288b721a80 ("ARM: imx: fix shared gate clock") attempted to fix
an issue with particular enable/disable sequence from two shared gate
clocks. But unfortunately, while it partially fixed the issue, it also
did something wrong in .is_enabled() function hook. In case of shared
gate, the function shouldn't really query the hardware state via
share_count, because the function is trying to query the enabling state
of the clock in question, not the hardware state which is shared by
multiple clocks.
Fix the issue by returning the enable_count of the clock itself which is
maintained by clock core, in case it's a clock sharing hardware gate
with others. As the result, the initialization of share_count per
hardware state is not needed now. So remove it.
Reported-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Fixes: 63288b721a80 ("ARM: imx: fix shared gate clock")
Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxxxxx>
Tested-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-imx/clk-gate2.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
--- a/arch/arm/mach-imx/clk-gate2.c
+++ b/arch/arm/mach-imx/clk-gate2.c
@@ -97,7 +97,7 @@ static int clk_gate2_is_enabled(struct c
struct clk_gate2 *gate = to_clk_gate2(hw);
if (gate->share_count)
- return !!(*gate->share_count);
+ return !!__clk_get_enable_count(hw->clk);
else
return clk_gate2_reg_is_enabled(gate->reg, gate->bit_idx);
}
@@ -127,10 +127,6 @@ struct clk *clk_register_gate2(struct de
gate->bit_idx = bit_idx;
gate->flags = clk_gate2_flags;
gate->lock = lock;
-
- /* Initialize share_count per hardware state */
- if (share_count)
- *share_count = clk_gate2_reg_is_enabled(reg, bit_idx) ? 1 : 0;
gate->share_count = share_count;
init.name = name;
Patches currently in stable-queue which might be from shawn.guo@xxxxxxxxxxxxx are
queue-3.16/arm-dts-vf610-twr-fix-pinctrl_esdhc1-pin-definitions.patch
queue-3.16/arm-dts-i.mx53-fix-apparent-bug-in-vpu-clks.patch
queue-3.16/arm-imx-fix-.is_enabled-of-shared-gate-clock.patch
queue-3.16/arm-dts-imx53-qsrb-fix-suspend-resume.patch
queue-3.16/arm-imx-fix-tlb-missing-of-iomuxc-base-address-during-suspend.patch
queue-3.16/arm-dt-imx53-fix-lvds-channel-1-port.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html