summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPatrick Daly <pdaly@codeaurora.org>2016-02-22 11:53:19 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:15:46 -0700
commit38db8e6ce112f5aecb06f434c26a1c780d2ea4e6 (patch)
tree2ec8164de99e7d661e85e82632474e156b203e0f /drivers
parent9105c08c2d9e51410b0ba2d1785c7d7c30dc1c22 (diff)
iommu/arm-smmu: Add iommu_dev for dynamic attach case
A new struct element was added during the kernel 4.4 upgrade. Ensure that it is set during dynamic attach. Change-Id: I0150aebe4a67728945890be2b547a6cbb9bd5306 Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/arm-smmu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 6c962c603333..21732857bac0 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1871,6 +1871,7 @@ static int arm_smmu_attach_dynamic(struct iommu_domain *domain,
.ias = smmu->va_size,
.oas = smmu->ipa_size,
.tlb = &arm_smmu_gather_ops,
+ .iommu_dev = smmu->dev,
};
fmt = IS_ENABLED(CONFIG_64BIT) ? ARM_64_LPAE_S1 : ARM_32_LPAE_S1;