iommu/amd: Improve error handling for amd_iommu_init_pci

Add error messages to prevent silent failure.

Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20220301085626.87680-2-vasant.hegde@amd.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index b10fb52ea44288747e0d992385a7b656541d92b7..6b5af568f3d5adbb380b06c0dd54fade1623ee6a 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1943,9 +1943,11 @@ 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 IOMMU Hardware (error=%d)!\n",
+                              iommu->index, ret);
+                       goto out;
+               }
                /* Need to setup range after PCI init */
                iommu_set_cwwb_range(iommu);
        }
@@ -1961,6 +1963,11 @@ static int __init amd_iommu_init_pci(void)
         * active.
         */
        ret = amd_iommu_init_api();
+       if (ret) {
+               pr_err("IOMMU: Failed to initialize IOMMU-API interface (error=%d)!\n",
+                      ret);
+               goto out;
+       }
 
        init_device_table_dma();
 
@@ -1970,6 +1977,7 @@ static int __init amd_iommu_init_pci(void)
        if (!ret)
                print_iommu_info();
 
+out:
        return ret;
 }