• Bjorn Helgaas's avatar
    Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-artpec',... · 69a06e49
    Bjorn Helgaas authored
    Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-artpec', 'pci/host-designware', 'pci/host-hv', 'pci/host-keystone', 'pci/host-rcar', 'pci/host-rockchip', 'pci/host-tegra' and 'pci/host-xilinx' into next
    
    * pci/host-aardvark:
      PCI: aardvark: Remove redundant dev_err call in advk_pcie_probe()
    
    * pci/host-altera:
      PCI: altera: Remove redundant platform_get_resource() return value check
      PCI: altera: Move retrain from fixup to altera_pcie_host_init()
      PCI: altera: Rework config accessors for use without a struct pci_bus
      PCI: altera: Poll for link training status after retraining the link
    
    * pci/host-artpec:
      PCI: artpec6: Drop __init from artpec6_add_pcie_port()
    
    * pci/host-designware:
      PCI: designware: Remove redundant platform_get_resource() return value check
      PCI: designware: Exchange viewport of `MEMORYs' and `CFGs/IOs'
      PCI: designware: Keep viewport fixed for IO transaction if num_viewport > 2
      PCI: designware: Check LTSSM training bit before deciding link is up
      PCI: designware: Add iATU Unroll feature
      PCI: designware: Wait for iATU enable
      PCI: designware: Move link wait definitions to .c file
      PCI: designware: Return data directly from dw_pcie_readl_rc()
    
    * pci/host-hv:
      PCI: hv: Handle hv_pci_generic_compl() error case
      PCI: hv: Handle vmbus_sendpacket() failure in hv_compose_msi_msg()
      PCI: hv: Remove the unused 'wrk' in struct hv_pcibus_device
      PCI: hv: Use pci_function_description[0] in struct definitions
      PCI: hv: Use zero-length array in struct pci_packet
      PCI: hv: Use list_move_tail() instead of list_del() + list_add_tail()
    
    * pci/host-keystone:
      PCI: keystone: Propagate request_irq() failure
    
    * pci/host-rcar:
      PCI: rcar: Try increasing PCIe link speed to 5 GT/s at boot
      PCI: rcar: Fix some checkpatch warnings
      PCI: rcar: Add multi-MSI support
      PCI: rcar: Don't disable/unprepare clocks on prepare/enable failure
      PCI: rcar: Consolidate register space lookup and ioremap
    
    * pci/host-rockchip:
      PCI: rockchip: Fix wrong transmitted FTS count
      PCI: rockchip: Improve the deassert sequence of four reset pins
      PCI: rockchip: Increase the Max Credit update interval
      PCI: rockchip: Add Rockchip PCIe controller support
      dt-bindings: PCI: rockchip: Add DT bindings for Rockchip PCIe controller
    
    * pci/host-tegra:
      PCI: tegra: Use of_device_get_match_data()
      PCI: tegra: Remove redundant _data suffix
    
    * pci/host-xilinx:
      microblaze/PCI: Add multidomain support for procfs
      PCI: xilinx: Dispose of MSI virtual IRQ
      PCI: xilinx: Clear correct MSI set bit
      PCI: xilinx: Clear interrupt register for invalid interrupt
      PCI: xilinx: Keep both legacy and MSI interrupt domain references
      PCI: xilinx-nwl: Enable all MSI interrupts using MSI mask
      PCI: xilinx-nwl: Expand error logging
    
    Conflicts:
    	drivers/pci/host/pcie-xilinx.c
    69a06e49
pcie-rcar.c 29.8 KB