[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <9db1f94f-7edd-73a1-fb09-9499c5f8cfcb@gmail.com>
Date: Fri, 8 Feb 2019 14:39:02 +0100
From: Matthias Brugger <matthias.bgg@...il.com>
To: matthias.bgg@...nel.org, mturquette@...libre.com, sboyd@...nel.org,
kevin-cw.chen@...iatek.com, mars.cheng@...iatek.com
Cc: sean.wang@...iatek.com, jasu@...motys.info,
linux-clk@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org
Subject: Re: [PATCH v3 3/3] clk: mediatek: Mark bus and DRAM related clocks as
critical
Steven, Mike, any comments on that?
On 08/01/2019 13:12, matthias.bgg@...nel.org wrote:
> From: Jasper Mattsson <jasu@...motys.info>
>
> Currently, DRAM-related clocks are not marked with CLK_IS_CRITICAL
> for MT6797. This causes memory corruption when the system is
> booted without clk_ignore_unused.
> This patch marks MUX ddrphycfg_sel as well as gates infra_dramc_f26m
> and infra_dramc_b_f26m as CLK_IS_CRITICAL.
>
> Signed-off-by: Jasper Mattsson <jasu@...motys.info>
> Signed-off-by: Matthias Brugger <matthias.bgg@...il.com>
> ---
> drivers/clk/mediatek/clk-mt6797.c | 60 ++++++++++++++++++-------------
> 1 file changed, 35 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-mt6797.c b/drivers/clk/mediatek/clk-mt6797.c
> index 5702bc974ed9..a6e5408e0388 100644
> --- a/drivers/clk/mediatek/clk-mt6797.c
> +++ b/drivers/clk/mediatek/clk-mt6797.c
> @@ -331,8 +331,8 @@ static const struct mtk_composite top_muxes[] = {
> ulposc_axi_ck_mux_parents, 0x0040, 2, 1),
> MUX(CLK_TOP_MUX_AXI, "axi_sel", axi_parents,
> 0x0040, 0, 2),
> - MUX(CLK_TOP_MUX_DDRPHYCFG, "ddrphycfg_sel", ddrphycfg_parents,
> - 0x0040, 16, 2),
> + MUX_FLAGS(CLK_TOP_MUX_DDRPHYCFG, "ddrphycfg_sel", ddrphycfg_parents,
> + 0x0040, 16, 2, CLK_IS_CRITICAL | CLK_SET_RATE_PARENT),
> MUX(CLK_TOP_MUX_MM, "mm_sel", mm_parents,
> 0x0040, 24, 2),
> MUX_GATE(CLK_TOP_MUX_PWM, "pwm_sel", pwm_parents, 0x0050, 0, 3, 7),
> @@ -424,31 +424,39 @@ static const struct mtk_gate_regs infra2_cg_regs = {
> .sta_ofs = 0x00b0,
> };
>
> -#define GATE_ICG0(_id, _name, _parent, _shift) { \
> - .id = _id, \
> - .name = _name, \
> - .parent_name = _parent, \
> - .regs = &infra0_cg_regs, \
> - .shift = _shift, \
> - .ops = &mtk_clk_gate_ops_setclr, \
> +#define GATE_ICG0(_id, _name, _parent, _shift) { \
> + .id = _id, \
> + .name = _name, \
> + .parent_name = _parent, \
> + .regs = &infra0_cg_regs, \
> + .shift = _shift, \
> + .ops = &mtk_clk_gate_ops_setclr, \
> }
>
> -#define GATE_ICG1(_id, _name, _parent, _shift) { \
> - .id = _id, \
> - .name = _name, \
> - .parent_name = _parent, \
> - .regs = &infra1_cg_regs, \
> - .shift = _shift, \
> - .ops = &mtk_clk_gate_ops_setclr, \
> +#define GATE_ICG1(_id, _name, _parent, _shift) \
> + GATE_ICG1_FLAGS(_id, _name, _parent, _shift, 0)
> +
> +#define GATE_ICG1_FLAGS(_id, _name, _parent, _shift, _flags) { \
> + .id = _id, \
> + .name = _name, \
> + .parent_name = _parent, \
> + .regs = &infra1_cg_regs, \
> + .shift = _shift, \
> + .ops = &mtk_clk_gate_ops_setclr, \
> + .flags = _flags, \
> }
>
> -#define GATE_ICG2(_id, _name, _parent, _shift) { \
> - .id = _id, \
> - .name = _name, \
> - .parent_name = _parent, \
> - .regs = &infra2_cg_regs, \
> - .shift = _shift, \
> - .ops = &mtk_clk_gate_ops_setclr, \
> +#define GATE_ICG2(_id, _name, _parent, _shift) \
> + GATE_ICG2_FLAGS(_id, _name, _parent, _shift, 0)
> +
> +#define GATE_ICG2_FLAGS(_id, _name, _parent, _shift, _flags) { \
> + .id = _id, \
> + .name = _name, \
> + .parent_name = _parent, \
> + .regs = &infra2_cg_regs, \
> + .shift = _shift, \
> + .ops = &mtk_clk_gate_ops_setclr, \
> + .flags = _flags, \
> }
>
> static const struct mtk_gate infra_clks[] = {
> @@ -505,7 +513,8 @@ static const struct mtk_gate infra_clks[] = {
> GATE_ICG1(CLK_INFRA_CCIF_AP, "infra_ccif_ap", "axi_sel", 23),
> GATE_ICG1(CLK_INFRA_AUDIO, "infra_audio", "axi_sel", 25),
> GATE_ICG1(CLK_INFRA_CCIF_MD, "infra_ccif_md", "axi_sel", 26),
> - GATE_ICG1(CLK_INFRA_DRAMC_F26M, "infra_dramc_f26m", "clk26m", 31),
> + GATE_ICG1_FLAGS(CLK_INFRA_DRAMC_F26M, "infra_dramc_f26m",
> + "clk26m", 31, CLK_IS_CRITICAL),
> GATE_ICG2(CLK_INFRA_I2C4, "infra_i2c4", "axi_sel", 0),
> GATE_ICG2(CLK_INFRA_I2C_APPM, "infra_i2c_appm", "axi_sel", 1),
> GATE_ICG2(CLK_INFRA_I2C_GPUPM, "infra_i2c_gpupm", "axi_sel", 2),
> @@ -516,7 +525,8 @@ static const struct mtk_gate infra_clks[] = {
> GATE_ICG2(CLK_INFRA_I2C5, "infra_i2c5", "axi_sel", 7),
> GATE_ICG2(CLK_INFRA_SYS_CIRQ, "infra_sys_cirq", "axi_sel", 8),
> GATE_ICG2(CLK_INFRA_SPI1, "infra_spi1", "spi_sel", 10),
> - GATE_ICG2(CLK_INFRA_DRAMC_B_F26M, "infra_dramc_b_f26m", "clk26m", 11),
> + GATE_ICG2_FLAGS(CLK_INFRA_DRAMC_B_F26M, "infra_dramc_b_f26m",
> + "clk26m", 11, CLK_IS_CRITICAL),
> GATE_ICG2(CLK_INFRA_ANC_MD32, "infra_anc_md32", "anc_md32_sel", 12),
> GATE_ICG2(CLK_INFRA_ANC_MD32_32K, "infra_anc_md32_32k", "clk26m", 13),
> GATE_ICG2(CLK_INFRA_DVFS_SPM1, "infra_dvfs_spm1", "axi_sel", 15),
>
Powered by blists - more mailing lists