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

Commit 4b1779c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI changes from Bjorn Helgaas:
 "Enumeration
   - Increment max correctly in pci_scan_bridge() (Andreas Noever)
   - Clarify the "scan anyway" comment in pci_scan_bridge() (Andreas Noever)
   - Assign CardBus bus number only during the second pass (Andreas Noever)
   - Use request_resource_conflict() instead of insert_ for bus numbers (Andreas Noever)
   - Make sure bus number resources stay within their parents bounds (Andreas Noever)
   - Remove pci_fixup_parent_subordinate_busnr() (Andreas Noever)
   - Check for child busses which use more bus numbers than allocated (Andreas Noever)
   - Don't scan random busses in pci_scan_bridge() (Andreas Noever)
   - x86: Drop pcibios_scan_root() check for bus already scanned (Bjorn Helgaas)
   - x86: Use pcibios_scan_root() instead of pci_scan_bus_with_sysdata() (Bjorn Helgaas)
   - x86: Use pcibios_scan_root() instead of pci_scan_bus_on_node() (Bjorn Helgaas)
   - x86: Merge pci_scan_bus_on_node() into pcibios_scan_root() (Bjorn Helgaas)
   - x86: Drop return value of pcibios_scan_root() (Bjorn Helgaas)

  NUMA
   - x86: Add x86_pci_root_bus_node() to look up NUMA node from PCI bus (Bjorn Helgaas)
   - x86: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node() (Bjorn Helgaas)
   - x86: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node() (Bjorn Helgaas)
   - x86: Use NUMA_NO_NODE, not -1, for unknown node (Bjorn Helgaas)
   - x86: Remove acpi_get_pxm() usage (Bjorn Helgaas)
   - ia64: Use NUMA_NO_NODE, not MAX_NUMNODES, for unknown node (Bjorn Helgaas)
   - ia64: Remove acpi_get_pxm() usage (Bjorn Helgaas)
   - ACPI: Fix acpi_get_node() prototype (Bjorn Helgaas)

  Resource management
   - i2o: Fix and refactor PCI space allocation (Bjorn Helgaas)
   - Add resource_contains() (Bjorn Helgaas)
   - Add %pR support for IORESOURCE_UNSET (Bjorn Helgaas)
   - Mark resources as IORESOURCE_UNSET if we can't assign them (Bjorn Helgaas)
   - Don't clear IORESOURCE_UNSET when updating BAR (Bjorn Helgaas)
   - Check IORESOURCE_UNSET before updating BAR (Bjorn Helgaas)
   - Don't try to claim IORESOURCE_UNSET resources (Bjorn Helgaas)
   - Mark 64-bit resource as IORESOURCE_UNSET if we only support 32-bit (Bjorn Helgaas)
   - Don't enable decoding if BAR hasn't been assigned an address (Bjorn Helgaas)
   - Add "weak" generic pcibios_enable_device() implementation (Bjorn Helgaas)
   - alpha, microblaze, sh, sparc, tile: Use default pcibios_enable_device() (Bjorn Helgaas)
   - s390: Use generic pci_enable_resources() (Bjorn Helgaas)
   - Don't check resource_size() in pci_bus_alloc_resource() (Bjorn Helgaas)
   - Set type in __request_region() (Bjorn Helgaas)
   - Check all IORESOURCE_TYPE_BITS in pci_bus_alloc_from_region() (Bjorn Helgaas)
   - Change pci_bus_alloc_resource() type_mask to unsigned long (Bjorn Helgaas)
   - Log IDE resource quirk in dmesg (Bjorn Helgaas)
   - Revert "[PATCH] Insert GART region into resource map" (Bjorn Helgaas)

  PCI device hotplug
   - Make check_link_active() non-static (Rajat Jain)
   - Use link change notifications for hot-plug and removal (Rajat Jain)
   - Enable link state change notifications (Rajat Jain)
   - Don't disable the link permanently during removal (Rajat Jain)
   - Don't check adapter or latch status while disabling (Rajat Jain)
   - Disable link notification across slot reset (Rajat Jain)
   - Ensure very fast hotplug events are also processed (Rajat Jain)
   - Add hotplug_lock to serialize hotplug events (Rajat Jain)
   - Remove a non-existent card, regardless of "surprise" capability (Rajat Jain)
   - Don't turn slot off when hot-added device already exists (Yijing Wang)

  MSI
   - Keep pci_enable_msi() documentation (Alexander Gordeev)
   - ahci: Fix broken single MSI fallback (Alexander Gordeev)
   - ahci, vfio: Use pci_enable_msi_range() (Alexander Gordeev)
   - Check kmalloc() return value, fix leak of name (Greg Kroah-Hartman)
   - Fix leak of msi_attrs (Greg Kroah-Hartman)
   - Fix pci_msix_vec_count() htmldocs failure (Masanari Iida)

  Virtualization
   - Device-specific ACS support (Alex Williamson)

  Freescale i.MX6
   - Wait for retraining (Marek Vasut)

  Marvell MVEBU
   - Use Device ID and revision from underlying endpoint (Andrew Lunn)
   - Fix incorrect size for PCI aperture resources (Jason Gunthorpe)
   - Call request_resource() on the apertures (Jason Gunthorpe)
   - Fix potential issue in range parsing (Jean-Jacques Hiblot)

  Renesas R-Car
   - Check platform_get_irq() return code (Ben Dooks)
   - Add error interrupt handling (Ben Dooks)
   - Fix bridge logic configuration accesses (Ben Dooks)
   - Register each instance independently (Magnus Damm)
   - Break out window size handling (Magnus Damm)
   - Make the Kconfig dependencies more generic (Magnus Damm)

  Synopsys DesignWare
   - Fix RC BAR to be single 64-bit non-prefetchable memory (Mohit Kumar)

  Miscellaneous
   - Remove unused SR-IOV VF Migration support (Bjorn Helgaas)
   - Enable INTx if BIOS left them disabled (Bjorn Helgaas)
   - Fix hex vs decimal typo in cpqhpc_probe() (Dan Carpenter)
   - Clean up par-arch object file list (Liviu Dudau)
   - Set IORESOURCE_ROM_SHADOW only for the default VGA device (Sander Eikelenboom)
   - ACPI, ARM, drm, powerpc, pcmcia, PCI: Use list_for_each_entry() for bus traversal (Yijing Wang)
   - Fix pci_bus_b() build failure (Paul Gortmaker)"

* tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (108 commits)
  Revert "[PATCH] Insert GART region into resource map"
  PCI: Log IDE resource quirk in dmesg
  PCI: Change pci_bus_alloc_resource() type_mask to unsigned long
  PCI: Check all IORESOURCE_TYPE_BITS in pci_bus_alloc_from_region()
  resources: Set type in __request_region()
  PCI: Don't check resource_size() in pci_bus_alloc_resource()
  s390/PCI: Use generic pci_enable_resources()
  tile PCI RC: Use default pcibios_enable_device()
  sparc/PCI: Use default pcibios_enable_device() (Leon only)
  sh/PCI: Use default pcibios_enable_device()
  microblaze/PCI: Use default pcibios_enable_device()
  alpha/PCI: Use default pcibios_enable_device()
  PCI: Add "weak" generic pcibios_enable_device() implementation
  PCI: Don't enable decoding if BAR hasn't been assigned an address
  PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
  PCI: Mark 64-bit resource as IORESOURCE_UNSET if we only support 32-bit
  PCI: Don't try to claim IORESOURCE_UNSET resources
  PCI: Check IORESOURCE_UNSET before updating BAR
  PCI: Don't clear IORESOURCE_UNSET when updating BAR
  PCI: Mark resources as IORESOURCE_UNSET if we can't assign them
  ...

Conflicts:
	arch/x86/include/asm/topology.h
	drivers/ata/ahci.c
parents 62ff577f 30723cbf

Documentation/PCI/pci-iov-howto.txt

+0 −4
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ To disable SR-IOV capability: 
	echo  0 > \

        /sys/bus/pci/devices/<DOMAIN:BUS:DEVICE.FUNCTION>/sriov_numvfs



To notify SR-IOV core of Virtual Function Migration:

(a) In the driver:

	irqreturn_t pci_sriov_migration(struct pci_dev *dev);



3.2 Usage example



Following piece of code illustrates the usage of the SR-IOV API.

arch/alpha/kernel/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -254,12 +254,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
	}

}



int

pcibios_enable_device(struct pci_dev *dev, int mask)

{

	return pci_enable_resources(dev, mask);

}



/*

 *  If we set up a device for bus mastering, we need to check the latency

 *  timer as certain firmware forgets to set it properly, as seen

arch/arm/kernel/bios32.c

+3 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
static int debug_pci;



/*

 * We can't use pci_find_device() here since we are

 * We can't use pci_get_device() here since we are

 * called from interrupt context.

 */

static void pcibios_bus_report_status(struct pci_bus *bus, u_int status_mask, int warn)
@@ -57,14 +57,11 @@ static void pcibios_bus_report_status(struct pci_bus *bus, u_int status_mask, in 


void pcibios_report_status(u_int status_mask, int warn)

{

	struct list_head *l;



	list_for_each(l, &pci_root_buses) {

		struct pci_bus *bus = pci_bus_b(l);

	struct pci_bus *bus;



	list_for_each_entry(bus, &pci_root_buses, node)

		pcibios_bus_report_status(bus, status_mask, warn);

}

}



/*

 * We don't use this to fix the device, but initialisation of it.

arch/frv/mb93090-mb00/pci-frv.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 


	/* Depth-First Search on bus tree */

	for (ln=bus_list->next; ln != bus_list; ln=ln->next) {

		bus = pci_bus_b(ln);

		bus = list_entry(ln, struct pci_bus, node);

		if ((dev = bus->self)) {

			for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {

				r = &dev->resource[idx];

arch/ia64/hp/common/sba_iommu.c

+11 −21
Original line number Diff line number Diff line
@@ -1140,11 +1140,13 @@ sba_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 


#ifdef CONFIG_NUMA

	{

		int node = ioc->node;

		struct page *page;

		page = alloc_pages_exact_node(ioc->node == MAX_NUMNODES ?

		                        numa_node_id() : ioc->node, flags,

		                        get_order(size));



		if (node == NUMA_NO_NODE)

			node = numa_node_id();



		page = alloc_pages_exact_node(node, flags, get_order(size));

		if (unlikely(!page))

			return NULL;
@@ -1914,7 +1916,7 @@ ioc_show(struct seq_file *s, void *v) 
	seq_printf(s, "Hewlett Packard %s IOC rev %d.%d\n",

		ioc->name, ((ioc->rev >> 4) & 0xF), (ioc->rev & 0xF));

#ifdef CONFIG_NUMA

	if (ioc->node != MAX_NUMNODES)

	if (ioc->node != NUMA_NO_NODE)

		seq_printf(s, "NUMA node       : %d\n", ioc->node);

#endif

	seq_printf(s, "IOVA size       : %ld MB\n", ((ioc->pdir_size >> 3) * iovp_size)/(1024*1024));
@@ -2015,31 +2017,19 @@ sba_connect_bus(struct pci_bus *bus) 
	printk(KERN_WARNING "No IOC for PCI Bus %04x:%02x in ACPI\n", pci_domain_nr(bus), bus->number);

}



#ifdef CONFIG_NUMA

static void __init

sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)

{

#ifdef CONFIG_NUMA

	unsigned int node;

	int pxm;



	ioc->node = MAX_NUMNODES;



	pxm = acpi_get_pxm(handle);



	if (pxm < 0)

		return;



	node = pxm_to_node(pxm);



	if (node >= MAX_NUMNODES || !node_online(node))

		return;

	node = acpi_get_node(handle);

	if (node != NUMA_NO_NODE && !node_online(node))

		node = NUMA_NO_NODE;



	ioc->node = node;

	return;

}

#else

#define sba_map_ioc_to_node(ioc, handle)

#endif

}



static int

acpi_sba_ioc_add(struct acpi_device *device,