Hi Greg kh,
This patch to fix misc: rtsx bug for kernel 5.4
Ricky
> -----Original Message-----
> From: 吳昊澄 Ricky <ricky...@realtek.com>
> Sent: Thursday, January 21, 2021 3:29 PM
> To: a...@arndb.de; gre...@linuxfoundation.org;
> ricky...@realtek.corp-partner.google.com; sas...@kernel.org;
> levin...@google.com; keitasuzuki.p...@sslab.ics.keio.ac.jp; kd...@doth.eu;
> linux-kernel@vger.kernel.org; 吳昊澄 Ricky <ricky...@realtek.com>
> Subject: [PATCH] rtsx: pci: fix device aspm state bug
>
> From: Ricky Wu <ricky...@realtek.corp-partner.google.com>
>
> changed rtsx_pci_disable_aspm() to rtsx_disable_aspm() make sure
> pcr->aspm_enabled to sync with aspm state
>
> BUG=b:175338107
> TEST=chromeos-kernel-5_4
>
> Signed-off-by: Ricky Wu <ricky...@realtek.corp-partner.google.com>
> Change-Id: I4b146dcdaaf2f2a965381c32780b0b110d751258
> ---
> drivers/misc/cardreader/rtsx_pcr.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/cardreader/rtsx_pcr.c
> b/drivers/misc/cardreader/rtsx_pcr.c
> index f07b01125d19..f3645e72ecc4 100644
> --- a/drivers/misc/cardreader/rtsx_pcr.c
> +++ b/drivers/misc/cardreader/rtsx_pcr.c
> @@ -1285,8 +1285,15 @@ int rtsx_ms_power_off_card3v3(struct rtsx_pcr
> *pcr) static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) {
> int err;
> + u8 val;
>
> pcr->pcie_cap = pci_find_capability(pcr->pci, PCI_CAP_ID_EXP);
> + rtsx_pci_read_config_byte(pcr, pcr->pcie_cap + PCI_EXP_LNKCTL, &val);
> + if (val & 0x02)
> + pcr->aspm_enabled = true;
> + else
> + pcr->aspm_enabled = false;
> +
> rtsx_pci_writel(pcr, RTSX_HCBAR, pcr->host_cmds_addr);
>
> rtsx_pci_enable_bus_int(pcr);
> @@ -1307,7 +1314,7 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr)
> /* Wait SSC power stable */
> udelay(200);
>
> - rtsx_pci_disable_aspm(pcr);
> + rtsx_disable_aspm(pcr);
> if (pcr->ops->optimize_phy) {
> err = pcr->ops->optimize_phy(pcr);
> if (err < 0)
> --
> 2.17.1
