mmc: tmio: Reorder TMIO clock handling
PATCH 1/1 mmc: tmio: Reorder TMIO clock handling
Reorder the tmio_sd_set_clk_rate() function such that it handles all of the clock requiests correctly. Specifically, before this patch, clock request with (mmc->clock == 0 && mmc->clk_disable) could leave the clock enabled, as the function would exit on if (!mmc->clock) condition on top and will not handle the mmc->clk_disable at all.
Rather than band-aid fixing just that particular problem, reorder the entire function to make it easier to understand and verify that all the cases are covered. The function has three sections now:
First, if mmc->clock != 0, we calculate divider for the SD block. Second, if mmc->clock != 0 and SD block clock are enabled and
current divider is not equal to the new divider, then stop the clock and update the divider.
Third, if mmc->clk_disable is set, disable the clock, otherwise
enable the clock. This happens independently of divider update now.
--- drivers/mmc/tmio-common.c | 105 ++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 51 deletions(-)
drivers/mmc/tmio-common.c +54 -51
@@ -560,68 +560,71 @@ static ulong tmio_sd_clk_get_rate(struct tmio_sd_priv *priv)return priv->clk_get_rate (priv); } -static void tmio_sd_set_clk_rate (struct tmio_sd_priv *priv, -struct mmc *mmc) +static void tmio_sd_set_clk_rate (struct tmio_sd_priv *priv,struct mmc *mmc) {unsigned int divisor; -u32 val, tmp; +u32 tmp, val =0 ;ulong mclk; -if (!mmc->clock) -return ; - - mclk =tmio_sd_clk_get_rate (priv); - - divisor =DIV_ROUND_UP (mclk, mmc->clock); - -/* Do not set divider to 0xff in DDR mode */ -if (mmc->ddr_mode && (divisor ==1 )) - divisor =2 ; - -if (divisor <=1 ) - val = (priv->caps &TMIO_SD_CAP_RCAR ) ? -TMIO_SD_CLKCTL_RCAR_DIV1 :TMIO_SD_CLKCTL_DIV1 ; -else if (divisor <=2 ) - val =TMIO_SD_CLKCTL_DIV2 ; -else if (divisor <=4 ) - val =TMIO_SD_CLKCTL_DIV4 ; -else if (divisor <=8 ) - val =TMIO_SD_CLKCTL_DIV8 ; -else if (divisor <=16 ) - val =TMIO_SD_CLKCTL_DIV16 ; -else if (divisor <=32 ) - val =TMIO_SD_CLKCTL_DIV32 ; -else if (divisor <=64 ) - val =TMIO_SD_CLKCTL_DIV64 ; -else if (divisor <=128 ) - val =TMIO_SD_CLKCTL_DIV128 ; -else if (divisor <=256 ) - val =TMIO_SD_CLKCTL_DIV256 ; -else if (divisor <=512 || !(priv->caps &TMIO_SD_CAP_DIV1024 )) - val =TMIO_SD_CLKCTL_DIV512 ; -else - val =TMIO_SD_CLKCTL_DIV1024 ; +if (mmc->clock) { + mclk =tmio_sd_clk_get_rate (priv); + + divisor =DIV_ROUND_UP (mclk, mmc->clock); + +/* Do not set divider to 0xff in DDR mode */ +if (mmc->ddr_mode && (divisor ==1 )) + divisor =2 ; + +if (divisor <=1 ) + val = (priv->caps &TMIO_SD_CAP_RCAR ) ? +TMIO_SD_CLKCTL_RCAR_DIV1 :TMIO_SD_CLKCTL_DIV1 ; +else if (divisor <=2 ) + val =TMIO_SD_CLKCTL_DIV2 ; +else if (divisor <=4 ) + val =TMIO_SD_CLKCTL_DIV4 ; +else if (divisor <=8 ) + val =TMIO_SD_CLKCTL_DIV8 ; +else if (divisor <=16 ) + val =TMIO_SD_CLKCTL_DIV16 ; +else if (divisor <=32 ) + val =TMIO_SD_CLKCTL_DIV32 ; +else if (divisor <=64 ) + val =TMIO_SD_CLKCTL_DIV64 ; +else if (divisor <=128 ) + val =TMIO_SD_CLKCTL_DIV128 ; +else if (divisor <=256 ) + val =TMIO_SD_CLKCTL_DIV256 ; +else if (divisor <=512 || !(priv->caps &TMIO_SD_CAP_DIV1024 )) + val =TMIO_SD_CLKCTL_DIV512 ; +else + val =TMIO_SD_CLKCTL_DIV1024 ; + } tmp =tmio_sd_readl (priv,TMIO_SD_CLKCTL ); -if (tmp &TMIO_SD_CLKCTL_SCLKEN && - (tmp &TMIO_SD_CLKCTL_DIV_MASK ) == val) -return ; - -/* stop the clock before changing its rate to avoid a glitch signal */ - tmp &= ~TMIO_SD_CLKCTL_SCLKEN ; -tmio_sd_writel (priv, tmp,TMIO_SD_CLKCTL ); +if (mmc->clock && + !((tmp &TMIO_SD_CLKCTL_SCLKEN ) && + ((tmp &TMIO_SD_CLKCTL_DIV_MASK ) == val))) { +/* +* Stop the clock before changing its rate +* to avoid a glitch signal +*/ + tmp &= ~TMIO_SD_CLKCTL_SCLKEN ; +tmio_sd_writel (priv, tmp,TMIO_SD_CLKCTL ); - tmp &= ~TMIO_SD_CLKCTL_DIV_MASK ; - tmp |= val; -tmio_sd_writel (priv, tmp,TMIO_SD_CLKCTL ); +/* Change the clock rate. */ + tmp &= ~TMIO_SD_CLKCTL_DIV_MASK ; + tmp |= val; + } -if (!mmc->clk_disable) { - tmp &= ~TMIO_SD_CLKCTL_OFFEN ; - tmp |=TMIO_SD_CLKCTL_SCLKEN ; - }else { +/* Enable or Disable the clock */ +if (mmc->clk_disable) { tmp |=TMIO_SD_CLKCTL_OFFEN ; tmp &= ~TMIO_SD_CLKCTL_SCLKEN ; + }else { + tmp &= ~TMIO_SD_CLKCTL_OFFEN ; + tmp |=TMIO_SD_CLKCTL_SCLKEN ; } +tmio_sd_writel (priv, tmp,TMIO_SD_CLKCTL );udelay (1000 );
Signature · 1 line
2.18.0
PATCH 1/1 mmc: tmio: Reorder TMIO clock handling
Quoted 18 lines · Marek Vasut
Reorder the
tmio_sd_set_clk_rate()function such that it handles all of the clock requiests correctly. Specifically, before this patch, clock request with (mmc->clock== 0 &&mmc->clk_disable) could leave the clock enabled, as the function would exit on if (!mmc->clock) condition on top and will not handle themmc->clk_disableat all.Rather than band-aid fixing just that particular problem, reorder the entire function to make it easier to understand and verify that all the cases are covered. The function has three sections now:
First, if
mmc->clock!= 0, we calculate divider for the SD block. Second, ifmmc->clock!= 0 and SD block clock are enabled and
current divider is not equal to the new divider, then stop the clock and update the divider.
Third, ifmmc->clk_disableis set, disable the clock, otherwise
enable the clock. This happens independently of divider update now.
Quoted 2 lines
Signed-off-by Marek Vasut <[email protected]>Cc Masahiro Yamada <[email protected]>
Yamada-san , can you check this one please ?
Signature · 2 lines
Best regards, Marek Vasut