diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-08-05 18:24:15 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-08-05 18:24:15 -0500 |
| commit | 3f906da760596b9a9551cd9243ece42f05e1a579 (patch) | |
| tree | 4e496bd2305d93ca363e0fa7f31c7e6943772ff6 /drivers/pci/pci.h | |
| parent | 0dfcabe9c640591808de483fadcd823dd24c37fb (diff) | |
| parent | b7360f609f5fa0537667dc1b8036c96bf7e03023 (diff) | |
| download | linux-next-3f906da760596b9a9551cd9243ece42f05e1a579.tar.gz | |
Merge branch 'pci/enumeration'
- Fix pci_cfg_wait queue locking problem (Xiang Zheng, Bjorn Helgaas)
- Keep device in system even if driver attach fails (Rajat Jain)
- Cache ACS capability offset in device (Rajat Jain)
- Treat "external-facing" devices themselves as internal, not external
(Rajat Jain)
- Announce device after early fixups (Tiezhu Yang)
* pci/enumeration:
PCI: Announce device after early fixups
PCI: Treat "external-facing" devices themselves as internal
PCI: Cache ACS capability offset in device
PCI: Reorder pci_enable_acs() and dependencies
PCI: Add device even if driver attach failed
PCI: Fix pci_cfg_wait queue locking problem
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 6d3f75867106..12fb79fbe29d 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -532,7 +532,7 @@ static inline resource_size_t pci_resource_alignment(struct pci_dev *dev, return resource_alignment(res); } -void pci_enable_acs(struct pci_dev *dev); +void pci_acs_init(struct pci_dev *dev); #ifdef CONFIG_PCI_QUIRKS int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags); int pci_dev_specific_enable_acs(struct pci_dev *dev); |