Merge branches 'pci/hotplug' and 'pci/resource' into next

* pci/hotplug:
  PCI: Use cached copy of PCI_EXP_SLTCAP_HPC bit

* pci/resource:
  PCI: Disable all BAR sizing for devices with non-compliant BARs
  x86/PCI: Mark Broadwell-EP Home Agent 1 as having non-compliant BARs
  PCI: Identify Enhanced Allocation (EA) BAR Equivalent resources in sysfs

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pcie/portdrv_core.c
index 050069f32f7742dc875c75b6d162a5820a478c1d,847f4fdca50ca1a216eb62b2dcfaa0ba0a63eb80,88122dc2e1b1375f1715f8b8ca431673cee8d3e9..32d4d0a3d20e5f2b5b2e78a90adc77081ad451be
--- 1/drivers/pci/pcie/portdrv_core.c
--- 2/drivers/pci/pcie/portdrv_core.c
--- 3/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@@@ -254,8 -254,8 -254,9 +254,7 @@@@ static void cleanup_service_irqs(struc
   static int get_port_device_capability(struct pci_dev *dev)
   {
        int services = 0;
- -     u32 reg32;
        int cap_mask = 0;
 --     int err;
   
        if (pcie_ports_disabled)
                return 0;
@@@@ -265,23 -265,21 -266,26 +264,18 @@@@
        if (pci_aer_available())
                cap_mask |= PCIE_PORT_SERVICE_AER;
   
 --     if (pcie_ports_auto) {
 --             err = pcie_port_platform_notify(dev, &cap_mask);
 --             if (err)
 --                     return 0;
 --     }
 ++     if (pcie_ports_auto)
 ++             pcie_port_platform_notify(dev, &cap_mask);
   
        /* Hot-Plug Capable */
- -     if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
- -         pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT) {
- -             pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, &reg32);
- -             if (reg32 & PCI_EXP_SLTCAP_HPC) {
- -                     services |= PCIE_PORT_SERVICE_HP;
- -                     /*
- -                      * Disable hot-plug interrupts in case they have been
- -                      * enabled by the BIOS and the hot-plug service driver
- -                      * is not loaded.
- -                      */
- -                     pcie_capability_clear_word(dev, PCI_EXP_SLTCTL,
- -                             PCI_EXP_SLTCTL_CCIE | PCI_EXP_SLTCTL_HPIE);
- -             }
+ +     if ((cap_mask & PCIE_PORT_SERVICE_HP) && dev->is_hotplug_bridge) {
+ +             services |= PCIE_PORT_SERVICE_HP;
+ +             /*
+ +              * Disable hot-plug interrupts in case they have been enabled
+ +              * by the BIOS and the hot-plug service driver is not loaded.
+ +              */
+ +             pcie_capability_clear_word(dev, PCI_EXP_SLTCTL,
+ +                       PCI_EXP_SLTCTL_CCIE | PCI_EXP_SLTCTL_HPIE);
        }
        /* AER capable */
        if ((cap_mask & PCIE_PORT_SERVICE_AER)

diff --cc drivers/pci/probe.c
Simple merge