diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:25 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-09-19 14:25:25 -0500 |
| commit | dffe4cca2e36e5a546fccf3f39a444731887ba9a (patch) | |
| tree | 063020a6130e93013037bd8b9f8963eb46a3735c /drivers/pci/pci.h | |
| parent | dceed69701ac2ac357c062117a3f201096c4bdab (diff) | |
| parent | 59100eb248c0b15585affa546c7f6834b30eb5a4 (diff) | |
| download | linux-dffe4cca2e36e5a546fccf3f39a444731887ba9a.tar.gz linux-dffe4cca2e36e5a546fccf3f39a444731887ba9a.tar.bz2 linux-dffe4cca2e36e5a546fccf3f39a444731887ba9a.zip | |
Merge branch 'pci/enumeration'
- Clear LBMS bit after a manual link retrain so we don't try to retrain a
link when there's no downstream device anymore (Maciej W. Rozycki)
- Revert to the original link speed after retraining fails instead of
leaving it restricted to 2.5GT/s, so a future device has a chance to use
higher speeds (Maciej W. Rozycki)
- Correct interpretation of pcie_retrain_link() return status and update it
to return 0/errno instead of true/false (Maciej W. Rozycki)
* pci/enumeration:
PCI: Use an error code with PCIe failed link retraining
PCI: Correct error reporting with PCIe failed link retraining
PCI: Revert to the original speed after PCIe failed link retraining
PCI: Clear the LBMS bit after a link retrain
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index fa3771cd8785..665c3b937a55 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -611,7 +611,7 @@ void pci_acs_init(struct pci_dev *dev); int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags); int pci_dev_specific_enable_acs(struct pci_dev *dev); int pci_dev_specific_disable_acs_redir(struct pci_dev *dev); -bool pcie_failed_link_retrain(struct pci_dev *dev); +int pcie_failed_link_retrain(struct pci_dev *dev); #else static inline int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags) @@ -626,9 +626,9 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev) { return -ENOTTY; } -static inline bool pcie_failed_link_retrain(struct pci_dev *dev) +static inline int pcie_failed_link_retrain(struct pci_dev *dev) { - return false; + return -ENOTTY; } #endif |