Re: [PATCH v6 12/15] iommu/amd: Add support for enable/disable IOPF

[Jason Gunthorpe <jgg@ziepe.ca>]

On Fri, Feb 09, 2024 at 11:29:27AM +0000, Vasant Hegde wrote:
> diff --git a/drivers/iommu/amd/Kconfig b/drivers/iommu/amd/Kconfig
> index 443b2c13c37b..d563f6d496ca 100644
> --- a/drivers/iommu/amd/Kconfig
> +++ b/drivers/iommu/amd/Kconfig
> @@ -10,6 +10,7 @@ config AMD_IOMMU
>  	select IOMMU_API
>  	select IOMMU_IOVA
>  	select IOMMU_IO_PGTABLE
> +	select IOMMU_IOPF

Makes me wonder if the previous patches actually compile fully?

> diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
> index 0fa172e0583d..21cc6654410f 100644
> --- a/drivers/iommu/amd/iommu.c
> +++ b/drivers/iommu/amd/iommu.c
> @@ -2058,12 +2058,22 @@ static int do_attach(struct iommu_dev_data *dev_data,
>  		if (ret)
>  			return ret;
>  
> -		if (pdev)
> +		if (pdev) {
>  			pdev_enable_caps(pdev);
> +
> +			/*
> +			 * Device can continue to function even if IOPF
> +			 * enablement failed. Hence in error path just
> +			 * disable device PRI support.
> +			 */
> +			if (amd_iommu_iopf_add_device(iommu, dev_data))
> +				pdev_disable_cap_pri(pdev);
> +		}
>  	} else if (pdev) {
>  		pdev_enable_cap_ats(pdev);
>  	}
>  
> +
>  	/* Update device table */

Extra whitespace

Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>

I already remarked about enabling PRI in the wrong spot..

Jason