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

Commit 2f466d33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI changes from Bjorn Helgaas:
 "Resource management
    - Fix host bridge window coalescing (Alexey Neyman)
    - Pass type, width, and prefetchability for window alignment (Wei Yang)

  PCI device hotplug
    - Convert acpiphp, acpiphp_ibm to dynamic debug (Lan Tianyu)

  Power management
    - Remove pci_pm_complete() (Liu Chuansheng)

  MSI
    - Fail initialization if device is not in PCI_D0 (Yijing Wang)

  MPS (Max Payload Size)
    - Use pcie_get_mps() and pcie_set_mps() to simplify code (Yijing Wang)
    - Use pcie_set_readrq() to simplify code (Yijing Wang)
    - Use cached pci_dev->pcie_mpss to simplify code (Yijing Wang)

  SR-IOV
    - Enable upstream bridges even for VFs on virtual buses (Bjorn Helgaas)
    - Use pci_is_root_bus() to avoid catching virtual buses (Wei Yang)

  Virtualization
    - Add x86 MSI masking ops (Konrad Rzeszutek Wilk)

  Freescale i.MX6
    - Support i.MX6 PCIe controller (Sean Cross)
    - Increase link startup timeout (Marek Vasut)
    - Probe PCIe in fs_initcall() (Marek Vasut)
    - Fix imprecise abort handler (Tim Harvey)
    - Remove redundant of_match_ptr (Sachin Kamat)

  Renesas R-Car
    - Support Gen2 internal PCIe controller (Valentine Barshak)

  Samsung Exynos
    - Add MSI support (Jingoo Han)
    - Turn off power when link fails (Jingoo Han)
    - Add Jingoo Han as maintainer (Jingoo Han)
    - Add clk_disable_unprepare() on error path (Wei Yongjun)
    - Remove redundant of_match_ptr (Sachin Kamat)

  Synopsys DesignWare
    - Add irq_create_mapping() (Pratyush Anand)
    - Add header guards (Seungwon Jeon)

  Miscellaneous
    - Enable native PCIe services by default on non-ACPI (Andrew Murray)
    - Cleanup _OSC usage and messages (Bjorn Helgaas)
    - Remove pcibios_last_bus boot option on non-x86 (Bjorn Helgaas)
    - Convert bus code to use bus_, drv_, and dev_groups (Greg Kroah-Hartman)
    - Remove unused pci_mem_start (Myron Stowe)
    - Make sysfs functions static (Sachin Kamat)
    - Warn on invalid return from driver probe (Stephen M. Cameron)
    - Remove Intel Haswell D3 delays (Todd E Brandt)
    - Call pci_set_master() in core if driver doesn't do it (Yinghai Lu)
    - Use pci_is_pcie() to simplify code (Yijing Wang)
    - Use PCIe capability accessors to simplify code (Yijing Wang)
    - Use cached pci_dev->pcie_cap to simplify code (Yijing Wang)
    - Removed unused "is_pcie" from struct pci_dev (Yijing Wang)
    - Simplify sysfs CPU affinity implementation (Yijing Wang)"

* tag 'pci-v3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (79 commits)
  PCI: Enable upstream bridges even for VFs on virtual buses
  PCI: Add pci_upstream_bridge()
  PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()
  PCI: Warn on driver probe return value greater than zero
  PCI: Drop warning about drivers that don't use pci_set_master()
  PCI: Workaround missing pci_set_master in pci drivers
  powerpc/pci: Use pci_is_pcie() to simplify code [fix]
  PCI: Update pcie_ports 'auto' behavior for non-ACPI platforms
  PCI: imx6: Probe the PCIe in fs_initcall()
  PCI: Add R-Car Gen2 internal PCI support
  PCI: imx6: Remove redundant of_match_ptr
  PCI: Report pci_pme_active() kmalloc failure
  mn10300/PCI: Remove useless pcibios_last_bus
  frv/PCI: Remove pcibios_last_bus
  PCI: imx6: Increase link startup timeout
  PCI: exynos: Remove redundant of_match_ptr
  PCI: imx6: Fix imprecise abort handler
  PCI: Fail MSI/MSI-X initialization if device is not in PCI_D0
  PCI: imx6: Remove redundant dev_err() in imx6_pcie_probe()
  x86/PCI: Coalesce multiple overlapping host bridge windows
  ...
parents f9300eaa eaaeb1cb

Documentation/PCI/pci.txt

+5 −3
Original line number Diff line number Diff line
@@ -525,8 +525,9 @@ corresponding register block for you. 
6. Other interesting functions

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



pci_find_slot()			Find pci_dev corresponding to given bus and

				slot numbers.

pci_get_domain_bus_and_slot()	Find pci_dev corresponding to given domain,

				bus and slot and number. If the device is

				found, its reference count is increased.

pci_set_power_state()		Set PCI Power Management state (0=D0 ... 3=D3)

pci_find_capability()		Find specified capability in device's capability

				list.
@@ -582,7 +583,8 @@ having sane locking. 


pci_find_device()	Superseded by pci_get_device()

pci_find_subsys()	Superseded by pci_get_subsys()

pci_find_slot()		Superseded by pci_get_slot()

pci_find_slot()		Superseded by pci_get_domain_bus_and_slot()

pci_get_slot()		Superseded by pci_get_domain_bus_and_slot()





The alternative is the traditional PCI device driver that walks PCI

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

+6 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
Required properties:

- compatible: should contain "snps,dw-pcie" to identify the

	core, plus an identifier for the specific instance, such

	as "samsung,exynos5440-pcie".

	as "samsung,exynos5440-pcie" or "fsl,imx6q-pcie".

- reg: base addresses and lengths of the pcie controller,

	the phy controller, additional register for the phy controller.

- interrupts: interrupt values for level interrupt,
@@ -21,6 +21,11 @@ Required properties: 
- num-lanes: number of lanes to use

- reset-gpio: gpio pin number of power good signal



Optional properties for fsl,imx6q-pcie

- power-on-gpio: gpio pin number of power-enable signal

- wake-up-gpio: gpio pin number of incoming wakeup signal

- disable-gpio: gpio pin number of outgoing rfkill/endpoint disable signal



Example:



SoC specific DT Entry:

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -6427,6 +6427,7 @@ S: Supported 
F:	Documentation/PCI/

F:	drivers/pci/

F:	include/linux/pci*

F:	arch/x86/pci/



PCI DRIVER FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@gmail.com>
@@ -6435,6 +6436,12 @@ S: Supported 
F:	Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt

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



PCI DRIVER FOR SAMSUNG EXYNOS

M:	Jingoo Han <jg1.han@samsung.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

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



PCMCIA SUBSYSTEM

P:	Linux PCMCIA Team

L:	linux-pcmcia@lists.infradead.org

arch/cris/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 


#define pcibios_assign_all_busses(void) 1



extern unsigned long pci_mem_start;

#define PCIBIOS_MIN_IO		0x1000

#define PCIBIOS_MIN_MEM		0x10000000

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

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ void pcibios_resource_survey(void); 


/* pci-vdk.c */



extern int __nongpreldata pcibios_last_bus;

extern struct pci_ops *__nongpreldata pci_root_ops;



/* pci-irq.c */