Revert "mmc: rtsx_pci: add quirk to disable MMC_CAP_AGGRESSIVE_PM for RTS525A"

This reverts commit 5f0bf80cc5e04d31eeb201683e0b477c24bd18e7.

This was asked to be reverted as it is not the correct way to do this.

Fixes: 5f0bf80cc5e0 ("mmc: rtsx_pci: add quirk to disable MMC_CAP_AGGRESSIVE_PM for RTS525A")
Cc: Matthew Schwartz <matthew.schwartz@linux.dev>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c
index 87d576a03e68e95e735f97bbc5286a7a89b5726d..38aefd8db452a3cfe647e1b0497037416f1fd549 100644 (file)
--- a/drivers/misc/cardreader/rts5249.c
+++ b/drivers/misc/cardreader/rts5249.c
@@ -78,9 +78,6 @@ static void rtsx_base_fetch_vendor_settings(struct rtsx_pcr *pcr)
        if (CHK_PCI_PID(pcr, PID_524A) || CHK_PCI_PID(pcr, PID_525A))
                pcr->rtd3_en = rtsx_reg_to_rtd3_uhsii(reg);
 
-       if (CHK_PCI_PID(pcr, PID_525A))
-               pcr->extra_caps |= EXTRA_CAPS_NO_AGGRESSIVE_PM;
-
        if (rtsx_check_mmc_support(reg))
                pcr->extra_caps |= EXTRA_CAPS_NO_MMC;
        pcr->sd30_drive_sel_3v3 = rtsx_reg_to_sd30_drive_sel_3v3(reg);

diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 5d3599ee06bff7546b8707c73166f67563c4e049..dc2587ff8519f8816815524104ae7200952a9d3c 100644 (file)
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -1456,8 +1456,8 @@ static void realtek_init_host(struct realtek_pci_sdmmc *host)
        mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED |
                MMC_CAP_MMC_HIGHSPEED | MMC_CAP_BUS_WIDTH_TEST |
                MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25;
-       if (pcr->rtd3_en && !(pcr->extra_caps & EXTRA_CAPS_NO_AGGRESSIVE_PM))
-               mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
+       if (pcr->rtd3_en)
+               mmc->caps = mmc->caps | MMC_CAP_AGGRESSIVE_PM;
        mmc->caps2 = MMC_CAP2_NO_PRESCAN_POWERUP | MMC_CAP2_FULL_PWR_CYCLE |
                MMC_CAP2_NO_SDIO;
        mmc->max_current_330 = 400;

diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
index f6122349c00ec827b3b182f657fef9d6eb790454..3c5689356004e63e40e9e533f811075c9fe3f05b 100644 (file)
--- a/include/linux/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -1230,7 +1230,6 @@ struct rtsx_pcr {
 #define EXTRA_CAPS_MMC_8BIT            (1 << 5)
 #define EXTRA_CAPS_NO_MMC              (1 << 7)
 #define EXTRA_CAPS_SD_EXPRESS          (1 << 8)
-#define EXTRA_CAPS_NO_AGGRESSIVE_PM    (1 << 9)
        u32                             extra_caps;
 
 #define IC_VER_A                       0