| Message ID | 1371502045-8044-1-git-send-email-nsujir@broadcom.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "Nithin Nayak Sujir" <nsujir@broadcom.com> Date: Mon, 17 Jun 2013 13:47:25 -0700 > From: Michael Chan <mchan@broadcom.com> > > The current tg3 code assumes the pci_error_handlers to be always called > in sequence. In particular, during ->error_detected(), NAPI is disabled > and the device is shutdown. The device is later reset and NAPI > re-enabled in ->slot_reset() and ->resume(). > > In EEH, if more than 6 errors are detected in a hour, only > ->error_detected() will be called. This will leave the driver in an > inconsistent state as NAPI is disabled but netif_running state is still > true. When the device is later closed, we'll try to disable NAPI again > and it will loop forever. > > We fix this by closing the device if we encounter any error conditions > during the normal sequence of the pci_error_handlers. > > v2: Remove the changes in tg3_io_resume() based on Benjamin Poirier's > feedback. > > Signed-off-by: Michael Chan <mchan@broadcom.com> > Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 28a645f..297fc13 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -17747,10 +17747,13 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, tg3_full_unlock(tp); done: - if (state == pci_channel_io_perm_failure) + if (state == pci_channel_io_perm_failure) { + tg3_napi_enable(tp); + dev_close(netdev); err = PCI_ERS_RESULT_DISCONNECT; - else + } else { pci_disable_device(pdev); + } rtnl_unlock(); @@ -17796,6 +17799,10 @@ static pci_ers_result_t tg3_io_slot_reset(struct pci_dev *pdev) rc = PCI_ERS_RESULT_RECOVERED; done: + if (rc != PCI_ERS_RESULT_RECOVERED && netif_running(netdev)) { + tg3_napi_enable(tp); + dev_close(netdev); + } rtnl_unlock(); return rc;