clk: tegra: Add missing spinlock for hclk and pclk
Subsystems (3)
PATCH 1/1 clk: tegra: Add missing spinlock for hclk and pclk
The hclk and pclk clocks are controlled by the same register. Hence a lock is required to avoid corruption.
--- drivers/clk/tegra/clk-tegra20.c | 11 +++++++---- drivers/clk/tegra/clk-tegra30.c | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/clk/tegra/clk-tegra20.c +7 -4
@@ -194,6 +194,7 @@ static void __iomem *clk_base;static void __iomem *pmc_base;static DEFINE_SPINLOCK (pll_div_lock); +static DEFINE_SPINLOCK (sysrate_lock);#define TEGRA_INIT_DATA_MUX (_name, _con_id, _dev_id, _parents, _offset, \ _clk_num, _regs, _gate_flags, _clk_id) \
@@ -768,19 +769,21 @@ static void tegra20_super_clk_init(void)/* HCLK */ clk =clk_register_divider (NULL ,"hclk_div" ,"sclk" ,0 , - clk_base +CLK_SYSTEM_RATE ,4 ,2 ,0 ,NULL ); + clk_base +CLK_SYSTEM_RATE ,4 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"hclk" ,"hclk_div" ,CLK_SET_RATE_PARENT , clk_base +CLK_SYSTEM_RATE ,7 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"hclk" ,NULL ); clks[hclk] = clk;/* PCLK */ clk =clk_register_divider (NULL ,"pclk_div" ,"hclk" ,0 , - clk_base +CLK_SYSTEM_RATE ,0 ,2 ,0 ,NULL ); + clk_base +CLK_SYSTEM_RATE ,0 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"pclk" ,"pclk_div" ,CLK_SET_RATE_PARENT , clk_base +CLK_SYSTEM_RATE ,3 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"pclk" ,NULL ); clks[pclk] = clk;
drivers/clk/tegra/clk-tegra30.c +7 -4
@@ -275,6 +275,7 @@ static DEFINE_SPINLOCK(clk_out_lock);static DEFINE_SPINLOCK (pll_div_lock);static DEFINE_SPINLOCK (cml_lock);static DEFINE_SPINLOCK (pll_d_lock); +static DEFINE_SPINLOCK (sysrate_lock);#define TEGRA_INIT_DATA_MUX (_name, _con_id, _dev_id, _parents, _offset, \ _clk_num, _regs, _gate_flags, _clk_id) \
@@ -1348,19 +1349,21 @@ static void __init tegra30_super_clk_init(void)/* HCLK */ clk =clk_register_divider (NULL ,"hclk_div" ,"sclk" ,0 , - clk_base +SYSTEM_CLK_RATE ,4 ,2 ,0 ,NULL ); + clk_base +SYSTEM_CLK_RATE ,4 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"hclk" ,"hclk_div" ,CLK_SET_RATE_PARENT , clk_base +SYSTEM_CLK_RATE ,7 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"hclk" ,NULL ); clks[hclk] = clk;/* PCLK */ clk =clk_register_divider (NULL ,"pclk_div" ,"hclk" ,0 , - clk_base +SYSTEM_CLK_RATE ,0 ,2 ,0 ,NULL ); + clk_base +SYSTEM_CLK_RATE ,0 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"pclk" ,"pclk_div" ,CLK_SET_RATE_PARENT , clk_base +SYSTEM_CLK_RATE ,3 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"pclk" ,NULL ); clks[pclk] = clk;
Signature · 1 line
1.7.7.rc0.72.g4b5ea.dirty
Quoting Peter De Schrijver (2013-02-07 08:37:35)
Quoted 4 lines
The hclk and pclk clocks are controlled by the same register. Hence a lock is required to avoid corruption.
Signed-off-by Peter De Schrijver <[email protected]>
I assume this is going through the tegra tree with the other ccf patches, so:
Stephen Warren
AppliedQuoted 10 lines · Mike Turquette
Quoting Peter De Schrijver (2013-02-07 08:37:35)
Quoted 4 lines
The hclk and pclk clocks are controlled by the same register. Hence a lock is required to avoid corruption.
Signed-off-by Peter De Schrijver <[email protected]>I assume this is going through the tegra tree with the other ccf patches, so:
Acked-by Mike Turquette <[email protected]>
I've applied this to Tegra's for-3.9/soc-ccf-fixes branch.
Quoted 4 lines · Peter De Schrijver
The hclk and pclk clocks are controlled by the same register. Hence a lock is required to avoid corruption.
Signed-off-by Peter De Schrijver <[email protected]>
Quoted 81 lines
--- drivers/clk/tegra/clk-tegra20.c | 11 +++++++---- drivers/clk/tegra/clk-tegra30.c | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-)drivers/clk/tegra/clk-tegra20.c +7
-4@@ -194,6 +194,7 @@ static void __iomem *clk_base;static void __iomem *pmc_base;static DEFINE_SPINLOCK (pll_div_lock); +static DEFINE_SPINLOCK (sysrate_lock);#define TEGRA_INIT_DATA_MUX (_name, _con_id, _dev_id, _parents, _offset, \ _clk_num, _regs, _gate_flags, _clk_id) \@@ -768,19 +769,21 @@ static void tegra20_super_clk_init(void)/* HCLK */ clk =clk_register_divider (NULL ,"hclk_div" ,"sclk" ,0 , - clk_base +CLK_SYSTEM_RATE ,4 ,2 ,0 ,NULL ); + clk_base +CLK_SYSTEM_RATE ,4 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"hclk" ,"hclk_div" ,CLK_SET_RATE_PARENT , clk_base +CLK_SYSTEM_RATE ,7 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"hclk" ,NULL ); clks[hclk] = clk;/* PCLK */ clk =clk_register_divider (NULL ,"pclk_div" ,"hclk" ,0 , - clk_base +CLK_SYSTEM_RATE ,0 ,2 ,0 ,NULL ); + clk_base +CLK_SYSTEM_RATE ,0 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"pclk" ,"pclk_div" ,CLK_SET_RATE_PARENT , clk_base +CLK_SYSTEM_RATE ,3 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"pclk" ,NULL ); clks[pclk] = clk;drivers/clk/tegra/clk-tegra30.c +7
-4@@ -275,6 +275,7 @@ static DEFINE_SPINLOCK(clk_out_lock);static DEFINE_SPINLOCK (pll_div_lock);static DEFINE_SPINLOCK (cml_lock);static DEFINE_SPINLOCK (pll_d_lock); +static DEFINE_SPINLOCK (sysrate_lock);#define TEGRA_INIT_DATA_MUX (_name, _con_id, _dev_id, _parents, _offset, \ _clk_num, _regs, _gate_flags, _clk_id) \@@ -1348,19 +1349,21 @@ static void __init tegra30_super_clk_init(void)/* HCLK */ clk =clk_register_divider (NULL ,"hclk_div" ,"sclk" ,0 , - clk_base +SYSTEM_CLK_RATE ,4 ,2 ,0 ,NULL ); + clk_base +SYSTEM_CLK_RATE ,4 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"hclk" ,"hclk_div" ,CLK_SET_RATE_PARENT , clk_base +SYSTEM_CLK_RATE ,7 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"hclk" ,NULL ); clks[hclk] = clk;/* PCLK */ clk =clk_register_divider (NULL ,"pclk_div" ,"hclk" ,0 , - clk_base +SYSTEM_CLK_RATE ,0 ,2 ,0 ,NULL ); + clk_base +SYSTEM_CLK_RATE ,0 ,2 ,0 , + &sysrate_lock); clk =clk_register_gate (NULL ,"pclk" ,"pclk_div" ,CLK_SET_RATE_PARENT , clk_base +SYSTEM_CLK_RATE ,3 , -CLK_GATE_SET_TO_DISABLE ,NULL ); +CLK_GATE_SET_TO_DISABLE , &sysrate_lock);clk_register_clkdev (clk,"pclk" ,NULL ); clks[pclk] = clk;