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

Commit 0834cc28 authored by Will Deacon's avatar Will Deacon
Browse files

iommu/arm-smmu: Restrict domain attributes to UNMANAGED domains 



The ARM SMMU drivers provide a DOMAIN_ATTR_NESTING domain attribute,
which allows callers of the IOMMU API to request that the page table
for a domain is installed at stage-2, if supported by the hardware.

Since setting this attribute only makes sense for UNMANAGED domains,
this patch returns -ENODEV if the domain_{get,set}_attr operations are
called on other domain types.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 56fbf600

drivers/iommu/arm-smmu-v3.c

+6 −0
Original line number Diff line number Diff line
@@ -1837,6 +1837,9 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, 
{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);



	if (domain->type != IOMMU_DOMAIN_UNMANAGED)

		return -EINVAL;



	switch (attr) {

	case DOMAIN_ATTR_NESTING:

		*(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED);
@@ -1852,6 +1855,9 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, 
	int ret = 0;

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);



	if (domain->type != IOMMU_DOMAIN_UNMANAGED)

		return -EINVAL;



	mutex_lock(&smmu_domain->init_mutex);



	switch (attr) {

drivers/iommu/arm-smmu.c

+6 −0
Original line number Diff line number Diff line
@@ -1603,6 +1603,9 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, 
{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);



	if (domain->type != IOMMU_DOMAIN_UNMANAGED)

		return -EINVAL;



	switch (attr) {

	case DOMAIN_ATTR_NESTING:

		*(int *)data = (smmu_domain->stage == ARM_SMMU_DOMAIN_NESTED);
@@ -1618,6 +1621,9 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, 
	int ret = 0;

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);



	if (domain->type != IOMMU_DOMAIN_UNMANAGED)

		return -EINVAL;



	mutex_lock(&smmu_domain->init_mutex);



	switch (attr) {