The pcie_failed_link_retrain() was added due to a behavior observed with a very specific set of circumstances which are in a comment above the function. The "quirk" is supposed to force the link down to Gen1 in the case where LTSSM is stuck in a loop or failing to train etc. The problem is that this "quirk" is applied to any bridge & it can often write the Gen1 TLS (Target Link Speed) when it should not. Leaving the port in a state that will result in a device linking up at Gen1 when it should not. Incorrect action by pcie_failed_link_retrain() has been observed with a variety of different NVMe drives using U.2 connectors & in multiple different hardware designs. Directly attached to the root port, downstream of a PCIe switch (Microchip/Broadcom) with different generations of Intel CPU. All of these systems were configured without power controller capability. They were also all in compliance with the Async Hot-Plug Reference model in PCI Express® Base Specification Revision 6.0 Appendix I. for OS controlled DPC Hot-Plug. The issue appears to be more likely to hit to be applied when using OOB PD (out-of band presence detect), but has also been observed without OOB PD support ('DLL State Changed' or 'In-Band PD'). Powering off or power cycling the slot via an out-of-band power control mechanism with OOB PD is extremely likely to hit since the kernel would see that slot presence is true. Physical Hot-insertion is also extremly likely to hit this issue with OOB PD with U.2 drives due to timing between presence assertion and the actual power-on/link-up of the NVMe drive itself. When the device eventually does power-up the TLS would have been left forced to Gen1. This is similarly true to the case of power cycling or powering off the slot. Exact circumstances for when this issue has been hit in a system without OOB PD due hasn't been fully understood to due having less reproductions as well as having reverted this patch for this configurations. Signed-off-by: Matthew W Carlis <mattc@xxxxxxxxxxxxxxx> 100.0% drivers/pci/ diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index d7f4ee634263..497e4acc52c8 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -100,6 +100,8 @@ int pcie_failed_link_retrain(struct pci_dev *dev) }; u16 lnksta, lnkctl2; int ret = -ENOTTY; + if (!pci_match_id(ids, dev) + return ret; if (!pci_is_pcie(dev) || !pcie_downstream_port(dev) || !pcie_cap_has_lnkctl2(dev) || !dev->link_active_reporting) @@ -124,8 +126,7 @@ int pcie_failed_link_retrain(struct pci_dev *dev) } if ((lnksta & PCI_EXP_LNKSTA_DLLLA) && - (lnkctl2 & PCI_EXP_LNKCTL2_TLS) == PCI_EXP_LNKCTL2_TLS_2_5GT && - pci_match_id(ids, dev)) { + (lnkctl2 & PCI_EXP_LNKCTL2_TLS) == PCI_EXP_LNKCTL2_TLS_2_5GT) { u32 lnkcap; pci_info(dev, "removing 2.5GT/s downstream link speed restriction\n"); -- 2.46.0