• Bjorn Helgaas's avatar
    Merge remote-tracking branch 'lorenzo/pci/dwc' into next · 16093362
    Bjorn Helgaas authored
    * lorenzo/pci/dwc:
      PCI: exynos: Fix a potential init_clk_resources NULL pointer dereference
      PCI: iproc: Fix NULL pointer dereference for BCMA
      PCI: dra7xx: Iterate over INTx status bits
      PCI: dra7xx: Fix legacy INTD IRQ handling
      PCI: qcom: Account for const type of of_device_id.data
      PCI: dwc: artpec6: Fix return value check in artpec6_add_pcie_ep()
      PCI: exynos: Remove deprecated PHY initialization code
      PCI: dwc: artpec6: Add support for the ARTPEC-7 SoC
      bindings: PCI: artpec: Add support for the ARTPEC-7 SoC
      PCI: dwc: artpec6: Deassert the core before waiting for PHY
      PCI: dwc: Make cpu_addr_fixup take struct dw_pcie as argument
      PCI: dwc: artpec6: Add support for endpoint mode
      bindings: PCI: artpec: Add support for endpoint mode
      PCI: dwc: artpec6: Split artpec6_pcie_establish_link() into smaller functions
      PCI: dwc: artpec6: Use BIT and GENMASK macros
      PCI: dwc: artpec6: Remove unused defines
      PCI: dwc: dra7xx: Help compiler to remove unused code
      PCI: dwc: dra7xx: Assign pp->ops in dra7xx_add_pcie_port() rather than in probe
      PCI: dwc: dra7xx: Refactor Kconfig and Makefile handling for host/ep mode
      PCI: designware-ep: Add generic function for raising MSI irq
      PCI: designware-ep: Remove static keyword from dw_pcie_ep_reset_bar()
      PCI: designware-ep: Pre-allocate memory for MSI in dw_pcie_ep_init
      PCI: designware-ep: Read-only registers need DBI_RO_WR_EN to be writable
      PCI: designware-ep: dw_pcie_ep_set_msi() should only set MMC bits
      PCI: dwc: Use the DMA-API to get the MSI address
      pci: dwc: pci-dra7xx: Make shutdown handler static
    
    Includes resolution to conflict between:
    
      4494738d ("PCI: endpoint: Add the function number as argument to EPC ops")
      6f6d7873 ("PCI: designware-ep: Add generic function for raising MSI irq")
    
    The resolution is due to Niklas Cassel <niklas.cassel@axis.com>:
    https://lkml.kernel.org/r/20180201085608.GA22568@axis.com
    16093362
pcie-designware-ep.c 10.1 KB