summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-11-02 15:57:03 -0600
committerBjorn Helgaas <bhelgaas@google.com>2015-11-02 15:57:03 -0600
commit1f9a30ec2a4acee9a4d664e7405c7eb26a7c4b5e (patch)
tree1dca71b9b6bae44aaed900d327811ece1fa38ad7
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
parentb07461a8e45b7a62ef7fb46e4f6ada66f63406a8 (diff)
parentbee67756eb4ae51ededeb8ce56e7f4fb91d30b43 (diff)
parentc56d4450eb6886225a5a0bb231ad2cea9f03284a (diff)
parent8affb487d4a4e223d961d7034cb41cd31982b618 (diff)
parentaf86fa4001ca5644ae20cc2c52cdf67bb7db9752 (diff)
parentc23b613507b8fa10e1839fb5a42e1b0318bf1d27 (diff)
Merge branches 'pci/aer', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/resource' and 'pci/virtualization' into next
* pci/aer: PCI/AER: Clear error status registers during enumeration and restore * pci/hotplug: PCI: pciehp: Queue power work requests in dedicated function * pci/misc: PCI: Turn off Request Attributes to avoid Chelsio T5 Completion erratum x86/PCI: Make pci_subsys_init() static PCI: Add builtin_pci_driver() to avoid registration boilerplate PCI: Remove unnecessary "if" statement * pci/msi: x86/PCI: Don't alloc pcibios-irq when MSI is enabled PCI/MSI: Export all remapped MSIs to sysfs attributes PCI: Disable MSI on SiS 761 * pci/resource: sparc/PCI: Add mem64 resource parsing for root bus PCI: Expand Enhanced Allocation BAR output PCI: Make Enhanced Allocation bitmasks more obvious PCI: Handle Enhanced Allocation capability for SR-IOV devices PCI: Add support for Enhanced Allocation devices PCI: Add Enhanced Allocation register entries PCI: Handle IORESOURCE_PCI_FIXED when assigning resources PCI: Handle IORESOURCE_PCI_FIXED when sizing resources PCI: Clear IORESOURCE_UNSET when reverting to firmware-assigned address * pci/virtualization: PCI: Fix sriov_enable() error path for pcibios_enable_sriov() failures PCI: Wait 1 second between disabling VFs and clearing NumVFs PCI: Reorder pcibios_sriov_disable() PCI: Remove VFs in reverse order if virtfn_add() fails PCI: Remove redundant validation of SR-IOV offset/stride registers PCI: Set SR-IOV NumVFs to zero after enumeration PCI: Enable SR-IOV ARI Capable Hierarchy before reading TotalVFs PCI: Don't try to restore VF BARs