Thread (8 messages) 8 messages, 2 authors, 2017-03-04

[PATCH v1] mmc: mediatek: Fixed bug where clock frequency could be set wrong

From: Daniel Kurtz <hidden>
Date: 2017-02-24 08:53:38
Also in: linux-mediatek, linux-mmc, lkml

On Fri, Feb 24, 2017 at 5:22 PM, Yong Mao [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: yong mao <redacted>

This patch can fix two issues:

Issue 1:
The maximum value of clock divider is 0xff.
Because the type of div is u32, div may be larger than max_div.
In this case, we should use max_div to set the clock frequency.

Issue 2:
In previous code, we can not set the correct clock frequency when
div equals 0xff.

Signed-off-by: Yong Mao <redacted>
Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
---
 drivers/mmc/host/mtk-sd.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 07f3236..3174445 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -540,6 +540,7 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)
        u32 mode;
        u32 flags;
        u32 div;
+       u32 max_div;
There's really no need for this variable.  Just use 0xff below.
quoted hunk ↗ jump to hunk
        u32 sclk;

        if (!hz) {
@@ -590,8 +591,18 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)
                        sclk = (host->src_clk_freq >> 2) / div;
                }
        }
+
+       /**
+        * The maximum value of div is 0xff.
+        * Check if the div is larger than max_div.
+        */
+       max_div = 0xff;
+       if (div > max_div) {
+               div = max_div;
+               sclk = (host->src_clk_freq >> 2) / div;
+       }
        sdr_set_field(host->base + MSDC_CFG, MSDC_CFG_CKMOD | MSDC_CFG_CKDIV,
-                       (mode << 8) | (div % 0xff));
+                     (mode << 8) | div);
Hmm, I don't know much about this sub-system, but should we even be
allowing requests to set a frequency that we can't actually achieve
with the divider?
        sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN);
        while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB))
                cpu_relax();
--
1.7.9.5


_______________________________________________
Linux-mediatek mailing list
Linux-mediatek at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help