Commit 469b7b8a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Joerg Roedel
Browse files

iommu/arm-smmu-v3: cleanup arm_smmu_dev_{enable,disable}_feature 



Fold the arm_smmu_dev_has_feature arm_smmu_dev_feature_enabled into
the main methods.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20220708080616.238833-5-hch@lst.de


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ae3ff39a

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

+14 −41
Original line number Diff line number Diff line
@@ -2765,58 +2765,27 @@ static void arm_smmu_get_resv_regions(struct device *dev, 
	iommu_dma_get_resv_regions(dev, head);

}



static bool arm_smmu_dev_has_feature(struct device *dev,

				     enum iommu_dev_features feat)

{

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);



	if (!master)

		return false;



	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

		return arm_smmu_master_iopf_supported(master);

	case IOMMU_DEV_FEAT_SVA:

		return arm_smmu_master_sva_supported(master);

	default:

		return false;

	}

}



static bool arm_smmu_dev_feature_enabled(struct device *dev,

					 enum iommu_dev_features feat)

{

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);



	if (!master)

		return false;



	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

		return master->iopf_enabled;

	case IOMMU_DEV_FEAT_SVA:

		return arm_smmu_master_sva_enabled(master);

	default:

		return false;

	}

}



static int arm_smmu_dev_enable_feature(struct device *dev,

				       enum iommu_dev_features feat)

{

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);



	if (!arm_smmu_dev_has_feature(dev, feat))

	if (!master)

		return -ENODEV;



	if (arm_smmu_dev_feature_enabled(dev, feat))

		return -EBUSY;



	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

		if (!arm_smmu_master_iopf_supported(master))

			return -EINVAL;

		if (master->iopf_enabled)

			return -EBUSY;

		master->iopf_enabled = true;

		return 0;

	case IOMMU_DEV_FEAT_SVA:

		if (!arm_smmu_master_sva_supported(master))

			return -EINVAL;

		if (arm_smmu_master_sva_enabled(master))

			return -EBUSY;

		return arm_smmu_master_enable_sva(master);

	default:

		return -EINVAL;
@@ -2828,16 +2797,20 @@ static int arm_smmu_dev_disable_feature(struct device *dev, 
{

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);



	if (!arm_smmu_dev_feature_enabled(dev, feat))

	if (!master)

		return -EINVAL;



	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

		if (!master->iopf_enabled)

			return -EINVAL;

		if (master->sva_enabled)

			return -EBUSY;

		master->iopf_enabled = false;

		return 0;

	case IOMMU_DEV_FEAT_SVA:

		if (!arm_smmu_master_sva_enabled(master))

			return -EINVAL;

		return arm_smmu_master_disable_sva(master);

	default:

		return -EINVAL;