Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediate...

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/Makefile
Simple merge

diff --cc drivers/iommu/amd_iommu.c
Simple merge

diff --cc drivers/iommu/amd_iommu_types.h
Simple merge

diff --cc drivers/iommu/arm-smmu-v3.c
Simple merge

diff --cc drivers/iommu/arm-smmu.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/iommu/iommu.c
Simple merge

diff --cc drivers/iommu/ipmmu-vmsa.c
index 2639fc7,9da8309,7ef9c19,9da8309,9da8309,9da8309,e4da6ef,35f3eda,9da8309,9da8309,9da8309..d02edd2
--- 1/drivers/iommu/ipmmu-vmsa.c
--- 2/drivers/iommu/ipmmu-vmsa.c
--- 3/drivers/iommu/ipmmu-vmsa.c
--- 4/drivers/iommu/ipmmu-vmsa.c
--- 5/drivers/iommu/ipmmu-vmsa.c
--- 6/drivers/iommu/ipmmu-vmsa.c
--- 7/drivers/iommu/ipmmu-vmsa.c
--- 8/drivers/iommu/ipmmu-vmsa.c
--- 9/drivers/iommu/ipmmu-vmsa.c
--- 10/drivers/iommu/ipmmu-vmsa.c
--- 11/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@@@@@@@@@@@ -282,11 -282,11 -226,26 -282,11 -282,11 -282,11 -282,11 -282,11 -282,11 -282,11 -282,11 +226,26 @@@@@@@@@@@@ static void ipmmu_ctx_write_all(struct 
                                        unsigned int reg, u32 data)
           {
                if (domain->mmu != domain->mmu->root)
-- --------             ipmmu_write(domain->mmu,
-- --------                         domain->context_id * IM_CTX_SIZE + reg, data);
++ ++++++++             ipmmu_ctx_write(domain->mmu, domain->context_id, reg, data);
 + ++++++++
-               ipmmu_write(domain->mmu->root,
-                           domain->context_id * IM_CTX_SIZE + reg, data);
++ ++++++++     ipmmu_ctx_write(domain->mmu->root, domain->context_id, reg, data);
++ ++++++++}
++ ++++++++
++ ++++++++static u32 ipmmu_utlb_reg(struct ipmmu_vmsa_device *mmu, unsigned int reg)
++ ++++++++{
++ ++++++++     return mmu->features->utlb_offset_base + reg;
++ ++++++++}
++ ++++++++
++ ++++++++static void ipmmu_imuasid_write(struct ipmmu_vmsa_device *mmu,
++ ++++++++                             unsigned int utlb, u32 data)
++ ++++++++{
++ ++++++++     ipmmu_write(mmu, ipmmu_utlb_reg(mmu, IMUASID(utlb)), data);
++ ++++++++}
+          
 - --------     ipmmu_write(domain->mmu->root,
 - --------                 domain->context_id * IM_CTX_SIZE + reg, data);
++ ++++++++static void ipmmu_imuctr_write(struct ipmmu_vmsa_device *mmu,
++ ++++++++                            unsigned int utlb, u32 data)
++ ++++++++{
++ ++++++++     ipmmu_write(mmu, ipmmu_utlb_reg(mmu, IMUCTR(utlb)), data);
           }
           
           /* -----------------------------------------------------------------------------

diff --cc drivers/iommu/mtk_iommu.c
Simple merge

diff --cc drivers/iommu/qcom_iommu.c
Simple merge

diff --cc drivers/iommu/rockchip-iommu.c
Simple merge

diff --cc drivers/iommu/tegra-smmu.c
Simple merge

diff --cc drivers/iommu/virtio-iommu.c
Simple merge

diff --cc include/linux/iommu.h
Simple merge