Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f493044d authored by Patrick Daly's avatar Patrick Daly
Browse files

Revert "iommu/arm-smmu: Treat all device transactions as unprivileged" 



This reverts commit d346180e ("iommu/arm-smmu: Treat all device
transactions as unprivileged").

The graphics implementation uses both privileged and unpriveleged mappings
in the same context bank.

Change-Id: Ia9771d1678398393ecc30ba81debd03186a09f2d
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 1b0313e6

drivers/iommu/arm-smmu.c

+1 −4
Original line number Diff line number Diff line
@@ -178,9 +178,6 @@ 
#define S2CR_TYPE_BYPASS		(1 << S2CR_TYPE_SHIFT)

#define S2CR_TYPE_FAULT			(2 << S2CR_TYPE_SHIFT)



#define S2CR_PRIVCFG_SHIFT		24

#define S2CR_PRIVCFG_UNPRIV		(2 << S2CR_PRIVCFG_SHIFT)



/* Context bank attribute registers */

#define ARM_SMMU_GR1_CBAR(n)		(0x0 + ((n) << 2))

#define CBAR_VMID_SHIFT			0
@@ -1463,7 +1460,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, 
		u32 idx, s2cr;



		idx = cfg->smrs ? cfg->smrs[i].idx : cfg->streamids[i];

		s2cr = S2CR_TYPE_TRANS | S2CR_PRIVCFG_UNPRIV |

		s2cr = S2CR_TYPE_TRANS |

		       (smmu_domain->cfg.cbndx << S2CR_CBNDX_SHIFT);

		writel_relaxed(s2cr, gr0_base + ARM_SMMU_GR0_S2CR(idx));

	}