Skip to contentSkip to conversation

IOMMU Updates for v3.12

GIT PULL Joerg Roedel 1 participant 1 message Sep 12, 2013

lore
Share & tools
lore
#0 lore raw

Hi Linus,

The following changes since commit 6e4664525b1db28f8c4e1130957f70a94c19213e:

Linux 3.11 (2013-09-02 13:46:10 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git tags/iommu-updates-v3.12

for you to fetch changes up to d6a60fc1a8187004792a01643d8af1d06a465026:

Merge branches 'arm/exynos', 'ppc/pamu', 'arm/smmu', 'x86/amd' and 'iommu/fixes' into next (2013-09-12 16:46:34 +0200)

----------------------------------------------------------------

IOMMU Updates for Linux v3.12

This round the updates contain:

* A new driver for the Freescale PAMU IOMMU from Varun Sethi. This driver has cooked for a while and required changes to the IOMMU-API and infrastructure that were already merged before.
* Updates for the ARM-SMMU driver from Will Deacon
* Various fixes, the most important one is probably a fix from Alex Williamson for a memory leak in the VT-d page-table freeing code

In summary not all that much. The biggest part in the diffstat is the new PAMU driver.

----------------------------------------------------------------
Alex Williamson (1):
intel-iommu: Fix leaks in pagetable freeing

Grant Grundler (1):
iommu/exynos: Remove dead code (set_prefbuf)

Joerg Roedel (3):
iommu/fsl: Fix whitespace problems noticed by git-am
iommu/fsl: Remove unnecessary 'fsl-pamu' prefixes
Merge branches 'arm/exynos', 'ppc/pamu', 'arm/smmu', 'x86/amd' and 'iommu/fixes' into next

Radmila Kompová (1):
iommu/amd: Fix resource leak in iommu_init_device()

Varun Sethi (3):
powerpc: Add iommu domain pointer to device archdata iommu/fsl: Add additional iommu attributes required by the PAMU driver. iommu/fsl: Freescale PAMU driver and iommu implementation.

Will Deacon (4):
iommu/arm-smmu: Remove broken big-endian check iommu/arm-smmu: Tighten up global fault reporting iommu/arm-smmu: Don't use VMIDs for stage-1 translations iommu/arm-smmu: Simplify VMID and ASID allocation

Yijing Wang (1):
iommu/amd: Clean up unnecessary MSI/MSI-X capability find

 arch/powerpc/include/asm/device.h         |    3 +
 arch/powerpc/include/asm/fsl_pamu_stash.h |   39 +
 arch/powerpc/sysdev/fsl_pci.h             |    5 +
 drivers/iommu/Kconfig                     |   10 +
 drivers/iommu/Makefile                    |    1 +
 drivers/iommu/amd_iommu.c                 |    4 +-
 drivers/iommu/amd_iommu_init.c            |    2 +-
 drivers/iommu/arm-smmu.c                  |   93 +-
 drivers/iommu/exynos-iommu.c              |   44 -
 drivers/iommu/fsl_pamu.c                  | 1309 +++++++++++++++++++++++++++++
 drivers/iommu/fsl_pamu.h                  |  410 +++++++++
 drivers/iommu/fsl_pamu_domain.c           | 1172 ++++++++++++++++++++++++++
 drivers/iommu/fsl_pamu_domain.h           |   85 ++
 drivers/iommu/intel-iommu.c               |   72 +-
 include/linux/iommu.h                     |   16 +
 15 files changed, 3145 insertions(+), 120 deletions(-)
 create mode 100644 arch/powerpc/include/asm/fsl_pamu_stash.h
 create mode 100644 drivers/iommu/fsl_pamu.c
 create mode 100644 drivers/iommu/fsl_pamu.h
 create mode 100644 drivers/iommu/fsl_pamu_domain.c
 create mode 100644 drivers/iommu/fsl_pamu_domain.h

Please pull.

Thanks,

Joerg