PCI/AER: Remove redundant Device Control Error Reporting Enable
Subsystems (9)
cover PCI/AER: Remove redundant Device Control Error Reporting Enable
From: Bjorn Helgaas <[email protected]>
Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), which appeared in v6.0, the PCI core has enabled PCIe error reporting for all devices during enumeration.
Remove driver code to do this and remove unnecessary includes of <linux/aer.h> from several other drivers.
Bjorn Helgaas (10):
scsi: aacraid: Drop redundant pci_enable_pcie_error_reporting()
scsi: arcmsr: Remove unnecessary aer.h include
scsi: be2iscsi: Drop redundant pci_enable_pcie_error_reporting()
scsi: bfa: Drop redundant pci_enable_pcie_error_reporting()
scsi: csiostor: Remove unnecessary aer.h include
scsi: hpsa: Remove unnecessary pci_disable_pcie_error_reporting()
comment
scsi: lpfc: Drop redundant pci_enable_pcie_error_reporting()
scsi: mpt3sas: Drop redundant pci_enable_pcie_error_reporting()
scsi: qla2xxx: Drop redundant pci_enable_pcie_error_reporting()
scsi: qla4xxx: Drop redundant pci_enable_pcie_error_reporting()
drivers/scsi/aacraid/linit.c | 3 - drivers/scsi/arcmsr/arcmsr_hba.c | 1 - drivers/scsi/be2iscsi/be_main.c | 9 --- drivers/scsi/be2iscsi/be_main.h | 1 - drivers/scsi/bfa/bfad.c | 6 -- drivers/scsi/bfa/bfad_drv.h | 1 - drivers/scsi/csiostor/csio_init.c | 1 - drivers/scsi/hpsa.c | 1 - drivers/scsi/lpfc/lpfc.h | 2 - drivers/scsi/lpfc/lpfc_attr.c | 96 ++++++++-------------------- drivers/scsi/lpfc/lpfc_init.c | 1 - drivers/scsi/lpfc/lpfc_sli.c | 55 ---------------- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 -- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 6 -- drivers/scsi/qla4xxx/ql4_def.h | 1 - drivers/scsi/qla4xxx/ql4_os.c | 4 -- 18 files changed, 27 insertions(+), 168 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/10 scsi: aacraid: Drop redundant pci_enable_pcie_error_reporting()
From: Bjorn Helgaas <[email protected]>
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.
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.
Also remove pci_disable_pcie_error_reporting() from the .error_detected() path, which was added by 5c63f7f710bd ("aacraid: Added EEH support") but looks unnecessary. Error reporting will be disabled by the device reset and will be re-enabled by the pci_restore_state() in aac_pci_slot_reset().
--- drivers/scsi/aacraid/linit.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/aacraid/linit.c +0 -3
@@ -26,7 +26,6 @@#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/pci.h> -#include <linux/aer.h> #include <linux/slab.h> #include <linux/mutex.h> #include <linux/spinlock.h>
@@ -1783,7 +1782,6 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)aac_scan_host (aac); -pci_enable_pcie_error_reporting (pdev);pci_save_state (pdev);return 0 ;
@@ -1949,7 +1947,6 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev,scsi_host_complete_all_commands (shost,DID_NO_CONNECT );aac_release_resources (aac); -pci_disable_pcie_error_reporting (pdev);aac_adapter_ioremap (aac,0 );return PCI_ERS_RESULT_NEED_RESET ;
Signature · 1 line
2.25.1
PATCH 2/10 scsi: arcmsr: Remove unnecessary aer.h include
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
<linux/aer.h> is unused, so remove it.
--- drivers/scsi/arcmsr/arcmsr_hba.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/arcmsr/arcmsr_hba.c +0 -1
@@ -57,7 +57,6 @@#include <linux/timer.h> #include <linux/slab.h> #include <linux/pci.h> -#include <linux/aer.h> #include <linux/circ_buf.h> #include <asm/dma.h> #include <asm/io.h>
Signature · 1 line
2.25.1
PATCH 3/10 scsi: be2iscsi: Drop redundant pci_enable_pcie_error_reporting()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
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.
--- drivers/scsi/be2iscsi/be_main.c | 9 --------- drivers/scsi/be2iscsi/be_main.h | 1 - 2 files changed, 10 deletions(-)
drivers/scsi/be2iscsi/be_main.c +0 -9
@@ -5545,13 +5545,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, goto disable_pci; } -/* Enable EEH reporting */ - ret =pci_enable_pcie_error_reporting (pcidev); -if (ret) -beiscsi_log (phba,KERN_WARNING ,BEISCSI_LOG_INIT , -"BM_%d : PCIe Error Reporting " -"Enabling Failed\n" ); -pci_save_state (pcidev);/* Initialize Driver configuration Paramters */
@@ -5736,7 +5729,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,pci_disable_msix (phba->pcidev);pci_dev_put (phba->pcidev);iscsi_host_free (phba->shost); -pci_disable_pcie_error_reporting (pcidev);pci_set_drvdata (pcidev,NULL ); disable_pci:pci_release_regions (pcidev);
@@ -5779,7 +5771,6 @@ static void beiscsi_remove(struct pci_dev *pcidev)pci_dev_put (phba->pcidev);iscsi_host_free (phba->shost); -pci_disable_pcie_error_reporting (pcidev);pci_set_drvdata (pcidev,NULL );pci_release_regions (pcidev);pci_disable_device (pcidev);
drivers/scsi/be2iscsi/be_main.h +0 -1
@@ -16,7 +16,6 @@#include <linux/in.h> #include <linux/ctype.h> #include <linux/module.h> -#include <linux/aer.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_device.h>
Signature · 1 line
2.25.1
PATCH 4/10 scsi: bfa: Drop redundant pci_enable_pcie_error_reporting()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
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.
--- drivers/scsi/bfa/bfad.c | 6 ------ drivers/scsi/bfa/bfad_drv.h | 1 - 2 files changed, 7 deletions(-)
drivers/scsi/bfa/bfad.c +0 -6
@@ -738,9 +738,6 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) goto out_release_region; } -/* Enable PCIE Advanced Error Recovery (AER) if kernel supports */ -pci_enable_pcie_error_reporting (pdev); - bfad->pci_bar0_kva =pci_iomap (pdev,0 ,pci_resource_len (pdev,0 )); bfad->pci_bar2_kva =pci_iomap (pdev,2 ,pci_resource_len (pdev,2 ));
@@ -801,8 +798,6 @@ bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad)pci_iounmap (pdev, bfad->pci_bar0_kva);pci_iounmap (pdev, bfad->pci_bar2_kva);pci_release_regions (pdev); -/* Disable PCIE Advanced Error Recovery (AER) */ -pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev); }
@@ -1562,7 +1557,6 @@ bfad_pci_slot_reset(struct pci_dev *pdev)if (restart_bfa (bfad) ==-1 ) goto out_disable_device; -pci_enable_pcie_error_reporting (pdev);dev_printk (KERN_WARNING , &pdev->dev,"slot_reset completed flags: 0x%x!\n" , bfad->bfad_flags);
drivers/scsi/bfa/bfad_drv.h +0 -1
@@ -30,7 +30,6 @@#include <linux/vmalloc.h> #include <linux/workqueue.h> #include <linux/bitops.h> -#include <linux/aer.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h>
Signature · 1 line
2.25.1
PATCH 5/10 scsi: csiostor: Remove unnecessary aer.h include
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
<linux/aer.h> is unused, so remove it.
--- drivers/scsi/csiostor/csio_init.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/csiostor/csio_init.c +0 -1
@@ -38,7 +38,6 @@#include <linux/module.h> #include <linux/init.h> #include <linux/pci.h> -#include <linux/aer.h> #include <linux/mm.h> #include <linux/notifier.h> #include <linux/kdebug.h>
Signature · 1 line
2.25.1
PATCH 6/10 scsi: hpsa: Remove unnecessary pci_disable_pcie_error_reporting() comment
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
105a3dbc7452 ("hpsa: clean up driver init") added a comment about pci_disable_pcie_error_reporting(), but hpsa has never called either pci_enable_pcie_error_reporting() or pci_disable_pcie_error_reporting().
Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core is responsible for managing PCIe device error reporting.
Remove the comment about pci_disable_pcie_error_reporting().
--- drivers/scsi/hpsa.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/hpsa.c +0 -1
@@ -9108,7 +9108,6 @@ static void hpsa_remove_one(struct pci_dev *pdev)free_percpu (h->lockup_detected);/* init_one 2 */ h->lockup_detected =NULL ;/* init_one 2 */ -/* (void) pci_disable_pcie_error_reporting(pdev); */ /* init_one 1 */ hpda_free_ctlr_info (h);/* init_one 1 */ }
Signature · 1 line
2.25.1
PATCH 7/10 scsi: lpfc: Drop redundant pci_enable_pcie_error_reporting()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
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.
--- drivers/scsi/lpfc/lpfc.h | 2 - drivers/scsi/lpfc/lpfc_attr.c | 96 ++++++++++------------------------- drivers/scsi/lpfc/lpfc_init.c | 1 - drivers/scsi/lpfc/lpfc_sli.c | 55 -------------------- 4 files changed, 27 insertions(+), 127 deletions(-)
drivers/scsi/lpfc/lpfc.h +0 -2
@@ -1036,7 +1036,6 @@ struct lpfc_hba {#define FCF_TS_INPROG 0x200/* FCF table scan in progress */ #define FCF_RR_INPROG 0x400/* FCF roundrobin flogi in progress */ #define HBA_FIP_SUPPORT 0x800/* FIP support in HBA */ -#define HBA_AER_ENABLED 0x1000/* AER enabled with HBA */ #define HBA_DEVLOSS_TMO 0x2000/* HBA in devloss timeout */ #define HBA_RRQ_ACTIVE 0x4000/* process the rrq active list */ #define HBA_IOQ_FLUSH 0x8000/* FCP/NVME I/O queues being flushed */
@@ -1190,7 +1189,6 @@ struct lpfc_hba {#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_FCP#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_FCP#endif -uint32_t cfg_aer_support;uint32_t cfg_sriov_nr_virtfn;uint32_t cfg_request_firmware_upgrade;uint32_t cfg_suppress_link_up;
drivers/scsi/lpfc/lpfc_attr.c +27 -69
147 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +0 -1
@@ -32,7 +32,6 @@#include <linux/spinlock.h> #include <linux/sched/clock.h> #include <linux/ctype.h> -#include <linux/aer.h> #include <linux/slab.h> #include <linux/firmware.h> #include <linux/miscdevice.h>
drivers/scsi/lpfc/lpfc_sli.c +0 -55
106 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 8/10 scsi: mpt3sas: Drop redundant pci_enable_pcie_error_reporting()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
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.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ----- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - 2 files changed, 6 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +0 -5
@@ -60,7 +60,6 @@#include <linux/ktime.h> #include <linux/kthread.h> #include <asm/page.h> /* To get host page size per arch */ -#include <linux/aer.h> #include "mpt3sas_base.h"
@@ -3535,7 +3534,6 @@ mpt3sas_base_unmap_resources(struct MPT3SAS_ADAPTER *ioc)if (pci_is_enabled (pdev)) {pci_release_selected_regions (ioc->pdev, ioc->bars); -pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev); } }
@@ -3615,9 +3613,6 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) goto out_fail; } -/* AER (Advanced Error Reporting) hooks */ -pci_enable_pcie_error_reporting (pdev); -pci_set_master (pdev);
drivers/scsi/mpt3sas/mpt3sas_scsih.c +0 -1
@@ -52,7 +52,6 @@#include <linux/delay.h> #include <linux/pci.h> #include <linux/interrupt.h> -#include <linux/aer.h> #include <linux/raid_class.h> #include <linux/blk-mq-pci.h> #include <asm/unaligned.h>
Signature · 1 line
2.25.1
PATCH 9/10 scsi: qla2xxx: Drop redundant pci_enable_pcie_error_reporting()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
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.
--- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 6 ------ 2 files changed, 7 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +0 -1
@@ -22,7 +22,6 @@#include <linux/interrupt.h> #include <linux/workqueue.h> #include <linux/firmware.h> -#include <linux/aer.h> #include <linux/mutex.h> #include <linux/btree.h>
drivers/scsi/qla2xxx/qla_os.c +0 -6
@@ -2940,9 +2940,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ql2xallocfwdump =0 ; } -/* This may fail but that's ok */ -pci_enable_pcie_error_reporting (pdev); - ha =kzalloc (sizeof (struct qla_hw_data ),GFP_KERNEL );if (!ha) { ql_log_pci(ql_log_fatal, pdev, 0x0009,
@@ -3949,8 +3946,6 @@ qla2x00_remove_one(struct pci_dev *pdev)pci_release_selected_regions (ha->pdev, ha->bars);kfree (ha); -pci_disable_pcie_error_reporting (pdev); -pci_disable_device (pdev); }
@@ -6825,7 +6820,6 @@ qla2x00_disable_board_on_pci_error(struct work_struct *work)qla2x00_unmap_iobases (ha);pci_release_selected_regions (ha->pdev, ha->bars); -pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev);/*
Signature · 1 line
2.25.1
PATCH 10/10 scsi: qla4xxx: Drop redundant pci_enable_pcie_error_reporting()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
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.
--- drivers/scsi/qla4xxx/ql4_def.h | 1 - drivers/scsi/qla4xxx/ql4_os.c | 4 ---- 2 files changed, 5 deletions(-)
drivers/scsi/qla4xxx/ql4_def.h +0 -1
@@ -23,7 +23,6 @@#include <linux/delay.h> #include <linux/interrupt.h> #include <linux/mutex.h> -#include <linux/aer.h> #include <linux/bsg-lib.h> #include <linux/vmalloc.h>
drivers/scsi/qla4xxx/ql4_os.c +0 -4
@@ -8639,8 +8639,6 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, ha->host_no = host->host_no; ha->func_num =PCI_FUNC (ha->pdev->devfn); -pci_enable_pcie_error_reporting (pdev); -/* Setup Runtime configurable options */ if (is_qla8022 (ha)) { ha->isp_ops = &qla4_82xx_isp_ops;
@@ -8867,7 +8865,6 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,qla4xxx_free_adapter (ha); probe_failed_ioconfig: -pci_disable_pcie_error_reporting (pdev);scsi_host_put (ha->host); probe_disable_device:
@@ -9022,7 +9019,6 @@ static void qla4xxx_remove_adapter(struct pci_dev *pdev)scsi_host_put (ha->host); -pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev); }
Signature · 1 line
2.25.1
Martin K. Petersen
AppliedBjorn,
Quoted 6 lines
Since
f26e58bf6f54("PCI/AER: Enable error reporting when AER is native"), which appeared in v6.0, the PCI core has enabled PCIe error reporting for all devices during enumeration.Remove driver code to do this and remove unnecessary includes of <
linux/aer.h> from several other drivers.
Applied to 6.4/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 8 lines · Bjorn Helgaas
Since
f26e58bf6f54("PCI/AER: Enable error reporting when AER is native"), which appeared in v6.0, the PCI core has enabled PCIe error reporting for all devices during enumeration.Remove driver code to do this and remove unnecessary includes of <
linux/aer.h> from several other drivers.[...]
Applied to 6.4/scsi-queue, thanks!
[01/10] scsi: aacraid: Drop redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/mkp/scsi/c/b3e2bf9c967b [02/10] scsi: arcmsr: Remove unnecessary aer.h include https://git.kernel.org/mkp/scsi/c/915b071a6f83 [03/10] scsi: be2iscsi: Drop redundant pci_enable_pcie_error_reporting() https://git.kernel.org/mkp/scsi/c/6574fb2580b0 [04/10] scsi: bfa: Drop redundant pci_enable_pcie_error_reporting() https://git.kernel.org/mkp/scsi/c/b54e1e47b5f5 [05/10] scsi: csiostor: Remove unnecessary aer.h include https://git.kernel.org/mkp/scsi/c/3afe8d64c4f5 [06/10] scsi: hpsa: Remove unnecessary pci_disable_pcie_error_reporting() comment https://git.kernel.org/mkp/scsi/c/b2bce40c5b81 [07/10] scsi: lpfc: Drop redundant pci_enable_pcie_error_reporting() https://git.kernel.org/mkp/scsi/c/e891681b1d5d [08/10] scsi: mpt3sas: Drop redundant pci_enable_pcie_error_reporting() https://git.kernel.org/mkp/scsi/c/edf6722f4ad2 [09/10] scsi: qla2xxx: Drop redundant pci_enable_pcie_error_reporting() https://git.kernel.org/mkp/scsi/c/c5c440bbff86 [10/10] scsi: qla4xxx: Drop redundant pci_enable_pcie_error_reporting() https://git.kernel.org/mkp/scsi/c/d7ba106418d6
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering