Merge branch 'core-iommu-for-linus' of...
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits) x86, Calgary IOMMU quirk: Find nearest matching Calgary while walking up the PCI tree x86/amd-iommu: Remove amd_iommu_pd_table x86/amd-iommu: Move reset_iommu_command_buffer out of locked code x86/amd-iommu: Cleanup DTE flushing code x86/amd-iommu: Introduce iommu_flush_device() function x86/amd-iommu: Cleanup attach/detach_device code x86/amd-iommu: Keep devices per domain in a list x86/amd-iommu: Add device bind reference counting x86/amd-iommu: Use dev->arch->iommu to store iommu related information x86/amd-iommu: Remove support for domain sharing x86/amd-iommu: Rearrange dma_ops related functions x86/amd-iommu: Move some pte allocation functions in the right section x86/amd-iommu: Remove iommu parameter from dma_ops_domain_alloc x86/amd-iommu: Use get_device_id and check_device where appropriate x86/amd-iommu: Move find_protection_domain to helper functions x86/amd-iommu: Simplify get_device_resources() x86/amd-iommu: Let domain_for_device handle aliases x86/amd-iommu: Remove iommu specific handling from dma_ops path x86/amd-iommu: Remove iommu parameter from __(un)map_single x86/amd-iommu: Make alloc_new_range aware of multiple IOMMUs ...
Showing
- arch/ia64/include/asm/swiotlb.h 0 additions, 2 deletionsarch/ia64/include/asm/swiotlb.h
- arch/ia64/kernel/pci-swiotlb.c 2 additions, 2 deletionsarch/ia64/kernel/pci-swiotlb.c
- arch/powerpc/kernel/setup_32.c 1 addition, 1 deletionarch/powerpc/kernel/setup_32.c
- arch/powerpc/kernel/setup_64.c 1 addition, 1 deletionarch/powerpc/kernel/setup_64.c
- arch/x86/include/asm/amd_iommu.h 5 additions, 11 deletionsarch/x86/include/asm/amd_iommu.h
- arch/x86/include/asm/amd_iommu_proto.h 38 additions, 0 deletionsarch/x86/include/asm/amd_iommu_proto.h
- arch/x86/include/asm/amd_iommu_types.h 42 additions, 12 deletionsarch/x86/include/asm/amd_iommu_types.h
- arch/x86/include/asm/calgary.h 0 additions, 2 deletionsarch/x86/include/asm/calgary.h
- arch/x86/include/asm/device.h 1 addition, 1 deletionarch/x86/include/asm/device.h
- arch/x86/include/asm/dma-mapping.h 3 additions, 2 deletionsarch/x86/include/asm/dma-mapping.h
- arch/x86/include/asm/gart.h 1 addition, 8 deletionsarch/x86/include/asm/gart.h
- arch/x86/include/asm/iommu.h 0 additions, 2 deletionsarch/x86/include/asm/iommu.h
- arch/x86/include/asm/swiotlb.h 3 additions, 6 deletionsarch/x86/include/asm/swiotlb.h
- arch/x86/include/asm/x86_init.h 10 additions, 0 deletionsarch/x86/include/asm/x86_init.h
- arch/x86/kernel/amd_iommu.c 669 additions, 578 deletionsarch/x86/kernel/amd_iommu.c
- arch/x86/kernel/amd_iommu_init.c 37 additions, 57 deletionsarch/x86/kernel/amd_iommu_init.c
- arch/x86/kernel/aperture_64.c 3 additions, 1 deletionarch/x86/kernel/aperture_64.c
- arch/x86/kernel/crash.c 2 additions, 3 deletionsarch/x86/kernel/crash.c
- arch/x86/kernel/pci-calgary_64.c 40 additions, 54 deletionsarch/x86/kernel/pci-calgary_64.c
- arch/x86/kernel/pci-dma.c 13 additions, 26 deletionsarch/x86/kernel/pci-dma.c
Loading
Please register or sign in to comment