Revert "FROMGIT: iommu/arm-smmu: Don't bypass pinned stream mappings"

This reverts commit 792c2bf3a5.

This patch relies on a failed upstream submission [0].  Bjorn also
reports that Qualcomm solve these types of issues using the upstream
solution in their downstream kernel now [1].

[0] https://lore.kernel.org/r/20191226221709.3844244-4-bjorn.andersson@linaro.org
[1] https://lore.kernel.org/linux-arm-kernel/YKxuynamQBTrNksO@yoga/

Suggested-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: I9b213d5b6d95c979b4b33cb3ec7e25c10042e8c8
This commit is contained in:
Lee Jones
2021-05-26 15:26:19 +01:00
parent 2aaddfbdeb
commit 5b9e3e32e0

View File

@@ -1124,10 +1124,6 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain,
if (type == s2cr[idx].type && cbndx == s2cr[idx].cbndx)
continue;
/* Don't bypasss pinned streams; leave them as they are */
if (type == S2CR_TYPE_BYPASS && s2cr[idx].pinned)
continue;
s2cr[idx].type = type;
s2cr[idx].privcfg = S2CR_PRIVCFG_DEFAULT;
s2cr[idx].cbndx = cbndx;