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

Commit c08f8467 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI changes from Bjorn Helgaas:
 "Enumeration
    - Move domain assignment from arm64 to generic code (Lorenzo Pieralisi)
    - ARM: Remove artificial dependency on pci_sys_data domain (Lorenzo Pieralisi)
    - ARM: Move to generic PCI domains (Lorenzo Pieralisi)
    - Generate uppercase hex for modalias var in uevent (Ricardo Ribalda Delgado)
    - Add and use generic config accessors on ARM, PowerPC (Rob Herring)

  Resource management
    - Free resources on failure in of_pci_get_host_bridge_resources() (Lorenzo Pieralisi)
    - Fix infinite loop with ROM image of size 0 (Michel Dänzer)

  PCI device hotplug
    - Handle surprise add even if surprise removal isn't supported (Bjorn Helgaas)

  Virtualization
    - Mark AMD/ATI VGA devices that don't reset on D3hot->D0 transition (Alex Williamson)
    - Add DMA alias quirk for Adaptec 3405 (Alex Williamson)
    - Add Wellsburg (X99) to Intel PCH root port ACS quirk (Alex Williamson)
    - Add ACS quirk for Emulex NICs (Vasundhara Volam)

  MSI
    - Fail MSI-X mappings if there's no space assigned to MSI-X BAR (Yijing Wang)

  Freescale Layerscape host bridge driver
    - Fix platform_no_drv_owner.cocci warnings (Julia Lawall)

  NVIDIA Tegra host bridge driver
    - Remove unnecessary tegra_pcie_fixup_bridge() (Lucas Stach)

  Renesas R-Car host bridge driver
    - Fix error handling of irq_of_parse_and_map() (Dmitry Torokhov)

  TI Keystone host bridge driver
    - Fix error handling of irq_of_parse_and_map() (Dmitry Torokhov)
    - Fix misspelling of current function in debug output (Julia Lawall)

  Xilinx AXI host bridge driver
    - Fix harmless format string warning (Arnd Bergmann)

  Miscellaneous
    - Use standard parsing functions for ASPM sysfs setters (Chris J Arges)
    - Add pci_device_to_OF_node() stub for !CONFIG_OF (Kevin Hao)
    - Delete unnecessary NULL pointer checks (Markus Elfring)
    - Add and use defines for PCIe Max_Read_Request_Size (Rafał Miłecki)
    - Include clk.h instead of clk-private.h (Stephen Boyd)"

* tag 'pci-v3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (48 commits)
  PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
  PCI: xilinx: Convert to use generic config accessors
  PCI: xgene: Convert to use generic config accessors
  PCI: tegra: Convert to use generic config accessors
  PCI: rcar: Convert to use generic config accessors
  PCI: generic: Convert to use generic config accessors
  powerpc/powermac: Convert PCI to use generic config accessors
  powerpc/fsl_pci: Convert PCI to use generic config accessors
  ARM: ks8695: Convert PCI to use generic config accessors
  ARM: sa1100: Convert PCI to use generic config accessors
  ARM: integrator: Convert PCI to use generic config accessors
  PCI: versatile: Add DT-based ARM Versatile PB PCIe host driver
  ARM: dts: versatile: add PCI controller binding
  of/pci: Free resources on failure in of_pci_get_host_bridge_resources()
  PCI: versatile: Add DT docs for ARM Versatile PB PCIe driver
  PCI: Fail MSI-X mappings if there's no space assigned to MSI-X BAR
  r8169: use PCI define for Max_Read_Request_Size
  [SCSI] esas2r: use PCI define for Max_Read_Request_Size
  tile: use PCI define for Max_Read_Request_Size
  rapidio/tsi721: use PCI define for Max_Read_Request_Size
  ...
parents bdccc4ed cb8e92d8

Documentation/devicetree/bindings/pci/versatile.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
* ARM Versatile Platform Baseboard PCI interface



PCI host controller found on the ARM Versatile PB board's FPGA.



Required properties:

- compatible: should contain "arm,versatile-pci" to identify the Versatile PCI

  controller.

- reg: base addresses and lengths of the pci controller. There must be 3

  entries:

	- Versatile-specific registers

	- Self Config space

	- Config space

- #address-cells: set to <3>

- #size-cells: set to <2>

- device_type: set to "pci"

- bus-range: set to <0 0xff>

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

- #interrupt-cells: set to <1>

- interrupt-map-mask and interrupt-map: standard PCI properties to define

	the mapping of the PCI interface to interrupt numbers.



Example:



pci-controller@10001000 {

	compatible = "arm,versatile-pci";

	device_type = "pci";

	reg = <0x10001000 0x1000

	       0x41000000 0x10000

	       0x42000000 0x100000>;

	bus-range = <0 0xff>;

	#address-cells = <3>;

	#size-cells = <2>;

	#interrupt-cells = <1>;



	ranges = <0x01000000 0 0x00000000 0x43000000 0 0x00010000   /* downstream I/O */

		  0x02000000 0 0x50000000 0x50000000 0 0x10000000   /* non-prefetchable memory */

		  0x42000000 0 0x60000000 0x60000000 0 0x10000000>; /* prefetchable memory */



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

	interrupt-map = <0x1800 0 0 1 &sic 28

			 0x1800 0 0 2 &sic 29

			 0x1800 0 0 3 &sic 30

			 0x1800 0 0 4 &sic 27



			 0x1000 0 0 1 &sic 27

			 0x1000 0 0 2 &sic 28

			 0x1000 0 0 3 &sic 29

			 0x1000 0 0 4 &sic 30



			 0x0800 0 0 1 &sic 30

			 0x0800 0 0 2 &sic 27

			 0x0800 0 0 3 &sic 28

			 0x0800 0 0 4 &sic 29



			 0x0000 0 0 1 &sic 29

			 0x0000 0 0 2 &sic 30

			 0x0000 0 0 3 &sic 27

			 0x0000 0 0 4 &sic 28>;

};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -7277,6 +7277,14 @@ F: include/linux/pci* 
F:	arch/x86/pci/

F:	arch/x86/kernel/quirks.c



PCI DRIVER FOR ARM VERSATILE PLATFORM

M:	Rob Herring <robh@kernel.org>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/versatile.txt

F:	drivers/pci/host/pci-versatile.c



PCI DRIVER FOR APPLIEDMICRO XGENE

M:	Tanmay Inamdar <tinamdar@apm.com>

L:	linux-pci@vger.kernel.org

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,9 @@ config PCI_DOMAINS 
	bool

	depends on PCI



config PCI_DOMAINS_GENERIC

	def_bool PCI_DOMAINS



config PCI_NANOENGINE

	bool "BSE nanoEngine PCI support"

	depends on SA1100_NANOENGINE

arch/arm/boot/dts/versatile-pb.dts

+37 −0
Original line number Diff line number Diff line
@@ -29,6 +29,43 @@ 
			clock-names = "apb_pclk";

		};



		pci-controller@10001000 {

			compatible = "arm,versatile-pci";

			device_type = "pci";

			reg = <0x10001000 0x1000

			       0x41000000 0x10000

			       0x42000000 0x100000>;

			bus-range = <0 0xff>;

			#address-cells = <3>;

			#size-cells = <2>;

			#interrupt-cells = <1>;



			ranges = <0x01000000 0 0x00000000 0x43000000 0 0x00010000   /* downstream I/O */

				  0x02000000 0 0x50000000 0x50000000 0 0x10000000   /* non-prefetchable memory */

				  0x42000000 0 0x60000000 0x60000000 0 0x10000000>; /* prefetchable memory */



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

			interrupt-map = <0x1800 0 0 1 &sic 28

					 0x1800 0 0 2 &sic 29

					 0x1800 0 0 3 &sic 30

					 0x1800 0 0 4 &sic 27



					 0x1000 0 0 1 &sic 27

					 0x1000 0 0 2 &sic 28

					 0x1000 0 0 3 &sic 29

					 0x1000 0 0 4 &sic 30



					 0x0800 0 0 1 &sic 30

					 0x0800 0 0 2 &sic 27

					 0x0800 0 0 3 &sic 28

					 0x0800 0 0 4 &sic 29



					 0x0000 0 0 1 &sic 29

					 0x0000 0 0 2 &sic 30

					 0x0000 0 0 3 &sic 27

					 0x0000 0 0 4 &sic 28>;

		};



		fpga {

			uart@9000 {

				compatible = "arm,pl011", "arm,primecell";

arch/arm/include/asm/mach/pci.h

+0 −6
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ struct pci_bus; 
struct device;



struct hw_pci {

#ifdef CONFIG_PCI_DOMAINS

	int		domain;

#endif

#ifdef CONFIG_PCI_MSI

	struct msi_controller *msi_ctrl;

#endif
@@ -45,9 +42,6 @@ struct hw_pci { 
 * Per-controller structure

 */

struct pci_sys_data {

#ifdef CONFIG_PCI_DOMAINS

	int		domain;

#endif

#ifdef CONFIG_PCI_MSI

	struct msi_controller *msi_ctrl;

#endif