Skip to content

Commit 85dd3af

Browse files
Victor Shihstorulf
authored andcommitted
mmc: sdhci-pci-gli: GL9755: Mask the replay timer timeout of AER
Due to a flaw in the hardware design, the GL9755 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 GL9755 PCI config. Therefore, the replay timer timeout must be masked. Fixes: 36ed2fd ("mmc: sdhci-pci-gli: A workaround to allow GL9755 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-3-victorshihgli@gmail.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 421b605 commit 85dd3af

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
@@ -152,6 +152,9 @@
152152
#define PCI_GLI_9755_PM_CTRL 0xFC
153153
#define PCI_GLI_9755_PM_STATE GENMASK(1, 0)
154154

155+
#define PCI_GLI_9755_CORRERR_MASK 0x214
156+
#define PCI_GLI_9755_CORRERR_MASK_REPLAY_TIMER_TIMEOUT BIT(12)
157+
155158
#define SDHCI_GLI_9767_GM_BURST_SIZE 0x510
156159
#define SDHCI_GLI_9767_GM_BURST_SIZE_AXI_ALWAYS_SET BIT(8)
157160

@@ -770,6 +773,11 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)
770773
value &= ~PCI_GLI_9755_PM_STATE;
771774
pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
772775

776+
/* mask the replay timer timeout of AER */
777+
pci_read_config_dword(pdev, PCI_GLI_9755_CORRERR_MASK, &value);
778+
value |= PCI_GLI_9755_CORRERR_MASK_REPLAY_TIMER_TIMEOUT;
779+
pci_write_config_dword(pdev, PCI_GLI_9755_CORRERR_MASK, value);
780+
773781
gl9755_wt_off(pdev);
774782
}
775783

0 commit comments

Comments
 (0)