Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI changes from Bjorn Helgaas: "Host bridge hotplug: - Add MMCONFIG support for hot-added host bridges (Jiang Liu) Device hotplug: - Move fixups from __init to __devinit (Sebastian Andrzej Siewior) - Call FINAL fixups for hot-added devices, too (Myron Stowe) - Factor out generic code for P2P bridge hot-add (Yinghai Lu) - Remove all functions in a slot, not just those with _EJx (Amos Kong) Dynamic resource management: - Track bus number allocation (struct resource tree per domain) (Yinghai Lu) - Make P2P bridge 1K I/O windows work with resource reassignment (Bjorn Helgaas, Yinghai Lu) - Disable decoding while updating 64-bit BARs (Bjorn Helgaas) Power management: - Add PCIe runtime D3cold support (Huang Ying) Virtualization: - Add VFIO infrastructure (ACS, DMA source ID quirks) (Alex Williamson) - Add quirks for devices with broken INTx masking (Jan Kiszka) Miscellaneous: - Fix some PCI Express capability version issues (Myron Stowe) - Factor out some arch code with a weak, generic, pcibios_setup() (Myron Stowe)" * tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (122 commits) PCI: hotplug: ensure a consistent return value in error case PCI: fix undefined reference to 'pci_fixup_final_inited' PCI: build resource code for M68K architecture PCI: pciehp: remove unused pciehp_get_max_lnk_width(), pciehp_get_cur_lnk_width() PCI: reorder __pci_assign_resource() (no change) PCI: fix truncation of resource size to 32 bits PCI: acpiphp: merge acpiphp_debug and debug PCI: acpiphp: remove unused res_lock sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases() PCI: call final fixups hot-added devices PCI: move final fixups from __init to __devinit x86/PCI: move final fixups from __init to __devinit MIPS/PCI: move final fixups from __init to __devinit PCI: support sizing P2P bridge I/O windows with 1K granularity PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2) PCI: disable MEM decoding while updating 64-bit MEM BARs PCI: leave MEM and IO decoding disabled during 64-bit BAR sizing, too PCI: never discard enable/suspend/resume_early/resume fixups PCI: release temporary reference in __nv_msi_ht_cap_quirk() PCI: restructure 'pci_do_fixups()' ...
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- arch/alpha/kernel/pci.c 4 additions, 13 deletionsarch/alpha/kernel/pci.c
- arch/arm/kernel/bios32.c 2 additions, 2 deletionsarch/arm/kernel/bios32.c
- arch/cris/arch-v32/drivers/pci/bios.c 0 additions, 5 deletionsarch/cris/arch-v32/drivers/pci/bios.c
- arch/frv/mb93090-mb00/pci-vdk.c 2 additions, 2 deletionsarch/frv/mb93090-mb00/pci-vdk.c
- arch/ia64/pci/pci.c 3 additions, 10 deletionsarch/ia64/pci/pci.c
- arch/microblaze/pci/pci-common.c 2 additions, 7 deletionsarch/microblaze/pci/pci-common.c
- arch/mips/pci/pci.c 3 additions, 3 deletionsarch/mips/pci/pci.c
- arch/mips/pmc-sierra/yosemite/ht.c 0 additions, 11 deletionsarch/mips/pmc-sierra/yosemite/ht.c
- arch/mips/txx9/generic/pci.c 3 additions, 3 deletionsarch/mips/txx9/generic/pci.c
- arch/parisc/kernel/pci.c 0 additions, 5 deletionsarch/parisc/kernel/pci.c
- arch/powerpc/include/asm/pci-bridge.h 1 addition, 0 deletionsarch/powerpc/include/asm/pci-bridge.h
- arch/powerpc/kernel/pci-common.c 11 additions, 10 deletionsarch/powerpc/kernel/pci-common.c
- arch/powerpc/kernel/pci_64.c 1 addition, 1 deletionarch/powerpc/kernel/pci_64.c
- arch/powerpc/kernel/pci_of_scan.c 1 addition, 1 deletionarch/powerpc/kernel/pci_of_scan.c
- arch/powerpc/platforms/85xx/tqm85xx.c 1 addition, 1 deletionarch/powerpc/platforms/85xx/tqm85xx.c
- arch/powerpc/platforms/86xx/gef_ppc9a.c 1 addition, 1 deletionarch/powerpc/platforms/86xx/gef_ppc9a.c
- arch/powerpc/platforms/86xx/gef_sbc310.c 1 addition, 1 deletionarch/powerpc/platforms/86xx/gef_sbc310.c
- arch/powerpc/platforms/86xx/gef_sbc610.c 1 addition, 1 deletionarch/powerpc/platforms/86xx/gef_sbc610.c
- arch/powerpc/platforms/powernv/pci-ioda.c 4 additions, 4 deletionsarch/powerpc/platforms/powernv/pci-ioda.c
Loading
Please register or sign in to comment