iommu/amd: Fix error handling for pdev_pri_ats_enable()
Subsystems (2)
Vasant Hegde
maintainerPATCH 1/1 iommu/amd: Fix error handling for pdev_pri_ats_enable()
Current code throws kernel warning if it fails to enable pasid/pri [1]. Do not call pci_disable_[pasid/pri] if pci_enable_[pasid/pri] failed.
[1] https://lore.kernel.org/linux-iommu/[email protected]/
Reported-by Matt Fagnani <[email protected]>
Signed-off-by Vasant Hegde <[email protected]>
Reviewed-by Suravee Suthikulpanit <[email protected]>
--- drivers/iommu/amd/iommu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/iommu/amd/iommu.c +7 -5
@@ -1702,27 +1702,29 @@ static int pdev_pri_ats_enable(struct pci_dev *pdev)/* Only allow access to user-accessible pages */ ret =pci_enable_pasid (pdev,0 );if (ret) - goto out_err; +return ret;/* First reset the PRI state of the device */ ret =pci_reset_pri (pdev);if (ret) - goto out_err; + goto out_err_pasid;/* Enable PRI */ /* FIXME: Hardcode number of outstanding requests for now */ ret =pci_enable_pri (pdev,32 );if (ret) - goto out_err; + goto out_err_pasid; ret =pci_enable_ats (pdev,PAGE_SHIFT );if (ret) - goto out_err; + goto out_err_pri;return 0 ; -out_err: +out_err_pri:pci_disable_pri (pdev); + +out_err_pasid:pci_disable_pasid (pdev);return ret;
Signature · 1 line
2.31.1
Quoted 2 lines · Vasant Hegde
drivers/iommu/amd/iommu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
Applied, thanks.