Skip to content
  • Bjorn Helgaas's avatar
    49e427e6
    Merge branch 'pci/host-probe-refactor' · 49e427e6
    Bjorn Helgaas authored
    - Use pci_host_bridge.windows list directly instead of splicing in a
      temporary list for cadence, mvebu, host-common (Rob Herring)
    
    - Use pci_host_probe() instead of open-coding all the pieces for altera,
      brcmstb, iproc, mobiveil, rcar, rockchip, tegra, v3, versatile, xgene,
      xilinx, xilinx-nwl (Rob Herring)
    
    - Convert to devm_platform_ioremap_resource_byname() instead of open-coding
      platform_get_resource_byname() and devm_ioremap_resource() for altera,
      cadence, mediatek, rockchip, tegra, xgene (Dejin Zheng)
    
    - Convert to devm_platform_ioremap_resource() instead of open-coding
      platform_get_resource() and devm_ioremap_resource() for aardvark,
      brcmstb, exynos, ftpci100, versatile (Dejin Zheng)
    
    - Remove redundant error messages from devm_pci_remap_cfg_resource()
      callers (Dejin Zheng)
    
    - Drop useless PCI_ENABLE_PROC_DOMAINS from versatile driver (Rob Herring)
    
    - Default host bridge parent device to the platform device (Rob Herring)
    
    - Drop unnecessary zeroing of host bridge fields (Rob Herring)
    
    - Use pci_is_root_bus() instead of tracking root bus number separately in
      aardvark, designware (imx6, keystone, designware-host), mobiveil,
      xilinx-nwl, xilinx, rockchip, rcar (Rob Herring)
    
    - Set host bridge bus number in pci_scan_root_bus_bridge() instead of each
      driver for aardvark, designware-host, host-common, mediatek, rcar, tegra,
      v3-semi (Rob Herring)
    
    - Use bridge resources instead of parsing DT 'ranges' again for cadence
      (Rob Herring)
    
    - Remove private bus number and range from cadence (Rob Herring)
    
    - Use devm_pci_alloc_host_bridge() to simplify rcar (Rob Herring)
    
    - Use struct pci_host_bridge.windows list directly rather than a temporary
      (Rob Herring)
    
    - Reduce OF "missing non-prefetchable window" from error to warning message
      (Rob Herring)
    
    - Convert rcar-gen2 from old Arm-specific pci_common_init_dev() to new
      arch-independent interfaces (Rob Herring)
    
    - Move DT resource setup into devm_pci_alloc_host_bridge() (Rob Herring)
    
    - Set bridge map_irq and swizzle_irq to default functions; drivers that
      don't support legacy IRQs (iproc) need to undo this (Rob Herring)
    
    * pci/host-probe-refactor:
      PCI: Set bridge map_irq and swizzle_irq to default functions
      PCI: Move DT resource setup into devm_pci_alloc_host_bridge()
      PCI: rcar-gen2: Convert to use modern host bridge probe functions
      PCI: of: Reduce missing non-prefetchable memory region to a warning
      PCI: rcar: Use struct pci_host_bridge.windows list directly
      PCI: rcar: Use devm_pci_alloc_host_bridge()
      PCI: cadence: Remove private bus number and range storage
      PCI: cadence: Use bridge resources for outbound window setup
      PCI: Move setting pci_host_bridge.busnr out of host drivers
      PCI: rcar: Use pci_is_root_bus() to check if bus is root bus
      PCI: rockchip: Use pci_is_root_bus() to check if bus is root bus
      PCI: xilinx: Use pci_is_root_bus() to check if bus is root bus
      PCI: xilinx-nwl: Use pci_is_root_bus() to check if bus is root bus
      PCI: mobiveil: Use pci_is_root_bus() to check if bus is root bus
      PCI: designware: Use pci_is_root_bus() to check if bus is root bus
      PCI: aardvark: Use pci_is_root_bus() to check if bus is root bus
      PCI: Drop unnecessary zeroing of bridge fields
      PCI: Set default bridge parent device
      PCI: versatile: Drop flag PCI_ENABLE_PROC_DOMAINS
      PCI: controller: Remove duplicate error message
      PCI: controller: Convert to devm_platform_ioremap_resource()
      PCI: controller: Convert to devm_platform_ioremap_resource_byname()
      PCI: xilinx: Use pci_host_probe() to register host
      PCI: xilinx-nwl: Use pci_host_probe() to register host
      PCI: rockchip: Use pci_host_probe() to register host
      PCI: rcar: Use pci_host_probe() to register host
      PCI: iproc: Use pci_host_probe() to register host
      PCI: altera: Use pci_host_probe() to register host
      PCI: xgene: Use pci_host_probe() to register host
      PCI: versatile: Use pci_host_probe() to register host
      PCI: v3: Use pci_host_probe() to register host
      PCI: tegra: Use pci_host_probe() to register host
      PCI: mobiveil: Use pci_host_probe() to register host
      PCI: brcmstb: Use pci_host_probe() to register host
      PCI: host-common: Use struct pci_host_bridge.windows list directly
      PCI: mvebu: Use struct pci_host_bridge.windows list directly
      PCI: cadence: Use struct pci_host_bridge.windows list directly
    
    # Conflicts:
    #	drivers/pci/controller/cadence/pcie-cadence-host.c
    49e427e6
    Merge branch 'pci/host-probe-refactor'
    Bjorn Helgaas authored
    - Use pci_host_bridge.windows list directly instead of splicing in a
      temporary list for cadence, mvebu, host-common (Rob Herring)
    
    - Use pci_host_probe() instead of open-coding all the pieces for altera,
      brcmstb, iproc, mobiveil, rcar, rockchip, tegra, v3, versatile, xgene,
      xilinx, xilinx-nwl (Rob Herring)
    
    - Convert to devm_platform_ioremap_resource_byname() instead of open-coding
      platform_get_resource_byname() and devm_ioremap_resource() for altera,
      cadence, mediatek, rockchip, tegra, xgene (Dejin Zheng)
    
    - Convert to devm_platform_ioremap_resource() instead of open-coding
      platform_get_resource() and devm_ioremap_resource() for aardvark,
      brcmstb, exynos, ftpci100, versatile (Dejin Zheng)
    
    - Remove redundant error messages from devm_pci_remap_cfg_resource()
      callers (Dejin Zheng)
    
    - Drop useless PCI_ENABLE_PROC_DOMAINS from versatile driver (Rob Herring)
    
    - Default host bridge parent device to the platform device (Rob Herring)
    
    - Drop unnecessary zeroing of host bridge fields (Rob Herring)
    
    - Use pci_is_root_bus() instead of tracking root bus number separately in
      aardvark, designware (imx6, keystone, designware-host), mobiveil,
      xilinx-nwl, xilinx, rockchip, rcar (Rob Herring)
    
    - Set host bridge bus number in pci_scan_root_bus_bridge() instead of each
      driver for aardvark, designware-host, host-common, mediatek, rcar, tegra,
      v3-semi (Rob Herring)
    
    - Use bridge resources instead of parsing DT 'ranges' again for cadence
      (Rob Herring)
    
    - Remove private bus number and range from cadence (Rob Herring)
    
    - Use devm_pci_alloc_host_bridge() to simplify rcar (Rob Herring)
    
    - Use struct pci_host_bridge.windows list directly rather than a temporary
      (Rob Herring)
    
    - Reduce OF "missing non-prefetchable window" from error to warning message
      (Rob Herring)
    
    - Convert rcar-gen2 from old Arm-specific pci_common_init_dev() to new
      arch-independent interfaces (Rob Herring)
    
    - Move DT resource setup into devm_pci_alloc_host_bridge() (Rob Herring)
    
    - Set bridge map_irq and swizzle_irq to default functions; drivers that
      don't support legacy IRQs (iproc) need to undo this (Rob Herring)
    
    * pci/host-probe-refactor:
      PCI: Set bridge map_irq and swizzle_irq to default functions
      PCI: Move DT resource setup into devm_pci_alloc_host_bridge()
      PCI: rcar-gen2: Convert to use modern host bridge probe functions
      PCI: of: Reduce missing non-prefetchable memory region to a warning
      PCI: rcar: Use struct pci_host_bridge.windows list directly
      PCI: rcar: Use devm_pci_alloc_host_bridge()
      PCI: cadence: Remove private bus number and range storage
      PCI: cadence: Use bridge resources for outbound window setup
      PCI: Move setting pci_host_bridge.busnr out of host drivers
      PCI: rcar: Use pci_is_root_bus() to check if bus is root bus
      PCI: rockchip: Use pci_is_root_bus() to check if bus is root bus
      PCI: xilinx: Use pci_is_root_bus() to check if bus is root bus
      PCI: xilinx-nwl: Use pci_is_root_bus() to check if bus is root bus
      PCI: mobiveil: Use pci_is_root_bus() to check if bus is root bus
      PCI: designware: Use pci_is_root_bus() to check if bus is root bus
      PCI: aardvark: Use pci_is_root_bus() to check if bus is root bus
      PCI: Drop unnecessary zeroing of bridge fields
      PCI: Set default bridge parent device
      PCI: versatile: Drop flag PCI_ENABLE_PROC_DOMAINS
      PCI: controller: Remove duplicate error message
      PCI: controller: Convert to devm_platform_ioremap_resource()
      PCI: controller: Convert to devm_platform_ioremap_resource_byname()
      PCI: xilinx: Use pci_host_probe() to register host
      PCI: xilinx-nwl: Use pci_host_probe() to register host
      PCI: rockchip: Use pci_host_probe() to register host
      PCI: rcar: Use pci_host_probe() to register host
      PCI: iproc: Use pci_host_probe() to register host
      PCI: altera: Use pci_host_probe() to register host
      PCI: xgene: Use pci_host_probe() to register host
      PCI: versatile: Use pci_host_probe() to register host
      PCI: v3: Use pci_host_probe() to register host
      PCI: tegra: Use pci_host_probe() to register host
      PCI: mobiveil: Use pci_host_probe() to register host
      PCI: brcmstb: Use pci_host_probe() to register host
      PCI: host-common: Use struct pci_host_bridge.windows list directly
      PCI: mvebu: Use struct pci_host_bridge.windows list directly
      PCI: cadence: Use struct pci_host_bridge.windows list directly
    
    # Conflicts:
    #	drivers/pci/controller/cadence/pcie-cadence-host.c
Loading