iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: rtsx: modify and fix init_hw function

Browse Source 
changed rtsx_pci_disable_aspm() to rtsx_disable_aspm()
do not access ASPM configuration directly

changed pcie_capability_write_word() to _clear_and_set_word()
make sure only change PCI_EXP_LNKCTL bit8

make sure ASPM disable after extra_init_hw()

Signed-off-by: Ricky Wu <ricky_wu@realtek.com>
Link: https://lore.kernel.org/r/20201202063228.18319-1-ricky_wu@realtek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ricky Wu 2020-12-02 14:32:28 +08:00 committed by Greg Kroah-Hartman
parent d928061c31
commit 121e9c6b5c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/misc/cardreader/rtsx_pcr.c
View File

@ -1289,7 +1289,7 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
/* Wait SSC power stable */ /* Wait SSC power stable */
udelay(200); udelay(200);
rtsx_pci_disable_aspm(pcr); rtsx_disable_aspm(pcr);
if (pcr->ops->optimize_phy) { if (pcr->ops->optimize_phy) {
err = pcr->ops->optimize_phy(pcr); err = pcr->ops->optimize_phy(pcr);
if (err < 0) if (err < 0)
@ -1363,8 +1363,8 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
rtsx_pci_init_ocp(pcr); rtsx_pci_init_ocp(pcr);
/* Enable clk_request_n to enable clock power management */ /* Enable clk_request_n to enable clock power management */
pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, pcie_capability_clear_and_set_word(pcr->pci, PCI_EXP_LNKCTL,
PCI_EXP_LNKCTL_CLKREQ_EN); 0, PCI_EXP_LNKCTL_CLKREQ_EN);
/* Enter L1 when host tx idle */ /* Enter L1 when host tx idle */
pci_write_config_byte(pdev, 0x70F, 0x5B); pci_write_config_byte(pdev, 0x70F, 0x5B);
@ -1374,6 +1374,8 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
return err; return err;
} }
rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30);
/* No CD interrupt if probing driver with card inserted. /* No CD interrupt if probing driver with card inserted.
* So we need to initialize pcr->card_exist here. * So we need to initialize pcr->card_exist here.
*/ */