You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 787314c35f IOMMU Updates for Linux v3.8 ... A few new features this merge-window. The most important one is probably, that dma-debug now warns if a dma-handle is not checked with dma_mapping_error by the device driver. This requires minor changes to some architectures which make use of dma-debug. Most of these changes have the respective Acks by the Arch-Maintainers. Besides that there are updates to the AMD IOMMU driver for refactor the IOMMU-Groups support and to make sure it does not trigger a hardware erratum. The OMAP changes (for which I pulled in a branch from Tony Lindgren's tree) have a conflict in linux-next with the arm-soc tree. The conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is deleted in the arm-soc tree. It is safe to delete the file too so solve the conflict. Similar changes are done in the arm-soc tree in the common clock framework migration. A missing hunk from the patch in the IOMMU tree will be submitted as a seperate patch when the merge-window is closed. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQzbQQAAoJECvwRC2XARrjXCIP/2RxBzbVOiaPOorl+ZWbsZ41 lzWiXsCHJkh4BK4/qGsVeKhiNd9LcbQUlhywnBbhWxym3spzmjGtvU2Hcg8QiO/M R83r9S4e8Z6DnF9Gcats1Ns9BufgpyhLXg3XoXPxtyHOgRS59fvYi6xXOxyX30Dy uhbj+WL6UD0zvOMNztEnM1p6UhX+XlpvzKDTR5+G5xKdVPkcgeiaKSwqz739caTn QE2NpqIh+8Mwuu1nIapk8h07xhUYU5eGMXa38u1LvDwSHsrsCMLC+lXIjtInn7Gw Bv+XcCHgtOaoPQwwk/xd2HVwJQxO9HNb5YX51EIjwP0C5S/3yW9Ji1RgqFb6Ewqq jIkF6ckwUheLWsBGkw5UknI/f7RX3MDiTWkziYLIniYKKewm+ymGfgIqPt2TzLIO tMZZiIssKvy7wOXQ5JjpYJg5Xmrau6opNwdEguC8pWkJT7qsn+3SeLjMt0Lh9IoY +37DOgOLb3O3/vnZJ3i0KMRZBfVeaRj5HaGmlxFCYUZCNQymIPTih9Jtqm+WuVcu YaGQCTtynsQ0JVh8YEekLzSfgd3OODP68fyCg1CQNixEgvUi2hd/toX2/Z1wkkSA JC9bZarcoPkSWqaTAA2HvmaaxvRR+0UbhFPopFTQarVV0MVLZWBxoyuKy/nMrmMd UgTzrDYy74UKdrSTwIXg =pPHZ -----END PGP SIGNATURE----- Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu Pull IOMMU updates from Joerg Roedel: "A few new features this merge-window. The most important one is probably, that dma-debug now warns if a dma-handle is not checked with dma_mapping_error by the device driver. This requires minor changes to some architectures which make use of dma-debug. Most of these changes have the respective Acks by the Arch-Maintainers. Besides that there are updates to the AMD IOMMU driver for refactor the IOMMU-Groups support and to make sure it does not trigger a hardware erratum. The OMAP changes (for which I pulled in a branch from Tony Lindgren's tree) have a conflict in linux-next with the arm-soc tree. The conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is deleted in the arm-soc tree. It is safe to delete the file too so solve the conflict. Similar changes are done in the arm-soc tree in the common clock framework migration. A missing hunk from the patch in the IOMMU tree will be submitted as a seperate patch when the merge-window is closed." * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits) ARM: dma-mapping: support debug_dma_mapping_error ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks iommu/omap: Adapt to runtime pm iommu/omap: Migrate to hwmod framework iommu/omap: Keep mmu enabled when requested iommu/omap: Remove redundant clock handling on ISR iommu/amd: Remove obsolete comment iommu/amd: Don't use 512GB pages iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch iommu/tegra: gart: Move bus_set_iommu after probe for multi arch iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all tile: dma_debug: add debug_dma_mapping_error support sh: dma_debug: add debug_dma_mapping_error support powerpc: dma_debug: add debug_dma_mapping_error support mips: dma_debug: add debug_dma_mapping_error support microblaze: dma-mapping: support debug_dma_mapping_error ia64: dma_debug: add debug_dma_mapping_error support c6x: dma_debug: add debug_dma_mapping_error support ARM64: dma_debug: add debug_dma_mapping_error support intel-iommu: Prevent devices with RMRRs from being placed into SI Domain ...		12 years ago
..
Kconfig	iommu/amd: Check if IOAPIC information is correct	13 years ago
Makefile	ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c	12 years ago
amd_iommu.c	iommu/amd: Remove obsolete comment	12 years ago
amd_iommu_init.c	iommu/amd: Work around wrong IOAPIC device-id in IVRS table	12 years ago
amd_iommu_proto.h	iommu/amd: Add initialization routines for AMD interrupt remapping	13 years ago
amd_iommu_types.h	iommu/amd: Properly account for virtual aliases in IOMMU groups	12 years ago
amd_iommu_v2.c	IOMMU Updates for Linux v3.6-rc1	13 years ago
dmar.c	iommu/dmar: Use pr_format() instead of PREFIX to tidy up pr_*() calls	13 years ago
exynos-iommu.c	iommu/exynos: use list_del_init instead of list_del/INIT_LIST_HEAD	13 years ago
intel-iommu.c	IOMMU Updates for Linux v3.8	12 years ago
intel_irq_remapping.c	irq_remap: disable IRQ remapping if any IOAPIC lacks an IOMMU	13 years ago
iommu.c	Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next	13 years ago
iova.c	iommu: Fix typo in iommu	13 years ago
irq_remapping.c	iommu/irq: Use amd_iommu_irq_ops if supported	13 years ago
irq_remapping.h	iommu/amd: Add initialization routines for AMD interrupt remapping	13 years ago
msm_iommu.c	iommu/msm: Implement DOMAIN_ATTR_GEOMETRY attribute	13 years ago
msm_iommu_dev.c	…
of_iommu.c	iommu: Add DMA window parser, of_get_dma_window()	13 years ago
omap-iommu-debug.c	ARM: OMAP2+: Move iommu/iovmm headers to platform_data	12 years ago
omap-iommu.c	iommu/omap: Adapt to runtime pm	12 years ago
omap-iommu.h	iommu/omap: Adapt to runtime pm	12 years ago
omap-iommu2.c	iommu/omap: Adapt to runtime pm	12 years ago
omap-iopgtable.h	ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c	12 years ago
omap-iovmm.c	ARM: OMAP2+: Move iommu/iovmm headers to platform_data	12 years ago
tegra-gart.c	iommu/tegra: gart: Move bus_set_iommu after probe for multi arch	12 years ago
tegra-smmu.c	IOMMU Updates for Linux v3.8	12 years ago