FAILED: patch "[PATCH] mmc: sdhci-pci-gli: GL9763e: Mask the replay timer timeout of" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 340be332e420ed37d15d4169a1b4174e912ad6cb
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082221-murmuring-commotion-35cb@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 340be332e420ed37d15d4169a1b4174e912ad6cb Mon Sep 17 00:00:00 2001
From: Victor Shih <[email protected]>
Date: Thu, 31 Jul 2025 14:57:52 +0800
Subject: [PATCH] mmc: sdhci-pci-gli: GL9763e: Mask the replay timer timeout of
AER
Due to a flaw in the hardware design, the GL9763e 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 GL9763e PCI config. Therefore, the replay timer timeout must be masked.
drivers/mmc/host/sdhci-pci-gli.c +3 -0
@@ -1782,6 +1782,9 @@ static void gl9763e_hw_setting(struct sdhci_pci_slot *slot) value |=FIELD_PREP (GLI_9763E_HS400_RXDLY ,GLI_9763E_HS400_RXDLY_5 );pci_write_config_dword (pdev,PCIE_GLI_9763E_CLKRXDLY , value); +/* mask the replay timer timeout of AER */ +sdhci_gli_mask_replay_timer_timeout (pdev); +pci_read_config_dword (pdev,PCIE_GLI_9763E_VHS , &value); value &= ~GLI_9763E_VHS_REV ; value |=FIELD_PREP (GLI_9763E_VHS_REV ,GLI_9763E_VHS_REV_R );
Sasha Levin
maintainerPATCH 1/3 mmc: sdhci-pci-gli: Use PCI AER definitions, not hard-coded values
From: Bjorn Helgaas <[email protected]>
[ Upstream commit 951b7ccc54591ba48755b5e0c7fc8b9623a64640 ]
015c9cbcf0ad ("mmc: sdhci-pci-gli: GL9750: Mask the replay timer timeout of AER") added PCI_GLI_9750_CORRERR_MASK, the offset of the AER Capability in config space, and PCI_GLI_9750_CORRERR_MASK_REPLAY_TIMER_TIMEOUT, the Replay Timer Timeout bit in the AER Correctable Error Status register.
Use pci_find_ext_capability() to locate the AER Capability and use the existing PCI_ERR_COR_REP_TIMER definition to mask the bit.
This removes a little bit of unnecessarily device-specific code and makes AER-related things more greppable.
--- drivers/mmc/host/sdhci-pci-gli.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/mmc/host/sdhci-pci-gli.c +2 -10
@@ -27,8 +27,6 @@#define PCI_GLI_9750_PM_CTRL 0xFC#define PCI_GLI_9750_PM_STATE GENMASK(1, 0) -#define PCI_GLI_9750_CORRERR_MASK 0x214 -#define PCI_GLI_9750_CORRERR_MASK_REPLAY_TIMER_TIMEOUT BIT(12)#define SDHCI_GLI_9750_CFG2 0x848#define SDHCI_GLI_9750_CFG2_L1DLY GENMASK(28, 24)
@@ -154,8 +152,6 @@#define PCI_GLI_9755_PM_CTRL 0xFC#define PCI_GLI_9755_PM_STATE GENMASK(1, 0) -#define PCI_GLI_9755_CORRERR_MASK 0x214 -#define PCI_GLI_9755_CORRERR_MASK_REPLAY_TIMER_TIMEOUT BIT(12)#define GLI_MAX_TUNING_LOOP 40
@@ -501,9 +497,7 @@ static void gl9750_hw_setting(struct sdhci_host *host)pci_write_config_dword (pdev,PCI_GLI_9750_PM_CTRL , value);/* mask the replay timer timeout of AER */ -pci_read_config_dword (pdev,PCI_GLI_9750_CORRERR_MASK , &value); - value |=PCI_GLI_9750_CORRERR_MASK_REPLAY_TIMER_TIMEOUT ; -pci_write_config_dword (pdev,PCI_GLI_9750_CORRERR_MASK , value); +sdhci_gli_mask_replay_timer_timeout (pdev);gl9750_wt_off (host); }
@@ -715,9 +709,7 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)pci_write_config_dword (pdev,PCI_GLI_9755_PM_CTRL , value);/* mask the replay timer timeout of AER */ -pci_read_config_dword (pdev,PCI_GLI_9755_CORRERR_MASK , &value); - value |=PCI_GLI_9755_CORRERR_MASK_REPLAY_TIMER_TIMEOUT ; -pci_write_config_dword (pdev,PCI_GLI_9755_CORRERR_MASK , value); +sdhci_gli_mask_replay_timer_timeout (pdev);gl9755_wt_off (pdev); }
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 2/3 mmc: sdhci-pci-gli: Add a new function to simplify the code
From: Victor Shih <[email protected]>
[ Upstream commit dec8b38be4b35cae5f7fa086daf2631e2cfa09c1 ]
In preparation to fix replay timer timeout, add sdhci_gli_mask_replay_timer_timeout() function to simplify some of the code, allowing it to be re-used.
Stable-dep-of: 340be332e420 ("mmc: sdhci-pci-gli: GL9763e: Mask the replay timer timeout of AER")
--- drivers/mmc/host/sdhci-pci-gli.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-pci-gli.c +14 -0
@@ -156,6 +156,20 @@#define GLI_MAX_TUNING_LOOP 40/* Genesys Logic chipset */ +static void sdhci_gli_mask_replay_timer_timeout (struct pci_dev *pdev) +{ +int aer; +u32 value; + +/* mask the replay timer timeout of AER */ + aer =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_ERR ); +if (aer) { +pci_read_config_dword (pdev, aer +PCI_ERR_COR_MASK , &value); + value |=PCI_ERR_COR_REP_TIMER ; +pci_write_config_dword (pdev, aer +PCI_ERR_COR_MASK , value); + } +} +static inline void gl9750_wt_on (struct sdhci_host *host) {u32 wt_value;
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 3/3 mmc: sdhci-pci-gli: GL9763e: Mask the replay timer timeout of AER
In reply to Sasha LevinFrom: Victor Shih <[email protected]>
[ Upstream commit 340be332e420ed37d15d4169a1b4174e912ad6cb ]
Due to a flaw in the hardware design, the GL9763e 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 GL9763e PCI config. Therefore, the replay timer timeout must be masked.
--- drivers/mmc/host/sdhci-pci-gli.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/sdhci-pci-gli.c +3 -0
@@ -988,6 +988,9 @@ static void gli_set_gl9763e(struct sdhci_pci_slot *slot) value |=FIELD_PREP (GLI_9763E_HS400_RXDLY ,GLI_9763E_HS400_RXDLY_5 );pci_write_config_dword (pdev,PCIE_GLI_9763E_CLKRXDLY , value); +/* mask the replay timer timeout of AER */ +sdhci_gli_mask_replay_timer_timeout (pdev); +pci_read_config_dword (pdev,PCIE_GLI_9763E_VHS , &value); value &= ~GLI_9763E_VHS_REV ; value |=FIELD_PREP (GLI_9763E_VHS_REV ,GLI_9763E_VHS_REV_R );
Signature · 1 line
2.50.1