Hi Linus,
there is a conflict this time when merging the IOMMU tree updates. It is
in drivers/iommu/intel/iommu.c and comes from the fact that the tip-tree
patched functions in that file which get removed with these updates. So
the merge resolution is to use the changes from the IOMMU tree. With
that in mind, here are the IOMMU changes for v5.18:
The following changes since commit ffb217a13a2eaf6d5bd974fc83036a53ca69f1e2:
Linux 5.17-rc7 (2022-03-06 14:28:31 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
tags/iommu-updates-v5.18
for you to fetch changes up to e17c6debd4b2d2d474074f83946f8c6522587566:
Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip',
'arm/smmu', 'x86/vt-d' and 'x86/amd' into next (2022-03-08 12:21:31 +0100)
IOMMU Updates for Linux v5.18
Including:
- IOMMU Core changes:
- Removal of aux domain related code as it is basically dead
and will be replaced by iommu-fd framework
- Split of iommu_ops to carry domain-specific call-backs
separatly
- Cleanup to remove useless ops->capable implementations
- Improve 32-bit free space estimate in iova allocator
- Intel VT-d updates:
- Various cleanups of the driver
- Support for ATS of SoC-integrated devices listed in
ACPI/SATC table
- ARM SMMU updates:
- Fix SMMUv3 soft lockup during continuous stream of events
- Fix error path for Qualcomm SMMU probe()
- Rework SMMU IRQ setup to prepare the ground for PMU support
- Minor cleanups and refactoring
- AMD IOMMU driver:
- Some minor cleanups and error-handling fixes
- Rockchip IOMMU driver:
- Use standard driver registration
- MSM IOMMU driver:
- Minor cleanup and change to standard driver registration
- Mediatek IOMMU driver:
- Fixes for IOTLB flushing logic
Andy Shevchenko (2):
perf/smmuv3: Don't cast parameter in bit operations
iommu/vt-d: Move intel_iommu_ops to header file
Christophe JAILLET (2):
iommu/arm-smmu-v3: Avoid open coded arithmetic in memory allocation
iommu/arm-smmu-v3: Simplify memory allocation
David Heidelberg (1):
iommu/msm: Simplify with dev_err_probe()
Jiasheng Jiang (1):
iommu/ipmmu-vmsa: Check for error num after setting mask
Joerg Roedel (3):
Merge branch 'core' into x86/vt-d
Merge tag 'arm-smmu-updates' of
git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip',
'arm/smmu', 'x86/vt-d' and 'x86/amd' into next
John Garry (1):
iommu/iova: Separate out rcache init
Lu Baolu (17):
iommu/vt-d: Remove guest pasid related callbacks
iommu: Remove guest pasid related interfaces and definitions
iommu/vt-d: Remove aux-domain related callbacks
iommu: Remove aux-domain related interfaces and iommu_ops
iommu: Remove apply_resv_region
drm/nouveau/device: Get right pgsize_bitmap of iommu_domain
iommu: Use right way to retrieve iommu_ops
iommu: Remove unused argument in is_attach_deferred
iommu: Split struct iommu_ops
iommu/vt-d: Remove intel_iommu::domains
iommu/vt-d: Remove finding domain in dmar_insert_one_dev_info()
iommu/vt-d: Remove iova_cache_get/put()
iommu/vt-d: Remove domain and devinfo mempool
iommu/vt-d: Remove DEFER_DEVICE_DOMAIN_INFO
iommu/vt-d: Remove unnecessary includes
iommu/vt-d: Remove unnecessary prototypes
iommu/vt-d: Fix indentation of goto labels
Marco Bonelli (1):
iommu/vt-d: Add missing "__init" for rmrr_sanity_check()
Miaoqian Lin (1):
iommu/arm-smmu: Add missing pm_runtime_disable() in
qcom_iommu_device_probe
Rafael J. Wysocki (1):
iommu/vtd: Replace acpi_bus_get_device()
Robin Murphy (5):
iommu: Remove trivial ops->capable implementations
iommu/rockchip: : Use standard driver registration
iommu/msm: Use standard driver registration
iommu/iova: Improve 32-bit free space estimate
iommu/arm-smmu: Account for PMU interrupts
Sebastian Reichel (1):
iommu/mediatek: Always check runtime PM status in tlb flush range callback
Suravee Suthikulpanit (2):
iommu/amd: Improve error handling for amd_iommu_init_pci
iommu/amd: Improve amd_iommu_v2_exit()
Vasant Hegde (3):
iommu/amd: Call memunmap in error path
iommu/amd: Clean up function declarations
iommu/amd: Remove unused struct fault.devid
Yian Chen (1):
iommu/vt-d: Enable ATS for the devices in SATC table
Yong Wu (4):
iommu/mediatek: Remove for_each_m4u in tlb_sync_all
iommu/mediatek: Remove the power status ch
