Re: [PATCH 8/8] iommu/dart: Call apple_dart_finalize_domain() as part of alloc_paging()

[Janne Grunau <j@jannau.net>]

On Fri, Sep 22, 2023 at 02:07:59PM -0300, Jason Gunthorpe wrote:
> In many cases the dev argument will now be !NULL so we should use it to
> finalize the domain at allocation.
> 
> Make apple_dart_finalize_domain() accept the correct type.
> 
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> ---
>  drivers/iommu/apple-dart.c | 26 ++++++++++++++++++--------
>  1 file changed, 18 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
> index 62efe0aa056f60..2c1832e357c7c6 100644
> --- a/drivers/iommu/apple-dart.c
> +++ b/drivers/iommu/apple-dart.c
> @@ -568,10 +568,9 @@ apple_dart_setup_translation(struct apple_dart_domain *domain,
>  	stream_map->dart->hw->invalidate_tlb(stream_map);
>  }
>  
> -static int apple_dart_finalize_domain(struct iommu_domain *domain,
> +static int apple_dart_finalize_domain(struct apple_dart_domain *dart_domain,
>  				      struct apple_dart_master_cfg *cfg)
>  {
> -	struct apple_dart_domain *dart_domain = to_dart_domain(domain);
>  	struct apple_dart *dart = cfg->stream_maps[0].dart;
>  	struct io_pgtable_cfg pgtbl_cfg;
>  	int ret = 0;
> @@ -597,16 +596,17 @@ static int apple_dart_finalize_domain(struct iommu_domain *domain,
>  		.iommu_dev = dart->dev,
>  	};
>  
> -	dart_domain->pgtbl_ops =
> -		alloc_io_pgtable_ops(dart->hw->fmt, &pgtbl_cfg, domain);
> +	dart_domain->pgtbl_ops = alloc_io_pgtable_ops(dart->hw->fmt, &pgtbl_cfg,
> +						      &dart_domain->domain);
>  	if (!dart_domain->pgtbl_ops) {
>  		ret = -ENOMEM;
>  		goto done;
>  	}
>  
> -	domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
> -	domain->geometry.aperture_start = 0;
> -	domain->geometry.aperture_end = (dma_addr_t)DMA_BIT_MASK(dart->ias);
> +	dart_domain->domain.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
> +	dart_domain->domain.geometry.aperture_start = 0;
> +	dart_domain->domain.geometry.aperture_end =
> +		(dma_addr_t)DMA_BIT_MASK(dart->ias);
>  
>  	dart_domain->finalized = true;
>  
> @@ -661,7 +661,7 @@ static int apple_dart_attach_dev_paging(struct iommu_domain *domain,
>  	if (cfg->stream_maps[0].dart->force_bypass)
>  		return -EINVAL;
>  
> -	ret = apple_dart_finalize_domain(domain, cfg);
> +	ret = apple_dart_finalize_domain(dart_domain, cfg);
>  	if (ret)
>  		return ret;
>  
> @@ -757,6 +757,16 @@ static struct iommu_domain *apple_dart_domain_alloc_paging(struct device *dev)
>  
>  	mutex_init(&dart_domain->init_lock);
>  
> +	if (dev) {
> +		struct apple_dart_master_cfg *cfg = dev_iommu_priv_get(dev);
> +		int ret;
> +
> +		ret = apple_dart_finalize_domain(dart_domain, cfg);
> +		if (ret) {
> +			kfree(dart_domain);
> +			return ERR_PTR(ret);
> +		}
> +	}
>  	return &dart_domain->domain;
>  }
>  
> -- 
> 2.42.0

Reviewed-by: Janne Grunau <j@jannau.net>

best regards

Janne