Skip to content

Commit 015c9cb

Browse files
Victor Shihstorulf
authored andcommitted
mmc: sdhci-pci-gli: GL9750: Mask the replay timer timeout of AER
Due to a flaw in the hardware design, the GL9750 replay timer frequently times out when ASPM is enabled. As a result, the warning messages will often appear in the system log when the system accesses the GL9750 PCI config. Therefore, the replay timer timeout must be masked. Fixes: d713379 ("mmc: sdhci-pci-gli: A workaround to allow GL9750 to enter ASPM L1.2") Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Acked-by: Kai-Heng Feng <kai.heng.geng@canonical.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20231107095741.8832-2-victorshihgli@gmail.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 85dd3af commit 015c9cb

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/mmc/host/sdhci-pci-gli.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
#define PCI_GLI_9750_PM_CTRL 0xFC
2929
#define PCI_GLI_9750_PM_STATE GENMASK(1, 0)
3030

31+
#define PCI_GLI_9750_CORRERR_MASK 0x214
32+
#define PCI_GLI_9750_CORRERR_MASK_REPLAY_TIMER_TIMEOUT BIT(12)
33+
3134
#define SDHCI_GLI_9750_CFG2 0x848
3235
#define SDHCI_GLI_9750_CFG2_L1DLY GENMASK(28, 24)
3336
#define GLI_9750_CFG2_L1DLY_VALUE 0x1F
@@ -564,6 +567,11 @@ static void gl9750_hw_setting(struct sdhci_host *host)
564567
value &= ~PCI_GLI_9750_PM_STATE;
565568
pci_write_config_dword(pdev, PCI_GLI_9750_PM_CTRL, value);
566569

570+
/* mask the replay timer timeout of AER */
571+
pci_read_config_dword(pdev, PCI_GLI_9750_CORRERR_MASK, &value);
572+
value |= PCI_GLI_9750_CORRERR_MASK_REPLAY_TIMER_TIMEOUT;
573+
pci_write_config_dword(pdev, PCI_GLI_9750_CORRERR_MASK, value);
574+
567575
gl9750_wt_off(host);
568576
}
569577

0 commit comments

Comments
 (0)