Commit c5c440bb authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Martin K. Petersen

scsi: qla2xxx: Drop redundant pci_enable_pcie_error_reporting()

pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since commit f26e58bf ("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: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20230307182842.870378-10-helgaas@kernel.org
Cc: Nilesh Javali <njavali@marvell.com>
Cc: GR-QLogic-Storage-Upstream@marvell.com
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent edf6722f
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/aer.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/btree.h> #include <linux/btree.h>
......
...@@ -2940,9 +2940,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2940,9 +2940,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
ql2xallocfwdump = 0; ql2xallocfwdump = 0;
} }
/* This may fail but that's ok */
pci_enable_pcie_error_reporting(pdev);
ha = kzalloc(sizeof(struct qla_hw_data), GFP_KERNEL); ha = kzalloc(sizeof(struct qla_hw_data), GFP_KERNEL);
if (!ha) { if (!ha) {
ql_log_pci(ql_log_fatal, pdev, 0x0009, ql_log_pci(ql_log_fatal, pdev, 0x0009,
...@@ -3949,8 +3946,6 @@ qla2x00_remove_one(struct pci_dev *pdev) ...@@ -3949,8 +3946,6 @@ qla2x00_remove_one(struct pci_dev *pdev)
pci_release_selected_regions(ha->pdev, ha->bars); pci_release_selected_regions(ha->pdev, ha->bars);
kfree(ha); kfree(ha);
pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }
...@@ -6825,7 +6820,6 @@ qla2x00_disable_board_on_pci_error(struct work_struct *work) ...@@ -6825,7 +6820,6 @@ qla2x00_disable_board_on_pci_error(struct work_struct *work)
qla2x00_unmap_iobases(ha); qla2x00_unmap_iobases(ha);
pci_release_selected_regions(ha->pdev, ha->bars); pci_release_selected_regions(ha->pdev, ha->bars);
pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment