PCI/AER: Clear uncorrectable error status for device
Subsystems (26)
PATCH 1/1 PCI/AER: Clear uncorrectable error status for device
PCI based device drivers handles ERR_NONFATAL by registering pci_error_handlers. some of the drivers clear AER uncorrectable status in slot_reset while some in resume.
Drivers should not have responsibility of clearing the AER status, instead shall be done by error and recovery framework defined in err.c
Clear the status while resuming, after reset_link was successful.
drivers/crypto/qat/qat_common/adf_aer.c +0 -1
@@ -198,7 +198,6 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev)pr_err ("QAT: Can't find acceleration device\n" );return PCI_ERS_RESULT_DISCONNECT ; } -pci_cleanup_aer_uncorrect_error_status (pdev);if (adf_dev_aer_schedule_reset (accel_dev,ADF_DEV_RESET_SYNC ))return PCI_ERS_RESULT_DISCONNECT ;
drivers/dma/ioat/init.c +0 -6
@@ -1267,12 +1267,6 @@ static pci_ers_result_t ioat_pcie_error_slot_reset(struct pci_dev *pdev)pci_wake_from_d3 (pdev, false); } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"AER uncorrect error status clear failed: %#x\n" , err); - } -return result; }
drivers/infiniband/hw/hfi1/pcie.c +0 -1
@@ -655,7 +655,6 @@ pci_resume(struct pci_dev *pdev)struct hfi1_devdata *dd =pci_get_drvdata (pdev);dd_dev_info (dd,"HFI1 resume function called\n" ); -pci_cleanup_aer_uncorrect_error_status (pdev);/* * Running jobs will fail, since it's asynchronous * unlike sysfs-requested reset. Better than
drivers/infiniband/hw/qib/qib_pcie.c +0 -1
@@ -597,7 +597,6 @@ qib_pci_resume(struct pci_dev *pdev)struct qib_devdata *dd =pci_get_drvdata (pdev);qib_devinfo (pdev,"QIB resume function called\n" ); -pci_cleanup_aer_uncorrect_error_status (pdev);/* * Running jobs will fail, since it's asynchronous * unlike sysfs-requested reset. Better than
drivers/net/ethernet/atheros/alx/main.c +0 -2
@@ -1960,8 +1960,6 @@ static pci_ers_result_t alx_pci_error_slot_reset(struct pci_dev *pdev)if (!alx_reset_mac (hw)) rc =PCI_ERS_RESULT_RECOVERED ; out: -pci_cleanup_aer_uncorrect_error_status (pdev); -rtnl_unlock ();return rc;
drivers/net/ethernet/broadcom/bnx2.c +0 -7
@@ -8793,13 +8793,6 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)if (!(bp->flags &BNX2_FLAG_AER_ENABLED ))return result; - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err);/* non-fatal, continue */ - } -return result; }
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +0 -8
@@ -14379,14 +14379,6 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)rtnl_unlock (); -/* If AER, perform cleanup of the PCIe registers */ -if (bp->flags &AER_ENABLED ) { -if (pci_cleanup_aer_uncorrect_error_status (pdev)) -BNX2X_ERR ("pci_cleanup_aer_uncorrect_error_status failed\n" ); -else -DP (NETIF_MSG_HW ,"pci_cleanup_aer_uncorrect_error_status succeeded\n" ); - } -return PCI_ERS_RESULT_RECOVERED ; }
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -7
@@ -9076,13 +9076,6 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)rtnl_unlock (); - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err);/* non-fatal, continue */ - } -return PCI_ERS_RESULT_RECOVERED ; }
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0 -1
@@ -4721,7 +4721,6 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)pci_set_master (pdev);pci_restore_state (pdev);pci_save_state (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);if (t4_wait_dev_ready (adap->regs) <0 )return PCI_ERS_RESULT_DISCONNECT ;
drivers/net/ethernet/emulex/benet/be_main.c +0 -1
@@ -6063,7 +6063,6 @@ static pci_ers_result_t be_eeh_reset(struct pci_dev *pdev)if (status)return PCI_ERS_RESULT_DISCONNECT ; -pci_cleanup_aer_uncorrect_error_status (pdev);be_clear_error (adapter,BE_CLEAR_ALL );return PCI_ERS_RESULT_RECOVERED ; }
drivers/net/ethernet/intel/e1000e/netdev.c +0 -2
@@ -6854,8 +6854,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } -pci_cleanup_aer_uncorrect_error_status (pdev); -return result; }
drivers/net/ethernet/intel/fm10k/fm10k_pci.c +0 -2
@@ -2462,8 +2462,6 @@ static pci_ers_result_t fm10k_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } -pci_cleanup_aer_uncorrect_error_status (pdev); -return result; }
drivers/net/ethernet/intel/i40e/i40e_main.c +0 -8
@@ -14245,14 +14245,6 @@ static pci_ers_result_t i40e_pci_error_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_DISCONNECT ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_info (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err); -/* non-fatal, continue */ - } -return result; }
drivers/net/ethernet/intel/igb/igb_main.c +0 -9
@@ -8991,7 +8991,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)struct igb_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;pci_ers_result_t result; -int err;if (pci_enable_device_mem (pdev)) { dev_err(&pdev->dev,
@@ -9015,14 +9014,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err); -/* non-fatal, continue */ - } -return result; }
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -9
@@ -10864,8 +10864,6 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,/* Free device reference count */ pci_dev_put (vfdev); } - -pci_cleanup_aer_uncorrect_error_status (pdev); }/*
@@ -10935,13 +10933,6 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -e_dev_err ("pci_cleanup_aer_uncorrect_error_status " -"failed 0x%0x\n" , err); -/* non-fatal, continue */ - } -return result; }
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +0 -6
@@ -1790,11 +1790,6 @@ static pci_ers_result_t netxen_io_slot_reset(struct pci_dev *pdev)return err ?PCI_ERS_RESULT_DISCONNECT :PCI_ERS_RESULT_RECOVERED ; } -static void netxen_io_resume (struct pci_dev *pdev) -{ -pci_cleanup_aer_uncorrect_error_status (pdev); -} -static void netxen_nic_shutdown (struct pci_dev *pdev) {struct netxen_adapter *adapter =pci_get_drvdata (pdev);
@@ -3490,7 +3485,6 @@ netxen_free_ip_list(struct netxen_adapter *adapter, bool master)static const struct pci_error_handlers netxen_err_handler = { .error_detected = netxen_io_error_detected, .slot_reset = netxen_io_slot_reset, - .resume = netxen_io_resume, };static struct pci_driver netxen_driver = {
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +0 -1
@@ -4232,7 +4232,6 @@ static void qlcnic_83xx_io_resume(struct pci_dev *pdev) {struct qlcnic_adapter *adapter =pci_get_drvdata (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);if (test_and_clear_bit (__QLCNIC_AER, &adapter->state))qlcnic_83xx_aer_start_poll_work (adapter); }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0 -1
@@ -3975,7 +3975,6 @@ static void qlcnic_82xx_io_resume(struct pci_dev *pdev)u32 state;struct qlcnic_adapter *adapter =pci_get_drvdata (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev); state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE );if (state ==QLCNIC_DEV_READY &&test_and_clear_bit (__QLCNIC_AER, &adapter->state))
drivers/net/ethernet/sfc/efx.c +0 -7
@@ -3843,13 +3843,6 @@ static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev) status =PCI_ERS_RESULT_DISCONNECT ; } - rc =pci_cleanup_aer_uncorrect_error_status (pdev); -if (rc) { -netif_err (efx, hw, efx->net_dev, -"pci_cleanup_aer_uncorrect_error_status failed (%d)\n" , rc); -/* Non-fatal error. Continue. */ - } -return status; }
drivers/net/ethernet/sfc/falcon/efx.c +0 -7
@@ -3194,13 +3194,6 @@ static pci_ers_result_t ef4_io_slot_reset(struct pci_dev *pdev) status =PCI_ERS_RESULT_DISCONNECT ; } - rc =pci_cleanup_aer_uncorrect_error_status (pdev); -if (rc) { -netif_err (efx, hw, efx->net_dev, -"pci_cleanup_aer_uncorrect_error_status failed (%d)\n" , rc); -/* Non-fatal error. Continue. */ - } -return status; }
drivers/nvme/host/pci.c +0 -1
@@ -2678,7 +2678,6 @@ static void nvme_error_resume(struct pci_dev *pdev)struct nvme_dev *dev =pci_get_drvdata (pdev);flush_work (&dev->ctrl.reset_work); -pci_cleanup_aer_uncorrect_error_status (pdev); }static const struct pci_error_handlers nvme_err_handler = {
drivers/pci/pcie/err.c +2 -0
@@ -265,6 +265,8 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,* The error is non fatal so the bus is ok; just invoke * the callback for the function that logged the error. */ +if (cb == report_resume) +pci_cleanup_aer_uncorrect_error_status (dev);cb (dev, &result_data); }
drivers/scsi/aacraid/linit.c +0 -2
@@ -2055,8 +2055,6 @@ static void aac_pci_resume(struct pci_dev *pdev)struct scsi_device *sdev =NULL ;struct aac_dev *aac = (struct aac_dev *)shost_priv (shost); -pci_cleanup_aer_uncorrect_error_status (pdev); -if (aac_adapter_ioremap (aac, aac->base_size)) {dev_err (&pdev->dev,"aacraid: ioremap failed\n" );
drivers/scsi/be2iscsi/be_main.c +0 -1
@@ -5518,7 +5518,6 @@ static pci_ers_result_t beiscsi_eeh_reset(struct pci_dev *pdev)return PCI_ERS_RESULT_DISCONNECT ; } -pci_cleanup_aer_uncorrect_error_status (pdev);return PCI_ERS_RESULT_RECOVERED ; }
drivers/scsi/bfa/bfad.c +0 -2
@@ -1569,8 +1569,6 @@ bfad_pci_slot_reset(struct pci_dev *pdev)if (pci_set_dma_mask (bfad->pcidev,DMA_BIT_MASK (32 )) !=0 ) goto out_disable_device; -pci_cleanup_aer_uncorrect_error_status (pdev); -if (restart_bfa (bfad) ==-1 ) goto out_disable_device;
drivers/scsi/csiostor/csio_init.c +0 -1
@@ -1102,7 +1102,6 @@ csio_pci_slot_reset(struct pci_dev *pdev)pci_set_master (pdev);pci_restore_state (pdev);pci_save_state (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);/* Bring HW s/m to ready state. * but don't resume IOs.
drivers/scsi/lpfc/lpfc_init.c +0 -8
@@ -11331,10 +11331,6 @@ lpfc_io_resume_s3(struct pci_dev *pdev)/* Bring device online, it will be no-op for non-fatal error resume */ lpfc_online (phba); - -/* Clean up Advanced Error Reporting (AER) if needed */ -if (phba->hba_flag &HBA_AER_ENABLED ) -pci_cleanup_aer_uncorrect_error_status (pdev); }/**
@@ -12146,10 +12142,6 @@ lpfc_io_resume_s4(struct pci_dev *pdev)/* Bring the device back online */ lpfc_online (phba); } - -/* Clean up Advanced Error Reporting (AER) if needed */ -if (phba->hba_flag &HBA_AER_ENABLED ) -pci_cleanup_aer_uncorrect_error_status (pdev); }/**
drivers/scsi/mpt3sas/mpt3sas_scsih.c +0 -1
@@ -10965,7 +10965,6 @@ scsih_pci_resume(struct pci_dev *pdev)pr_info (MPT3SAS_FMT "PCI error: resume callback!!\n" , ioc->name); -pci_cleanup_aer_uncorrect_error_status (pdev);mpt3sas_base_start_watchdog (ioc);scsi_unblock_requests (ioc->shost); }
drivers/scsi/qla2xxx/qla_os.c +0 -2
@@ -6823,8 +6823,6 @@ qla2xxx_pci_resume(struct pci_dev *pdev) "The device failed to resume I/O from slot/link_reset.\n"); } -pci_cleanup_aer_uncorrect_error_status (pdev); - ha->flags.eeh_busy =0 ; }
drivers/scsi/qla4xxx/ql4_os.c +0 -1
@@ -9824,7 +9824,6 @@ qla4xxx_pci_resume(struct pci_dev *pdev) __func__); } -pci_cleanup_aer_uncorrect_error_status (pdev);clear_bit (AF_EEH_BUSY , &ha->flags); }
Signature · 1 line
2.7.4
drivers/pci/pcie/err.c static pci_ers_result_t broadcast_error_message(struct pci_dev *dev, · line 271
Quoted 9 lines · Oza Pawandeep
+++
b/drivers/pci/pcie/err.cdrivers/pci/pcie/err.c +2
-0@@ -265,6 +265,8 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,* The error is non fatal so the bus is ok; just invoke * the callback for the function that logged the error. */ +if (cb == report_resume) +pci_cleanup_aer_uncorrect_error_status (dev);cb (dev, &result_data); }
In order to follow the existing behavior (drivers are calling pci_cleanup_aer_uncorrect_error_status() right before return), you should probably move the pci_cleanup_aer_uncorrect_error_status after
cb(dev, &result_data);
line.
Quoted 17 lines · Sinan Kaya
drivers/pci/pcie/err.c static pci_ers_result_t · line 272
Quoted 10 lines · Oza Pawandeep
+++
b/drivers/pci/pcie/err.cdrivers/pci/pcie/err.c +2
-0@@ -265,6 +265,8 @@ static pci_ers_result_tbroadcast_error_message(struct pci_dev *dev, * The error is non fatal so the bus is ok; just invoke * the callback for the function that logged the error. */ +if (cb == report_resume) +pci_cleanup_aer_uncorrect_error_status (dev);cb (dev, &result_data); }In order to follow the existing behavior (drivers are calling
pci_cleanup_aer_uncorrect_error_status()right before return), you should probably move thepci_cleanup_aer_uncorrect_error_statusafter
Quoted 3 lines
cb(dev, &result_data);line.
some drivers are calling it in slot_reset, which is before resume, while some are calling in beginning of resume (e.g. netxen_io_resume)
hence I have kept it before calling resume() (e.g. before cb(dev, &result_data))
Regards,
Oza.
[+cc Sinan, LKML]
Quoted 6 lines · Oza Pawandeep
PCI based device drivers handles
ERR_NONFATALby registeringpci_error_handlers. some of the drivers clear AER uncorrectable status inslot_resetwhile some in resume.Drivers should not have responsibility of clearing the AER status, instead shall be done by error and recovery framework defined in
err.c
Agreed, and Keith's patch 43c9a34fe04e ("PCI/ERR: Always use the first downstream port") [1], which is queued on pci/hotplug for v4.20, does call pci_cleanup_aer_uncorrect_error_status() at the end of pcie_do_recovery().
1) Does that seem like the right place?
2) I guess all we need now would be to remove the calls from the drivers?
3) If we remove all the calls from the drivers, we should remove the declaration from include/linux/aer.h, too.
I can take care of these updates if we agree they're the right thing to do.
[1] http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=43c9a34fe04e
Quoted 473 lines
Clear the status while resuming, after
reset_linkwas successful.Signed-off-by Oza Pawandeep <[email protected]>drivers/crypto/qat/qat_common/adf_aer.c +0
-1@@ -198,7 +198,6 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev)pr_err ("QAT: Can't find acceleration device\n" );return PCI_ERS_RESULT_DISCONNECT ; } -pci_cleanup_aer_uncorrect_error_status (pdev);if (adf_dev_aer_schedule_reset (accel_dev,ADF_DEV_RESET_SYNC ))return PCI_ERS_RESULT_DISCONNECT ;drivers/dma/ioat/init.c +0
-6@@ -1267,12 +1267,6 @@ static pci_ers_result_t ioat_pcie_error_slot_reset(struct pci_dev *pdev)pci_wake_from_d3 (pdev, false); } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"AER uncorrect error status clear failed: %#x\n" , err); - } -return result; }drivers/infiniband/hw/hfi1/pcie.c +0
-1@@ -655,7 +655,6 @@ pci_resume(struct pci_dev *pdev)struct hfi1_devdata *dd =pci_get_drvdata (pdev);dd_dev_info (dd,"HFI1 resume function called\n" ); -pci_cleanup_aer_uncorrect_error_status (pdev);/* * Running jobs will fail, since it's asynchronous * unlike sysfs-requested reset. Better than drivers/infiniband/hw/qib/qib_pcie.c +0
-1@@ -597,7 +597,6 @@ qib_pci_resume(struct pci_dev *pdev)struct qib_devdata *dd =pci_get_drvdata (pdev);qib_devinfo (pdev,"QIB resume function called\n" ); -pci_cleanup_aer_uncorrect_error_status (pdev);/* * Running jobs will fail, since it's asynchronous * unlike sysfs-requested reset. Better than drivers/net/ethernet/atheros/alx/main.c +0
-2@@ -1960,8 +1960,6 @@ static pci_ers_result_t alx_pci_error_slot_reset(struct pci_dev *pdev)if (!alx_reset_mac (hw)) rc =PCI_ERS_RESULT_RECOVERED ; out: -pci_cleanup_aer_uncorrect_error_status (pdev); -rtnl_unlock ();return rc;drivers/net/ethernet/broadcom/bnx2.c +0
-7@@ -8793,13 +8793,6 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)if (!(bp->flags &BNX2_FLAG_AER_ENABLED ))return result; - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err);/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +0
-8@@ -14379,14 +14379,6 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)rtnl_unlock (); -/* If AER, perform cleanup of the PCIe registers */ -if (bp->flags &AER_ENABLED ) { -if (pci_cleanup_aer_uncorrect_error_status (pdev)) -BNX2X_ERR ("pci_cleanup_aer_uncorrect_error_status failed\n" ); -else -DP (NETIF_MSG_HW ,"pci_cleanup_aer_uncorrect_error_status succeeded\n" ); - } -return PCI_ERS_RESULT_RECOVERED ; }drivers/net/ethernet/broadcom/bnxt/bnxt.c +0
-7@@ -9076,13 +9076,6 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)rtnl_unlock (); - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err);/* non-fatal, continue */ - } -return PCI_ERS_RESULT_RECOVERED ; }drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0
-1@@ -4721,7 +4721,6 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)pci_set_master (pdev);pci_restore_state (pdev);pci_save_state (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);if (t4_wait_dev_ready (adap->regs) <0 )return PCI_ERS_RESULT_DISCONNECT ;drivers/net/ethernet/emulex/benet/be_main.c +0
-1@@ -6063,7 +6063,6 @@ static pci_ers_result_t be_eeh_reset(struct pci_dev *pdev)if (status)return PCI_ERS_RESULT_DISCONNECT ; -pci_cleanup_aer_uncorrect_error_status (pdev);be_clear_error (adapter,BE_CLEAR_ALL );return PCI_ERS_RESULT_RECOVERED ; }drivers/net/ethernet/intel/e1000e/netdev.c +0
-2@@ -6854,8 +6854,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } -pci_cleanup_aer_uncorrect_error_status (pdev); -return result; }drivers/net/ethernet/intel/fm10k/fm10k_pci.c +0
-2@@ -2462,8 +2462,6 @@ static pci_ers_result_t fm10k_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } -pci_cleanup_aer_uncorrect_error_status (pdev); -return result; }drivers/net/ethernet/intel/i40e/i40e_main.c +0
-8@@ -14245,14 +14245,6 @@ static pci_ers_result_t i40e_pci_error_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_DISCONNECT ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_info (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err); -/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/intel/igb/igb_main.c +0
-9@@ -8991,7 +8991,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)struct igb_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;pci_ers_result_t result; -int err;if (pci_enable_device_mem (pdev)) { dev_err(&pdev->dev,@@ -9015,14 +9014,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err); -/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0
-9@@ -10864,8 +10864,6 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,/* Free device reference count */ pci_dev_put (vfdev); } - -pci_cleanup_aer_uncorrect_error_status (pdev); }/* @@ -10935,13 +10933,6 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -e_dev_err ("pci_cleanup_aer_uncorrect_error_status " -"failed 0x%0x\n" , err); -/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +0
-6@@ -1790,11 +1790,6 @@ static pci_ers_result_t netxen_io_slot_reset(struct pci_dev *pdev)return err ?PCI_ERS_RESULT_DISCONNECT :PCI_ERS_RESULT_RECOVERED ; } -static void netxen_io_resume (struct pci_dev *pdev) -{ -pci_cleanup_aer_uncorrect_error_status (pdev); -} -static void netxen_nic_shutdown (struct pci_dev *pdev) {struct netxen_adapter *adapter =pci_get_drvdata (pdev);@@ -3490,7 +3485,6 @@ netxen_free_ip_list(struct netxen_adapter *adapter, bool master)static const struct pci_error_handlers netxen_err_handler = { .error_detected = netxen_io_error_detected, .slot_reset = netxen_io_slot_reset, - .resume = netxen_io_resume, };static struct pci_driver netxen_driver = {drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +0
-1@@ -4232,7 +4232,6 @@ static void qlcnic_83xx_io_resume(struct pci_dev *pdev) {struct qlcnic_adapter *adapter =pci_get_drvdata (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);if (test_and_clear_bit (__QLCNIC_AER, &adapter->state))qlcnic_83xx_aer_start_poll_work (adapter); }drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0
-1@@ -3975,7 +3975,6 @@ static void qlcnic_82xx_io_resume(struct pci_dev *pdev)u32 state;struct qlcnic_adapter *adapter =pci_get_drvdata (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev); state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE );if (state ==QLCNIC_DEV_READY &&test_and_clear_bit (__QLCNIC_AER, &adapter->state))drivers/net/ethernet/sfc/efx.c +0
-7@@ -3843,13 +3843,6 @@ static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev) status =PCI_ERS_RESULT_DISCONNECT ; } - rc =pci_cleanup_aer_uncorrect_error_status (pdev); -if (rc) { -netif_err (efx, hw, efx->net_dev, -"pci_cleanup_aer_uncorrect_error_status failed (%d)\n" , rc); -/* Non-fatal error. Continue. */ - } -return status; }drivers/net/ethernet/sfc/falcon/efx.c +0
-7@@ -3194,13 +3194,6 @@ static pci_ers_result_t ef4_io_slot_reset(struct pci_dev *pdev) status =PCI_ERS_RESULT_DISCONNECT ; } - rc =pci_cleanup_aer_uncorrect_error_status (pdev); -if (rc) { -netif_err (efx, hw, efx->net_dev, -"pci_cleanup_aer_uncorrect_error_status failed (%d)\n" , rc); -/* Non-fatal error. Continue. */ - } -return status; }drivers/nvme/host/pci.c +0
-1@@ -2678,7 +2678,6 @@ static void nvme_error_resume(struct pci_dev *pdev)struct nvme_dev *dev =pci_get_drvdata (pdev);flush_work (&dev->ctrl.reset_work); -pci_cleanup_aer_uncorrect_error_status (pdev); }static const struct pci_error_handlers nvme_err_handler = {drivers/pci/pcie/err.c +2
-0@@ -265,6 +265,8 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,* The error is non fatal so the bus is ok; just invoke * the callback for the function that logged the error. */ +if (cb == report_resume) +pci_cleanup_aer_uncorrect_error_status (dev);cb (dev, &result_data); }drivers/scsi/aacraid/linit.c +0
-2@@ -2055,8 +2055,6 @@ static void aac_pci_resume(struct pci_dev *pdev)struct scsi_device *sdev =NULL ;struct aac_dev *aac = (struct aac_dev *)shost_priv (shost); -pci_cleanup_aer_uncorrect_error_status (pdev); -if (aac_adapter_ioremap (aac, aac->base_size)) {dev_err (&pdev->dev,"aacraid: ioremap failed\n" );drivers/scsi/be2iscsi/be_main.c +0
-1@@ -5518,7 +5518,6 @@ static pci_ers_result_t beiscsi_eeh_reset(struct pci_dev *pdev)return PCI_ERS_RESULT_DISCONNECT ; } -pci_cleanup_aer_uncorrect_error_status (pdev);return PCI_ERS_RESULT_RECOVERED ; }drivers/scsi/bfa/bfad.c +0
-2@@ -1569,8 +1569,6 @@ bfad_pci_slot_reset(struct pci_dev *pdev)if (pci_set_dma_mask (bfad->pcidev,DMA_BIT_MASK (32 )) !=0 ) goto out_disable_device; -pci_cleanup_aer_uncorrect_error_status (pdev); -if (restart_bfa (bfad) ==-1 ) goto out_disable_device;drivers/scsi/csiostor/csio_init.c +0
-1@@ -1102,7 +1102,6 @@ csio_pci_slot_reset(struct pci_dev *pdev)pci_set_master (pdev);pci_restore_state (pdev);pci_save_state (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);/* Bring HW s/m to ready state. * but don't resume IOs. drivers/scsi/lpfc/lpfc_init.c +0
-8@@ -11331,10 +11331,6 @@ lpfc_io_resume_s3(struct pci_dev *pdev)/* Bring device online, it will be no-op for non-fatal error resume */ lpfc_online (phba); - -/* Clean up Advanced Error Reporting (AER) if needed */ -if (phba->hba_flag &HBA_AER_ENABLED ) -pci_cleanup_aer_uncorrect_error_status (pdev); }/** @@ -12146,10 +12142,6 @@ lpfc_io_resume_s4(struct pci_dev *pdev)/* Bring the device back online */ lpfc_online (phba); } - -/* Clean up Advanced Error Reporting (AER) if needed */ -if (phba->hba_flag &HBA_AER_ENABLED ) -pci_cleanup_aer_uncorrect_error_status (pdev); }/** drivers/scsi/mpt3sas/mpt3sas_scsih.c +0
-1@@ -10965,7 +10965,6 @@ scsih_pci_resume(struct pci_dev *pdev)pr_info (MPT3SAS_FMT "PCI error: resume callback!!\n" , ioc->name); -pci_cleanup_aer_uncorrect_error_status (pdev);mpt3sas_base_start_watchdog (ioc);scsi_unblock_requests (ioc->shost); }drivers/scsi/qla2xxx/qla_os.c +0
-2@@ -6823,8 +6823,6 @@ qla2xxx_pci_resume(struct pci_dev *pdev) "The device failed to resume I/O from slot/link_reset.\n"); } -pci_cleanup_aer_uncorrect_error_status (pdev); - ha->flags.eeh_busy =0 ; }drivers/scsi/qla4xxx/ql4_os.c +0
-1@@ -9824,7 +9824,6 @@ qla4xxx_pci_resume(struct pci_dev *pdev) __func__); } -pci_cleanup_aer_uncorrect_error_status (pdev);clear_bit (AF_EEH_BUSY , &ha->flags); }Signature · 1 line
2.7.4
Quoted 17 lines · Bjorn Helgaas
[+cc Sinan, LKML]
Quoted 6 lines · Oza Pawandeep
PCI based device drivers handles
ERR_NONFATALby registeringpci_error_handlers. some of the drivers clear AER uncorrectable status inslot_resetwhile some in resume.Drivers should not have responsibility of clearing the AER status, instead shall be done by error and recovery framework defined in
err.cAgreed, and Keith's patch
43c9a34fe04e("PCI/ERR: Always use the first downstream port") [1], which is queued on pci/hotplug for v4.20, does callpci_cleanup_aer_uncorrect_error_status()at the end ofpcie_do_recovery().1) Does that seem like the right place?
Quoted 8 lines
2) I guess all we need now would be to remove the calls from the drivers?
3) If we remove all the calls from the drivers, we should remove the declaration from
include/linux/aer.h, too.I can take care of these updates if we agree they're the right thing to do.
sure Bjorn. this patch already removes all the calls from drivers and adds call to pci_cleanup_aer_uncorrect_error_status().
Please feel free to modify or adapt and take care.
Regards,
Oza.
Quoted 503 lines
[1]
http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=43c9a34fe04eQuoted 499 lines
Clear the status while resuming, after
reset_linkwas successful.Signed-off-by Oza Pawandeep <[email protected]>drivers/crypto/qat/qat_common/adf_aer.c +0
-1@@ -198,7 +198,6 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev) pr_err("QAT: Can't find acceleration device\n");return PCI_ERS_RESULT_DISCONNECT ; } -pci_cleanup_aer_uncorrect_error_status (pdev);if (adf_dev_aer_schedule_reset (accel_dev,ADF_DEV_RESET_SYNC ))return PCI_ERS_RESULT_DISCONNECT ;drivers/dma/ioat/init.c +0
-6@@ -1267,12 +1267,6 @@ static pci_ers_result_t ioat_pcie_error_slot_reset(struct pci_dev *pdev)pci_wake_from_d3 (pdev, false); } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"AER uncorrect error status clear failed: %#x\n" , err); - } -return result; }drivers/infiniband/hw/hfi1/pcie.c +0
-1@@ -655,7 +655,6 @@ pci_resume(struct pci_dev *pdev)struct hfi1_devdata *dd =pci_get_drvdata (pdev);dd_dev_info (dd,"HFI1 resume function called\n" ); -pci_cleanup_aer_uncorrect_error_status (pdev);/* * Running jobs will fail, since it's asynchronous * unlike sysfs-requested reset. Better than drivers/infiniband/hw/qib/qib_pcie.c +0
-1@@ -597,7 +597,6 @@ qib_pci_resume(struct pci_dev *pdev)struct qib_devdata *dd =pci_get_drvdata (pdev);qib_devinfo (pdev,"QIB resume function called\n" ); -pci_cleanup_aer_uncorrect_error_status (pdev);/* * Running jobs will fail, since it's asynchronous * unlike sysfs-requested reset. Better than drivers/net/ethernet/atheros/alx/main.c +0
-2@@ -1960,8 +1960,6 @@ static pci_ers_result_t alx_pci_error_slot_reset(struct pci_dev *pdev) if (!alx_reset_mac(hw)) rc =PCI_ERS_RESULT_RECOVERED ; out: -pci_cleanup_aer_uncorrect_error_status (pdev); -rtnl_unlock ();drivers/net/ethernet/atheros/alx/main.c +0
-0return rc;drivers/net/ethernet/broadcom/bnx2.c +0
-7@@ -8793,13 +8793,6 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev) if (!(bp->flags & BNX2_FLAG_AER_ENABLED))return result; - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err);/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +0
-8@@ -14379,14 +14379,6 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)rtnl_unlock (); -/* If AER, perform cleanup of the PCIe registers */ -if (bp->flags &AER_ENABLED ) { -if (pci_cleanup_aer_uncorrect_error_status (pdev)) -BNX2X_ERR ("pci_cleanup_aer_uncorrect_error_status failed\n" ); -else -DP (NETIF_MSG_HW ,"pci_cleanup_aer_uncorrect_error_status succeeded\n"); - } - returnPCI_ERS_RESULT_RECOVERED ;}
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0
-7@@ -9076,13 +9076,6 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)rtnl_unlock (); - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err);/* non-fatal, continue */ - } -return PCI_ERS_RESULT_RECOVERED ; }drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0
-1@@ -4721,7 +4721,6 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)pci_set_master (pdev );pci_restore_state (pdev);pci_save_state (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);if (t4_wait_dev_ready (adap->regs) <0 )drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +0
-0return PCI_ERS_RESULT_DISCONNECT ;drivers/net/ethernet/emulex/benet/be_main.c +0
-1@@ -6063,7 +6063,6 @@ static pci_ers_result_t be_eeh_reset(struct pci_dev *pdev)if (status)return PCI_ERS_RESULT_DISCONNECT ; - pci_cleanup_aer_uncorrect_error_status(pdev);be_clear_error (adapter,BE_CLEAR_ALL );return PCI_ERS_RESULT_RECOVERED ;}
drivers/net/ethernet/intel/e1000e/netdev.c +0
-2@@ -6854,8 +6854,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } -pci_cleanup_aer_uncorrect_error_status (pdev); -return result; }drivers/net/ethernet/intel/fm10k/fm10k_pci.c +0
-2@@ -2462,8 +2462,6 @@ static pci_ers_result_t fm10k_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } -pci_cleanup_aer_uncorrect_error_status (pdev); -return result; }drivers/net/ethernet/intel/i40e/i40e_main.c +0
-8@@ -14245,14 +14245,6 @@ static pci_ers_result_t i40e_pci_error_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_DISCONNECT ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_info (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err); -/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/intel/igb/igb_main.c +0
-1@@ -8991,7 +8991,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)struct igb_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;pci_ers_result_t result; -int err;if (pci_enable_device_mem (pdev)) {drivers/net/ethernet/intel/igb/igb_main.c +0
-8dev_err(&pdev->dev,@@ -9015,14 +9014,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -dev_err (&pdev->dev, -"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n" , - err); -/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0
-2@@ -10864,8 +10864,6 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,/* Free device reference count */ pci_dev_put (vfdev); } - -pci_cleanup_aer_uncorrect_error_status (pdev); }drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0
-7/* @@ -10935,13 +10933,6 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) result =PCI_ERS_RESULT_RECOVERED ; } - err =pci_cleanup_aer_uncorrect_error_status (pdev); -if (err) { -e_dev_err ("pci_cleanup_aer_uncorrect_error_status " -"failed 0x%0x\n" , err); -/* non-fatal, continue */ - } -return result; }drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +0
-5@@ -1790,11 +1790,6 @@ static pci_ers_result_t netxen_io_slot_reset(struct pci_dev *pdev) return err ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED; } -static void netxen_io_resume (struct pci_dev *pdev) -{ -pci_cleanup_aer_uncorrect_error_status (pdev); -} -static void netxen_nic_shutdown (struct pci_dev *pdev) {drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +0
-1struct netxen_adapter *adapter =pci_get_drvdata (pdev);@@ -3490,7 +3485,6 @@ netxen_free_ip_list(struct netxen_adapter *adapter, bool master)static const struct pci_error_handlers netxen_err_handler = { .error_detected = netxen_io_error_detected, .slot_reset = netxen_io_slot_reset, - .resume = netxen_io_resume, };static struct
pci_drivernetxen_driver= {drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +0
-1@@ -4232,7 +4232,6 @@ static void qlcnic_83xx_io_resume(struct pci_dev *pdev) {struct qlcnic_adapter *adapter =pci_get_drvdata (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);if (test_and_clear_bit (__QLCNIC_AER, &adapter->state))qlcnic_83xx_aer_start_poll_work (adapter);}
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0
-1@@ -3975,7 +3975,6 @@ static void qlcnic_82xx_io_resume(struct pci_dev *pdev)u32 state;struct qlcnic_adapter *adapter =pci_get_drvdata (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev); state =QLC_SHARED_REG_RD32 (adapter,QLCNIC_CRB_DEV_STATE ); if (state == QLCNIC_DEV_READY && test_and_clear_bit(__QLCNIC_AER,drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0
-0&adapter->state))drivers/net/ethernet/sfc/efx.c +0
-7@@ -3843,13 +3843,6 @@ static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev) status =PCI_ERS_RESULT_DISCONNECT ; } - rc =pci_cleanup_aer_uncorrect_error_status (pdev); -if (rc) { -netif_err (efx, hw, efx->net_dev, -"pci_cleanup_aer_uncorrect_error_status failed (%d)\n" , rc); -/* Non-fatal error. Continue. */ - } -return status; }drivers/net/ethernet/sfc/falcon/efx.c +0
-7@@ -3194,13 +3194,6 @@ static pci_ers_result_t ef4_io_slot_reset(struct pci_dev *pdev) status =PCI_ERS_RESULT_DISCONNECT ; } - rc =pci_cleanup_aer_uncorrect_error_status (pdev); -if (rc) { -netif_err (efx, hw, efx->net_dev, -"pci_cleanup_aer_uncorrect_error_status failed (%d)\n" , rc); -/* Non-fatal error. Continue. */ - } -return status; }drivers/nvme/host/pci.c +0
-1@@ -2678,7 +2678,6 @@ static void nvme_error_resume(struct pci_dev *pdev)struct nvme_dev *dev =pci_get_drvdata (pdev);flush_work (&dev->ctrl.reset_work); -pci_cleanup_aer_uncorrect_error_status (pdev); }static const struct
pci_error_handlersnvme_err_handler= {drivers/pci/pcie/err.c +2
-0@@ -265,6 +265,8 @@ static pci_ers_result_tbroadcast_error_message(struct pci_dev *dev, * The error is non fatal so the bus is ok; just invoke * the callback for the function that logged the error. */ +if (cb == report_resume) +pci_cleanup_aer_uncorrect_error_status (dev);cb (dev, &result_data); }drivers/scsi/aacraid/linit.c +0
-2@@ -2055,8 +2055,6 @@ static void aac_pci_resume(struct pci_dev *pdev)struct scsi_device *sdev =NULL ;struct aac_dev *aac = (struct aac_dev *)shost_priv (shost); -pci_cleanup_aer_uncorrect_error_status (pdev); -if (aac_adapter_ioremap (aac, aac->base_size)) {dev_err (&pdev->dev,"aacraid: ioremap failed\n" );drivers/scsi/be2iscsi/be_main.c +0
-1@@ -5518,7 +5518,6 @@ static pci_ers_result_t beiscsi_eeh_reset(struct pci_dev *pdev)return PCI_ERS_RESULT_DISCONNECT ; } -pci_cleanup_aer_uncorrect_error_status (pdev);return PCI_ERS_RESULT_RECOVERED ; }drivers/scsi/bfa/bfad.c +0
-2@@ -1569,8 +1569,6 @@ bfad_pci_slot_reset(struct pci_dev *pdev)if (pci_set_dma_mask (bfad->pcidev,DMA_BIT_MASK (32 )) !=0 ) goto out_disable_device; -pci_cleanup_aer_uncorrect_error_status (pdev); -if (restart_bfa (bfad) ==-1 ) goto out_disable_device;drivers/scsi/csiostor/csio_init.c +0
-1@@ -1102,7 +1102,6 @@ csio_pci_slot_reset(struct pci_dev *pdev)pci_set_master (pdev);pci_restore_state (pdev);pci_save_state (pdev); -pci_cleanup_aer_uncorrect_error_status (pdev);/* Bring HW s/m to ready state. * but don't resume IOs. drivers/scsi/lpfc/lpfc_init.c +0
-4@@ -11331,10 +11331,6 @@ lpfc_io_resume_s3(struct pci_dev *pdev)/* Bring device online, it will be no-op for non-fatal error resume */ lpfc_online (phba); - -/* Clean up Advanced Error Reporting (AER) if needed */ -if (phba->hba_flag &HBA_AER_ENABLED ) -pci_cleanup_aer_uncorrect_error_status (pdev); }/**
drivers/scsi/lpfc/lpfc_init.c +0
-4@@ -12146,10 +12142,6 @@ lpfc_io_resume_s4(struct pci_dev *pdev)/* Bring the device back online */ lpfc_online (phba); } - -/* Clean up Advanced Error Reporting (AER) if needed */ -if (phba->hba_flag &HBA_AER_ENABLED ) -pci_cleanup_aer_uncorrect_error_status (pdev); }/** drivers/scsi/mpt3sas/mpt3sas_scsih.c +0
-1@@ -10965,7 +10965,6 @@ scsih_pci_resume(struct pci_dev *pdev)pr_info (MPT3SAS_FMT "PCI error: resume callback!!\n" , ioc->name); -pci_cleanup_aer_uncorrect_error_status (pdev);mpt3sas_base_start_watchdog (ioc);scsi_unblock_requests (ioc->shost); }drivers/scsi/qla2xxx/qla_os.c +0
-2@@ -6823,8 +6823,6 @@ qla2xxx_pci_resume(struct pci_dev *pdev) "The device failed to resume I/O from slot/link_reset.\n"); } -pci_cleanup_aer_uncorrect_error_status (pdev); - ha->flags.eeh_busy =0 ; }drivers/scsi/qla4xxx/ql4_os.c +0
-2@@ -9824,7 +9824,6 @@ qla4xxx_pci_resume(struct pci_dev *pdev) __func__); } -pci_cleanup_aer_uncorrect_error_status (pdev);clear_bit (AF_EEH_BUSY , &ha->flags); } --2.7.4
Quoted 2 lines · On 9/28/2018 6:24 AM, [email protected] wrote:
1) Does that seem like the right place?
IMO, I think best is to call after driver callback in PCI core. A driver specific action can cause some of these errors. We don't want to return with outstanding errors.
Quoted 3 lines
2) I guess all we need now would be to remove the calls from the
drivers?
yes
Quoted 3 lines
3) If we remove all the calls from the drivers, we should remove the
declaration from include/linux/aer.h, too.
makes sense
Quoted 2 lines
I can take care of these updates if we agree they're the right thing to do.