4 files changed, 57 insertions, 0 deletions

diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c
index f5ddb82dadb7..64a779c58a74 100644
--- a/drivers/memstick/host/rtsx_pci_ms.c
+++ b/drivers/memstick/host/rtsx_pci_ms.c
@@ -426,6 +426,9 @@ static void rtsx_pci_ms_request(struct memstick_host *msh)
 
         dev_dbg(ms_dev(host), "--> %s\n", __func__);
 
+        if (rtsx_pci_card_exclusive_check(host->pcr, RTSX_MS_CARD))
+                return;
+
         schedule_work(&host->handle_req);
 }
 
@@ -441,6 +444,10 @@ static int rtsx_pci_ms_set_param(struct memstick_host *msh,
         dev_dbg(ms_dev(host), "%s: param = %d, value = %d\n",
                         __func__, param, value);
 
+        err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_MS_CARD);
+        if (err)
+                return err;
+
         switch (param) {
         case MEMSTICK_POWER:
                 if (value == MEMSTICK_POWER_ON)
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index 822237e322ba..481a98a10ecd 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -708,6 +708,25 @@ int rtsx_pci_card_power_off(struct rtsx_pcr *pcr, int card)
 }
 EXPORT_SYMBOL_GPL(rtsx_pci_card_power_off);
 
+int rtsx_pci_card_exclusive_check(struct rtsx_pcr *pcr, int card)
+{
+        unsigned int cd_mask[] = {
+                [RTSX_SD_CARD] = SD_EXIST,
+                [RTSX_MS_CARD] = MS_EXIST
+        };
+
+        if (!pcr->ms_pmos) {
+                /* When using single PMOS, accessing card is not permitted
+                 * if the existing card is not the designated one.
+                 */
+                if (pcr->card_exist & (~cd_mask[card]))
+                        return -EIO;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rtsx_pci_card_exclusive_check);
+
 int rtsx_pci_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
 {
         if (pcr->ops->switch_output_voltage)
@@ -784,6 +803,9 @@ static void rtsx_pci_card_detect(struct work_struct *work)
                         card_inserted = pcr->ops->cd_deglitch(pcr);
 
                 card_detect = card_inserted | card_removed;
+
+                pcr->card_exist |= card_inserted;
+                pcr->card_exist &= ~card_removed;
         }
 
         mutex_unlock(&pcr->pcr_mutex);
@@ -976,6 +998,14 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
                         return err;
         }
 
+        /* No CD interrupt if probing driver with card inserted.
+         * So we need to initialize pcr->card_exist here.
+         */
+        if (pcr->ops->cd_deglitch)
+                pcr->card_exist = pcr->ops->cd_deglitch(pcr);
+        else
+                pcr->card_exist = rtsx_pci_readl(pcr, RTSX_BIPR) & CARD_EXIST;
+
         return 0;
 }
 
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);
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h
index 5d9b81e8aff4..26ea7f1b7caf 100644
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
@@ -740,6 +740,7 @@ struct rtsx_pcr {
 
         unsigned int                    card_inserted;
         unsigned int                    card_removed;
+        unsigned int                    card_exist;
 
         struct delayed_work             carddet_work;
         struct delayed_work             idle_work;
@@ -804,6 +805,7 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
                 u8 ssc_depth, bool initial_mode, bool double_clk, bool vpclk);
 int rtsx_pci_card_power_on(struct rtsx_pcr *pcr, int card);
 int rtsx_pci_card_power_off(struct rtsx_pcr *pcr, int card);
+int rtsx_pci_card_exclusive_check(struct rtsx_pcr *pcr, int card);
 int rtsx_pci_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage);
 unsigned int rtsx_pci_card_exist(struct rtsx_pcr *pcr);
 void rtsx_pci_complete_unfinished_transfer(struct rtsx_pcr *pcr);