diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 21:59:01 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 21:59:01 +0200 |
commit | 5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3 (patch) | |
tree | 6a0592aa4088435230163ada694c68b839674d60 /drivers/pci/pci.h | |
parent | Merge branch 'pci/peer-to-peer' (diff) | |
parent | PCI: Make pci_get_rom_size() static (diff) | |
download | linux-5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3.tar.xz linux-5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3.zip |
Merge branch 'pci/resource'
- Clean up devm_of_pci_get_host_bridge_resources() resource allocation
(Jan Kiszka)
- Fixup resizable BARs after suspend/resume (Christian König)
- Make "pci=earlydump" generic (Sinan Kaya)
- Fix ROM BAR access routines to stay in bounds and check for signature
correctly (Rex Zhu)
* pci/resource:
PCI: Make pci_get_rom_size() static
PCI: Add check code for last image indicator not set
PCI: Avoid accessing memory outside the ROM BAR
PCI: Make early dump functionality generic
PCI: Cleanup PCI_REBAR_CTRL_BAR_SHIFT handling
PCI: Restore resized BAR state on resume
PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources()
# Conflicts:
# Documentation/admin-guide/kernel-parameters.txt
Diffstat (limited to 'drivers/pci/pci.h')
-rw-r--r-- | drivers/pci/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 8907ceb88233..61960411bd3b 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -7,6 +7,7 @@ #define PCI_VSEC_ID_INTEL_TBT 0x1234 /* Thunderbolt */ extern const unsigned char pcie_link_speed[]; +extern bool pci_early_dump; bool pcie_cap_has_lnkctl(const struct pci_dev *dev); |