mmc: sdhci-pci: Fix initialization of some SD cards for Intel BYT-based controllers

BugLink: https://bugs.launchpad.net/bugs/1928825
commit 2970134b927834e9249659a70aac48e62dff804a upstream.

Bus power may control card power, but the full reset done by SDHCI at
initialization still may not reset the power, whereas a direct write to
SDHCI_POWER_CONTROL can. That might be needed to initialize correctly, if
the card was left powered on previously.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210331081752.23621-1-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index afbccfceaaf85d31d37767b98b8a2709cc37b2c7..4ca7ab92c8156e7bef465727b29845a7262d413c 100644 (file)
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -520,6 +520,7 @@ struct intel_host {
        int     drv_strength;
        bool    d3_retune;
        bool    rpm_retune_ok;
+       bool    needs_pwr_off;
        u32     glk_rx_ctrl1;
        u32     glk_tun_val;
        u32     active_ltr;
@@ -647,9 +648,25 @@ out:
 static void sdhci_intel_set_power(struct sdhci_host *host, unsigned char mode,
                                  unsigned short vdd)
 {
+       struct sdhci_pci_slot *slot = sdhci_priv(host);
+       struct intel_host *intel_host = sdhci_pci_priv(slot);
        int cntr;
        u8 reg;
 
+       /*
+        * Bus power may control card power, but a full reset still may not
+        * reset the power, whereas a direct write to SDHCI_POWER_CONTROL can.
+        * That might be needed to initialize correctly, if the card was left
+        * powered on previously.
+        */
+       if (intel_host->needs_pwr_off) {
+               intel_host->needs_pwr_off = false;
+               if (mode != MMC_POWER_OFF) {
+                       sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+                       usleep_range(10000, 12500);
+               }
+       }
+
        sdhci_set_power(host, mode, vdd);
 
        if (mode == MMC_POWER_OFF)
@@ -1139,6 +1156,14 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
        return 0;
 }
 
+static void byt_needs_pwr_off(struct sdhci_pci_slot *slot)
+{
+       struct intel_host *intel_host = sdhci_pci_priv(slot);
+       u8 reg = sdhci_readb(slot->host, SDHCI_POWER_CONTROL);
+
+       intel_host->needs_pwr_off = reg  & SDHCI_POWER_ON;
+}
+
 static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
 {
        byt_probe_slot(slot);
@@ -1156,6 +1181,8 @@ static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
            slot->chip->pdev->subsystem_device == PCI_SUBDEVICE_ID_NI_78E3)
                slot->host->mmc->caps2 |= MMC_CAP2_AVOID_3_3V;
 
+       byt_needs_pwr_off(slot);
+
        return 0;
 }