Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45604e68 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents d9322d22 f8415222 ad67b437

arch/x86/pci/fixup.c

+7 −0
Original line number Diff line number Diff line
@@ -552,9 +552,16 @@ static void twinhead_reserve_killing_zone(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x27B9, twinhead_reserve_killing_zone);



/*

 * Broadwell EP Home Agent BARs erroneously return non-zero values when read.

 *

 * See http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html

 * entry BDF2.

 */

static void pci_bdwep_bar(struct pci_dev *dev)

{

	dev->non_compliant_bars = 1;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_bdwep_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_bdwep_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_bdwep_bar);

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -2228,7 +2228,7 @@ void pci_pm_init(struct pci_dev *dev) 


static unsigned long pci_ea_flags(struct pci_dev *dev, u8 prop)

{

	unsigned long flags = IORESOURCE_PCI_FIXED;

	unsigned long flags = IORESOURCE_PCI_FIXED | IORESOURCE_PCI_EA_BEI;



	switch (prop) {

	case PCI_EA_P_MEM:

drivers/pci/pcie/portdrv_core.c

+8 −14
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ static void cleanup_service_irqs(struct pci_dev *dev) 
static int get_port_device_capability(struct pci_dev *dev)

{

	int services = 0;

	u32 reg32;

	int cap_mask = 0;



	if (pcie_ports_disabled)
@@ -269,20 +268,15 @@ static int get_port_device_capability(struct pci_dev *dev) 
		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) {

	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.

		 * 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)

	    && pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR)) {

drivers/pci/probe.c

+3 −3
Original line number Diff line number Diff line
@@ -179,9 +179,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
	u16 orig_cmd;

	struct pci_bus_region region, inverted_region;



	if (dev->non_compliant_bars)

		return 0;



	mask = type ? PCI_ROM_ADDRESS_MASK : ~0;



	/* No printks while decoding is disabled! */
@@ -322,6 +319,9 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) 
{

	unsigned int pos, reg;



	if (dev->non_compliant_bars)

		return;



	for (pos = 0; pos < howmany; pos++) {

		struct resource *res = &dev->resource[pos];

		reg = PCI_BASE_ADDRESS_0 + (pos << 2);

include/linux/ioport.h

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ struct resource { 


/*

 * IO resources have these defined flags.

 *

 * PCI devices expose these flags to userspace in the "resource" sysfs file,

 * so don't move them.

 */

#define IORESOURCE_BITS		0x000000ff	/* Bus-specific bits */
@@ -110,6 +113,7 @@ struct resource { 


/* PCI control bits.  Shares IORESOURCE_BITS with above PCI ROM.  */

#define IORESOURCE_PCI_FIXED		(1<<4)	/* Do not move resource */

#define IORESOURCE_PCI_EA_BEI		(1<<5)	/* BAR Equivalent Indicator */



/*

 * I/O Resource Descriptors