Commit 9fde0083 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Will Deacon
Browse files

iommu/arm-smmu-v3: Remove ARM_SMMU_DOMAIN_NESTED 



Currently this is exactly the same as ARM_SMMU_DOMAIN_S2, so just remove
it. The ongoing work to add nesting support through iommufd will do
something a little different.

Reviewed-by: default avatarMoritz Fischer <mdf@kernel.org>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Tested-by: default avatarShameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Tested-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 12a48fe9

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+1 −3
Original line number Diff line number Diff line
@@ -1289,7 +1289,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, 
			cd_table = &master->cd_table;

			break;

		case ARM_SMMU_DOMAIN_S2:

		case ARM_SMMU_DOMAIN_NESTED:

			s2_cfg = &smmu_domain->s2_cfg;

			break;

		default:
@@ -2170,7 +2169,6 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) 
		fmt = ARM_64_LPAE_S1;

		finalise_stage_fn = arm_smmu_domain_finalise_s1;

		break;

	case ARM_SMMU_DOMAIN_NESTED:

	case ARM_SMMU_DOMAIN_S2:

		ias = smmu->ias;

		oas = smmu->oas;
@@ -2739,7 +2737,7 @@ static int arm_smmu_enable_nesting(struct iommu_domain *domain) 
	if (smmu_domain->smmu)

		ret = -EPERM;

	else

		smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED;

		smmu_domain->stage = ARM_SMMU_DOMAIN_S2;

	mutex_unlock(&smmu_domain->init_mutex);



	return ret;

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h

+0 −1
Original line number Diff line number Diff line
@@ -715,7 +715,6 @@ struct arm_smmu_master { 
enum arm_smmu_domain_stage {

	ARM_SMMU_DOMAIN_S1 = 0,

	ARM_SMMU_DOMAIN_S2,

	ARM_SMMU_DOMAIN_NESTED,

	ARM_SMMU_DOMAIN_BYPASS,

};