From 5b9e3e32e0d871850c007c7b8afa2489a59f2151 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 26 May 2021 15:26:19 +0100 Subject: [PATCH] Revert "FROMGIT: iommu/arm-smmu: Don't bypass pinned stream mappings" This reverts commit 792c2bf3a5dd4e4babd40ed3ad2d85f126f10632. 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 Signed-off-by: Lee Jones Change-Id: I9b213d5b6d95c979b4b33cb3ec7e25c10042e8c8 --- drivers/iommu/arm/arm-smmu/arm-smmu.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 1911f9987f58..131f3996ac66 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -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;