mmc: sdhci-pci-gli: enable UHS-II mode for GL9755
authorVictor Shih <victor.shih@genesyslogic.com.tw>
Fri, 18 Oct 2024 10:53:32 +0000 (18:53 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 24 Oct 2024 12:38:27 +0000 (14:38 +0200)
Changes are:
 * Disable GL9755 overcurrent interrupt when power on/off on UHS-II.
 * Enable the internal clock when do reset on UHS-II mode.
 * Increase timeout value before detecting UHS-II interface.
 * Add vendor settings fro UHS-II mode.
 * Remove sdhci_gli_enable_internal_clock functon unused clk_ctrl variable.
 * Make a function sdhci_gli_wait_software_reset_done() for gl9755 reset.
 * Remove unnecessary code from sdhci_gl9755_reset().

Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw>
Signed-off-by: Lucas Lai <lucas.lai@genesyslogic.com.tw>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Message-ID: <20241018105333.4569-16-victorshihgli@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-pci-gli.c

index 0f81586..708138e 100644 (file)
@@ -18,6 +18,7 @@
 #include "sdhci-cqhci.h"
 #include "sdhci-pci.h"
 #include "cqhci.h"
+#include "sdhci-uhs2.h"
 
 /*  Genesys Logic extra registers */
 #define SDHCI_GLI_9750_WT         0x800
 
 #define PCI_GLI_9755_PLLSSC        0x68
 #define   PCI_GLI_9755_PLLSSC_PPM    GENMASK(15, 0)
+#define   PCI_GLI_9755_PLLSSC_RTL             BIT(24)
+#define   GLI_9755_PLLSSC_RTL_VALUE           0x1
+#define   PCI_GLI_9755_PLLSSC_TRANS_PASS      BIT(27)
+#define   GLI_9755_PLLSSC_TRANS_PASS_VALUE    0x1
+#define   PCI_GLI_9755_PLLSSC_RECV            GENMASK(29, 28)
+#define   GLI_9755_PLLSSC_RECV_VALUE          0x0
+#define   PCI_GLI_9755_PLLSSC_TRAN            GENMASK(31, 30)
+#define   GLI_9755_PLLSSC_TRAN_VALUE          0x3
+
+#define PCI_GLI_9755_UHS2_PLL            0x6C
+#define   PCI_GLI_9755_UHS2_PLL_SSC        GENMASK(9, 8)
+#define   GLI_9755_UHS2_PLL_SSC_VALUE      0x0
+#define   PCI_GLI_9755_UHS2_PLL_DELAY      BIT(18)
+#define   GLI_9755_UHS2_PLL_DELAY_VALUE    0x1
+#define   PCI_GLI_9755_UHS2_PLL_PDRST      BIT(27)
+#define   GLI_9755_UHS2_PLL_PDRST_VALUE    0x1
 
 #define PCI_GLI_9755_SerDes  0x70
+#define   PCI_GLI_9755_UHS2_SERDES_INTR       GENMASK(2, 0)
+#define   GLI_9755_UHS2_SERDES_INTR_VALUE     0x3
+#define   PCI_GLI_9755_UHS2_SERDES_ZC1        BIT(3)
+#define   GLI_9755_UHS2_SERDES_ZC1_VALUE      0x0
+#define   PCI_GLI_9755_UHS2_SERDES_ZC2        GENMASK(7, 4)
+#define   GLI_9755_UHS2_SERDES_ZC2_DEFAULT    0xB
+#define   GLI_9755_UHS2_SERDES_ZC2_SANDISK    0x0
 #define PCI_GLI_9755_SCP_DIS   BIT(19)
+#define   PCI_GLI_9755_UHS2_SERDES_TRAN       GENMASK(27, 24)
+#define   GLI_9755_UHS2_SERDES_TRAN_VALUE     0xC
+#define   PCI_GLI_9755_UHS2_SERDES_RECV       GENMASK(31, 28)
+#define   GLI_9755_UHS2_SERDES_RECV_VALUE     0xF
 
 #define PCI_GLI_9755_MISC          0x78
 #define   PCI_GLI_9755_MISC_SSC_OFF    BIT(26)
@@ -779,6 +807,203 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)
        gl9755_wt_off(pdev);
 }
 
+static void gl9755_vendor_init(struct sdhci_host *host)
+{
+       struct sdhci_pci_slot *slot = sdhci_priv(host);
+       struct pci_dev *pdev = slot->chip->pdev;
+       u32 serdes;
+       u32 pllssc;
+       u32 uhs2_pll;
+
+       gl9755_wt_on(pdev);
+
+       pci_read_config_dword(pdev, PCI_GLI_9755_SerDes, &serdes);
+       serdes &= ~PCI_GLI_9755_UHS2_SERDES_TRAN;
+       serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_TRAN,
+                            GLI_9755_UHS2_SERDES_TRAN_VALUE);
+       serdes &= ~PCI_GLI_9755_UHS2_SERDES_RECV;
+       serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_RECV,
+                            GLI_9755_UHS2_SERDES_RECV_VALUE);
+       serdes &= ~PCI_GLI_9755_UHS2_SERDES_INTR;
+       serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_INTR,
+                            GLI_9755_UHS2_SERDES_INTR_VALUE);
+       serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC1;
+       serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_ZC1,
+                            GLI_9755_UHS2_SERDES_ZC1_VALUE);
+       serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC2;
+       serdes |= FIELD_PREP(PCI_GLI_9755_UHS2_SERDES_ZC2,
+                            GLI_9755_UHS2_SERDES_ZC2_DEFAULT);
+       pci_write_config_dword(pdev, PCI_GLI_9755_SerDes, serdes);
+
+       pci_read_config_dword(pdev, PCI_GLI_9755_UHS2_PLL, &uhs2_pll);
+       uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_SSC;
+       uhs2_pll |= FIELD_PREP(PCI_GLI_9755_UHS2_PLL_SSC,
+                         GLI_9755_UHS2_PLL_SSC_VALUE);
+       uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_DELAY;
+       uhs2_pll |= FIELD_PREP(PCI_GLI_9755_UHS2_PLL_DELAY,
+                         GLI_9755_UHS2_PLL_DELAY_VALUE);
+       uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_PDRST;
+       uhs2_pll |= FIELD_PREP(PCI_GLI_9755_UHS2_PLL_PDRST,
+                         GLI_9755_UHS2_PLL_PDRST_VALUE);
+       pci_write_config_dword(pdev, PCI_GLI_9755_UHS2_PLL, uhs2_pll);
+
+       pci_read_config_dword(pdev, PCI_GLI_9755_PLLSSC, &pllssc);
+       pllssc &= ~PCI_GLI_9755_PLLSSC_RTL;
+       pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_RTL,
+                         GLI_9755_PLLSSC_RTL_VALUE);
+       pllssc &= ~PCI_GLI_9755_PLLSSC_TRANS_PASS;
+       pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_TRANS_PASS,
+                         GLI_9755_PLLSSC_TRANS_PASS_VALUE);
+       pllssc &= ~PCI_GLI_9755_PLLSSC_RECV;
+       pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_RECV,
+                         GLI_9755_PLLSSC_RECV_VALUE);
+       pllssc &= ~PCI_GLI_9755_PLLSSC_TRAN;
+       pllssc |= FIELD_PREP(PCI_GLI_9755_PLLSSC_TRAN,
+                         GLI_9755_PLLSSC_TRAN_VALUE);
+       pci_write_config_dword(pdev, PCI_GLI_9755_PLLSSC, pllssc);
+
+       gl9755_wt_off(pdev);
+}
+
+static void sdhci_gli_pre_detect_init(struct sdhci_host *host)
+{
+       /* Need more time on UHS2 detect flow */
+       sdhci_writeb(host, 0xA7, SDHCI_UHS2_TIMER_CTRL);
+}
+
+static void sdhci_gli_overcurrent_event_enable(struct sdhci_host *host, bool enable)
+{
+       u32 mask;
+
+       mask = sdhci_readl(host, SDHCI_SIGNAL_ENABLE);
+       if (enable)
+               mask |= SDHCI_INT_BUS_POWER;
+       else
+               mask &= ~SDHCI_INT_BUS_POWER;
+
+       sdhci_writel(host, mask, SDHCI_SIGNAL_ENABLE);
+
+       mask = sdhci_readl(host, SDHCI_INT_ENABLE);
+       if (enable)
+               mask |= SDHCI_INT_BUS_POWER;
+       else
+               mask &= ~SDHCI_INT_BUS_POWER;
+
+       sdhci_writel(host, mask, SDHCI_INT_ENABLE);
+}
+
+static void gl9755_set_power(struct sdhci_host *host, unsigned char mode,
+                            unsigned short vdd)
+{
+       u8 pwr = 0;
+
+       if (mode != MMC_POWER_OFF) {
+               pwr = sdhci_get_vdd_value(vdd);
+               if (!pwr)
+                       WARN(1, "%s: Invalid vdd %#x\n", mmc_hostname(host->mmc), vdd);
+               pwr |= SDHCI_VDD2_POWER_180;
+       }
+
+       if (host->pwr == pwr)
+               return;
+
+       host->pwr = pwr;
+
+       if (pwr == 0) {
+               sdhci_gli_overcurrent_event_enable(host, false);
+               sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+       } else {
+               sdhci_gli_overcurrent_event_enable(host, false);
+               sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
+
+               pwr |= (SDHCI_POWER_ON | SDHCI_VDD2_POWER_ON);
+
+               sdhci_writeb(host, pwr & 0xf, SDHCI_POWER_CONTROL);
+               /* wait stable */
+               mdelay(5);
+               sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
+               /* wait stable */
+               mdelay(5);
+               sdhci_gli_overcurrent_event_enable(host, true);
+       }
+}
+
+static bool sdhci_wait_clock_stable(struct sdhci_host *host)
+{
+       u16 clk = 0;
+
+       if (read_poll_timeout_atomic(sdhci_readw, clk, (clk & SDHCI_CLOCK_INT_STABLE),
+                                    10, 20000, false, host, SDHCI_CLOCK_CONTROL)) {
+               pr_err("%s: Internal clock never stabilised.\n", mmc_hostname(host->mmc));
+               sdhci_dumpregs(host);
+               return false;
+       }
+       return true;
+}
+
+static void sdhci_gli_enable_internal_clock(struct sdhci_host *host)
+{
+       u16 ctrl2;
+
+       ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
+
+       sdhci_writew(host, SDHCI_CLOCK_INT_EN, SDHCI_CLOCK_CONTROL);
+
+       if (!((ctrl2 & SDHCI_CTRL_V4_MODE) &&
+             (ctrl2 & SDHCI_CTRL_UHS2_ENABLE))) {
+               sdhci_wait_clock_stable(host);
+               sdhci_writew(host, SDHCI_CTRL_V4_MODE, SDHCI_HOST_CONTROL2);
+       }
+}
+
+static int sdhci_gli_wait_software_reset_done(struct sdhci_host *host, u8 mask)
+{
+       u8 rst;
+
+       /* hw clears the bit when it's done */
+       if (read_poll_timeout_atomic(sdhci_readb, rst, !(rst & mask),
+                                    10, 100000, false, host, SDHCI_SOFTWARE_RESET)) {
+               pr_err("%s: Reset 0x%x never completed.\n", mmc_hostname(host->mmc), (int)mask);
+               sdhci_dumpregs(host);
+               /* manual clear */
+               sdhci_writeb(host, 0, SDHCI_SOFTWARE_RESET);
+               return -ETIMEDOUT;
+       }
+
+       return 0;
+}
+
+static void sdhci_gli_uhs2_reset_sd_tran(struct sdhci_host *host)
+{
+       /* do this on UHS2 mode */
+       if (host->mmc->uhs2_sd_tran) {
+               sdhci_uhs2_reset(host, SDHCI_UHS2_SW_RESET_SD);
+               sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
+               sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
+               sdhci_uhs2_clear_set_irqs(host,
+                                         SDHCI_INT_ALL_MASK,
+                                         SDHCI_UHS2_INT_ERROR_MASK);
+       }
+}
+
+static void sdhci_gl9755_reset(struct sdhci_host *host, u8 mask)
+{
+       /* need internal clock */
+       if (mask & SDHCI_RESET_ALL)
+               sdhci_gli_enable_internal_clock(host);
+
+       sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET);
+
+       /* reset sd-tran on UHS2 mode if need to reset cmd/data */
+       if ((mask & SDHCI_RESET_CMD) | (mask & SDHCI_RESET_DATA))
+               sdhci_gli_uhs2_reset_sd_tran(host);
+
+       if (mask & SDHCI_RESET_ALL)
+               host->clock = 0;
+
+       sdhci_gli_wait_software_reset_done(host, mask);
+}
+
 static inline void gl9767_vhs_read(struct pci_dev *pdev)
 {
        u32 vhs_enable;
@@ -1086,6 +1311,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slot *slot)
        gli_pcie_enable_msi(slot);
        slot->host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
        sdhci_enable_v4_mode(host);
+       gl9755_vendor_init(host);
 
        return 0;
 }
@@ -1524,17 +1750,24 @@ static const struct sdhci_ops sdhci_gl9755_ops = {
        .read_w                 = sdhci_gli_readw,
        .read_b                 = sdhci_gli_readb,
        .set_clock              = sdhci_gl9755_set_clock,
+       .set_power              = gl9755_set_power,
        .enable_dma             = sdhci_pci_enable_dma,
        .set_bus_width          = sdhci_set_bus_width,
-       .reset                  = sdhci_reset,
+       .reset                  = sdhci_gl9755_reset,
        .set_uhs_signaling      = sdhci_set_uhs_signaling,
        .voltage_switch         = sdhci_gli_voltage_switch,
+       .dump_uhs2_regs         = sdhci_uhs2_dump_regs,
+       .set_timeout            = sdhci_uhs2_set_timeout,
+       .irq                    = sdhci_uhs2_irq,
+       .uhs2_pre_detect_init   = sdhci_gli_pre_detect_init,
 };
 
 const struct sdhci_pci_fixes sdhci_gl9755 = {
        .quirks         = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
        .quirks2        = SDHCI_QUIRK2_BROKEN_DDR50,
        .probe_slot     = gli_probe_slot_gl9755,
+       .add_host       = sdhci_pci_uhs2_add_host,
+       .remove_host    = sdhci_pci_uhs2_remove_host,
        .ops            = &sdhci_gl9755_ops,
 #ifdef CONFIG_PM_SLEEP
        .resume         = sdhci_pci_gli_resume,