Re: [PATCH 1/5] iommu/amd: Improve error handling for amd_iommu_init_pci

[Joerg Roedel <joro@8bytes.org>]

On Mon, Feb 21, 2022 at 10:29:12AM +0530, Vasant Hegde wrote:
> From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> 
> Add error messages to prevent silent failure.
> 
> Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
> ---
>  drivers/iommu/amd/init.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
> index 1eacd43cb436..770ac679b682 100644
> --- a/drivers/iommu/amd/init.c
> +++ b/drivers/iommu/amd/init.c
> @@ -1942,9 +1942,10 @@ static int __init amd_iommu_init_pci(void)
>  
>  	for_each_iommu(iommu) {
>  		ret = iommu_init_pci(iommu);
> -		if (ret)
> -			break;
> -
> +		if (ret) {
> +			pr_err("IOMMU:%d Failed to initialize!\n", iommu->index);

Please make that message "IOMMU%d: Failed to initialize IOMMU Hardware (error=%d)!\n".

> +			goto out;
> +		}
>  		/* Need to setup range after PCI init */
>  		iommu_set_cwwb_range(iommu);
>  	}
> @@ -1960,6 +1961,10 @@ static int __init amd_iommu_init_pci(void)
>  	 * active.
>  	 */
>  	ret = amd_iommu_init_api();
> +	if (ret) {
> +		pr_err("IOMMU: Failed to initialize api!\n");

And that "IOMMU: Failed to initialize IOMMU-API interface (error=%d)!\n"

> +		goto out;
> +	}
>  
>  	init_device_table_dma();
>  
> @@ -1969,6 +1974,7 @@ static int __init amd_iommu_init_pci(void)
>  	if (!ret)
>  		print_iommu_info();
>  
> +out:
>  	return ret;
>  }
>  
> -- 
> 2.27.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu