[git pull] IOMMU updates for Linux 3.4
From: Joerg Roedel
Date: Thu Mar 22 2012 - 15:23:39 EST
Hi Linus,
The following changes since commit c16fa4f2ad19908a47c63d8fa436a1178438c7e7:
Linux 3.3 (2012-03-18 16:15:34 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git next
or as a signed tag at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-updates-v3.4
Gerard Snitselaar (1):
iommu/amd: Fix section mismatch
Hiroshi DOYU (2):
ARM: IOMMU: Tegra20: Add iommu_ops for GART driver
ARM: IOMMU: Tegra30: Add iommu_ops for SMMU driver
Joerg Roedel (7):
iommu/amd: Split amd_iommu_init function
iommu/amd: Fix double free of mem-region in error-path
iommu/amd: Update git-tree in MAINTAINERS
iommu/amd: Don't initialize IOMMUv2 resources when not required
iommu/amd: Make sure IOMMU interrupts are re-enabled on resume
iommu/amd: Move interrupt setup code into seperate function
Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next
Lucas Stach (1):
iommu/tegra-gart: fix spin_unlock in map failure path
Steffen Persvold (1):
iommu/amd: Fix section warning for prealloc_protection_domains
MAINTAINERS | 2 +-
arch/arm/mach-tegra/include/mach/smmu.h | 63 ++
drivers/iommu/Kconfig | 20 +
drivers/iommu/Makefile | 2 +
drivers/iommu/amd_iommu.c | 2 +-
drivers/iommu/amd_iommu_init.c | 187 ++++--
drivers/iommu/amd_iommu_v2.c | 14 +-
drivers/iommu/tegra-gart.c | 451 ++++++++++++++
drivers/iommu/tegra-smmu.c | 1034 +++++++++++++++++++++++++++++++
include/linux/amd-iommu.h | 2 +-
10 files changed, 1709 insertions(+), 68 deletions(-)
create mode 100644 arch/arm/mach-tegra/include/mach/smmu.h
create mode 100644 drivers/iommu/tegra-gart.c
create mode 100644 drivers/iommu/tegra-smmu.c
The IOMMU updates for this round are not very large patch-wise. But
they contain two new IOMMU drivers for the ARM Tegra 2 and 3 platforms.
Besides that there are also a few patches for the AMD IOMMU which
prepare the driver for adding intr-remapping support and a couple of
fixes.
The top-commit of the next branch on my local machine is
7de473066f1512e52ea806e3c9698e5ea325b26c
Please pull.
Thanks,
Joerg
Attachment:
signature.asc
Description: Digital signature