diff options
author | Utkarsh Saxena <usaxena@codeaurora.org> | 2016-11-10 16:33:13 +0530 |
---|---|---|
committer | Utkarsh Saxena <usaxena@codeaurora.org> | 2016-11-10 16:33:13 +0530 |
commit | e2fe16ac45b651c2ed29acc843362310730c0388 (patch) | |
tree | a662ca3363a62859fe4698c2eec936e97434cfe3 | |
parent | e95375540c79e0d0b48953141559fec4b6bcbf96 (diff) |
msm: ipa: Address overlap fix
No need to assert and return fault on
address overlap with respect to SMMU
enabled case.
Address overlap does not cause any
functional failure.
Change-Id: I5b0faa6e021f2463635e13625072e159ba558907
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
-rw-r--r-- | drivers/platform/msm/ipa/ipa_v2/ipa.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa.c b/drivers/platform/msm/ipa/ipa_v2/ipa.c index 804c89dc9533..73add50cf224 100644 --- a/drivers/platform/msm/ipa/ipa_v2/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v2/ipa.c @@ -4907,20 +4907,16 @@ int ipa_iommu_map(struct iommu_domain *domain, IPADBG("domain =0x%p iova 0x%lx\n", domain, iova); IPADBG("paddr =0x%pa size 0x%x\n", &paddr, (u32)size); - /* make sure no overlapping */ + /* Checking the address overlapping */ if (domain == ipa2_get_smmu_domain()) { if (iova >= ap_cb->va_start && iova < ap_cb->va_end) { IPAERR("iommu AP overlap addr 0x%lx\n", iova); - ipa_assert(); - return -EFAULT; } } else if (domain == ipa2_get_wlan_smmu_domain()) { /* wlan is one time map */ } else if (domain == ipa2_get_uc_smmu_domain()) { if (iova >= uc_cb->va_start && iova < uc_cb->va_end) { IPAERR("iommu uC overlap addr 0x%lx\n", iova); - ipa_assert(); - return -EFAULT; } } else { IPAERR("Unexpected domain 0x%p\n", domain); |