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

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

iommu: arm-smmu: Fix use-before-init issue 



Ensure that arm_smmu_setup_default_domain() is called prior to
checking domain attributes.

Change-Id: I22df08359623331a00de5a2dee9a23802dff5182
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 72c6f5f1

drivers/iommu/arm-smmu.c

+1 −2
Original line number Diff line number Diff line
@@ -1898,7 +1898,6 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
	enum io_pgtable_fmt fmt;

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_cfg *cfg = &smmu_domain->cfg;

	bool is_fast = smmu_domain->attributes & (1 << DOMAIN_ATTR_FAST);

	unsigned long quirks = 0;

	bool dynamic;
@@ -2020,7 +2019,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
		goto out_unlock;

	}



	if (is_fast)

	if (smmu_domain->attributes & (1 << DOMAIN_ATTR_FAST))

		fmt = ARM_V8L_FAST;



	if (smmu_domain->attributes & (1 << DOMAIN_ATTR_USE_UPSTREAM_HINT))