Skip to content

Commit

Permalink
iommu/amd: Improve error handling for amd_iommu_init_pci
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Suravee Suthikulpanit authored and Joerg Roedel committed Mar 4, 2022
1 parent 754e0b0 commit 06687a0
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions drivers/iommu/amd/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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();

Expand All @@ -1970,6 +1977,7 @@ static int __init amd_iommu_init_pci(void)
if (!ret)
print_iommu_info();

out:
return ret;
}

Expand Down

0 comments on commit 06687a0

Please sign in to comment.