Hi Linus,
there is a small merge conflict this time in arch/powerpc/kernel/iommu.c
with the tag I send you. I did a test-merge with your latest tree
locally to include my resolution in this email, but for some reason git
shows me a conflict in another file (drivers/iommu/amd_iommu.c) in the
resulting commit, which didn't show a conflict when I did the merge.
Anyway, the conflict exists because my patches modify code in the
powerpc iommu driver which is already removed in your tree.
With that in mind:
The following changes since commit 7566ec393f4161572ba6f11ad5171fd5d59b0fbd:
Linux 4.20-rc7 (2018-12-16 15:46:55 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
tags/iommu-updates-v4.21
for you to fetch changes up to 03ebe48e235f17d70f34890d34d8153b8a84c02e:
Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'arm/tegra',
'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next (2018-12-20
10:05:20 +0100)
IOMMU Updates for Linux v4.21
Including (in no particular order):
- Page table code for AMD IOMMU now supports large pages where
smaller page-sizes were mapped before. VFIO had to work around
that in the past and I included a patch to remove it (acked by
Alex Williamson)
- Patches to unmodularize a couple of IOMMU drivers that would
never work as modules anyway.
- Work to unify the the iommu-related pointers in
'struct device' into one pointer. This work is not finished
yet, but will probably be in the next cycle.
- NUMA aware allocation in iommu-dma code
- Support for r8a774a1 and r8a774c0 in the Renesas IOMMU driver
- Scalable mode support for the Intel VT-d driver
- PM runtime improvements for the ARM-SMMU driver
- Support for the QCOM-SMMUv2 IOMMU hardware from Qualcom
- Various smaller fixes and improvements
Arvind Yadav (1):
iommu/mediatek: Constify iommu_ops
Fabrizio Castro (4):
iommu/ipmmu-vmsa: Hook up R8A774A1 DT maching code
dt-bindings: iommu: ipmmu-vmsa: Add r8a774a1 support
dt-bindings: iommu: ipmmu-vmsa: Add r8a774c0 support
iommu/ipmmu-vmsa: Hook up r8a774c0 DT matching code
Ganapatrao Kulkarni (1):
iommu/dma: Use NUMA aware memory allocations in __iommu_dma_alloc_pages()
Hai Nguyen Pham (1):
iommu/ipmmu-vmsa: Hook up r8a77990 DT matching code
Joerg Roedel (31):
iommu/amd: Collect page-table pages in freelist
iommu/amd: Introduce free_sub_pt() function
iommu/amd: Ignore page-mode 7 in free_sub_pt()
iommu/amd: Allow downgrading page-sizes in alloc_pte()
iommu/amd: Restart loop if cmpxchg64 succeeded in alloc_pte()
iommu/amd: Allow to upgrade page-size
vfio/type1: Remove map_try_harder() code path
iommu/amd: Use pr_fmt()
iommu/amd: Fix line-break in error log reporting
iommu/amd: Remove leading 0s in error log messages
iommu: Introduce wrappers around dev->iommu_fwspec
ACPI/IORT: Use helper functions to access dev->iommu_fwspec
iommu/arm-smmu: Use helper functions to access dev->iommu_fwspec
iommu/dma: Use helper functions to access dev->iommu_fwspec
iommu/ipmmu-vmsa: Use helper functions to access dev->iommu_fwspec
iommu/mediatek: Use helper functions to access dev->iommu_fwspec
iommu/of: Use helper functions to access dev->iommu_fwspec
iommu/qcom: Use helper functions to access dev->iommu_fwspec
iommu/tegra: Use helper functions to access dev->iommu_fwspec
driver core: Introduce device_iommu_mapped() function
iommu/of: Use device_iommu_mapped()
ACPI/IORT: Use device_iommu_mapped()
powerpc/iommu: Use device_iommu_mapped()
xhci: Use device_iommu_mapped()
dmaengine: sh: rcar-dmac: Use device_iommu_mapped()
iommu/sysfs: Rename iommu_release_device()
iommu: Consolitate ->add/remove_device() calls
iommu/of: Don't call iommu_ops->add_device directly
ACPI/IORT: Don't call iommu_ops->add_device directly
iommu: Check for iommu_ops == NULL in iommu_probe_device()
Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'arm/tegra',
'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next
Lu Baolu (13):
iommu/vtd: Cleanup dma_remapping.h header
iommu/vt-d: Enumerate the scalable mode capability
iommu/vt-d: Manage scalalble mode PASID tables
iommu/vt-d: Move page table helpers into header
iommu/vt-d: Add 256-bit invalidation descriptor support
iommu/vt-d: Reserve a domain id for FL and PT modes
iommu/vt-d: Add second level page table interface
iommu/vt-d: Setup pasid entry for RID2PASID support
iommu/vt-d: Pass pasid table to context mapping
