From: Joerg Roedel <jroedel@suse.de>
Date: Tue, 12 Nov 2019 16:11:25 +0000 (+0100)
Subject: Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediate... 
X-Git-Tag: v5.5-rc1~77^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b3a713feef8db41d4bcccb3b97e86ee906690c8;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediatek', 'arm/tegra', 'arm/smmu', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next
---

9b3a713feef8db41d4bcccb3b97e86ee906690c8
diff --cc drivers/iommu/ipmmu-vmsa.c
index 2639fc7181171,9da8309f71708,7ef9c199ab06a,9da8309f71708,9da8309f71708,9da8309f71708,e4da6efbda49c,35f3edaba0e29,9da8309f71708,9da8309f71708,9da8309f71708..d02edd2751f32
--- a/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);
           }
           
           /* -----------------------------------------------------------------------------