misc: rtsx: Find L1 PM Substates capability instead of hard-coding

Instead of hard-coding the location of the L1 PM Substates capability based
on the Device ID, search for it in the extended capabilities list.  This
works for any device, as long as it implements the L1 PM Substates
capability correctly, so it doesn't require maintenance as new devices are
added.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200721212336.1159079-5-helgaas@kernel.org
[ minor addition due to differences in my tree - gregkh]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c
index 448929829de4e172bf9afe052627012f7ec5ad80..f5716c63110476974148f2964d1a1d93a61980a8 100644 (file)
--- a/drivers/misc/cardreader/rts5228.c
+++ b/drivers/misc/cardreader/rts5228.c
@@ -379,11 +379,16 @@ static void rts5228_process_ocp(struct rtsx_pcr *pcr)
 
 static void rts5228_init_from_cfg(struct rtsx_pcr *pcr)
 {
+       struct pci_dev *pdev = pcr->pci;
+       int l1ss;
        u32 lval;
        struct rtsx_cr_option *option = &pcr->option;
 
-       pci_read_config_dword(pcr->pci, PCR_ASPM_SETTING_REG1, &lval);
+       l1ss = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_L1SS);
+       if (!l1ss)
+               return;
 
+       pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);
 
        if (0 == (lval & 0x0F))
                rtsx_pci_enable_oobs_polling(pcr);

diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c
index 665472d05993979eac72331c29d852f5e7177843..1b8149e806c1cc8efcdba98272ad85b762c5e70a 100644 (file)
--- a/drivers/misc/cardreader/rts5249.c
+++ b/drivers/misc/cardreader/rts5249.c
@@ -95,15 +95,15 @@ static void rtsx_base_force_power_down(struct rtsx_pcr *pcr, u8 pm_state)
 static void rts5249_init_from_cfg(struct rtsx_pcr *pcr)
 {
        struct pci_dev *pdev = pcr->pci;
+       int l1ss;
        struct rtsx_cr_option *option = &(pcr->option);
        u32 lval;
 
-       if (CHK_PCI_PID(pcr, PID_524A))
-               pci_read_config_dword(pdev,
-                       PCR_ASPM_SETTING_REG1, &lval);
-       else
-               pci_read_config_dword(pdev,
-                       PCR_ASPM_SETTING_REG2, &lval);
+       l1ss = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_L1SS);
+       if (!l1ss)
+               return;
+
+       pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);
 
        if (lval & ASPM_L1_1_EN_MASK)
                rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);

diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
index 0e806dd7ad087981053116845a5b89be06ae6ed8..ebf77643cc90ae0250de0e866b3d1071c10580f2 100644 (file)
--- a/drivers/misc/cardreader/rts5260.c
+++ b/drivers/misc/cardreader/rts5260.c
@@ -498,10 +498,15 @@ static void rts5260_pwr_saving_setting(struct rtsx_pcr *pcr)
 static void rts5260_init_from_cfg(struct rtsx_pcr *pcr)
 {
        struct pci_dev *pdev = pcr->pci;
+       int l1ss;
        struct rtsx_cr_option *option = &pcr->option;
        u32 lval;
 
-       pci_read_config_dword(pdev, PCR_ASPM_SETTING_5260, &lval);
+       l1ss = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_L1SS);
+       if (!l1ss)
+               return;
+
+       pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);
 
        if (lval & ASPM_L1_1_EN_MASK)
                rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);

diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c
index 4f30637ee4ac9fce13489ed480c6d5f6cfcc43d7..4b6e3fe4a007043901f7e01366174bfe1198cdff 100644 (file)
--- a/drivers/misc/cardreader/rts5261.c
+++ b/drivers/misc/cardreader/rts5261.c
@@ -413,10 +413,15 @@ static int rts5261_init_from_hw(struct rtsx_pcr *pcr)
 static void rts5261_init_from_cfg(struct rtsx_pcr *pcr)
 {
        struct pci_dev *pdev = pcr->pci;
+       int l1ss;
        u32 lval;
        struct rtsx_cr_option *option = &pcr->option;
 
-       pci_read_config_dword(pdev, PCR_ASPM_SETTING_REG1, &lval);
+       l1ss = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_L1SS);
+       if (!l1ss)
+               return;
+
+       pci_read_config_dword(pdev, l1ss + PCI_L1SS_CTL1, &lval);
 
        if (lval & ASPM_L1_1_EN_MASK)
                rtsx_set_dev_flag(pcr, ASPM_L1_1_EN);

diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
index b93573c3c5fc87e4da951fe2e3032b8219b8e747..f146ca413f38aad9f551ae980272e12fd1c10588 100644 (file)
--- a/include/linux/rtsx_pci.h
+++ b/include/linux/rtsx_pci.h
@@ -1037,10 +1037,6 @@
 #define   PHY_DIG1E_RX_EN_KEEP         0x0001
 #define PHY_DUM_REG                    0x1F
 
-#define PCR_ASPM_SETTING_REG1          0x160
-#define PCR_ASPM_SETTING_REG2          0x168
-#define PCR_ASPM_SETTING_5260          0x178
-
 #define PCR_SETTING_REG1               0x724
 #define PCR_SETTING_REG2               0x814
 #define PCR_SETTING_REG3               0x747