mmc: rtsx: Add test mode for RTS5261

This patch add test mode for RTS5261.
If test mode is set, reader will switch to SD Express mode
mandatorily, and this mode is used by factory testing only.

Signed-off-by: Rui Feng <rui_feng@realsil.com.cn>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/1604397269-2780-1-git-send-email-rui_feng@realsil.com.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/misc/cardreader/rts5261.h b/drivers/misc/cardreader/rts5261.h
index 8d80f0d..8017935 100644 (file)
--- a/drivers/misc/cardreader/rts5261.h
+++ b/drivers/misc/cardreader/rts5261.h
@@ -60,11 +60,6 @@
 /* DMACTL 0xFE2C */
 #define RTS5261_DMA_PACK_SIZE_MASK     0xF0
 
-/* FW config info register */
-#define RTS5261_FW_CFG_INFO0           0xFF50
-#define RTS5261_FW_EXPRESS_TEST_MASK   (0x01<<0)
-#define RTS5261_FW_EA_MODE_MASK                (0x01<<5)
-
 /* FW status register */
 #define RTS5261_FW_STATUS              0xFF56
 #define RTS5261_EXPRESS_LINK_FAIL_MASK (0x01<<7)

diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index c584070..e9ea703 100644 (file)
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -47,6 +47,8 @@ struct realtek_pci_sdmmc {
        bool                    using_cookie;
 };
 
+static int sdmmc_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios);
+
 static inline struct device *sdmmc_dev(struct realtek_pci_sdmmc *host)
 {
        return &(host->pdev->dev);
@@ -898,6 +900,7 @@ static int sd_power_on(struct realtek_pci_sdmmc *host)
        struct mmc_host *mmc = host->mmc;
        int err;
        u32 val;
+       u8 test_mode;
 
        if (host->power_state == SDMMC_POWER_ON)
                return 0;
@@ -925,6 +928,15 @@ static int sd_power_on(struct realtek_pci_sdmmc *host)
                return err;
 
        if (PCI_PID(pcr) == PID_5261) {
+               /*
+                * If test mode is set switch to SD Express mandatorily,
+                * this is only for factory testing.
+                */
+               rtsx_pci_read_register(pcr, RTS5261_FW_CFG_INFO0, &test_mode);
+               if (test_mode & RTS5261_FW_EXPRESS_TEST_MASK) {
+                       sdmmc_init_sd_express(mmc, NULL);
+                       return 0;
+               }
                if (pcr->extra_caps & EXTRA_CAPS_SD_EXPRESS)
                        mmc->caps2 |= MMC_CAP2_SD_EXP | MMC_CAP2_SD_EXP_1_2V;
                /*
@@ -1355,10 +1367,11 @@ static int sdmmc_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios)
        rtsx_pci_write_register(pcr, RTS5261_FW_CFG0,
                RTS5261_FW_ENTER_EXPRESS, RTS5261_FW_ENTER_EXPRESS);
        rtsx_pci_write_register(pcr, RTS5261_FW_CFG1,
+               RTS5261_MCU_CLOCK_GATING, RTS5261_MCU_CLOCK_GATING);
+       rtsx_pci_write_register(pcr, RTS5261_FW_CFG1,
                RTS5261_MCU_BUS_SEL_MASK | RTS5261_MCU_CLOCK_SEL_MASK
-               | RTS5261_MCU_CLOCK_GATING | RTS5261_DRIVER_ENABLE_FW,
-               RTS5261_MCU_CLOCK_SEL_16M | RTS5261_MCU_CLOCK_GATING
-               | RTS5261_DRIVER_ENABLE_FW);
+               | RTS5261_DRIVER_ENABLE_FW,
+               RTS5261_MCU_CLOCK_SEL_16M | RTS5261_DRIVER_ENABLE_FW);
        host->eject = true;
        return 0;
 }

diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
index b47959f..db249e8 100644 (file)
--- a/include/linux/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -658,6 +658,10 @@
 #define   PM_WAKE_EN                   0x01
 #define PM_CTRL4                       0xFF47
 
+/* FW config info register */
+#define RTS5261_FW_CFG_INFO0           0xFF50
+#define   RTS5261_FW_EXPRESS_TEST_MASK (0x01 << 0)
+#define   RTS5261_FW_EA_MODE_MASK      (0x01 << 5)
 #define RTS5261_FW_CFG0                        0xFF54
 #define   RTS5261_FW_ENTER_EXPRESS     (0x01 << 0)