diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2023-03-07 10:19:42 -0600 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2023-03-17 11:16:43 +0800 |
commit | 197cccc771ee5871747e7abe5698c4f2ddb12233 (patch) | |
tree | d45120600d54966c332c1b6b770d1d3a2b055d68 /drivers/crypto/qat/qat_c3xxx/adf_drv.c | |
parent | 118dbccc1a35b50bf41296846809487e914b65a1 (diff) | |
download | linux-stable-197cccc771ee5871747e7abe5698c4f2ddb12233.tar.gz linux-stable-197cccc771ee5871747e7abe5698c4f2ddb12233.tar.bz2 linux-stable-197cccc771ee5871747e7abe5698c4f2ddb12233.zip |
crypto: qat - drop redundant adf_enable_aer()
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration, so the
driver doesn't need to do it itself.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this only controls ERR_* Messages from the device. An ERR_*
Message may cause the Root Port to generate an interrupt, depending on the
AER Root Error Command register managed by the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Cc: qat-linux@intel.com
Acked-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/qat/qat_c3xxx/adf_drv.c')
-rw-r--r-- | drivers/crypto/qat/qat_c3xxx/adf_drv.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/crypto/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/qat/qat_c3xxx/adf_drv.c index 4c00c4933805..bb4dca735ab5 100644 --- a/drivers/crypto/qat/qat_c3xxx/adf_drv.c +++ b/drivers/crypto/qat/qat_c3xxx/adf_drv.c @@ -193,12 +193,10 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); - adf_enable_aer(accel_dev); - if (pci_save_state(pdev)) { dev_err(&pdev->dev, "Failed to save pci state\n"); ret = -ENOMEM; - goto out_err_disable_aer; + goto out_err_free_reg; } ret = adf_dev_up(accel_dev, true); @@ -209,8 +207,6 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) out_err_dev_stop: adf_dev_down(accel_dev, false); -out_err_disable_aer: - adf_disable_aer(accel_dev); out_err_free_reg: pci_release_regions(accel_pci_dev->pci_dev); out_err_disable: @@ -230,7 +226,6 @@ static void adf_remove(struct pci_dev *pdev) return; } adf_dev_down(accel_dev, false); - adf_disable_aer(accel_dev); adf_cleanup_accel(accel_dev); adf_cleanup_pci_dev(accel_dev); kfree(accel_dev); |