| Message ID | 1430933.sM2tQimLcT@amdc1032 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2015-03-27 17:27 GMT+01:00 Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>: > Commit 42773b28e71d ("clk: samsung: exynos4: Enable ARMCLK > down feature") enabled ARMCLK down feature on all Exynos4 > SoCs. Unfortunately on Exynos4210 SoC ARMCLK down feature > causes a lockup when ondemand cpufreq governor is used. > Fix it by limiting ARMCLK down feature to Exynos4x12 SoCs. > > This patch was tested on: > - Exynos4210 SoC based Trats board > - Exynos4210 SoC based Origen board > - Exynos4412 SoC based Trats2 board > - Exynos4412 SoC based Odroid-U3 board > > Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> > Cc: Daniel Drake <drake@endlessm.com> > Cc: Tomasz Figa <t.figa@samsung.com> > Cc: Kukjin Kim <kgene@kernel.org> > Fixes: 42773b28e71d ("clk: samsung: exynos4: Enable ARMCLK down feature") > Cc: <stable@vger.kernel.org> # v3.17+ > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > --- > drivers/clk/samsung/clk-exynos4.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Best regards, Krzysztof
Quoting Krzysztof Kozlowski (2015-03-28 09:37:05) > 2015-03-27 17:27 GMT+01:00 Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>: > > Commit 42773b28e71d ("clk: samsung: exynos4: Enable ARMCLK > > down feature") enabled ARMCLK down feature on all Exynos4 > > SoCs. Unfortunately on Exynos4210 SoC ARMCLK down feature > > causes a lockup when ondemand cpufreq governor is used. > > Fix it by limiting ARMCLK down feature to Exynos4x12 SoCs. > > > > This patch was tested on: > > - Exynos4210 SoC based Trats board > > - Exynos4210 SoC based Origen board > > - Exynos4412 SoC based Trats2 board > > - Exynos4412 SoC based Odroid-U3 board > > > > Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> > > Cc: Daniel Drake <drake@endlessm.com> > > Cc: Tomasz Figa <t.figa@samsung.com> > > Cc: Kukjin Kim <kgene@kernel.org> > > Fixes: 42773b28e71d ("clk: samsung: exynos4: Enable ARMCLK down feature") > > Cc: <stable@vger.kernel.org> # v3.17+ > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > --- > > drivers/clk/samsung/clk-exynos4.c | 11 +++++------ > > 1 file changed, 5 insertions(+), 6 deletions(-) > > Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Applied. Thanks, Mike > > Best regards, > Krzysztof
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index 51462e8..714d6ba 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c @@ -1354,7 +1354,7 @@ static struct samsung_pll_clock exynos4x12_plls[nr_plls] __initdata = { VPLL_LOCK, VPLL_CON0, NULL), }; -static void __init exynos4_core_down_clock(enum exynos4_soc soc) +static void __init exynos4x12_core_down_clock(void) { unsigned int tmp; @@ -1373,11 +1373,9 @@ static void __init exynos4_core_down_clock(enum exynos4_soc soc) __raw_writel(tmp, reg_base + PWR_CTRL1); /* - * Disable the clock up feature on Exynos4x12, in case it was - * enabled by bootloader. + * Disable the clock up feature in case it was enabled by bootloader. */ - if (exynos4_soc == EXYNOS4X12) - __raw_writel(0x0, reg_base + E4X12_PWR_CTRL2); + __raw_writel(0x0, reg_base + E4X12_PWR_CTRL2); } /* register exynos4 clocks */ @@ -1474,7 +1472,8 @@ static void __init exynos4_clk_init(struct device_node *np, samsung_clk_register_alias(ctx, exynos4_aliases, ARRAY_SIZE(exynos4_aliases)); - exynos4_core_down_clock(soc); + if (soc == EXYNOS4X12) + exynos4x12_core_down_clock(); exynos4_clk_sleep_init(); samsung_clk_of_add_provider(np, ctx);
Commit 42773b28e71d ("clk: samsung: exynos4: Enable ARMCLK down feature") enabled ARMCLK down feature on all Exynos4 SoCs. Unfortunately on Exynos4210 SoC ARMCLK down feature causes a lockup when ondemand cpufreq governor is used. Fix it by limiting ARMCLK down feature to Exynos4x12 SoCs. This patch was tested on: - Exynos4210 SoC based Trats board - Exynos4210 SoC based Origen board - Exynos4412 SoC based Trats2 board - Exynos4412 SoC based Odroid-U3 board Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Daniel Drake <drake@endlessm.com> Cc: Tomasz Figa <t.figa@samsung.com> Cc: Kukjin Kim <kgene@kernel.org> Fixes: 42773b28e71d ("clk: samsung: exynos4: Enable ARMCLK down feature") Cc: <stable@vger.kernel.org> # v3.17+ Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> --- drivers/clk/samsung/clk-exynos4.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)