diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-27 18:35:43 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-27 18:35:43 -0400 |
commit | 605d240052473228bf0c8c051cad825fddb25502 (patch) | |
tree | c1eeed2abdf258cb6cf2d14f5986c2e9bed40a1e /include | |
parent | d3c02799d32039ddd548c20680f7982b646ba3d8 (diff) | |
parent | 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed (diff) |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition
PCI: acpiphp_ibm: Convert to dynamic debug
PCI: acpiphp: Convert to dynamic debug
PCI: Remove Intel Haswell D3 delays
PCI: Pass type, width, and prefetchability for window alignment
PCI: Document reason for using pci_is_root_bus()
PCI: Use pci_is_root_bus() to check for root bus
PCI: Remove unused "is_pcie" from pci_dev structure
PCI: Update pci_find_slot() description in pci.txt
[SCSI] qla2xxx: Use standard PCIe Capability Link register field names
PCI: Fix comment typo, remove unnecessary !! in pci_is_pcie()
PCI: Drop "setting latency timer" messages
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 */ |