qlcnic: fix async event handling during diagnostic loopback test

o Handle async events during diagnostic loopback test
o Clear loopback mode on failure to receive async events

Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 36c1474863661f96e90c59eb0189feb43817c530..51b4340deffaaee49e0e3d63cdf11a1292250e45 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -1436,13 +1436,15 @@ int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
                return status;
        }
 
-       /* Wait until firmware send IDC Completion AEN */
+       /* Wait for Link and IDC Completion AEN */
        do {
                msleep(300);
+               qlcnic_83xx_process_aen(adapter);
                if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {
                        dev_err(&adapter->pdev->dev,
                                "FW did not generate IDC completion AEN\n");
                        clear_bit(QLC_83XX_IDC_COMP_AEN, &ahw->idc.status);
+                       qlcnic_83xx_clear_lb_mode(adapter, mode);
                        return -EIO;
                }
        } while (test_bit(QLC_83XX_IDC_COMP_AEN, &ahw->idc.status));
@@ -1474,9 +1476,10 @@ int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *adapter, u8 mode)
                return status;
        }
 
-       /* Wait until firmware send IDC Completion AEN */
+       /* Wait for Link and IDC Completion AEN */
        do {
                msleep(300);
+               qlcnic_83xx_process_aen(adapter);
                if (loop++ > QLCNIC_ILB_MAX_RCV_LOOP) {
                        dev_err(&adapter->pdev->dev,
                                "Firmware didn't sent IDC completion AEN\n");