diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-07-12 17:08:24 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-07-12 17:08:24 -0500 |
| commit | 8cf80c5c14b4914b0eb03d4bcafebd07180edfb9 (patch) | |
| tree | 6f2a349281fa7d46d84971ffe9dc583be2d059a8 /include/linux/pci.h | |
| parent | b6a001c0cb2d29b77596a142aad5249044a6c119 (diff) | |
| parent | dc6b698a86fe40a50525433eb8e92a267847f6f9 (diff) | |
Merge branch 'pci/enumeration'
- If user prevents VF probing, return error instead of pretending a
driver has claimed the VF (Alex Williamson)
- Always allow probing with driver_override (Alex Williamson)
- Decode PCIe 32 GT/s link speed (Gustavo Pimentel)
- Ignore lockdep for sysfs remove to avoid lockdep false positive (Marek
Vasut)
* pci/enumeration:
PCI: sysfs: Ignore lockdep for remove attribute
PCI: Decode PCIe 32 GT/s link speed
PCI: Always allow probing with driver_override
PCI: Return error if cannot probe VF
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 3d9a167ca5c3..ea91e79d0ba6 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -260,6 +260,7 @@ enum pci_bus_speed { PCIE_SPEED_5_0GT = 0x15, PCIE_SPEED_8_0GT = 0x16, PCIE_SPEED_16_0GT = 0x17, + PCIE_SPEED_32_0GT = 0x18, PCI_SPEED_UNKNOWN = 0xff, }; |