[2.6.28,1/1] cxgb3 - fix race in EEH

A SGE queue set timer might access registers while in EEH recovery,
triggering an EEH error loop. Stop all timers early in EEH process.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 5447f3e60f0..d355c826b9b 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -479,6 +479,7 @@ static int setup_sge_qsets(struct adapter *adap)
                                                              irq_idx,
                                 &adap->params.sge.qset[qset_idx], ntxq, dev);
                         if (err) {
+                                t3_stop_sge_timers(adap);
                                 t3_free_sge_resources(adap);
                                 return err;
                         }
@@ -2449,6 +2450,9 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
             test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map))
                 offload_close(&adapter->tdev);
 
+        /* Stop SGE timers */
+        t3_stop_sge_timers(adapter);
+
         adapter->flags &= ~FULL_INIT_DONE;
 
         pci_disable_device(pdev);
@@ -2801,6 +2805,7 @@ static void __devexit remove_one(struct pci_dev *pdev)
                     if (test_bit(i, &adapter->registered_device_map))
                         unregister_netdev(adapter->port[i]);
 
+                t3_stop_sge_timers(adapter);
                 t3_free_sge_resources(adapter);
                 cxgb_disable_msi(adapter);