• Linus Torvalds's avatar
    Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 7550cfab
    Linus Torvalds authored
    Pull more PCI updates from Bjorn Helgaas:
     "Here are some more things I'd like to see in v3.16-rc1:
    
       - DMA alias iterator, part of some work to fix IOMMU issues
       - MVEBU, Tegra, DesignWare changes that I forgot to include before
       - Some whitespace code cleanup
    
      Details:
    
      IOMMU
        - Add DMA alias iterator (Alex Williamson)
        - Add DMA alias quirks for ASMedia, ITE, Tundra bridges (Alex Williamson)
        - Add DMA alias quirks for Marvell, Ricoh devices (Alex Williamson)
        - Add DMA alias quirk for HighPoint devices (Jérôme Carretero)
    
      MSI
        - Fix leak in free_msi_irqs() (Alexei Starovoitov)
    
      Marvell MVEBU
        - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
        - Avoid setting an undefined window size (Jason Gunthorpe)
        - Allow several windows with the same target/attribute (Thomas Petazzoni)
        - Split PCIe BARs into multiple MBus windows when needed (Thomas Petazzoni)
        - Fix off-by-one in the computed size of the mbus windows (Willy Tarreau)
    
      NVIDIA Tegra
        - Use new OF interrupt mapping when possible (Lucas Stach)
    
      Synopsys DesignWare
        - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
        - Use new OF interrupt mapping when possible (Lucas Stach)
        - Split Exynos and i.MX bindings (Lucas Stach)
        - Fix comment for setting number of lanes (Mohit Kumar)
        - Fix iATU programming for cfg1, io and mem viewport (Mohit Kumar)
    
      Miscellaneous
        - EXPORT_SYMBOL cleanup (Ryan Desfosses)
        - Whitespace cleanup (Ryan Desfosses)
        - Merge multi-line quoted strings (Ryan Desfosses)"
    
    * tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)
      PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
      PCI/MSI: Fix memory leak in free_msi_irqs()
      PCI: Merge multi-line quoted strings
      PCI: Whitespace cleanup
      PCI: Move EXPORT_SYMBOL so it immediately follows function/variable
      PCI: Add bridge DMA alias quirk for ITE bridge
      PCI: designware: Split Exynos and i.MX bindings
      PCI: Add bridge DMA alias quirk for ASMedia and Tundra bridges
      PCI: Add support for PCIe-to-PCI bridge DMA alias quirks
      PCI: Add function 1 DMA alias quirk for Marvell devices
      PCI: Add function 0 DMA alias quirk for Ricoh devices
      PCI: Add support for DMA alias quirks
      PCI: Convert pci_dev_flags definitions to bit shifts
      PCI: Add DMA alias iterator
      PCI: mvebu: Use '%pa' for printing 'phys_addr_t' type
      PCI: mvebu: Remove unnecessary use of 'conf_lock' spinlock
      PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
      PCI: designware: Use new OF interrupt mapping when possible
      PCI: designware: Fix iATU programming for cfg1, io and mem viewport
      PCI: designware: Fix comment for setting number of lanes
      ...
    7550cfab
shpchp_ctrl.c 18.3 KB