mmc: core: limit probe clock frequency to configured f_max

Currently MMC core disregards host->f_max during card initialization
phase. Obey upper boundary for the clock frequency and skip faster
speeds when they are above the limit.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/f471bceaf237d582d746bd289c4c4f3639cb7b45.1577962382.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index abf8f5eb0a1c8bebf45dc02a83b7cb9e7795f5df..aa54d359dab74beb7ea27850b5ac144511df3fdc 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2330,7 +2330,13 @@ void mmc_rescan(struct work_struct *work)
        }
 
        for (i = 0; i < ARRAY_SIZE(freqs); i++) {
-               if (!mmc_rescan_try_freq(host, max(freqs[i], host->f_min)))
+               unsigned int freq = freqs[i];
+               if (freq > host->f_max) {
+                       if (i + 1 < ARRAY_SIZE(freqs))
+                               continue;
+                       freq = host->f_max;
+               }
+               if (!mmc_rescan_try_freq(host, max(freq, host->f_min)))
                        break;
                if (freqs[i] <= host->f_min)
                        break;
@@ -2344,7 +2350,7 @@ void mmc_rescan(struct work_struct *work)
 
 void mmc_start_host(struct mmc_host *host)
 {
-       host->f_init = max(freqs[0], host->f_min);
+       host->f_init = max(min(freqs[0], host->f_max), host->f_min);
        host->rescan_disable = 0;
        host->ios.power_mode = MMC_POWER_UNDEFINED;