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

Commit 3be1b98e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI changes from Bjorn Helgaas:
 "Enumeration
    - Read capability list as dwords, not bytes (Sean O. Stalley)

  Resource management
    - Don't check for PNP overlaps with unassigned PCI BARs (Bjorn Helgaas)
    - Mark invalid BARs as unassigned (Bjorn Helgaas)
    - Show driver, BAR#, and resource on pci_ioremap_bar() failure (Bjorn Helgaas)
    - Fail pci_ioremap_bar() on unassigned resources (Bjorn Helgaas)
    - Assign resources before drivers claim devices (Yijing Wang)
    - Claim bus resources before pci_bus_add_devices() (Yijing Wang)

  Power management
    - Optimize device state transition delays (Aaron Lu)
    - Don't clear ASPM bits when the FADT declares it's unsupported (Matthew Garrett)

  Virtualization
    - Add ACS quirks for Intel 1G NICs (Alex Williamson)

  IOMMU
    - Add ptr to OF node arg to of_iommu_configure() (Murali Karicheri)
    - Move of_dma_configure() to device.c to help re-use (Murali Karicheri)
    - Fix size when dma-range is not used (Murali Karicheri)
    - Add helper functions pci_get[put]_host_bridge_device() (Murali Karicheri)
    - Add of_pci_dma_configure() to update DMA configuration (Murali Karicheri)
    - Update DMA configuration from DT (Murali Karicheri)
    - dma-mapping: limit IOMMU mapping size (Murali Karicheri)
    - Calculate device DMA masks based on DT dma-range size (Murali Karicheri)

  ARM Versatile host bridge driver
    - Check for devm_ioremap_resource() failures (Jisheng Zhang)

  Broadcom iProc host bridge driver
    - Add Broadcom iProc PCIe driver (Ray Jui)

  Marvell MVEBU host bridge driver
    - Add suspend/resume support (Thomas Petazzoni)

  Renesas R-Car host bridge driver
    - Fix position of MSI enable bit (Nobuhiro Iwamatsu)
    - Write zeroes to reserved PCIEPARL bits (Nobuhiro Iwamatsu)
    - Change PCIEPARL and PCIEPARH to PCIEPALR and PCIEPAUR (Nobuhiro Iwamatsu)
    - Verify that mem_res is 64K-aligned (Nobuhiro Iwamatsu)

  Samsung Exynos host bridge driver
    - Fix INTx enablement statement termination error (Jaehoon Chung)

  Miscellaneous
    - Make a shareable UUID for PCI firmware ACPI _DSM (Aaron Lu)
    - Clarify policy for vendor IDs in pci.txt (Michael S. Tsirkin)"

* tag 'pci-v4.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (36 commits)
  PCI: Read capability list as dwords, not bytes
  PCI: layerscape: Simplify platform_get_resource_byname() failure checking
  PCI: keystone: Don't dereference possible NULL pointer
  PCI: versatile: Check for devm_ioremap_resource() failures
  PCI: Don't clear ASPM bits when the FADT declares it's unsupported
  PCI: Clarify policy for vendor IDs in pci.txt
  PCI/ACPI: Optimize device state transition delays
  PCI: Export pci_find_host_bridge() for use inside PCI core
  PCI: Make a shareable UUID for PCI firmware ACPI _DSM
  PCI: Fix typo in Thunderbolt kernel message
  PCI: exynos: Fix INTx enablement statement termination error
  PCI: iproc: Add Broadcom iProc PCIe support
  PCI: iproc: Add DT docs for Broadcom iProc PCIe driver
  PCI: Export symbols required for loadable host driver modules
  PCI: Add ACS quirks for Intel 1G NICs
  PCI: mvebu: Add suspend/resume support
  PCI: Cleanup control flow
  sparc/PCI: Claim bus resources before pci_bus_add_devices()
  PCI: Assign resources before drivers claim devices (pci_scan_root_bus())
  PCI: Fail pci_ioremap_bar() on unassigned resources
  ...
parents 392b46f3 5468d5a6

Documentation/PCI/pci.txt

+6 −6
Original line number Diff line number Diff line
@@ -564,14 +564,14 @@ to be handled by platform and generic code, not individual drivers. 
8. Vendor and device identifications

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



One is not required to add new device ids to include/linux/pci_ids.h.

Please add PCI_VENDOR_ID_xxx for vendors and a hex constant for device ids.

Do not add new device or vendor IDs to include/linux/pci_ids.h unless they

are shared across multiple drivers.  You can add private definitions in

your driver if they're helpful, or just use plain hex constants.



PCI_VENDOR_ID_xxx constants are re-used. The device ids are arbitrary

hex numbers (vendor controlled) and normally used only in a single

location, the pci_device_id table.

The device IDs are arbitrary hex numbers (vendor controlled) and normally used

only in a single location, the pci_device_id table.



Please DO submit new vendor/device ids to pciids.sourceforge.net project.

Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.

Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt

0 → 100644
+63 −0
Original line number Diff line number Diff line 
* Broadcom iProc PCIe controller with the platform bus interface



Required properties:

- compatible: Must be "brcm,iproc-pcie"

- reg: base address and length of the PCIe controller I/O register space

- #interrupt-cells: set to <1>

- interrupt-map-mask and interrupt-map, standard PCI properties to define the

  mapping of the PCIe interface to interrupt numbers

- linux,pci-domain: PCI domain ID. Should be unique for each host controller

- bus-range: PCI bus numbers covered

- #address-cells: set to <3>

- #size-cells: set to <2>

- device_type: set to "pci"

- ranges: ranges for the PCI memory and I/O regions



Optional properties:

- phys: phandle of the PCIe PHY device

- phy-names: must be "pcie-phy"



Example:

	pcie0: pcie@18012000 {

		compatible = "brcm,iproc-pcie";

		reg = <0x18012000 0x1000>;



		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 0>;

		interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;



		linux,pci-domain = <0>;



		bus-range = <0x00 0xff>;



		#address-cells = <3>;

		#size-cells = <2>;

		device_type = "pci";

		ranges = <0x81000000 0 0	  0x28000000 0 0x00010000

			  0x82000000 0 0x20000000 0x20000000 0 0x04000000>;



		phys = <&phy 0 5>;

		phy-names = "pcie-phy";

	};



	pcie1: pcie@18013000 {

		compatible = "brcm,iproc-pcie";

		reg = <0x18013000 0x1000>;



		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 0>;

		interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;



		linux,pci-domain = <1>;



		bus-range = <0x00 0xff>;



		#address-cells = <3>;

		#size-cells = <2>;

		device_type = "pci";

		ranges = <0x81000000 0 0	  0x48000000 0 0x00010000

			  0x82000000 0 0x40000000 0x40000000 0 0x04000000>;



		phys = <&phy 1 6>;

		phy-names = "pcie-phy";

	};

arch/alpha/kernel/pci.c

+7 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ common_init_pci(void) 


		bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,

					hose, &resources);

		if (!bus)

			continue;

		hose->bus = bus;

		hose->need_domain_info = need_domain_info;

		next_busno = bus->busn_res.end + 1;
@@ -353,6 +355,11 @@ common_init_pci(void) 


	pci_assign_unassigned_resources();

	pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);

	for (hose = hose_head; hose; hose = hose->next) {

		bus = hose->bus;

		if (bus)

			pci_bus_add_devices(bus);

	}

}

arch/alpha/kernel/sys_nautilus.c

+4 −0
Original line number Diff line number Diff line
@@ -207,6 +207,9 @@ nautilus_init_pci(void) 


	/* Scan our single hose.  */

	bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);

	if (!bus)

		return;



	hose->bus = bus;

	pcibios_claim_one_bus(bus);
@@ -253,6 +256,7 @@ nautilus_init_pci(void) 
	   for the root bus, so just clear it. */

	bus->self = NULL;

	pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);

	pci_bus_add_devices(bus);

}



/*

arch/arm/mach-dove/pcie.c

+4 −8
Original line number Diff line number Diff line
@@ -155,17 +155,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); 
static struct pci_bus __init *

dove_pcie_scan_bus(int nr, struct pci_sys_data *sys)

{

	struct pci_bus *bus;



	if (nr < num_pcie_ports) {

		bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,

					&sys->resources);

	} else {

		bus = NULL;

	if (nr >= num_pcie_ports) {

		BUG();

		return NULL;

	}



	return bus;

	return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,

				 &sys->resources);

}



static int __init dove_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)