Re: [PATCH 02/18] iommu/fsl_pamu: remove fsl_pamu_get_domain_attr

2021-03-30 Thread Will Deacon
On Tue, Mar 16, 2021 at 04:38:08PM +0100, Christoph Hellwig wrote:
> 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: Christoph Hellwig 
> Acked-by: Li Yang 
> ---
>  drivers/iommu/fsl_pamu_domain.c | 30 --
>  include/linux/iommu.h   |  4 
>  2 files changed, 34 deletions(-)

Acked-by: Will Deacon 

Will
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization


[PATCH 02/18] iommu/fsl_pamu: remove fsl_pamu_get_domain_attr

2021-03-16 Thread Christoph Hellwig
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: Christoph Hellwig 
Acked-by: Li Yang 
---
 drivers/iommu/fsl_pamu_domain.c | 30 --
 include/linux/iommu.h   |  4 
 2 files changed, 34 deletions(-)

diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index 53380cf1fa452f..e587ec43f7e750 100644
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -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, _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,
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 47c8b318d8f523..52874ae164dd60 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -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,
-- 
2.30.1

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization