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

Commit 13ea642e authored by Omkar Savagaonkar's avatar Omkar Savagaonkar Committed by Gerrit - the friendly Code Review server
Browse files

iommu: arm-smmu: Remove check for hibernation and secure use case 



Hibernation with secure use case can be supported with hyp_assign
tracker. It is being committed as part of separate patch. Hence,
remove this particular check.

Change-Id: Id76e0d4544d82acb889dc8b803e795cca6762350
Signed-off-by: default avatarOmkar Savagaonkar <omkars@codeaurora.org>
parent 32c33983

drivers/iommu/arm-smmu.c

+0 −13
Original line number Diff line number Diff line
@@ -524,11 +524,6 @@ static void arm_smmu_secure_domain_unlock(struct arm_smmu_domain *smmu_domain) 
		mutex_unlock(&smmu_domain->assign_lock);

}



static bool arm_smmu_opt_hibernation(struct arm_smmu_device *smmu)

{

	return IS_ENABLED(CONFIG_HIBERNATION);

}



#ifdef CONFIG_ARM_SMMU_SELFTEST



static int selftest;
@@ -1915,14 +1910,6 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
		goto out_unlock;

	}



	if (arm_smmu_has_secure_vmid(smmu_domain) &&

	    arm_smmu_opt_hibernation(smmu)) {

		dev_err(smmu->dev,

			"Secure usecases not supported with hibernation\n");

		ret = -EPERM;

		goto out_unlock;

	}



	/*

	 * Mapping the requested stage onto what we support is surprisingly

	 * complicated, mainly because the spec allows S1+S2 SMMUs without