mfd: rtsx: Fix issue that booting OS with SD card inserted

Realtek card reader supports both SD and MS card. According to the
settings of rtsx MFD driver, SD host will be probed before MS host.
If we boot/reboot Linux with SD card inserted, the resetting flow of SD
card will succeed, and the following resetting flow of MS is sure to fail.
Then MS upper-level driver will ask rtsx driver to turn power off. This
request leads to the result that the following SD commands fail and SD card
can't be accessed again.

In this commit, Realtek's SD and MS host driver will check whether the card
that upper driver requesting is the one existing in the slot. If not, Realtek's
host driver will refuse the operation to make sure the exlusive accessing
at the same time.

Signed-off-by: Wei WANG <wei_wang@realsil.com.cn>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index f74b5adca642..468c92303167 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -678,12 +678,19 @@ static void sdmmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
         struct mmc_command *cmd = mrq->cmd;
         struct mmc_data *data = mrq->data;
         unsigned int data_size = 0;
+        int err;
 
         if (host->eject) {
                 cmd->error = -ENOMEDIUM;
                 goto finish;
         }
 
+        err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD);
+        if (err) {
+                cmd->error = err;
+                goto finish;
+        }
+
         mutex_lock(&pcr->pcr_mutex);
 
         rtsx_pci_start_run(pcr);
@@ -901,6 +908,9 @@ static void sdmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         if (host->eject)
                 return;
 
+        if (rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD))
+                return;
+
         mutex_lock(&pcr->pcr_mutex);
 
         rtsx_pci_start_run(pcr);
@@ -1073,6 +1083,10 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
         if (host->eject)
                 return -ENOMEDIUM;
 
+        err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD);
+        if (err)
+                return err;
+
         mutex_lock(&pcr->pcr_mutex);
 
         rtsx_pci_start_run(pcr);
@@ -1122,6 +1136,10 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode)
         if (host->eject)
                 return -ENOMEDIUM;
 
+        err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD);
+        if (err)
+                return err;
+
         mutex_lock(&pcr->pcr_mutex);
 
         rtsx_pci_start_run(pcr);