qlcnic: fix rx bytes statistics

[safe/jmp/linux-2.6] / drivers / net / qlcnic / qlcnic_main.c

diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 79c6e05..0a52d24 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -84,6 +84,7 @@ static void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter);
 static void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter);
 static void qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter);
 
+static void qlcnic_idc_debug_info(struct qlcnic_adapter *adapter, u8 encoding);
 static void qlcnic_clr_all_drv_state(struct qlcnic_adapter *adapter);
 static int qlcnic_can_start_firmware(struct qlcnic_adapter *adapter);
 
@@ -494,7 +495,9 @@ static void get_brd_name(struct qlcnic_adapter *adapter, char *name)
                        qlcnic_boards[i].device == pdev->device &&
                        qlcnic_boards[i].sub_vendor == pdev->subsystem_vendor &&
                        qlcnic_boards[i].sub_device == pdev->subsystem_device) {
-                               strcpy(name, qlcnic_boards[i].short_name);
+                               sprintf(name, "%pM: %s" ,
+                                       adapter->mac_addr,
+                                       qlcnic_boards[i].short_name);
                                found = 1;
                                break;
                }
@@ -620,6 +623,7 @@ wait_init:
                goto err_out;
 
        QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_READY);
+       qlcnic_idc_debug_info(adapter, 1);
 
        qlcnic_check_options(adapter);
 
@@ -1056,6 +1060,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        adapter = netdev_priv(netdev);
        adapter->netdev  = netdev;
        adapter->pdev    = pdev;
+       adapter->dev_rst_time = jiffies;
        adapter->ahw.pci_func  = pci_func_id;
 
        revision_id = pdev->revision;
@@ -1080,6 +1085,9 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_out_iounmap;
        }
 
+       if (qlcnic_read_mac_addr(adapter))
+               dev_warn(&pdev->dev, "failed to read mac addr\n");
+
        if (qlcnic_setup_idc_param(adapter))
                goto err_out_iounmap;
 
@@ -1694,7 +1702,7 @@ static struct net_device_stats *qlcnic_get_stats(struct net_device *netdev)
 
        stats->rx_packets = adapter->stats.rx_pkts + adapter->stats.lro_pkts;
        stats->tx_packets = adapter->stats.xmitfinished;
-       stats->rx_bytes = adapter->stats.rxbytes;
+       stats->rx_bytes = adapter->stats.rxbytes + adapter->stats.lrobytes;
        stats->tx_bytes = adapter->stats.txbytes;
        stats->rx_dropped = adapter->stats.rxdropped;
        stats->tx_dropped = adapter->stats.txdropped;
@@ -1887,6 +1895,19 @@ static void qlcnic_poll_controller(struct net_device *netdev)
 }
 #endif
 
+static void
+qlcnic_idc_debug_info(struct qlcnic_adapter *adapter, u8 encoding)
+{
+       u32 val;
+
+       val = adapter->portnum & 0xf;
+       val |= encoding << 7;
+       val |= (jiffies - adapter->dev_rst_time) << 8;
+
+       QLCWR32(adapter, QLCNIC_CRB_DRV_SCRATCH, val);
+       adapter->dev_rst_time = jiffies;
+}
+
 static int
 qlcnic_set_drv_state(struct qlcnic_adapter *adapter, u8 state)
 {
@@ -2010,6 +2031,7 @@ qlcnic_can_start_firmware(struct qlcnic_adapter *adapter)
        case QLCNIC_DEV_COLD:
                QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_INITIALIZING);
                QLCWR32(adapter, QLCNIC_CRB_DRV_IDC_VER, QLCNIC_DRV_IDC_VER);
+               qlcnic_idc_debug_info(adapter, 0);
                qlcnic_api_unlock(adapter);
                return 1;
 
@@ -2043,8 +2065,11 @@ qlcnic_can_start_firmware(struct qlcnic_adapter *adapter)
 
        do {
                msleep(1000);
-       } while ((QLCRD32(adapter, QLCNIC_CRB_DEV_STATE) != QLCNIC_DEV_READY)
-                       && --dev_init_timeo);
+               prev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
+
+               if (prev_state == QLCNIC_DEV_QUISCENT)
+                       continue;
+       } while ((prev_state != QLCNIC_DEV_READY) && --dev_init_timeo);
 
        if (!dev_init_timeo) {
                dev_err(&adapter->pdev->dev,
@@ -2075,6 +2100,14 @@ qlcnic_fwinit_work(struct work_struct *work)
        if (qlcnic_api_lock(adapter))
                goto err_ret;
 
+       dev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
+       if (dev_state ==  QLCNIC_DEV_QUISCENT) {
+               qlcnic_api_unlock(adapter);
+               qlcnic_schedule_work(adapter, qlcnic_fwinit_work,
+                                               FW_POLL_DELAY * 2);
+               return;
+       }
+
        if (adapter->fw_wait_cnt++ > adapter->reset_ack_timeo) {
                dev_err(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",
                                        adapter->reset_ack_timeo);
@@ -2084,11 +2117,25 @@ qlcnic_fwinit_work(struct work_struct *work)
        if (!qlcnic_check_drv_state(adapter)) {
 skip_ack_check:
                dev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
+
+               if (dev_state == QLCNIC_DEV_NEED_QUISCENT) {
+                       QLCWR32(adapter, QLCNIC_CRB_DEV_STATE,
+                                               QLCNIC_DEV_QUISCENT);
+                       qlcnic_schedule_work(adapter, qlcnic_fwinit_work,
+                                               FW_POLL_DELAY * 2);
+                       QLCDB(adapter, DRV, "Quiscing the driver\n");
+                       qlcnic_idc_debug_info(adapter, 0);
+
+                       qlcnic_api_unlock(adapter);
+                       return;
+               }
+
                if (dev_state == QLCNIC_DEV_NEED_RESET) {
                        QLCWR32(adapter, QLCNIC_CRB_DEV_STATE,
                                                QLCNIC_DEV_INITIALIZING);
                        set_bit(__QLCNIC_START_FW, &adapter->state);
                        QLCDB(adapter, DRV, "Restarting fw\n");
+                       qlcnic_idc_debug_info(adapter, 0);
                }
 
                qlcnic_api_unlock(adapter);
@@ -2106,6 +2153,8 @@ skip_ack_check:
        QLCDB(adapter, HW, "Func waiting: Device state=%u\n", dev_state);
 
        switch (dev_state) {
+       case QLCNIC_DEV_QUISCENT:
+       case QLCNIC_DEV_NEED_QUISCENT:
        case QLCNIC_DEV_NEED_RESET:
                qlcnic_schedule_work(adapter,
                        qlcnic_fwinit_work, FW_POLL_DELAY);
@@ -2182,6 +2231,7 @@ qlcnic_dev_request_reset(struct qlcnic_adapter *adapter)
        if (state == QLCNIC_DEV_READY) {
                QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_NEED_RESET);
                QLCDB(adapter, DRV, "NEED_RESET state set\n");
+               qlcnic_idc_debug_info(adapter, 0);
        }
 
        qlcnic_api_unlock(adapter);