diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci.h | 10 | ||||
-rw-r--r-- | include/uapi/linux/pci_regs.h | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index da172f956ad6..d3a888ae4b2e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -330,8 +330,6 @@ struct pci_dev { | |||
330 | unsigned int msix_enabled:1; | 330 | unsigned int msix_enabled:1; |
331 | unsigned int ari_enabled:1; /* ARI forwarding */ | 331 | unsigned int ari_enabled:1; /* ARI forwarding */ |
332 | unsigned int is_managed:1; | 332 | unsigned int is_managed:1; |
333 | unsigned int is_pcie:1; /* Obsolete. Will be removed. | ||
334 | Use pci_is_pcie() instead */ | ||
335 | unsigned int needs_freset:1; /* Dev requires fundamental reset */ | 333 | unsigned int needs_freset:1; /* Dev requires fundamental reset */ |
336 | unsigned int state_saved:1; | 334 | unsigned int state_saved:1; |
337 | unsigned int is_physfn:1; | 335 | unsigned int is_physfn:1; |
@@ -472,6 +470,10 @@ struct pci_bus { | |||
472 | /* | 470 | /* |
473 | * Returns true if the pci bus is root (behind host-pci bridge), | 471 | * Returns true if the pci bus is root (behind host-pci bridge), |
474 | * false otherwise | 472 | * false otherwise |
473 | * | ||
474 | * Some code assumes that "bus->self == NULL" means that bus is a root bus. | ||
475 | * This is incorrect because "virtual" buses added for SR-IOV (via | ||
476 | * virtfn_add_bus()) have "bus->self == NULL" but are not root buses. | ||
475 | */ | 477 | */ |
476 | static inline bool pci_is_root_bus(struct pci_bus *pbus) | 478 | static inline bool pci_is_root_bus(struct pci_bus *pbus) |
477 | { | 479 | { |
@@ -1749,11 +1751,11 @@ static inline int pci_pcie_cap(struct pci_dev *dev) | |||
1749 | * pci_is_pcie - check if the PCI device is PCI Express capable | 1751 | * pci_is_pcie - check if the PCI device is PCI Express capable |
1750 | * @dev: PCI device | 1752 | * @dev: PCI device |
1751 | * | 1753 | * |
1752 | * Retrun true if the PCI device is PCI Express capable, false otherwise. | 1754 | * Returns: true if the PCI device is PCI Express capable, false otherwise. |
1753 | */ | 1755 | */ |
1754 | static inline bool pci_is_pcie(struct pci_dev *dev) | 1756 | static inline bool pci_is_pcie(struct pci_dev *dev) |
1755 | { | 1757 | { |
1756 | return !!pci_pcie_cap(dev); | 1758 | return pci_pcie_cap(dev); |
1757 | } | 1759 | } |
1758 | 1760 | ||
1759 | /** | 1761 | /** |
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index 1a38377a0032..0890556f779e 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h | |||
@@ -319,7 +319,6 @@ | |||
319 | #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ | 319 | #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ |
320 | #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ | 320 | #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ |
321 | #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ | 321 | #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ |
322 | #define PCI_MSIX_FLAGS_BIRMASK (7 << 0) /* deprecated */ | ||
323 | #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ | 322 | #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ |
324 | 323 | ||
325 | /* MSI-X entry's format */ | 324 | /* MSI-X entry's format */ |