Commit 392825e0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Joerg Roedel
Browse files

iommu/fsl_pamu: remove fsl_pamu_get_domain_attr 



None of the values returned by this function are ever queried.  Also
remove the DOMAIN_ATTR_FSL_PAMUV1 enum value that is not otherwise used.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarLi Yang <leoyang.li@nxp.com>
Link: https://lore.kernel.org/r/20210401155256.298656-3-hch@lst.de


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

drivers/iommu/fsl_pamu_domain.c

+0 −30
Original line number Diff line number Diff line
@@ -832,35 +832,6 @@ static int fsl_pamu_set_domain_attr(struct iommu_domain *domain, 
	return ret;

}



static int fsl_pamu_get_domain_attr(struct iommu_domain *domain,

				    enum iommu_attr attr_type, void *data)

{

	struct fsl_dma_domain *dma_domain = to_fsl_dma_domain(domain);

	int ret = 0;



	switch (attr_type) {

	case DOMAIN_ATTR_FSL_PAMU_STASH:

		memcpy(data, &dma_domain->dma_stash,

		       sizeof(struct pamu_stash_attribute));

		break;

	case DOMAIN_ATTR_FSL_PAMU_ENABLE:

		*(int *)data = dma_domain->enabled;

		break;

	case DOMAIN_ATTR_FSL_PAMUV1:

		*(int *)data = DOMAIN_ATTR_FSL_PAMUV1;

		break;

	case DOMAIN_ATTR_WINDOWS:

		*(u32 *)data = dma_domain->win_cnt;

		break;

	default:

		pr_debug("Unsupported attribute type\n");

		ret = -EINVAL;

		break;

	}



	return ret;

}



static struct iommu_group *get_device_iommu_group(struct device *dev)

{

	struct iommu_group *group;
@@ -987,7 +958,6 @@ static const struct iommu_ops fsl_pamu_ops = { 
	.domain_window_enable = fsl_pamu_window_enable,

	.iova_to_phys	= fsl_pamu_iova_to_phys,

	.domain_set_attr = fsl_pamu_set_domain_attr,

	.domain_get_attr = fsl_pamu_get_domain_attr,

	.probe_device	= fsl_pamu_probe_device,

	.release_device	= fsl_pamu_release_device,

	.device_group   = fsl_pamu_device_group,

include/linux/iommu.h

+0 −4
Original line number Diff line number Diff line
@@ -104,9 +104,6 @@ enum iommu_cap { 
 *  -the actual size of the mapped region of a window must be power

 *   of 2 starting with 4KB and physical address must be naturally

 *   aligned.

 * DOMAIN_ATTR_FSL_PAMUV1 corresponds to the above mentioned contraints.

 * The caller can invoke iommu_domain_get_attr to check if the underlying

 * iommu implementation supports these constraints.

 */



enum iommu_attr {
@@ -115,7 +112,6 @@ enum iommu_attr { 
	DOMAIN_ATTR_WINDOWS,

	DOMAIN_ATTR_FSL_PAMU_STASH,

	DOMAIN_ATTR_FSL_PAMU_ENABLE,

	DOMAIN_ATTR_FSL_PAMUV1,

	DOMAIN_ATTR_NESTING,	/* two stages of translation */

	DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE,

	DOMAIN_ATTR_IO_PGTABLE_CFG,