Commit a9238741 authored Sep 03, 2013 by Linus Torvalds

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

Pull PCI changes from Bjorn Helgaas:

  PCI device hotplug:
    - Use PCIe native hotplug, not ACPI hotplug, when possible (Neil Horman)
    - Assign resources on per-host bridge basis (Yinghai Lu)

  MPS (Max Payload Size):
    - Allow larger MPS settings below hotplug-capable Root Port (Yijing Wang)
    - Add warnings about unsafe MPS settings (Yijing Wang)
    - Simplify interface and messages (Bjorn Helgaas)

  SR-IOV:
    - Return -ENOSYS on non-SR-IOV devices (Stefan Assmann)
    - Update NumVFs register when disabling SR-IOV (Yijing Wang)

  Virtualization:
    - Add bus and slot reset support (Alex Williamson)
    - Fix ACS (Access Control Services) issues (Alex Williamson)

  Miscellaneous:
    - Simplify PCIe Capability accessors (Bjorn Helgaas)
    - Add pcibios_pm_ops for arch-specific hibernate stuff (Sebastian Ott)
    - Disable decoding during BAR sizing only when necessary (Zoltan Kiss)
    - Delay enabling bridges until they're needed (Yinghai Lu)
    - Split Designware support into Synopsys and Exynos parts (Jingoo Han)
    - Convert class code to use dev_groups (Greg Kroah-Hartman)
    - Cleanup Designware and Exynos I/O access wrappers (Seungwon Jeon)
    - Fix bridge I/O window alignment (Bjorn Helgaas)
    - Add pci_wait_for_pending_transaction() (Casey Leedom)
    - Use devm_ioremap_resource() in Marvell driver (Tushar Behera)

* tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (63 commits)
  PCI/ACPI: Fix _OSC ordering to allow PCIe hotplug use when available
  PCI: exynos: Add I/O access wrappers
  PCI: designware: Drop "addr" arg from dw_pcie_readl_rc()/dw_pcie_writel_rc()
  PCI: Remove pcie_cap_has_devctl()
  PCI: Support PCIe Capability Slot registers only for ports with slots
  PCI: Remove PCIe Capability version checks
  PCI: Allow PCIe Capability link-related register access for switches
  PCI: Add offsets of PCIe capability registers
  PCI: Tidy bitmasks and spacing of PCIe capability definitions
  PCI: Remove obsolete comment reference to pci_pcie_cap2()
  PCI: Clarify PCI_EXP_TYPE_PCI_BRIDGE comment
  PCI: Rename PCIe capability definitions to follow convention
  PCI: Warn if unsafe MPS settings detected
  PCI: Fix MPS peer-to-peer DMA comment syntax
  PCI: Disable decoding for BAR sizing only when it was actually enabled
  PCI: Add comment about needing pci_msi_off() even when CONFIG_PCI_MSI=n
  PCI: Add pcibios_pm_ops for optional arch-specific hibernate functionality
  PCI: Don't restrict MPS for slots below Root Ports
  PCI: Simplify MPS test for Downstream Port
  PCI: Remove unnecessary check for pcie_get_mps() failure
  ...

parents 40031da4 e89c3316

Documentation/devicetree/bindings/pci/designware-pcie.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ Required properties:
		- interrupt-map-mask and interrupt-map: standard PCI properties
		to define the mapping of the PCIe interface to interrupt
		numbers.
		- num-lanes: number of lanes to use
		- reset-gpio: gpio pin number of power good signal

		Example:
		@@ -41,6 +42,7 @@ SoC specific DT Entry:
		#interrupt-cells = <1>;
		interrupt-map-mask = <0 0 0 0>;
		interrupt-map = <0x0 0 &gic 53>;
		num-lanes = <4>;
		};

		pcie@2a0000 {
		@@ -60,6 +62,7 @@ SoC specific DT Entry:
		#interrupt-cells = <1>;
		interrupt-map-mask = <0 0 0 0>;
		interrupt-map = <0x0 0 &gic 56>;
		num-lanes = <4>;
		};

		Board specific DT Entry:

arch/arm/boot/dts/exynos5440.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,7 @@
		#interrupt-cells = <1>;
		interrupt-map-mask = <0 0 0 0>;
		interrupt-map = <0x0 0 &gic 53>;
		num-lanes = <4>;
		};

		pcie@2a0000 {
		@@ -267,5 +268,6 @@
		#interrupt-cells = <1>;
		interrupt-map-mask = <0 0 0 0>;
		interrupt-map = <0x0 0 &gic 56>;
		num-lanes = <4>;
		};
		};

arch/arm/kernel/bios32.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -525,11 +525,6 @@ void pci_common_init_dev(struct device parent, struct hw_pci hw)
		* Assign resources.
		*/
		pci_bus_assign_resources(bus);

		/*
		* Enable bridges
		*/
		pci_enable_bridges(bus);
		}

		/*

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -320,7 +320,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
		* are examined.
		*/

		void __init pcibios_fixup_bus(struct pci_bus *bus)
		void pcibios_fixup_bus(struct pci_bus *bus)
		{
		#if 0
		printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);

arch/m68k/platform/coldfire/pci.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -319,7 +319,6 @@ static int __init mcf_pci_init(void)
		pci_fixup_irqs(pci_common_swizzle, mcf_pci_map_irq);
		pci_bus_size_bridges(rootbus);
		pci_bus_assign_resources(rootbus);
		pci_enable_bridges(rootbus);
		return 0;
		}