[PATCH] PCI: Add quirk to disable ASPM L1 for Sandisk SN740 NVMe SSDs

[PATCH] PCI: Add quirk to disable ASPM L1 for Sandisk SN740 NVMe SSDs

[Manivannan Sadhasivam]

The Sandisk SN740 NVMe SSDs cause below AER errors on the upstream Root
Port of PCIe controller in Lenovo Thinkpad T14s laptop when ASPM L1 is
enabled:

  pcieport 0006:00:00.0: AER: Correctable error message received from 0006:01:00.0
  nvme 0006:01:00.0: PCIe Bus Error: severity=Correctable, type=Physical Layer, (Receiver ID)
  nvme 0006:01:00.0:   device [15b7:5015] error status/mask=00000001/0000e000
  nvme 0006:01:00.0:    [ 0] RxErr

Hence, add a quirk to disable L1 state for this SSD.

Reported-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
---
 drivers/pci/quirks.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 214ed060ca1b..a6f88c5ba2f4 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2525,6 +2525,18 @@ static void quirk_disable_aspm_l0s_l1(struct pci_dev *dev)
  */
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x1080, quirk_disable_aspm_l0s_l1);
 
+static void quirk_disable_aspm_l1(struct pci_dev *dev)
+{
+       pci_info(dev, "Disabling ASPM L1\n");
+       pci_disable_link_state(dev, PCIE_LINK_STATE_L1);
+}
+
+/*
+ * Sandisk SN740 NVMe SSDs cause AER timeout errors on the upstream PCIe Root
+ * Port when ASPM L1 is enabled.
+ */
+DECLARE_PCI_FIXUP_FINAL(0x15b7, 0x5015, quirk_disable_aspm_l1);
+
 /*
  * Some Pericom PCIe-to-PCI bridges in reverse mode need the PCIe Retrain
  * Link bit cleared after starting the link retrain process to allow this
-- 
2.48.1

Re: [PATCH] PCI: Add quirk to disable ASPM L1 for Sandisk SN740 NVMe SSDs

[Konrad Dybcio]

On 11/20/25 4:46 PM, Manivannan Sadhasivam wrote:
> The Sandisk SN740 NVMe SSDs cause below AER errors on the upstream Root
> Port of PCIe controller in Lenovo Thinkpad T14s laptop when ASPM L1 is

                             ^ Microsoft Surface Laptop 7

Konrad

> enabled:
> 
>   pcieport 0006:00:00.0: AER: Correctable error message received from 0006:01:00.0
>   nvme 0006:01:00.0: PCIe Bus Error: severity=Correctable, type=Physical Layer, (Receiver ID)
>   nvme 0006:01:00.0:   device [15b7:5015] error status/mask=00000001/0000e000
>   nvme 0006:01:00.0:    [ 0] RxErr
> 
> Hence, add a quirk to disable L1 state for this SSD.
> 
> Reported-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
> ---
>  drivers/pci/quirks.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 214ed060ca1b..a6f88c5ba2f4 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2525,6 +2525,18 @@ static void quirk_disable_aspm_l0s_l1(struct pci_dev *dev)
>   */
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x1080, quirk_disable_aspm_l0s_l1);
>  
> +static void quirk_disable_aspm_l1(struct pci_dev *dev)
> +{
> +       pci_info(dev, "Disabling ASPM L1\n");
> +       pci_disable_link_state(dev, PCIE_LINK_STATE_L1);
> +}
> +
> +/*
> + * Sandisk SN740 NVMe SSDs cause AER timeout errors on the upstream PCIe Root
> + * Port when ASPM L1 is enabled.
> + */
> +DECLARE_PCI_FIXUP_FINAL(0x15b7, 0x5015, quirk_disable_aspm_l1);
> +
>  /*
>   * Some Pericom PCIe-to-PCI bridges in reverse mode need the PCIe Retrain
>   * Link bit cleared after starting the link retrain process to allow this

Re: [PATCH] PCI: Add quirk to disable ASPM L1 for Sandisk SN740 NVMe SSDs

[Lukas Wunner]

On Thu, Nov 20, 2025 at 09:16:01PM +0530, Manivannan Sadhasivam wrote:
> +++ b/drivers/pci/quirks.c
> @@ -2525,6 +2525,18 @@ static void quirk_disable_aspm_l0s_l1(struct pci_dev *dev)
>   */
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x1080, quirk_disable_aspm_l0s_l1);
>  
> +static void quirk_disable_aspm_l1(struct pci_dev *dev)
> +{
> +       pci_info(dev, "Disabling ASPM L1\n");
> +       pci_disable_link_state(dev, PCIE_LINK_STATE_L1);
> +}

Shouldn't this be using pcie_aspm_remove_cap()?  Existing quirks
were converted to this new helper with 30579eebba6a.

Thanks,

Lukas

Re: [PATCH] PCI: Add quirk to disable ASPM L1 for Sandisk SN740 NVMe SSDs

[Manivannan Sadhasivam]

On Thu, Nov 20, 2025 at 04:50:44PM +0100, Konrad Dybcio wrote:
> On 11/20/25 4:46 PM, Manivannan Sadhasivam wrote:
> > The Sandisk SN740 NVMe SSDs cause below AER errors on the upstream Root
> > Port of PCIe controller in Lenovo Thinkpad T14s laptop when ASPM L1 is
> 
>                              ^ Microsoft Surface Laptop 7
> 

Err... Somehow I assumed that it was T14s ;)

@Bjorn: Let me know if I have to resend or you can fix it up while applying.

- Mani

> Konrad
> 
> > enabled:
> > 
> >   pcieport 0006:00:00.0: AER: Correctable error message received from 0006:01:00.0
> >   nvme 0006:01:00.0: PCIe Bus Error: severity=Correctable, type=Physical Layer, (Receiver ID)
> >   nvme 0006:01:00.0:   device [15b7:5015] error status/mask=00000001/0000e000
> >   nvme 0006:01:00.0:    [ 0] RxErr
> > 
> > Hence, add a quirk to disable L1 state for this SSD.
> > 
> > Reported-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> > Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
> > ---
> >  drivers/pci/quirks.c | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > index 214ed060ca1b..a6f88c5ba2f4 100644
> > --- a/drivers/pci/quirks.c
> > +++ b/drivers/pci/quirks.c
> > @@ -2525,6 +2525,18 @@ static void quirk_disable_aspm_l0s_l1(struct pci_dev *dev)
> >   */
> >  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x1080, quirk_disable_aspm_l0s_l1);
> >  
> > +static void quirk_disable_aspm_l1(struct pci_dev *dev)
> > +{
> > +       pci_info(dev, "Disabling ASPM L1\n");
> > +       pci_disable_link_state(dev, PCIE_LINK_STATE_L1);
> > +}
> > +
> > +/*
> > + * Sandisk SN740 NVMe SSDs cause AER timeout errors on the upstream PCIe Root
> > + * Port when ASPM L1 is enabled.
> > + */
> > +DECLARE_PCI_FIXUP_FINAL(0x15b7, 0x5015, quirk_disable_aspm_l1);
> > +
> >  /*
> >   * Some Pericom PCIe-to-PCI bridges in reverse mode need the PCIe Retrain
> >   * Link bit cleared after starting the link retrain process to allow this

-- 
மணிவண்ணன் சதாசிவம்

Re: [PATCH] PCI: Add quirk to disable ASPM L1 for Sandisk SN740 NVMe SSDs

[Manivannan Sadhasivam]

On Thu, Nov 20, 2025 at 05:04:31PM +0100, Lukas Wunner wrote:
> On Thu, Nov 20, 2025 at 09:16:01PM +0530, Manivannan Sadhasivam wrote:
> > +++ b/drivers/pci/quirks.c
> > @@ -2525,6 +2525,18 @@ static void quirk_disable_aspm_l0s_l1(struct pci_dev *dev)
> >   */
> >  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x1080, quirk_disable_aspm_l0s_l1);
> >  
> > +static void quirk_disable_aspm_l1(struct pci_dev *dev)
> > +{
> > +       pci_info(dev, "Disabling ASPM L1\n");
> > +       pci_disable_link_state(dev, PCIE_LINK_STATE_L1);
> > +}
> 
> Shouldn't this be using pcie_aspm_remove_cap()?  Existing quirks
> were converted to this new helper with 30579eebba6a.
> 

Ah, I didn't notice that Bjorn's series got merged into mainline. Will rebase
and send v2.

- Mani

-- 
மணிவண்ணன் சதாசிவம்