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

Commit 241c08df authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Fix DOMAIN_ATTR_S1_BYPASS check"

parents 2137a397 235dc35b

drivers/iommu/arm-smmu.c

+3 −1
Original line number Diff line number Diff line
@@ -1470,7 +1470,9 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, 


	/* SCTLR */

	reg = SCTLR_CFCFG | SCTLR_CFIE | SCTLR_CFRE | SCTLR_EAE_SBOP;

	if (!stage1 || !(smmu_domain->attributes & DOMAIN_ATTR_S1_BYPASS))



	if (!(smmu_domain->attributes & (1 << DOMAIN_ATTR_S1_BYPASS)) ||

								!stage1)

		reg |= SCTLR_M;

	if (stage1)

		reg |= SCTLR_S1_ASIDPNE;