]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/net/bnx2x_main.c
iwlwifi: use dtim_period from association, and set listen_interval
[linux-2.6-omap-h63xx.git] / drivers / net / bnx2x_main.c
index 70cba64732ca03827e7268aecf529d7e1940baab..af251a5df844929097ef67adb394936871bbec3b 100644 (file)
@@ -1,4 +1,4 @@
-/* bnx2x.c: Broadcom Everest network driver.
+/* bnx2x_main.c: Broadcom Everest network driver.
  *
  * Copyright (c) 2007-2008 Broadcom Corporation
  *
  *
  */
 
-/* define this to make the driver freeze on error
- * to allow getting debug info
- * (you will need to reboot afterwards)
- */
-/*#define BNX2X_STOP_ON_ERROR*/
-
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/mii.h>
 #ifdef NETIF_F_HW_VLAN_TX
        #include <linux/if_vlan.h>
-       #define BCM_VLAN 1
 #endif
 #include <net/ip.h>
 #include <net/tcp.h>
 #include <net/checksum.h>
+#include <linux/version.h>
+#include <net/ip6_checksum.h>
 #include <linux/workqueue.h>
 #include <linux/crc32.h>
+#include <linux/crc32c.h>
 #include <linux/prefetch.h>
 #include <linux/zlib.h>
-#include <linux/version.h>
 #include <linux/io.h>
 
 #include "bnx2x_reg.h"
 #include "bnx2x_fw_defs.h"
 #include "bnx2x_hsi.h"
+#include "bnx2x_link.h"
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.42.4"
-#define DRV_MODULE_RELDATE      "2008/4/9"
-#define BNX2X_BC_VER           0x040200
+#define DRV_MODULE_VERSION      "1.45.6"
+#define DRV_MODULE_RELDATE      "2008/06/23"
+#define BNX2X_BC_VER           0x040200
 
-/* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT             (5*HZ)
+/* Time in jiffies before concluding the transmitter is hung */
+#define TX_TIMEOUT             (5*HZ)
 
 static char version[] __devinitdata =
-       "Broadcom NetXtreme II 5771X 10Gigabit Ethernet Driver "
+       "Broadcom NetXtreme II 5771x 10Gigabit Ethernet Driver "
        DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("Eliezer Tamir");
@@ -82,20 +78,21 @@ MODULE_VERSION(DRV_MODULE_VERSION);
 
 static int use_inta;
 static int poll;
-static int onefunc;
-static int nomcp;
 static int debug;
+static int disable_tpa;
+static int nomcp;
+static int load_count[3]; /* 0-common, 1-port0, 2-port1 */
 static int use_multi;
 
 module_param(use_inta, int, 0);
 module_param(poll, int, 0);
-module_param(onefunc, int, 0);
 module_param(debug, int, 0);
+module_param(disable_tpa, int, 0);
+module_param(nomcp, int, 0);
 MODULE_PARM_DESC(use_inta, "use INT#A instead of MSI-X");
 MODULE_PARM_DESC(poll, "use polling (for debug)");
-MODULE_PARM_DESC(onefunc, "enable only first function");
-MODULE_PARM_DESC(nomcp, "ignore management CPU (Implies onefunc)");
 MODULE_PARM_DESC(debug, "default debug msglevel");
+MODULE_PARM_DESC(nomcp, "ignore management CPU");
 
 #ifdef BNX2X_MULTI
 module_param(use_multi, int, 0);
@@ -104,18 +101,27 @@ MODULE_PARM_DESC(use_multi, "use per-CPU queues");
 
 enum bnx2x_board_type {
        BCM57710 = 0,
+       BCM57711 = 1,
+       BCM57711E = 2,
 };
 
-/* indexed by board_t, above */
+/* indexed by board_type, above */
 static struct {
        char *name;
 } board_info[] __devinitdata = {
-       { "Broadcom NetXtreme II BCM57710 XGb" }
+       { "Broadcom NetXtreme II BCM57710 XGb" },
+       { "Broadcom NetXtreme II BCM57711 XGb" },
+       { "Broadcom NetXtreme II BCM57711E XGb" }
 };
 
+
 static const struct pci_device_id bnx2x_pci_tbl[] = {
        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_57710,
                PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM57710 },
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_57711,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM57711 },
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_57711E,
+               PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM57711E },
        { 0 }
 };
 
@@ -136,7 +142,6 @@ static void bnx2x_reg_wr_ind(struct bnx2x *bp, u32 addr, u32 val)
                               PCICFG_VENDOR_ID_OFFSET);
 }
 
-#ifdef BNX2X_IND_RD
 static u32 bnx2x_reg_rd_ind(struct bnx2x *bp, u32 addr)
 {
        u32 val;
@@ -148,7 +153,6 @@ static u32 bnx2x_reg_rd_ind(struct bnx2x *bp, u32 addr)
 
        return val;
 }
-#endif
 
 static const u32 dmae_reg_go_c[] = {
        DMAE_REG_GO_C0, DMAE_REG_GO_C1, DMAE_REG_GO_C2, DMAE_REG_GO_C3,
@@ -168,19 +172,29 @@ static void bnx2x_post_dmae(struct bnx2x *bp, struct dmae_command *dmae,
        for (i = 0; i < (sizeof(struct dmae_command)/4); i++) {
                REG_WR(bp, cmd_offset + i*4, *(((u32 *)dmae) + i));
 
-/*             DP(NETIF_MSG_DMAE, "DMAE cmd[%d].%d (0x%08x) : 0x%08x\n",
-                  idx, i, cmd_offset + i*4, *(((u32 *)dmae) + i)); */
+               DP(BNX2X_MSG_OFF, "DMAE cmd[%d].%d (0x%08x) : 0x%08x\n",
+                  idx, i, cmd_offset + i*4, *(((u32 *)dmae) + i));
        }
        REG_WR(bp, dmae_reg_go_c[idx], 1);
 }
 
-static void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr,
-                            u32 dst_addr, u32 len32)
+void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,
+                     u32 len32)
 {
-       struct dmae_command *dmae = &bp->dmae;
-       int port = bp->port;
+       struct dmae_command *dmae = &bp->init_dmae;
        u32 *wb_comp = bnx2x_sp(bp, wb_comp);
-       int timeout = 200;
+       int cnt = 200;
+
+       if (!bp->dmae_ready) {
+               u32 *data = bnx2x_sp(bp, wb_data[0]);
+
+               DP(BNX2X_MSG_OFF, "DMAE is not ready (dst_addr %08x  len32 %d)"
+                  "  using indirect\n", dst_addr, len32);
+               bnx2x_init_ind_wr(bp, dst_addr, data, len32);
+               return;
+       }
+
+       mutex_lock(&bp->dmae_mutex);
 
        memset(dmae, 0, sizeof(struct dmae_command));
 
@@ -192,7 +206,8 @@ static void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr,
 #else
                        DMAE_CMD_ENDIANITY_DW_SWAP |
 #endif
-                       (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0));
+                       (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                       (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
        dmae->src_addr_lo = U64_LO(dma_addr);
        dmae->src_addr_hi = U64_HI(dma_addr);
        dmae->dst_addr_lo = dst_addr >> 2;
@@ -200,49 +215,62 @@ static void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr,
        dmae->len = len32;
        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, wb_comp));
        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, wb_comp));
-       dmae->comp_val = BNX2X_WB_COMP_VAL;
+       dmae->comp_val = DMAE_COMP_VAL;
 
-/*
-       DP(NETIF_MSG_DMAE, "dmae: opcode 0x%08x\n"
+       DP(BNX2X_MSG_OFF, "dmae: opcode 0x%08x\n"
           DP_LEVEL "src_addr  [%x:%08x]  len [%d *4]  "
                    "dst_addr [%x:%08x (%08x)]\n"
           DP_LEVEL "comp_addr [%x:%08x]  comp_val 0x%08x\n",
           dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
           dmae->len, dmae->dst_addr_hi, dmae->dst_addr_lo, dst_addr,
           dmae->comp_addr_hi, dmae->comp_addr_lo, dmae->comp_val);
-*/
-/*
-       DP(NETIF_MSG_DMAE, "data [0x%08x 0x%08x 0x%08x 0x%08x]\n",
+       DP(BNX2X_MSG_OFF, "data [0x%08x 0x%08x 0x%08x 0x%08x]\n",
           bp->slowpath->wb_data[0], bp->slowpath->wb_data[1],
           bp->slowpath->wb_data[2], bp->slowpath->wb_data[3]);
-*/
 
        *wb_comp = 0;
 
-       bnx2x_post_dmae(bp, dmae, port * 8);
+       bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
 
        udelay(5);
-       /* adjust timeout for emulation/FPGA */
-       if (CHIP_REV_IS_SLOW(bp))
-               timeout *= 100;
-       while (*wb_comp != BNX2X_WB_COMP_VAL) {
-/*             DP(NETIF_MSG_DMAE, "wb_comp 0x%08x\n", *wb_comp); */
-               udelay(5);
-               if (!timeout) {
+
+       while (*wb_comp != DMAE_COMP_VAL) {
+               DP(BNX2X_MSG_OFF, "wb_comp 0x%08x\n", *wb_comp);
+
+               /* adjust delay for emulation/FPGA */
+               if (CHIP_REV_IS_SLOW(bp))
+                       msleep(100);
+               else
+                       udelay(5);
+
+               if (!cnt) {
                        BNX2X_ERR("dmae timeout!\n");
                        break;
                }
-               timeout--;
+               cnt--;
        }
+
+       mutex_unlock(&bp->dmae_mutex);
 }
 
-#ifdef BNX2X_DMAE_RD
-static void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
+void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
 {
-       struct dmae_command *dmae = &bp->dmae;
-       int port = bp->port;
+       struct dmae_command *dmae = &bp->init_dmae;
        u32 *wb_comp = bnx2x_sp(bp, wb_comp);
-       int timeout = 200;
+       int cnt = 200;
+
+       if (!bp->dmae_ready) {
+               u32 *data = bnx2x_sp(bp, wb_data[0]);
+               int i;
+
+               DP(BNX2X_MSG_OFF, "DMAE is not ready (src_addr %08x  len32 %d)"
+                  "  using indirect\n", src_addr, len32);
+               for (i = 0; i < len32; i++)
+                       data[i] = bnx2x_reg_rd_ind(bp, src_addr + i*4);
+               return;
+       }
+
+       mutex_lock(&bp->dmae_mutex);
 
        memset(bnx2x_sp(bp, wb_data[0]), 0, sizeof(u32) * 4);
        memset(dmae, 0, sizeof(struct dmae_command));
@@ -255,7 +283,8 @@ static void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
 #else
                        DMAE_CMD_ENDIANITY_DW_SWAP |
 #endif
-                       (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0));
+                       (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                       (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
        dmae->src_addr_lo = src_addr >> 2;
        dmae->src_addr_hi = 0;
        dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, wb_data));
@@ -263,82 +292,182 @@ static void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
        dmae->len = len32;
        dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, wb_comp));
        dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, wb_comp));
-       dmae->comp_val = BNX2X_WB_COMP_VAL;
+       dmae->comp_val = DMAE_COMP_VAL;
 
-/*
-       DP(NETIF_MSG_DMAE, "dmae: opcode 0x%08x\n"
+       DP(BNX2X_MSG_OFF, "dmae: opcode 0x%08x\n"
           DP_LEVEL "src_addr  [%x:%08x]  len [%d *4]  "
                    "dst_addr [%x:%08x (%08x)]\n"
           DP_LEVEL "comp_addr [%x:%08x]  comp_val 0x%08x\n",
           dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
           dmae->len, dmae->dst_addr_hi, dmae->dst_addr_lo, src_addr,
           dmae->comp_addr_hi, dmae->comp_addr_lo, dmae->comp_val);
-*/
 
        *wb_comp = 0;
 
-       bnx2x_post_dmae(bp, dmae, port * 8);
+       bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
 
        udelay(5);
-       while (*wb_comp != BNX2X_WB_COMP_VAL) {
-               udelay(5);
-               if (!timeout) {
+
+       while (*wb_comp != DMAE_COMP_VAL) {
+
+               /* adjust delay for emulation/FPGA */
+               if (CHIP_REV_IS_SLOW(bp))
+                       msleep(100);
+               else
+                       udelay(5);
+
+               if (!cnt) {
                        BNX2X_ERR("dmae timeout!\n");
                        break;
                }
-               timeout--;
+               cnt--;
        }
-/*
-       DP(NETIF_MSG_DMAE, "data [0x%08x 0x%08x 0x%08x 0x%08x]\n",
+       DP(BNX2X_MSG_OFF, "data [0x%08x 0x%08x 0x%08x 0x%08x]\n",
           bp->slowpath->wb_data[0], bp->slowpath->wb_data[1],
           bp->slowpath->wb_data[2], bp->slowpath->wb_data[3]);
-*/
+
+       mutex_unlock(&bp->dmae_mutex);
+}
+
+/* used only for slowpath so not inlined */
+static void bnx2x_wb_wr(struct bnx2x *bp, int reg, u32 val_hi, u32 val_lo)
+{
+       u32 wb_write[2];
+
+       wb_write[0] = val_hi;
+       wb_write[1] = val_lo;
+       REG_WR_DMAE(bp, reg, wb_write, 2);
+}
+
+#ifdef USE_WB_RD
+static u64 bnx2x_wb_rd(struct bnx2x *bp, int reg)
+{
+       u32 wb_data[2];
+
+       REG_RD_DMAE(bp, reg, wb_data, 2);
+
+       return HILO_U64(wb_data[0], wb_data[1]);
 }
 #endif
 
 static int bnx2x_mc_assert(struct bnx2x *bp)
 {
-       int i, j, rc = 0;
        char last_idx;
-       const char storm[] = {"XTCU"};
-       const u32 intmem_base[] = {
-               BAR_XSTRORM_INTMEM,
-               BAR_TSTRORM_INTMEM,
-               BAR_CSTRORM_INTMEM,
-               BAR_USTRORM_INTMEM
-       };
+       int i, rc = 0;
+       u32 row0, row1, row2, row3;
 
-       /* Go through all instances of all SEMIs */
-       for (i = 0; i < 4; i++) {
-               last_idx = REG_RD8(bp, XSTORM_ASSERT_LIST_INDEX_OFFSET +
-                                  intmem_base[i]);
-               if (last_idx)
-                       BNX2X_LOG("DATA %cSTORM_ASSERT_LIST_INDEX 0x%x\n",
-                                 storm[i], last_idx);
-
-               /* print the asserts */
-               for (j = 0; j < STROM_ASSERT_ARRAY_SIZE; j++) {
-                       u32 row0, row1, row2, row3;
-
-                       row0 = REG_RD(bp, XSTORM_ASSERT_LIST_OFFSET(j) +
-                                     intmem_base[i]);
-                       row1 = REG_RD(bp, XSTORM_ASSERT_LIST_OFFSET(j) + 4 +
-                                     intmem_base[i]);
-                       row2 = REG_RD(bp, XSTORM_ASSERT_LIST_OFFSET(j) + 8 +
-                                     intmem_base[i]);
-                       row3 = REG_RD(bp, XSTORM_ASSERT_LIST_OFFSET(j) + 12 +
-                                     intmem_base[i]);
-
-                       if (row0 != COMMON_ASM_INVALID_ASSERT_OPCODE) {
-                               BNX2X_LOG("DATA %cSTORM_ASSERT_INDEX 0x%x ="
-                                         " 0x%08x 0x%08x 0x%08x 0x%08x\n",
-                                         storm[i], j, row3, row2, row1, row0);
-                               rc++;
-                       } else {
-                               break;
-                       }
+       /* XSTORM */
+       last_idx = REG_RD8(bp, BAR_XSTRORM_INTMEM +
+                          XSTORM_ASSERT_LIST_INDEX_OFFSET);
+       if (last_idx)
+               BNX2X_ERR("XSTORM_ASSERT_LIST_INDEX 0x%x\n", last_idx);
+
+       /* print the asserts */
+       for (i = 0; i < STROM_ASSERT_ARRAY_SIZE; i++) {
+
+               row0 = REG_RD(bp, BAR_XSTRORM_INTMEM +
+                             XSTORM_ASSERT_LIST_OFFSET(i));
+               row1 = REG_RD(bp, BAR_XSTRORM_INTMEM +
+                             XSTORM_ASSERT_LIST_OFFSET(i) + 4);
+               row2 = REG_RD(bp, BAR_XSTRORM_INTMEM +
+                             XSTORM_ASSERT_LIST_OFFSET(i) + 8);
+               row3 = REG_RD(bp, BAR_XSTRORM_INTMEM +
+                             XSTORM_ASSERT_LIST_OFFSET(i) + 12);
+
+               if (row0 != COMMON_ASM_INVALID_ASSERT_OPCODE) {
+                       BNX2X_ERR("XSTORM_ASSERT_INDEX 0x%x = 0x%08x"
+                                 " 0x%08x 0x%08x 0x%08x\n",
+                                 i, row3, row2, row1, row0);
+                       rc++;
+               } else {
+                       break;
+               }
+       }
+
+       /* TSTORM */
+       last_idx = REG_RD8(bp, BAR_TSTRORM_INTMEM +
+                          TSTORM_ASSERT_LIST_INDEX_OFFSET);
+       if (last_idx)
+               BNX2X_ERR("TSTORM_ASSERT_LIST_INDEX 0x%x\n", last_idx);
+
+       /* print the asserts */
+       for (i = 0; i < STROM_ASSERT_ARRAY_SIZE; i++) {
+
+               row0 = REG_RD(bp, BAR_TSTRORM_INTMEM +
+                             TSTORM_ASSERT_LIST_OFFSET(i));
+               row1 = REG_RD(bp, BAR_TSTRORM_INTMEM +
+                             TSTORM_ASSERT_LIST_OFFSET(i) + 4);
+               row2 = REG_RD(bp, BAR_TSTRORM_INTMEM +
+                             TSTORM_ASSERT_LIST_OFFSET(i) + 8);
+               row3 = REG_RD(bp, BAR_TSTRORM_INTMEM +
+                             TSTORM_ASSERT_LIST_OFFSET(i) + 12);
+
+               if (row0 != COMMON_ASM_INVALID_ASSERT_OPCODE) {
+                       BNX2X_ERR("TSTORM_ASSERT_INDEX 0x%x = 0x%08x"
+                                 " 0x%08x 0x%08x 0x%08x\n",
+                                 i, row3, row2, row1, row0);
+                       rc++;
+               } else {
+                       break;
+               }
+       }
+
+       /* CSTORM */
+       last_idx = REG_RD8(bp, BAR_CSTRORM_INTMEM +
+                          CSTORM_ASSERT_LIST_INDEX_OFFSET);
+       if (last_idx)
+               BNX2X_ERR("CSTORM_ASSERT_LIST_INDEX 0x%x\n", last_idx);
+
+       /* print the asserts */
+       for (i = 0; i < STROM_ASSERT_ARRAY_SIZE; i++) {
+
+               row0 = REG_RD(bp, BAR_CSTRORM_INTMEM +
+                             CSTORM_ASSERT_LIST_OFFSET(i));
+               row1 = REG_RD(bp, BAR_CSTRORM_INTMEM +
+                             CSTORM_ASSERT_LIST_OFFSET(i) + 4);
+               row2 = REG_RD(bp, BAR_CSTRORM_INTMEM +
+                             CSTORM_ASSERT_LIST_OFFSET(i) + 8);
+               row3 = REG_RD(bp, BAR_CSTRORM_INTMEM +
+                             CSTORM_ASSERT_LIST_OFFSET(i) + 12);
+
+               if (row0 != COMMON_ASM_INVALID_ASSERT_OPCODE) {
+                       BNX2X_ERR("CSTORM_ASSERT_INDEX 0x%x = 0x%08x"
+                                 " 0x%08x 0x%08x 0x%08x\n",
+                                 i, row3, row2, row1, row0);
+                       rc++;
+               } else {
+                       break;
+               }
+       }
+
+       /* USTORM */
+       last_idx = REG_RD8(bp, BAR_USTRORM_INTMEM +
+                          USTORM_ASSERT_LIST_INDEX_OFFSET);
+       if (last_idx)
+               BNX2X_ERR("USTORM_ASSERT_LIST_INDEX 0x%x\n", last_idx);
+
+       /* print the asserts */
+       for (i = 0; i < STROM_ASSERT_ARRAY_SIZE; i++) {
+
+               row0 = REG_RD(bp, BAR_USTRORM_INTMEM +
+                             USTORM_ASSERT_LIST_OFFSET(i));
+               row1 = REG_RD(bp, BAR_USTRORM_INTMEM +
+                             USTORM_ASSERT_LIST_OFFSET(i) + 4);
+               row2 = REG_RD(bp, BAR_USTRORM_INTMEM +
+                             USTORM_ASSERT_LIST_OFFSET(i) + 8);
+               row3 = REG_RD(bp, BAR_USTRORM_INTMEM +
+                             USTORM_ASSERT_LIST_OFFSET(i) + 12);
+
+               if (row0 != COMMON_ASM_INVALID_ASSERT_OPCODE) {
+                       BNX2X_ERR("USTORM_ASSERT_INDEX 0x%x = 0x%08x"
+                                 " 0x%08x 0x%08x 0x%08x\n",
+                                 i, row3, row2, row1, row0);
+                       rc++;
+               } else {
+                       break;
                }
        }
+
        return rc;
 }
 
@@ -381,15 +510,20 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
                struct eth_tx_db_data *hw_prods = fp->hw_tx_prods;
 
                BNX2X_ERR("queue[%d]: tx_pkt_prod(%x)  tx_pkt_cons(%x)"
-                         "  tx_bd_prod(%x)  tx_bd_cons(%x)  *tx_cons_sb(%x)"
-                         "  *rx_cons_sb(%x)  rx_comp_prod(%x)"
-                         "  rx_comp_cons(%x)  fp_c_idx(%x)  fp_u_idx(%x)"
-                         "  bd data(%x,%x)\n",
+                         "  tx_bd_prod(%x)  tx_bd_cons(%x)  *tx_cons_sb(%x)\n",
                          i, fp->tx_pkt_prod, fp->tx_pkt_cons, fp->tx_bd_prod,
-                         fp->tx_bd_cons, *fp->tx_cons_sb, *fp->rx_cons_sb,
-                         fp->rx_comp_prod, fp->rx_comp_cons, fp->fp_c_idx,
-                         fp->fp_u_idx, hw_prods->packets_prod,
-                         hw_prods->bds_prod);
+                         fp->tx_bd_cons, le16_to_cpu(*fp->tx_cons_sb));
+               BNX2X_ERR("          rx_comp_prod(%x)  rx_comp_cons(%x)"
+                         "  *rx_cons_sb(%x)  *rx_bd_cons_sb(%x)"
+                         "  rx_sge_prod(%x)  last_max_sge(%x)\n",
+                         fp->rx_comp_prod, fp->rx_comp_cons,
+                         le16_to_cpu(*fp->rx_cons_sb),
+                         le16_to_cpu(*fp->rx_bd_cons_sb),
+                         fp->rx_sge_prod, fp->last_max_sge);
+               BNX2X_ERR("          fp_c_idx(%x)  fp_u_idx(%x)"
+                         "  bd data(%x,%x)  rx_alloc_failed(%lx)\n",
+                         fp->fp_c_idx, fp->fp_u_idx, hw_prods->packets_prod,
+                         hw_prods->bds_prod, fp->rx_alloc_failed);
 
                start = TX_BD(le16_to_cpu(*fp->tx_cons_sb) - 10);
                end = TX_BD(le16_to_cpu(*fp->tx_cons_sb) + 245);
@@ -416,7 +550,17 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
                        struct sw_rx_bd *sw_bd = &fp->rx_buf_ring[j];
 
                        BNX2X_ERR("rx_bd[%x]=[%x:%x]  sw_bd=[%p]\n",
-                                 j, rx_bd[0], rx_bd[1], sw_bd->skb);
+                                 j, rx_bd[1], rx_bd[0], sw_bd->skb);
+               }
+
+               start = 0;
+               end = RX_SGE_CNT*NUM_RX_SGE_PAGES;
+               for (j = start; j < end; j++) {
+                       u32 *rx_sge = (u32 *)&fp->rx_sge_ring[j];
+                       struct sw_rx_page *sw_page = &fp->rx_page_ring[j];
+
+                       BNX2X_ERR("rx_sge[%x]=[%x:%x]  sw_page=[%p]\n",
+                                 j, rx_sge[1], rx_sge[0], sw_page->page);
                }
 
                start = RCQ_BD(fp->rx_comp_cons - 10);
@@ -435,17 +579,17 @@ static void bnx2x_panic_dump(struct bnx2x *bp)
                  bp->def_c_idx, bp->def_u_idx, bp->def_x_idx, bp->def_t_idx,
                  bp->def_att_idx, bp->attn_state, bp->spq_prod_idx);
 
-
+       bnx2x_fw_dump(bp);
        bnx2x_mc_assert(bp);
        BNX2X_ERR("end crash dump -----------------\n");
 
-       bp->stats_state = STATS_STATE_DISABLE;
-       DP(BNX2X_MSG_STATS, "stats_state - DISABLE\n");
+       bp->stats_state = STATS_STATE_DISABLED;
+       DP(BNX2X_MSG_STATS, "stats_state - DISABLED\n");
 }
 
 static void bnx2x_int_enable(struct bnx2x *bp)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
        u32 addr = port ? HC_REG_CONFIG_1 : HC_REG_CONFIG_0;
        u32 val = REG_RD(bp, addr);
        int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0;
@@ -460,7 +604,6 @@ static void bnx2x_int_enable(struct bnx2x *bp)
                        HC_CONFIG_0_REG_INT_LINE_EN_0 |
                        HC_CONFIG_0_REG_ATTN_BIT_EN_0);
 
-               /* Errata A0.158 workaround */
                DP(NETIF_MSG_INTR, "write %x to HC %d (addr 0x%x)  MSI-X %d\n",
                   val, port, addr, msix);
 
@@ -473,11 +616,25 @@ static void bnx2x_int_enable(struct bnx2x *bp)
           val, port, addr, msix);
 
        REG_WR(bp, addr, val);
+
+       if (CHIP_IS_E1H(bp)) {
+               /* init leading/trailing edge */
+               if (IS_E1HMF(bp)) {
+                       val = (0xfe0f | (1 << (BP_E1HVN(bp) + 4)));
+                       if (bp->port.pmf)
+                               /* enable nig attention */
+                               val |= 0x0100;
+               } else
+                       val = 0xffff;
+
+               REG_WR(bp, HC_REG_TRAILING_EDGE_0 + port*8, val);
+               REG_WR(bp, HC_REG_LEADING_EDGE_0 + port*8, val);
+       }
 }
 
 static void bnx2x_int_disable(struct bnx2x *bp)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
        u32 addr = port ? HC_REG_CONFIG_1 : HC_REG_CONFIG_0;
        u32 val = REG_RD(bp, addr);
 
@@ -496,10 +653,10 @@ static void bnx2x_int_disable(struct bnx2x *bp)
 
 static void bnx2x_int_disable_sync(struct bnx2x *bp)
 {
-
        int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0;
        int i;
 
+       /* disable interrupt handling */
        atomic_inc(&bp->intr_sem);
        /* prevent the HW from sending interrupts */
        bnx2x_int_disable(bp);
@@ -516,30 +673,29 @@ static void bnx2x_int_disable_sync(struct bnx2x *bp)
 
        /* make sure sp_task is not running */
        cancel_work_sync(&bp->sp_task);
-
 }
 
-/* fast path code */
+/* fast path */
 
 /*
- * general service functions
+ * General service functions
  */
 
-static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 id,
+static inline void bnx2x_ack_sb(struct bnx2x *bp, u8 sb_id,
                                u8 storm, u16 index, u8 op, u8 update)
 {
-       u32 igu_addr = (IGU_ADDR_INT_ACK + IGU_PORT_BASE * bp->port) * 8;
+       u32 igu_addr = (IGU_ADDR_INT_ACK + IGU_FUNC_BASE * BP_FUNC(bp)) * 8;
        struct igu_ack_register igu_ack;
 
        igu_ack.status_block_index = index;
        igu_ack.sb_id_and_flags =
-                       ((id << IGU_ACK_REGISTER_STATUS_BLOCK_ID_SHIFT) |
+                       ((sb_id << IGU_ACK_REGISTER_STATUS_BLOCK_ID_SHIFT) |
                         (storm << IGU_ACK_REGISTER_STORM_ID_SHIFT) |
                         (update << IGU_ACK_REGISTER_UPDATE_INDEX_SHIFT) |
                         (op << IGU_ACK_REGISTER_INTERRUPT_MODE_SHIFT));
 
-/*      DP(NETIF_MSG_INTR, "write 0x%08x to IGU addr 0x%x\n",
-          (*(u32 *)&igu_ack), BAR_IGU_INTMEM + igu_addr); */
+       DP(BNX2X_MSG_OFF, "write 0x%08x to IGU addr 0x%x\n",
+          (*(u32 *)&igu_ack), BAR_IGU_INTMEM + igu_addr);
        REG_WR(bp, BAR_IGU_INTMEM + igu_addr, (*(u32 *)&igu_ack));
 }
 
@@ -567,8 +723,9 @@ static inline int bnx2x_has_work(struct bnx2x_fastpath *fp)
        if ((rx_cons_sb & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
                rx_cons_sb++;
 
-       if ((rx_cons_sb != fp->rx_comp_cons) ||
-           (le16_to_cpu(*fp->tx_cons_sb) != fp->tx_pkt_cons))
+       if ((fp->rx_comp_cons != rx_cons_sb) ||
+           (fp->tx_pkt_prod != le16_to_cpu(*fp->tx_cons_sb)) ||
+           (fp->tx_pkt_prod != fp->tx_pkt_cons))
                return 1;
 
        return 0;
@@ -576,11 +733,11 @@ static inline int bnx2x_has_work(struct bnx2x_fastpath *fp)
 
 static u16 bnx2x_ack_int(struct bnx2x *bp)
 {
-       u32 igu_addr = (IGU_ADDR_SIMD_MASK + IGU_PORT_BASE * bp->port) * 8;
+       u32 igu_addr = (IGU_ADDR_SIMD_MASK + IGU_FUNC_BASE * BP_FUNC(bp)) * 8;
        u32 result = REG_RD(bp, BAR_IGU_INTMEM + igu_addr);
 
-/*      DP(NETIF_MSG_INTR, "read 0x%08x from IGU addr 0x%x\n",
-          result, BAR_IGU_INTMEM + igu_addr); */
+       DP(BNX2X_MSG_OFF, "read 0x%08x from IGU addr 0x%x\n",
+          result, BAR_IGU_INTMEM + igu_addr);
 
 #ifdef IGU_DEBUG
 #warning IGU_DEBUG active
@@ -606,7 +763,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
        struct sw_tx_bd *tx_buf = &fp->tx_buf_ring[idx];
        struct eth_tx_bd *tx_bd;
        struct sk_buff *skb = tx_buf->skb;
-       u16 bd_idx = tx_buf->first_bd;
+       u16 bd_idx = TX_BD(tx_buf->first_bd), new_cons;
        int nbd;
 
        DP(BNX2X_MSG_OFF, "pkt_idx %d  buff @(%p)->skb %p\n",
@@ -619,9 +776,10 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                         BD_UNMAP_LEN(tx_bd), PCI_DMA_TODEVICE);
 
        nbd = le16_to_cpu(tx_bd->nbd) - 1;
+       new_cons = nbd + tx_buf->first_bd;
 #ifdef BNX2X_STOP_ON_ERROR
        if (nbd > (MAX_SKB_FRAGS + 2)) {
-               BNX2X_ERR("bad nbd!\n");
+               BNX2X_ERR("BAD nbd!\n");
                bnx2x_panic();
        }
 #endif
@@ -656,37 +814,35 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp,
        }
 
        /* release skb */
-       BUG_TRAP(skb);
+       WARN_ON(!skb);
        dev_kfree_skb(skb);
        tx_buf->first_bd = 0;
        tx_buf->skb = NULL;
 
-       return bd_idx;
+       return new_cons;
 }
 
-static inline u32 bnx2x_tx_avail(struct bnx2x_fastpath *fp)
+static inline u16 bnx2x_tx_avail(struct bnx2x_fastpath *fp)
 {
-       u16 used;
-       u32 prod;
-       u32 cons;
+       s16 used;
+       u16 prod;
+       u16 cons;
 
-       /* Tell compiler that prod and cons can change */
-       barrier();
+       barrier(); /* Tell compiler that prod and cons can change */
        prod = fp->tx_bd_prod;
        cons = fp->tx_bd_cons;
 
-       used = (NUM_TX_BD - NUM_TX_RINGS + prod - cons +
-               (cons / TX_DESC_CNT) - (prod / TX_DESC_CNT));
+       /* NUM_TX_RINGS = number of "next-page" entries
+          It will be used as a threshold */
+       used = SUB_S16(prod, cons) + (s16)NUM_TX_RINGS;
 
-       if (prod >= cons) {
-               /* used = prod - cons - prod/size + cons/size */
-               used -= NUM_TX_BD - NUM_TX_RINGS;
-       }
-
-       BUG_TRAP(used <= fp->bp->tx_ring_size);
-       BUG_TRAP((fp->bp->tx_ring_size - used) <= MAX_TX_AVAIL);
+#ifdef BNX2X_STOP_ON_ERROR
+       WARN_ON(used < 0);
+       WARN_ON(used > fp->bp->tx_ring_size);
+       WARN_ON((fp->bp->tx_ring_size - used) > MAX_TX_AVAIL);
+#endif
 
-       return (fp->bp->tx_ring_size - used);
+       return (s16)(fp->bp->tx_ring_size) - used;
 }
 
 static void bnx2x_tx_int(struct bnx2x_fastpath *fp, int work)
@@ -710,10 +866,10 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp, int work)
 
                /* prefetch(bp->tx_buf_ring[pkt_cons].skb); */
 
-               DP(NETIF_MSG_TX_DONE, "hw_cons %u  sw_cons %u  pkt_cons %d\n",
+               DP(NETIF_MSG_TX_DONE, "hw_cons %u  sw_cons %u  pkt_cons %u\n",
                   hw_cons, sw_cons, pkt_cons);
 
-/*             if (NEXT_TX_IDX(sw_cons) != hw_cons) {
+/*             if (NEXT_TX_IDX(sw_cons) != hw_cons) {
                        rmb();
                        prefetch(fp->tx_buf_ring[NEXT_TX_IDX(sw_cons)].skb);
                }
@@ -746,7 +902,6 @@ static void bnx2x_tx_int(struct bnx2x_fastpath *fp, int work)
                        netif_wake_queue(bp->dev);
 
                netif_tx_unlock(bp->dev);
-
        }
 }
 
@@ -757,13 +912,14 @@ static void bnx2x_sp_event(struct bnx2x_fastpath *fp,
        int cid = SW_CID(rr_cqe->ramrod_cqe.conn_and_cmd_data);
        int command = CQE_CMD(rr_cqe->ramrod_cqe.conn_and_cmd_data);
 
-       DP(NETIF_MSG_RX_STATUS,
+       DP(BNX2X_MSG_SP,
           "fp %d  cid %d  got ramrod #%d  state is %x  type is %d\n",
-          fp->index, cid, command, bp->state, rr_cqe->ramrod_cqe.type);
+          FP_IDX(fp), cid, command, bp->state,
+          rr_cqe->ramrod_cqe.ramrod_type);
 
        bp->spq_left++;
 
-       if (fp->index) {
+       if (FP_IDX(fp)) {
                switch (command | fp->state) {
                case (RAMROD_CMD_ID_ETH_CLIENT_SETUP |
                                                BNX2X_FP_STATE_OPENING):
@@ -779,10 +935,11 @@ static void bnx2x_sp_event(struct bnx2x_fastpath *fp,
                        break;
 
                default:
-                       BNX2X_ERR("unexpected MC reply(%d)  state is %x\n",
-                                 command, fp->state);
+                       BNX2X_ERR("unexpected MC reply (%d)  "
+                                 "fp->state is %x\n", command, fp->state);
+                       break;
                }
-               mb(); /* force bnx2x_wait_ramrod to see the change */
+               mb(); /* force bnx2x_wait_ramrod() to see the change */
                return;
        }
 
@@ -799,25 +956,82 @@ static void bnx2x_sp_event(struct bnx2x_fastpath *fp,
                break;
 
        case (RAMROD_CMD_ID_ETH_CFC_DEL | BNX2X_STATE_CLOSING_WAIT4_HALT):
-               DP(NETIF_MSG_IFDOWN, "got delete ramrod for MULTI[%d]\n",
-                  cid);
+               DP(NETIF_MSG_IFDOWN, "got delete ramrod for MULTI[%d]\n", cid);
                bnx2x_fp(bp, cid, state) = BNX2X_FP_STATE_CLOSED;
                break;
 
        case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_OPEN):
+       case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_DIAG):
                DP(NETIF_MSG_IFUP, "got set mac ramrod\n");
+               bp->set_mac_pending = 0;
                break;
 
        case (RAMROD_CMD_ID_ETH_SET_MAC | BNX2X_STATE_CLOSING_WAIT4_HALT):
-               DP(NETIF_MSG_IFUP, "got (un)set mac ramrod\n");
+               DP(NETIF_MSG_IFDOWN, "got (un)set mac ramrod\n");
                break;
 
        default:
-               BNX2X_ERR("unexpected ramrod (%d)  state is %x\n",
+               BNX2X_ERR("unexpected MC reply (%d)  bp->state is %x\n",
                          command, bp->state);
+               break;
+       }
+       mb(); /* force bnx2x_wait_ramrod() to see the change */
+}
+
+static inline void bnx2x_free_rx_sge(struct bnx2x *bp,
+                                    struct bnx2x_fastpath *fp, u16 index)
+{
+       struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
+       struct page *page = sw_buf->page;
+       struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
+
+       /* Skip "next page" elements */
+       if (!page)
+               return;
+
+       pci_unmap_page(bp->pdev, pci_unmap_addr(sw_buf, mapping),
+                      BCM_PAGE_SIZE*PAGES_PER_SGE, PCI_DMA_FROMDEVICE);
+       __free_pages(page, PAGES_PER_SGE_SHIFT);
+
+       sw_buf->page = NULL;
+       sge->addr_hi = 0;
+       sge->addr_lo = 0;
+}
+
+static inline void bnx2x_free_rx_sge_range(struct bnx2x *bp,
+                                          struct bnx2x_fastpath *fp, int last)
+{
+       int i;
+
+       for (i = 0; i < last; i++)
+               bnx2x_free_rx_sge(bp, fp, i);
+}
+
+static inline int bnx2x_alloc_rx_sge(struct bnx2x *bp,
+                                    struct bnx2x_fastpath *fp, u16 index)
+{
+       struct page *page = alloc_pages(GFP_ATOMIC, PAGES_PER_SGE_SHIFT);
+       struct sw_rx_page *sw_buf = &fp->rx_page_ring[index];
+       struct eth_rx_sge *sge = &fp->rx_sge_ring[index];
+       dma_addr_t mapping;
+
+       if (unlikely(page == NULL))
+               return -ENOMEM;
+
+       mapping = pci_map_page(bp->pdev, page, 0, BCM_PAGE_SIZE*PAGES_PER_SGE,
+                              PCI_DMA_FROMDEVICE);
+       if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
+               __free_pages(page, PAGES_PER_SGE_SHIFT);
+               return -ENOMEM;
        }
 
-       mb(); /* force bnx2x_wait_ramrod to see the change */
+       sw_buf->page = page;
+       pci_unmap_addr_set(sw_buf, mapping, mapping);
+
+       sge->addr_hi = cpu_to_le32(U64_HI(mapping));
+       sge->addr_lo = cpu_to_le32(U64_LO(mapping));
+
+       return 0;
 }
 
 static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
@@ -834,8 +1048,7 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
 
        mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_use_size,
                                 PCI_DMA_FROMDEVICE);
-       if (unlikely(dma_mapping_error(mapping))) {
-
+       if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
                dev_kfree_skb(skb);
                return -ENOMEM;
        }
@@ -874,24 +1087,325 @@ static void bnx2x_reuse_rx_skb(struct bnx2x_fastpath *fp,
        *prod_bd = *cons_bd;
 }
 
+static inline void bnx2x_update_last_max_sge(struct bnx2x_fastpath *fp,
+                                            u16 idx)
+{
+       u16 last_max = fp->last_max_sge;
+
+       if (SUB_S16(idx, last_max) > 0)
+               fp->last_max_sge = idx;
+}
+
+static void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp)
+{
+       int i, j;
+
+       for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
+               int idx = RX_SGE_CNT * i - 1;
+
+               for (j = 0; j < 2; j++) {
+                       SGE_MASK_CLEAR_BIT(fp, idx);
+                       idx--;
+               }
+       }
+}
+
+static void bnx2x_update_sge_prod(struct bnx2x_fastpath *fp,
+                                 struct eth_fast_path_rx_cqe *fp_cqe)
+{
+       struct bnx2x *bp = fp->bp;
+       u16 sge_len = BCM_PAGE_ALIGN(le16_to_cpu(fp_cqe->pkt_len) -
+                                    le16_to_cpu(fp_cqe->len_on_bd)) >>
+                     BCM_PAGE_SHIFT;
+       u16 last_max, last_elem, first_elem;
+       u16 delta = 0;
+       u16 i;
+
+       if (!sge_len)
+               return;
+
+       /* First mark all used pages */
+       for (i = 0; i < sge_len; i++)
+               SGE_MASK_CLEAR_BIT(fp, RX_SGE(le16_to_cpu(fp_cqe->sgl[i])));
+
+       DP(NETIF_MSG_RX_STATUS, "fp_cqe->sgl[%d] = %d\n",
+          sge_len - 1, le16_to_cpu(fp_cqe->sgl[sge_len - 1]));
+
+       /* Here we assume that the last SGE index is the biggest */
+       prefetch((void *)(fp->sge_mask));
+       bnx2x_update_last_max_sge(fp, le16_to_cpu(fp_cqe->sgl[sge_len - 1]));
+
+       last_max = RX_SGE(fp->last_max_sge);
+       last_elem = last_max >> RX_SGE_MASK_ELEM_SHIFT;
+       first_elem = RX_SGE(fp->rx_sge_prod) >> RX_SGE_MASK_ELEM_SHIFT;
+
+       /* If ring is not full */
+       if (last_elem + 1 != first_elem)
+               last_elem++;
+
+       /* Now update the prod */
+       for (i = first_elem; i != last_elem; i = NEXT_SGE_MASK_ELEM(i)) {
+               if (likely(fp->sge_mask[i]))
+                       break;
+
+               fp->sge_mask[i] = RX_SGE_MASK_ELEM_ONE_MASK;
+               delta += RX_SGE_MASK_ELEM_SZ;
+       }
+
+       if (delta > 0) {
+               fp->rx_sge_prod += delta;
+               /* clear page-end entries */
+               bnx2x_clear_sge_mask_next_elems(fp);
+       }
+
+       DP(NETIF_MSG_RX_STATUS,
+          "fp->last_max_sge = %d  fp->rx_sge_prod = %d\n",
+          fp->last_max_sge, fp->rx_sge_prod);
+}
+
+static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp)
+{
+       /* Set the mask to all 1-s: it's faster to compare to 0 than to 0xf-s */
+       memset(fp->sge_mask, 0xff,
+              (NUM_RX_SGE >> RX_SGE_MASK_ELEM_SHIFT)*sizeof(u64));
+
+       /* Clear the two last indeces in the page to 1:
+          these are the indeces that correspond to the "next" element,
+          hence will never be indicated and should be removed from
+          the calculations. */
+       bnx2x_clear_sge_mask_next_elems(fp);
+}
+
+static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
+                           struct sk_buff *skb, u16 cons, u16 prod)
+{
+       struct bnx2x *bp = fp->bp;
+       struct sw_rx_bd *cons_rx_buf = &fp->rx_buf_ring[cons];
+       struct sw_rx_bd *prod_rx_buf = &fp->rx_buf_ring[prod];
+       struct eth_rx_bd *prod_bd = &fp->rx_desc_ring[prod];
+       dma_addr_t mapping;
+
+       /* move empty skb from pool to prod and map it */
+       prod_rx_buf->skb = fp->tpa_pool[queue].skb;
+       mapping = pci_map_single(bp->pdev, fp->tpa_pool[queue].skb->data,
+                                bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
+       pci_unmap_addr_set(prod_rx_buf, mapping, mapping);
+
+       /* move partial skb from cons to pool (don't unmap yet) */
+       fp->tpa_pool[queue] = *cons_rx_buf;
+
+       /* mark bin state as start - print error if current state != stop */
+       if (fp->tpa_state[queue] != BNX2X_TPA_STOP)
+               BNX2X_ERR("start of bin not in stop [%d]\n", queue);
+
+       fp->tpa_state[queue] = BNX2X_TPA_START;
+
+       /* point prod_bd to new skb */
+       prod_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+       prod_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+
+#ifdef BNX2X_STOP_ON_ERROR
+       fp->tpa_queue_used |= (1 << queue);
+#ifdef __powerpc64__
+       DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%lx\n",
+#else
+       DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%llx\n",
+#endif
+          fp->tpa_queue_used);
+#endif
+}
+
+static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
+                              struct sk_buff *skb,
+                              struct eth_fast_path_rx_cqe *fp_cqe,
+                              u16 cqe_idx)
+{
+       struct sw_rx_page *rx_pg, old_rx_pg;
+       struct page *sge;
+       u16 len_on_bd = le16_to_cpu(fp_cqe->len_on_bd);
+       u32 i, frag_len, frag_size, pages;
+       int err;
+       int j;
+
+       frag_size = le16_to_cpu(fp_cqe->pkt_len) - len_on_bd;
+       pages = BCM_PAGE_ALIGN(frag_size) >> BCM_PAGE_SHIFT;
+
+       /* This is needed in order to enable forwarding support */
+       if (frag_size)
+               skb_shinfo(skb)->gso_size = min((u32)BCM_PAGE_SIZE,
+                                              max(frag_size, (u32)len_on_bd));
+
+#ifdef BNX2X_STOP_ON_ERROR
+       if (pages > 8*PAGES_PER_SGE) {
+               BNX2X_ERR("SGL length is too long: %d. CQE index is %d\n",
+                         pages, cqe_idx);
+               BNX2X_ERR("fp_cqe->pkt_len = %d  fp_cqe->len_on_bd = %d\n",
+                         fp_cqe->pkt_len, len_on_bd);
+               bnx2x_panic();
+               return -EINVAL;
+       }
+#endif
+
+       /* Run through the SGL and compose the fragmented skb */
+       for (i = 0, j = 0; i < pages; i += PAGES_PER_SGE, j++) {
+               u16 sge_idx = RX_SGE(le16_to_cpu(fp_cqe->sgl[j]));
+
+               /* FW gives the indices of the SGE as if the ring is an array
+                  (meaning that "next" element will consume 2 indices) */
+               frag_len = min(frag_size, (u32)(BCM_PAGE_SIZE*PAGES_PER_SGE));
+               rx_pg = &fp->rx_page_ring[sge_idx];
+               sge = rx_pg->page;
+               old_rx_pg = *rx_pg;
+
+               /* If we fail to allocate a substitute page, we simply stop
+                  where we are and drop the whole packet */
+               err = bnx2x_alloc_rx_sge(bp, fp, sge_idx);
+               if (unlikely(err)) {
+                       fp->rx_alloc_failed++;
+                       return err;
+               }
+
+               /* Unmap the page as we r going to pass it to the stack */
+               pci_unmap_page(bp->pdev, pci_unmap_addr(&old_rx_pg, mapping),
+                             BCM_PAGE_SIZE*PAGES_PER_SGE, PCI_DMA_FROMDEVICE);
+
+               /* Add one frag and update the appropriate fields in the skb */
+               skb_fill_page_desc(skb, j, old_rx_pg.page, 0, frag_len);
+
+               skb->data_len += frag_len;
+               skb->truesize += frag_len;
+               skb->len += frag_len;
+
+               frag_size -= frag_len;
+       }
+
+       return 0;
+}
+
+static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
+                          u16 queue, int pad, int len, union eth_rx_cqe *cqe,
+                          u16 cqe_idx)
+{
+       struct sw_rx_bd *rx_buf = &fp->tpa_pool[queue];
+       struct sk_buff *skb = rx_buf->skb;
+       /* alloc new skb */
+       struct sk_buff *new_skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+
+       /* Unmap skb in the pool anyway, as we are going to change
+          pool entry status to BNX2X_TPA_STOP even if new skb allocation
+          fails. */
+       pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping),
+                        bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
+
+       /* if alloc failed drop the packet and keep the buffer in the bin */
+       if (likely(new_skb)) {
+
+               prefetch(skb);
+               prefetch(((char *)(skb)) + 128);
+
+               /* else fix ip xsum and give it to the stack */
+               /* (no need to map the new skb) */
+#ifdef BNX2X_STOP_ON_ERROR
+               if (pad + len > bp->rx_buf_size) {
+                       BNX2X_ERR("skb_put is about to fail...  "
+                                 "pad %d  len %d  rx_buf_size %d\n",
+                                 pad, len, bp->rx_buf_size);
+                       bnx2x_panic();
+                       return;
+               }
+#endif
+
+               skb_reserve(skb, pad);
+               skb_put(skb, len);
+
+               skb->protocol = eth_type_trans(skb, bp->dev);
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+               {
+                       struct iphdr *iph;
+
+                       iph = (struct iphdr *)skb->data;
+                       iph->check = 0;
+                       iph->check = ip_fast_csum((u8 *)iph, iph->ihl);
+               }
+
+               if (!bnx2x_fill_frag_skb(bp, fp, skb,
+                                        &cqe->fast_path_cqe, cqe_idx)) {
+#ifdef BCM_VLAN
+                       if ((bp->vlgrp != NULL) &&
+                           (le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) &
+                            PARSING_FLAGS_VLAN))
+                               vlan_hwaccel_receive_skb(skb, bp->vlgrp,
+                                               le16_to_cpu(cqe->fast_path_cqe.
+                                                           vlan_tag));
+                       else
+#endif
+                               netif_receive_skb(skb);
+               } else {
+                       DP(NETIF_MSG_RX_STATUS, "Failed to allocate new pages"
+                          " - dropping packet!\n");
+                       dev_kfree_skb(skb);
+               }
+
+               bp->dev->last_rx = jiffies;
+
+               /* put new skb in bin */
+               fp->tpa_pool[queue].skb = new_skb;
+
+       } else {
+               DP(NETIF_MSG_RX_STATUS,
+                  "Failed to allocate new skb - dropping packet!\n");
+               fp->rx_alloc_failed++;
+       }
+
+       fp->tpa_state[queue] = BNX2X_TPA_STOP;
+}
+
+static inline void bnx2x_update_rx_prod(struct bnx2x *bp,
+                                       struct bnx2x_fastpath *fp,
+                                       u16 bd_prod, u16 rx_comp_prod,
+                                       u16 rx_sge_prod)
+{
+       struct tstorm_eth_rx_producers rx_prods = {0};
+       int i;
+
+       /* Update producers */
+       rx_prods.bd_prod = bd_prod;
+       rx_prods.cqe_prod = rx_comp_prod;
+       rx_prods.sge_prod = rx_sge_prod;
+
+       for (i = 0; i < sizeof(struct tstorm_eth_rx_producers)/4; i++)
+               REG_WR(bp, BAR_TSTRORM_INTMEM +
+                      TSTORM_RX_PRODS_OFFSET(BP_PORT(bp), FP_CL_ID(fp)) + i*4,
+                      ((u32 *)&rx_prods)[i]);
+
+       DP(NETIF_MSG_RX_STATUS,
+          "Wrote: bd_prod %u  cqe_prod %u  sge_prod %u\n",
+          bd_prod, rx_comp_prod, rx_sge_prod);
+}
+
 static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 {
        struct bnx2x *bp = fp->bp;
-       u16 bd_cons, bd_prod, comp_ring_cons;
+       u16 bd_cons, bd_prod, bd_prod_fw, comp_ring_cons;
        u16 hw_comp_cons, sw_comp_cons, sw_comp_prod;
        int rx_pkt = 0;
+       u16 queue;
 
 #ifdef BNX2X_STOP_ON_ERROR
        if (unlikely(bp->panic))
                return 0;
 #endif
 
+       /* CQ "next element" is of the size of the regular element,
+          that's why it's ok here */
        hw_comp_cons = le16_to_cpu(*fp->rx_cons_sb);
        if ((hw_comp_cons & MAX_RCQ_DESC_CNT) == MAX_RCQ_DESC_CNT)
                hw_comp_cons++;
 
        bd_cons = fp->rx_bd_cons;
        bd_prod = fp->rx_bd_prod;
+       bd_prod_fw = bd_prod;
        sw_comp_cons = fp->rx_comp_cons;
        sw_comp_prod = fp->rx_comp_prod;
 
@@ -902,34 +1416,31 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 
        DP(NETIF_MSG_RX_STATUS,
           "queue[%d]:  hw_comp_cons %u  sw_comp_cons %u\n",
-          fp->index, hw_comp_cons, sw_comp_cons);
+          FP_IDX(fp), hw_comp_cons, sw_comp_cons);
 
        while (sw_comp_cons != hw_comp_cons) {
-               unsigned int len, pad;
-               struct sw_rx_bd *rx_buf;
+               struct sw_rx_bd *rx_buf = NULL;
                struct sk_buff *skb;
                union eth_rx_cqe *cqe;
+               u8 cqe_fp_flags;
+               u16 len, pad;
 
                comp_ring_cons = RCQ_BD(sw_comp_cons);
                bd_prod = RX_BD(bd_prod);
                bd_cons = RX_BD(bd_cons);
 
                cqe = &fp->rx_comp_ring[comp_ring_cons];
+               cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
 
-               DP(NETIF_MSG_RX_STATUS, "hw_comp_cons %u  sw_comp_cons %u"
-                  "  comp_ring (%u)  bd_ring (%u,%u)\n",
-                  hw_comp_cons, sw_comp_cons,
-                  comp_ring_cons, bd_prod, bd_cons);
                DP(NETIF_MSG_RX_STATUS, "CQE type %x  err %x  status %x"
-                  "  queue %x  vlan %x  len %x\n",
-                  cqe->fast_path_cqe.type,
-                  cqe->fast_path_cqe.error_type_flags,
-                  cqe->fast_path_cqe.status_flags,
+                  "  queue %x  vlan %x  len %u\n", CQE_TYPE(cqe_fp_flags),
+                  cqe_fp_flags, cqe->fast_path_cqe.status_flags,
                   cqe->fast_path_cqe.rss_hash_result,
-                  cqe->fast_path_cqe.vlan_tag, cqe->fast_path_cqe.pkt_len);
+                  le16_to_cpu(cqe->fast_path_cqe.vlan_tag),
+                  le16_to_cpu(cqe->fast_path_cqe.pkt_len));
 
                /* is this a slowpath msg? */
-               if (unlikely(cqe->fast_path_cqe.type)) {
+               if (unlikely(CQE_TYPE(cqe_fp_flags))) {
                        bnx2x_sp_event(fp, cqe);
                        goto next_cqe;
 
@@ -937,10 +1448,52 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                } else {
                        rx_buf = &fp->rx_buf_ring[bd_cons];
                        skb = rx_buf->skb;
-
                        len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
                        pad = cqe->fast_path_cqe.placement_offset;
 
+                       /* If CQE is marked both TPA_START and TPA_END
+                          it is a non-TPA CQE */
+                       if ((!fp->disable_tpa) &&
+                           (TPA_TYPE(cqe_fp_flags) !=
+                                       (TPA_TYPE_START | TPA_TYPE_END))) {
+                               queue = cqe->fast_path_cqe.queue_index;
+
+                               if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_START) {
+                                       DP(NETIF_MSG_RX_STATUS,
+                                          "calling tpa_start on queue %d\n",
+                                          queue);
+
+                                       bnx2x_tpa_start(fp, queue, skb,
+                                                       bd_cons, bd_prod);
+                                       goto next_rx;
+                               }
+
+                               if (TPA_TYPE(cqe_fp_flags) == TPA_TYPE_END) {
+                                       DP(NETIF_MSG_RX_STATUS,
+                                          "calling tpa_stop on queue %d\n",
+                                          queue);
+
+                                       if (!BNX2X_RX_SUM_FIX(cqe))
+                                               BNX2X_ERR("STOP on none TCP "
+                                                         "data\n");
+
+                                       /* This is a size of the linear data
+                                          on this skb */
+                                       len = le16_to_cpu(cqe->fast_path_cqe.
+                                                               len_on_bd);
+                                       bnx2x_tpa_stop(bp, fp, queue, pad,
+                                                   len, cqe, comp_ring_cons);
+#ifdef BNX2X_STOP_ON_ERROR
+                                       if (bp->panic)
+                                               return -EINVAL;
+#endif
+
+                                       bnx2x_update_sge_prod(fp,
+                                                       &cqe->fast_path_cqe);
+                                       goto next_cqe;
+                               }
+                       }
+
                        pci_dma_sync_single_for_device(bp->pdev,
                                        pci_unmap_addr(rx_buf, mapping),
                                                       pad + RX_COPY_THRESH,
@@ -949,13 +1502,11 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                        prefetch(((char *)(skb)) + 128);
 
                        /* is this an error packet? */
-                       if (unlikely(cqe->fast_path_cqe.error_type_flags &
-                                                       ETH_RX_ERROR_FALGS)) {
+                       if (unlikely(cqe_fp_flags & ETH_RX_ERROR_FALGS)) {
                        /* do we sometimes forward error packets anyway? */
                                DP(NETIF_MSG_RX_ERR,
-                                  "ERROR flags(%u) Rx packet(%u)\n",
-                                  cqe->fast_path_cqe.error_type_flags,
-                                  sw_comp_cons);
+                                  "ERROR  flags %x  rx packet %u\n",
+                                  cqe_fp_flags, sw_comp_cons);
                                /* TBD make sure MC counts this as a drop */
                                goto reuse_rx;
                        }
@@ -971,9 +1522,9 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                                                           len + pad);
                                if (new_skb == NULL) {
                                        DP(NETIF_MSG_RX_ERR,
-                                          "ERROR packet dropped "
+                                          "ERROR  packet dropped "
                                           "because of alloc failure\n");
-                                       /* TBD count this as a drop? */
+                                       fp->rx_alloc_failed++;
                                        goto reuse_rx;
                                }
 
@@ -997,8 +1548,9 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 
                        } else {
                                DP(NETIF_MSG_RX_ERR,
-                                  "ERROR packet dropped because "
+                                  "ERROR  packet dropped because "
                                   "of alloc failure\n");
+                               fp->rx_alloc_failed++;
 reuse_rx:
                                bnx2x_reuse_rx_skb(fp, skb, bd_cons, bd_prod);
                                goto next_rx;
@@ -1014,14 +1566,14 @@ reuse_rx:
                }
 
 #ifdef BCM_VLAN
-               if ((le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags)
-                               & PARSING_FLAGS_NUMBER_OF_NESTED_VLANS)
-                   && (bp->vlgrp != NULL))
+               if ((bp->vlgrp != NULL) &&
+                   (le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags) &
+                    PARSING_FLAGS_VLAN))
                        vlan_hwaccel_receive_skb(skb, bp->vlgrp,
                                le16_to_cpu(cqe->fast_path_cqe.vlan_tag));
                else
 #endif
-               netif_receive_skb(skb);
+                       netif_receive_skb(skb);
 
                bp->dev->last_rx = jiffies;
 
@@ -1030,23 +1582,24 @@ next_rx:
 
                bd_cons = NEXT_RX_IDX(bd_cons);
                bd_prod = NEXT_RX_IDX(bd_prod);
+               bd_prod_fw = NEXT_RX_IDX(bd_prod_fw);
+               rx_pkt++;
 next_cqe:
                sw_comp_prod = NEXT_RCQ_IDX(sw_comp_prod);
                sw_comp_cons = NEXT_RCQ_IDX(sw_comp_cons);
-               rx_pkt++;
 
-               if ((rx_pkt == budget))
+               if (rx_pkt == budget)
                        break;
        } /* while */
 
        fp->rx_bd_cons = bd_cons;
-       fp->rx_bd_prod = bd_prod;
+       fp->rx_bd_prod = bd_prod_fw;
        fp->rx_comp_cons = sw_comp_cons;
        fp->rx_comp_prod = sw_comp_prod;
 
-       REG_WR(bp, BAR_TSTRORM_INTMEM +
-              TSTORM_RCQ_PROD_OFFSET(bp->port, fp->index), sw_comp_prod);
-
+       /* Update producers */
+       bnx2x_update_rx_prod(bp, fp, bd_prod_fw, sw_comp_prod,
+                            fp->rx_sge_prod);
        mmiowb(); /* keep prod updates ordered */
 
        fp->rx_pkt += rx_pkt;
@@ -1060,10 +1613,11 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
        struct bnx2x_fastpath *fp = fp_cookie;
        struct bnx2x *bp = fp->bp;
        struct net_device *dev = bp->dev;
-       int index = fp->index;
+       int index = FP_IDX(fp);
 
-       DP(NETIF_MSG_INTR, "got an msix interrupt on [%d]\n", index);
-       bnx2x_ack_sb(bp, index, USTORM_ID, 0, IGU_INT_DISABLE, 0);
+       DP(BNX2X_MSG_FP, "got an MSI-X interrupt on IDX:SB [%d:%d]\n",
+          index, FP_SB_ID(fp));
+       bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID, 0, IGU_INT_DISABLE, 0);
 
 #ifdef BNX2X_STOP_ON_ERROR
        if (unlikely(bp->panic))
@@ -1076,6 +1630,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
        prefetch(&fp->status_blk->u_status_block.status_block_index);
 
        netif_rx_schedule(dev, &bnx2x_fp(bp, index, napi));
+
        return IRQ_HANDLED;
 }
 
@@ -1084,26 +1639,28 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
        struct net_device *dev = dev_instance;
        struct bnx2x *bp = netdev_priv(dev);
        u16 status = bnx2x_ack_int(bp);
+       u16 mask;
 
+       /* Return here if interrupt is shared and it's not for us */
        if (unlikely(status == 0)) {
                DP(NETIF_MSG_INTR, "not our interrupt!\n");
                return IRQ_NONE;
        }
-
-       DP(NETIF_MSG_INTR, "got an interrupt status is %u\n", status);
+       DP(NETIF_MSG_INTR, "got an interrupt  status %u\n", status);
 
 #ifdef BNX2X_STOP_ON_ERROR
        if (unlikely(bp->panic))
                return IRQ_HANDLED;
 #endif
 
-       /* Return here if interrupt is shared and is disabled */
+       /* Return here if interrupt is disabled */
        if (unlikely(atomic_read(&bp->intr_sem) != 0)) {
                DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n");
                return IRQ_HANDLED;
        }
 
-       if (status & 0x2) {
+       mask = 0x2 << bp->fp[0].sb_id;
+       if (status & mask) {
                struct bnx2x_fastpath *fp = &bp->fp[0];
 
                prefetch(fp->rx_cons_sb);
@@ -1113,13 +1670,11 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
 
                netif_rx_schedule(dev, &bnx2x_fp(bp, 0, napi));
 
-               status &= ~0x2;
-               if (!status)
-                       return IRQ_HANDLED;
+               status &= ~mask;
        }
 
-       if (unlikely(status & 0x1)) {
 
+       if (unlikely(status & 0x1)) {
                schedule_work(&bp->sp_task);
 
                status &= ~0x1;
@@ -1127,75 +1682,29 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
                        return IRQ_HANDLED;
        }
 
-       DP(NETIF_MSG_INTR, "got an unknown interrupt! (status is %u)\n",
-          status);
+       if (status)
+               DP(NETIF_MSG_INTR, "got an unknown interrupt! (status %u)\n",
+                  status);
 
        return IRQ_HANDLED;
 }
 
 /* end of fast path */
 
-/* PHY/MAC */
+static void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
+
+/* Link */
 
 /*
  * General service functions
  */
 
-static void bnx2x_leds_set(struct bnx2x *bp, unsigned int speed)
-{
-       int port = bp->port;
-
-       NIG_WR(NIG_REG_LED_MODE_P0 + port*4,
-              ((bp->hw_config & SHARED_HW_CFG_LED_MODE_MASK) >>
-               SHARED_HW_CFG_LED_MODE_SHIFT));
-       NIG_WR(NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 + port*4, 0);
-
-       /* Set blinking rate to ~15.9Hz */
-       NIG_WR(NIG_REG_LED_CONTROL_BLINK_RATE_P0 + port*4,
-              LED_BLINK_RATE_VAL);
-       NIG_WR(NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 + port*4, 1);
-
-       /* On Ax chip versions for speeds less than 10G
-          LED scheme is different */
-       if ((CHIP_REV(bp) == CHIP_REV_Ax) && (speed < SPEED_10000)) {
-               NIG_WR(NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 + port*4, 1);
-               NIG_WR(NIG_REG_LED_CONTROL_TRAFFIC_P0 + port*4, 0);
-               NIG_WR(NIG_REG_LED_CONTROL_BLINK_TRAFFIC_P0 + port*4, 1);
-       }
-}
-
-static void bnx2x_leds_unset(struct bnx2x *bp)
-{
-       int port = bp->port;
-
-       NIG_WR(NIG_REG_LED_10G_P0 + port*4, 0);
-       NIG_WR(NIG_REG_LED_MODE_P0 + port*4, SHARED_HW_CFG_LED_MAC1);
-}
-
-static u32 bnx2x_bits_en(struct bnx2x *bp, u32 reg, u32 bits)
-{
-       u32 val = REG_RD(bp, reg);
-
-       val |= bits;
-       REG_WR(bp, reg, val);
-       return val;
-}
-
-static u32 bnx2x_bits_dis(struct bnx2x *bp, u32 reg, u32 bits)
-{
-       u32 val = REG_RD(bp, reg);
-
-       val &= ~bits;
-       REG_WR(bp, reg, val);
-       return val;
-}
-
 static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource)
 {
-       u32 cnt;
        u32 lock_status;
        u32 resource_bit = (1 << resource);
-       u8 func = bp->port;
+       u8 port = BP_PORT(bp);
+       int cnt;
 
        /* Validating that the resource is within range */
        if (resource > HW_LOCK_MAX_RESOURCE_VALUE) {
@@ -1206,7 +1715,7 @@ static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource)
        }
 
        /* Validating that the resource is not already taken */
-       lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + func*8);
+       lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8);
        if (lock_status & resource_bit) {
                DP(NETIF_MSG_HW, "lock_status 0x%x  resource_bit 0x%x\n",
                   lock_status, resource_bit);
@@ -1216,9 +1725,9 @@ static int bnx2x_hw_lock(struct bnx2x *bp, u32 resource)
        /* Try for 1 second every 5ms */
        for (cnt = 0; cnt < 200; cnt++) {
                /* Try to acquire the lock */
-               REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + func*8 + 4,
+               REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + port*8 + 4,
                       resource_bit);
-               lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + func*8);
+               lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8);
                if (lock_status & resource_bit)
                        return 0;
 
@@ -1232,7 +1741,7 @@ static int bnx2x_hw_unlock(struct bnx2x *bp, u32 resource)
 {
        u32 lock_status;
        u32 resource_bit = (1 << resource);
-       u8 func = bp->port;
+       u8 port = BP_PORT(bp);
 
        /* Validating that the resource is within range */
        if (resource > HW_LOCK_MAX_RESOURCE_VALUE) {
@@ -1243,22 +1752,45 @@ static int bnx2x_hw_unlock(struct bnx2x *bp, u32 resource)
        }
 
        /* Validating that the resource is currently taken */
-       lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + func*8);
+       lock_status = REG_RD(bp, MISC_REG_DRIVER_CONTROL_1 + port*8);
        if (!(lock_status & resource_bit)) {
                DP(NETIF_MSG_HW, "lock_status 0x%x  resource_bit 0x%x\n",
                   lock_status, resource_bit);
                return -EFAULT;
        }
 
-       REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + func*8, resource_bit);
+       REG_WR(bp, MISC_REG_DRIVER_CONTROL_1 + port*8, resource_bit);
        return 0;
 }
 
-static int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode)
+/* HW Lock for shared dual port PHYs */
+static void bnx2x_phy_hw_lock(struct bnx2x *bp)
+{
+       u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
+
+       mutex_lock(&bp->port.phy_mutex);
+
+       if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) ||
+           (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073))
+               bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO);
+}
+
+static void bnx2x_phy_hw_unlock(struct bnx2x *bp)
+{
+       u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
+
+       if ((ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) ||
+           (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073))
+               bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_8072_MDIO);
+
+       mutex_unlock(&bp->port.phy_mutex);
+}
+
+int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode)
 {
        /* The GPIO should be swapped if swap register is set and active */
        int gpio_port = (REG_RD(bp, NIG_REG_PORT_SWAP) &&
-                        REG_RD(bp, NIG_REG_STRAP_OVERRIDE)) ^ bp->port;
+                        REG_RD(bp, NIG_REG_STRAP_OVERRIDE)) ^ BP_PORT(bp);
        int gpio_shift = gpio_num +
                        (gpio_port ? MISC_REGISTERS_GPIO_PORT_SHIFT : 0);
        u32 gpio_mask = (1 << gpio_shift);
@@ -1353,2672 +1885,482 @@ static int bnx2x_set_spio(struct bnx2x *bp, int spio_num, u32 mode)
        return 0;
 }
 
-static int bnx2x_mdio22_write(struct bnx2x *bp, u32 reg, u32 val)
+static void bnx2x_calc_fc_adv(struct bnx2x *bp)
 {
-       int port = bp->port;
-       u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
-       u32 tmp;
-       int i, rc;
-
-/*      DP(NETIF_MSG_HW, "phy_addr 0x%x  reg 0x%x  val 0x%08x\n",
-          bp->phy_addr, reg, val); */
-
-       if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
-
-               tmp = REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_MODE);
-               tmp &= ~EMAC_MDIO_MODE_AUTO_POLL;
-               EMAC_WR(EMAC_REG_EMAC_MDIO_MODE, tmp);
-               REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_MODE);
-               udelay(40);
+       switch (bp->link_vars.ieee_fc) {
+       case MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE:
+               bp->port.advertising &= ~(ADVERTISED_Asym_Pause |
+                                         ADVERTISED_Pause);
+               break;
+       case MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH:
+               bp->port.advertising |= (ADVERTISED_Asym_Pause |
+                                        ADVERTISED_Pause);
+               break;
+       case MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC:
+               bp->port.advertising |= ADVERTISED_Asym_Pause;
+               break;
+       default:
+               bp->port.advertising &= ~(ADVERTISED_Asym_Pause |
+                                         ADVERTISED_Pause);
+               break;
        }
+}
 
-       tmp = ((bp->phy_addr << 21) | (reg << 16) |
-              (val & EMAC_MDIO_COMM_DATA) |
-              EMAC_MDIO_COMM_COMMAND_WRITE_22 |
-              EMAC_MDIO_COMM_START_BUSY);
-       EMAC_WR(EMAC_REG_EMAC_MDIO_COMM, tmp);
-
-       for (i = 0; i < 50; i++) {
-               udelay(10);
-
-               tmp = REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_COMM);
-               if (!(tmp & EMAC_MDIO_COMM_START_BUSY)) {
-                       udelay(5);
-                       break;
-               }
-       }
+static void bnx2x_link_report(struct bnx2x *bp)
+{
+       if (bp->link_vars.link_up) {
+               if (bp->state == BNX2X_STATE_OPEN)
+                       netif_carrier_on(bp->dev);
+               printk(KERN_INFO PFX "%s NIC Link is Up, ", bp->dev->name);
 
-       if (tmp & EMAC_MDIO_COMM_START_BUSY) {
-               BNX2X_ERR("write phy register failed\n");
+               printk("%d Mbps ", bp->link_vars.line_speed);
 
-               rc = -EBUSY;
-       } else {
-               rc = 0;
-       }
+               if (bp->link_vars.duplex == DUPLEX_FULL)
+                       printk("full duplex");
+               else
+                       printk("half duplex");
 
-       if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
+               if (bp->link_vars.flow_ctrl != FLOW_CTRL_NONE) {
+                       if (bp->link_vars.flow_ctrl & FLOW_CTRL_RX) {
+                               printk(", receive ");
+                               if (bp->link_vars.flow_ctrl & FLOW_CTRL_TX)
+                                       printk("& transmit ");
+                       } else {
+                               printk(", transmit ");
+                       }
+                       printk("flow control ON");
+               }
+               printk("\n");
 
-               tmp = REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_MODE);
-               tmp |= EMAC_MDIO_MODE_AUTO_POLL;
-               EMAC_WR(EMAC_REG_EMAC_MDIO_MODE, tmp);
+       } else { /* link_down */
+               netif_carrier_off(bp->dev);
+               printk(KERN_ERR PFX "%s NIC Link is Down\n", bp->dev->name);
        }
-
-       return rc;
 }
 
-static int bnx2x_mdio22_read(struct bnx2x *bp, u32 reg, u32 *ret_val)
+static u8 bnx2x_initial_phy_init(struct bnx2x *bp)
 {
-       int port = bp->port;
-       u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
-       u32 val;
-       int i, rc;
+       u8 rc;
 
-       if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
+       /* Initialize link parameters structure variables */
+       bp->link_params.mtu = bp->dev->mtu;
 
-               val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_MODE);
-               val &= ~EMAC_MDIO_MODE_AUTO_POLL;
-               EMAC_WR(EMAC_REG_EMAC_MDIO_MODE, val);
-               REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_MODE);
-               udelay(40);
-       }
-
-       val = ((bp->phy_addr << 21) | (reg << 16) |
-              EMAC_MDIO_COMM_COMMAND_READ_22 |
-              EMAC_MDIO_COMM_START_BUSY);
-       EMAC_WR(EMAC_REG_EMAC_MDIO_COMM, val);
-
-       for (i = 0; i < 50; i++) {
-               udelay(10);
-
-               val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_COMM);
-               if (!(val & EMAC_MDIO_COMM_START_BUSY)) {
-                       val &= EMAC_MDIO_COMM_DATA;
-                       break;
-               }
-       }
+       bnx2x_phy_hw_lock(bp);
+       rc = bnx2x_phy_init(&bp->link_params, &bp->link_vars);
+       bnx2x_phy_hw_unlock(bp);
 
-       if (val & EMAC_MDIO_COMM_START_BUSY) {
-               BNX2X_ERR("read phy register failed\n");
+       if (bp->link_vars.link_up)
+               bnx2x_link_report(bp);
 
-               *ret_val = 0x0;
-               rc = -EBUSY;
-       } else {
-               *ret_val = val;
-               rc = 0;
-       }
+       bnx2x_calc_fc_adv(bp);
 
-       if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
+       return rc;
+}
 
-               val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MDIO_MODE);
-               val |= EMAC_MDIO_MODE_AUTO_POLL;
-               EMAC_WR(EMAC_REG_EMAC_MDIO_MODE, val);
-       }
+static void bnx2x_link_set(struct bnx2x *bp)
+{
+       bnx2x_phy_hw_lock(bp);
+       bnx2x_phy_init(&bp->link_params, &bp->link_vars);
+       bnx2x_phy_hw_unlock(bp);
 
-/*      DP(NETIF_MSG_HW, "phy_addr 0x%x  reg 0x%x  ret_val 0x%08x\n",
-          bp->phy_addr, reg, *ret_val); */
+       bnx2x_calc_fc_adv(bp);
+}
 
-       return rc;
+static void bnx2x__link_reset(struct bnx2x *bp)
+{
+       bnx2x_phy_hw_lock(bp);
+       bnx2x_link_reset(&bp->link_params, &bp->link_vars);
+       bnx2x_phy_hw_unlock(bp);
 }
 
-static int bnx2x_mdio45_ctrl_write(struct bnx2x *bp, u32 mdio_ctrl,
-                                  u32 phy_addr, u32 reg, u32 addr, u32 val)
+static u8 bnx2x_link_test(struct bnx2x *bp)
 {
-       u32 tmp;
-       int i, rc = 0;
+       u8 rc;
 
-       /* set clause 45 mode, slow down the MDIO clock to 2.5MHz
-        * (a value of 49==0x31) and make sure that the AUTO poll is off
-        */
-       tmp = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
-       tmp &= ~(EMAC_MDIO_MODE_AUTO_POLL | EMAC_MDIO_MODE_CLOCK_CNT);
-       tmp |= (EMAC_MDIO_MODE_CLAUSE_45 |
-               (49 << EMAC_MDIO_MODE_CLOCK_CNT_BITSHIFT));
-       REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE, tmp);
-       REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
-       udelay(40);
-
-       /* address */
-       tmp = ((phy_addr << 21) | (reg << 16) | addr |
-              EMAC_MDIO_COMM_COMMAND_ADDRESS |
-              EMAC_MDIO_COMM_START_BUSY);
-       REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM, tmp);
-
-       for (i = 0; i < 50; i++) {
-               udelay(10);
-
-               tmp = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM);
-               if (!(tmp & EMAC_MDIO_COMM_START_BUSY)) {
-                       udelay(5);
-                       break;
-               }
-       }
-       if (tmp & EMAC_MDIO_COMM_START_BUSY) {
-               BNX2X_ERR("write phy register failed\n");
+       bnx2x_phy_hw_lock(bp);
+       rc = bnx2x_test_link(&bp->link_params, &bp->link_vars);
+       bnx2x_phy_hw_unlock(bp);
 
-               rc = -EBUSY;
+       return rc;
+}
 
-       } else {
-               /* data */
-               tmp = ((phy_addr << 21) | (reg << 16) | val |
-                      EMAC_MDIO_COMM_COMMAND_WRITE_45 |
-                      EMAC_MDIO_COMM_START_BUSY);
-               REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM, tmp);
-
-               for (i = 0; i < 50; i++) {
-                       udelay(10);
-
-                       tmp = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM);
-                       if (!(tmp & EMAC_MDIO_COMM_START_BUSY)) {
-                               udelay(5);
-                               break;
-                       }
-               }
+/* Calculates the sum of vn_min_rates.
+   It's needed for further normalizing of the min_rates.
 
-               if (tmp & EMAC_MDIO_COMM_START_BUSY) {
-                       BNX2X_ERR("write phy register failed\n");
+   Returns:
+     sum of vn_min_rates
+       or
+     0 - if all the min_rates are 0.
+     In the later case fainess algorithm should be deactivated.
+     If not all min_rates are zero then those that are zeroes will
+     be set to 1.
+ */
+static u32 bnx2x_calc_vn_wsum(struct bnx2x *bp)
+{
+       int i, port = BP_PORT(bp);
+       u32 wsum = 0;
+       int all_zero = 1;
+
+       for (i = 0; i < E1HVN_MAX; i++) {
+               u32 vn_cfg =
+                       SHMEM_RD(bp, mf_cfg.func_mf_config[2*i + port].config);
+               u32 vn_min_rate = ((vn_cfg & FUNC_MF_CFG_MIN_BW_MASK) >>
+                                    FUNC_MF_CFG_MIN_BW_SHIFT) * 100;
+               if (!(vn_cfg & FUNC_MF_CFG_FUNC_HIDE)) {
+                       /* If min rate is zero - set it to 1 */
+                       if (!vn_min_rate)
+                               vn_min_rate = DEF_MIN_RATE;
+                       else
+                               all_zero = 0;
 
-                       rc = -EBUSY;
+                       wsum += vn_min_rate;
                }
        }
 
-       /* unset clause 45 mode, set the MDIO clock to a faster value
-        * (0x13 => 6.25Mhz) and restore the AUTO poll if needed
-        */
-       tmp = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
-       tmp &= ~(EMAC_MDIO_MODE_CLAUSE_45 | EMAC_MDIO_MODE_CLOCK_CNT);
-       tmp |= (0x13 << EMAC_MDIO_MODE_CLOCK_CNT_BITSHIFT);
-       if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG)
-               tmp |= EMAC_MDIO_MODE_AUTO_POLL;
-       REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE, tmp);
+       /* ... only if all min rates are zeros - disable FAIRNESS */
+       if (all_zero)
+               return 0;
 
-       return rc;
+       return wsum;
 }
 
-static int bnx2x_mdio45_write(struct bnx2x *bp, u32 phy_addr, u32 reg,
-                             u32 addr, u32 val)
+static void bnx2x_init_port_minmax(struct bnx2x *bp,
+                                  int en_fness,
+                                  u16 port_rate,
+                                  struct cmng_struct_per_port *m_cmng_port)
 {
-       u32 emac_base = bp->port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
+       u32 r_param = port_rate / 8;
+       int port = BP_PORT(bp);
+       int i;
 
-       return bnx2x_mdio45_ctrl_write(bp, emac_base, phy_addr,
-                                      reg, addr, val);
-}
+       memset(m_cmng_port, 0, sizeof(struct cmng_struct_per_port));
+
+       /* Enable minmax only if we are in e1hmf mode */
+       if (IS_E1HMF(bp)) {
+               u32 fair_periodic_timeout_usec;
+               u32 t_fair;
+
+               /* Enable rate shaping and fairness */
+               m_cmng_port->flags.cmng_vn_enable = 1;
+               m_cmng_port->flags.fairness_enable = en_fness ? 1 : 0;
+               m_cmng_port->flags.rate_shaping_enable = 1;
+
+               if (!en_fness)
+                       DP(NETIF_MSG_IFUP, "All MIN values are zeroes"
+                          "  fairness will be disabled\n");
+
+               /* 100 usec in SDM ticks = 25 since each tick is 4 usec */
+               m_cmng_port->rs_vars.rs_periodic_timeout =
+                                               RS_PERIODIC_TIMEOUT_USEC / 4;
+
+               /* this is the threshold below which no timer arming will occur
+                  1.25 coefficient is for the threshold to be a little bigger
+                  than the real time, to compensate for timer in-accuracy */
+               m_cmng_port->rs_vars.rs_threshold =
+                               (RS_PERIODIC_TIMEOUT_USEC * r_param * 5) / 4;
+
+               /* resolution of fairness timer */
+               fair_periodic_timeout_usec = QM_ARB_BYTES / r_param;
+               /* for 10G it is 1000usec. for 1G it is 10000usec. */
+               t_fair = T_FAIR_COEF / port_rate;
+
+               /* this is the threshold below which we won't arm
+                  the timer anymore */
+               m_cmng_port->fair_vars.fair_threshold = QM_ARB_BYTES;
+
+               /* we multiply by 1e3/8 to get bytes/msec.
+                  We don't want the credits to pass a credit
+                  of the T_FAIR*FAIR_MEM (algorithm resolution) */
+               m_cmng_port->fair_vars.upper_bound =
+                                               r_param * t_fair * FAIR_MEM;
+               /* since each tick is 4 usec */
+               m_cmng_port->fair_vars.fairness_timeout =
+                                               fair_periodic_timeout_usec / 4;
 
-static int bnx2x_mdio45_ctrl_read(struct bnx2x *bp, u32 mdio_ctrl,
-                                 u32 phy_addr, u32 reg, u32 addr,
-                                 u32 *ret_val)
-{
-       u32 val;
-       int i, rc = 0;
+       } else {
+               /* Disable rate shaping and fairness */
+               m_cmng_port->flags.cmng_vn_enable = 0;
+               m_cmng_port->flags.fairness_enable = 0;
+               m_cmng_port->flags.rate_shaping_enable = 0;
 
-       /* set clause 45 mode, slow down the MDIO clock to 2.5MHz
-        * (a value of 49==0x31) and make sure that the AUTO poll is off
-        */
-       val = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
-       val &= ~(EMAC_MDIO_MODE_AUTO_POLL | EMAC_MDIO_MODE_CLOCK_CNT);
-       val |= (EMAC_MDIO_MODE_CLAUSE_45 |
-               (49 << EMAC_MDIO_MODE_CLOCK_CNT_BITSHIFT));
-       REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE, val);
-       REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
-       udelay(40);
-
-       /* address */
-       val = ((phy_addr << 21) | (reg << 16) | addr |
-              EMAC_MDIO_COMM_COMMAND_ADDRESS |
-              EMAC_MDIO_COMM_START_BUSY);
-       REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM, val);
-
-       for (i = 0; i < 50; i++) {
-               udelay(10);
-
-               val = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM);
-               if (!(val & EMAC_MDIO_COMM_START_BUSY)) {
-                       udelay(5);
-                       break;
-               }
+               DP(NETIF_MSG_IFUP,
+                  "Single function mode  minmax will be disabled\n");
        }
-       if (val & EMAC_MDIO_COMM_START_BUSY) {
-               BNX2X_ERR("read phy register failed\n");
 
-               *ret_val = 0;
-               rc = -EBUSY;
-
-       } else {
-               /* data */
-               val = ((phy_addr << 21) | (reg << 16) |
-                      EMAC_MDIO_COMM_COMMAND_READ_45 |
-                      EMAC_MDIO_COMM_START_BUSY);
-               REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM, val);
-
-               for (i = 0; i < 50; i++) {
-                       udelay(10);
-
-                       val = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM);
-                       if (!(val & EMAC_MDIO_COMM_START_BUSY)) {
-                               val &= EMAC_MDIO_COMM_DATA;
-                               break;
-                       }
-               }
+       /* Store it to internal memory */
+       for (i = 0; i < sizeof(struct cmng_struct_per_port) / 4; i++)
+               REG_WR(bp, BAR_XSTRORM_INTMEM +
+                      XSTORM_CMNG_PER_PORT_VARS_OFFSET(port) + i * 4,
+                      ((u32 *)(m_cmng_port))[i]);
+}
 
-               if (val & EMAC_MDIO_COMM_START_BUSY) {
-                       BNX2X_ERR("read phy register failed\n");
+static void bnx2x_init_vn_minmax(struct bnx2x *bp, int func,
+                                  u32 wsum, u16 port_rate,
+                                struct cmng_struct_per_port *m_cmng_port)
+{
+       struct rate_shaping_vars_per_vn m_rs_vn;
+       struct fairness_vars_per_vn m_fair_vn;
+       u32 vn_cfg = SHMEM_RD(bp, mf_cfg.func_mf_config[func].config);
+       u16 vn_min_rate, vn_max_rate;
+       int i;
 
-                       val = 0;
-                       rc = -EBUSY;
-               }
+       /* If function is hidden - set min and max to zeroes */
+       if (vn_cfg & FUNC_MF_CFG_FUNC_HIDE) {
+               vn_min_rate = 0;
+               vn_max_rate = 0;
 
-               *ret_val = val;
+       } else {
+               vn_min_rate = ((vn_cfg & FUNC_MF_CFG_MIN_BW_MASK) >>
+                               FUNC_MF_CFG_MIN_BW_SHIFT) * 100;
+               /* If FAIRNESS is enabled (not all min rates are zeroes) and
+                  if current min rate is zero - set it to 1.
+                  This is a requirment of the algorithm. */
+               if ((vn_min_rate == 0) && wsum)
+                       vn_min_rate = DEF_MIN_RATE;
+               vn_max_rate = ((vn_cfg & FUNC_MF_CFG_MAX_BW_MASK) >>
+                               FUNC_MF_CFG_MAX_BW_SHIFT) * 100;
+       }
+
+       DP(NETIF_MSG_IFUP, "func %d: vn_min_rate=%d  vn_max_rate=%d  "
+          "wsum=%d\n", func, vn_min_rate, vn_max_rate, wsum);
+
+       memset(&m_rs_vn, 0, sizeof(struct rate_shaping_vars_per_vn));
+       memset(&m_fair_vn, 0, sizeof(struct fairness_vars_per_vn));
+
+       /* global vn counter - maximal Mbps for this vn */
+       m_rs_vn.vn_counter.rate = vn_max_rate;
+
+       /* quota - number of bytes transmitted in this period */
+       m_rs_vn.vn_counter.quota =
+                               (vn_max_rate * RS_PERIODIC_TIMEOUT_USEC) / 8;
+
+#ifdef BNX2X_PER_PROT_QOS
+       /* per protocol counter */
+       for (protocol = 0; protocol < NUM_OF_PROTOCOLS; protocol++) {
+               /* maximal Mbps for this protocol */
+               m_rs_vn.protocol_counters[protocol].rate =
+                                               protocol_max_rate[protocol];
+               /* the quota in each timer period -
+                  number of bytes transmitted in this period */
+               m_rs_vn.protocol_counters[protocol].quota =
+                       (u32)(rs_periodic_timeout_usec *
+                         ((double)m_rs_vn.
+                                  protocol_counters[protocol].rate/8));
        }
+#endif
 
-       /* unset clause 45 mode, set the MDIO clock to a faster value
-        * (0x13 => 6.25Mhz) and restore the AUTO poll if needed
-        */
-       val = REG_RD(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
-       val &= ~(EMAC_MDIO_MODE_CLAUSE_45 | EMAC_MDIO_MODE_CLOCK_CNT);
-       val |= (0x13 << EMAC_MDIO_MODE_CLOCK_CNT_BITSHIFT);
-       if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG)
-               val |= EMAC_MDIO_MODE_AUTO_POLL;
-       REG_WR(bp, mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE, val);
-
-       return rc;
-}
+       if (wsum) {
+               /* credit for each period of the fairness algorithm:
+                  number of bytes in T_FAIR (the vn share the port rate).
+                  wsum should not be larger than 10000, thus
+                  T_FAIR_COEF / (8 * wsum) will always be grater than zero */
+               m_fair_vn.vn_credit_delta =
+                       max((u64)(vn_min_rate * (T_FAIR_COEF / (8 * wsum))),
+                           (u64)(m_cmng_port->fair_vars.fair_threshold * 2));
+               DP(NETIF_MSG_IFUP, "m_fair_vn.vn_credit_delta=%d\n",
+                  m_fair_vn.vn_credit_delta);
+       }
+
+#ifdef BNX2X_PER_PROT_QOS
+       do {
+               u32 protocolWeightSum = 0;
+
+               for (protocol = 0; protocol < NUM_OF_PROTOCOLS; protocol++)
+                       protocolWeightSum +=
+                                       drvInit.protocol_min_rate[protocol];
+               /* per protocol counter -
+                  NOT NEEDED IF NO PER-PROTOCOL CONGESTION MANAGEMENT */
+               if (protocolWeightSum > 0) {
+                       for (protocol = 0;
+                            protocol < NUM_OF_PROTOCOLS; protocol++)
+                               /* credit for each period of the
+                                  fairness algorithm - number of bytes in
+                                  T_FAIR (the protocol share the vn rate) */
+                               m_fair_vn.protocol_credit_delta[protocol] =
+                                       (u32)((vn_min_rate / 8) * t_fair *
+                                       protocol_min_rate / protocolWeightSum);
+               }
+       } while (0);
+#endif
 
-static int bnx2x_mdio45_read(struct bnx2x *bp, u32 phy_addr, u32 reg,
-                            u32 addr, u32 *ret_val)
-{
-       u32 emac_base = bp->port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
+       /* Store it to internal memory */
+       for (i = 0; i < sizeof(struct rate_shaping_vars_per_vn)/4; i++)
+               REG_WR(bp, BAR_XSTRORM_INTMEM +
+                      XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(func) + i * 4,
+                      ((u32 *)(&m_rs_vn))[i]);
 
-       return bnx2x_mdio45_ctrl_read(bp, emac_base, phy_addr,
-                                     reg, addr, ret_val);
+       for (i = 0; i < sizeof(struct fairness_vars_per_vn)/4; i++)
+               REG_WR(bp, BAR_XSTRORM_INTMEM +
+                      XSTORM_FAIRNESS_PER_VN_VARS_OFFSET(func) + i * 4,
+                      ((u32 *)(&m_fair_vn))[i]);
 }
 
-static int bnx2x_mdio45_vwrite(struct bnx2x *bp, u32 phy_addr, u32 reg,
-                              u32 addr, u32 val)
+/* This function is called upon link interrupt */
+static void bnx2x_link_attn(struct bnx2x *bp)
 {
-       int i;
-       u32 rd_val;
-
-       might_sleep();
-       for (i = 0; i < 10; i++) {
-               bnx2x_mdio45_write(bp, phy_addr, reg, addr, val);
-               msleep(5);
-               bnx2x_mdio45_read(bp, phy_addr, reg, addr, &rd_val);
-               /* if the read value is not the same as the value we wrote,
-                  we should write it again */
-               if (rd_val == val)
-                       return 0;
-       }
-       BNX2X_ERR("MDIO write in CL45 failed\n");
-       return -EBUSY;
-}
+       int vn;
 
-/*
- * link management
- */
+       /* Make sure that we are synced with the current statistics */
+       bnx2x_stats_handle(bp, STATS_EVENT_STOP);
 
-static void bnx2x_pause_resolve(struct bnx2x *bp, u32 pause_result)
-{
-       switch (pause_result) {                 /* ASYM P ASYM P */
-       case 0xb:                               /*   1  0   1  1 */
-               bp->flow_ctrl = FLOW_CTRL_TX;
-               break;
+       bnx2x_phy_hw_lock(bp);
+       bnx2x_link_update(&bp->link_params, &bp->link_vars);
+       bnx2x_phy_hw_unlock(bp);
 
-       case 0xe:                               /*   1  1   1  0 */
-               bp->flow_ctrl = FLOW_CTRL_RX;
-               break;
+       if (bp->link_vars.link_up) {
 
-       case 0x5:                               /*   0  1   0  1 */
-       case 0x7:                               /*   0  1   1  1 */
-       case 0xd:                               /*   1  1   0  1 */
-       case 0xf:                               /*   1  1   1  1 */
-               bp->flow_ctrl = FLOW_CTRL_BOTH;
-               break;
+               if (bp->link_vars.mac_type == MAC_TYPE_BMAC) {
+                       struct host_port_stats *pstats;
 
-       default:
-               break;
+                       pstats = bnx2x_sp(bp, port_stats);
+                       /* reset old bmac stats */
+                       memset(&(pstats->mac_stx[0]), 0,
+                              sizeof(struct mac_stx));
+               }
+               if ((bp->state == BNX2X_STATE_OPEN) ||
+                   (bp->state == BNX2X_STATE_DISABLED))
+                       bnx2x_stats_handle(bp, STATS_EVENT_LINK_UP);
        }
-}
 
-static u8 bnx2x_ext_phy_resove_fc(struct bnx2x *bp)
-{
-       u32 ext_phy_addr;
-       u32 ld_pause;   /* local */
-       u32 lp_pause;   /* link partner */
-       u32 an_complete; /* AN complete */
-       u32 pause_result;
-       u8 ret = 0;
-
-       ext_phy_addr = ((bp->ext_phy_config &
-                        PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                                       PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
-
-       /* read twice */
-       bnx2x_mdio45_read(bp, ext_phy_addr,
-                         EXT_PHY_KR_AUTO_NEG_DEVAD,
-                         EXT_PHY_KR_STATUS, &an_complete);
-       bnx2x_mdio45_read(bp, ext_phy_addr,
-                         EXT_PHY_KR_AUTO_NEG_DEVAD,
-                         EXT_PHY_KR_STATUS, &an_complete);
-
-       if (an_complete & EXT_PHY_KR_AUTO_NEG_COMPLETE) {
-               ret = 1;
-               bnx2x_mdio45_read(bp, ext_phy_addr,
-                                 EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                 EXT_PHY_KR_AUTO_NEG_ADVERT, &ld_pause);
-               bnx2x_mdio45_read(bp, ext_phy_addr,
-                                 EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                 EXT_PHY_KR_LP_AUTO_NEG, &lp_pause);
-               pause_result = (ld_pause &
-                               EXT_PHY_KR_AUTO_NEG_ADVERT_PAUSE_MASK) >> 8;
-               pause_result |= (lp_pause &
-                                EXT_PHY_KR_AUTO_NEG_ADVERT_PAUSE_MASK) >> 10;
-               DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x \n",
-                  pause_result);
-               bnx2x_pause_resolve(bp, pause_result);
-       }
-       return ret;
-}
-
-static void bnx2x_flow_ctrl_resolve(struct bnx2x *bp, u32 gp_status)
-{
-       u32 ld_pause;   /* local driver */
-       u32 lp_pause;   /* link partner */
-       u32 pause_result;
-
-       bp->flow_ctrl = 0;
-
-       /* resolve from gp_status in case of AN complete and not sgmii */
-       if ((bp->req_autoneg & AUTONEG_FLOW_CTRL) &&
-           (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) &&
-           (!(bp->phy_flags & PHY_SGMII_FLAG)) &&
-           (XGXS_EXT_PHY_TYPE(bp) == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT)) {
-
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-               bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_AUTO_NEG_ADV,
-                                 &ld_pause);
-               bnx2x_mdio22_read(bp,
-                       MDIO_COMBO_IEEE0_AUTO_NEG_LINK_PARTNER_ABILITY1,
-                                 &lp_pause);
-               pause_result = (ld_pause &
-                               MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>5;
-               pause_result |= (lp_pause &
-                                MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>7;
-               DP(NETIF_MSG_LINK, "pause_result 0x%x\n", pause_result);
-               bnx2x_pause_resolve(bp, pause_result);
-       } else if (!(bp->req_autoneg & AUTONEG_FLOW_CTRL) ||
-                  !(bnx2x_ext_phy_resove_fc(bp))) {
-               /* forced speed */
-               if (bp->req_autoneg & AUTONEG_FLOW_CTRL) {
-                       switch (bp->req_flow_ctrl) {
-                       case FLOW_CTRL_AUTO:
-                               if (bp->dev->mtu <= 4500)
-                                       bp->flow_ctrl = FLOW_CTRL_BOTH;
-                               else
-                                       bp->flow_ctrl = FLOW_CTRL_TX;
-                               break;
+       /* indicate link status */
+       bnx2x_link_report(bp);
 
-                       case FLOW_CTRL_TX:
-                               bp->flow_ctrl = FLOW_CTRL_TX;
-                               break;
+       if (IS_E1HMF(bp)) {
+               int func;
 
-                       case FLOW_CTRL_RX:
-                               if (bp->dev->mtu <= 4500)
-                                       bp->flow_ctrl = FLOW_CTRL_RX;
-                               break;
+               for (vn = VN_0; vn < E1HVN_MAX; vn++) {
+                       if (vn == BP_E1HVN(bp))
+                               continue;
 
-                       case FLOW_CTRL_BOTH:
-                               if (bp->dev->mtu <= 4500)
-                                       bp->flow_ctrl = FLOW_CTRL_BOTH;
-                               else
-                                       bp->flow_ctrl = FLOW_CTRL_TX;
-                               break;
+                       func = ((vn << 1) | BP_PORT(bp));
 
-                       case FLOW_CTRL_NONE:
-                       default:
-                               break;
-                       }
-               } else { /* forced mode */
-                       switch (bp->req_flow_ctrl) {
-                       case FLOW_CTRL_AUTO:
-                               DP(NETIF_MSG_LINK, "req_flow_ctrl 0x%x while"
-                                                  " req_autoneg 0x%x\n",
-                                  bp->req_flow_ctrl, bp->req_autoneg);
-                               break;
+                       /* Set the attention towards other drivers
+                          on the same port */
+                       REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_0 +
+                              (LINK_SYNC_ATTENTION_BIT_FUNC_0 + func)*4, 1);
+               }
+       }
 
-                       case FLOW_CTRL_TX:
-                       case FLOW_CTRL_RX:
-                       case FLOW_CTRL_BOTH:
-                               bp->flow_ctrl = bp->req_flow_ctrl;
-                               break;
+       if (CHIP_IS_E1H(bp) && (bp->link_vars.line_speed > 0)) {
+               struct cmng_struct_per_port m_cmng_port;
+               u32 wsum;
+               int port = BP_PORT(bp);
 
-                       case FLOW_CTRL_NONE:
-                       default:
-                               break;
-                       }
-               }
+               /* Init RATE SHAPING and FAIRNESS contexts */
+               wsum = bnx2x_calc_vn_wsum(bp);
+               bnx2x_init_port_minmax(bp, (int)wsum,
+                                       bp->link_vars.line_speed,
+                                       &m_cmng_port);
+               if (IS_E1HMF(bp))
+                       for (vn = VN_0; vn < E1HVN_MAX; vn++)
+                               bnx2x_init_vn_minmax(bp, 2*vn + port,
+                                       wsum, bp->link_vars.line_speed,
+                                                    &m_cmng_port);
        }
-       DP(NETIF_MSG_LINK, "flow_ctrl 0x%x\n", bp->flow_ctrl);
 }
 
-static void bnx2x_link_settings_status(struct bnx2x *bp, u32 gp_status)
+static void bnx2x__link_status_update(struct bnx2x *bp)
 {
-       bp->link_status = 0;
-
-       if (gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_LINK_STATUS) {
-               DP(NETIF_MSG_LINK, "phy link up\n");
-
-               bp->phy_link_up = 1;
-               bp->link_status |= LINK_STATUS_LINK_UP;
-
-               if (gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_DUPLEX_STATUS)
-                       bp->duplex = DUPLEX_FULL;
-               else
-                       bp->duplex = DUPLEX_HALF;
-
-               bnx2x_flow_ctrl_resolve(bp, gp_status);
-
-               switch (gp_status & GP_STATUS_SPEED_MASK) {
-               case GP_STATUS_10M:
-                       bp->line_speed = SPEED_10;
-                       if (bp->duplex == DUPLEX_FULL)
-                               bp->link_status |= LINK_10TFD;
-                       else
-                               bp->link_status |= LINK_10THD;
-                       break;
+       if (bp->state != BNX2X_STATE_OPEN)
+               return;
 
-               case GP_STATUS_100M:
-                       bp->line_speed = SPEED_100;
-                       if (bp->duplex == DUPLEX_FULL)
-                               bp->link_status |= LINK_100TXFD;
-                       else
-                               bp->link_status |= LINK_100TXHD;
-                       break;
+       bnx2x_link_status_update(&bp->link_params, &bp->link_vars);
 
-               case GP_STATUS_1G:
-               case GP_STATUS_1G_KX:
-                       bp->line_speed = SPEED_1000;
-                       if (bp->duplex == DUPLEX_FULL)
-                               bp->link_status |= LINK_1000TFD;
-                       else
-                               bp->link_status |= LINK_1000THD;
-                       break;
+       if (bp->link_vars.link_up)
+               bnx2x_stats_handle(bp, STATS_EVENT_LINK_UP);
+       else
+               bnx2x_stats_handle(bp, STATS_EVENT_STOP);
 
-               case GP_STATUS_2_5G:
-                       bp->line_speed = SPEED_2500;
-                       if (bp->duplex == DUPLEX_FULL)
-                               bp->link_status |= LINK_2500TFD;
-                       else
-                               bp->link_status |= LINK_2500THD;
-                       break;
+       /* indicate link status */
+       bnx2x_link_report(bp);
+}
 
-               case GP_STATUS_5G:
-               case GP_STATUS_6G:
-                       BNX2X_ERR("link speed unsupported  gp_status 0x%x\n",
-                                 gp_status);
-                       break;
+static void bnx2x_pmf_update(struct bnx2x *bp)
+{
+       int port = BP_PORT(bp);
+       u32 val;
 
-               case GP_STATUS_10G_KX4:
-               case GP_STATUS_10G_HIG:
-               case GP_STATUS_10G_CX4:
-                       bp->line_speed = SPEED_10000;
-                       bp->link_status |= LINK_10GTFD;
-                       break;
+       bp->port.pmf = 1;
+       DP(NETIF_MSG_LINK, "pmf %d\n", bp->port.pmf);
 
-               case GP_STATUS_12G_HIG:
-                       bp->line_speed = SPEED_12000;
-                       bp->link_status |= LINK_12GTFD;
-                       break;
+       /* enable nig attention */
+       val = (0xff0f | (1 << (BP_E1HVN(bp) + 4)));
+       REG_WR(bp, HC_REG_TRAILING_EDGE_0 + port*8, val);
+       REG_WR(bp, HC_REG_LEADING_EDGE_0 + port*8, val);
 
-               case GP_STATUS_12_5G:
-                       bp->line_speed = SPEED_12500;
-                       bp->link_status |= LINK_12_5GTFD;
-                       break;
+       bnx2x_stats_handle(bp, STATS_EVENT_PMF);
+}
 
-               case GP_STATUS_13G:
-                       bp->line_speed = SPEED_13000;
-                       bp->link_status |= LINK_13GTFD;
-                       break;
+/* end of Link */
 
-               case GP_STATUS_15G:
-                       bp->line_speed = SPEED_15000;
-                       bp->link_status |= LINK_15GTFD;
-                       break;
+/* slow path */
 
-               case GP_STATUS_16G:
-                       bp->line_speed = SPEED_16000;
-                       bp->link_status |= LINK_16GTFD;
-                       break;
+/*
+ * General service functions
+ */
 
-               default:
-                       BNX2X_ERR("link speed unsupported  gp_status 0x%x\n",
-                                 gp_status);
-                       break;
-               }
+/* the slow path queue is odd since completions arrive on the fastpath ring */
+static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
+                        u32 data_hi, u32 data_lo, int common)
+{
+       int func = BP_FUNC(bp);
 
-               bp->link_status |= LINK_STATUS_SERDES_LINK;
+       DP(BNX2X_MSG_SP/*NETIF_MSG_TIMER*/,
+          "SPQE (%x:%x)  command %d  hw_cid %x  data (%x:%x)  left %x\n",
+          (u32)U64_HI(bp->spq_mapping), (u32)(U64_LO(bp->spq_mapping) +
+          (void *)bp->spq_prod_bd - (void *)bp->spq), command,
+          HW_CID(bp, cid), data_hi, data_lo, bp->spq_left);
 
-               if (bp->req_autoneg & AUTONEG_SPEED) {
-                       bp->link_status |= LINK_STATUS_AUTO_NEGOTIATE_ENABLED;
+#ifdef BNX2X_STOP_ON_ERROR
+       if (unlikely(bp->panic))
+               return -EIO;
+#endif
 
-                       if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE)
-                               bp->link_status |=
-                                       LINK_STATUS_AUTO_NEGOTIATE_COMPLETE;
+       spin_lock_bh(&bp->spq_lock);
 
-                       if (bp->autoneg & AUTONEG_PARALLEL)
-                               bp->link_status |=
-                                       LINK_STATUS_PARALLEL_DETECTION_USED;
-               }
+       if (!bp->spq_left) {
+               BNX2X_ERR("BUG! SPQ ring full!\n");
+               spin_unlock_bh(&bp->spq_lock);
+               bnx2x_panic();
+               return -EBUSY;
+       }
 
-               if (bp->flow_ctrl & FLOW_CTRL_TX)
-                      bp->link_status |= LINK_STATUS_TX_FLOW_CONTROL_ENABLED;
+       /* CID needs port number to be encoded int it */
+       bp->spq_prod_bd->hdr.conn_and_cmd_data =
+                       cpu_to_le32(((command << SPE_HDR_CMD_ID_SHIFT) |
+                                    HW_CID(bp, cid)));
+       bp->spq_prod_bd->hdr.type = cpu_to_le16(ETH_CONNECTION_TYPE);
+       if (common)
+               bp->spq_prod_bd->hdr.type |=
+                       cpu_to_le16((1 << SPE_HDR_COMMON_RAMROD_SHIFT));
 
-               if (bp->flow_ctrl & FLOW_CTRL_RX)
-                      bp->link_status |= LINK_STATUS_RX_FLOW_CONTROL_ENABLED;
+       bp->spq_prod_bd->data.mac_config_addr.hi = cpu_to_le32(data_hi);
+       bp->spq_prod_bd->data.mac_config_addr.lo = cpu_to_le32(data_lo);
 
-       } else { /* link_down */
-               DP(NETIF_MSG_LINK, "phy link down\n");
+       bp->spq_left--;
 
-               bp->phy_link_up = 0;
+       if (bp->spq_prod_bd == bp->spq_last_bd) {
+               bp->spq_prod_bd = bp->spq;
+               bp->spq_prod_idx = 0;
+               DP(NETIF_MSG_TIMER, "end of spq\n");
 
-               bp->line_speed = 0;
-               bp->duplex = DUPLEX_FULL;
-               bp->flow_ctrl = 0;
+       } else {
+               bp->spq_prod_bd++;
+               bp->spq_prod_idx++;
        }
 
-       DP(NETIF_MSG_LINK, "gp_status 0x%x  phy_link_up %d\n"
-          DP_LEVEL "  line_speed %d  duplex %d  flow_ctrl 0x%x"
-                   "  link_status 0x%x\n",
-          gp_status, bp->phy_link_up, bp->line_speed, bp->duplex,
-          bp->flow_ctrl, bp->link_status);
-}
-
-static void bnx2x_link_int_ack(struct bnx2x *bp, int is_10g)
-{
-       int port = bp->port;
-
-       /* first reset all status
-        * we assume only one line will be change at a time */
-       bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
-                      (NIG_STATUS_XGXS0_LINK10G |
-                       NIG_STATUS_XGXS0_LINK_STATUS |
-                       NIG_STATUS_SERDES0_LINK_STATUS));
-       if (bp->phy_link_up) {
-               if (is_10g) {
-                       /* Disable the 10G link interrupt
-                        * by writing 1 to the status register
-                        */
-                       DP(NETIF_MSG_LINK, "10G XGXS phy link up\n");
-                       bnx2x_bits_en(bp,
-                                     NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
-                                     NIG_STATUS_XGXS0_LINK10G);
-
-               } else if (bp->phy_flags & PHY_XGXS_FLAG) {
-                       /* Disable the link interrupt
-                        * by writing 1 to the relevant lane
-                        * in the status register
-                        */
-                       DP(NETIF_MSG_LINK, "1G XGXS phy link up\n");
-                       bnx2x_bits_en(bp,
-                                     NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
-                                     ((1 << bp->ser_lane) <<
-                                      NIG_STATUS_XGXS0_LINK_STATUS_SIZE));
-
-               } else { /* SerDes */
-                       DP(NETIF_MSG_LINK, "SerDes phy link up\n");
-                       /* Disable the link interrupt
-                        * by writing 1 to the status register
-                        */
-                       bnx2x_bits_en(bp,
-                                     NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
-                                     NIG_STATUS_SERDES0_LINK_STATUS);
-               }
-
-       } else { /* link_down */
-       }
-}
-
-static int bnx2x_ext_phy_is_link_up(struct bnx2x *bp)
-{
-       u32 ext_phy_type;
-       u32 ext_phy_addr;
-       u32 val1 = 0, val2;
-       u32 rx_sd, pcs_status;
-
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               ext_phy_addr = ((bp->ext_phy_config &
-                                PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
-
-               ext_phy_type = XGXS_EXT_PHY_TYPE(bp);
-               switch (ext_phy_type) {
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
-                       DP(NETIF_MSG_LINK, "XGXS Direct\n");
-                       val1 = 1;
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
-                       DP(NETIF_MSG_LINK, "XGXS 8705\n");
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_WIS_DEVAD,
-                                         EXT_PHY_OPT_LASI_STATUS, &val1);
-                       DP(NETIF_MSG_LINK, "8705 LASI status 0x%x\n", val1);
-
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_WIS_DEVAD,
-                                         EXT_PHY_OPT_LASI_STATUS, &val1);
-                       DP(NETIF_MSG_LINK, "8705 LASI status 0x%x\n", val1);
-
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_OPT_PMD_RX_SD, &rx_sd);
-                       DP(NETIF_MSG_LINK, "8705 rx_sd 0x%x\n", rx_sd);
-                       val1 = (rx_sd & 0x1);
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
-                       DP(NETIF_MSG_LINK, "XGXS 8706\n");
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_OPT_LASI_STATUS, &val1);
-                       DP(NETIF_MSG_LINK, "8706 LASI status 0x%x\n", val1);
-
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_OPT_LASI_STATUS, &val1);
-                       DP(NETIF_MSG_LINK, "8706 LASI status 0x%x\n", val1);
-
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_OPT_PMD_RX_SD, &rx_sd);
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PCS_DEVAD,
-                                         EXT_PHY_OPT_PCS_STATUS, &pcs_status);
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_AUTO_NEG_DEVAD,
-                                         EXT_PHY_OPT_AN_LINK_STATUS, &val2);
-
-                       DP(NETIF_MSG_LINK, "8706 rx_sd 0x%x"
-                          "  pcs_status 0x%x 1Gbps link_status 0x%x 0x%x\n",
-                          rx_sd, pcs_status, val2, (val2 & (1<<1)));
-                       /* link is up if both bit 0 of pmd_rx_sd and
-                        * bit 0 of pcs_status are set, or if the autoneg bit
-                          1 is set
-                        */
-                       val1 = ((rx_sd & pcs_status & 0x1) || (val2 & (1<<1)));
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
-                       bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO);
-
-                       /* clear the interrupt LASI status register */
-                       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                              ext_phy_addr,
-                                              EXT_PHY_KR_PCS_DEVAD,
-                                              EXT_PHY_KR_LASI_STATUS, &val2);
-                       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                              ext_phy_addr,
-                                              EXT_PHY_KR_PCS_DEVAD,
-                                              EXT_PHY_KR_LASI_STATUS, &val1);
-                       DP(NETIF_MSG_LINK, "KR LASI status 0x%x->0x%x\n",
-                          val2, val1);
-                       /* Check the LASI */
-                       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                              ext_phy_addr,
-                                              EXT_PHY_KR_PMA_PMD_DEVAD,
-                                              0x9003, &val2);
-                       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                              ext_phy_addr,
-                                              EXT_PHY_KR_PMA_PMD_DEVAD,
-                                              0x9003, &val1);
-                       DP(NETIF_MSG_LINK, "KR 0x9003 0x%x->0x%x\n",
-                          val2, val1);
-                       /* Check the link status */
-                       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                              ext_phy_addr,
-                                              EXT_PHY_KR_PCS_DEVAD,
-                                              EXT_PHY_KR_PCS_STATUS, &val2);
-                       DP(NETIF_MSG_LINK, "KR PCS status 0x%x\n", val2);
-                       /* Check the link status on 1.1.2 */
-                       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                         ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_KR_STATUS, &val2);
-                       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                         ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_KR_STATUS, &val1);
-                       DP(NETIF_MSG_LINK,
-                          "KR PMA status 0x%x->0x%x\n", val2, val1);
-                       val1 = ((val1 & 4) == 4);
-                       /* If 1G was requested assume the link is up */
-                       if (!(bp->req_autoneg & AUTONEG_SPEED) &&
-                           (bp->req_line_speed == SPEED_1000))
-                               val1 = 1;
-                       bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_8072_MDIO);
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_OPT_LASI_STATUS, &val2);
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_OPT_LASI_STATUS, &val1);
-                       DP(NETIF_MSG_LINK,
-                          "10G-base-T LASI status 0x%x->0x%x\n", val2, val1);
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_KR_STATUS, &val2);
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                         EXT_PHY_KR_STATUS, &val1);
-                       DP(NETIF_MSG_LINK,
-                          "10G-base-T PMA status 0x%x->0x%x\n", val2, val1);
-                       val1 = ((val1 & 4) == 4);
-                       /* if link is up
-                        * print the AN outcome of the SFX7101 PHY
-                        */
-                       if (val1) {
-                               bnx2x_mdio45_read(bp, ext_phy_addr,
-                                                 EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                                 0x21, &val2);
-                               DP(NETIF_MSG_LINK,
-                                  "SFX7101 AN status 0x%x->%s\n", val2,
-                                  (val2 & (1<<14)) ? "Master" : "Slave");
-                       }
-                       break;
-
-               default:
-                       DP(NETIF_MSG_LINK, "BAD XGXS ext_phy_config 0x%x\n",
-                          bp->ext_phy_config);
-                       val1 = 0;
-                       break;
-               }
-
-       } else { /* SerDes */
-               ext_phy_type = SERDES_EXT_PHY_TYPE(bp);
-               switch (ext_phy_type) {
-               case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT:
-                       DP(NETIF_MSG_LINK, "SerDes Direct\n");
-                       val1 = 1;
-                       break;
-
-               case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482:
-                       DP(NETIF_MSG_LINK, "SerDes 5482\n");
-                       val1 = 1;
-                       break;
-
-               default:
-                       DP(NETIF_MSG_LINK, "BAD SerDes ext_phy_config 0x%x\n",
-                          bp->ext_phy_config);
-                       val1 = 0;
-                       break;
-               }
-       }
-
-       return val1;
-}
-
-static void bnx2x_bmac_enable(struct bnx2x *bp, int is_lb)
-{
-       int port = bp->port;
-       u32 bmac_addr = port ? NIG_REG_INGRESS_BMAC1_MEM :
-                              NIG_REG_INGRESS_BMAC0_MEM;
-       u32 wb_write[2];
-       u32 val;
-
-       DP(NETIF_MSG_LINK, "enabling BigMAC\n");
-       /* reset and unreset the BigMac */
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-              (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-       msleep(5);
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-              (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-
-       /* enable access for bmac registers */
-       NIG_WR(NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
-
-       /* XGXS control */
-       wb_write[0] = 0x3c;
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_XGXS_CONTROL,
-                   wb_write, 2);
-
-       /* tx MAC SA */
-       wb_write[0] = ((bp->dev->dev_addr[2] << 24) |
-                      (bp->dev->dev_addr[3] << 16) |
-                      (bp->dev->dev_addr[4] << 8) |
-                       bp->dev->dev_addr[5]);
-       wb_write[1] = ((bp->dev->dev_addr[0] << 8) |
-                       bp->dev->dev_addr[1]);
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_SOURCE_ADDR,
-                   wb_write, 2);
-
-       /* tx control */
-       val = 0xc0;
-       if (bp->flow_ctrl & FLOW_CTRL_TX)
-               val |= 0x800000;
-       wb_write[0] = val;
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_CONTROL, wb_write, 2);
-
-       /* set tx mtu */
-       wb_write[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD; /* -CRC */
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_MAX_SIZE, wb_write, 2);
-
-       /* mac control */
-       val = 0x3;
-       if (is_lb) {
-               val |= 0x4;
-               DP(NETIF_MSG_LINK, "enable bmac loopback\n");
-       }
-       wb_write[0] = val;
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL,
-                   wb_write, 2);
-
-       /* rx control set to don't strip crc */
-       val = 0x14;
-       if (bp->flow_ctrl & FLOW_CTRL_RX)
-               val |= 0x20;
-       wb_write[0] = val;
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_CONTROL, wb_write, 2);
-
-       /* set rx mtu */
-       wb_write[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_MAX_SIZE, wb_write, 2);
-
-       /* set cnt max size */
-       wb_write[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD; /* -VLAN */
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_CNT_MAX_SIZE,
-                   wb_write, 2);
-
-       /* configure safc */
-       wb_write[0] = 0x1000200;
-       wb_write[1] = 0;
-       REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_LLFC_MSG_FLDS,
-                   wb_write, 2);
-
-       /* fix for emulation */
-       if (CHIP_REV(bp) == CHIP_REV_EMUL) {
-               wb_write[0] = 0xf000;
-               wb_write[1] = 0;
-               REG_WR_DMAE(bp,
-                           bmac_addr + BIGMAC_REGISTER_TX_PAUSE_THRESHOLD,
-                           wb_write, 2);
-       }
-
-       /* reset old bmac stats */
-       memset(&bp->old_bmac, 0, sizeof(struct bmac_stats));
-
-       NIG_WR(NIG_REG_XCM0_OUT_EN + port*4, 0x0);
-
-       /* select XGXS */
-       NIG_WR(NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 0x1);
-       NIG_WR(NIG_REG_XGXS_LANE_SEL_P0 + port*4, 0x0);
-
-       /* disable the NIG in/out to the emac */
-       NIG_WR(NIG_REG_EMAC0_IN_EN + port*4, 0x0);
-       NIG_WR(NIG_REG_EMAC0_PAUSE_OUT_EN + port*4, 0x0);
-       NIG_WR(NIG_REG_EGRESS_EMAC0_OUT_EN + port*4, 0x0);
-
-       /* enable the NIG in/out to the bmac */
-       NIG_WR(NIG_REG_EGRESS_EMAC0_PORT + port*4, 0x0);
-
-       NIG_WR(NIG_REG_BMAC0_IN_EN + port*4, 0x1);
-       val = 0;
-       if (bp->flow_ctrl & FLOW_CTRL_TX)
-               val = 1;
-       NIG_WR(NIG_REG_BMAC0_PAUSE_OUT_EN + port*4, val);
-       NIG_WR(NIG_REG_BMAC0_OUT_EN + port*4, 0x1);
-
-       bp->phy_flags |= PHY_BMAC_FLAG;
-
-       bp->stats_state = STATS_STATE_ENABLE;
-}
-
-static void bnx2x_bmac_rx_disable(struct bnx2x *bp)
-{
-       int port = bp->port;
-       u32 bmac_addr = port ? NIG_REG_INGRESS_BMAC1_MEM :
-                              NIG_REG_INGRESS_BMAC0_MEM;
-       u32 wb_write[2];
-
-       /* Only if the bmac is out of reset */
-       if (REG_RD(bp, MISC_REG_RESET_REG_2) &
-                       (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port)) {
-               /* Clear Rx Enable bit in BMAC_CONTROL register */
-#ifdef BNX2X_DMAE_RD
-               bnx2x_read_dmae(bp, bmac_addr +
-                               BIGMAC_REGISTER_BMAC_CONTROL, 2);
-               wb_write[0] = *bnx2x_sp(bp, wb_data[0]);
-               wb_write[1] = *bnx2x_sp(bp, wb_data[1]);
-#else
-               wb_write[0] = REG_RD(bp,
-                               bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL);
-               wb_write[1] = REG_RD(bp,
-                               bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL + 4);
-#endif
-               wb_write[0] &= ~BMAC_CONTROL_RX_ENABLE;
-               REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL,
-                           wb_write, 2);
-               msleep(1);
-       }
-}
-
-static void bnx2x_emac_enable(struct bnx2x *bp)
-{
-       int port = bp->port;
-       u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
-       u32 val;
-       int timeout;
-
-       DP(NETIF_MSG_LINK, "enabling EMAC\n");
-       /* reset and unreset the emac core */
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-              (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
-       msleep(5);
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-              (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
-
-       /* enable emac and not bmac */
-       NIG_WR(NIG_REG_EGRESS_EMAC0_PORT + port*4, 1);
-
-       /* for paladium */
-       if (CHIP_REV(bp) == CHIP_REV_EMUL) {
-               /* Use lane 1 (of lanes 0-3) */
-               NIG_WR(NIG_REG_XGXS_LANE_SEL_P0 + port*4, 1);
-               NIG_WR(NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 1);
-       }
-       /* for fpga */
-       else if (CHIP_REV(bp) == CHIP_REV_FPGA) {
-               /* Use lane 1 (of lanes 0-3) */
-               NIG_WR(NIG_REG_XGXS_LANE_SEL_P0 + port*4, 1);
-               NIG_WR(NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 0);
-       }
-       /* ASIC */
-       else {
-               if (bp->phy_flags & PHY_XGXS_FLAG) {
-                       DP(NETIF_MSG_LINK, "XGXS\n");
-                       /* select the master lanes (out of 0-3) */
-                       NIG_WR(NIG_REG_XGXS_LANE_SEL_P0 + port*4,
-                              bp->ser_lane);
-                       /* select XGXS */
-                       NIG_WR(NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 1);
-
-               } else { /* SerDes */
-                       DP(NETIF_MSG_LINK, "SerDes\n");
-                       /* select SerDes */
-                       NIG_WR(NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 0);
-               }
-       }
-
-       /* enable emac */
-       NIG_WR(NIG_REG_NIG_EMAC0_EN + port*4, 1);
-
-       /* init emac - use read-modify-write */
-       /* self clear reset */
-       val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);
-       EMAC_WR(EMAC_REG_EMAC_MODE, (val | EMAC_MODE_RESET));
-
-       timeout = 200;
-       while (val & EMAC_MODE_RESET) {
-               val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);
-               DP(NETIF_MSG_LINK, "EMAC reset reg is %u\n", val);
-               if (!timeout) {
-                       BNX2X_ERR("EMAC timeout!\n");
-                       break;
-               }
-               timeout--;
-       }
-
-       /* reset tx part */
-       EMAC_WR(EMAC_REG_EMAC_TX_MODE, EMAC_TX_MODE_RESET);
-
-       timeout = 200;
-       while (val & EMAC_TX_MODE_RESET) {
-               val = REG_RD(bp, emac_base + EMAC_REG_EMAC_TX_MODE);
-               DP(NETIF_MSG_LINK, "EMAC reset reg is %u\n", val);
-               if (!timeout) {
-                       BNX2X_ERR("EMAC timeout!\n");
-                       break;
-               }
-               timeout--;
-       }
-
-       if (CHIP_REV_IS_SLOW(bp)) {
-               /* config GMII mode */
-               val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);
-               EMAC_WR(EMAC_REG_EMAC_MODE, (val | EMAC_MODE_PORT_GMII));
-
-       } else { /* ASIC */
-               /* pause enable/disable */
-               bnx2x_bits_dis(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
-                              EMAC_RX_MODE_FLOW_EN);
-               if (bp->flow_ctrl & FLOW_CTRL_RX)
-                       bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
-                                     EMAC_RX_MODE_FLOW_EN);
-
-               bnx2x_bits_dis(bp, emac_base + EMAC_REG_EMAC_TX_MODE,
-                              EMAC_TX_MODE_EXT_PAUSE_EN);
-               if (bp->flow_ctrl & FLOW_CTRL_TX)
-                       bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE,
-                                     EMAC_TX_MODE_EXT_PAUSE_EN);
-       }
-
-       /* KEEP_VLAN_TAG, promiscuous */
-       val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE);
-       val |= EMAC_RX_MODE_KEEP_VLAN_TAG | EMAC_RX_MODE_PROMISCUOUS;
-       EMAC_WR(EMAC_REG_EMAC_RX_MODE, val);
-
-       /* identify magic packets */
-       val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);
-       EMAC_WR(EMAC_REG_EMAC_MODE, (val | EMAC_MODE_MPKT));
-
-       /* enable emac for jumbo packets */
-       EMAC_WR(EMAC_REG_EMAC_RX_MTU_SIZE,
-               (EMAC_RX_MTU_SIZE_JUMBO_ENA |
-                (ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD))); /* -VLAN */
-
-       /* strip CRC */
-       NIG_WR(NIG_REG_NIG_INGRESS_EMAC0_NO_CRC + port*4, 0x1);
-
-       val = ((bp->dev->dev_addr[0] << 8) |
-               bp->dev->dev_addr[1]);
-       EMAC_WR(EMAC_REG_EMAC_MAC_MATCH, val);
-
-       val = ((bp->dev->dev_addr[2] << 24) |
-              (bp->dev->dev_addr[3] << 16) |
-              (bp->dev->dev_addr[4] << 8) |
-               bp->dev->dev_addr[5]);
-       EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + 4, val);
-
-       /* disable the NIG in/out to the bmac */
-       NIG_WR(NIG_REG_BMAC0_IN_EN + port*4, 0x0);
-       NIG_WR(NIG_REG_BMAC0_PAUSE_OUT_EN + port*4, 0x0);
-       NIG_WR(NIG_REG_BMAC0_OUT_EN + port*4, 0x0);
-
-       /* enable the NIG in/out to the emac */
-       NIG_WR(NIG_REG_EMAC0_IN_EN + port*4, 0x1);
-       val = 0;
-       if (bp->flow_ctrl & FLOW_CTRL_TX)
-               val = 1;
-       NIG_WR(NIG_REG_EMAC0_PAUSE_OUT_EN + port*4, val);
-       NIG_WR(NIG_REG_EGRESS_EMAC0_OUT_EN + port*4, 0x1);
-
-       if (CHIP_REV(bp) == CHIP_REV_FPGA) {
-               /* take the BigMac out of reset */
-               REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                      (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-
-               /* enable access for bmac registers */
-               NIG_WR(NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
-       }
-
-       bp->phy_flags |= PHY_EMAC_FLAG;
-
-       bp->stats_state = STATS_STATE_ENABLE;
-}
-
-static void bnx2x_emac_program(struct bnx2x *bp)
-{
-       u16 mode = 0;
-       int port = bp->port;
-
-       DP(NETIF_MSG_LINK, "setting link speed & duplex\n");
-       bnx2x_bits_dis(bp, GRCBASE_EMAC0 + port*0x400 + EMAC_REG_EMAC_MODE,
-                      (EMAC_MODE_25G_MODE |
-                       EMAC_MODE_PORT_MII_10M |
-                       EMAC_MODE_HALF_DUPLEX));
-       switch (bp->line_speed) {
-       case SPEED_10:
-               mode |= EMAC_MODE_PORT_MII_10M;
-               break;
-
-       case SPEED_100:
-               mode |= EMAC_MODE_PORT_MII;
-               break;
-
-       case SPEED_1000:
-               mode |= EMAC_MODE_PORT_GMII;
-               break;
-
-       case SPEED_2500:
-               mode |= (EMAC_MODE_25G_MODE | EMAC_MODE_PORT_GMII);
-               break;
-
-       default:
-               /* 10G not valid for EMAC */
-               BNX2X_ERR("Invalid line_speed 0x%x\n", bp->line_speed);
-               break;
-       }
-
-       if (bp->duplex == DUPLEX_HALF)
-               mode |= EMAC_MODE_HALF_DUPLEX;
-       bnx2x_bits_en(bp, GRCBASE_EMAC0 + port*0x400 + EMAC_REG_EMAC_MODE,
-                     mode);
-
-       bnx2x_leds_set(bp, bp->line_speed);
-}
-
-static void bnx2x_set_sgmii_tx_driver(struct bnx2x *bp)
-{
-       u32 lp_up2;
-       u32 tx_driver;
-
-       /* read precomp */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_OVER_1G);
-       bnx2x_mdio22_read(bp, MDIO_OVER_1G_LP_UP2, &lp_up2);
-
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_TX0);
-       bnx2x_mdio22_read(bp, MDIO_TX0_TX_DRIVER, &tx_driver);
-
-       /* bits [10:7] at lp_up2, positioned at [15:12] */
-       lp_up2 = (((lp_up2 & MDIO_OVER_1G_LP_UP2_PREEMPHASIS_MASK) >>
-                  MDIO_OVER_1G_LP_UP2_PREEMPHASIS_SHIFT) <<
-                 MDIO_TX0_TX_DRIVER_PREEMPHASIS_SHIFT);
-
-       if ((lp_up2 != 0) &&
-           (lp_up2 != (tx_driver & MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK))) {
-               /* replace tx_driver bits [15:12] */
-               tx_driver &= ~MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK;
-               tx_driver |= lp_up2;
-               bnx2x_mdio22_write(bp, MDIO_TX0_TX_DRIVER, tx_driver);
-       }
-}
-
-static void bnx2x_pbf_update(struct bnx2x *bp)
-{
-       int port = bp->port;
-       u32 init_crd, crd;
-       u32 count = 1000;
-       u32 pause = 0;
-
-       /* disable port */
-       REG_WR(bp, PBF_REG_DISABLE_NEW_TASK_PROC_P0 + port*4, 0x1);
-
-       /* wait for init credit */
-       init_crd = REG_RD(bp, PBF_REG_P0_INIT_CRD + port*4);
-       crd = REG_RD(bp, PBF_REG_P0_CREDIT + port*8);
-       DP(NETIF_MSG_LINK, "init_crd 0x%x  crd 0x%x\n", init_crd, crd);
-
-       while ((init_crd != crd) && count) {
-               msleep(5);
-
-               crd = REG_RD(bp, PBF_REG_P0_CREDIT + port*8);
-               count--;
-       }
-       crd = REG_RD(bp, PBF_REG_P0_CREDIT + port*8);
-       if (init_crd != crd)
-               BNX2X_ERR("BUG! init_crd 0x%x != crd 0x%x\n", init_crd, crd);
-
-       if (bp->flow_ctrl & FLOW_CTRL_RX)
-               pause = 1;
-       REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, pause);
-       if (pause) {
-               /* update threshold */
-               REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, 0);
-               /* update init credit */
-               init_crd = 778;         /* (800-18-4) */
-
-       } else {
-               u32 thresh = (ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD)/16;
-
-               /* update threshold */
-               REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, thresh);
-               /* update init credit */
-               switch (bp->line_speed) {
-               case SPEED_10:
-               case SPEED_100:
-               case SPEED_1000:
-                       init_crd = thresh + 55 - 22;
-                       break;
-
-               case SPEED_2500:
-                       init_crd = thresh + 138 - 22;
-                       break;
-
-               case SPEED_10000:
-                       init_crd = thresh + 553 - 22;
-                       break;
-
-               default:
-                       BNX2X_ERR("Invalid line_speed 0x%x\n",
-                                 bp->line_speed);
-                       break;
-               }
-       }
-       REG_WR(bp, PBF_REG_P0_INIT_CRD + port*4, init_crd);
-       DP(NETIF_MSG_LINK, "PBF updated to speed %d credit %d\n",
-          bp->line_speed, init_crd);
-
-       /* probe the credit changes */
-       REG_WR(bp, PBF_REG_INIT_P0 + port*4, 0x1);
-       msleep(5);
-       REG_WR(bp, PBF_REG_INIT_P0 + port*4, 0x0);
-
-       /* enable port */
-       REG_WR(bp, PBF_REG_DISABLE_NEW_TASK_PROC_P0 + port*4, 0x0);
-}
-
-static void bnx2x_update_mng(struct bnx2x *bp)
-{
-       if (!nomcp)
-               SHMEM_WR(bp, port_mb[bp->port].link_status,
-                        bp->link_status);
-}
-
-static void bnx2x_link_report(struct bnx2x *bp)
-{
-       if (bp->link_up) {
-               netif_carrier_on(bp->dev);
-               printk(KERN_INFO PFX "%s NIC Link is Up, ", bp->dev->name);
-
-               printk("%d Mbps ", bp->line_speed);
-
-               if (bp->duplex == DUPLEX_FULL)
-                       printk("full duplex");
-               else
-                       printk("half duplex");
-
-               if (bp->flow_ctrl) {
-                       if (bp->flow_ctrl & FLOW_CTRL_RX) {
-                               printk(", receive ");
-                               if (bp->flow_ctrl & FLOW_CTRL_TX)
-                                       printk("& transmit ");
-                       } else {
-                               printk(", transmit ");
-                       }
-                       printk("flow control ON");
-               }
-               printk("\n");
-
-       } else { /* link_down */
-               netif_carrier_off(bp->dev);
-               printk(KERN_INFO PFX "%s NIC Link is Down\n", bp->dev->name);
-       }
-}
-
-static void bnx2x_link_up(struct bnx2x *bp)
-{
-       int port = bp->port;
-
-       /* PBF - link up */
-       bnx2x_pbf_update(bp);
-
-       /* disable drain */
-       NIG_WR(NIG_REG_EGRESS_DRAIN0_MODE + port*4, 0);
-
-       /* update shared memory */
-       bnx2x_update_mng(bp);
-
-       /* indicate link up */
-       bnx2x_link_report(bp);
-}
-
-static void bnx2x_link_down(struct bnx2x *bp)
-{
-       int port = bp->port;
-
-       /* notify stats */
-       if (bp->stats_state != STATS_STATE_DISABLE) {
-               bp->stats_state = STATS_STATE_STOP;
-               DP(BNX2X_MSG_STATS, "stats_state - STOP\n");
-       }
-
-       /* indicate no mac active */
-       bp->phy_flags &= ~(PHY_BMAC_FLAG | PHY_EMAC_FLAG);
-
-       /* update shared memory */
-       bnx2x_update_mng(bp);
-
-       /* activate nig drain */
-       NIG_WR(NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);
-
-       /* reset BigMac */
-       bnx2x_bmac_rx_disable(bp);
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-              (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-
-       /* indicate link down */
-       bnx2x_link_report(bp);
-}
-
-static void bnx2x_init_mac_stats(struct bnx2x *bp);
-
-/* This function is called upon link interrupt */
-static void bnx2x_link_update(struct bnx2x *bp)
-{
-       int port = bp->port;
-       int i;
-       u32 gp_status;
-       int link_10g;
-
-       DP(NETIF_MSG_LINK, "port %x, %s, int_status 0x%x,"
-          " int_mask 0x%x, saved_mask 0x%x, MI_INT %x, SERDES_LINK %x,"
-          " 10G %x, XGXS_LINK %x\n", port,
-          (bp->phy_flags & PHY_XGXS_FLAG)? "XGXS":"SerDes",
-          REG_RD(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4),
-          REG_RD(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4), bp->nig_mask,
-          REG_RD(bp, NIG_REG_EMAC0_STATUS_MISC_MI_INT + port*0x18),
-          REG_RD(bp, NIG_REG_SERDES0_STATUS_LINK_STATUS + port*0x3c),
-          REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68),
-          REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK_STATUS + port*0x68)
-       );
-
-       might_sleep();
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_GP_STATUS);
-       /* avoid fast toggling */
-       for (i = 0; i < 10; i++) {
-               msleep(10);
-               bnx2x_mdio22_read(bp, MDIO_GP_STATUS_TOP_AN_STATUS1,
-                                 &gp_status);
-       }
-
-       bnx2x_link_settings_status(bp, gp_status);
-
-       /* anything 10 and over uses the bmac */
-       link_10g = ((bp->line_speed >= SPEED_10000) &&
-                   (bp->line_speed <= SPEED_16000));
-
-       bnx2x_link_int_ack(bp, link_10g);
-
-       /* link is up only if both local phy and external phy are up */
-       bp->link_up = (bp->phy_link_up && bnx2x_ext_phy_is_link_up(bp));
-       if (bp->link_up) {
-               if (link_10g) {
-                       bnx2x_bmac_enable(bp, 0);
-                       bnx2x_leds_set(bp, SPEED_10000);
-
-               } else {
-                       bnx2x_emac_enable(bp);
-                       bnx2x_emac_program(bp);
-
-                       /* AN complete? */
-                       if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) {
-                               if (!(bp->phy_flags & PHY_SGMII_FLAG))
-                                       bnx2x_set_sgmii_tx_driver(bp);
-                       }
-               }
-               bnx2x_link_up(bp);
-
-       } else { /* link down */
-               bnx2x_leds_unset(bp);
-               bnx2x_link_down(bp);
-       }
-
-       bnx2x_init_mac_stats(bp);
-}
-
-/*
- * Init service functions
- */
-
-static void bnx2x_set_aer_mmd(struct bnx2x *bp)
-{
-       u16 offset = (bp->phy_flags & PHY_XGXS_FLAG) ?
-                                       (bp->phy_addr + bp->ser_lane) : 0;
-
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_AER_BLOCK);
-       bnx2x_mdio22_write(bp, MDIO_AER_BLOCK_AER_REG, 0x3800 + offset);
-}
-
-static void bnx2x_set_master_ln(struct bnx2x *bp)
-{
-       u32 new_master_ln;
-
-       /* set the master_ln for AN */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_XGXS_BLOCK2);
-       bnx2x_mdio22_read(bp, MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
-                         &new_master_ln);
-       bnx2x_mdio22_write(bp, MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
-                          (new_master_ln | bp->ser_lane));
-}
-
-static void bnx2x_reset_unicore(struct bnx2x *bp)
-{
-       u32 mii_control;
-       int i;
-
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-       bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_MII_CONTROL, &mii_control);
-       /* reset the unicore */
-       bnx2x_mdio22_write(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                          (mii_control | MDIO_COMBO_IEEO_MII_CONTROL_RESET));
-
-       /* wait for the reset to self clear */
-       for (i = 0; i < MDIO_ACCESS_TIMEOUT; i++) {
-               udelay(5);
-
-               /* the reset erased the previous bank value */
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-               bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                                 &mii_control);
-
-               if (!(mii_control & MDIO_COMBO_IEEO_MII_CONTROL_RESET)) {
-                       udelay(5);
-                       return;
-               }
-       }
-
-       BNX2X_ERR("BUG! %s (0x%x) is still in reset!\n",
-                 (bp->phy_flags & PHY_XGXS_FLAG)? "XGXS":"SerDes",
-                 bp->phy_addr);
-}
-
-static void bnx2x_set_swap_lanes(struct bnx2x *bp)
-{
-       /* Each two bits represents a lane number:
-          No swap is 0123 => 0x1b no need to enable the swap */
-
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_XGXS_BLOCK2);
-       if (bp->rx_lane_swap != 0x1b) {
-               bnx2x_mdio22_write(bp, MDIO_XGXS_BLOCK2_RX_LN_SWAP,
-                                  (bp->rx_lane_swap |
-                                   MDIO_XGXS_BLOCK2_RX_LN_SWAP_ENABLE |
-                                  MDIO_XGXS_BLOCK2_RX_LN_SWAP_FORCE_ENABLE));
-       } else {
-               bnx2x_mdio22_write(bp, MDIO_XGXS_BLOCK2_RX_LN_SWAP, 0);
-       }
-
-       if (bp->tx_lane_swap != 0x1b) {
-               bnx2x_mdio22_write(bp, MDIO_XGXS_BLOCK2_TX_LN_SWAP,
-                                  (bp->tx_lane_swap |
-                                   MDIO_XGXS_BLOCK2_TX_LN_SWAP_ENABLE));
-       } else {
-               bnx2x_mdio22_write(bp, MDIO_XGXS_BLOCK2_TX_LN_SWAP, 0);
-       }
-}
-
-static void bnx2x_set_parallel_detection(struct bnx2x *bp)
-{
-       u32 control2;
-
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_SERDES_DIGITAL);
-       bnx2x_mdio22_read(bp, MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
-                         &control2);
-
-       if (bp->autoneg & AUTONEG_PARALLEL) {
-               control2 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
-       } else {
-               control2 &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
-       }
-       bnx2x_mdio22_write(bp, MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
-                          control2);
-
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               DP(NETIF_MSG_LINK, "XGXS\n");
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_10G_PARALLEL_DETECT);
-
-               bnx2x_mdio22_write(bp,
-                               MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK,
-                              MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK_CNT);
-
-               bnx2x_mdio22_read(bp,
-                               MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
-                               &control2);
-
-               if (bp->autoneg & AUTONEG_PARALLEL) {
-                       control2 |=
-                   MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL_PARDET10G_EN;
-               } else {
-                       control2 &=
-                  ~MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL_PARDET10G_EN;
-               }
-               bnx2x_mdio22_write(bp,
-                               MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
-                               control2);
-
-               /* Disable parallel detection of HiG */
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_XGXS_BLOCK2);
-               bnx2x_mdio22_write(bp, MDIO_XGXS_BLOCK2_UNICORE_MODE_10G,
-                               MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_CX4_XGXS |
-                               MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_HIGIG_XGXS);
-       }
-}
-
-static void bnx2x_set_autoneg(struct bnx2x *bp)
-{
-       u32 reg_val;
-
-       /* CL37 Autoneg */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-       bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
-       if ((bp->req_autoneg & AUTONEG_SPEED) &&
-           (bp->autoneg & AUTONEG_CL37)) {
-               /* CL37 Autoneg Enabled */
-               reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_AN_EN;
-       } else {
-               /* CL37 Autoneg Disabled */
-               reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
-                            MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN);
-       }
-       bnx2x_mdio22_write(bp, MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
-
-       /* Enable/Disable Autodetection */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_SERDES_DIGITAL);
-       bnx2x_mdio22_read(bp, MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, &reg_val);
-       reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN;
-
-       if ((bp->req_autoneg & AUTONEG_SPEED) &&
-           (bp->autoneg & AUTONEG_SGMII_FIBER_AUTODET)) {
-               reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET;
-       } else {
-               reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET;
-       }
-       bnx2x_mdio22_write(bp, MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, reg_val);
-
-       /* Enable TetonII and BAM autoneg */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_BAM_NEXT_PAGE);
-       bnx2x_mdio22_read(bp, MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
-                         &reg_val);
-       if ((bp->req_autoneg & AUTONEG_SPEED) &&
-           (bp->autoneg & AUTONEG_CL37) && (bp->autoneg & AUTONEG_BAM)) {
-               /* Enable BAM aneg Mode and TetonII aneg Mode */
-               reg_val |= (MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_BAM_MODE |
-                           MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_TETON_AN);
-       } else {
-               /* TetonII and BAM Autoneg Disabled */
-               reg_val &= ~(MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_BAM_MODE |
-                            MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_TETON_AN);
-       }
-       bnx2x_mdio22_write(bp, MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
-                          reg_val);
-
-       /* Enable Clause 73 Aneg */
-       if ((bp->req_autoneg & AUTONEG_SPEED) &&
-           (bp->autoneg & AUTONEG_CL73)) {
-               /* Enable BAM Station Manager */
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_CL73_USERB0);
-               bnx2x_mdio22_write(bp, MDIO_CL73_USERB0_CL73_BAM_CTRL1,
-                                  (MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_EN |
-                       MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_STATION_MNGR_EN |
-                       MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_NP_AFTER_BP_EN));
-
-               /* Merge CL73 and CL37 aneg resolution */
-               bnx2x_mdio22_read(bp, MDIO_CL73_USERB0_CL73_BAM_CTRL3,
-                                 &reg_val);
-               bnx2x_mdio22_write(bp, MDIO_CL73_USERB0_CL73_BAM_CTRL3,
-                                  (reg_val |
-                       MDIO_CL73_USERB0_CL73_BAM_CTRL3_USE_CL73_HCD_MR));
-
-               /* Set the CL73 AN speed */
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_CL73_IEEEB1);
-               bnx2x_mdio22_read(bp, MDIO_CL73_IEEEB1_AN_ADV2, &reg_val);
-               /* In the SerDes we support only the 1G.
-                  In the XGXS we support the 10G KX4
-                  but we currently do not support the KR */
-               if (bp->phy_flags & PHY_XGXS_FLAG) {
-                       DP(NETIF_MSG_LINK, "XGXS\n");
-                       /* 10G KX4 */
-                       reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_10G_KX4;
-               } else {
-                       DP(NETIF_MSG_LINK, "SerDes\n");
-                       /* 1000M KX */
-                       reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_1000M_KX;
-               }
-               bnx2x_mdio22_write(bp, MDIO_CL73_IEEEB1_AN_ADV2, reg_val);
-
-               /* CL73 Autoneg Enabled */
-               reg_val = MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN;
-       } else {
-               /* CL73 Autoneg Disabled */
-               reg_val = 0;
-       }
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_CL73_IEEEB0);
-       bnx2x_mdio22_write(bp, MDIO_CL73_IEEEB0_CL73_AN_CONTROL, reg_val);
-}
-
-/* program SerDes, forced speed */
-static void bnx2x_program_serdes(struct bnx2x *bp)
-{
-       u32 reg_val;
-
-       /* program duplex, disable autoneg */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-       bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
-       reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX |
-                    MDIO_COMBO_IEEO_MII_CONTROL_AN_EN);
-       if (bp->req_duplex == DUPLEX_FULL)
-               reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
-       bnx2x_mdio22_write(bp, MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
-
-       /* program speed
-          - needed only if the speed is greater than 1G (2.5G or 10G) */
-       if (bp->req_line_speed > SPEED_1000) {
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_SERDES_DIGITAL);
-               bnx2x_mdio22_read(bp, MDIO_SERDES_DIGITAL_MISC1, &reg_val);
-               /* clearing the speed value before setting the right speed */
-               reg_val &= ~MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_MASK;
-               reg_val |= (MDIO_SERDES_DIGITAL_MISC1_REFCLK_SEL_156_25M |
-                           MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_SEL);
-               if (bp->req_line_speed == SPEED_10000)
-                       reg_val |=
-                               MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_10G_CX4;
-               bnx2x_mdio22_write(bp, MDIO_SERDES_DIGITAL_MISC1, reg_val);
-       }
-}
-
-static void bnx2x_set_brcm_cl37_advertisment(struct bnx2x *bp)
-{
-       u32 val = 0;
-
-       /* configure the 48 bits for BAM AN */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_OVER_1G);
-
-       /* set extended capabilities */
-       if (bp->advertising & ADVERTISED_2500baseX_Full)
-               val |= MDIO_OVER_1G_UP1_2_5G;
-       if (bp->advertising & ADVERTISED_10000baseT_Full)
-               val |= MDIO_OVER_1G_UP1_10G;
-       bnx2x_mdio22_write(bp, MDIO_OVER_1G_UP1, val);
-
-       bnx2x_mdio22_write(bp, MDIO_OVER_1G_UP3, 0);
-}
-
-static void bnx2x_set_ieee_aneg_advertisment(struct bnx2x *bp)
-{
-       u32 an_adv;
-
-       /* for AN, we are always publishing full duplex */
-       an_adv = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX;
-
-       /* resolve pause mode and advertisement
-        * Please refer to Table 28B-3 of the 802.3ab-1999 spec */
-       if (bp->req_autoneg & AUTONEG_FLOW_CTRL) {
-               switch (bp->req_flow_ctrl) {
-               case FLOW_CTRL_AUTO:
-                       if (bp->dev->mtu <= 4500) {
-                               an_adv |=
-                                    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
-                               bp->advertising |= (ADVERTISED_Pause |
-                                                   ADVERTISED_Asym_Pause);
-                       } else {
-                               an_adv |=
-                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
-                               bp->advertising |= ADVERTISED_Asym_Pause;
-                       }
-                       break;
-
-               case FLOW_CTRL_TX:
-                       an_adv |=
-                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
-                       bp->advertising |= ADVERTISED_Asym_Pause;
-                       break;
-
-               case FLOW_CTRL_RX:
-                       if (bp->dev->mtu <= 4500) {
-                               an_adv |=
-                                    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
-                               bp->advertising |= (ADVERTISED_Pause |
-                                                   ADVERTISED_Asym_Pause);
-                       } else {
-                               an_adv |=
-                                    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE;
-                               bp->advertising &= ~(ADVERTISED_Pause |
-                                                    ADVERTISED_Asym_Pause);
-                       }
-                       break;
-
-               case FLOW_CTRL_BOTH:
-                       if (bp->dev->mtu <= 4500) {
-                               an_adv |=
-                                    MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
-                               bp->advertising |= (ADVERTISED_Pause |
-                                                   ADVERTISED_Asym_Pause);
-                       } else {
-                               an_adv |=
-                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
-                               bp->advertising |= ADVERTISED_Asym_Pause;
-                       }
-                       break;
-
-               case FLOW_CTRL_NONE:
-               default:
-                       an_adv |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE;
-                       bp->advertising &= ~(ADVERTISED_Pause |
-                                            ADVERTISED_Asym_Pause);
-                       break;
-               }
-       } else { /* forced mode */
-               switch (bp->req_flow_ctrl) {
-               case FLOW_CTRL_AUTO:
-                       DP(NETIF_MSG_LINK, "req_flow_ctrl 0x%x while"
-                                          " req_autoneg 0x%x\n",
-                          bp->req_flow_ctrl, bp->req_autoneg);
-                       break;
-
-               case FLOW_CTRL_TX:
-                       an_adv |=
-                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
-                       bp->advertising |= ADVERTISED_Asym_Pause;
-                       break;
-
-               case FLOW_CTRL_RX:
-               case FLOW_CTRL_BOTH:
-                       an_adv |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
-                       bp->advertising |= (ADVERTISED_Pause |
-                                           ADVERTISED_Asym_Pause);
-                       break;
-
-               case FLOW_CTRL_NONE:
-               default:
-                       an_adv |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE;
-                       bp->advertising &= ~(ADVERTISED_Pause |
-                                            ADVERTISED_Asym_Pause);
-                       break;
-               }
-       }
-
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-       bnx2x_mdio22_write(bp, MDIO_COMBO_IEEE0_AUTO_NEG_ADV, an_adv);
-}
-
-static void bnx2x_restart_autoneg(struct bnx2x *bp)
-{
-       if (bp->autoneg & AUTONEG_CL73) {
-               /* enable and restart clause 73 aneg */
-               u32 an_ctrl;
-
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_CL73_IEEEB0);
-               bnx2x_mdio22_read(bp, MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                 &an_ctrl);
-               bnx2x_mdio22_write(bp, MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                  (an_ctrl |
-                                   MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN |
-                               MDIO_CL73_IEEEB0_CL73_AN_CONTROL_RESTART_AN));
-
-       } else {
-               /* Enable and restart BAM/CL37 aneg */
-               u32 mii_control;
-
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-               bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                                 &mii_control);
-               bnx2x_mdio22_write(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                                  (mii_control |
-                                   MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
-                                   MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN));
-       }
-}
-
-static void bnx2x_initialize_sgmii_process(struct bnx2x *bp)
-{
-       u32 control1;
-
-       /* in SGMII mode, the unicore is always slave */
-       MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_SERDES_DIGITAL);
-       bnx2x_mdio22_read(bp, MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
-                         &control1);
-       control1 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_INVERT_SIGNAL_DETECT;
-       /* set sgmii mode (and not fiber) */
-       control1 &= ~(MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_FIBER_MODE |
-                     MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET |
-                     MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_MSTR_MODE);
-       bnx2x_mdio22_write(bp, MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
-                          control1);
-
-       /* if forced speed */
-       if (!(bp->req_autoneg & AUTONEG_SPEED)) {
-               /* set speed, disable autoneg */
-               u32 mii_control;
-
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-               bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                                 &mii_control);
-               mii_control &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
-                              MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK |
-                                MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX);
-
-               switch (bp->req_line_speed) {
-               case SPEED_100:
-                       mii_control |=
-                               MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_100;
-                       break;
-               case SPEED_1000:
-                       mii_control |=
-                               MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_1000;
-                       break;
-               case SPEED_10:
-                       /* there is nothing to set for 10M */
-                       break;
-               default:
-                       /* invalid speed for SGMII */
-                       DP(NETIF_MSG_LINK, "Invalid req_line_speed 0x%x\n",
-                          bp->req_line_speed);
-                       break;
-               }
-
-               /* setting the full duplex */
-               if (bp->req_duplex == DUPLEX_FULL)
-                       mii_control |=
-                               MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
-               bnx2x_mdio22_write(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                                  mii_control);
-
-       } else { /* AN mode */
-               /* enable and restart AN */
-               bnx2x_restart_autoneg(bp);
-       }
-}
-
-static void bnx2x_link_int_enable(struct bnx2x *bp)
-{
-       int port = bp->port;
-       u32 ext_phy_type;
-       u32 mask;
-
-       /* setting the status to report on link up
-          for either XGXS or SerDes */
-       bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
-                      (NIG_STATUS_XGXS0_LINK10G |
-                       NIG_STATUS_XGXS0_LINK_STATUS |
-                       NIG_STATUS_SERDES0_LINK_STATUS));
-
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               mask = (NIG_MASK_XGXS0_LINK10G |
-                       NIG_MASK_XGXS0_LINK_STATUS);
-               DP(NETIF_MSG_LINK, "enabled XGXS interrupt\n");
-               ext_phy_type = XGXS_EXT_PHY_TYPE(bp);
-               if ((ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &&
-                   (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE) &&
-                   (ext_phy_type !=
-                               PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN)) {
-                       mask |= NIG_MASK_MI_INT;
-                       DP(NETIF_MSG_LINK, "enabled external phy int\n");
-               }
-
-       } else { /* SerDes */
-               mask = NIG_MASK_SERDES0_LINK_STATUS;
-               DP(NETIF_MSG_LINK, "enabled SerDes interrupt\n");
-               ext_phy_type = SERDES_EXT_PHY_TYPE(bp);
-               if ((ext_phy_type !=
-                               PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT) &&
-                   (ext_phy_type !=
-                               PORT_HW_CFG_SERDES_EXT_PHY_TYPE_NOT_CONN)) {
-                       mask |= NIG_MASK_MI_INT;
-                       DP(NETIF_MSG_LINK, "enabled external phy int\n");
-               }
-       }
-       bnx2x_bits_en(bp,
-                     NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
-                     mask);
-       DP(NETIF_MSG_LINK, "port %x, %s, int_status 0x%x,"
-          " int_mask 0x%x, MI_INT %x, SERDES_LINK %x,"
-          " 10G %x, XGXS_LINK %x\n", port,
-          (bp->phy_flags & PHY_XGXS_FLAG)? "XGXS":"SerDes",
-          REG_RD(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4),
-          REG_RD(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4),
-          REG_RD(bp, NIG_REG_EMAC0_STATUS_MISC_MI_INT + port*0x18),
-          REG_RD(bp, NIG_REG_SERDES0_STATUS_LINK_STATUS + port*0x3c),
-          REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68),
-          REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK_STATUS + port*0x68)
-       );
-}
-
-static void bnx2x_bcm8072_external_rom_boot(struct bnx2x *bp)
-{
-       u32 ext_phy_addr = ((bp->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
-       u32 fw_ver1, fw_ver2;
-
-       /* Need to wait 200ms after reset */
-       msleep(200);
-       /* Boot port from external ROM
-        * Set ser_boot_ctl bit in the MISC_CTRL1 register
-        */
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD,
-                               EXT_PHY_KR_MISC_CTRL1, 0x0001);
-
-       /* Reset internal microprocessor */
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD, EXT_PHY_KR_GEN_CTRL,
-                               EXT_PHY_KR_ROM_RESET_INTERNAL_MP);
-       /* set micro reset = 0 */
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD, EXT_PHY_KR_GEN_CTRL,
-                               EXT_PHY_KR_ROM_MICRO_RESET);
-       /* Reset internal microprocessor */
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD, EXT_PHY_KR_GEN_CTRL,
-                               EXT_PHY_KR_ROM_RESET_INTERNAL_MP);
-       /* wait for 100ms for code download via SPI port */
-       msleep(100);
-
-       /* Clear ser_boot_ctl bit */
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD,
-                               EXT_PHY_KR_MISC_CTRL1, 0x0000);
-       /* Wait 100ms */
-       msleep(100);
-
-       /* Print the PHY FW version */
-       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0, ext_phy_addr,
-                              EXT_PHY_KR_PMA_PMD_DEVAD,
-                              0xca19, &fw_ver1);
-       bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0, ext_phy_addr,
-                              EXT_PHY_KR_PMA_PMD_DEVAD,
-                              0xca1a, &fw_ver2);
-       DP(NETIF_MSG_LINK,
-          "8072 FW version 0x%x:0x%x\n", fw_ver1, fw_ver2);
-}
-
-static void bnx2x_bcm8072_force_10G(struct bnx2x *bp)
-{
-       u32 ext_phy_addr = ((bp->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
-
-       /* Force KR or KX */
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD, EXT_PHY_KR_CTRL,
-                               0x2040);
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD, EXT_PHY_KR_CTRL2,
-                               0x000b);
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_PMA_PMD_DEVAD, EXT_PHY_KR_PMD_CTRL,
-                               0x0000);
-       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0, ext_phy_addr,
-                               EXT_PHY_KR_AUTO_NEG_DEVAD, EXT_PHY_KR_CTRL,
-                               0x0000);
-}
-
-static void bnx2x_ext_phy_init(struct bnx2x *bp)
-{
-       u32 ext_phy_type;
-       u32 ext_phy_addr;
-       u32 cnt;
-       u32 ctrl;
-       u32 val = 0;
-
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               ext_phy_addr = ((bp->ext_phy_config &
-                                PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
-
-               ext_phy_type = XGXS_EXT_PHY_TYPE(bp);
-               /* Make sure that the soft reset is off (expect for the 8072:
-                * due to the lock, it will be done inside the specific
-                * handling)
-                */
-               if ((ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &&
-                   (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE) &&
-                  (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN) &&
-                   (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072)) {
-                       /* Wait for soft reset to get cleared upto 1 sec */
-                       for (cnt = 0; cnt < 1000; cnt++) {
-                               bnx2x_mdio45_read(bp, ext_phy_addr,
-                                                 EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                                 EXT_PHY_OPT_CNTL, &ctrl);
-                               if (!(ctrl & (1<<15)))
-                                       break;
-                               msleep(1);
-                       }
-                       DP(NETIF_MSG_LINK,
-                          "control reg 0x%x (after %d ms)\n", ctrl, cnt);
-               }
-
-               switch (ext_phy_type) {
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
-                       DP(NETIF_MSG_LINK, "XGXS Direct\n");
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
-                       DP(NETIF_MSG_LINK, "XGXS 8705\n");
-
-                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                           EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                           EXT_PHY_OPT_PMD_MISC_CNTL,
-                                           0x8288);
-                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                           EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                           EXT_PHY_OPT_PHY_IDENTIFIER,
-                                           0x7fbf);
-                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                           EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                           EXT_PHY_OPT_CMU_PLL_BYPASS,
-                                           0x0100);
-                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                           EXT_PHY_OPT_WIS_DEVAD,
-                                           EXT_PHY_OPT_LASI_CNTL, 0x1);
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
-                       DP(NETIF_MSG_LINK, "XGXS 8706\n");
-
-                       if (!(bp->req_autoneg & AUTONEG_SPEED)) {
-                               /* Force speed */
-                               if (bp->req_line_speed == SPEED_10000) {
-                                       DP(NETIF_MSG_LINK,
-                                          "XGXS 8706 force 10Gbps\n");
-                                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                               EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                               EXT_PHY_OPT_PMD_DIGITAL_CNT,
-                                               0x400);
-                               } else {
-                                       /* Force 1Gbps */
-                                       DP(NETIF_MSG_LINK,
-                                          "XGXS 8706 force 1Gbps\n");
-
-                                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                               EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                               EXT_PHY_OPT_CNTL,
-                                               0x0040);
-
-                                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                               EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                               EXT_PHY_OPT_CNTL2,
-                                               0x000D);
-                               }
-
-                               /* Enable LASI */
-                               bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                                   EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                                   EXT_PHY_OPT_LASI_CNTL,
-                                                   0x1);
-                       } else {
-                               /* AUTONEG */
-                               /* Allow CL37 through CL73 */
-                               DP(NETIF_MSG_LINK, "XGXS 8706 AutoNeg\n");
-                               bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                                   EXT_PHY_AUTO_NEG_DEVAD,
-                                                   EXT_PHY_OPT_AN_CL37_CL73,
-                                                   0x040c);
-
-                               /* Enable Full-Duplex advertisment on CL37 */
-                               bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                                   EXT_PHY_AUTO_NEG_DEVAD,
-                                                   EXT_PHY_OPT_AN_CL37_FD,
-                                                   0x0020);
-                               /* Enable CL37 AN */
-                               bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                                   EXT_PHY_AUTO_NEG_DEVAD,
-                                                   EXT_PHY_OPT_AN_CL37_AN,
-                                                   0x1000);
-                               /* Advertise 10G/1G support */
-                               if (bp->advertising &
-                                   ADVERTISED_1000baseT_Full)
-                                       val = (1<<5);
-                               if (bp->advertising &
-                                   ADVERTISED_10000baseT_Full)
-                                       val |= (1<<7);
-
-                               bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                                   EXT_PHY_AUTO_NEG_DEVAD,
-                                                   EXT_PHY_OPT_AN_ADV, val);
-                               /* Enable LASI */
-                               bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                                   EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                                   EXT_PHY_OPT_LASI_CNTL,
-                                                   0x1);
-
-                               /* Enable clause 73 AN */
-                               bnx2x_mdio45_write(bp, ext_phy_addr,
-                                                  EXT_PHY_AUTO_NEG_DEVAD,
-                                                  EXT_PHY_OPT_CNTL,
-                                                  0x1200);
-                       }
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
-                       bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO);
-                       /* Wait for soft reset to get cleared upto 1 sec */
-                       for (cnt = 0; cnt < 1000; cnt++) {
-                               bnx2x_mdio45_ctrl_read(bp, GRCBASE_EMAC0,
-                                               ext_phy_addr,
-                                               EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                               EXT_PHY_OPT_CNTL, &ctrl);
-                               if (!(ctrl & (1<<15)))
-                                       break;
-                               msleep(1);
-                       }
-                       DP(NETIF_MSG_LINK,
-                          "8072 control reg 0x%x (after %d ms)\n",
-                          ctrl, cnt);
-
-                       bnx2x_bcm8072_external_rom_boot(bp);
-                       DP(NETIF_MSG_LINK, "Finshed loading 8072 KR ROM\n");
-
-                       /* enable LASI */
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                               ext_phy_addr,
-                                               EXT_PHY_KR_PMA_PMD_DEVAD,
-                                               0x9000, 0x0400);
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                               ext_phy_addr,
-                                               EXT_PHY_KR_PMA_PMD_DEVAD,
-                                               EXT_PHY_KR_LASI_CNTL, 0x0004);
-
-                       /* If this is forced speed, set to KR or KX
-                        * (all other are not supported)
-                        */
-                       if (!(bp->req_autoneg & AUTONEG_SPEED)) {
-                               if (bp->req_line_speed == SPEED_10000) {
-                                       bnx2x_bcm8072_force_10G(bp);
-                                       DP(NETIF_MSG_LINK,
-                                          "Forced speed 10G on 8072\n");
-                                       /* unlock */
-                                       bnx2x_hw_unlock(bp,
-                                               HW_LOCK_RESOURCE_8072_MDIO);
-                                       break;
-                               } else
-                                       val = (1<<5);
-                       } else {
-
-                               /* Advertise 10G/1G support */
-                               if (bp->advertising &
-                                               ADVERTISED_1000baseT_Full)
-                                       val = (1<<5);
-                               if (bp->advertising &
-                                               ADVERTISED_10000baseT_Full)
-                                       val |= (1<<7);
-                       }
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                       ext_phy_addr,
-                                       EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                       0x11, val);
-                       /* Add support for CL37 ( passive mode ) I */
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                               ext_phy_addr,
-                                               EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                               0x8370, 0x040c);
-                       /* Add support for CL37 ( passive mode ) II */
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                               ext_phy_addr,
-                                               EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                               0xffe4, 0x20);
-                       /* Add support for CL37 ( passive mode ) III */
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                               ext_phy_addr,
-                                               EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                               0xffe0, 0x1000);
-                       /* Restart autoneg */
-                       msleep(500);
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                       ext_phy_addr,
-                                       EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                       EXT_PHY_KR_CTRL, 0x1200);
-                       DP(NETIF_MSG_LINK, "8072 Autoneg Restart: "
-                          "1G %ssupported  10G %ssupported\n",
-                          (val & (1<<5)) ? "" : "not ",
-                          (val & (1<<7)) ? "" : "not ");
-
-                       /* unlock */
-                       bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_8072_MDIO);
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
-                       DP(NETIF_MSG_LINK,
-                          "Setting the SFX7101 LASI indication\n");
-                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                           EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                           EXT_PHY_OPT_LASI_CNTL, 0x1);
-                       DP(NETIF_MSG_LINK,
-                          "Setting the SFX7101 LED to blink on traffic\n");
-                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                           EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                           0xC007, (1<<3));
-
-                       /* read modify write pause advertizing */
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                         EXT_PHY_KR_AUTO_NEG_ADVERT, &val);
-                       val &= ~EXT_PHY_KR_AUTO_NEG_ADVERT_PAUSE_BOTH;
-                       /* Please refer to Table 28B-3 of 802.3ab-1999 spec. */
-                       if (bp->advertising & ADVERTISED_Pause)
-                               val |= EXT_PHY_KR_AUTO_NEG_ADVERT_PAUSE;
-
-                       if (bp->advertising & ADVERTISED_Asym_Pause) {
-                               val |=
-                                EXT_PHY_KR_AUTO_NEG_ADVERT_PAUSE_ASYMMETRIC;
-                       }
-                       DP(NETIF_MSG_LINK, "SFX7101 AN advertize 0x%x\n", val);
-                       bnx2x_mdio45_vwrite(bp, ext_phy_addr,
-                                           EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                           EXT_PHY_KR_AUTO_NEG_ADVERT, val);
-                       /* Restart autoneg */
-                       bnx2x_mdio45_read(bp, ext_phy_addr,
-                                         EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                         EXT_PHY_KR_CTRL, &val);
-                       val |= 0x200;
-                       bnx2x_mdio45_write(bp, ext_phy_addr,
-                                           EXT_PHY_KR_AUTO_NEG_DEVAD,
-                                           EXT_PHY_KR_CTRL, val);
-                       break;
-
-               default:
-                       BNX2X_ERR("BAD XGXS ext_phy_config 0x%x\n",
-                                 bp->ext_phy_config);
-                       break;
-               }
-
-       } else { /* SerDes */
-/*             ext_phy_addr = ((bp->ext_phy_config &
-                                PORT_HW_CFG_SERDES_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_SERDES_EXT_PHY_ADDR_SHIFT);
-*/
-               ext_phy_type = SERDES_EXT_PHY_TYPE(bp);
-               switch (ext_phy_type) {
-               case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT:
-                       DP(NETIF_MSG_LINK, "SerDes Direct\n");
-                       break;
-
-               case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482:
-                       DP(NETIF_MSG_LINK, "SerDes 5482\n");
-                       break;
-
-               default:
-                       DP(NETIF_MSG_LINK, "BAD SerDes ext_phy_config 0x%x\n",
-                          bp->ext_phy_config);
-                       break;
-               }
-       }
-}
-
-static void bnx2x_ext_phy_reset(struct bnx2x *bp)
-{
-       u32 ext_phy_type;
-       u32 ext_phy_addr = ((bp->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
-       u32 board = (bp->board & SHARED_HW_CFG_BOARD_TYPE_MASK);
-
-       /* The PHY reset is controled by GPIO 1
-        * Give it 1ms of reset pulse
-        */
-       if ((board != SHARED_HW_CFG_BOARD_TYPE_BCM957710T1002G) &&
-           (board != SHARED_HW_CFG_BOARD_TYPE_BCM957710T1003G)) {
-               bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                              MISC_REGISTERS_GPIO_OUTPUT_LOW);
-               msleep(1);
-               bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                              MISC_REGISTERS_GPIO_OUTPUT_HIGH);
-       }
-
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               ext_phy_type = XGXS_EXT_PHY_TYPE(bp);
-               switch (ext_phy_type) {
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
-                       DP(NETIF_MSG_LINK, "XGXS Direct\n");
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
-                       DP(NETIF_MSG_LINK, "XGXS 8705/8706\n");
-                       bnx2x_mdio45_write(bp, ext_phy_addr,
-                                          EXT_PHY_OPT_PMA_PMD_DEVAD,
-                                          EXT_PHY_OPT_CNTL, 0xa040);
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
-                       DP(NETIF_MSG_LINK, "XGXS 8072\n");
-                       bnx2x_hw_lock(bp, HW_LOCK_RESOURCE_8072_MDIO);
-                       bnx2x_mdio45_ctrl_write(bp, GRCBASE_EMAC0,
-                                               ext_phy_addr,
-                                               EXT_PHY_KR_PMA_PMD_DEVAD,
-                                               0, 1<<15);
-                       bnx2x_hw_unlock(bp, HW_LOCK_RESOURCE_8072_MDIO);
-                       break;
-
-               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
-                       DP(NETIF_MSG_LINK, "XGXS SFX7101\n");
-                       break;
-
-               default:
-                       DP(NETIF_MSG_LINK, "BAD XGXS ext_phy_config 0x%x\n",
-                          bp->ext_phy_config);
-                       break;
-               }
-
-       } else { /* SerDes */
-               ext_phy_type = SERDES_EXT_PHY_TYPE(bp);
-               switch (ext_phy_type) {
-               case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT:
-                       DP(NETIF_MSG_LINK, "SerDes Direct\n");
-                       break;
-
-               case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482:
-                       DP(NETIF_MSG_LINK, "SerDes 5482\n");
-                       break;
-
-               default:
-                       DP(NETIF_MSG_LINK, "BAD SerDes ext_phy_config 0x%x\n",
-                          bp->ext_phy_config);
-                       break;
-               }
-       }
-}
-
-static void bnx2x_link_initialize(struct bnx2x *bp)
-{
-       int port = bp->port;
-
-       /* disable attentions */
-       bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
-                      (NIG_MASK_XGXS0_LINK_STATUS |
-                       NIG_MASK_XGXS0_LINK10G |
-                       NIG_MASK_SERDES0_LINK_STATUS |
-                       NIG_MASK_MI_INT));
-
-       /* Activate the external PHY */
-       bnx2x_ext_phy_reset(bp);
-
-       bnx2x_set_aer_mmd(bp);
-
-       if (bp->phy_flags & PHY_XGXS_FLAG)
-               bnx2x_set_master_ln(bp);
-
-       /* reset the SerDes and wait for reset bit return low */
-       bnx2x_reset_unicore(bp);
-
-       bnx2x_set_aer_mmd(bp);
-
-       /* setting the masterLn_def again after the reset */
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               bnx2x_set_master_ln(bp);
-               bnx2x_set_swap_lanes(bp);
-       }
-
-       /* Set Parallel Detect */
-       if (bp->req_autoneg & AUTONEG_SPEED)
-               bnx2x_set_parallel_detection(bp);
-
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               if (bp->req_line_speed &&
-                   bp->req_line_speed < SPEED_1000) {
-                       bp->phy_flags |= PHY_SGMII_FLAG;
-               } else {
-                       bp->phy_flags &= ~PHY_SGMII_FLAG;
-               }
-       }
-
-       if (!(bp->phy_flags & PHY_SGMII_FLAG)) {
-               u16 bank, rx_eq;
-
-               rx_eq = ((bp->serdes_config &
-                         PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_MASK) >>
-                        PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_SHIFT);
-
-               DP(NETIF_MSG_LINK, "setting rx eq to %d\n", rx_eq);
-               for (bank = MDIO_REG_BANK_RX0; bank <= MDIO_REG_BANK_RX_ALL;
-                           bank += (MDIO_REG_BANK_RX1 - MDIO_REG_BANK_RX0)) {
-                       MDIO_SET_REG_BANK(bp, bank);
-                       bnx2x_mdio22_write(bp, MDIO_RX0_RX_EQ_BOOST,
-                                          ((rx_eq &
-                               MDIO_RX0_RX_EQ_BOOST_EQUALIZER_CTRL_MASK) |
-                               MDIO_RX0_RX_EQ_BOOST_OFFSET_CTRL));
-               }
-
-               /* forced speed requested? */
-               if (!(bp->req_autoneg & AUTONEG_SPEED)) {
-                       DP(NETIF_MSG_LINK, "not SGMII, no AN\n");
-
-                       /* disable autoneg */
-                       bnx2x_set_autoneg(bp);
-
-                       /* program speed and duplex */
-                       bnx2x_program_serdes(bp);
-
-               } else { /* AN_mode */
-                       DP(NETIF_MSG_LINK, "not SGMII, AN\n");
-
-                       /* AN enabled */
-                       bnx2x_set_brcm_cl37_advertisment(bp);
-
-                       /* program duplex & pause advertisement (for aneg) */
-                       bnx2x_set_ieee_aneg_advertisment(bp);
-
-                       /* enable autoneg */
-                       bnx2x_set_autoneg(bp);
-
-                       /* enable and restart AN */
-                       bnx2x_restart_autoneg(bp);
-               }
-
-       } else { /* SGMII mode */
-               DP(NETIF_MSG_LINK, "SGMII\n");
-
-               bnx2x_initialize_sgmii_process(bp);
-       }
-
-       /* init ext phy and enable link state int */
-       bnx2x_ext_phy_init(bp);
-
-       /* enable the interrupt */
-       bnx2x_link_int_enable(bp);
-}
-
-static void bnx2x_phy_deassert(struct bnx2x *bp)
-{
-       int port = bp->port;
-       u32 val;
-
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               DP(NETIF_MSG_LINK, "XGXS\n");
-               val = XGXS_RESET_BITS;
-
-       } else { /* SerDes */
-               DP(NETIF_MSG_LINK, "SerDes\n");
-               val = SERDES_RESET_BITS;
-       }
-
-       val = val << (port*16);
-
-       /* reset and unreset the SerDes/XGXS */
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR, val);
-       msleep(5);
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_SET, val);
-}
-
-static int bnx2x_phy_init(struct bnx2x *bp)
-{
-       DP(NETIF_MSG_LINK, "started\n");
-       if (CHIP_REV(bp) == CHIP_REV_FPGA) {
-               bp->phy_flags |= PHY_EMAC_FLAG;
-               bp->link_up = 1;
-               bp->line_speed = SPEED_10000;
-               bp->duplex = DUPLEX_FULL;
-               NIG_WR(NIG_REG_EGRESS_DRAIN0_MODE + bp->port*4, 0);
-               bnx2x_emac_enable(bp);
-               bnx2x_link_report(bp);
-               return 0;
-
-       } else if (CHIP_REV(bp) == CHIP_REV_EMUL) {
-               bp->phy_flags |= PHY_BMAC_FLAG;
-               bp->link_up = 1;
-               bp->line_speed = SPEED_10000;
-               bp->duplex = DUPLEX_FULL;
-               NIG_WR(NIG_REG_EGRESS_DRAIN0_MODE + bp->port*4, 0);
-               bnx2x_bmac_enable(bp, 0);
-               bnx2x_link_report(bp);
-               return 0;
-
-       } else {
-               bnx2x_phy_deassert(bp);
-               bnx2x_link_initialize(bp);
-       }
-
-       return 0;
-}
-
-static void bnx2x_link_reset(struct bnx2x *bp)
-{
-       int port = bp->port;
-       u32 board = (bp->board & SHARED_HW_CFG_BOARD_TYPE_MASK);
-
-       /* update shared memory */
-       bp->link_status = 0;
-       bnx2x_update_mng(bp);
-
-       /* disable attentions */
-       bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
-                      (NIG_MASK_XGXS0_LINK_STATUS |
-                       NIG_MASK_XGXS0_LINK10G |
-                       NIG_MASK_SERDES0_LINK_STATUS |
-                       NIG_MASK_MI_INT));
-
-       /* activate nig drain */
-       NIG_WR(NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);
-
-       /* disable nig egress interface */
-       NIG_WR(NIG_REG_BMAC0_OUT_EN + port*4, 0);
-       NIG_WR(NIG_REG_EGRESS_EMAC0_OUT_EN + port*4, 0);
-
-       /* Stop BigMac rx */
-       bnx2x_bmac_rx_disable(bp);
-
-       /* disable emac */
-       NIG_WR(NIG_REG_NIG_EMAC0_EN + port*4, 0);
-
-       msleep(10);
-
-       /* The PHY reset is controled by GPIO 1
-        * Hold it as output low
-        */
-       if ((board != SHARED_HW_CFG_BOARD_TYPE_BCM957710T1002G) &&
-           (board != SHARED_HW_CFG_BOARD_TYPE_BCM957710T1003G)) {
-               bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                              MISC_REGISTERS_GPIO_OUTPUT_LOW);
-               DP(NETIF_MSG_LINK, "reset external PHY\n");
-       }
-
-       /* reset the SerDes/XGXS */
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR,
-              (0x1ff << (port*16)));
-
-       /* reset BigMac */
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-              (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-
-       /* disable nig ingress interface */
-       NIG_WR(NIG_REG_BMAC0_IN_EN + port*4, 0);
-       NIG_WR(NIG_REG_EMAC0_IN_EN + port*4, 0);
-
-       /* set link down */
-       bp->link_up = 0;
-}
-
-#ifdef BNX2X_XGXS_LB
-static void bnx2x_set_xgxs_loopback(struct bnx2x *bp, int is_10g)
-{
-       int port = bp->port;
-
-       if (is_10g) {
-               u32 md_devad;
-
-               DP(NETIF_MSG_LINK, "XGXS 10G loopback enable\n");
-
-               /* change the uni_phy_addr in the nig */
-               REG_RD(bp, (NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18),
-                      &md_devad);
-               NIG_WR(NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18, 0x5);
-
-               /* change the aer mmd */
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_AER_BLOCK);
-               bnx2x_mdio22_write(bp, MDIO_AER_BLOCK_AER_REG, 0x2800);
-
-               /* config combo IEEE0 control reg for loopback */
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_CL73_IEEEB0);
-               bnx2x_mdio22_write(bp, MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                  0x6041);
-
-               /* set aer mmd back */
-               bnx2x_set_aer_mmd(bp);
-
-               /* and md_devad */
-               NIG_WR(NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18, md_devad);
-
-       } else {
-               u32 mii_control;
-
-               DP(NETIF_MSG_LINK, "XGXS 1G loopback enable\n");
-
-               MDIO_SET_REG_BANK(bp, MDIO_REG_BANK_COMBO_IEEE0);
-               bnx2x_mdio22_read(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                                 &mii_control);
-               bnx2x_mdio22_write(bp, MDIO_COMBO_IEEE0_MII_CONTROL,
-                                  (mii_control |
-                                   MDIO_COMBO_IEEO_MII_CONTROL_LOOPBACK));
-       }
-}
-#endif
-
-/* end of PHY/MAC */
-
-/* slow path */
-
-/*
- * General service functions
- */
-
-/* the slow path queue is odd since completions arrive on the fastpath ring */
-static int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
-                        u32 data_hi, u32 data_lo, int common)
-{
-       int port = bp->port;
-
-       DP(NETIF_MSG_TIMER,
-          "spe (%x:%x)  command %d  hw_cid %x  data (%x:%x)  left %x\n",
-          (u32)U64_HI(bp->spq_mapping), (u32)(U64_LO(bp->spq_mapping) +
-          (void *)bp->spq_prod_bd - (void *)bp->spq), command,
-          HW_CID(bp, cid), data_hi, data_lo, bp->spq_left);
-
-#ifdef BNX2X_STOP_ON_ERROR
-       if (unlikely(bp->panic))
-               return -EIO;
-#endif
-
-       spin_lock(&bp->spq_lock);
-
-       if (!bp->spq_left) {
-               BNX2X_ERR("BUG! SPQ ring full!\n");
-               spin_unlock(&bp->spq_lock);
-               bnx2x_panic();
-               return -EBUSY;
-       }
-
-       /* CID needs port number to be encoded int it */
-       bp->spq_prod_bd->hdr.conn_and_cmd_data =
-                       cpu_to_le32(((command << SPE_HDR_CMD_ID_SHIFT) |
-                                    HW_CID(bp, cid)));
-       bp->spq_prod_bd->hdr.type = cpu_to_le16(ETH_CONNECTION_TYPE);
-       if (common)
-               bp->spq_prod_bd->hdr.type |=
-                       cpu_to_le16((1 << SPE_HDR_COMMON_RAMROD_SHIFT));
-
-       bp->spq_prod_bd->data.mac_config_addr.hi = cpu_to_le32(data_hi);
-       bp->spq_prod_bd->data.mac_config_addr.lo = cpu_to_le32(data_lo);
-
-       bp->spq_left--;
-
-       if (bp->spq_prod_bd == bp->spq_last_bd) {
-               bp->spq_prod_bd = bp->spq;
-               bp->spq_prod_idx = 0;
-               DP(NETIF_MSG_TIMER, "end of spq\n");
-
-       } else {
-               bp->spq_prod_bd++;
-               bp->spq_prod_idx++;
-       }
-
-       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(port),
-              bp->spq_prod_idx);
-
-       spin_unlock(&bp->spq_lock);
-       return 0;
+       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func),
+              bp->spq_prod_idx);
+
+       spin_unlock_bh(&bp->spq_lock);
+       return 0;
 }
 
 /* acquire split MCP access lock register */
 static int bnx2x_lock_alr(struct bnx2x *bp)
 {
-       int rc = 0;
        u32 i, j, val;
+       int rc = 0;
 
        might_sleep();
        i = 100;
@@ -4031,10 +2373,8 @@ static int bnx2x_lock_alr(struct bnx2x *bp)
 
                msleep(5);
        }
-
        if (!(val & (1L << 31))) {
                BNX2X_ERR("Cannot acquire nvram interface\n");
-
                rc = -EBUSY;
        }
 
@@ -4085,8 +2425,9 @@ static inline u16 bnx2x_update_dsb_idx(struct bnx2x *bp)
 
 static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
 {
-       int port = bp->port;
-       u32 igu_addr = (IGU_ADDR_ATTN_BITS_SET + IGU_PORT_BASE * port) * 8;
+       int port = BP_PORT(bp);
+       int func = BP_FUNC(bp);
+       u32 igu_addr = (IGU_ADDR_ATTN_BITS_SET + IGU_FUNC_BASE * func) * 8;
        u32 aeu_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 :
                              MISC_REG_AEU_MASK_ATTN_FUNC_0;
        u32 nig_int_mask_addr = port ? NIG_REG_MASK_INTERRUPT_PORT1 :
@@ -4113,7 +2454,7 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
                        bp->nig_mask = REG_RD(bp, nig_int_mask_addr);
                        REG_WR(bp, nig_int_mask_addr, 0);
 
-                       bnx2x_link_update(bp);
+                       bnx2x_link_attn(bp);
 
                        /* handle unicore attn? */
                }
@@ -4170,14 +2511,14 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
 
 static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
        int reg_offset;
        u32 val;
 
-       if (attn & AEU_INPUTS_ATTN_BITS_SPIO5) {
+       reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
+                            MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0);
 
-               reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
-                                    MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0);
+       if (attn & AEU_INPUTS_ATTN_BITS_SPIO5) {
 
                val = REG_RD(bp, reg_offset);
                val &= ~AEU_INPUTS_ATTN_BITS_SPIO5;
@@ -4185,7 +2526,7 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
 
                BNX2X_ERR("SPIO5 hw attention\n");
 
-               switch (bp->board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
+               switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
                case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:
                        /* Fan failure attention */
 
@@ -4196,14 +2537,14 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
                                       MISC_REGISTERS_GPIO_OUTPUT_LOW);
                        /* mark the failure */
-                       bp->ext_phy_config &=
+                       bp->link_params.ext_phy_config &=
                                        ~PORT_HW_CFG_XGXS_EXT_PHY_TYPE_MASK;
-                       bp->ext_phy_config |=
+                       bp->link_params.ext_phy_config |=
                                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE;
                        SHMEM_WR(bp,
                                 dev_info.port_hw_config[port].
                                                        external_phy_config,
-                                bp->ext_phy_config);
+                                bp->link_params.ext_phy_config);
                        /* log the failure */
                        printk(KERN_ERR PFX "Fan Failure on Network"
                               " Controller %s has caused the driver to"
@@ -4216,6 +2557,17 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
                        break;
                }
        }
+
+       if (attn & HW_INTERRUT_ASSERT_SET_0) {
+
+               val = REG_RD(bp, reg_offset);
+               val &= ~(attn & HW_INTERRUT_ASSERT_SET_0);
+               REG_WR(bp, reg_offset, val);
+
+               BNX2X_ERR("FATAL HW block attention set0 0x%x\n",
+                         (attn & HW_INTERRUT_ASSERT_SET_0));
+               bnx2x_panic();
+       }
 }
 
 static inline void bnx2x_attn_int_deasserted1(struct bnx2x *bp, u32 attn)
@@ -4230,6 +2582,23 @@ static inline void bnx2x_attn_int_deasserted1(struct bnx2x *bp, u32 attn)
                if (val & 0x2)
                        BNX2X_ERR("FATAL error from DORQ\n");
        }
+
+       if (attn & HW_INTERRUT_ASSERT_SET_1) {
+
+               int port = BP_PORT(bp);
+               int reg_offset;
+
+               reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_1 :
+                                    MISC_REG_AEU_ENABLE1_FUNC_0_OUT_1);
+
+               val = REG_RD(bp, reg_offset);
+               val &= ~(attn & HW_INTERRUT_ASSERT_SET_1);
+               REG_WR(bp, reg_offset, val);
+
+               BNX2X_ERR("FATAL HW block attention set1 0x%x\n",
+                         (attn & HW_INTERRUT_ASSERT_SET_1));
+               bnx2x_panic();
+       }
 }
 
 static inline void bnx2x_attn_int_deasserted2(struct bnx2x *bp, u32 attn)
@@ -4253,13 +2622,41 @@ static inline void bnx2x_attn_int_deasserted2(struct bnx2x *bp, u32 attn)
                if (val & 0x18000)
                        BNX2X_ERR("FATAL error from PXP\n");
        }
+
+       if (attn & HW_INTERRUT_ASSERT_SET_2) {
+
+               int port = BP_PORT(bp);
+               int reg_offset;
+
+               reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_2 :
+                                    MISC_REG_AEU_ENABLE1_FUNC_0_OUT_2);
+
+               val = REG_RD(bp, reg_offset);
+               val &= ~(attn & HW_INTERRUT_ASSERT_SET_2);
+               REG_WR(bp, reg_offset, val);
+
+               BNX2X_ERR("FATAL HW block attention set2 0x%x\n",
+                         (attn & HW_INTERRUT_ASSERT_SET_2));
+               bnx2x_panic();
+       }
 }
 
 static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
 {
+       u32 val;
+
        if (attn & EVEREST_GEN_ATTN_IN_USE_MASK) {
 
-               if (attn & BNX2X_MC_ASSERT_BITS) {
+               if (attn & BNX2X_PMF_LINK_ASSERT) {
+                       int func = BP_FUNC(bp);
+
+                       REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_12 + func*4, 0);
+                       bnx2x__link_status_update(bp);
+                       if (SHMEM_RD(bp, func_mb[func].drv_status) &
+                                                       DRV_STATUS_PMF)
+                               bnx2x_pmf_update(bp);
+
+               } else if (attn & BNX2X_MC_ASSERT_BITS) {
 
                        BNX2X_ERR("MC assert!\n");
                        REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_10, 0);
@@ -4272,16 +2669,25 @@ static inline void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
 
                        BNX2X_ERR("MCP assert!\n");
                        REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_11, 0);
-                       bnx2x_mc_assert(bp);
+                       bnx2x_fw_dump(bp);
 
                } else
                        BNX2X_ERR("Unknown HW assert! (attn 0x%x)\n", attn);
        }
 
        if (attn & EVEREST_LATCHED_ATTN_IN_USE_MASK) {
-
+               BNX2X_ERR("LATCHED attention 0x%08x (masked)\n", attn);
+               if (attn & BNX2X_GRC_TIMEOUT) {
+                       val = CHIP_IS_E1H(bp) ?
+                               REG_RD(bp, MISC_REG_GRC_TIMEOUT_ATTN) : 0;
+                       BNX2X_ERR("GRC time-out 0x%08x\n", val);
+               }
+               if (attn & BNX2X_GRC_RSV) {
+                       val = CHIP_IS_E1H(bp) ?
+                               REG_RD(bp, MISC_REG_GRC_RSV_ATTN) : 0;
+                       BNX2X_ERR("GRC reserved 0x%08x\n", val);
+               }
                REG_WR(bp, MISC_REG_AEU_CLR_LATCH_SIGNAL, 0x7ff);
-               BNX2X_ERR("LATCHED attention 0x%x (masked)\n", attn);
        }
 }
 
@@ -4289,7 +2695,7 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted)
 {
        struct attn_route attn;
        struct attn_route group_mask;
-       int port = bp->port;
+       int port = BP_PORT(bp);
        int index;
        u32 reg_addr;
        u32 val;
@@ -4302,14 +2708,16 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted)
        attn.sig[1] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_2_FUNC_0 + port*4);
        attn.sig[2] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_3_FUNC_0 + port*4);
        attn.sig[3] = REG_RD(bp, MISC_REG_AEU_AFTER_INVERT_4_FUNC_0 + port*4);
-       DP(NETIF_MSG_HW, "attn %llx\n", (unsigned long long)attn.sig[0]);
+       DP(NETIF_MSG_HW, "attn: %08x %08x %08x %08x\n",
+          attn.sig[0], attn.sig[1], attn.sig[2], attn.sig[3]);
 
        for (index = 0; index < MAX_DYNAMIC_ATTN_GRPS; index++) {
                if (deasserted & (1 << index)) {
                        group_mask = bp->attn_group[index];
 
-                       DP(NETIF_MSG_HW, "group[%d]: %llx\n", index,
-                          (unsigned long long)group_mask.sig[0]);
+                       DP(NETIF_MSG_HW, "group[%d]: %08x %08x %08x %08x\n",
+                          index, group_mask.sig[0], group_mask.sig[1],
+                          group_mask.sig[2], group_mask.sig[3]);
 
                        bnx2x_attn_int_deasserted3(bp,
                                        attn.sig[3] & group_mask.sig[3]);
@@ -4320,22 +2728,6 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted)
                        bnx2x_attn_int_deasserted0(bp,
                                        attn.sig[0] & group_mask.sig[0]);
 
-                       if ((attn.sig[0] & group_mask.sig[0] &
-                                               HW_INTERRUT_ASSERT_SET_0) ||
-                           (attn.sig[1] & group_mask.sig[1] &
-                                               HW_INTERRUT_ASSERT_SET_1) ||
-                           (attn.sig[2] & group_mask.sig[2] &
-                                               HW_INTERRUT_ASSERT_SET_2))
-                               BNX2X_ERR("FATAL HW block attention"
-                                         "  set0 0x%x  set1 0x%x"
-                                         "  set2 0x%x\n",
-                                         (attn.sig[0] & group_mask.sig[0] &
-                                          HW_INTERRUT_ASSERT_SET_0),
-                                         (attn.sig[1] & group_mask.sig[1] &
-                                          HW_INTERRUT_ASSERT_SET_1),
-                                         (attn.sig[2] & group_mask.sig[2] &
-                                          HW_INTERRUT_ASSERT_SET_2));
-
                        if ((attn.sig[0] & group_mask.sig[0] &
                                                HW_PRTY_ASSERT_SET_0) ||
                            (attn.sig[1] & group_mask.sig[1] &
@@ -4348,17 +2740,17 @@ static void bnx2x_attn_int_deasserted(struct bnx2x *bp, u32 deasserted)
 
        bnx2x_unlock_alr(bp);
 
-       reg_addr = (IGU_ADDR_ATTN_BITS_CLR + IGU_PORT_BASE * port) * 8;
+       reg_addr = (IGU_ADDR_ATTN_BITS_CLR + IGU_FUNC_BASE * BP_FUNC(bp)) * 8;
 
        val = ~deasserted;
-/*      DP(NETIF_MSG_INTR, "write 0x%08x to IGU addr 0x%x\n",
+/*     DP(NETIF_MSG_INTR, "write 0x%08x to IGU addr 0x%x\n",
           val, BAR_IGU_INTMEM + reg_addr); */
        REG_WR(bp, BAR_IGU_INTMEM + reg_addr, val);
 
        if (bp->aeu_mask & (deasserted & 0xff))
-               BNX2X_ERR("IGU BUG\n");
+               BNX2X_ERR("IGU BUG!\n");
        if (~bp->attn_state & deasserted)
-               BNX2X_ERR("IGU BUG\n");
+               BNX2X_ERR("IGU BUG!\n");
 
        reg_addr = port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 :
                          MISC_REG_AEU_MASK_ATTN_FUNC_0;
@@ -4390,7 +2782,7 @@ static void bnx2x_attn_int(struct bnx2x *bp)
           attn_bits, attn_ack, asserted, deasserted);
 
        if (~(attn_bits ^ attn_ack) & (attn_bits ^ attn_state))
-               BNX2X_ERR("bad attention state\n");
+               BNX2X_ERR("BAD attention state\n");
 
        /* handle bits that were raised */
        if (asserted)
@@ -4405,6 +2797,7 @@ static void bnx2x_sp_task(struct work_struct *work)
        struct bnx2x *bp = container_of(work, struct bnx2x, sp_task);
        u16 status;
 
+
        /* Return here if interrupt is disabled */
        if (unlikely(atomic_read(&bp->intr_sem) != 0)) {
                DP(BNX2X_MSG_SP, "called but intr_sem not 0, returning\n");
@@ -4412,10 +2805,10 @@ static void bnx2x_sp_task(struct work_struct *work)
        }
 
        status = bnx2x_update_dsb_idx(bp);
-       if (status == 0)
-               BNX2X_ERR("spurious slowpath interrupt!\n");
+/*     if (status == 0)                                     */
+/*             BNX2X_ERR("spurious slowpath interrupt!\n"); */
 
-       DP(NETIF_MSG_INTR, "got a slowpath interrupt (updated %x)\n", status);
+       DP(BNX2X_MSG_SP, "got a slowpath interrupt (updated %x)\n", status);
 
        /* HW attentions */
        if (status & 0x1)
@@ -4423,7 +2816,7 @@ static void bnx2x_sp_task(struct work_struct *work)
 
        /* CStorm events: query_stats, port delete ramrod */
        if (status & 0x2)
-               bp->stat_pending = 0;
+               bp->stats_pending = 0;
 
        bnx2x_ack_sb(bp, DEF_SB_ID, ATTENTION_ID, bp->def_att_idx,
                     IGU_INT_NOP, 1);
@@ -4469,12 +2862,6 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
 * Macros
 ****************************************************************************/
 
-#define UPDATE_STAT(s, t) \
-       do { \
-               estats->t += new->s - old->s; \
-               old->s = new->s; \
-       } while (0)
-
 /* sum[hi:lo] += add[hi:lo] */
 #define ADD_64(s_hi, a_hi, s_lo, a_lo) \
        do { \
@@ -4485,40 +2872,47 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
 /* difference = minuend - subtrahend */
 #define DIFF_64(d_hi, m_hi, s_hi, d_lo, m_lo, s_lo) \
        do { \
-               if (m_lo < s_lo) {      /* underflow */ \
+               if (m_lo < s_lo) { \
+                       /* underflow */ \
                        d_hi = m_hi - s_hi; \
-                       if (d_hi > 0) { /* we can 'loan' 1 */ \
+                       if (d_hi > 0) { \
+                       /* we can 'loan' 1 */ \
                                d_hi--; \
                                d_lo = m_lo + (UINT_MAX - s_lo) + 1; \
-                       } else {        /* m_hi <= s_hi */ \
+                       } else { \
+                       /* m_hi <= s_hi */ \
                                d_hi = 0; \
                                d_lo = 0; \
                        } \
-               } else {                /* m_lo >= s_lo */ \
+               } else { \
+                       /* m_lo >= s_lo */ \
                        if (m_hi < s_hi) { \
-                           d_hi = 0; \
-                           d_lo = 0; \
-                       } else {        /* m_hi >= s_hi */ \
-                           d_hi = m_hi - s_hi; \
-                           d_lo = m_lo - s_lo; \
+                               d_hi = 0; \
+                               d_lo = 0; \
+                       } else { \
+                       /* m_hi >= s_hi */ \
+                               d_hi = m_hi - s_hi; \
+                               d_lo = m_lo - s_lo; \
                        } \
                } \
        } while (0)
 
-/* minuend -= subtrahend */
-#define SUB_64(m_hi, s_hi, m_lo, s_lo) \
+#define UPDATE_STAT64(s, t) \
        do { \
-               DIFF_64(m_hi, m_hi, s_hi, m_lo, m_lo, s_lo); \
+               DIFF_64(diff.hi, new->s##_hi, pstats->mac_stx[0].t##_hi, \
+                       diff.lo, new->s##_lo, pstats->mac_stx[0].t##_lo); \
+               pstats->mac_stx[0].t##_hi = new->s##_hi; \
+               pstats->mac_stx[0].t##_lo = new->s##_lo; \
+               ADD_64(pstats->mac_stx[1].t##_hi, diff.hi, \
+                      pstats->mac_stx[1].t##_lo, diff.lo); \
        } while (0)
 
-#define UPDATE_STAT64(s_hi, t_hi, s_lo, t_lo) \
+#define UPDATE_STAT64_NIG(s, t) \
        do { \
-               DIFF_64(diff.hi, new->s_hi, old->s_hi, \
-                       diff.lo, new->s_lo, old->s_lo); \
-               old->s_hi = new->s_hi; \
-               old->s_lo = new->s_lo; \
-               ADD_64(estats->t_hi, diff.hi, \
-                      estats->t_lo, diff.lo); \
+               DIFF_64(diff.hi, new->s##_hi, old->s##_hi, \
+                       diff.lo, new->s##_lo, old->s##_lo); \
+               ADD_64(estats->t##_hi, diff.hi, \
+                      estats->t##_lo, diff.lo); \
        } while (0)
 
 /* sum[hi:lo] += add */
@@ -4528,16 +2922,25 @@ static irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance)
                s_hi += (s_lo < a) ? 1 : 0; \
        } while (0)
 
-#define UPDATE_EXTEND_STAT(s, t_hi, t_lo) \
+#define UPDATE_EXTEND_STAT(s) \
        do { \
-               ADD_EXTEND_64(estats->t_hi, estats->t_lo, new->s); \
+               ADD_EXTEND_64(pstats->mac_stx[1].s##_hi, \
+                             pstats->mac_stx[1].s##_lo, \
+                             new->s); \
        } while (0)
 
-#define UPDATE_EXTEND_TSTAT(s, t_hi, t_lo) \
+#define UPDATE_EXTEND_TSTAT(s, t) \
        do { \
                diff = le32_to_cpu(tclient->s) - old_tclient->s; \
                old_tclient->s = le32_to_cpu(tclient->s); \
-               ADD_EXTEND_64(estats->t_hi, estats->t_lo, diff); \
+               ADD_EXTEND_64(fstats->t##_hi, fstats->t##_lo, diff); \
+       } while (0)
+
+#define UPDATE_EXTEND_XSTAT(s, t) \
+       do { \
+               diff = le32_to_cpu(xclient->s) - old_xclient->s; \
+               old_xclient->s = le32_to_cpu(xclient->s); \
+               ADD_EXTEND_64(fstats->t##_hi, fstats->t##_lo, diff); \
        } while (0)
 
 /*
@@ -4560,55 +2963,272 @@ static inline long bnx2x_hilo(u32 *hiref)
  * Init service functions
  */
 
-static void bnx2x_init_mac_stats(struct bnx2x *bp)
+static void bnx2x_storm_stats_init(struct bnx2x *bp)
+{
+       int func = BP_FUNC(bp);
+
+       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(func), 1);
+       REG_WR(bp, BAR_XSTRORM_INTMEM +
+              XSTORM_STATS_FLAGS_OFFSET(func) + 4, 0);
+
+       REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(func), 1);
+       REG_WR(bp, BAR_TSTRORM_INTMEM +
+              TSTORM_STATS_FLAGS_OFFSET(func) + 4, 0);
+
+       REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(func), 0);
+       REG_WR(bp, BAR_CSTRORM_INTMEM +
+              CSTORM_STATS_FLAGS_OFFSET(func) + 4, 0);
+
+       REG_WR(bp, BAR_XSTRORM_INTMEM +
+              XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func),
+              U64_LO(bnx2x_sp_mapping(bp, fw_stats)));
+       REG_WR(bp, BAR_XSTRORM_INTMEM +
+              XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4,
+              U64_HI(bnx2x_sp_mapping(bp, fw_stats)));
+
+       REG_WR(bp, BAR_TSTRORM_INTMEM +
+              TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func),
+              U64_LO(bnx2x_sp_mapping(bp, fw_stats)));
+       REG_WR(bp, BAR_TSTRORM_INTMEM +
+              TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(func) + 4,
+              U64_HI(bnx2x_sp_mapping(bp, fw_stats)));
+}
+
+static void bnx2x_storm_stats_post(struct bnx2x *bp)
+{
+       if (!bp->stats_pending) {
+               struct eth_query_ramrod_data ramrod_data = {0};
+               int rc;
+
+               ramrod_data.drv_counter = bp->stats_counter++;
+               ramrod_data.collect_port_1b = bp->port.pmf ? 1 : 0;
+               ramrod_data.ctr_id_vector = (1 << BP_CL_ID(bp));
+
+               rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_STAT_QUERY, 0,
+                                  ((u32 *)&ramrod_data)[1],
+                                  ((u32 *)&ramrod_data)[0], 0);
+               if (rc == 0) {
+                       /* stats ramrod has it's own slot on the spq */
+                       bp->spq_left++;
+                       bp->stats_pending = 1;
+               }
+       }
+}
+
+static void bnx2x_stats_init(struct bnx2x *bp)
+{
+       int port = BP_PORT(bp);
+
+       bp->executer_idx = 0;
+       bp->stats_counter = 0;
+
+       /* port stats */
+       if (!BP_NOMCP(bp))
+               bp->port.port_stx = SHMEM_RD(bp, port_mb[port].port_stx);
+       else
+               bp->port.port_stx = 0;
+       DP(BNX2X_MSG_STATS, "port_stx 0x%x\n", bp->port.port_stx);
+
+       memset(&(bp->port.old_nig_stats), 0, sizeof(struct nig_stats));
+       bp->port.old_nig_stats.brb_discard =
+                       REG_RD(bp, NIG_REG_STAT0_BRB_DISCARD + port*0x38);
+       REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50,
+                   &(bp->port.old_nig_stats.egress_mac_pkt0_lo), 2);
+       REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50,
+                   &(bp->port.old_nig_stats.egress_mac_pkt1_lo), 2);
+
+       /* function stats */
+       memset(&bp->dev->stats, 0, sizeof(struct net_device_stats));
+       memset(&bp->old_tclient, 0, sizeof(struct tstorm_per_client_stats));
+       memset(&bp->old_xclient, 0, sizeof(struct xstorm_per_client_stats));
+       memset(&bp->eth_stats, 0, sizeof(struct bnx2x_eth_stats));
+
+       bp->stats_state = STATS_STATE_DISABLED;
+       if (IS_E1HMF(bp) && bp->port.pmf && bp->port.port_stx)
+               bnx2x_stats_handle(bp, STATS_EVENT_PMF);
+}
+
+static void bnx2x_hw_stats_post(struct bnx2x *bp)
+{
+       struct dmae_command *dmae = &bp->stats_dmae;
+       u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+       *stats_comp = DMAE_COMP_VAL;
+
+       /* loader */
+       if (bp->executer_idx) {
+               int loader_idx = PMF_DMAE_C(bp);
+
+               memset(dmae, 0, sizeof(struct dmae_command));
+
+               dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                               DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
+                               DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                               DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                               DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                               (BP_PORT(bp) ? DMAE_CMD_PORT_1 :
+                                              DMAE_CMD_PORT_0) |
+                               (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+               dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, dmae[0]));
+               dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, dmae[0]));
+               dmae->dst_addr_lo = (DMAE_REG_CMD_MEM +
+                                    sizeof(struct dmae_command) *
+                                    (loader_idx + 1)) >> 2;
+               dmae->dst_addr_hi = 0;
+               dmae->len = sizeof(struct dmae_command) >> 2;
+               if (CHIP_IS_E1(bp))
+                       dmae->len--;
+               dmae->comp_addr_lo = dmae_reg_go_c[loader_idx + 1] >> 2;
+               dmae->comp_addr_hi = 0;
+               dmae->comp_val = 1;
+
+               *stats_comp = 0;
+               bnx2x_post_dmae(bp, dmae, loader_idx);
+
+       } else if (bp->func_stx) {
+               *stats_comp = 0;
+               bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
+       }
+}
+
+static int bnx2x_stats_comp(struct bnx2x *bp)
+{
+       u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+       int cnt = 10;
+
+       might_sleep();
+       while (*stats_comp != DMAE_COMP_VAL) {
+               msleep(1);
+               if (!cnt) {
+                       BNX2X_ERR("timeout waiting for stats finished\n");
+                       break;
+               }
+               cnt--;
+       }
+       return 1;
+}
+
+/*
+ * Statistics service functions
+ */
+
+static void bnx2x_stats_pmf_update(struct bnx2x *bp)
+{
+       struct dmae_command *dmae;
+       u32 opcode;
+       int loader_idx = PMF_DMAE_C(bp);
+       u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+       /* sanity */
+       if (!IS_E1HMF(bp) || !bp->port.pmf || !bp->port.port_stx) {
+               BNX2X_ERR("BUG!\n");
+               return;
+       }
+
+       bp->executer_idx = 0;
+
+       opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
+                 DMAE_CMD_C_ENABLE |
+                 DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                 DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                 DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                 (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                 (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+
+       dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+       dmae->opcode = (opcode | DMAE_CMD_C_DST_GRC);
+       dmae->src_addr_lo = bp->port.port_stx >> 2;
+       dmae->src_addr_hi = 0;
+       dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
+       dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
+       dmae->len = DMAE_LEN32_RD_MAX;
+       dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+       dmae->comp_addr_hi = 0;
+       dmae->comp_val = 1;
+
+       dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+       dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
+       dmae->src_addr_lo = (bp->port.port_stx >> 2) + DMAE_LEN32_RD_MAX;
+       dmae->src_addr_hi = 0;
+       dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats) +
+                                  DMAE_LEN32_RD_MAX * 4);
+       dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats) +
+                                  DMAE_LEN32_RD_MAX * 4);
+       dmae->len = (sizeof(struct host_port_stats) >> 2) - DMAE_LEN32_RD_MAX;
+       dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+       dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+       dmae->comp_val = DMAE_COMP_VAL;
+
+       *stats_comp = 0;
+       bnx2x_hw_stats_post(bp);
+       bnx2x_stats_comp(bp);
+}
+
+static void bnx2x_port_stats_init(struct bnx2x *bp)
 {
        struct dmae_command *dmae;
-       int port = bp->port;
-       int loader_idx = port * 8;
+       int port = BP_PORT(bp);
+       int vn = BP_E1HVN(bp);
        u32 opcode;
+       int loader_idx = PMF_DMAE_C(bp);
        u32 mac_addr;
+       u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+       /* sanity */
+       if (!bp->link_vars.link_up || !bp->port.pmf) {
+               BNX2X_ERR("BUG!\n");
+               return;
+       }
 
        bp->executer_idx = 0;
-       if (bp->fw_mb) {
-               /* MCP */
-               opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
-                         DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+
+       /* MCP */
+       opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                 DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
+                 DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
 #ifdef __BIG_ENDIAN
-                         DMAE_CMD_ENDIANITY_B_DW_SWAP |
+                 DMAE_CMD_ENDIANITY_B_DW_SWAP |
 #else
-                         DMAE_CMD_ENDIANITY_DW_SWAP |
+                 DMAE_CMD_ENDIANITY_DW_SWAP |
 #endif
-                         (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0));
+                 (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                 (vn << DMAE_CMD_E1HVN_SHIFT));
 
-               if (bp->link_up)
-                       opcode |= (DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE);
+       if (bp->port.port_stx) {
 
                dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
                dmae->opcode = opcode;
-               dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, eth_stats) +
-                                          sizeof(u32));
-               dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, eth_stats) +
-                                          sizeof(u32));
-               dmae->dst_addr_lo = bp->fw_mb >> 2;
+               dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
+               dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
+               dmae->dst_addr_lo = bp->port.port_stx >> 2;
                dmae->dst_addr_hi = 0;
-               dmae->len = (offsetof(struct bnx2x_eth_stats, mac_stx_end) -
-                            sizeof(u32)) >> 2;
-               if (bp->link_up) {
-                       dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
-                       dmae->comp_addr_hi = 0;
-                       dmae->comp_val = 1;
-               } else {
-                       dmae->comp_addr_lo = 0;
-                       dmae->comp_addr_hi = 0;
-                       dmae->comp_val = 0;
-               }
+               dmae->len = sizeof(struct host_port_stats) >> 2;
+               dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+               dmae->comp_addr_hi = 0;
+               dmae->comp_val = 1;
        }
 
-       if (!bp->link_up) {
-               /* no need to collect statistics in link down */
-               return;
+       if (bp->func_stx) {
+
+               dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+               dmae->opcode = opcode;
+               dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
+               dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
+               dmae->dst_addr_lo = bp->func_stx >> 2;
+               dmae->dst_addr_hi = 0;
+               dmae->len = sizeof(struct host_func_stats) >> 2;
+               dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+               dmae->comp_addr_hi = 0;
+               dmae->comp_val = 1;
        }
 
+       /* MAC */
        opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
                  DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
                  DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
@@ -4617,9 +3237,10 @@ static void bnx2x_init_mac_stats(struct bnx2x *bp)
 #else
                  DMAE_CMD_ENDIANITY_DW_SWAP |
 #endif
-                 (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0));
+                 (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                 (vn << DMAE_CMD_E1HVN_SHIFT));
 
-       if (bp->phy_flags & PHY_BMAC_FLAG) {
+       if (bp->link_vars.mac_type == MAC_TYPE_BMAC) {
 
                mac_addr = (port ? NIG_REG_INGRESS_BMAC1_MEM :
                                   NIG_REG_INGRESS_BMAC0_MEM);
@@ -4647,16 +3268,16 @@ static void bnx2x_init_mac_stats(struct bnx2x *bp)
                                     BIGMAC_REGISTER_RX_STAT_GR64) >> 2;
                dmae->src_addr_hi = 0;
                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
-                                       offsetof(struct bmac_stats, rx_gr64));
+                               offsetof(struct bmac_stats, rx_stat_gr64_lo));
                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
-                                       offsetof(struct bmac_stats, rx_gr64));
+                               offsetof(struct bmac_stats, rx_stat_gr64_lo));
                dmae->len = (8 + BIGMAC_REGISTER_RX_STAT_GRIPJ -
                             BIGMAC_REGISTER_RX_STAT_GR64) >> 2;
                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
                dmae->comp_addr_hi = 0;
                dmae->comp_val = 1;
 
-       } else if (bp->phy_flags & PHY_EMAC_FLAG) {
+       } else if (bp->link_vars.mac_type == MAC_TYPE_EMAC) {
 
                mac_addr = (port ? GRCBASE_EMAC1 : GRCBASE_EMAC0);
 
@@ -4680,11 +3301,9 @@ static void bnx2x_init_mac_stats(struct bnx2x *bp)
                                     EMAC_REG_EMAC_RX_STAT_AC_28) >> 2;
                dmae->src_addr_hi = 0;
                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
-                                          offsetof(struct emac_stats,
-                                                   rx_falsecarriererrors));
+                    offsetof(struct emac_stats, rx_stat_falsecarriererrors));
                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
-                                          offsetof(struct emac_stats,
-                                                   rx_falsecarriererrors));
+                    offsetof(struct emac_stats, rx_stat_falsecarriererrors));
                dmae->len = 1;
                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
                dmae->comp_addr_hi = 0;
@@ -4697,11 +3316,9 @@ static void bnx2x_init_mac_stats(struct bnx2x *bp)
                                     EMAC_REG_EMAC_TX_STAT_AC) >> 2;
                dmae->src_addr_hi = 0;
                dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, mac_stats) +
-                                          offsetof(struct emac_stats,
-                                                   tx_ifhcoutoctets));
+                       offsetof(struct emac_stats, tx_stat_ifhcoutoctets));
                dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, mac_stats) +
-                                          offsetof(struct emac_stats,
-                                                   tx_ifhcoutoctets));
+                       offsetof(struct emac_stats, tx_stat_ifhcoutoctets));
                dmae->len = EMAC_REG_EMAC_TX_STAT_AC_COUNT;
                dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
                dmae->comp_addr_hi = 0;
@@ -4709,6 +3326,32 @@ static void bnx2x_init_mac_stats(struct bnx2x *bp)
        }
 
        /* NIG */
+       dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+       dmae->opcode = opcode;
+       dmae->src_addr_lo = (port ? NIG_REG_STAT1_BRB_DISCARD :
+                                   NIG_REG_STAT0_BRB_DISCARD) >> 2;
+       dmae->src_addr_hi = 0;
+       dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats));
+       dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats));
+       dmae->len = (sizeof(struct nig_stats) - 4*sizeof(u32)) >> 2;
+       dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+       dmae->comp_addr_hi = 0;
+       dmae->comp_val = 1;
+
+       dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+       dmae->opcode = opcode;
+       dmae->src_addr_lo = (port ? NIG_REG_STAT1_EGRESS_MAC_PKT0 :
+                                   NIG_REG_STAT0_EGRESS_MAC_PKT0) >> 2;
+       dmae->src_addr_hi = 0;
+       dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats) +
+                       offsetof(struct nig_stats, egress_mac_pkt0_lo));
+       dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats) +
+                       offsetof(struct nig_stats, egress_mac_pkt0_lo));
+       dmae->len = (2*sizeof(u32)) >> 2;
+       dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+       dmae->comp_addr_hi = 0;
+       dmae->comp_val = 1;
+
        dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
        dmae->opcode = (DMAE_CMD_SRC_GRC | DMAE_CMD_DST_PCI |
                        DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
@@ -4718,325 +3361,322 @@ static void bnx2x_init_mac_stats(struct bnx2x *bp)
 #else
                        DMAE_CMD_ENDIANITY_DW_SWAP |
 #endif
-                       (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0));
-       dmae->src_addr_lo = (port ? NIG_REG_STAT1_BRB_DISCARD :
-                                   NIG_REG_STAT0_BRB_DISCARD) >> 2;
-       dmae->src_addr_hi = 0;
-       dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig));
-       dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig));
-       dmae->len = (sizeof(struct nig_stats) - 2*sizeof(u32)) >> 2;
-       dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig) +
-                                   offsetof(struct nig_stats, done));
-       dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig) +
-                                   offsetof(struct nig_stats, done));
-       dmae->comp_val = 0xffffffff;
-}
-
-static void bnx2x_init_stats(struct bnx2x *bp)
-{
-       int port = bp->port;
-
-       bp->stats_state = STATS_STATE_DISABLE;
-       bp->executer_idx = 0;
-
-       bp->old_brb_discard = REG_RD(bp,
-                                    NIG_REG_STAT0_BRB_DISCARD + port*0x38);
-
-       memset(&bp->old_bmac, 0, sizeof(struct bmac_stats));
-       memset(&bp->old_tclient, 0, sizeof(struct tstorm_per_client_stats));
-       memset(&bp->dev->stats, 0, sizeof(struct net_device_stats));
-
-       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(port), 1);
-       REG_WR(bp, BAR_XSTRORM_INTMEM +
-              XSTORM_STATS_FLAGS_OFFSET(port) + 4, 0);
-
-       REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_STATS_FLAGS_OFFSET(port), 1);
-       REG_WR(bp, BAR_TSTRORM_INTMEM +
-              TSTORM_STATS_FLAGS_OFFSET(port) + 4, 0);
+                       (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                       (vn << DMAE_CMD_E1HVN_SHIFT));
+       dmae->src_addr_lo = (port ? NIG_REG_STAT1_EGRESS_MAC_PKT1 :
+                                   NIG_REG_STAT0_EGRESS_MAC_PKT1) >> 2;
+       dmae->src_addr_hi = 0;
+       dmae->dst_addr_lo = U64_LO(bnx2x_sp_mapping(bp, nig_stats) +
+                       offsetof(struct nig_stats, egress_mac_pkt1_lo));
+       dmae->dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, nig_stats) +
+                       offsetof(struct nig_stats, egress_mac_pkt1_lo));
+       dmae->len = (2*sizeof(u32)) >> 2;
+       dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+       dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+       dmae->comp_val = DMAE_COMP_VAL;
+
+       *stats_comp = 0;
+}
+
+static void bnx2x_func_stats_init(struct bnx2x *bp)
+{
+       struct dmae_command *dmae = &bp->stats_dmae;
+       u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+
+       /* sanity */
+       if (!bp->func_stx) {
+               BNX2X_ERR("BUG!\n");
+               return;
+       }
+
+       bp->executer_idx = 0;
+       memset(dmae, 0, sizeof(struct dmae_command));
+
+       dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                       DMAE_CMD_C_DST_PCI | DMAE_CMD_C_ENABLE |
+                       DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
+#ifdef __BIG_ENDIAN
+                       DMAE_CMD_ENDIANITY_B_DW_SWAP |
+#else
+                       DMAE_CMD_ENDIANITY_DW_SWAP |
+#endif
+                       (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                       (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+       dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
+       dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
+       dmae->dst_addr_lo = bp->func_stx >> 2;
+       dmae->dst_addr_hi = 0;
+       dmae->len = sizeof(struct host_func_stats) >> 2;
+       dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+       dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+       dmae->comp_val = DMAE_COMP_VAL;
+
+       *stats_comp = 0;
+}
+
+static void bnx2x_stats_start(struct bnx2x *bp)
+{
+       if (bp->port.pmf)
+               bnx2x_port_stats_init(bp);
+
+       else if (bp->func_stx)
+               bnx2x_func_stats_init(bp);
+
+       bnx2x_hw_stats_post(bp);
+       bnx2x_storm_stats_post(bp);
+}
+
+static void bnx2x_stats_pmf_start(struct bnx2x *bp)
+{
+       bnx2x_stats_comp(bp);
+       bnx2x_stats_pmf_update(bp);
+       bnx2x_stats_start(bp);
+}
+
+static void bnx2x_stats_restart(struct bnx2x *bp)
+{
+       bnx2x_stats_comp(bp);
+       bnx2x_stats_start(bp);
+}
+
+static void bnx2x_bmac_stats_update(struct bnx2x *bp)
+{
+       struct bmac_stats *new = bnx2x_sp(bp, mac_stats.bmac_stats);
+       struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
+       struct regpair diff;
+
+       UPDATE_STAT64(rx_stat_grerb, rx_stat_ifhcinbadoctets);
+       UPDATE_STAT64(rx_stat_grfcs, rx_stat_dot3statsfcserrors);
+       UPDATE_STAT64(rx_stat_grund, rx_stat_etherstatsundersizepkts);
+       UPDATE_STAT64(rx_stat_grovr, rx_stat_dot3statsframestoolong);
+       UPDATE_STAT64(rx_stat_grfrg, rx_stat_etherstatsfragments);
+       UPDATE_STAT64(rx_stat_grjbr, rx_stat_etherstatsjabbers);
+       UPDATE_STAT64(rx_stat_grxpf, rx_stat_bmac_xpf);
+       UPDATE_STAT64(rx_stat_grxcf, rx_stat_bmac_xcf);
+       UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffstateentered);
+       UPDATE_STAT64(rx_stat_grxpf, rx_stat_xoffpauseframesreceived);
+       UPDATE_STAT64(tx_stat_gtxpf, tx_stat_outxoffsent);
+       UPDATE_STAT64(tx_stat_gtxpf, tx_stat_flowcontroldone);
+       UPDATE_STAT64(tx_stat_gt64, tx_stat_etherstatspkts64octets);
+       UPDATE_STAT64(tx_stat_gt127,
+                               tx_stat_etherstatspkts65octetsto127octets);
+       UPDATE_STAT64(tx_stat_gt255,
+                               tx_stat_etherstatspkts128octetsto255octets);
+       UPDATE_STAT64(tx_stat_gt511,
+                               tx_stat_etherstatspkts256octetsto511octets);
+       UPDATE_STAT64(tx_stat_gt1023,
+                               tx_stat_etherstatspkts512octetsto1023octets);
+       UPDATE_STAT64(tx_stat_gt1518,
+                               tx_stat_etherstatspkts1024octetsto1522octets);
+       UPDATE_STAT64(tx_stat_gt2047, tx_stat_bmac_2047);
+       UPDATE_STAT64(tx_stat_gt4095, tx_stat_bmac_4095);
+       UPDATE_STAT64(tx_stat_gt9216, tx_stat_bmac_9216);
+       UPDATE_STAT64(tx_stat_gt16383, tx_stat_bmac_16383);
+       UPDATE_STAT64(tx_stat_gterr,
+                               tx_stat_dot3statsinternalmactransmiterrors);
+       UPDATE_STAT64(tx_stat_gtufl, tx_stat_bmac_ufl);
+}
+
+static void bnx2x_emac_stats_update(struct bnx2x *bp)
+{
+       struct emac_stats *new = bnx2x_sp(bp, mac_stats.emac_stats);
+       struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
+
+       UPDATE_EXTEND_STAT(rx_stat_ifhcinbadoctets);
+       UPDATE_EXTEND_STAT(tx_stat_ifhcoutbadoctets);
+       UPDATE_EXTEND_STAT(rx_stat_dot3statsfcserrors);
+       UPDATE_EXTEND_STAT(rx_stat_dot3statsalignmenterrors);
+       UPDATE_EXTEND_STAT(rx_stat_dot3statscarriersenseerrors);
+       UPDATE_EXTEND_STAT(rx_stat_falsecarriererrors);
+       UPDATE_EXTEND_STAT(rx_stat_etherstatsundersizepkts);
+       UPDATE_EXTEND_STAT(rx_stat_dot3statsframestoolong);
+       UPDATE_EXTEND_STAT(rx_stat_etherstatsfragments);
+       UPDATE_EXTEND_STAT(rx_stat_etherstatsjabbers);
+       UPDATE_EXTEND_STAT(rx_stat_maccontrolframesreceived);
+       UPDATE_EXTEND_STAT(rx_stat_xoffstateentered);
+       UPDATE_EXTEND_STAT(rx_stat_xonpauseframesreceived);
+       UPDATE_EXTEND_STAT(rx_stat_xoffpauseframesreceived);
+       UPDATE_EXTEND_STAT(tx_stat_outxonsent);
+       UPDATE_EXTEND_STAT(tx_stat_outxoffsent);
+       UPDATE_EXTEND_STAT(tx_stat_flowcontroldone);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatscollisions);
+       UPDATE_EXTEND_STAT(tx_stat_dot3statssinglecollisionframes);
+       UPDATE_EXTEND_STAT(tx_stat_dot3statsmultiplecollisionframes);
+       UPDATE_EXTEND_STAT(tx_stat_dot3statsdeferredtransmissions);
+       UPDATE_EXTEND_STAT(tx_stat_dot3statsexcessivecollisions);
+       UPDATE_EXTEND_STAT(tx_stat_dot3statslatecollisions);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatspkts64octets);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatspkts65octetsto127octets);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatspkts128octetsto255octets);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatspkts256octetsto511octets);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatspkts512octetsto1023octets);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatspkts1024octetsto1522octets);
+       UPDATE_EXTEND_STAT(tx_stat_etherstatspktsover1522octets);
+       UPDATE_EXTEND_STAT(tx_stat_dot3statsinternalmactransmiterrors);
+}
+
+static int bnx2x_hw_stats_update(struct bnx2x *bp)
+{
+       struct nig_stats *new = bnx2x_sp(bp, nig_stats);
+       struct nig_stats *old = &(bp->port.old_nig_stats);
+       struct host_port_stats *pstats = bnx2x_sp(bp, port_stats);
+       struct bnx2x_eth_stats *estats = &bp->eth_stats;
+       struct regpair diff;
+
+       if (bp->link_vars.mac_type == MAC_TYPE_BMAC)
+               bnx2x_bmac_stats_update(bp);
+
+       else if (bp->link_vars.mac_type == MAC_TYPE_EMAC)
+               bnx2x_emac_stats_update(bp);
+
+       else { /* unreached */
+               BNX2X_ERR("stats updated by dmae but no MAC active\n");
+               return -1;
+       }
 
-       REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(port), 0);
-       REG_WR(bp, BAR_CSTRORM_INTMEM +
-              CSTORM_STATS_FLAGS_OFFSET(port) + 4, 0);
+       ADD_EXTEND_64(pstats->brb_drop_hi, pstats->brb_drop_lo,
+                     new->brb_discard - old->brb_discard);
 
-       REG_WR(bp, BAR_XSTRORM_INTMEM +
-              XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(port),
-              U64_LO(bnx2x_sp_mapping(bp, fw_stats)));
-       REG_WR(bp, BAR_XSTRORM_INTMEM +
-              XSTORM_ETH_STATS_QUERY_ADDR_OFFSET(port) + 4,
-              U64_HI(bnx2x_sp_mapping(bp, fw_stats)));
+       UPDATE_STAT64_NIG(egress_mac_pkt0,
+                                       etherstatspkts1024octetsto1522octets);
+       UPDATE_STAT64_NIG(egress_mac_pkt1, etherstatspktsover1522octets);
 
-       REG_WR(bp, BAR_TSTRORM_INTMEM +
-              TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(port),
-              U64_LO(bnx2x_sp_mapping(bp, fw_stats)));
-       REG_WR(bp, BAR_TSTRORM_INTMEM +
-              TSTORM_ETH_STATS_QUERY_ADDR_OFFSET(port) + 4,
-              U64_HI(bnx2x_sp_mapping(bp, fw_stats)));
-}
+       memcpy(old, new, sizeof(struct nig_stats));
 
-static void bnx2x_stop_stats(struct bnx2x *bp)
-{
-       might_sleep();
-       if (bp->stats_state != STATS_STATE_DISABLE) {
-               int timeout = 10;
+       memcpy(&(estats->rx_stat_ifhcinbadoctets_hi), &(pstats->mac_stx[1]),
+              sizeof(struct mac_stx));
+       estats->brb_drop_hi = pstats->brb_drop_hi;
+       estats->brb_drop_lo = pstats->brb_drop_lo;
 
-               bp->stats_state = STATS_STATE_STOP;
-               DP(BNX2X_MSG_STATS, "stats_state - STOP\n");
+       pstats->host_port_stats_start = ++pstats->host_port_stats_end;
 
-               while (bp->stats_state != STATS_STATE_DISABLE) {
-                       if (!timeout) {
-                               BNX2X_ERR("timeout waiting for stats stop\n");
-                               break;
-                       }
-                       timeout--;
-                       msleep(100);
-               }
-       }
-       DP(BNX2X_MSG_STATS, "stats_state - DISABLE\n");
+       return 0;
 }
 
-/*
- * Statistics service functions
- */
-
-static void bnx2x_update_bmac_stats(struct bnx2x *bp)
-{
-       struct regp diff;
-       struct regp sum;
-       struct bmac_stats *new = bnx2x_sp(bp, mac_stats.bmac);
-       struct bmac_stats *old = &bp->old_bmac;
-       struct bnx2x_eth_stats *estats = bnx2x_sp(bp, eth_stats);
-
-       sum.hi = 0;
-       sum.lo = 0;
-
-       UPDATE_STAT64(tx_gtbyt.hi, total_bytes_transmitted_hi,
-                     tx_gtbyt.lo, total_bytes_transmitted_lo);
-
-       UPDATE_STAT64(tx_gtmca.hi, total_multicast_packets_transmitted_hi,
-                     tx_gtmca.lo, total_multicast_packets_transmitted_lo);
-       ADD_64(sum.hi, diff.hi, sum.lo, diff.lo);
-
-       UPDATE_STAT64(tx_gtgca.hi, total_broadcast_packets_transmitted_hi,
-                     tx_gtgca.lo, total_broadcast_packets_transmitted_lo);
-       ADD_64(sum.hi, diff.hi, sum.lo, diff.lo);
-
-       UPDATE_STAT64(tx_gtpkt.hi, total_unicast_packets_transmitted_hi,
-                     tx_gtpkt.lo, total_unicast_packets_transmitted_lo);
-       SUB_64(estats->total_unicast_packets_transmitted_hi, sum.hi,
-              estats->total_unicast_packets_transmitted_lo, sum.lo);
-
-       UPDATE_STAT(tx_gtxpf.lo, pause_xoff_frames_transmitted);
-       UPDATE_STAT(tx_gt64.lo, frames_transmitted_64_bytes);
-       UPDATE_STAT(tx_gt127.lo, frames_transmitted_65_127_bytes);
-       UPDATE_STAT(tx_gt255.lo, frames_transmitted_128_255_bytes);
-       UPDATE_STAT(tx_gt511.lo, frames_transmitted_256_511_bytes);
-       UPDATE_STAT(tx_gt1023.lo, frames_transmitted_512_1023_bytes);
-       UPDATE_STAT(tx_gt1518.lo, frames_transmitted_1024_1522_bytes);
-       UPDATE_STAT(tx_gt2047.lo, frames_transmitted_1523_9022_bytes);
-       UPDATE_STAT(tx_gt4095.lo, frames_transmitted_1523_9022_bytes);
-       UPDATE_STAT(tx_gt9216.lo, frames_transmitted_1523_9022_bytes);
-       UPDATE_STAT(tx_gt16383.lo, frames_transmitted_1523_9022_bytes);
-
-       UPDATE_STAT(rx_grfcs.lo, crc_receive_errors);
-       UPDATE_STAT(rx_grund.lo, runt_packets_received);
-       UPDATE_STAT(rx_grovr.lo, stat_Dot3statsFramesTooLong);
-       UPDATE_STAT(rx_grxpf.lo, pause_xoff_frames_received);
-       UPDATE_STAT(rx_grxcf.lo, control_frames_received);
-       /* UPDATE_STAT(rx_grxpf.lo, control_frames_received); */
-       UPDATE_STAT(rx_grfrg.lo, error_runt_packets_received);
-       UPDATE_STAT(rx_grjbr.lo, error_jabber_packets_received);
-
-       UPDATE_STAT64(rx_grerb.hi, stat_IfHCInBadOctets_hi,
-                     rx_grerb.lo, stat_IfHCInBadOctets_lo);
-       UPDATE_STAT64(tx_gtufl.hi, stat_IfHCOutBadOctets_hi,
-                     tx_gtufl.lo, stat_IfHCOutBadOctets_lo);
-       UPDATE_STAT(tx_gterr.lo, stat_Dot3statsInternalMacTransmitErrors);
-       /* UPDATE_STAT(rx_grxpf.lo, stat_XoffStateEntered); */
-       estats->stat_XoffStateEntered = estats->pause_xoff_frames_received;
-}
-
-static void bnx2x_update_emac_stats(struct bnx2x *bp)
-{
-       struct emac_stats *new = bnx2x_sp(bp, mac_stats.emac);
-       struct bnx2x_eth_stats *estats = bnx2x_sp(bp, eth_stats);
-
-       UPDATE_EXTEND_STAT(tx_ifhcoutoctets, total_bytes_transmitted_hi,
-                                            total_bytes_transmitted_lo);
-       UPDATE_EXTEND_STAT(tx_ifhcoutucastpkts,
-                                       total_unicast_packets_transmitted_hi,
-                                       total_unicast_packets_transmitted_lo);
-       UPDATE_EXTEND_STAT(tx_ifhcoutmulticastpkts,
-                                     total_multicast_packets_transmitted_hi,
-                                     total_multicast_packets_transmitted_lo);
-       UPDATE_EXTEND_STAT(tx_ifhcoutbroadcastpkts,
-                                     total_broadcast_packets_transmitted_hi,
-                                     total_broadcast_packets_transmitted_lo);
-
-       estats->pause_xon_frames_transmitted += new->tx_outxonsent;
-       estats->pause_xoff_frames_transmitted += new->tx_outxoffsent;
-       estats->single_collision_transmit_frames +=
-                               new->tx_dot3statssinglecollisionframes;
-       estats->multiple_collision_transmit_frames +=
-                               new->tx_dot3statsmultiplecollisionframes;
-       estats->late_collision_frames += new->tx_dot3statslatecollisions;
-       estats->excessive_collision_frames +=
-                               new->tx_dot3statsexcessivecollisions;
-       estats->frames_transmitted_64_bytes += new->tx_etherstatspkts64octets;
-       estats->frames_transmitted_65_127_bytes +=
-                               new->tx_etherstatspkts65octetsto127octets;
-       estats->frames_transmitted_128_255_bytes +=
-                               new->tx_etherstatspkts128octetsto255octets;
-       estats->frames_transmitted_256_511_bytes +=
-                               new->tx_etherstatspkts256octetsto511octets;
-       estats->frames_transmitted_512_1023_bytes +=
-                               new->tx_etherstatspkts512octetsto1023octets;
-       estats->frames_transmitted_1024_1522_bytes +=
-                               new->tx_etherstatspkts1024octetsto1522octet;
-       estats->frames_transmitted_1523_9022_bytes +=
-                               new->tx_etherstatspktsover1522octets;
-
-       estats->crc_receive_errors += new->rx_dot3statsfcserrors;
-       estats->alignment_errors += new->rx_dot3statsalignmenterrors;
-       estats->false_carrier_detections += new->rx_falsecarriererrors;
-       estats->runt_packets_received += new->rx_etherstatsundersizepkts;
-       estats->stat_Dot3statsFramesTooLong += new->rx_dot3statsframestoolong;
-       estats->pause_xon_frames_received += new->rx_xonpauseframesreceived;
-       estats->pause_xoff_frames_received += new->rx_xoffpauseframesreceived;
-       estats->control_frames_received += new->rx_maccontrolframesreceived;
-       estats->error_runt_packets_received += new->rx_etherstatsfragments;
-       estats->error_jabber_packets_received += new->rx_etherstatsjabbers;
-
-       UPDATE_EXTEND_STAT(rx_ifhcinbadoctets, stat_IfHCInBadOctets_hi,
-                                              stat_IfHCInBadOctets_lo);
-       UPDATE_EXTEND_STAT(tx_ifhcoutbadoctets, stat_IfHCOutBadOctets_hi,
-                                               stat_IfHCOutBadOctets_lo);
-       estats->stat_Dot3statsInternalMacTransmitErrors +=
-                               new->tx_dot3statsinternalmactransmiterrors;
-       estats->stat_Dot3StatsCarrierSenseErrors +=
-                               new->rx_dot3statscarriersenseerrors;
-       estats->stat_Dot3StatsDeferredTransmissions +=
-                               new->tx_dot3statsdeferredtransmissions;
-       estats->stat_FlowControlDone += new->tx_flowcontroldone;
-       estats->stat_XoffStateEntered += new->rx_xoffstateentered;
-}
-
-static int bnx2x_update_storm_stats(struct bnx2x *bp)
+static int bnx2x_storm_stats_update(struct bnx2x *bp)
 {
        struct eth_stats_query *stats = bnx2x_sp(bp, fw_stats);
-       struct tstorm_common_stats *tstats = &stats->tstorm_common;
+       int cl_id = BP_CL_ID(bp);
+       struct tstorm_per_port_stats *tport =
+                               &stats->tstorm_common.port_statistics;
        struct tstorm_per_client_stats *tclient =
-                                               &tstats->client_statistics[0];
+                       &stats->tstorm_common.client_statistics[cl_id];
        struct tstorm_per_client_stats *old_tclient = &bp->old_tclient;
-       struct xstorm_common_stats *xstats = &stats->xstorm_common;
-       struct nig_stats *nstats = bnx2x_sp(bp, nig);
-       struct bnx2x_eth_stats *estats = bnx2x_sp(bp, eth_stats);
+       struct xstorm_per_client_stats *xclient =
+                       &stats->xstorm_common.client_statistics[cl_id];
+       struct xstorm_per_client_stats *old_xclient = &bp->old_xclient;
+       struct host_func_stats *fstats = bnx2x_sp(bp, func_stats);
+       struct bnx2x_eth_stats *estats = &bp->eth_stats;
        u32 diff;
 
-       /* are DMAE stats valid? */
-       if (nstats->done != 0xffffffff) {
-               DP(BNX2X_MSG_STATS, "stats not updated by dmae\n");
+       /* are storm stats valid? */
+       if ((u16)(le16_to_cpu(tclient->stats_counter) + 1) !=
+                                                       bp->stats_counter) {
+               DP(BNX2X_MSG_STATS, "stats not updated by tstorm"
+                  "  tstorm counter (%d) != stats_counter (%d)\n",
+                  tclient->stats_counter, bp->stats_counter);
                return -1;
        }
-
-       /* are storm stats valid? */
-       if (tstats->done.hi != 0xffffffff) {
-               DP(BNX2X_MSG_STATS, "stats not updated by tstorm\n");
+       if ((u16)(le16_to_cpu(xclient->stats_counter) + 1) !=
+                                                       bp->stats_counter) {
+               DP(BNX2X_MSG_STATS, "stats not updated by xstorm"
+                  "  xstorm counter (%d) != stats_counter (%d)\n",
+                  xclient->stats_counter, bp->stats_counter);
                return -2;
        }
-       if (xstats->done.hi != 0xffffffff) {
-               DP(BNX2X_MSG_STATS, "stats not updated by xstorm\n");
-               return -3;
-       }
 
-       estats->total_bytes_received_hi =
-       estats->valid_bytes_received_hi =
+       fstats->total_bytes_received_hi =
+       fstats->valid_bytes_received_hi =
                                le32_to_cpu(tclient->total_rcv_bytes.hi);
-       estats->total_bytes_received_lo =
-       estats->valid_bytes_received_lo =
+       fstats->total_bytes_received_lo =
+       fstats->valid_bytes_received_lo =
                                le32_to_cpu(tclient->total_rcv_bytes.lo);
-       ADD_64(estats->total_bytes_received_hi,
-              le32_to_cpu(tclient->rcv_error_bytes.hi),
-              estats->total_bytes_received_lo,
-              le32_to_cpu(tclient->rcv_error_bytes.lo));
-
-       UPDATE_EXTEND_TSTAT(rcv_unicast_pkts,
-                                       total_unicast_packets_received_hi,
-                                       total_unicast_packets_received_lo);
+
+       estats->error_bytes_received_hi =
+                               le32_to_cpu(tclient->rcv_error_bytes.hi);
+       estats->error_bytes_received_lo =
+                               le32_to_cpu(tclient->rcv_error_bytes.lo);
+       ADD_64(estats->error_bytes_received_hi,
+              estats->rx_stat_ifhcinbadoctets_hi,
+              estats->error_bytes_received_lo,
+              estats->rx_stat_ifhcinbadoctets_lo);
+
+       ADD_64(fstats->total_bytes_received_hi,
+              estats->error_bytes_received_hi,
+              fstats->total_bytes_received_lo,
+              estats->error_bytes_received_lo);
+
+       UPDATE_EXTEND_TSTAT(rcv_unicast_pkts, total_unicast_packets_received);
        UPDATE_EXTEND_TSTAT(rcv_multicast_pkts,
-                                       total_multicast_packets_received_hi,
-                                       total_multicast_packets_received_lo);
+                               total_multicast_packets_received);
        UPDATE_EXTEND_TSTAT(rcv_broadcast_pkts,
-                                       total_broadcast_packets_received_hi,
-                                       total_broadcast_packets_received_lo);
-
-       estats->frames_received_64_bytes = MAC_STX_NA;
-       estats->frames_received_65_127_bytes = MAC_STX_NA;
-       estats->frames_received_128_255_bytes = MAC_STX_NA;
-       estats->frames_received_256_511_bytes = MAC_STX_NA;
-       estats->frames_received_512_1023_bytes = MAC_STX_NA;
-       estats->frames_received_1024_1522_bytes = MAC_STX_NA;
-       estats->frames_received_1523_9022_bytes = MAC_STX_NA;
-
-       estats->x_total_sent_bytes_hi =
-                               le32_to_cpu(xstats->total_sent_bytes.hi);
-       estats->x_total_sent_bytes_lo =
-                               le32_to_cpu(xstats->total_sent_bytes.lo);
-       estats->x_total_sent_pkts = le32_to_cpu(xstats->total_sent_pkts);
-
-       estats->t_rcv_unicast_bytes_hi =
+                               total_broadcast_packets_received);
+
+       fstats->total_bytes_transmitted_hi =
+                               le32_to_cpu(xclient->total_sent_bytes.hi);
+       fstats->total_bytes_transmitted_lo =
+                               le32_to_cpu(xclient->total_sent_bytes.lo);
+
+       UPDATE_EXTEND_XSTAT(unicast_pkts_sent,
+                               total_unicast_packets_transmitted);
+       UPDATE_EXTEND_XSTAT(multicast_pkts_sent,
+                               total_multicast_packets_transmitted);
+       UPDATE_EXTEND_XSTAT(broadcast_pkts_sent,
+                               total_broadcast_packets_transmitted);
+
+       memcpy(estats, &(fstats->total_bytes_received_hi),
+              sizeof(struct host_func_stats) - 2*sizeof(u32));
+
+       estats->mac_filter_discard = le32_to_cpu(tport->mac_filter_discard);
+       estats->xxoverflow_discard = le32_to_cpu(tport->xxoverflow_discard);
+       estats->brb_truncate_discard =
+                               le32_to_cpu(tport->brb_truncate_discard);
+       estats->mac_discard = le32_to_cpu(tport->mac_discard);
+
+       old_tclient->rcv_unicast_bytes.hi =
                                le32_to_cpu(tclient->rcv_unicast_bytes.hi);
-       estats->t_rcv_unicast_bytes_lo =
+       old_tclient->rcv_unicast_bytes.lo =
                                le32_to_cpu(tclient->rcv_unicast_bytes.lo);
-       estats->t_rcv_broadcast_bytes_hi =
+       old_tclient->rcv_broadcast_bytes.hi =
                                le32_to_cpu(tclient->rcv_broadcast_bytes.hi);
-       estats->t_rcv_broadcast_bytes_lo =
+       old_tclient->rcv_broadcast_bytes.lo =
                                le32_to_cpu(tclient->rcv_broadcast_bytes.lo);
-       estats->t_rcv_multicast_bytes_hi =
+       old_tclient->rcv_multicast_bytes.hi =
                                le32_to_cpu(tclient->rcv_multicast_bytes.hi);
-       estats->t_rcv_multicast_bytes_lo =
+       old_tclient->rcv_multicast_bytes.lo =
                                le32_to_cpu(tclient->rcv_multicast_bytes.lo);
-       estats->t_total_rcv_pkt = le32_to_cpu(tclient->total_rcv_pkts);
+       old_tclient->total_rcv_pkts = le32_to_cpu(tclient->total_rcv_pkts);
 
-       estats->checksum_discard = le32_to_cpu(tclient->checksum_discard);
-       estats->packets_too_big_discard =
+       old_tclient->checksum_discard = le32_to_cpu(tclient->checksum_discard);
+       old_tclient->packets_too_big_discard =
                                le32_to_cpu(tclient->packets_too_big_discard);
-       estats->jabber_packets_received = estats->packets_too_big_discard +
-                                         estats->stat_Dot3statsFramesTooLong;
-       estats->no_buff_discard = le32_to_cpu(tclient->no_buff_discard);
-       estats->ttl0_discard = le32_to_cpu(tclient->ttl0_discard);
-       estats->mac_discard = le32_to_cpu(tclient->mac_discard);
-       estats->mac_filter_discard = le32_to_cpu(tstats->mac_filter_discard);
-       estats->xxoverflow_discard = le32_to_cpu(tstats->xxoverflow_discard);
-       estats->brb_truncate_discard =
-                               le32_to_cpu(tstats->brb_truncate_discard);
-
-       estats->brb_discard += nstats->brb_discard - bp->old_brb_discard;
-       bp->old_brb_discard = nstats->brb_discard;
-
-       estats->brb_packet = nstats->brb_packet;
-       estats->brb_truncate = nstats->brb_truncate;
-       estats->flow_ctrl_discard = nstats->flow_ctrl_discard;
-       estats->flow_ctrl_octets = nstats->flow_ctrl_octets;
-       estats->flow_ctrl_packet = nstats->flow_ctrl_packet;
-       estats->mng_discard = nstats->mng_discard;
-       estats->mng_octet_inp = nstats->mng_octet_inp;
-       estats->mng_octet_out = nstats->mng_octet_out;
-       estats->mng_packet_inp = nstats->mng_packet_inp;
-       estats->mng_packet_out = nstats->mng_packet_out;
-       estats->pbf_octets = nstats->pbf_octets;
-       estats->pbf_packet = nstats->pbf_packet;
-       estats->safc_inp = nstats->safc_inp;
-
-       xstats->done.hi = 0;
-       tstats->done.hi = 0;
-       nstats->done = 0;
+       estats->no_buff_discard =
+       old_tclient->no_buff_discard = le32_to_cpu(tclient->no_buff_discard);
+       old_tclient->ttl0_discard = le32_to_cpu(tclient->ttl0_discard);
+
+       old_xclient->total_sent_pkts = le32_to_cpu(xclient->total_sent_pkts);
+       old_xclient->unicast_bytes_sent.hi =
+                               le32_to_cpu(xclient->unicast_bytes_sent.hi);
+       old_xclient->unicast_bytes_sent.lo =
+                               le32_to_cpu(xclient->unicast_bytes_sent.lo);
+       old_xclient->multicast_bytes_sent.hi =
+                               le32_to_cpu(xclient->multicast_bytes_sent.hi);
+       old_xclient->multicast_bytes_sent.lo =
+                               le32_to_cpu(xclient->multicast_bytes_sent.lo);
+       old_xclient->broadcast_bytes_sent.hi =
+                               le32_to_cpu(xclient->broadcast_bytes_sent.hi);
+       old_xclient->broadcast_bytes_sent.lo =
+                               le32_to_cpu(xclient->broadcast_bytes_sent.lo);
+
+       fstats->host_func_stats_start = ++fstats->host_func_stats_end;
 
        return 0;
 }
 
-static void bnx2x_update_net_stats(struct bnx2x *bp)
+static void bnx2x_net_stats_update(struct bnx2x *bp)
 {
-       struct bnx2x_eth_stats *estats = bnx2x_sp(bp, eth_stats);
+       struct tstorm_per_client_stats *old_tclient = &bp->old_tclient;
+       struct bnx2x_eth_stats *estats = &bp->eth_stats;
        struct net_device_stats *nstats = &bp->dev->stats;
 
        nstats->rx_packets =
@@ -5049,28 +3689,35 @@ static void bnx2x_update_net_stats(struct bnx2x *bp)
                bnx2x_hilo(&estats->total_multicast_packets_transmitted_hi) +
                bnx2x_hilo(&estats->total_broadcast_packets_transmitted_hi);
 
-       nstats->rx_bytes = bnx2x_hilo(&estats->total_bytes_received_hi);
+       nstats->rx_bytes = bnx2x_hilo(&estats->valid_bytes_received_hi);
 
        nstats->tx_bytes = bnx2x_hilo(&estats->total_bytes_transmitted_hi);
 
-       nstats->rx_dropped = estats->checksum_discard + estats->mac_discard;
+       nstats->rx_dropped = old_tclient->checksum_discard +
+                            estats->mac_discard;
        nstats->tx_dropped = 0;
 
        nstats->multicast =
                bnx2x_hilo(&estats->total_multicast_packets_transmitted_hi);
 
-       nstats->collisions = estats->single_collision_transmit_frames +
-                            estats->multiple_collision_transmit_frames +
-                            estats->late_collision_frames +
-                            estats->excessive_collision_frames;
+       nstats->collisions =
+                       estats->tx_stat_dot3statssinglecollisionframes_lo +
+                       estats->tx_stat_dot3statsmultiplecollisionframes_lo +
+                       estats->tx_stat_dot3statslatecollisions_lo +
+                       estats->tx_stat_dot3statsexcessivecollisions_lo;
 
-       nstats->rx_length_errors = estats->runt_packets_received +
-                                  estats->jabber_packets_received;
-       nstats->rx_over_errors = estats->brb_discard +
+       estats->jabber_packets_received =
+                               old_tclient->packets_too_big_discard +
+                               estats->rx_stat_dot3statsframestoolong_lo;
+
+       nstats->rx_length_errors =
+                               estats->rx_stat_etherstatsundersizepkts_lo +
+                               estats->jabber_packets_received;
+       nstats->rx_over_errors = estats->brb_drop_lo +
                                 estats->brb_truncate_discard;
-       nstats->rx_crc_errors = estats->crc_receive_errors;
-       nstats->rx_frame_errors = estats->alignment_errors;
-       nstats->rx_fifo_errors = estats->no_buff_discard;
+       nstats->rx_crc_errors = estats->rx_stat_dot3statsfcserrors_lo;
+       nstats->rx_frame_errors = estats->rx_stat_dot3statsalignmenterrors_lo;
+       nstats->rx_fifo_errors = old_tclient->no_buff_discard;
        nstats->rx_missed_errors = estats->xxoverflow_discard;
 
        nstats->rx_errors = nstats->rx_length_errors +
@@ -5080,65 +3727,75 @@ static void bnx2x_update_net_stats(struct bnx2x *bp)
                            nstats->rx_fifo_errors +
                            nstats->rx_missed_errors;
 
-       nstats->tx_aborted_errors = estats->late_collision_frames +
-                                   estats->excessive_collision_frames;
-       nstats->tx_carrier_errors = estats->false_carrier_detections;
+       nstats->tx_aborted_errors =
+                       estats->tx_stat_dot3statslatecollisions_lo +
+                       estats->tx_stat_dot3statsexcessivecollisions_lo;
+       nstats->tx_carrier_errors = estats->rx_stat_falsecarriererrors_lo;
        nstats->tx_fifo_errors = 0;
        nstats->tx_heartbeat_errors = 0;
        nstats->tx_window_errors = 0;
 
        nstats->tx_errors = nstats->tx_aborted_errors +
                            nstats->tx_carrier_errors;
-
-       estats->mac_stx_start = ++estats->mac_stx_end;
 }
 
-static void bnx2x_update_stats(struct bnx2x *bp)
+static void bnx2x_stats_update(struct bnx2x *bp)
 {
-       int i;
+       u32 *stats_comp = bnx2x_sp(bp, stats_comp);
+       int update = 0;
 
-       if (!bnx2x_update_storm_stats(bp)) {
+       if (*stats_comp != DMAE_COMP_VAL)
+               return;
 
-               if (bp->phy_flags & PHY_BMAC_FLAG) {
-                       bnx2x_update_bmac_stats(bp);
+       if (bp->port.pmf)
+               update = (bnx2x_hw_stats_update(bp) == 0);
 
-               } else if (bp->phy_flags & PHY_EMAC_FLAG) {
-                       bnx2x_update_emac_stats(bp);
+       update |= (bnx2x_storm_stats_update(bp) == 0);
 
-               } else { /* unreached */
-                       BNX2X_ERR("no MAC active\n");
-                       return;
-               }
+       if (update)
+               bnx2x_net_stats_update(bp);
 
-               bnx2x_update_net_stats(bp);
+       else {
+               if (bp->stats_pending) {
+                       bp->stats_pending++;
+                       if (bp->stats_pending == 3) {
+                               BNX2X_ERR("stats not updated for 3 times\n");
+                               bnx2x_panic();
+                               return;
+                       }
+               }
        }
 
        if (bp->msglevel & NETIF_MSG_TIMER) {
-               struct bnx2x_eth_stats *estats = bnx2x_sp(bp, eth_stats);
+               struct tstorm_per_client_stats *old_tclient = &bp->old_tclient;
+               struct bnx2x_eth_stats *estats = &bp->eth_stats;
                struct net_device_stats *nstats = &bp->dev->stats;
+               int i;
 
                printk(KERN_DEBUG "%s:\n", bp->dev->name);
                printk(KERN_DEBUG "  tx avail (%4x)  tx hc idx (%x)"
                                  "  tx pkt (%lx)\n",
                       bnx2x_tx_avail(bp->fp),
-                      *bp->fp->tx_cons_sb, nstats->tx_packets);
+                      le16_to_cpu(*bp->fp->tx_cons_sb), nstats->tx_packets);
                printk(KERN_DEBUG "  rx usage (%4x)  rx hc idx (%x)"
                                  "  rx pkt (%lx)\n",
-                      (u16)(*bp->fp->rx_cons_sb - bp->fp->rx_comp_cons),
-                      *bp->fp->rx_cons_sb, nstats->rx_packets);
+                      (u16)(le16_to_cpu(*bp->fp->rx_cons_sb) -
+                            bp->fp->rx_comp_cons),
+                      le16_to_cpu(*bp->fp->rx_cons_sb), nstats->rx_packets);
                printk(KERN_DEBUG "  %s (Xoff events %u)  brb drops %u\n",
                       netif_queue_stopped(bp->dev)? "Xoff" : "Xon",
-                      estats->driver_xoff, estats->brb_discard);
+                      estats->driver_xoff, estats->brb_drop_lo);
                printk(KERN_DEBUG "tstats: checksum_discard %u  "
                        "packets_too_big_discard %u  no_buff_discard %u  "
                        "mac_discard %u  mac_filter_discard %u  "
                        "xxovrflow_discard %u  brb_truncate_discard %u  "
                        "ttl0_discard %u\n",
-                      estats->checksum_discard,
-                      estats->packets_too_big_discard,
-                      estats->no_buff_discard, estats->mac_discard,
+                      old_tclient->checksum_discard,
+                      old_tclient->packets_too_big_discard,
+                      old_tclient->no_buff_discard, estats->mac_discard,
                       estats->mac_filter_discard, estats->xxoverflow_discard,
-                      estats->brb_truncate_discard, estats->ttl0_discard);
+                      estats->brb_truncate_discard,
+                      old_tclient->ttl0_discard);
 
                for_each_queue(bp, i) {
                        printk(KERN_DEBUG "[%d]: %lu\t%lu\t%lu\n", i,
@@ -5148,60 +3805,131 @@ static void bnx2x_update_stats(struct bnx2x *bp)
                }
        }
 
-       if (bp->state != BNX2X_STATE_OPEN) {
-               DP(BNX2X_MSG_STATS, "state is %x, returning\n", bp->state);
-               return;
-       }
-
-#ifdef BNX2X_STOP_ON_ERROR
-       if (unlikely(bp->panic))
-               return;
-#endif
+       bnx2x_hw_stats_post(bp);
+       bnx2x_storm_stats_post(bp);
+}
 
-       /* loader */
-       if (bp->executer_idx) {
-               struct dmae_command *dmae = &bp->dmae;
-               int port = bp->port;
-               int loader_idx = port * 8;
+static void bnx2x_port_stats_stop(struct bnx2x *bp)
+{
+       struct dmae_command *dmae;
+       u32 opcode;
+       int loader_idx = PMF_DMAE_C(bp);
+       u32 *stats_comp = bnx2x_sp(bp, stats_comp);
 
-               memset(dmae, 0, sizeof(struct dmae_command));
+       bp->executer_idx = 0;
 
-               dmae->opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
-                               DMAE_CMD_C_DST_GRC | DMAE_CMD_C_ENABLE |
-                               DMAE_CMD_DST_RESET |
+       opcode = (DMAE_CMD_SRC_PCI | DMAE_CMD_DST_GRC |
+                 DMAE_CMD_C_ENABLE |
+                 DMAE_CMD_SRC_RESET | DMAE_CMD_DST_RESET |
 #ifdef __BIG_ENDIAN
-                               DMAE_CMD_ENDIANITY_B_DW_SWAP |
+                 DMAE_CMD_ENDIANITY_B_DW_SWAP |
 #else
-                               DMAE_CMD_ENDIANITY_DW_SWAP |
+                 DMAE_CMD_ENDIANITY_DW_SWAP |
 #endif
-                               (port ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0));
-               dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, dmae[0]));
-               dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, dmae[0]));
-               dmae->dst_addr_lo = (DMAE_REG_CMD_MEM +
-                                    sizeof(struct dmae_command) *
-                                    (loader_idx + 1)) >> 2;
+                 (BP_PORT(bp) ? DMAE_CMD_PORT_1 : DMAE_CMD_PORT_0) |
+                 (BP_E1HVN(bp) << DMAE_CMD_E1HVN_SHIFT));
+
+       if (bp->port.port_stx) {
+
+               dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+               if (bp->func_stx)
+                       dmae->opcode = (opcode | DMAE_CMD_C_DST_GRC);
+               else
+                       dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
+               dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, port_stats));
+               dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, port_stats));
+               dmae->dst_addr_lo = bp->port.port_stx >> 2;
                dmae->dst_addr_hi = 0;
-               dmae->len = sizeof(struct dmae_command) >> 2;
-               dmae->len--;    /* !!! for A0/1 only */
-               dmae->comp_addr_lo = dmae_reg_go_c[loader_idx + 1] >> 2;
-               dmae->comp_addr_hi = 0;
-               dmae->comp_val = 1;
+               dmae->len = sizeof(struct host_port_stats) >> 2;
+               if (bp->func_stx) {
+                       dmae->comp_addr_lo = dmae_reg_go_c[loader_idx] >> 2;
+                       dmae->comp_addr_hi = 0;
+                       dmae->comp_val = 1;
+               } else {
+                       dmae->comp_addr_lo =
+                               U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+                       dmae->comp_addr_hi =
+                               U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+                       dmae->comp_val = DMAE_COMP_VAL;
 
-               bnx2x_post_dmae(bp, dmae, loader_idx);
+                       *stats_comp = 0;
+               }
        }
 
-       if (bp->stats_state != STATS_STATE_ENABLE) {
-               bp->stats_state = STATS_STATE_DISABLE;
-               return;
+       if (bp->func_stx) {
+
+               dmae = bnx2x_sp(bp, dmae[bp->executer_idx++]);
+               dmae->opcode = (opcode | DMAE_CMD_C_DST_PCI);
+               dmae->src_addr_lo = U64_LO(bnx2x_sp_mapping(bp, func_stats));
+               dmae->src_addr_hi = U64_HI(bnx2x_sp_mapping(bp, func_stats));
+               dmae->dst_addr_lo = bp->func_stx >> 2;
+               dmae->dst_addr_hi = 0;
+               dmae->len = sizeof(struct host_func_stats) >> 2;
+               dmae->comp_addr_lo = U64_LO(bnx2x_sp_mapping(bp, stats_comp));
+               dmae->comp_addr_hi = U64_HI(bnx2x_sp_mapping(bp, stats_comp));
+               dmae->comp_val = DMAE_COMP_VAL;
+
+               *stats_comp = 0;
        }
+}
+
+static void bnx2x_stats_stop(struct bnx2x *bp)
+{
+       int update = 0;
+
+       bnx2x_stats_comp(bp);
+
+       if (bp->port.pmf)
+               update = (bnx2x_hw_stats_update(bp) == 0);
+
+       update |= (bnx2x_storm_stats_update(bp) == 0);
 
-       if (bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_STAT_QUERY, 0, 0, 0, 0) == 0) {
-               /* stats ramrod has it's own slot on the spe */
-               bp->spq_left++;
-               bp->stat_pending = 1;
+       if (update) {
+               bnx2x_net_stats_update(bp);
+
+               if (bp->port.pmf)
+                       bnx2x_port_stats_stop(bp);
+
+               bnx2x_hw_stats_post(bp);
+               bnx2x_stats_comp(bp);
        }
 }
 
+static void bnx2x_stats_do_nothing(struct bnx2x *bp)
+{
+}
+
+static const struct {
+       void (*action)(struct bnx2x *bp);
+       enum bnx2x_stats_state next_state;
+} bnx2x_stats_stm[STATS_STATE_MAX][STATS_EVENT_MAX] = {
+/* state       event   */
+{
+/* DISABLED    PMF     */ {bnx2x_stats_pmf_update, STATS_STATE_DISABLED},
+/*             LINK_UP */ {bnx2x_stats_start,      STATS_STATE_ENABLED},
+/*             UPDATE  */ {bnx2x_stats_do_nothing, STATS_STATE_DISABLED},
+/*             STOP    */ {bnx2x_stats_do_nothing, STATS_STATE_DISABLED}
+},
+{
+/* ENABLED     PMF     */ {bnx2x_stats_pmf_start,  STATS_STATE_ENABLED},
+/*             LINK_UP */ {bnx2x_stats_restart,    STATS_STATE_ENABLED},
+/*             UPDATE  */ {bnx2x_stats_update,     STATS_STATE_ENABLED},
+/*             STOP    */ {bnx2x_stats_stop,       STATS_STATE_DISABLED}
+}
+};
+
+static void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event)
+{
+       enum bnx2x_stats_state state = bp->stats_state;
+
+       bnx2x_stats_stm[state][event].action(bp);
+       bp->stats_state = bnx2x_stats_stm[state][event].next_state;
+
+       if ((event != STATS_EVENT_UPDATE) || (bp->msglevel & NETIF_MSG_TIMER))
+               DP(BNX2X_MSG_STATS, "state %d -> event %d -> state %d\n",
+                  state, event, bp->stats_state);
+}
+
 static void bnx2x_timer(unsigned long data)
 {
        struct bnx2x *bp = (struct bnx2x *) data;
@@ -5220,8 +3948,8 @@ static void bnx2x_timer(unsigned long data)
                rc = bnx2x_rx_int(fp, 1000);
        }
 
-       if (!nomcp) {
-               int port = bp->port;
+       if (!BP_NOMCP(bp)) {
+               int func = BP_FUNC(bp);
                u32 drv_pulse;
                u32 mcp_pulse;
 
@@ -5229,9 +3957,9 @@ static void bnx2x_timer(unsigned long data)
                bp->fw_drv_pulse_wr_seq &= DRV_PULSE_SEQ_MASK;
                /* TBD - add SYSTEM_TIME */
                drv_pulse = bp->fw_drv_pulse_wr_seq;
-               SHMEM_WR(bp, func_mb[port].drv_pulse_mb, drv_pulse);
+               SHMEM_WR(bp, func_mb[func].drv_pulse_mb, drv_pulse);
 
-               mcp_pulse = (SHMEM_RD(bp, func_mb[port].mcp_pulse_mb) &
+               mcp_pulse = (SHMEM_RD(bp, func_mb[func].mcp_pulse_mb) &
                             MCP_PULSE_SEQ_MASK);
                /* The delta between driver pulse and mcp response
                 * should be 1 (before mcp response) or 0 (after mcp response)
@@ -5244,10 +3972,9 @@ static void bnx2x_timer(unsigned long data)
                }
        }
 
-       if (bp->stats_state == STATS_STATE_DISABLE)
-               goto timer_restart;
-
-       bnx2x_update_stats(bp);
+       if ((bp->state == BNX2X_STATE_OPEN) ||
+           (bp->state == BNX2X_STATE_DISABLED))
+               bnx2x_stats_handle(bp, STATS_EVENT_UPDATE);
 
 timer_restart:
        mod_timer(&bp->timer, jiffies + bp->current_interval);
@@ -5261,58 +3988,94 @@ timer_restart:
  * nic init service functions
  */
 
-static void bnx2x_init_sb(struct bnx2x *bp, struct host_status_block *sb,
-                         dma_addr_t mapping, int id)
+static void bnx2x_zero_sb(struct bnx2x *bp, int sb_id)
 {
-       int port = bp->port;
-       u64 section;
+       int port = BP_PORT(bp);
+
+       bnx2x_init_fill(bp, BAR_USTRORM_INTMEM +
+                       USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0,
+                       sizeof(struct ustorm_def_status_block)/4);
+       bnx2x_init_fill(bp, BAR_CSTRORM_INTMEM +
+                       CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), 0,
+                       sizeof(struct cstorm_def_status_block)/4);
+}
+
+static void bnx2x_init_sb(struct bnx2x *bp, int sb_id,
+                         struct host_status_block *sb, dma_addr_t mapping)
+{
+       int port = BP_PORT(bp);
+       int func = BP_FUNC(bp);
        int index;
+       u64 section;
 
        /* USTORM */
        section = ((u64)mapping) + offsetof(struct host_status_block,
                                            u_status_block);
-       sb->u_status_block.status_block_id = id;
+       sb->u_status_block.status_block_id = sb_id;
 
        REG_WR(bp, BAR_USTRORM_INTMEM +
-              USTORM_SB_HOST_SB_ADDR_OFFSET(port, id), U64_LO(section));
+              USTORM_SB_HOST_SB_ADDR_OFFSET(port, sb_id), U64_LO(section));
        REG_WR(bp, BAR_USTRORM_INTMEM +
-              ((USTORM_SB_HOST_SB_ADDR_OFFSET(port, id)) + 4),
+              ((USTORM_SB_HOST_SB_ADDR_OFFSET(port, sb_id)) + 4),
               U64_HI(section));
+       REG_WR8(bp, BAR_USTRORM_INTMEM + FP_USB_FUNC_OFF +
+               USTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), func);
 
        for (index = 0; index < HC_USTORM_SB_NUM_INDICES; index++)
                REG_WR16(bp, BAR_USTRORM_INTMEM +
-                        USTORM_SB_HC_DISABLE_OFFSET(port, id, index), 0x1);
+                        USTORM_SB_HC_DISABLE_OFFSET(port, sb_id, index), 1);
 
        /* CSTORM */
        section = ((u64)mapping) + offsetof(struct host_status_block,
                                            c_status_block);
-       sb->c_status_block.status_block_id = id;
+       sb->c_status_block.status_block_id = sb_id;
 
        REG_WR(bp, BAR_CSTRORM_INTMEM +
-              CSTORM_SB_HOST_SB_ADDR_OFFSET(port, id), U64_LO(section));
+              CSTORM_SB_HOST_SB_ADDR_OFFSET(port, sb_id), U64_LO(section));
        REG_WR(bp, BAR_CSTRORM_INTMEM +
-              ((CSTORM_SB_HOST_SB_ADDR_OFFSET(port, id)) + 4),
+              ((CSTORM_SB_HOST_SB_ADDR_OFFSET(port, sb_id)) + 4),
               U64_HI(section));
+       REG_WR8(bp, BAR_CSTRORM_INTMEM + FP_CSB_FUNC_OFF +
+               CSTORM_SB_HOST_STATUS_BLOCK_OFFSET(port, sb_id), func);
 
        for (index = 0; index < HC_CSTORM_SB_NUM_INDICES; index++)
                REG_WR16(bp, BAR_CSTRORM_INTMEM +
-                        CSTORM_SB_HC_DISABLE_OFFSET(port, id, index), 0x1);
+                        CSTORM_SB_HC_DISABLE_OFFSET(port, sb_id, index), 1);
+
+       bnx2x_ack_sb(bp, sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
+}
+
+static void bnx2x_zero_def_sb(struct bnx2x *bp)
+{
+       int func = BP_FUNC(bp);
 
-       bnx2x_ack_sb(bp, id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
+       bnx2x_init_fill(bp, BAR_USTRORM_INTMEM +
+                       USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
+                       sizeof(struct ustorm_def_status_block)/4);
+       bnx2x_init_fill(bp, BAR_CSTRORM_INTMEM +
+                       CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
+                       sizeof(struct cstorm_def_status_block)/4);
+       bnx2x_init_fill(bp, BAR_XSTRORM_INTMEM +
+                       XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
+                       sizeof(struct xstorm_def_status_block)/4);
+       bnx2x_init_fill(bp, BAR_TSTRORM_INTMEM +
+                       TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), 0,
+                       sizeof(struct tstorm_def_status_block)/4);
 }
 
 static void bnx2x_init_def_sb(struct bnx2x *bp,
                              struct host_def_status_block *def_sb,
-                             dma_addr_t mapping, int id)
+                             dma_addr_t mapping, int sb_id)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
+       int func = BP_FUNC(bp);
        int index, val, reg_offset;
        u64 section;
 
        /* ATTN */
        section = ((u64)mapping) + offsetof(struct host_def_status_block,
                                            atten_status_block);
-       def_sb->atten_status_block.status_block_id = id;
+       def_sb->atten_status_block.status_block_id = sb_id;
 
        bp->def_att_idx = 0;
        bp->attn_state = 0;
@@ -5320,7 +4083,7 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,
        reg_offset = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
                             MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0);
 
-       for (index = 0; index < 3; index++) {
+       for (index = 0; index < MAX_DYNAMIC_ATTN_GRPS; index++) {
                bp->attn_group[index].sig[0] = REG_RD(bp,
                                                     reg_offset + 0x10*index);
                bp->attn_group[index].sig[1] = REG_RD(bp,
@@ -5343,149 +4106,229 @@ static void bnx2x_init_def_sb(struct bnx2x *bp,
        reg_offset = (port ? HC_REG_ATTN_NUM_P1 : HC_REG_ATTN_NUM_P0);
 
        val = REG_RD(bp, reg_offset);
-       val |= id;
+       val |= sb_id;
        REG_WR(bp, reg_offset, val);
 
        /* USTORM */
        section = ((u64)mapping) + offsetof(struct host_def_status_block,
                                            u_def_status_block);
-       def_sb->u_def_status_block.status_block_id = id;
+       def_sb->u_def_status_block.status_block_id = sb_id;
 
        bp->def_u_idx = 0;
 
        REG_WR(bp, BAR_USTRORM_INTMEM +
-              USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port), U64_LO(section));
+              USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));
        REG_WR(bp, BAR_USTRORM_INTMEM +
-              ((USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port)) + 4),
+              ((USTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),
               U64_HI(section));
-       REG_WR(bp, BAR_USTRORM_INTMEM + USTORM_HC_BTR_OFFSET(port),
+       REG_WR8(bp, BAR_USTRORM_INTMEM +  DEF_USB_FUNC_OFF +
+               USTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);
+       REG_WR(bp, BAR_USTRORM_INTMEM + USTORM_HC_BTR_OFFSET(func),
               BNX2X_BTR);
 
        for (index = 0; index < HC_USTORM_DEF_SB_NUM_INDICES; index++)
                REG_WR16(bp, BAR_USTRORM_INTMEM +
-                        USTORM_DEF_SB_HC_DISABLE_OFFSET(port, index), 0x1);
+                        USTORM_DEF_SB_HC_DISABLE_OFFSET(func, index), 1);
 
        /* CSTORM */
        section = ((u64)mapping) + offsetof(struct host_def_status_block,
                                            c_def_status_block);
-       def_sb->c_def_status_block.status_block_id = id;
+       def_sb->c_def_status_block.status_block_id = sb_id;
 
        bp->def_c_idx = 0;
 
        REG_WR(bp, BAR_CSTRORM_INTMEM +
-              CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port), U64_LO(section));
+              CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));
        REG_WR(bp, BAR_CSTRORM_INTMEM +
-              ((CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port)) + 4),
+              ((CSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),
               U64_HI(section));
-       REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_HC_BTR_OFFSET(port),
+       REG_WR8(bp, BAR_CSTRORM_INTMEM +  DEF_CSB_FUNC_OFF +
+               CSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);
+       REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_HC_BTR_OFFSET(func),
               BNX2X_BTR);
 
        for (index = 0; index < HC_CSTORM_DEF_SB_NUM_INDICES; index++)
                REG_WR16(bp, BAR_CSTRORM_INTMEM +
-                        CSTORM_DEF_SB_HC_DISABLE_OFFSET(port, index), 0x1);
+                        CSTORM_DEF_SB_HC_DISABLE_OFFSET(func, index), 1);
 
        /* TSTORM */
        section = ((u64)mapping) + offsetof(struct host_def_status_block,
                                            t_def_status_block);
-       def_sb->t_def_status_block.status_block_id = id;
+       def_sb->t_def_status_block.status_block_id = sb_id;
 
        bp->def_t_idx = 0;
 
        REG_WR(bp, BAR_TSTRORM_INTMEM +
-              TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port), U64_LO(section));
+              TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));
        REG_WR(bp, BAR_TSTRORM_INTMEM +
-              ((TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port)) + 4),
+              ((TSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),
               U64_HI(section));
-       REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_HC_BTR_OFFSET(port),
+       REG_WR8(bp, BAR_TSTRORM_INTMEM +  DEF_TSB_FUNC_OFF +
+               TSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);
+       REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_HC_BTR_OFFSET(func),
               BNX2X_BTR);
 
        for (index = 0; index < HC_TSTORM_DEF_SB_NUM_INDICES; index++)
                REG_WR16(bp, BAR_TSTRORM_INTMEM +
-                        TSTORM_DEF_SB_HC_DISABLE_OFFSET(port, index), 0x1);
+                        TSTORM_DEF_SB_HC_DISABLE_OFFSET(func, index), 1);
 
        /* XSTORM */
        section = ((u64)mapping) + offsetof(struct host_def_status_block,
                                            x_def_status_block);
-       def_sb->x_def_status_block.status_block_id = id;
+       def_sb->x_def_status_block.status_block_id = sb_id;
 
        bp->def_x_idx = 0;
 
        REG_WR(bp, BAR_XSTRORM_INTMEM +
-              XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port), U64_LO(section));
+              XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func), U64_LO(section));
        REG_WR(bp, BAR_XSTRORM_INTMEM +
-              ((XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(port)) + 4),
+              ((XSTORM_DEF_SB_HOST_SB_ADDR_OFFSET(func)) + 4),
               U64_HI(section));
-       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_HC_BTR_OFFSET(port),
+       REG_WR8(bp, BAR_XSTRORM_INTMEM +  DEF_XSB_FUNC_OFF +
+               XSTORM_DEF_SB_HOST_STATUS_BLOCK_OFFSET(func), func);
+       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_HC_BTR_OFFSET(func),
               BNX2X_BTR);
 
        for (index = 0; index < HC_XSTORM_DEF_SB_NUM_INDICES; index++)
                REG_WR16(bp, BAR_XSTRORM_INTMEM +
-                        XSTORM_DEF_SB_HC_DISABLE_OFFSET(port, index), 0x1);
+                        XSTORM_DEF_SB_HC_DISABLE_OFFSET(func, index), 1);
 
-       bp->stat_pending = 0;
+       bp->stats_pending = 0;
 
-       bnx2x_ack_sb(bp, id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
+       bnx2x_ack_sb(bp, sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
 }
 
 static void bnx2x_update_coalesce(struct bnx2x *bp)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
        int i;
 
        for_each_queue(bp, i) {
+               int sb_id = bp->fp[i].sb_id;
 
                /* HC_INDEX_U_ETH_RX_CQ_CONS */
                REG_WR8(bp, BAR_USTRORM_INTMEM +
-                       USTORM_SB_HC_TIMEOUT_OFFSET(port, i,
+                       USTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id,
                                                   HC_INDEX_U_ETH_RX_CQ_CONS),
-                       bp->rx_ticks_int/12);
+                       bp->rx_ticks/12);
                REG_WR16(bp, BAR_USTRORM_INTMEM +
-                        USTORM_SB_HC_DISABLE_OFFSET(port, i,
+                        USTORM_SB_HC_DISABLE_OFFSET(port, sb_id,
                                                   HC_INDEX_U_ETH_RX_CQ_CONS),
-                        bp->rx_ticks_int ? 0 : 1);
+                        bp->rx_ticks ? 0 : 1);
 
                /* HC_INDEX_C_ETH_TX_CQ_CONS */
                REG_WR8(bp, BAR_CSTRORM_INTMEM +
-                       CSTORM_SB_HC_TIMEOUT_OFFSET(port, i,
+                       CSTORM_SB_HC_TIMEOUT_OFFSET(port, sb_id,
                                                   HC_INDEX_C_ETH_TX_CQ_CONS),
-                       bp->tx_ticks_int/12);
+                       bp->tx_ticks/12);
                REG_WR16(bp, BAR_CSTRORM_INTMEM +
-                        CSTORM_SB_HC_DISABLE_OFFSET(port, i,
+                        CSTORM_SB_HC_DISABLE_OFFSET(port, sb_id,
                                                   HC_INDEX_C_ETH_TX_CQ_CONS),
-                        bp->tx_ticks_int ? 0 : 1);
+                        bp->tx_ticks ? 0 : 1);
+       }
+}
+
+static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
+                                      struct bnx2x_fastpath *fp, int last)
+{
+       int i;
+
+       for (i = 0; i < last; i++) {
+               struct sw_rx_bd *rx_buf = &(fp->tpa_pool[i]);
+               struct sk_buff *skb = rx_buf->skb;
+
+               if (skb == NULL) {
+                       DP(NETIF_MSG_IFDOWN, "tpa bin %d empty on free\n", i);
+                       continue;
+               }
+
+               if (fp->tpa_state[i] == BNX2X_TPA_START)
+                       pci_unmap_single(bp->pdev,
+                                        pci_unmap_addr(rx_buf, mapping),
+                                        bp->rx_buf_use_size,
+                                        PCI_DMA_FROMDEVICE);
+
+               dev_kfree_skb(skb);
+               rx_buf->skb = NULL;
        }
 }
 
 static void bnx2x_init_rx_rings(struct bnx2x *bp)
 {
-       u16 ring_prod;
+       int func = BP_FUNC(bp);
+       u16 ring_prod, cqe_ring_prod = 0;
        int i, j;
-       int port = bp->port;
 
        bp->rx_buf_use_size = bp->dev->mtu;
-
        bp->rx_buf_use_size += bp->rx_offset + ETH_OVREHEAD;
        bp->rx_buf_size = bp->rx_buf_use_size + 64;
 
+       if (bp->flags & TPA_ENABLE_FLAG) {
+               DP(NETIF_MSG_IFUP,
+                  "rx_buf_use_size %d  rx_buf_size %d  effective_mtu %d\n",
+                  bp->rx_buf_use_size, bp->rx_buf_size,
+                  bp->dev->mtu + ETH_OVREHEAD);
+
+               for_each_queue(bp, j) {
+                       for (i = 0; i < ETH_MAX_AGGREGATION_QUEUES_E1H; i++) {
+                               struct bnx2x_fastpath *fp = &bp->fp[j];
+
+                               fp->tpa_pool[i].skb =
+                                  netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+                               if (!fp->tpa_pool[i].skb) {
+                                       BNX2X_ERR("Failed to allocate TPA "
+                                                 "skb pool for queue[%d] - "
+                                                 "disabling TPA on this "
+                                                 "queue!\n", j);
+                                       bnx2x_free_tpa_pool(bp, fp, i);
+                                       fp->disable_tpa = 1;
+                                       break;
+                               }
+                               pci_unmap_addr_set((struct sw_rx_bd *)
+                                                       &bp->fp->tpa_pool[i],
+                                                  mapping, 0);
+                               fp->tpa_state[i] = BNX2X_TPA_STOP;
+                       }
+               }
+       }
+
        for_each_queue(bp, j) {
                struct bnx2x_fastpath *fp = &bp->fp[j];
 
                fp->rx_bd_cons = 0;
                fp->rx_cons_sb = BNX2X_RX_SB_INDEX;
+               fp->rx_bd_cons_sb = BNX2X_RX_SB_BD_INDEX;
+
+               /* "next page" elements initialization */
+               /* SGE ring */
+               for (i = 1; i <= NUM_RX_SGE_PAGES; i++) {
+                       struct eth_rx_sge *sge;
+
+                       sge = &fp->rx_sge_ring[RX_SGE_CNT * i - 2];
+                       sge->addr_hi =
+                               cpu_to_le32(U64_HI(fp->rx_sge_mapping +
+                                       BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
+                       sge->addr_lo =
+                               cpu_to_le32(U64_LO(fp->rx_sge_mapping +
+                                       BCM_PAGE_SIZE*(i % NUM_RX_SGE_PAGES)));
+               }
+
+               bnx2x_init_sge_ring_bit_mask(fp);
 
+               /* RX BD ring */
                for (i = 1; i <= NUM_RX_RINGS; i++) {
                        struct eth_rx_bd *rx_bd;
 
                        rx_bd = &fp->rx_desc_ring[RX_DESC_CNT * i - 2];
                        rx_bd->addr_hi =
                                cpu_to_le32(U64_HI(fp->rx_desc_mapping +
-                                          BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
+                                           BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
                        rx_bd->addr_lo =
                                cpu_to_le32(U64_LO(fp->rx_desc_mapping +
-                                          BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
-
+                                           BCM_PAGE_SIZE*(i % NUM_RX_RINGS)));
                }
 
+               /* CQ ring */
                for (i = 1; i <= NUM_RCQ_RINGS; i++) {
                        struct eth_rx_cqe_next_page *nextpg;
 
@@ -5493,40 +4336,67 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)
                                &fp->rx_comp_ring[RCQ_DESC_CNT * i - 1];
                        nextpg->addr_hi =
                                cpu_to_le32(U64_HI(fp->rx_comp_mapping +
-                                         BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
+                                          BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
                        nextpg->addr_lo =
                                cpu_to_le32(U64_LO(fp->rx_comp_mapping +
-                                         BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
+                                          BCM_PAGE_SIZE*(i % NUM_RCQ_RINGS)));
                }
 
-               /* rx completion queue */
-               fp->rx_comp_cons = ring_prod = 0;
+               /* Allocate SGEs and initialize the ring elements */
+               for (i = 0, ring_prod = 0;
+                    i < MAX_RX_SGE_CNT*NUM_RX_SGE_PAGES; i++) {
+
+                       if (bnx2x_alloc_rx_sge(bp, fp, ring_prod) < 0) {
+                               BNX2X_ERR("was only able to allocate "
+                                         "%d rx sges\n", i);
+                               BNX2X_ERR("disabling TPA for queue[%d]\n", j);
+                               /* Cleanup already allocated elements */
+                               bnx2x_free_rx_sge_range(bp, fp, ring_prod);
+                               bnx2x_free_tpa_pool(bp, fp,
+                                             ETH_MAX_AGGREGATION_QUEUES_E1H);
+                               fp->disable_tpa = 1;
+                               ring_prod = 0;
+                               break;
+                       }
+                       ring_prod = NEXT_SGE_IDX(ring_prod);
+               }
+               fp->rx_sge_prod = ring_prod;
 
+               /* Allocate BDs and initialize BD ring */
+               fp->rx_comp_cons = fp->rx_alloc_failed = 0;
+               cqe_ring_prod = ring_prod = 0;
                for (i = 0; i < bp->rx_ring_size; i++) {
                        if (bnx2x_alloc_rx_skb(bp, fp, ring_prod) < 0) {
                                BNX2X_ERR("was only able to allocate "
                                          "%d rx skbs\n", i);
+                               fp->rx_alloc_failed++;
                                break;
                        }
                        ring_prod = NEXT_RX_IDX(ring_prod);
-                       BUG_TRAP(ring_prod > i);
+                       cqe_ring_prod = NEXT_RCQ_IDX(cqe_ring_prod);
+                       WARN_ON(ring_prod <= i);
                }
 
-               fp->rx_bd_prod = fp->rx_comp_prod = ring_prod;
+               fp->rx_bd_prod = ring_prod;
+               /* must not have more available CQEs than BDs */
+               fp->rx_comp_prod = min((u16)(NUM_RCQ_RINGS*RCQ_DESC_CNT),
+                                      cqe_ring_prod);
                fp->rx_pkt = fp->rx_calls = 0;
 
-               /* Warning! this will generate an interrupt (to the TSTORM) */
-               /* must only be done when chip is initialized */
-               REG_WR(bp, BAR_TSTRORM_INTMEM +
-                      TSTORM_RCQ_PROD_OFFSET(port, j), ring_prod);
+               /* Warning!
+                * this will generate an interrupt (to the TSTORM)
+                * must only be done after chip is initialized
+                */
+               bnx2x_update_rx_prod(bp, fp, ring_prod, fp->rx_comp_prod,
+                                    fp->rx_sge_prod);
                if (j != 0)
                        continue;
 
                REG_WR(bp, BAR_USTRORM_INTMEM +
-                      USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(port),
+                      USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(func),
                       U64_LO(fp->rx_comp_mapping));
                REG_WR(bp, BAR_USTRORM_INTMEM +
-                      USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(port) + 4,
+                      USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(func) + 4,
                       U64_HI(fp->rx_comp_mapping));
        }
 }
@@ -5544,10 +4414,10 @@ static void bnx2x_init_tx_ring(struct bnx2x *bp)
 
                        tx_bd->addr_hi =
                                cpu_to_le32(U64_HI(fp->tx_desc_mapping +
-                                          BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
+                                           BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
                        tx_bd->addr_lo =
                                cpu_to_le32(U64_LO(fp->tx_desc_mapping +
-                                          BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
+                                           BCM_PAGE_SIZE*(i % NUM_TX_RINGS)));
                }
 
                fp->tx_pkt_prod = 0;
@@ -5561,7 +4431,7 @@ static void bnx2x_init_tx_ring(struct bnx2x *bp)
 
 static void bnx2x_init_sp_ring(struct bnx2x *bp)
 {
-       int port = bp->port;
+       int func = BP_FUNC(bp);
 
        spin_lock_init(&bp->spq_lock);
 
@@ -5571,12 +4441,13 @@ static void bnx2x_init_sp_ring(struct bnx2x *bp)
        bp->spq_prod_bd = bp->spq;
        bp->spq_last_bd = bp->spq_prod_bd + MAX_SP_DESC_CNT;
 
-       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PAGE_BASE_OFFSET(port),
+       REG_WR(bp, XSEM_REG_FAST_MEMORY + XSTORM_SPQ_PAGE_BASE_OFFSET(func),
               U64_LO(bp->spq_mapping));
-       REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PAGE_BASE_OFFSET(port) + 4,
+       REG_WR(bp,
+              XSEM_REG_FAST_MEMORY + XSTORM_SPQ_PAGE_BASE_OFFSET(func) + 4,
               U64_HI(bp->spq_mapping));
 
-       REG_WR(bp, XSEM_REG_FAST_MEMORY + XSTORM_SPQ_PROD_OFFSET(port),
+       REG_WR(bp, XSEM_REG_FAST_MEMORY + XSTORM_SPQ_PROD_OFFSET(func),
               bp->spq_prod_idx);
 }
 
@@ -5587,6 +4458,7 @@ static void bnx2x_init_context(struct bnx2x *bp)
        for_each_queue(bp, i) {
                struct eth_context *context = bnx2x_sp(bp, context[i].eth);
                struct bnx2x_fastpath *fp = &bp->fp[i];
+               u8 sb_id = FP_SB_ID(fp);
 
                context->xstorm_st_context.tx_bd_page_base_hi =
                                                U64_HI(fp->tx_desc_mapping);
@@ -5596,26 +4468,37 @@ static void bnx2x_init_context(struct bnx2x *bp)
                                                U64_HI(fp->tx_prods_mapping);
                context->xstorm_st_context.db_data_addr_lo =
                                                U64_LO(fp->tx_prods_mapping);
-
-               context->ustorm_st_context.rx_bd_page_base_hi =
+               context->xstorm_st_context.statistics_data = (BP_CL_ID(bp) |
+                               XSTORM_ETH_ST_CONTEXT_STATISTICS_ENABLE);
+
+               context->ustorm_st_context.common.sb_index_numbers =
+                                               BNX2X_RX_SB_INDEX_NUM;
+               context->ustorm_st_context.common.clientId = FP_CL_ID(fp);
+               context->ustorm_st_context.common.status_block_id = sb_id;
+               context->ustorm_st_context.common.flags =
+                       USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_MC_ALIGNMENT;
+               context->ustorm_st_context.common.mc_alignment_size = 64;
+               context->ustorm_st_context.common.bd_buff_size =
+                                               bp->rx_buf_use_size;
+               context->ustorm_st_context.common.bd_page_base_hi =
                                                U64_HI(fp->rx_desc_mapping);
-               context->ustorm_st_context.rx_bd_page_base_lo =
+               context->ustorm_st_context.common.bd_page_base_lo =
                                                U64_LO(fp->rx_desc_mapping);
-               context->ustorm_st_context.status_block_id = i;
-               context->ustorm_st_context.sb_index_number =
-                                               HC_INDEX_U_ETH_RX_CQ_CONS;
-               context->ustorm_st_context.rcq_base_address_hi =
-                                               U64_HI(fp->rx_comp_mapping);
-               context->ustorm_st_context.rcq_base_address_lo =
-                                               U64_LO(fp->rx_comp_mapping);
-               context->ustorm_st_context.flags =
-                               USTORM_ETH_ST_CONTEXT_ENABLE_MC_ALIGNMENT;
-               context->ustorm_st_context.mc_alignment_size = 64;
-               context->ustorm_st_context.num_rss = bp->num_queues;
+               if (!fp->disable_tpa) {
+                       context->ustorm_st_context.common.flags |=
+                               (USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_TPA |
+                                USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_SGE_RING);
+                       context->ustorm_st_context.common.sge_buff_size =
+                                       (u16)(BCM_PAGE_SIZE*PAGES_PER_SGE);
+                       context->ustorm_st_context.common.sge_page_base_hi =
+                                               U64_HI(fp->rx_sge_mapping);
+                       context->ustorm_st_context.common.sge_page_base_lo =
+                                               U64_LO(fp->rx_sge_mapping);
+               }
 
                context->cstorm_st_context.sb_index_number =
                                                HC_INDEX_C_ETH_TX_CQ_CONS;
-               context->cstorm_st_context.status_block_id = i;
+               context->cstorm_st_context.status_block_id = sb_id;
 
                context->xstorm_ag_context.cdu_reserved =
                        CDU_RSRVD_VALUE_TYPE_A(HW_CID(bp, i),
@@ -5630,14 +4513,16 @@ static void bnx2x_init_context(struct bnx2x *bp)
 
 static void bnx2x_init_ind_table(struct bnx2x *bp)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
        int i;
 
        if (!is_multi(bp))
                return;
 
+       DP(NETIF_MSG_IFUP, "Initializing indirection table\n");
        for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
-               REG_WR8(bp, TSTORM_INDIRECTION_TABLE_OFFSET(port) + i,
+               REG_WR8(bp, BAR_TSTRORM_INTMEM +
+                       TSTORM_INDIRECTION_TABLE_OFFSET(port) + i,
                        i % bp->num_queues);
 
        REG_WR(bp, PRS_REG_A_PRSU_20, 0xf);
@@ -5645,77 +4530,86 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
 
 static void bnx2x_set_client_config(struct bnx2x *bp)
 {
-#ifdef BCM_VLAN
-       int mode = bp->rx_mode;
-#endif
-       int i, port = bp->port;
        struct tstorm_eth_client_config tstorm_client = {0};
+       int port = BP_PORT(bp);
+       int i;
 
-       tstorm_client.mtu = bp->dev->mtu;
+       tstorm_client.mtu = bp->dev->mtu + ETH_OVREHEAD;
        tstorm_client.statistics_counter_id = 0;
        tstorm_client.config_flags =
                                TSTORM_ETH_CLIENT_CONFIG_STATSITICS_ENABLE;
 #ifdef BCM_VLAN
-       if (mode && bp->vlgrp) {
+       if (bp->rx_mode && bp->vlgrp) {
                tstorm_client.config_flags |=
                                TSTORM_ETH_CLIENT_CONFIG_VLAN_REMOVAL_ENABLE;
                DP(NETIF_MSG_IFUP, "vlan removal enabled\n");
        }
 #endif
-       if (mode != BNX2X_RX_MODE_PROMISC)
-               tstorm_client.drop_flags =
-                               TSTORM_ETH_CLIENT_CONFIG_DROP_MAC_ERR;
+
+       if (bp->flags & TPA_ENABLE_FLAG) {
+               tstorm_client.max_sges_for_packet =
+                       BCM_PAGE_ALIGN(tstorm_client.mtu) >> BCM_PAGE_SHIFT;
+               tstorm_client.max_sges_for_packet =
+                       ((tstorm_client.max_sges_for_packet +
+                         PAGES_PER_SGE - 1) & (~(PAGES_PER_SGE - 1))) >>
+                       PAGES_PER_SGE_SHIFT;
+
+               tstorm_client.config_flags |=
+                               TSTORM_ETH_CLIENT_CONFIG_ENABLE_SGE_RING;
+       }
 
        for_each_queue(bp, i) {
                REG_WR(bp, BAR_TSTRORM_INTMEM +
-                      TSTORM_CLIENT_CONFIG_OFFSET(port, i),
+                      TSTORM_CLIENT_CONFIG_OFFSET(port, bp->fp[i].cl_id),
                       ((u32 *)&tstorm_client)[0]);
                REG_WR(bp, BAR_TSTRORM_INTMEM +
-                      TSTORM_CLIENT_CONFIG_OFFSET(port, i) + 4,
+                      TSTORM_CLIENT_CONFIG_OFFSET(port, bp->fp[i].cl_id) + 4,
                       ((u32 *)&tstorm_client)[1]);
        }
 
-/*     DP(NETIF_MSG_IFUP, "tstorm_client: 0x%08x 0x%08x\n",
-          ((u32 *)&tstorm_client)[0], ((u32 *)&tstorm_client)[1]); */
+       DP(BNX2X_MSG_OFF, "tstorm_client: 0x%08x 0x%08x\n",
+          ((u32 *)&tstorm_client)[0], ((u32 *)&tstorm_client)[1]);
 }
 
 static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
 {
-       int mode = bp->rx_mode;
-       int port = bp->port;
        struct tstorm_eth_mac_filter_config tstorm_mac_filter = {0};
+       int mode = bp->rx_mode;
+       int mask = (1 << BP_L_ID(bp));
+       int func = BP_FUNC(bp);
        int i;
 
        DP(NETIF_MSG_RX_STATUS, "rx mode is %d\n", mode);
 
        switch (mode) {
        case BNX2X_RX_MODE_NONE: /* no Rx */
-               tstorm_mac_filter.ucast_drop_all = 1;
-               tstorm_mac_filter.mcast_drop_all = 1;
-               tstorm_mac_filter.bcast_drop_all = 1;
+               tstorm_mac_filter.ucast_drop_all = mask;
+               tstorm_mac_filter.mcast_drop_all = mask;
+               tstorm_mac_filter.bcast_drop_all = mask;
                break;
        case BNX2X_RX_MODE_NORMAL:
-               tstorm_mac_filter.bcast_accept_all = 1;
+               tstorm_mac_filter.bcast_accept_all = mask;
                break;
        case BNX2X_RX_MODE_ALLMULTI:
-               tstorm_mac_filter.mcast_accept_all = 1;
-               tstorm_mac_filter.bcast_accept_all = 1;
+               tstorm_mac_filter.mcast_accept_all = mask;
+               tstorm_mac_filter.bcast_accept_all = mask;
                break;
        case BNX2X_RX_MODE_PROMISC:
-               tstorm_mac_filter.ucast_accept_all = 1;
-               tstorm_mac_filter.mcast_accept_all = 1;
-               tstorm_mac_filter.bcast_accept_all = 1;
+               tstorm_mac_filter.ucast_accept_all = mask;
+               tstorm_mac_filter.mcast_accept_all = mask;
+               tstorm_mac_filter.bcast_accept_all = mask;
                break;
        default:
-               BNX2X_ERR("bad rx mode (%d)\n", mode);
+               BNX2X_ERR("BAD rx mode (%d)\n", mode);
+               break;
        }
 
        for (i = 0; i < sizeof(struct tstorm_eth_mac_filter_config)/4; i++) {
                REG_WR(bp, BAR_TSTRORM_INTMEM +
-                      TSTORM_MAC_FILTER_CONFIG_OFFSET(port) + i * 4,
+                      TSTORM_MAC_FILTER_CONFIG_OFFSET(func) + i * 4,
                       ((u32 *)&tstorm_mac_filter)[i]);
 
-/*             DP(NETIF_MSG_IFUP, "tstorm_mac_filter[%d]: 0x%08x\n", i,
+/*             DP(NETIF_MSG_IFUP, "tstorm_mac_filter[%d]: 0x%08x\n", i,
                   ((u32 *)&tstorm_mac_filter)[i]); */
        }
 
@@ -5725,26 +4619,30 @@ static void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
 
 static void bnx2x_init_internal(struct bnx2x *bp)
 {
-       int port = bp->port;
        struct tstorm_eth_function_common_config tstorm_config = {0};
        struct stats_indication_flags stats_flags = {0};
+       int port = BP_PORT(bp);
+       int func = BP_FUNC(bp);
+       int i;
 
        if (is_multi(bp)) {
                tstorm_config.config_flags = MULTI_FLAGS;
                tstorm_config.rss_result_mask = MULTI_MASK;
        }
 
+       tstorm_config.leading_client_id = BP_L_ID(bp);
+
        REG_WR(bp, BAR_TSTRORM_INTMEM +
-              TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(port),
+              TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(func),
               (*(u32 *)&tstorm_config));
 
-/*      DP(NETIF_MSG_IFUP, "tstorm_config: 0x%08x\n",
+/*     DP(NETIF_MSG_IFUP, "tstorm_config: 0x%08x\n",
           (*(u32 *)&tstorm_config)); */
 
        bp->rx_mode = BNX2X_RX_MODE_NONE; /* no rx until link is up */
        bnx2x_set_storm_rx_mode(bp);
 
-       stats_flags.collect_eth = cpu_to_le32(1);
+       stats_flags.collect_eth = 1;
 
        REG_WR(bp, BAR_XSTRORM_INTMEM + XSTORM_STATS_FLAGS_OFFSET(port),
               ((u32 *)&stats_flags)[0]);
@@ -5761,8 +4659,47 @@ static void bnx2x_init_internal(struct bnx2x *bp)
        REG_WR(bp, BAR_CSTRORM_INTMEM + CSTORM_STATS_FLAGS_OFFSET(port) + 4,
               ((u32 *)&stats_flags)[1]);
 
-/*      DP(NETIF_MSG_IFUP, "stats_flags: 0x%08x 0x%08x\n",
+/*     DP(NETIF_MSG_IFUP, "stats_flags: 0x%08x 0x%08x\n",
           ((u32 *)&stats_flags)[0], ((u32 *)&stats_flags)[1]); */
+
+       if (CHIP_IS_E1H(bp)) {
+               REG_WR8(bp, BAR_XSTRORM_INTMEM + XSTORM_FUNCTION_MODE_OFFSET,
+                       IS_E1HMF(bp));
+               REG_WR8(bp, BAR_TSTRORM_INTMEM + TSTORM_FUNCTION_MODE_OFFSET,
+                       IS_E1HMF(bp));
+               REG_WR8(bp, BAR_CSTRORM_INTMEM + CSTORM_FUNCTION_MODE_OFFSET,
+                       IS_E1HMF(bp));
+               REG_WR8(bp, BAR_USTRORM_INTMEM + USTORM_FUNCTION_MODE_OFFSET,
+                       IS_E1HMF(bp));
+
+               REG_WR16(bp, BAR_XSTRORM_INTMEM + XSTORM_E1HOV_OFFSET(func),
+                        bp->e1hov);
+       }
+
+       /* Zero this manualy as its initialization is
+          currently missing in the initTool */
+       for (i = 0; i < USTORM_AGG_DATA_SIZE >> 2; i++)
+               REG_WR(bp, BAR_USTRORM_INTMEM +
+                      USTORM_AGG_DATA_OFFSET + 4*i, 0);
+
+       for_each_queue(bp, i) {
+               struct bnx2x_fastpath *fp = &bp->fp[i];
+               u16 max_agg_size;
+
+               REG_WR(bp, BAR_USTRORM_INTMEM +
+                      USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)),
+                      U64_LO(fp->rx_comp_mapping));
+               REG_WR(bp, BAR_USTRORM_INTMEM +
+                      USTORM_CQE_PAGE_BASE_OFFSET(port, FP_CL_ID(fp)) + 4,
+                      U64_HI(fp->rx_comp_mapping));
+
+               max_agg_size = min((u32)(bp->rx_buf_use_size +
+                                        8*BCM_PAGE_SIZE*PAGES_PER_SGE),
+                                  (u32)0xffff);
+               REG_WR16(bp, BAR_USTRORM_INTMEM +
+                        USTORM_MAX_AGG_SIZE_OFFSET(port, FP_CL_ID(fp)),
+                        max_agg_size);
+       }
 }
 
 static void bnx2x_nic_init(struct bnx2x *bp)
@@ -5772,25 +4709,29 @@ static void bnx2x_nic_init(struct bnx2x *bp)
        for_each_queue(bp, i) {
                struct bnx2x_fastpath *fp = &bp->fp[i];
 
+               fp->bp = bp;
                fp->state = BNX2X_FP_STATE_CLOSED;
-               DP(NETIF_MSG_IFUP, "bnx2x_init_sb(%p,%p,%d);\n",
-                  bp, fp->status_blk, i);
                fp->index = i;
-               bnx2x_init_sb(bp, fp->status_blk, fp->status_blk_mapping, i);
+               fp->cl_id = BP_L_ID(bp) + i;
+               fp->sb_id = fp->cl_id;
+               DP(NETIF_MSG_IFUP,
+                  "bnx2x_init_sb(%p,%p) index %d  cl_id %d  sb %d\n",
+                  bp, fp->status_blk, i, FP_CL_ID(fp), FP_SB_ID(fp));
+               bnx2x_init_sb(bp, FP_SB_ID(fp), fp->status_blk,
+                             fp->status_blk_mapping);
        }
 
        bnx2x_init_def_sb(bp, bp->def_status_blk,
-                         bp->def_status_blk_mapping, 0x10);
+                         bp->def_status_blk_mapping, DEF_SB_ID);
        bnx2x_update_coalesce(bp);
        bnx2x_init_rx_rings(bp);
        bnx2x_init_tx_ring(bp);
        bnx2x_init_sp_ring(bp);
        bnx2x_init_context(bp);
        bnx2x_init_internal(bp);
-       bnx2x_init_stats(bp);
+       bnx2x_storm_stats_init(bp);
        bnx2x_init_ind_table(bp);
        bnx2x_int_enable(bp);
-
 }
 
 /* end of nic init */
@@ -5828,7 +4769,7 @@ gunzip_nomem2:
 
 gunzip_nomem1:
        printk(KERN_ERR PFX "%s: Cannot allocate firmware buffer for"
-              " uncompression\n", bp->dev->name);
+              " un-compression\n", bp->dev->name);
        return -ENOMEM;
 }
 
@@ -5856,7 +4797,7 @@ static int bnx2x_gunzip(struct bnx2x *bp, u8 *zbuf, int len)
 
        n = 10;
 
-#define FNAME                          0x8
+#define FNAME                          0x8
 
        if (zbuf[3] & FNAME)
                while ((zbuf[n++] != 0) && (n < len));
@@ -5893,41 +4834,25 @@ static int bnx2x_gunzip(struct bnx2x *bp, u8 *zbuf, int len)
 /* nic load/unload */
 
 /*
- * general service functions
+ * General service functions
  */
 
 /* send a NIG loopback debug packet */
 static void bnx2x_lb_pckt(struct bnx2x *bp)
 {
-#ifdef USE_DMAE
        u32 wb_write[3];
-#endif
 
        /* Ethernet source and destination addresses */
-#ifdef USE_DMAE
        wb_write[0] = 0x55555555;
        wb_write[1] = 0x55555555;
-       wb_write[2] = 0x20;             /* SOP */
+       wb_write[2] = 0x20;             /* SOP */
        REG_WR_DMAE(bp, NIG_REG_DEBUG_PACKET_LB, wb_write, 3);
-#else
-       REG_WR_IND(bp, NIG_REG_DEBUG_PACKET_LB, 0x55555555);
-       REG_WR_IND(bp, NIG_REG_DEBUG_PACKET_LB + 4, 0x55555555);
-       /* SOP */
-       REG_WR_IND(bp, NIG_REG_DEBUG_PACKET_LB + 8, 0x20);
-#endif
 
        /* NON-IP protocol */
-#ifdef USE_DMAE
        wb_write[0] = 0x09000000;
        wb_write[1] = 0x55555555;
-       wb_write[2] = 0x10;             /* EOP, eop_bvalid = 0 */
+       wb_write[2] = 0x10;             /* EOP, eop_bvalid = 0 */
        REG_WR_DMAE(bp, NIG_REG_DEBUG_PACKET_LB, wb_write, 3);
-#else
-       REG_WR_IND(bp, NIG_REG_DEBUG_PACKET_LB, 0x09000000);
-       REG_WR_IND(bp, NIG_REG_DEBUG_PACKET_LB + 4, 0x55555555);
-       /* EOP, eop_bvalid = 0 */
-       REG_WR_IND(bp, NIG_REG_DEBUG_PACKET_LB + 8, 0x10);
-#endif
 }
 
 /* some of the internal memories
@@ -5940,17 +4865,12 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)
        int count, i;
        u32 val = 0;
 
-       switch (CHIP_REV(bp)) {
-       case CHIP_REV_EMUL:
-               factor = 200;
-               break;
-       case CHIP_REV_FPGA:
+       if (CHIP_REV_IS_FPGA(bp))
                factor = 120;
-               break;
-       default:
+       else if (CHIP_REV_IS_EMUL(bp))
+               factor = 200;
+       else
                factor = 1;
-               break;
-       }
 
        DP(NETIF_MSG_HW, "start part1\n");
 
@@ -5970,13 +4890,9 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)
        /* Wait until NIG register shows 1 packet of size 0x10 */
        count = 1000 * factor;
        while (count) {
-#ifdef BNX2X_DMAE_RD
+
                bnx2x_read_dmae(bp, NIG_REG_STAT2_BRB_OCTET, 2);
                val = *bnx2x_sp(bp, wb_data[0]);
-#else
-               val = REG_RD(bp, NIG_REG_STAT2_BRB_OCTET);
-               REG_RD(bp, NIG_REG_STAT2_BRB_OCTET + 4);
-#endif
                if (val == 0x10)
                        break;
 
@@ -5992,7 +4908,6 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)
        count = 1000 * factor;
        while (count) {
                val = REG_RD(bp, PRS_REG_NUM_OF_PACKETS);
-
                if (val == 1)
                        break;
 
@@ -6005,9 +4920,9 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)
        }
 
        /* Reset and init BRB, PRS */
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR, 0x3);
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR, 0x03);
        msleep(50);
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, 0x3);
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, 0x03);
        msleep(50);
        bnx2x_init_block(bp, BRB1_COMMON_START, BRB1_COMMON_END);
        bnx2x_init_block(bp, PRS_COMMON_START, PRS_COMMON_END);
@@ -6031,13 +4946,9 @@ static int bnx2x_int_mem_test(struct bnx2x *bp)
           packets of size 11*0x10 = 0xb0 */
        count = 1000 * factor;
        while (count) {
-#ifdef BNX2X_DMAE_RD
+
                bnx2x_read_dmae(bp, NIG_REG_STAT2_BRB_OCTET, 2);
                val = *bnx2x_sp(bp, wb_data[0]);
-#else
-               val = REG_RD(bp, NIG_REG_STAT2_BRB_OCTET);
-               REG_RD(bp, NIG_REG_STAT2_BRB_OCTET + 4);
-#endif
                if (val == 0xb0)
                        break;
 
@@ -6107,85 +5018,75 @@ static void enable_blocks_attention(struct bnx2x *bp)
        REG_WR(bp, XSDM_REG_XSDM_INT_MASK_0, 0);
        REG_WR(bp, XSDM_REG_XSDM_INT_MASK_1, 0);
        REG_WR(bp, XCM_REG_XCM_INT_MASK, 0);
-/*      REG_WR(bp, XSEM_REG_XSEM_INT_MASK_0, 0); */
-/*      REG_WR(bp, XSEM_REG_XSEM_INT_MASK_1, 0); */
+/*     REG_WR(bp, XSEM_REG_XSEM_INT_MASK_0, 0); */
+/*     REG_WR(bp, XSEM_REG_XSEM_INT_MASK_1, 0); */
        REG_WR(bp, USDM_REG_USDM_INT_MASK_0, 0);
        REG_WR(bp, USDM_REG_USDM_INT_MASK_1, 0);
        REG_WR(bp, UCM_REG_UCM_INT_MASK, 0);
-/*      REG_WR(bp, USEM_REG_USEM_INT_MASK_0, 0); */
-/*      REG_WR(bp, USEM_REG_USEM_INT_MASK_1, 0); */
+/*     REG_WR(bp, USEM_REG_USEM_INT_MASK_0, 0); */
+/*     REG_WR(bp, USEM_REG_USEM_INT_MASK_1, 0); */
        REG_WR(bp, GRCBASE_UPB + PB_REG_PB_INT_MASK, 0);
        REG_WR(bp, CSDM_REG_CSDM_INT_MASK_0, 0);
        REG_WR(bp, CSDM_REG_CSDM_INT_MASK_1, 0);
        REG_WR(bp, CCM_REG_CCM_INT_MASK, 0);
-/*      REG_WR(bp, CSEM_REG_CSEM_INT_MASK_0, 0); */
-/*      REG_WR(bp, CSEM_REG_CSEM_INT_MASK_1, 0); */
-       REG_WR(bp, PXP2_REG_PXP2_INT_MASK, 0x480000);
+/*     REG_WR(bp, CSEM_REG_CSEM_INT_MASK_0, 0); */
+/*     REG_WR(bp, CSEM_REG_CSEM_INT_MASK_1, 0); */
+       if (CHIP_REV_IS_FPGA(bp))
+               REG_WR(bp, PXP2_REG_PXP2_INT_MASK_0, 0x580000);
+       else
+               REG_WR(bp, PXP2_REG_PXP2_INT_MASK_0, 0x480000);
        REG_WR(bp, TSDM_REG_TSDM_INT_MASK_0, 0);
        REG_WR(bp, TSDM_REG_TSDM_INT_MASK_1, 0);
        REG_WR(bp, TCM_REG_TCM_INT_MASK, 0);
-/*      REG_WR(bp, TSEM_REG_TSEM_INT_MASK_0, 0); */
-/*      REG_WR(bp, TSEM_REG_TSEM_INT_MASK_1, 0); */
+/*     REG_WR(bp, TSEM_REG_TSEM_INT_MASK_0, 0); */
+/*     REG_WR(bp, TSEM_REG_TSEM_INT_MASK_1, 0); */
        REG_WR(bp, CDU_REG_CDU_INT_MASK, 0);
        REG_WR(bp, DMAE_REG_DMAE_INT_MASK, 0);
-/*      REG_WR(bp, MISC_REG_MISC_INT_MASK, 0); */
-       REG_WR(bp, PBF_REG_PBF_INT_MASK, 0X18);         /* bit 3,4 masked */
+/*     REG_WR(bp, MISC_REG_MISC_INT_MASK, 0); */
+       REG_WR(bp, PBF_REG_PBF_INT_MASK, 0X18);         /* bit 3,4 masked */
 }
 
-static int bnx2x_function_init(struct bnx2x *bp, int mode)
+
+static int bnx2x_init_common(struct bnx2x *bp)
 {
-       int func = bp->port;
-       int port = func ? PORT1 : PORT0;
        u32 val, i;
-#ifdef USE_DMAE
-       u32 wb_write[2];
-#endif
-
-       DP(BNX2X_MSG_MCP, "function is %d  mode is %x\n", func, mode);
-       if ((func != 0) && (func != 1)) {
-               BNX2X_ERR("BAD function number (%d)\n", func);
-               return -ENODEV;
-       }
 
-       bnx2x_gunzip_init(bp);
+       DP(BNX2X_MSG_MCP, "starting common init  func %d\n", BP_FUNC(bp));
 
-       if (mode & 0x1) {       /* init common */
-               DP(BNX2X_MSG_MCP, "starting common init  func %d  mode %x\n",
-                  func, mode);
-               REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
-                      0xffffffff);
-               REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                      0xfffc);
-               bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END);
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, 0xffffffff);
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET, 0xfffc);
 
-               REG_WR(bp, MISC_REG_LCPLL_CTRL_REG_2, 0x100);
-               msleep(30);
-               REG_WR(bp, MISC_REG_LCPLL_CTRL_REG_2, 0x0);
+       bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END);
+       if (CHIP_IS_E1H(bp))
+               REG_WR(bp, MISC_REG_E1HMF_MODE, IS_E1HMF(bp));
 
-               bnx2x_init_block(bp, PXP_COMMON_START, PXP_COMMON_END);
-               bnx2x_init_block(bp, PXP2_COMMON_START, PXP2_COMMON_END);
+       REG_WR(bp, MISC_REG_LCPLL_CTRL_REG_2, 0x100);
+       msleep(30);
+       REG_WR(bp, MISC_REG_LCPLL_CTRL_REG_2, 0x0);
 
-               bnx2x_init_pxp(bp);
+       bnx2x_init_block(bp, PXP_COMMON_START, PXP_COMMON_END);
+       if (CHIP_IS_E1(bp)) {
+               /* enable HW interrupt from PXP on USDM overflow
+                  bit 16 on INT_MASK_0 */
+               REG_WR(bp, PXP_REG_PXP_INT_MASK_0, 0);
+       }
 
-               if (CHIP_REV(bp) == CHIP_REV_Ax) {
-                       /* enable HW interrupt from PXP on USDM
-                          overflow bit 16 on INT_MASK_0 */
-                       REG_WR(bp, PXP_REG_PXP_INT_MASK_0, 0);
-               }
+       bnx2x_init_block(bp, PXP2_COMMON_START, PXP2_COMMON_END);
+       bnx2x_init_pxp(bp);
 
 #ifdef __BIG_ENDIAN
-               REG_WR(bp, PXP2_REG_RQ_QM_ENDIAN_M, 1);
-               REG_WR(bp, PXP2_REG_RQ_TM_ENDIAN_M, 1);
-               REG_WR(bp, PXP2_REG_RQ_SRC_ENDIAN_M, 1);
-               REG_WR(bp, PXP2_REG_RQ_CDU_ENDIAN_M, 1);
-               REG_WR(bp, PXP2_REG_RQ_DBG_ENDIAN_M, 1);
-               REG_WR(bp, PXP2_REG_RQ_HC_ENDIAN_M, 1);
-
-/*             REG_WR(bp, PXP2_REG_RD_PBF_SWAP_MODE, 1); */
-               REG_WR(bp, PXP2_REG_RD_QM_SWAP_MODE, 1);
-               REG_WR(bp, PXP2_REG_RD_TM_SWAP_MODE, 1);
-               REG_WR(bp, PXP2_REG_RD_SRC_SWAP_MODE, 1);
-               REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, 1);
+       REG_WR(bp, PXP2_REG_RQ_QM_ENDIAN_M, 1);
+       REG_WR(bp, PXP2_REG_RQ_TM_ENDIAN_M, 1);
+       REG_WR(bp, PXP2_REG_RQ_SRC_ENDIAN_M, 1);
+       REG_WR(bp, PXP2_REG_RQ_CDU_ENDIAN_M, 1);
+       REG_WR(bp, PXP2_REG_RQ_DBG_ENDIAN_M, 1);
+       REG_WR(bp, PXP2_REG_RQ_HC_ENDIAN_M, 1);
+
+/*     REG_WR(bp, PXP2_REG_RD_PBF_SWAP_MODE, 1); */
+       REG_WR(bp, PXP2_REG_RD_QM_SWAP_MODE, 1);
+       REG_WR(bp, PXP2_REG_RD_TM_SWAP_MODE, 1);
+       REG_WR(bp, PXP2_REG_RD_SRC_SWAP_MODE, 1);
+       REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, 1);
 #endif
 
 #ifndef BCM_ISCSI
@@ -6193,247 +5094,259 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode)
                REG_WR(bp, PRS_REG_NIC_MODE, 1);
 #endif
 
-               REG_WR(bp, PXP2_REG_RQ_CDU_P_SIZE, 5);
+       REG_WR(bp, PXP2_REG_RQ_CDU_P_SIZE, 2);
 #ifdef BCM_ISCSI
-               REG_WR(bp, PXP2_REG_RQ_TM_P_SIZE, 5);
-               REG_WR(bp, PXP2_REG_RQ_QM_P_SIZE, 5);
-               REG_WR(bp, PXP2_REG_RQ_SRC_P_SIZE, 5);
+       REG_WR(bp, PXP2_REG_RQ_TM_P_SIZE, 5);
+       REG_WR(bp, PXP2_REG_RQ_QM_P_SIZE, 5);
+       REG_WR(bp, PXP2_REG_RQ_SRC_P_SIZE, 5);
 #endif
 
-               bnx2x_init_block(bp, DMAE_COMMON_START, DMAE_COMMON_END);
+       if (CHIP_REV_IS_FPGA(bp) && CHIP_IS_E1H(bp))
+               REG_WR(bp, PXP2_REG_PGL_TAGS_LIMIT, 0x1);
 
-               /* let the HW do it's magic ... */
-               msleep(100);
-               /* finish PXP init
-                  (can be moved up if we want to use the DMAE) */
-               val = REG_RD(bp, PXP2_REG_RQ_CFG_DONE);
-               if (val != 1) {
-                       BNX2X_ERR("PXP2 CFG failed\n");
-                       return -EBUSY;
-               }
+       /* let the HW do it's magic ... */
+       msleep(100);
+       /* finish PXP init */
+       val = REG_RD(bp, PXP2_REG_RQ_CFG_DONE);
+       if (val != 1) {
+               BNX2X_ERR("PXP2 CFG failed\n");
+               return -EBUSY;
+       }
+       val = REG_RD(bp, PXP2_REG_RD_INIT_DONE);
+       if (val != 1) {
+               BNX2X_ERR("PXP2 RD_INIT failed\n");
+               return -EBUSY;
+       }
 
-               val = REG_RD(bp, PXP2_REG_RD_INIT_DONE);
-               if (val != 1) {
-                       BNX2X_ERR("PXP2 RD_INIT failed\n");
-                       return -EBUSY;
-               }
+       REG_WR(bp, PXP2_REG_RQ_DISABLE_INPUTS, 0);
+       REG_WR(bp, PXP2_REG_RD_DISABLE_INPUTS, 0);
 
-               REG_WR(bp, PXP2_REG_RQ_DISABLE_INPUTS, 0);
-               REG_WR(bp, PXP2_REG_RD_DISABLE_INPUTS, 0);
+       bnx2x_init_block(bp, DMAE_COMMON_START, DMAE_COMMON_END);
 
-               bnx2x_init_fill(bp, TSEM_REG_PRAM, 0, 8);
+       /* clean the DMAE memory */
+       bp->dmae_ready = 1;
+       bnx2x_init_fill(bp, TSEM_REG_PRAM, 0, 8);
 
-               bnx2x_init_block(bp, TCM_COMMON_START, TCM_COMMON_END);
-               bnx2x_init_block(bp, UCM_COMMON_START, UCM_COMMON_END);
-               bnx2x_init_block(bp, CCM_COMMON_START, CCM_COMMON_END);
-               bnx2x_init_block(bp, XCM_COMMON_START, XCM_COMMON_END);
+       bnx2x_init_block(bp, TCM_COMMON_START, TCM_COMMON_END);
+       bnx2x_init_block(bp, UCM_COMMON_START, UCM_COMMON_END);
+       bnx2x_init_block(bp, CCM_COMMON_START, CCM_COMMON_END);
+       bnx2x_init_block(bp, XCM_COMMON_START, XCM_COMMON_END);
 
-#ifdef BNX2X_DMAE_RD
-               bnx2x_read_dmae(bp, XSEM_REG_PASSIVE_BUFFER, 3);
-               bnx2x_read_dmae(bp, CSEM_REG_PASSIVE_BUFFER, 3);
-               bnx2x_read_dmae(bp, TSEM_REG_PASSIVE_BUFFER, 3);
-               bnx2x_read_dmae(bp, USEM_REG_PASSIVE_BUFFER, 3);
-#else
-               REG_RD(bp, XSEM_REG_PASSIVE_BUFFER);
-               REG_RD(bp, XSEM_REG_PASSIVE_BUFFER + 4);
-               REG_RD(bp, XSEM_REG_PASSIVE_BUFFER + 8);
-               REG_RD(bp, CSEM_REG_PASSIVE_BUFFER);
-               REG_RD(bp, CSEM_REG_PASSIVE_BUFFER + 4);
-               REG_RD(bp, CSEM_REG_PASSIVE_BUFFER + 8);
-               REG_RD(bp, TSEM_REG_PASSIVE_BUFFER);
-               REG_RD(bp, TSEM_REG_PASSIVE_BUFFER + 4);
-               REG_RD(bp, TSEM_REG_PASSIVE_BUFFER + 8);
-               REG_RD(bp, USEM_REG_PASSIVE_BUFFER);
-               REG_RD(bp, USEM_REG_PASSIVE_BUFFER + 4);
-               REG_RD(bp, USEM_REG_PASSIVE_BUFFER + 8);
-#endif
-               bnx2x_init_block(bp, QM_COMMON_START, QM_COMMON_END);
-               /* soft reset pulse */
-               REG_WR(bp, QM_REG_SOFT_RESET, 1);
-               REG_WR(bp, QM_REG_SOFT_RESET, 0);
+       bnx2x_read_dmae(bp, XSEM_REG_PASSIVE_BUFFER, 3);
+       bnx2x_read_dmae(bp, CSEM_REG_PASSIVE_BUFFER, 3);
+       bnx2x_read_dmae(bp, TSEM_REG_PASSIVE_BUFFER, 3);
+       bnx2x_read_dmae(bp, USEM_REG_PASSIVE_BUFFER, 3);
+
+       bnx2x_init_block(bp, QM_COMMON_START, QM_COMMON_END);
+       /* soft reset pulse */
+       REG_WR(bp, QM_REG_SOFT_RESET, 1);
+       REG_WR(bp, QM_REG_SOFT_RESET, 0);
 
 #ifdef BCM_ISCSI
-               bnx2x_init_block(bp, TIMERS_COMMON_START, TIMERS_COMMON_END);
+       bnx2x_init_block(bp, TIMERS_COMMON_START, TIMERS_COMMON_END);
 #endif
-               bnx2x_init_block(bp, DQ_COMMON_START, DQ_COMMON_END);
-               REG_WR(bp, DORQ_REG_DPM_CID_OFST, BCM_PAGE_BITS);
-               if (CHIP_REV(bp) == CHIP_REV_Ax) {
-                       /* enable hw interrupt from doorbell Q */
-                       REG_WR(bp, DORQ_REG_DORQ_INT_MASK, 0);
-               }
 
-               bnx2x_init_block(bp, BRB1_COMMON_START, BRB1_COMMON_END);
+       bnx2x_init_block(bp, DQ_COMMON_START, DQ_COMMON_END);
+       REG_WR(bp, DORQ_REG_DPM_CID_OFST, BCM_PAGE_SHIFT);
+       if (!CHIP_REV_IS_SLOW(bp)) {
+               /* enable hw interrupt from doorbell Q */
+               REG_WR(bp, DORQ_REG_DORQ_INT_MASK, 0);
+       }
 
-               if (CHIP_REV_IS_SLOW(bp)) {
-                       /* fix for emulation and FPGA for no pause */
-                       REG_WR(bp, BRB1_REG_PAUSE_HIGH_THRESHOLD_0, 513);
-                       REG_WR(bp, BRB1_REG_PAUSE_HIGH_THRESHOLD_1, 513);
-                       REG_WR(bp, BRB1_REG_PAUSE_LOW_THRESHOLD_0, 0);
-                       REG_WR(bp, BRB1_REG_PAUSE_LOW_THRESHOLD_1, 0);
-               }
+       bnx2x_init_block(bp, BRB1_COMMON_START, BRB1_COMMON_END);
+       if (CHIP_REV_IS_SLOW(bp)) {
+               /* fix for emulation and FPGA for no pause */
+               REG_WR(bp, BRB1_REG_PAUSE_HIGH_THRESHOLD_0, 513);
+               REG_WR(bp, BRB1_REG_PAUSE_HIGH_THRESHOLD_1, 513);
+               REG_WR(bp, BRB1_REG_PAUSE_LOW_THRESHOLD_0, 0);
+               REG_WR(bp, BRB1_REG_PAUSE_LOW_THRESHOLD_1, 0);
+       }
 
-               bnx2x_init_block(bp, PRS_COMMON_START, PRS_COMMON_END);
-
-               bnx2x_init_block(bp, TSDM_COMMON_START, TSDM_COMMON_END);
-               bnx2x_init_block(bp, CSDM_COMMON_START, CSDM_COMMON_END);
-               bnx2x_init_block(bp, USDM_COMMON_START, USDM_COMMON_END);
-               bnx2x_init_block(bp, XSDM_COMMON_START, XSDM_COMMON_END);
-
-               bnx2x_init_fill(bp, TSTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE);
-               bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE);
-               bnx2x_init_fill(bp, XSTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE);
-               bnx2x_init_fill(bp, USTORM_INTMEM_ADDR, 0, STORM_INTMEM_SIZE);
-
-               bnx2x_init_block(bp, TSEM_COMMON_START, TSEM_COMMON_END);
-               bnx2x_init_block(bp, USEM_COMMON_START, USEM_COMMON_END);
-               bnx2x_init_block(bp, CSEM_COMMON_START, CSEM_COMMON_END);
-               bnx2x_init_block(bp, XSEM_COMMON_START, XSEM_COMMON_END);
-
-               /* sync semi rtc */
-               REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR,
-                      0x80000000);
-               REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
-                      0x80000000);
-
-               bnx2x_init_block(bp, UPB_COMMON_START, UPB_COMMON_END);
-               bnx2x_init_block(bp, XPB_COMMON_START, XPB_COMMON_END);
-               bnx2x_init_block(bp, PBF_COMMON_START, PBF_COMMON_END);
-
-               REG_WR(bp, SRC_REG_SOFT_RST, 1);
-               for (i = SRC_REG_KEYRSS0_0; i <= SRC_REG_KEYRSS1_9; i += 4) {
-                       REG_WR(bp, i, 0xc0cac01a);
-                       /* TODO: replace with something meaningful */
-               }
-               /* SRCH COMMON comes here */
-               REG_WR(bp, SRC_REG_SOFT_RST, 0);
-
-               if (sizeof(union cdu_context) != 1024) {
-                       /* we currently assume that a context is 1024 bytes */
-                       printk(KERN_ALERT PFX "please adjust the size of"
-                              " cdu_context(%ld)\n",
-                              (long)sizeof(union cdu_context));
-               }
-               val = (4 << 24) + (0 << 12) + 1024;
-               REG_WR(bp, CDU_REG_CDU_GLOBAL_PARAMS, val);
-               bnx2x_init_block(bp, CDU_COMMON_START, CDU_COMMON_END);
-
-               bnx2x_init_block(bp, CFC_COMMON_START, CFC_COMMON_END);
-               REG_WR(bp, CFC_REG_INIT_REG, 0x7FF);
-
-               bnx2x_init_block(bp, HC_COMMON_START, HC_COMMON_END);
-               bnx2x_init_block(bp, MISC_AEU_COMMON_START,
-                                MISC_AEU_COMMON_END);
-               /* RXPCS COMMON comes here */
-               /* EMAC0 COMMON comes here */
-               /* EMAC1 COMMON comes here */
-               /* DBU COMMON comes here */
-               /* DBG COMMON comes here */
-               bnx2x_init_block(bp, NIG_COMMON_START, NIG_COMMON_END);
+       bnx2x_init_block(bp, PRS_COMMON_START, PRS_COMMON_END);
+       if (CHIP_IS_E1H(bp))
+               REG_WR(bp, PRS_REG_E1HOV_MODE, IS_E1HMF(bp));
+
+       bnx2x_init_block(bp, TSDM_COMMON_START, TSDM_COMMON_END);
+       bnx2x_init_block(bp, CSDM_COMMON_START, CSDM_COMMON_END);
+       bnx2x_init_block(bp, USDM_COMMON_START, USDM_COMMON_END);
+       bnx2x_init_block(bp, XSDM_COMMON_START, XSDM_COMMON_END);
+
+       if (CHIP_IS_E1H(bp)) {
+               bnx2x_init_fill(bp, TSTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1H/2);
+               bnx2x_init_fill(bp,
+                               TSTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
+                               0, STORM_INTMEM_SIZE_E1H/2);
+               bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1H/2);
+               bnx2x_init_fill(bp,
+                               CSTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
+                               0, STORM_INTMEM_SIZE_E1H/2);
+               bnx2x_init_fill(bp, XSTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1H/2);
+               bnx2x_init_fill(bp,
+                               XSTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
+                               0, STORM_INTMEM_SIZE_E1H/2);
+               bnx2x_init_fill(bp, USTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1H/2);
+               bnx2x_init_fill(bp,
+                               USTORM_INTMEM_ADDR + STORM_INTMEM_SIZE_E1H/2,
+                               0, STORM_INTMEM_SIZE_E1H/2);
+       } else { /* E1 */
+               bnx2x_init_fill(bp, TSTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1);
+               bnx2x_init_fill(bp, CSTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1);
+               bnx2x_init_fill(bp, XSTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1);
+               bnx2x_init_fill(bp, USTORM_INTMEM_ADDR, 0,
+                               STORM_INTMEM_SIZE_E1);
+       }
+
+       bnx2x_init_block(bp, TSEM_COMMON_START, TSEM_COMMON_END);
+       bnx2x_init_block(bp, USEM_COMMON_START, USEM_COMMON_END);
+       bnx2x_init_block(bp, CSEM_COMMON_START, CSEM_COMMON_END);
+       bnx2x_init_block(bp, XSEM_COMMON_START, XSEM_COMMON_END);
+
+       /* sync semi rtc */
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR,
+              0x80000000);
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
+              0x80000000);
+
+       bnx2x_init_block(bp, UPB_COMMON_START, UPB_COMMON_END);
+       bnx2x_init_block(bp, XPB_COMMON_START, XPB_COMMON_END);
+       bnx2x_init_block(bp, PBF_COMMON_START, PBF_COMMON_END);
+
+       REG_WR(bp, SRC_REG_SOFT_RST, 1);
+       for (i = SRC_REG_KEYRSS0_0; i <= SRC_REG_KEYRSS1_9; i += 4) {
+               REG_WR(bp, i, 0xc0cac01a);
+               /* TODO: replace with something meaningful */
+       }
+       if (CHIP_IS_E1H(bp))
+               bnx2x_init_block(bp, SRCH_COMMON_START, SRCH_COMMON_END);
+       REG_WR(bp, SRC_REG_SOFT_RST, 0);
+
+       if (sizeof(union cdu_context) != 1024)
+               /* we currently assume that a context is 1024 bytes */
+               printk(KERN_ALERT PFX "please adjust the size of"
+                      " cdu_context(%ld)\n", (long)sizeof(union cdu_context));
+
+       bnx2x_init_block(bp, CDU_COMMON_START, CDU_COMMON_END);
+       val = (4 << 24) + (0 << 12) + 1024;
+       REG_WR(bp, CDU_REG_CDU_GLOBAL_PARAMS, val);
+       if (CHIP_IS_E1(bp)) {
+               /* !!! fix pxp client crdit until excel update */
+               REG_WR(bp, CDU_REG_CDU_DEBUG, 0x264);
+               REG_WR(bp, CDU_REG_CDU_DEBUG, 0);
+       }
+
+       bnx2x_init_block(bp, CFC_COMMON_START, CFC_COMMON_END);
+       REG_WR(bp, CFC_REG_INIT_REG, 0x7FF);
+
+       bnx2x_init_block(bp, HC_COMMON_START, HC_COMMON_END);
+       bnx2x_init_block(bp, MISC_AEU_COMMON_START, MISC_AEU_COMMON_END);
+
+       /* PXPCS COMMON comes here */
+       /* Reset PCIE errors for debug */
+       REG_WR(bp, 0x2814, 0xffffffff);
+       REG_WR(bp, 0x3820, 0xffffffff);
 
-               if (CHIP_REV_IS_SLOW(bp))
-                       msleep(200);
+       /* EMAC0 COMMON comes here */
+       /* EMAC1 COMMON comes here */
+       /* DBU COMMON comes here */
+       /* DBG COMMON comes here */
 
-               /* finish CFC init */
-               val = REG_RD(bp, CFC_REG_LL_INIT_DONE);
-               if (val != 1) {
-                       BNX2X_ERR("CFC LL_INIT failed\n");
-                       return -EBUSY;
-               }
+       bnx2x_init_block(bp, NIG_COMMON_START, NIG_COMMON_END);
+       if (CHIP_IS_E1H(bp)) {
+               REG_WR(bp, NIG_REG_LLH_MF_MODE, IS_E1HMF(bp));
+               REG_WR(bp, NIG_REG_LLH_E1HOV_MODE, IS_E1HMF(bp));
+       }
 
-               val = REG_RD(bp, CFC_REG_AC_INIT_DONE);
-               if (val != 1) {
-                       BNX2X_ERR("CFC AC_INIT failed\n");
-                       return -EBUSY;
-               }
+       if (CHIP_REV_IS_SLOW(bp))
+               msleep(200);
 
-               val = REG_RD(bp, CFC_REG_CAM_INIT_DONE);
-               if (val != 1) {
-                       BNX2X_ERR("CFC CAM_INIT failed\n");
-                       return -EBUSY;
-               }
+       /* finish CFC init */
+       val = reg_poll(bp, CFC_REG_LL_INIT_DONE, 1, 100, 10);
+       if (val != 1) {
+               BNX2X_ERR("CFC LL_INIT failed\n");
+               return -EBUSY;
+       }
+       val = reg_poll(bp, CFC_REG_AC_INIT_DONE, 1, 100, 10);
+       if (val != 1) {
+               BNX2X_ERR("CFC AC_INIT failed\n");
+               return -EBUSY;
+       }
+       val = reg_poll(bp, CFC_REG_CAM_INIT_DONE, 1, 100, 10);
+       if (val != 1) {
+               BNX2X_ERR("CFC CAM_INIT failed\n");
+               return -EBUSY;
+       }
+       REG_WR(bp, CFC_REG_DEBUG0, 0);
 
-               REG_WR(bp, CFC_REG_DEBUG0, 0);
+       /* read NIG statistic
+          to see if this is our first up since powerup */
+       bnx2x_read_dmae(bp, NIG_REG_STAT2_BRB_OCTET, 2);
+       val = *bnx2x_sp(bp, wb_data[0]);
 
-               /* read NIG statistic
-                  to see if this is our first up since powerup */
-#ifdef BNX2X_DMAE_RD
-               bnx2x_read_dmae(bp, NIG_REG_STAT2_BRB_OCTET, 2);
-               val = *bnx2x_sp(bp, wb_data[0]);
-#else
-               val = REG_RD(bp, NIG_REG_STAT2_BRB_OCTET);
-               REG_RD(bp, NIG_REG_STAT2_BRB_OCTET + 4);
-#endif
-               /* do internal memory self test */
-               if ((val == 0) && bnx2x_int_mem_test(bp)) {
-                       BNX2X_ERR("internal mem selftest failed\n");
-                       return -EBUSY;
-               }
+       /* do internal memory self test */
+       if ((CHIP_IS_E1(bp)) && (val == 0) && bnx2x_int_mem_test(bp)) {
+               BNX2X_ERR("internal mem self test failed\n");
+               return -EBUSY;
+       }
 
-               /* clear PXP2 attentions */
-               REG_RD(bp, PXP2_REG_PXP2_INT_STS_CLR);
+       switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
+       case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:
+               /* Fan failure is indicated by SPIO 5 */
+               bnx2x_set_spio(bp, MISC_REGISTERS_SPIO_5,
+                              MISC_REGISTERS_SPIO_INPUT_HI_Z);
 
-               enable_blocks_attention(bp);
-               /* enable_blocks_parity(bp); */
+               /* set to active low mode */
+               val = REG_RD(bp, MISC_REG_SPIO_INT);
+               val |= ((1 << MISC_REGISTERS_SPIO_5) <<
+                                       MISC_REGISTERS_SPIO_INT_OLD_SET_POS);
+               REG_WR(bp, MISC_REG_SPIO_INT, val);
 
-               switch (bp->board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
-               case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:
-                       /* Fan failure is indicated by SPIO 5 */
-                       bnx2x_set_spio(bp, MISC_REGISTERS_SPIO_5,
-                                      MISC_REGISTERS_SPIO_INPUT_HI_Z);
+               /* enable interrupt to signal the IGU */
+               val = REG_RD(bp, MISC_REG_SPIO_EVENT_EN);
+               val |= (1 << MISC_REGISTERS_SPIO_5);
+               REG_WR(bp, MISC_REG_SPIO_EVENT_EN, val);
+               break;
 
-                       /* set to active low mode */
-                       val = REG_RD(bp, MISC_REG_SPIO_INT);
-                       val |= ((1 << MISC_REGISTERS_SPIO_5) <<
-                                       MISC_REGISTERS_SPIO_INT_OLD_SET_POS);
-                       REG_WR(bp, MISC_REG_SPIO_INT, val);
+       default:
+               break;
+       }
 
-                       /* enable interrupt to signal the IGU */
-                       val = REG_RD(bp, MISC_REG_SPIO_EVENT_EN);
-                       val |= (1 << MISC_REGISTERS_SPIO_5);
-                       REG_WR(bp, MISC_REG_SPIO_EVENT_EN, val);
-                       break;
+       /* clear PXP2 attentions */
+       REG_RD(bp, PXP2_REG_PXP2_INT_STS_CLR_0);
 
-               default:
-                       break;
-               }
+       enable_blocks_attention(bp);
 
-       } /* end of common init */
+       if (bp->flags & TPA_ENABLE_FLAG) {
+               struct tstorm_eth_tpa_exist tmp = {0};
 
-       /* per port init */
+               tmp.tpa_exist = 1;
 
-       /* the phys address is shifted right 12 bits and has an added
-          1=valid bit added to the 53rd bit
-          then since this is a wide register(TM)
-          we split it into two 32 bit writes
-        */
-#define RQ_ONCHIP_AT_PORT_SIZE  384
-#define ONCHIP_ADDR1(x)   ((u32)(((u64)x >> 12) & 0xFFFFFFFF))
-#define ONCHIP_ADDR2(x)   ((u32)((1 << 20) | ((u64)x >> 44)))
-#define PXP_ONE_ILT(x)    ((x << 10) | x)
+               REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET,
+                      ((u32 *)&tmp)[0]);
+               REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4,
+                      ((u32 *)&tmp)[1]);
+       }
 
-       DP(BNX2X_MSG_MCP, "starting per-function init port is %x\n", func);
+       return 0;
+}
 
-       REG_WR(bp, NIG_REG_MASK_INTERRUPT_PORT0 + func*4, 0);
+static int bnx2x_init_port(struct bnx2x *bp)
+{
+       int port = BP_PORT(bp);
+       u32 val;
 
-       /* Port PXP comes here */
-       /* Port PXP2 comes here */
+       DP(BNX2X_MSG_MCP, "starting port init  port %x\n", port);
 
-       /* Offset is
-        * Port0  0
-        * Port1  384 */
-       i = func * RQ_ONCHIP_AT_PORT_SIZE;
-#ifdef USE_DMAE
-       wb_write[0] = ONCHIP_ADDR1(bnx2x_sp_mapping(bp, context));
-       wb_write[1] = ONCHIP_ADDR2(bnx2x_sp_mapping(bp, context));
-       REG_WR_DMAE(bp, PXP2_REG_RQ_ONCHIP_AT + i*8, wb_write, 2);
-#else
-       REG_WR_IND(bp, PXP2_REG_RQ_ONCHIP_AT + i*8,
-                  ONCHIP_ADDR1(bnx2x_sp_mapping(bp, context)));
-       REG_WR_IND(bp, PXP2_REG_RQ_ONCHIP_AT + i*8 + 4,
-                  ONCHIP_ADDR2(bnx2x_sp_mapping(bp, context)));
-#endif
-       REG_WR(bp, PXP2_REG_PSWRQ_CDU0_L2P + func*4, PXP_ONE_ILT(i));
+       REG_WR(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4, 0);
 
+       /* Port PXP comes here */
+       /* Port PXP2 comes here */
 #ifdef BCM_ISCSI
        /* Port0  1
         * Port1  385 */
@@ -6459,30 +5372,9 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode)
        REG_WR_DMAE(bp, PXP2_REG_RQ_ONCHIP_AT + i*8, wb_write, 2);
        REG_WR(bp, PXP2_REG_PSWRQ_SRC0_L2P + func*4, PXP_ONE_ILT(i));
 #endif
-
-       /* Port TCM comes here */
-       /* Port UCM comes here */
-       /* Port CCM comes here */
-       bnx2x_init_block(bp, func ? XCM_PORT1_START : XCM_PORT0_START,
-                            func ? XCM_PORT1_END : XCM_PORT0_END);
-
-#ifdef USE_DMAE
-       wb_write[0] = 0;
-       wb_write[1] = 0;
-#endif
-       for (i = 0; i < 32; i++) {
-               REG_WR(bp, QM_REG_BASEADDR + (func*32 + i)*4, 1024 * 4 * i);
-#ifdef USE_DMAE
-               REG_WR_DMAE(bp, QM_REG_PTRTBL + (func*32 + i)*8, wb_write, 2);
-#else
-               REG_WR_IND(bp, QM_REG_PTRTBL + (func*32 + i)*8, 0);
-               REG_WR_IND(bp, QM_REG_PTRTBL + (func*32 + i)*8 + 4, 0);
-#endif
-       }
-       REG_WR(bp, QM_REG_CONNNUM_0 + func*4, 1024/16 - 1);
+       /* Port CMs come here */
 
        /* Port QM comes here */
-
 #ifdef BCM_ISCSI
        REG_WR(bp, TM_REG_LIN0_SCAN_TIME + func*4, 1024/64*20);
        REG_WR(bp, TM_REG_LIN0_MAX_ACTIVE_CID + func*4, 31);
@@ -6492,37 +5384,37 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode)
 #endif
        /* Port DQ comes here */
        /* Port BRB1 comes here */
-       bnx2x_init_block(bp, func ? PRS_PORT1_START : PRS_PORT0_START,
-                            func ? PRS_PORT1_END : PRS_PORT0_END);
+       /* Port PRS comes here */
        /* Port TSDM comes here */
        /* Port CSDM comes here */
        /* Port USDM comes here */
        /* Port XSDM comes here */
-       bnx2x_init_block(bp, func ? TSEM_PORT1_START : TSEM_PORT0_START,
-                            func ? TSEM_PORT1_END : TSEM_PORT0_END);
-       bnx2x_init_block(bp, func ? USEM_PORT1_START : USEM_PORT0_START,
-                            func ? USEM_PORT1_END : USEM_PORT0_END);
-       bnx2x_init_block(bp, func ? CSEM_PORT1_START : CSEM_PORT0_START,
-                            func ? CSEM_PORT1_END : CSEM_PORT0_END);
-       bnx2x_init_block(bp, func ? XSEM_PORT1_START : XSEM_PORT0_START,
-                            func ? XSEM_PORT1_END : XSEM_PORT0_END);
+       bnx2x_init_block(bp, port ? TSEM_PORT1_START : TSEM_PORT0_START,
+                            port ? TSEM_PORT1_END : TSEM_PORT0_END);
+       bnx2x_init_block(bp, port ? USEM_PORT1_START : USEM_PORT0_START,
+                            port ? USEM_PORT1_END : USEM_PORT0_END);
+       bnx2x_init_block(bp, port ? CSEM_PORT1_START : CSEM_PORT0_START,
+                            port ? CSEM_PORT1_END : CSEM_PORT0_END);
+       bnx2x_init_block(bp, port ? XSEM_PORT1_START : XSEM_PORT0_START,
+                            port ? XSEM_PORT1_END : XSEM_PORT0_END);
        /* Port UPB comes here */
-       /* Port XSDM comes here */
-       bnx2x_init_block(bp, func ? PBF_PORT1_START : PBF_PORT0_START,
-                            func ? PBF_PORT1_END : PBF_PORT0_END);
+       /* Port XPB comes here */
+
+       bnx2x_init_block(bp, port ? PBF_PORT1_START : PBF_PORT0_START,
+                            port ? PBF_PORT1_END : PBF_PORT0_END);
 
        /* configure PBF to work without PAUSE mtu 9000 */
-       REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + func*4, 0);
+       REG_WR(bp, PBF_REG_P0_PAUSE_ENABLE + port*4, 0);
 
        /* update threshold */
-       REG_WR(bp, PBF_REG_P0_ARB_THRSH + func*4, (9040/16));
+       REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, (9040/16));
        /* update init credit */
-       REG_WR(bp, PBF_REG_P0_INIT_CRD + func*4, (9040/16) + 553 - 22);
+       REG_WR(bp, PBF_REG_P0_INIT_CRD + port*4, (9040/16) + 553 - 22);
 
        /* probe changes */
-       REG_WR(bp, PBF_REG_INIT_P0 + func*4, 1);
+       REG_WR(bp, PBF_REG_INIT_P0 + port*4, 1);
        msleep(5);
-       REG_WR(bp, PBF_REG_INIT_P0 + func*4, 0);
+       REG_WR(bp, PBF_REG_INIT_P0 + port*4, 0);
 
 #ifdef BCM_ISCSI
        /* tell the searcher where the T2 table is */
@@ -6540,23 +5432,57 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode)
 #endif
        /* Port CDU comes here */
        /* Port CFC comes here */
-       bnx2x_init_block(bp, func ? HC_PORT1_START : HC_PORT0_START,
-                            func ? HC_PORT1_END : HC_PORT0_END);
-       bnx2x_init_block(bp, func ? MISC_AEU_PORT1_START :
+
+       if (CHIP_IS_E1(bp)) {
+               REG_WR(bp, HC_REG_LEADING_EDGE_0 + port*8, 0);
+               REG_WR(bp, HC_REG_TRAILING_EDGE_0 + port*8, 0);
+       }
+       bnx2x_init_block(bp, port ? HC_PORT1_START : HC_PORT0_START,
+                            port ? HC_PORT1_END : HC_PORT0_END);
+
+       bnx2x_init_block(bp, port ? MISC_AEU_PORT1_START :
                                    MISC_AEU_PORT0_START,
-                            func ? MISC_AEU_PORT1_END : MISC_AEU_PORT0_END);
+                            port ? MISC_AEU_PORT1_END : MISC_AEU_PORT0_END);
+       /* init aeu_mask_attn_func_0/1:
+        *  - SF mode: bits 3-7 are masked. only bits 0-2 are in use
+        *  - MF mode: bit 3 is masked. bits 0-2 are in use as in SF
+        *             bits 4-7 are used for "per vn group attention" */
+       REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4,
+              (IS_E1HMF(bp) ? 0xF7 : 0x7));
+
        /* Port PXPCS comes here */
        /* Port EMAC0 comes here */
        /* Port EMAC1 comes here */
        /* Port DBU comes here */
        /* Port DBG comes here */
-       bnx2x_init_block(bp, func ? NIG_PORT1_START : NIG_PORT0_START,
-                            func ? NIG_PORT1_END : NIG_PORT0_END);
-       REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + func*4, 1);
+       bnx2x_init_block(bp, port ? NIG_PORT1_START : NIG_PORT0_START,
+                            port ? NIG_PORT1_END : NIG_PORT0_END);
+
+       REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 1);
+
+       if (CHIP_IS_E1H(bp)) {
+               u32 wsum;
+               struct cmng_struct_per_port m_cmng_port;
+               int vn;
+
+               /* 0x2 disable e1hov, 0x1 enable */
+               REG_WR(bp, NIG_REG_LLH0_BRB1_DRV_MASK_MF + port*4,
+                      (IS_E1HMF(bp) ? 0x1 : 0x2));
+
+               /* Init RATE SHAPING and FAIRNESS contexts.
+                  Initialize as if there is 10G link. */
+               wsum = bnx2x_calc_vn_wsum(bp);
+               bnx2x_init_port_minmax(bp, (int)wsum, 10000, &m_cmng_port);
+               if (IS_E1HMF(bp))
+                       for (vn = VN_0; vn < E1HVN_MAX; vn++)
+                               bnx2x_init_vn_minmax(bp, 2*vn + port,
+                                       wsum, 10000, &m_cmng_port);
+       }
+
        /* Port MCP comes here */
        /* Port DMAE comes here */
 
-       switch (bp->board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
+       switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {
        case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:
                /* add SPIO 5 to group 0 */
                val = REG_RD(bp, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0);
@@ -6568,50 +5494,152 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode)
                break;
        }
 
-       bnx2x_link_reset(bp);
+       bnx2x__link_reset(bp);
+
+       return 0;
+}
+
+#define ILT_PER_FUNC           (768/2)
+#define FUNC_ILT_BASE(func)    (func * ILT_PER_FUNC)
+/* the phys address is shifted right 12 bits and has an added
+   1=valid bit added to the 53rd bit
+   then since this is a wide register(TM)
+   we split it into two 32 bit writes
+ */
+#define ONCHIP_ADDR1(x)                ((u32)(((u64)x >> 12) & 0xFFFFFFFF))
+#define ONCHIP_ADDR2(x)                ((u32)((1 << 20) | ((u64)x >> 44)))
+#define PXP_ONE_ILT(x)         (((x) << 10) | x)
+#define PXP_ILT_RANGE(f, l)    (((l) << 10) | f)
+
+#define CNIC_ILT_LINES         0
+
+static void bnx2x_ilt_wr(struct bnx2x *bp, u32 index, dma_addr_t addr)
+{
+       int reg;
+
+       if (CHIP_IS_E1H(bp))
+               reg = PXP2_REG_RQ_ONCHIP_AT_B0 + index*8;
+       else /* E1 */
+               reg = PXP2_REG_RQ_ONCHIP_AT + index*8;
+
+       bnx2x_wb_wr(bp, reg, ONCHIP_ADDR1(addr), ONCHIP_ADDR2(addr));
+}
+
+static int bnx2x_init_func(struct bnx2x *bp)
+{
+       int port = BP_PORT(bp);
+       int func = BP_FUNC(bp);
+       int i;
+
+       DP(BNX2X_MSG_MCP, "starting func init  func %x\n", func);
+
+       i = FUNC_ILT_BASE(func);
+
+       bnx2x_ilt_wr(bp, i, bnx2x_sp_mapping(bp, context));
+       if (CHIP_IS_E1H(bp)) {
+               REG_WR(bp, PXP2_REG_RQ_CDU_FIRST_ILT, i);
+               REG_WR(bp, PXP2_REG_RQ_CDU_LAST_ILT, i + CNIC_ILT_LINES);
+       } else /* E1 */
+               REG_WR(bp, PXP2_REG_PSWRQ_CDU0_L2P + func*4,
+                      PXP_ILT_RANGE(i, i + CNIC_ILT_LINES));
+
+
+       if (CHIP_IS_E1H(bp)) {
+               for (i = 0; i < 9; i++)
+                       bnx2x_init_block(bp,
+                                        cm_start[func][i], cm_end[func][i]);
+
+               REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 1);
+               REG_WR(bp, NIG_REG_LLH0_FUNC_VLAN_ID + port*8, bp->e1hov);
+       }
+
+       /* HC init per function */
+       if (CHIP_IS_E1H(bp)) {
+               REG_WR(bp, MISC_REG_AEU_GENERAL_ATTN_12 + func*4, 0);
+
+               REG_WR(bp, HC_REG_LEADING_EDGE_0 + port*8, 0);
+               REG_WR(bp, HC_REG_TRAILING_EDGE_0 + port*8, 0);
+       }
+       bnx2x_init_block(bp, hc_limits[func][0], hc_limits[func][1]);
+
+       if (CHIP_IS_E1H(bp))
+               REG_WR(bp, HC_REG_FUNC_NUM_P0 + port*4, func);
 
        /* Reset PCIE errors for debug */
        REG_WR(bp, 0x2114, 0xffffffff);
        REG_WR(bp, 0x2120, 0xffffffff);
-       REG_WR(bp, 0x2814, 0xffffffff);
 
-       /* !!! move to init_values.h */
-       REG_WR(bp, XSDM_REG_INIT_CREDIT_PXP_CTRL, 0x1);
-       REG_WR(bp, USDM_REG_INIT_CREDIT_PXP_CTRL, 0x1);
-       REG_WR(bp, CSDM_REG_INIT_CREDIT_PXP_CTRL, 0x1);
-       REG_WR(bp, TSDM_REG_INIT_CREDIT_PXP_CTRL, 0x1);
+       return 0;
+}
+
+static int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
+{
+       int i, rc = 0;
 
-       REG_WR(bp, DBG_REG_PCI_REQ_CREDIT, 0x1);
-       REG_WR(bp, TM_REG_PCIARB_CRDCNT_VAL, 0x1);
-       REG_WR(bp, CDU_REG_CDU_DEBUG, 0x264);
-       REG_WR(bp, CDU_REG_CDU_DEBUG, 0x0);
+       DP(BNX2X_MSG_MCP, "function %d  load_code %x\n",
+          BP_FUNC(bp), load_code);
 
-       bnx2x_gunzip_end(bp);
+       bp->dmae_ready = 0;
+       mutex_init(&bp->dmae_mutex);
+       bnx2x_gunzip_init(bp);
+
+       switch (load_code) {
+       case FW_MSG_CODE_DRV_LOAD_COMMON:
+               rc = bnx2x_init_common(bp);
+               if (rc)
+                       goto init_hw_err;
+               /* no break */
+
+       case FW_MSG_CODE_DRV_LOAD_PORT:
+               bp->dmae_ready = 1;
+               rc = bnx2x_init_port(bp);
+               if (rc)
+                       goto init_hw_err;
+               /* no break */
+
+       case FW_MSG_CODE_DRV_LOAD_FUNCTION:
+               bp->dmae_ready = 1;
+               rc = bnx2x_init_func(bp);
+               if (rc)
+                       goto init_hw_err;
+               break;
+
+       default:
+               BNX2X_ERR("Unknown load_code (0x%x) from MCP\n", load_code);
+               break;
+       }
 
-       if (!nomcp) {
-               port = bp->port;
+       if (!BP_NOMCP(bp)) {
+               int func = BP_FUNC(bp);
 
                bp->fw_drv_pulse_wr_seq =
-                               (SHMEM_RD(bp, func_mb[port].drv_pulse_mb) &
+                               (SHMEM_RD(bp, func_mb[func].drv_pulse_mb) &
                                 DRV_PULSE_SEQ_MASK);
-               bp->fw_mb = SHMEM_RD(bp, func_mb[port].fw_mb_param);
-               DP(BNX2X_MSG_MCP, "drv_pulse 0x%x  fw_mb 0x%x\n",
-                  bp->fw_drv_pulse_wr_seq, bp->fw_mb);
-       } else {
-               bp->fw_mb = 0;
-       }
+               bp->func_stx = SHMEM_RD(bp, func_mb[func].fw_mb_param);
+               DP(BNX2X_MSG_MCP, "drv_pulse 0x%x  func_stx 0x%x\n",
+                  bp->fw_drv_pulse_wr_seq, bp->func_stx);
+       } else
+               bp->func_stx = 0;
 
-       return 0;
+       /* this needs to be done before gunzip end */
+       bnx2x_zero_def_sb(bp);
+       for_each_queue(bp, i)
+               bnx2x_zero_sb(bp, BP_L_ID(bp) + i);
+
+init_hw_err:
+       bnx2x_gunzip_end(bp);
+
+       return rc;
 }
 
 /* send the MCP a request, block until there is a reply */
 static u32 bnx2x_fw_command(struct bnx2x *bp, u32 command)
 {
-       int port = bp->port;
+       int func = BP_FUNC(bp);
        u32 seq = ++bp->fw_seq;
        u32 rc = 0;
 
-       SHMEM_WR(bp, func_mb[port].drv_mb_header, (command | seq));
+       SHMEM_WR(bp, func_mb[func].drv_mb_header, (command | seq));
        DP(BNX2X_MSG_MCP, "wrote command (%x) to FW MB\n", (command | seq));
 
        /* let the FW do it's magic ... */
@@ -6620,7 +5648,7 @@ static u32 bnx2x_fw_command(struct bnx2x *bp, u32 command)
        if (CHIP_REV_IS_SLOW(bp))
                msleep(900);
 
-       rc = SHMEM_RD(bp, func_mb[port].fw_mb_header);
+       rc = SHMEM_RD(bp, func_mb[func].fw_mb_header);
        DP(BNX2X_MSG_MCP, "read (%x) seq is (%x) from FW MB\n", rc, seq);
 
        /* is this a reply to our command? */
@@ -6683,17 +5711,19 @@ static void bnx2x_free_mem(struct bnx2x *bp)
                               bnx2x_fp(bp, i, rx_comp_mapping),
                               sizeof(struct eth_fast_path_rx_cqe) *
                               NUM_RCQ_BD);
-       }
-
-       BNX2X_FREE(bp->fp);
 
+               /* SGE ring */
+               BNX2X_PCI_FREE(bnx2x_fp(bp, i, rx_sge_ring),
+                              bnx2x_fp(bp, i, rx_sge_mapping),
+                              BCM_PAGE_SIZE * NUM_RX_SGE_PAGES);
+       }
        /* end of fastpath */
 
        BNX2X_PCI_FREE(bp->def_status_blk, bp->def_status_blk_mapping,
-                      (sizeof(struct host_def_status_block)));
+                      sizeof(struct host_def_status_block));
 
        BNX2X_PCI_FREE(bp->slowpath, bp->slowpath_mapping,
-                      (sizeof(struct bnx2x_slowpath)));
+                      sizeof(struct bnx2x_slowpath));
 
 #ifdef BCM_ISCSI
        BNX2X_PCI_FREE(bp->t1, bp->t1_mapping, 64*1024);
@@ -6701,7 +5731,7 @@ static void bnx2x_free_mem(struct bnx2x *bp)
        BNX2X_PCI_FREE(bp->timers, bp->timers_mapping, 8*1024);
        BNX2X_PCI_FREE(bp->qm, bp->qm_mapping, 128*1024);
 #endif
-       BNX2X_PCI_FREE(bp->spq, bp->spq_mapping, PAGE_SIZE);
+       BNX2X_PCI_FREE(bp->spq, bp->spq_mapping, BCM_PAGE_SIZE);
 
 #undef BNX2X_PCI_FREE
 #undef BNX2X_KFREE
@@ -6729,8 +5759,6 @@ static int bnx2x_alloc_mem(struct bnx2x *bp)
        int i;
 
        /* fastpath */
-       BNX2X_ALLOC(bp->fp, sizeof(struct bnx2x_fastpath) * bp->num_queues);
-
        for_each_queue(bp, i) {
                bnx2x_fp(bp, i, bp) = bp;
 
@@ -6765,6 +5793,12 @@ static int bnx2x_alloc_mem(struct bnx2x *bp)
                                sizeof(struct eth_fast_path_rx_cqe) *
                                NUM_RCQ_BD);
 
+               /* SGE ring */
+               BNX2X_ALLOC(bnx2x_fp(bp, i, rx_page_ring),
+                               sizeof(struct sw_rx_page) * NUM_RX_SGE);
+               BNX2X_PCI_ALLOC(bnx2x_fp(bp, i, rx_sge_ring),
+                               &bnx2x_fp(bp, i, rx_sge_mapping),
+                               BCM_PAGE_SIZE * NUM_RX_SGE_PAGES);
        }
        /* end of fastpath */
 
@@ -6826,8 +5860,6 @@ static void bnx2x_free_tx_skbs(struct bnx2x *bp)
                u16 sw_prod = fp->tx_pkt_prod;
                u16 sw_cons = fp->tx_pkt_cons;
 
-               BUG_TRAP(fp->tx_buf_ring != NULL);
-
                while (sw_cons != sw_prod) {
                        bd_cons = bnx2x_free_tx_pkt(bp, fp, TX_BD(sw_cons));
                        sw_cons++;
@@ -6842,8 +5874,6 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)
        for_each_queue(bp, j) {
                struct bnx2x_fastpath *fp = &bp->fp[j];
 
-               BUG_TRAP(fp->rx_buf_ring != NULL);
-
                for (i = 0; i < NUM_RX_BD; i++) {
                        struct sw_rx_bd *rx_buf = &fp->rx_buf_ring[i];
                        struct sk_buff *skb = rx_buf->skb;
@@ -6859,6 +5889,9 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)
                        rx_buf->skb = NULL;
                        dev_kfree_skb(skb);
                }
+               if (!fp->disable_tpa)
+                       bnx2x_free_tpa_pool(bp, fp,
+                                           ETH_MAX_AGGREGATION_QUEUES_E1H);
        }
 }
 
@@ -6870,7 +5903,7 @@ static void bnx2x_free_skbs(struct bnx2x *bp)
 
 static void bnx2x_free_msix_irqs(struct bnx2x *bp)
 {
-       int i;
+       int i, offset = 1;
 
        free_irq(bp->msix_table[0].vector, bp->dev);
        DP(NETIF_MSG_IFDOWN, "released sp irq (%d)\n",
@@ -6878,26 +5911,22 @@ static void bnx2x_free_msix_irqs(struct bnx2x *bp)
 
        for_each_queue(bp, i) {
                DP(NETIF_MSG_IFDOWN, "about to release fp #%d->%d irq  "
-                  "state(%x)\n", i, bp->msix_table[i + 1].vector,
+                  "state %x\n", i, bp->msix_table[i + offset].vector,
                   bnx2x_fp(bp, i, state));
 
                if (bnx2x_fp(bp, i, state) != BNX2X_FP_STATE_CLOSED)
                        BNX2X_ERR("IRQ of fp #%d being freed while "
                                  "state != closed\n", i);
 
-               free_irq(bp->msix_table[i + 1].vector, &bp->fp[i]);
+               free_irq(bp->msix_table[i + offset].vector, &bp->fp[i]);
        }
-
 }
 
 static void bnx2x_free_irq(struct bnx2x *bp)
 {
-
        if (bp->flags & USING_MSIX_FLAG) {
-
                bnx2x_free_msix_irqs(bp);
                pci_disable_msix(bp->pdev);
-
                bp->flags &= ~USING_MSIX_FLAG;
 
        } else
@@ -6906,87 +5935,87 @@ static void bnx2x_free_irq(struct bnx2x *bp)
 
 static int bnx2x_enable_msix(struct bnx2x *bp)
 {
-
-       int i;
+       int i, rc, offset;
 
        bp->msix_table[0].entry = 0;
-       for_each_queue(bp, i)
-               bp->msix_table[i + 1].entry = i + 1;
+       offset = 1;
+       DP(NETIF_MSG_IFUP, "msix_table[0].entry = 0 (slowpath)\n");
 
-       if (pci_enable_msix(bp->pdev, &bp->msix_table[0],
-                                    bp->num_queues + 1)){
-               BNX2X_LOG("failed to enable MSI-X\n");
-               return -1;
+       for_each_queue(bp, i) {
+               int igu_vec = offset + i + BP_L_ID(bp);
 
+               bp->msix_table[i + offset].entry = igu_vec;
+               DP(NETIF_MSG_IFUP, "msix_table[%d].entry = %d "
+                  "(fastpath #%u)\n", i + offset, igu_vec, i);
        }
 
+       rc = pci_enable_msix(bp->pdev, &bp->msix_table[0],
+                            bp->num_queues + offset);
+       if (rc) {
+               DP(NETIF_MSG_IFUP, "MSI-X is not attainable\n");
+               return -1;
+       }
        bp->flags |= USING_MSIX_FLAG;
 
        return 0;
-
 }
 
-
 static int bnx2x_req_msix_irqs(struct bnx2x *bp)
 {
-
-       int i, rc;
+       int i, rc, offset = 1;
 
        rc = request_irq(bp->msix_table[0].vector, bnx2x_msix_sp_int, 0,
                         bp->dev->name, bp->dev);
-
        if (rc) {
                BNX2X_ERR("request sp irq failed\n");
                return -EBUSY;
        }
 
        for_each_queue(bp, i) {
-               rc = request_irq(bp->msix_table[i + 1].vector,
+               rc = request_irq(bp->msix_table[i + offset].vector,
                                 bnx2x_msix_fp_int, 0,
                                 bp->dev->name, &bp->fp[i]);
-
                if (rc) {
-                       BNX2X_ERR("request fp #%d irq failed  "
-                                 "rc %d\n", i, rc);
+                       BNX2X_ERR("request fp #%d irq failed  rc %d\n",
+                                 i + offset, rc);
                        bnx2x_free_msix_irqs(bp);
                        return -EBUSY;
                }
 
                bnx2x_fp(bp, i, state) = BNX2X_FP_STATE_IRQ;
-
        }
 
        return 0;
-
 }
 
 static int bnx2x_req_irq(struct bnx2x *bp)
 {
+       int rc;
 
-       int rc = request_irq(bp->pdev->irq, bnx2x_interrupt,
-                            IRQF_SHARED, bp->dev->name, bp->dev);
+       rc = request_irq(bp->pdev->irq, bnx2x_interrupt, IRQF_SHARED,
+                        bp->dev->name, bp->dev);
        if (!rc)
                bnx2x_fp(bp, 0, state) = BNX2X_FP_STATE_IRQ;
 
        return rc;
-
 }
 
 /*
  * Init service functions
  */
 
-static void bnx2x_set_mac_addr(struct bnx2x *bp)
+static void bnx2x_set_mac_addr_e1(struct bnx2x *bp)
 {
        struct mac_configuration_cmd *config = bnx2x_sp(bp, mac_config);
+       int port = BP_PORT(bp);
 
        /* CAM allocation
         * unicasts 0-31:port0 32-63:port1
         * multicast 64-127:port0 128-191:port1
         */
        config->hdr.length_6b = 2;
-       config->hdr.offset = bp->port ? 31 : 0;
-       config->hdr.reserved0 = 0;
+       config->hdr.offset = port ? 31 : 0;
+       config->hdr.client_id = BP_CL_ID(bp);
        config->hdr.reserved1 = 0;
 
        /* primary MAC */
@@ -6996,7 +6025,7 @@ static void bnx2x_set_mac_addr(struct bnx2x *bp)
                                        swab16(*(u16 *)&bp->dev->dev_addr[2]);
        config->config_table[0].cam_entry.lsb_mac_addr =
                                        swab16(*(u16 *)&bp->dev->dev_addr[4]);
-       config->config_table[0].cam_entry.flags = cpu_to_le16(bp->port);
+       config->config_table[0].cam_entry.flags = cpu_to_le16(port);
        config->config_table[0].target_table_entry.flags = 0;
        config->config_table[0].target_table_entry.client_id = 0;
        config->config_table[0].target_table_entry.vlan_id = 0;
@@ -7010,7 +6039,7 @@ static void bnx2x_set_mac_addr(struct bnx2x *bp)
        config->config_table[1].cam_entry.msb_mac_addr = 0xffff;
        config->config_table[1].cam_entry.middle_mac_addr = 0xffff;
        config->config_table[1].cam_entry.lsb_mac_addr = 0xffff;
-       config->config_table[1].cam_entry.flags = cpu_to_le16(bp->port);
+       config->config_table[1].cam_entry.flags = cpu_to_le16(port);
        config->config_table[1].target_table_entry.flags =
                                TSTORM_CAM_TARGET_TABLE_ENTRY_BROADCAST;
        config->config_table[1].target_table_entry.client_id = 0;
@@ -7021,64 +6050,105 @@ static void bnx2x_set_mac_addr(struct bnx2x *bp)
                      U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0);
 }
 
+static void bnx2x_set_mac_addr_e1h(struct bnx2x *bp)
+{
+       struct mac_configuration_cmd_e1h *config =
+               (struct mac_configuration_cmd_e1h *)bnx2x_sp(bp, mac_config);
+
+       if (bp->state != BNX2X_STATE_OPEN) {
+               DP(NETIF_MSG_IFUP, "state is %x, returning\n", bp->state);
+               return;
+       }
+
+       /* CAM allocation for E1H
+        * unicasts: by func number
+        * multicast: 20+FUNC*20, 20 each
+        */
+       config->hdr.length_6b = 1;
+       config->hdr.offset = BP_FUNC(bp);
+       config->hdr.client_id = BP_CL_ID(bp);
+       config->hdr.reserved1 = 0;
+
+       /* primary MAC */
+       config->config_table[0].msb_mac_addr =
+                                       swab16(*(u16 *)&bp->dev->dev_addr[0]);
+       config->config_table[0].middle_mac_addr =
+                                       swab16(*(u16 *)&bp->dev->dev_addr[2]);
+       config->config_table[0].lsb_mac_addr =
+                                       swab16(*(u16 *)&bp->dev->dev_addr[4]);
+       config->config_table[0].client_id = BP_L_ID(bp);
+       config->config_table[0].vlan_id = 0;
+       config->config_table[0].e1hov_id = cpu_to_le16(bp->e1hov);
+       config->config_table[0].flags = BP_PORT(bp);
+
+       DP(NETIF_MSG_IFUP, "setting MAC (%04x:%04x:%04x)  E1HOV %d  CLID %d\n",
+          config->config_table[0].msb_mac_addr,
+          config->config_table[0].middle_mac_addr,
+          config->config_table[0].lsb_mac_addr, bp->e1hov, BP_L_ID(bp));
+
+       bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0,
+                     U64_HI(bnx2x_sp_mapping(bp, mac_config)),
+                     U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0);
+}
+
 static int bnx2x_wait_ramrod(struct bnx2x *bp, int state, int idx,
                             int *state_p, int poll)
 {
        /* can take a while if any port is running */
-       int timeout = 500;
+       int cnt = 500;
 
        DP(NETIF_MSG_IFUP, "%s for state to become %x on IDX [%d]\n",
           poll ? "polling" : "waiting", state, idx);
 
        might_sleep();
-
-       while (timeout) {
-
+       while (cnt--) {
                if (poll) {
                        bnx2x_rx_int(bp->fp, 10);
-                       /* If index is different from 0
-                        * The reply for some commands will
+                       /* if index is different from 0
+                        * the reply for some commands will
                         * be on the none default queue
                         */
                        if (idx)
                                bnx2x_rx_int(&bp->fp[idx], 10);
                }
-
-               mb(); /* state is changed by bnx2x_sp_event()*/
+               mb(); /* state is changed by bnx2x_sp_event() */
 
                if (*state_p == state)
                        return 0;
 
-               timeout--;
                msleep(1);
-
        }
 
        /* timeout! */
        BNX2X_ERR("timeout %s for state %x on IDX [%d]\n",
                  poll ? "polling" : "waiting", state, idx);
+#ifdef BNX2X_STOP_ON_ERROR
+       bnx2x_panic();
+#endif
 
        return -EBUSY;
 }
 
 static int bnx2x_setup_leading(struct bnx2x *bp)
 {
+       int rc;
 
        /* reset IGU state */
-       bnx2x_ack_sb(bp, DEF_SB_ID, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
+       bnx2x_ack_sb(bp, bp->fp[0].sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
 
        /* SETUP ramrod */
        bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_PORT_SETUP, 0, 0, 0, 0);
 
-       return bnx2x_wait_ramrod(bp, BNX2X_STATE_OPEN, 0, &(bp->state), 0);
+       /* Wait for completion */
+       rc = bnx2x_wait_ramrod(bp, BNX2X_STATE_OPEN, 0, &(bp->state), 0);
 
+       return rc;
 }
 
 static int bnx2x_setup_multi(struct bnx2x *bp, int index)
 {
-
        /* reset IGU state */
-       bnx2x_ack_sb(bp, index, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
+       bnx2x_ack_sb(bp, bp->fp[index].sb_id, CSTORM_ID, 0, IGU_INT_ENABLE, 0);
 
        /* SETUP ramrod */
        bp->fp[index].state = BNX2X_FP_STATE_OPENING;
@@ -7087,82 +6157,111 @@ static int bnx2x_setup_multi(struct bnx2x *bp, int index)
        /* Wait for completion */
        return bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_OPEN, index,
                                 &(bp->fp[index].state), 0);
-
 }
 
-
 static int bnx2x_poll(struct napi_struct *napi, int budget);
 static void bnx2x_set_rx_mode(struct net_device *dev);
 
-static int bnx2x_nic_load(struct bnx2x *bp, int req_irq)
+/* must be called with rtnl_lock */
+static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 {
        u32 load_code;
-       int i;
+       int i, rc;
+
+#ifdef BNX2X_STOP_ON_ERROR
+       if (unlikely(bp->panic))
+               return -EPERM;
+#endif
 
        bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD;
 
-       /* Send LOAD_REQUEST command to MCP.
-          Returns the type of LOAD command: if it is the
-          first port to be initialized common blocks should be
-          initialized, otherwise - not.
+       /* Send LOAD_REQUEST command to MCP
+          Returns the type of LOAD command:
+          if it is the first port to be initialized
+          common blocks should be initialized, otherwise - not
        */
-       if (!nomcp) {
+       if (!BP_NOMCP(bp)) {
                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ);
                if (!load_code) {
                        BNX2X_ERR("MCP response failure, unloading\n");
                        return -EBUSY;
                }
-               if (load_code == FW_MSG_CODE_DRV_LOAD_REFUSED) {
-                       BNX2X_ERR("MCP refused load request, unloading\n");
+               if (load_code == FW_MSG_CODE_DRV_LOAD_REFUSED)
                        return -EBUSY; /* other port in diagnostic mode */
-               }
+
        } else {
-               load_code = FW_MSG_CODE_DRV_LOAD_COMMON;
+               DP(NETIF_MSG_IFUP, "NO MCP load counts before us %d, %d, %d\n",
+                  load_count[0], load_count[1], load_count[2]);
+               load_count[0]++;
+               load_count[1 + BP_PORT(bp)]++;
+               DP(NETIF_MSG_IFUP, "NO MCP new load counts       %d, %d, %d\n",
+                  load_count[0], load_count[1], load_count[2]);
+               if (load_count[0] == 1)
+                       load_code = FW_MSG_CODE_DRV_LOAD_COMMON;
+               else if (load_count[1 + BP_PORT(bp)] == 1)
+                       load_code = FW_MSG_CODE_DRV_LOAD_PORT;
+               else
+                       load_code = FW_MSG_CODE_DRV_LOAD_FUNCTION;
        }
 
-       /* if we can't use msix we only need one fp,
-        * so try to enable msix with the requested number of fp's
+       if ((load_code == FW_MSG_CODE_DRV_LOAD_COMMON) ||
+           (load_code == FW_MSG_CODE_DRV_LOAD_PORT))
+               bp->port.pmf = 1;
+       else
+               bp->port.pmf = 0;
+       DP(NETIF_MSG_LINK, "pmf %d\n", bp->port.pmf);
+
+       /* if we can't use MSI-X we only need one fp,
+        * so try to enable MSI-X with the requested number of fp's
         * and fallback to inta with one fp
         */
-       if (req_irq) {
-               if (use_inta) {
+       if (use_inta) {
+               bp->num_queues = 1;
+
+       } else {
+               if ((use_multi > 1) && (use_multi <= BP_MAX_QUEUES(bp)))
+                       /* user requested number */
+                       bp->num_queues = use_multi;
+
+               else if (use_multi)
+                       bp->num_queues = min_t(u32, num_online_cpus(),
+                                              BP_MAX_QUEUES(bp));
+               else
                        bp->num_queues = 1;
-               } else {
-                       if ((use_multi > 1) && (use_multi <= 16))
-                               /* user requested number */
-                               bp->num_queues = use_multi;
-                       else if (use_multi == 1)
-                               bp->num_queues = num_online_cpus();
-                       else
-                               bp->num_queues = 1;
-
-                       if (bnx2x_enable_msix(bp)) {
-                               /* failed to enable msix */
-                               bp->num_queues = 1;
-                               if (use_multi)
-                                       BNX2X_ERR("Multi requested but failed"
-                                                 " to enable MSI-X\n");
-                       }
+
+               if (bnx2x_enable_msix(bp)) {
+                       /* failed to enable MSI-X */
+                       bp->num_queues = 1;
+                       if (use_multi)
+                               BNX2X_ERR("Multi requested but failed"
+                                         " to enable MSI-X\n");
                }
        }
-
-       DP(NETIF_MSG_IFUP, "set number of queues to %d\n", bp->num_queues);
+       DP(NETIF_MSG_IFUP,
+          "set number of queues to %d\n", bp->num_queues);
 
        if (bnx2x_alloc_mem(bp))
                return -ENOMEM;
 
-       if (req_irq) {
-               if (bp->flags & USING_MSIX_FLAG) {
-                       if (bnx2x_req_msix_irqs(bp)) {
-                               pci_disable_msix(bp->pdev);
-                               goto load_error;
-                       }
+       for_each_queue(bp, i)
+               bnx2x_fp(bp, i, disable_tpa) =
+                                       ((bp->flags & TPA_ENABLE_FLAG) == 0);
 
-               } else {
-                       if (bnx2x_req_irq(bp)) {
-                               BNX2X_ERR("IRQ request failed, aborting\n");
-                               goto load_error;
-                       }
+       /* Disable interrupt handling until HW is initialized */
+       atomic_set(&bp->intr_sem, 1);
+
+       if (bp->flags & USING_MSIX_FLAG) {
+               rc = bnx2x_req_msix_irqs(bp);
+               if (rc) {
+                       pci_disable_msix(bp->pdev);
+                       goto load_error;
+               }
+       } else {
+               bnx2x_ack_int(bp);
+               rc = bnx2x_req_irq(bp);
+               if (rc) {
+                       BNX2X_ERR("IRQ request failed, aborting\n");
+                       goto load_error;
                }
        }
 
@@ -7170,30 +6269,31 @@ static int bnx2x_nic_load(struct bnx2x *bp, int req_irq)
                netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
                               bnx2x_poll, 128);
 
-
        /* Initialize HW */
-       if (bnx2x_function_init(bp,
-                               (load_code == FW_MSG_CODE_DRV_LOAD_COMMON))) {
+       rc = bnx2x_init_hw(bp, load_code);
+       if (rc) {
                BNX2X_ERR("HW init failed, aborting\n");
                goto load_error;
        }
 
-
+       /* Enable interrupt handling */
        atomic_set(&bp->intr_sem, 0);
 
-
        /* Setup NIC internals and enable interrupts */
        bnx2x_nic_init(bp);
 
        /* Send LOAD_DONE command to MCP */
-       if (!nomcp) {
+       if (!BP_NOMCP(bp)) {
                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE);
                if (!load_code) {
                        BNX2X_ERR("MCP response failure, unloading\n");
+                       rc = -EBUSY;
                        goto load_int_disable;
                }
        }
 
+       bnx2x_stats_init(bp);
+
        bp->state = BNX2X_STATE_OPENING_WAIT4_PORT;
 
        /* Enable Rx interrupt handling before sending the ramrod
@@ -7201,33 +6301,68 @@ static int bnx2x_nic_load(struct bnx2x *bp, int req_irq)
        for_each_queue(bp, i)
                napi_enable(&bnx2x_fp(bp, i, napi));
 
-       if (bnx2x_setup_leading(bp))
+       rc = bnx2x_setup_leading(bp);
+       if (rc) {
+#ifdef BNX2X_STOP_ON_ERROR
+               bp->panic = 1;
+#endif
                goto load_stop_netif;
+       }
 
-       for_each_nondefault_queue(bp, i)
-               if (bnx2x_setup_multi(bp, i))
-                       goto load_stop_netif;
+       if (CHIP_IS_E1H(bp))
+               if (bp->mf_config & FUNC_MF_CFG_FUNC_DISABLED) {
+                       BNX2X_ERR("!!!  mf_cfg function disabled\n");
+                       bp->state = BNX2X_STATE_DISABLED;
+               }
+
+       if (bp->state == BNX2X_STATE_OPEN)
+               for_each_nondefault_queue(bp, i) {
+                       rc = bnx2x_setup_multi(bp, i);
+                       if (rc)
+                               goto load_stop_netif;
+               }
 
-       bnx2x_set_mac_addr(bp);
+       if (CHIP_IS_E1(bp))
+               bnx2x_set_mac_addr_e1(bp);
+       else
+               bnx2x_set_mac_addr_e1h(bp);
 
-       bnx2x_phy_init(bp);
+       if (bp->port.pmf)
+               bnx2x_initial_phy_init(bp);
 
        /* Start fast path */
-       if (req_irq) { /* IRQ is only requested from bnx2x_open */
+       switch (load_mode) {
+       case LOAD_NORMAL:
+               /* Tx queue should be only reenabled */
+               netif_wake_queue(bp->dev);
+               bnx2x_set_rx_mode(bp->dev);
+               break;
+
+       case LOAD_OPEN:
+               /* IRQ is only requested from bnx2x_open */
                netif_start_queue(bp->dev);
+               bnx2x_set_rx_mode(bp->dev);
                if (bp->flags & USING_MSIX_FLAG)
                        printk(KERN_INFO PFX "%s: using MSI-X\n",
                               bp->dev->name);
+               break;
 
-       /* Otherwise Tx queue should be only reenabled */
-       } else if (netif_running(bp->dev)) {
-               netif_wake_queue(bp->dev);
+       case LOAD_DIAG:
                bnx2x_set_rx_mode(bp->dev);
+               bp->state = BNX2X_STATE_DIAG;
+               break;
+
+       default:
+               break;
        }
 
+       if (!bp->port.pmf)
+               bnx2x__link_status_update(bp);
+
        /* start the timer */
        mod_timer(&bp->timer, jiffies + bp->current_interval);
 
+
        return 0;
 
 load_stop_netif:
@@ -7237,103 +6372,63 @@ load_stop_netif:
 load_int_disable:
        bnx2x_int_disable_sync(bp);
 
-       bnx2x_free_skbs(bp);
+       /* Release IRQs */
        bnx2x_free_irq(bp);
 
+       /* Free SKBs, SGEs, TPA pool and driver internals */
+       bnx2x_free_skbs(bp);
+       for_each_queue(bp, i)
+               bnx2x_free_rx_sge_range(bp, bp->fp + i,
+                                       RX_SGE_CNT*NUM_RX_SGE_PAGES);
 load_error:
        bnx2x_free_mem(bp);
 
        /* TBD we really need to reset the chip
           if we want to recover from this */
-       return -EBUSY;
-}
-
-
-static void bnx2x_reset_chip(struct bnx2x *bp, u32 reset_code)
-{
-       int port = bp->port;
-#ifdef USE_DMAE
-       u32 wb_write[2];
-#endif
-       int base, i;
-
-       DP(NETIF_MSG_IFDOWN, "reset called with code %x\n", reset_code);
-
-       /* Do not rcv packets to BRB */
-       REG_WR(bp, NIG_REG_LLH0_BRB1_DRV_MASK + port*4, 0x0);
-       /* Do not direct rcv packets that are not for MCP to the BRB */
-       REG_WR(bp, (port ? NIG_REG_LLH1_BRB1_NOT_MCP :
-                          NIG_REG_LLH0_BRB1_NOT_MCP), 0x0);
-
-       /* Configure IGU and AEU */
-       REG_WR(bp, HC_REG_CONFIG_0 + port*4, 0x1000);
-       REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, 0);
-
-       /* TODO: Close Doorbell port? */
-
-       /* Clear ILT */
-#ifdef USE_DMAE
-       wb_write[0] = 0;
-       wb_write[1] = 0;
-#endif
-       base = port * RQ_ONCHIP_AT_PORT_SIZE;
-       for (i = base; i < base + RQ_ONCHIP_AT_PORT_SIZE; i++) {
-#ifdef USE_DMAE
-               REG_WR_DMAE(bp, PXP2_REG_RQ_ONCHIP_AT + i*8, wb_write, 2);
-#else
-               REG_WR_IND(bp, PXP2_REG_RQ_ONCHIP_AT, 0);
-               REG_WR_IND(bp, PXP2_REG_RQ_ONCHIP_AT + 4, 0);
-#endif
-       }
-
-       if (reset_code == FW_MSG_CODE_DRV_UNLOAD_COMMON) {
-               /* reset_common */
-               REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR,
-                      0xd3ffff7f);
-               REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-                      0x1403);
-       }
+       return rc;
 }
 
 static int bnx2x_stop_multi(struct bnx2x *bp, int index)
 {
-
        int rc;
 
        /* halt the connection */
        bp->fp[index].state = BNX2X_FP_STATE_HALTING;
        bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, index, 0, 0, 0);
 
-
+       /* Wait for completion */
        rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, index,
-                                      &(bp->fp[index].state), 1);
+                              &(bp->fp[index].state), 1);
        if (rc) /* timeout */
                return rc;
 
        /* delete cfc entry */
        bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_CFC_DEL, index, 0, 0, 1);
 
-       return bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_CLOSED, index,
-                                &(bp->fp[index].state), 1);
-
+       /* Wait for completion */
+       rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_CLOSED, index,
+                              &(bp->fp[index].state), 1);
+       return rc;
 }
 
-
 static void bnx2x_stop_leading(struct bnx2x *bp)
 {
        u16 dsb_sp_prod_idx;
        /* if the other port is handling traffic,
           this can take a lot of time */
-       int timeout = 500;
+       int cnt = 500;
+       int rc;
 
        might_sleep();
 
        /* Send HALT ramrod */
        bp->fp[0].state = BNX2X_FP_STATE_HALTING;
-       bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, 0, 0, 0, 0);
+       bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_HALT, 0, 0, BP_CL_ID(bp), 0);
 
-       if (bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, 0,
-                              &(bp->fp[0].state), 1))
+       /* Wait for completion */
+       rc = bnx2x_wait_ramrod(bp, BNX2X_FP_STATE_HALTED, 0,
+                              &(bp->fp[0].state), 1);
+       if (rc) /* timeout */
                return;
 
        dsb_sp_prod_idx = *bp->dsb_sp_prod;
@@ -7345,29 +6440,110 @@ static void bnx2x_stop_leading(struct bnx2x *bp)
           we are going to reset the chip anyway
           so there is not much to do if this times out
         */
-       while ((dsb_sp_prod_idx == *bp->dsb_sp_prod) && timeout) {
-               timeout--;
+       while (dsb_sp_prod_idx == *bp->dsb_sp_prod) {
                msleep(1);
-       }
-       if (!timeout) {
-               DP(NETIF_MSG_IFDOWN, "timeout polling for completion "
-                  "dsb_sp_prod 0x%x != dsb_sp_prod_idx 0x%x\n",
-                  *bp->dsb_sp_prod, dsb_sp_prod_idx);
+               if (!cnt) {
+                       DP(NETIF_MSG_IFDOWN, "timeout waiting for port del "
+                          "dsb_sp_prod 0x%x != dsb_sp_prod_idx 0x%x\n",
+                          *bp->dsb_sp_prod, dsb_sp_prod_idx);
+#ifdef BNX2X_STOP_ON_ERROR
+                       bnx2x_panic();
+#endif
+                       break;
+               }
+               cnt--;
        }
        bp->state = BNX2X_STATE_CLOSING_WAIT4_UNLOAD;
        bp->fp[0].state = BNX2X_FP_STATE_CLOSED;
 }
 
+static void bnx2x_reset_func(struct bnx2x *bp)
+{
+       int port = BP_PORT(bp);
+       int func = BP_FUNC(bp);
+       int base, i;
+
+       /* Configure IGU */
+       REG_WR(bp, HC_REG_LEADING_EDGE_0 + port*8, 0);
+       REG_WR(bp, HC_REG_TRAILING_EDGE_0 + port*8, 0);
+
+       REG_WR(bp, HC_REG_CONFIG_0 + port*4, 0x1000);
+
+       /* Clear ILT */
+       base = FUNC_ILT_BASE(func);
+       for (i = base; i < base + ILT_PER_FUNC; i++)
+               bnx2x_ilt_wr(bp, i, 0);
+}
+
+static void bnx2x_reset_port(struct bnx2x *bp)
+{
+       int port = BP_PORT(bp);
+       u32 val;
+
+       REG_WR(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4, 0);
+
+       /* Do not rcv packets to BRB */
+       REG_WR(bp, NIG_REG_LLH0_BRB1_DRV_MASK + port*4, 0x0);
+       /* Do not direct rcv packets that are not for MCP to the BRB */
+       REG_WR(bp, (port ? NIG_REG_LLH1_BRB1_NOT_MCP :
+                          NIG_REG_LLH0_BRB1_NOT_MCP), 0x0);
+
+       /* Configure AEU */
+       REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, 0);
+
+       msleep(100);
+       /* Check for BRB port occupancy */
+       val = REG_RD(bp, BRB1_REG_PORT_NUM_OCC_BLOCKS_0 + port*4);
+       if (val)
+               DP(NETIF_MSG_IFDOWN,
+                  "BRB1 is not empty  %d blooks are occupied\n", val);
+
+       /* TODO: Close Doorbell port? */
+}
+
+static void bnx2x_reset_common(struct bnx2x *bp)
+{
+       /* reset_common */
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR,
+              0xd3ffff7f);
+       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR, 0x1403);
+}
+
+static void bnx2x_reset_chip(struct bnx2x *bp, u32 reset_code)
+{
+       DP(BNX2X_MSG_MCP, "function %d  reset_code %x\n",
+          BP_FUNC(bp), reset_code);
+
+       switch (reset_code) {
+       case FW_MSG_CODE_DRV_UNLOAD_COMMON:
+               bnx2x_reset_port(bp);
+               bnx2x_reset_func(bp);
+               bnx2x_reset_common(bp);
+               break;
+
+       case FW_MSG_CODE_DRV_UNLOAD_PORT:
+               bnx2x_reset_port(bp);
+               bnx2x_reset_func(bp);
+               break;
+
+       case FW_MSG_CODE_DRV_UNLOAD_FUNCTION:
+               bnx2x_reset_func(bp);
+               break;
+
+       default:
+               BNX2X_ERR("Unknown reset_code (0x%x) from MCP\n", reset_code);
+               break;
+       }
+}
 
-static int bnx2x_nic_unload(struct bnx2x *bp, int free_irq)
+/* msut be called with rtnl_lock */
+static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
 {
        u32 reset_code = 0;
-       int i, timeout;
+       int i, cnt;
 
        bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT;
 
-       del_timer_sync(&bp->timer);
-
        bp->rx_mode = BNX2X_RX_MODE_NONE;
        bnx2x_set_storm_rx_mode(bp);
 
@@ -7376,21 +6552,45 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int free_irq)
                bp->dev->trans_start = jiffies; /* prevent tx timeout */
        }
 
+       del_timer_sync(&bp->timer);
+       SHMEM_WR(bp, func_mb[BP_FUNC(bp)].drv_pulse_mb,
+                (DRV_PULSE_ALWAYS_ALIVE | bp->fw_drv_pulse_wr_seq));
+       bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+
        /* Wait until all fast path tasks complete */
        for_each_queue(bp, i) {
                struct bnx2x_fastpath *fp = &bp->fp[i];
 
-               timeout = 1000;
-               while (bnx2x_has_work(fp) && (timeout--))
+#ifdef BNX2X_STOP_ON_ERROR
+#ifdef __powerpc64__
+               DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%lx\n",
+#else
+               DP(NETIF_MSG_IFDOWN, "fp->tpa_queue_used = 0x%llx\n",
+#endif
+                  fp->tpa_queue_used);
+#endif
+               cnt = 1000;
+               smp_rmb();
+               while (bnx2x_has_work(fp)) {
                        msleep(1);
-               if (!timeout)
-                       BNX2X_ERR("timeout waiting for queue[%d]\n", i);
+                       if (!cnt) {
+                               BNX2X_ERR("timeout waiting for queue[%d]\n",
+                                         i);
+#ifdef BNX2X_STOP_ON_ERROR
+                               bnx2x_panic();
+                               return -EBUSY;
+#else
+                               break;
+#endif
+                       }
+                       cnt--;
+                       smp_rmb();
+               }
        }
 
-       /* Wait until stat ramrod returns and all SP tasks complete */
-       timeout = 1000;
-       while ((bp->stat_pending || (bp->spq_left != MAX_SPQ_PENDING)) &&
-              (timeout--))
+       /* Wait until all slow path tasks complete */
+       cnt = 1000;
+       while ((bp->spq_left != MAX_SPQ_PENDING) && cnt--)
                msleep(1);
 
        for_each_queue(bp, i)
@@ -7398,63 +6598,91 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int free_irq)
        /* Disable interrupts after Tx and Rx are disabled on stack level */
        bnx2x_int_disable_sync(bp);
 
+       /* Release IRQs */
+       bnx2x_free_irq(bp);
+
        if (bp->flags & NO_WOL_FLAG)
                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP;
 
        else if (bp->wol) {
-               u32 emac_base = bp->port ? GRCBASE_EMAC0 : GRCBASE_EMAC1;
+               u32 emac_base = BP_PORT(bp) ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
                u8 *mac_addr = bp->dev->dev_addr;
-               u32 val = (EMAC_MODE_MPKT | EMAC_MODE_MPKT_RCVD |
-                          EMAC_MODE_ACPI_RCVD);
-
-               EMAC_WR(EMAC_REG_EMAC_MODE, val);
+               u32 val;
 
+               /* The mac address is written to entries 1-4 to
+                  preserve entry 0 which is used by the PMF */
                val = (mac_addr[0] << 8) | mac_addr[1];
-               EMAC_WR(EMAC_REG_EMAC_MAC_MATCH, val);
+               EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + (BP_E1HVN(bp) + 1)*8, val);
 
                val = (mac_addr[2] << 24) | (mac_addr[3] << 16) |
                      (mac_addr[4] << 8) | mac_addr[5];
-               EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + 4, val);
+               EMAC_WR(EMAC_REG_EMAC_MAC_MATCH + (BP_E1HVN(bp) + 1)*8 + 4,
+                       val);
 
                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_EN;
 
        } else
                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
 
-       /* Close multi and leading connections */
+       /* Close multi and leading connections
+          Completions for ramrods are collected in a synchronous way */
        for_each_nondefault_queue(bp, i)
                if (bnx2x_stop_multi(bp, i))
                        goto unload_error;
 
+       if (CHIP_IS_E1H(bp))
+               REG_WR(bp, NIG_REG_LLH0_FUNC_EN + BP_PORT(bp)*8, 0);
+
        bnx2x_stop_leading(bp);
+#ifdef BNX2X_STOP_ON_ERROR
+       /* If ramrod completion timed out - break here! */
+       if (bp->panic) {
+               BNX2X_ERR("Stop leading failed!\n");
+               return -EBUSY;
+       }
+#endif
+
        if ((bp->state != BNX2X_STATE_CLOSING_WAIT4_UNLOAD) ||
            (bp->fp[0].state != BNX2X_FP_STATE_CLOSED)) {
-               DP(NETIF_MSG_IFDOWN, "failed to close leading properly!"
-                  "state 0x%x  fp[0].state 0x%x",
+               DP(NETIF_MSG_IFDOWN, "failed to close leading properly!  "
+                  "state 0x%x  fp[0].state 0x%x\n",
                   bp->state, bp->fp[0].state);
        }
 
 unload_error:
-       bnx2x_link_reset(bp);
-
-       if (!nomcp)
+       if (!BP_NOMCP(bp))
                reset_code = bnx2x_fw_command(bp, reset_code);
-       else
-               reset_code = FW_MSG_CODE_DRV_UNLOAD_COMMON;
+       else {
+               DP(NETIF_MSG_IFDOWN, "NO MCP load counts      %d, %d, %d\n",
+                  load_count[0], load_count[1], load_count[2]);
+               load_count[0]--;
+               load_count[1 + BP_PORT(bp)]--;
+               DP(NETIF_MSG_IFDOWN, "NO MCP new load counts  %d, %d, %d\n",
+                  load_count[0], load_count[1], load_count[2]);
+               if (load_count[0] == 0)
+                       reset_code = FW_MSG_CODE_DRV_UNLOAD_COMMON;
+               else if (load_count[1 + BP_PORT(bp)] == 0)
+                       reset_code = FW_MSG_CODE_DRV_UNLOAD_PORT;
+               else
+                       reset_code = FW_MSG_CODE_DRV_UNLOAD_FUNCTION;
+       }
 
-       /* Release IRQs */
-       if (free_irq)
-               bnx2x_free_irq(bp);
+       if ((reset_code == FW_MSG_CODE_DRV_UNLOAD_COMMON) ||
+           (reset_code == FW_MSG_CODE_DRV_UNLOAD_PORT))
+               bnx2x__link_reset(bp);
 
        /* Reset the chip */
        bnx2x_reset_chip(bp, reset_code);
 
        /* Report UNLOAD_DONE to MCP */
-       if (!nomcp)
+       if (!BP_NOMCP(bp))
                bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
 
-       /* Free SKBs and driver internals */
+       /* Free SKBs, SGEs, TPA pool and driver internals */
        bnx2x_free_skbs(bp);
+       for_each_queue(bp, i)
+               bnx2x_free_rx_sge_range(bp, bp->fp + i,
+                                       RX_SGE_CNT*NUM_RX_SGE_PAGES);
        bnx2x_free_mem(bp);
 
        bp->state = BNX2X_STATE_CLOSED;
@@ -7464,6 +6692,29 @@ unload_error:
        return 0;
 }
 
+static void bnx2x_reset_task(struct work_struct *work)
+{
+       struct bnx2x *bp = container_of(work, struct bnx2x, reset_task);
+
+#ifdef BNX2X_STOP_ON_ERROR
+       BNX2X_ERR("reset task called but STOP_ON_ERROR defined"
+                 " so reset not done to allow debug dump,\n"
+        KERN_ERR " you will need to reboot when done\n");
+       return;
+#endif
+
+       rtnl_lock();
+
+       if (!netif_running(bp->dev))
+               goto reset_task_exit;
+
+       bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+       bnx2x_nic_load(bp, LOAD_NORMAL);
+
+reset_task_exit:
+       rtnl_unlock();
+}
+
 /* end of nic load/unload */
 
 /* ethtool_ops */
@@ -7472,210 +6723,352 @@ unload_error:
  * Init service functions
  */
 
-static void bnx2x_link_settings_supported(struct bnx2x *bp, u32 switch_cfg)
+static void __devinit bnx2x_undi_unload(struct bnx2x *bp)
 {
-       int port = bp->port;
-       u32 ext_phy_type;
+       u32 val;
+
+       /* Check if there is any driver already loaded */
+       val = REG_RD(bp, MISC_REG_UNPREPARED);
+       if (val == 0x1) {
+               /* Check if it is the UNDI driver
+                * UNDI driver initializes CID offset for normal bell to 0x7
+                */
+               val = REG_RD(bp, DORQ_REG_NORM_CID_OFST);
+               if (val == 0x7) {
+                       u32 reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
+                       /* save our func and fw_seq */
+                       int func = BP_FUNC(bp);
+                       u16 fw_seq = bp->fw_seq;
+
+                       BNX2X_DEV_INFO("UNDI is active! reset device\n");
+
+                       /* try unload UNDI on port 0 */
+                       bp->func = 0;
+                       bp->fw_seq = (SHMEM_RD(bp,
+                                            func_mb[bp->func].drv_mb_header) &
+                                     DRV_MSG_SEQ_NUMBER_MASK);
+
+                       reset_code = bnx2x_fw_command(bp, reset_code);
+                       bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
+
+                       /* if UNDI is loaded on the other port */
+                       if (reset_code != FW_MSG_CODE_DRV_UNLOAD_COMMON) {
+
+                               bp->func = 1;
+                               bp->fw_seq = (SHMEM_RD(bp,
+                                            func_mb[bp->func].drv_mb_header) &
+                                             DRV_MSG_SEQ_NUMBER_MASK);
+
+                               bnx2x_fw_command(bp,
+                                            DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS);
+                               bnx2x_fw_command(bp,
+                                                DRV_MSG_CODE_UNLOAD_DONE);
+
+                               /* restore our func and fw_seq */
+                               bp->func = func;
+                               bp->fw_seq = fw_seq;
+                       }
+
+                       /* reset device */
+                       REG_WR(bp,
+                              GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR,
+                              0xd3ffff7f);
+                       REG_WR(bp,
+                              GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
+                              0x1403);
+               }
+       }
+}
+
+static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
+{
+       u32 val, val2, val3, val4, id;
+
+       /* Get the chip revision id and number. */
+       /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */
+       val = REG_RD(bp, MISC_REG_CHIP_NUM);
+       id = ((val & 0xffff) << 16);
+       val = REG_RD(bp, MISC_REG_CHIP_REV);
+       id |= ((val & 0xf) << 12);
+       val = REG_RD(bp, MISC_REG_CHIP_METAL);
+       id |= ((val & 0xff) << 4);
+       REG_RD(bp, MISC_REG_BOND_ID);
+       id |= (val & 0xf);
+       bp->common.chip_id = id;
+       bp->link_params.chip_id = bp->common.chip_id;
+       BNX2X_DEV_INFO("chip ID is 0x%x\n", id);
+
+       val = REG_RD(bp, MCP_REG_MCPR_NVM_CFG4);
+       bp->common.flash_size = (NVRAM_1MB_SIZE <<
+                                (val & MCPR_NVM_CFG4_FLASH_SIZE));
+       BNX2X_DEV_INFO("flash_size 0x%x (%d)\n",
+                      bp->common.flash_size, bp->common.flash_size);
+
+       bp->common.shmem_base = REG_RD(bp, MISC_REG_SHARED_MEM_ADDR);
+       bp->link_params.shmem_base = bp->common.shmem_base;
+       BNX2X_DEV_INFO("shmem offset is 0x%x\n", bp->common.shmem_base);
+
+       if (!bp->common.shmem_base ||
+           (bp->common.shmem_base < 0xA0000) ||
+           (bp->common.shmem_base >= 0xC0000)) {
+               BNX2X_DEV_INFO("MCP not active\n");
+               bp->flags |= NO_MCP_FLAG;
+               return;
+       }
+
+       val = SHMEM_RD(bp, validity_map[BP_PORT(bp)]);
+       if ((val & (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))
+               != (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))
+               BNX2X_ERR("BAD MCP validity signature\n");
+
+       bp->common.hw_config = SHMEM_RD(bp, dev_info.shared_hw_config.config);
+       bp->common.board = SHMEM_RD(bp, dev_info.shared_hw_config.board);
+
+       BNX2X_DEV_INFO("hw_config 0x%08x  board 0x%08x\n",
+                      bp->common.hw_config, bp->common.board);
+
+       bp->link_params.hw_led_mode = ((bp->common.hw_config &
+                                       SHARED_HW_CFG_LED_MODE_MASK) >>
+                                      SHARED_HW_CFG_LED_MODE_SHIFT);
+
+       val = SHMEM_RD(bp, dev_info.bc_rev) >> 8;
+       bp->common.bc_ver = val;
+       BNX2X_DEV_INFO("bc_ver %X\n", val);
+       if (val < BNX2X_BC_VER) {
+               /* for now only warn
+                * later we might need to enforce this */
+               BNX2X_ERR("This driver needs bc_ver %X but found %X,"
+                         " please upgrade BC\n", BNX2X_BC_VER, val);
+       }
+       BNX2X_DEV_INFO("%sWoL Capable\n",
+                      (bp->flags & NO_WOL_FLAG)? "Not " : "");
+
+       val = SHMEM_RD(bp, dev_info.shared_hw_config.part_num);
+       val2 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[4]);
+       val3 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[8]);
+       val4 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[12]);
+
+       printk(KERN_INFO PFX "part number %X-%X-%X-%X\n",
+              val, val2, val3, val4);
+}
 
-       bp->phy_flags = 0;
+static void __devinit bnx2x_link_settings_supported(struct bnx2x *bp,
+                                                   u32 switch_cfg)
+{
+       int port = BP_PORT(bp);
+       u32 ext_phy_type;
 
        switch (switch_cfg) {
        case SWITCH_CFG_1G:
                BNX2X_DEV_INFO("switch_cfg 0x%x (1G)\n", switch_cfg);
 
-               ext_phy_type = SERDES_EXT_PHY_TYPE(bp);
+               ext_phy_type =
+                       SERDES_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
                switch (ext_phy_type) {
                case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT:
                        BNX2X_DEV_INFO("ext_phy_type 0x%x (Direct)\n",
                                       ext_phy_type);
 
-                       bp->supported |= (SUPPORTED_10baseT_Half |
-                                         SUPPORTED_10baseT_Full |
-                                         SUPPORTED_100baseT_Half |
-                                         SUPPORTED_100baseT_Full |
-                                         SUPPORTED_1000baseT_Full |
-                                         SUPPORTED_2500baseX_Full |
-                                         SUPPORTED_TP | SUPPORTED_FIBRE |
-                                         SUPPORTED_Autoneg |
-                                         SUPPORTED_Pause |
-                                         SUPPORTED_Asym_Pause);
+                       bp->port.supported |= (SUPPORTED_10baseT_Half |
+                                              SUPPORTED_10baseT_Full |
+                                              SUPPORTED_100baseT_Half |
+                                              SUPPORTED_100baseT_Full |
+                                              SUPPORTED_1000baseT_Full |
+                                              SUPPORTED_2500baseX_Full |
+                                              SUPPORTED_TP |
+                                              SUPPORTED_FIBRE |
+                                              SUPPORTED_Autoneg |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
                        break;
 
                case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482:
                        BNX2X_DEV_INFO("ext_phy_type 0x%x (5482)\n",
                                       ext_phy_type);
 
-                       bp->phy_flags |= PHY_SGMII_FLAG;
-
-                       bp->supported |= (SUPPORTED_10baseT_Half |
-                                         SUPPORTED_10baseT_Full |
-                                         SUPPORTED_100baseT_Half |
-                                         SUPPORTED_100baseT_Full |
-                                         SUPPORTED_1000baseT_Full |
-                                         SUPPORTED_TP | SUPPORTED_FIBRE |
-                                         SUPPORTED_Autoneg |
-                                         SUPPORTED_Pause |
-                                         SUPPORTED_Asym_Pause);
+                       bp->port.supported |= (SUPPORTED_10baseT_Half |
+                                              SUPPORTED_10baseT_Full |
+                                              SUPPORTED_100baseT_Half |
+                                              SUPPORTED_100baseT_Full |
+                                              SUPPORTED_1000baseT_Full |
+                                              SUPPORTED_TP |
+                                              SUPPORTED_FIBRE |
+                                              SUPPORTED_Autoneg |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
                        break;
 
                default:
                        BNX2X_ERR("NVRAM config error. "
                                  "BAD SerDes ext_phy_config 0x%x\n",
-                                 bp->ext_phy_config);
+                                 bp->link_params.ext_phy_config);
                        return;
                }
 
-               bp->phy_addr = REG_RD(bp, NIG_REG_SERDES0_CTRL_PHY_ADDR +
-                                     port*0x10);
-               BNX2X_DEV_INFO("phy_addr 0x%x\n", bp->phy_addr);
+               bp->port.phy_addr = REG_RD(bp, NIG_REG_SERDES0_CTRL_PHY_ADDR +
+                                          port*0x10);
+               BNX2X_DEV_INFO("phy_addr 0x%x\n", bp->port.phy_addr);
                break;
 
        case SWITCH_CFG_10G:
                BNX2X_DEV_INFO("switch_cfg 0x%x (10G)\n", switch_cfg);
 
-               bp->phy_flags |= PHY_XGXS_FLAG;
-
-               ext_phy_type = XGXS_EXT_PHY_TYPE(bp);
+               ext_phy_type =
+                       XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
                switch (ext_phy_type) {
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
                        BNX2X_DEV_INFO("ext_phy_type 0x%x (Direct)\n",
                                       ext_phy_type);
 
-                       bp->supported |= (SUPPORTED_10baseT_Half |
-                                         SUPPORTED_10baseT_Full |
-                                         SUPPORTED_100baseT_Half |
-                                         SUPPORTED_100baseT_Full |
-                                         SUPPORTED_1000baseT_Full |
-                                         SUPPORTED_2500baseX_Full |
-                                         SUPPORTED_10000baseT_Full |
-                                         SUPPORTED_TP | SUPPORTED_FIBRE |
-                                         SUPPORTED_Autoneg |
-                                         SUPPORTED_Pause |
-                                         SUPPORTED_Asym_Pause);
+                       bp->port.supported |= (SUPPORTED_10baseT_Half |
+                                              SUPPORTED_10baseT_Full |
+                                              SUPPORTED_100baseT_Half |
+                                              SUPPORTED_100baseT_Full |
+                                              SUPPORTED_1000baseT_Full |
+                                              SUPPORTED_2500baseX_Full |
+                                              SUPPORTED_10000baseT_Full |
+                                              SUPPORTED_TP |
+                                              SUPPORTED_FIBRE |
+                                              SUPPORTED_Autoneg |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
                        break;
 
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
                        BNX2X_DEV_INFO("ext_phy_type 0x%x (8705)\n",
-                                       ext_phy_type);
+                                      ext_phy_type);
 
-                       bp->supported |= (SUPPORTED_10000baseT_Full |
-                                         SUPPORTED_FIBRE |
-                                         SUPPORTED_Pause |
-                                         SUPPORTED_Asym_Pause);
+                       bp->port.supported |= (SUPPORTED_10000baseT_Full |
+                                              SUPPORTED_FIBRE |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
                        break;
 
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
                        BNX2X_DEV_INFO("ext_phy_type 0x%x (8706)\n",
                                       ext_phy_type);
 
-                       bp->supported |= (SUPPORTED_10000baseT_Full |
-                                         SUPPORTED_1000baseT_Full |
-                                         SUPPORTED_Autoneg |
-                                         SUPPORTED_FIBRE |
-                                         SUPPORTED_Pause |
-                                         SUPPORTED_Asym_Pause);
+                       bp->port.supported |= (SUPPORTED_10000baseT_Full |
+                                              SUPPORTED_1000baseT_Full |
+                                              SUPPORTED_FIBRE |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
                        break;
 
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
                        BNX2X_DEV_INFO("ext_phy_type 0x%x (8072)\n",
                                       ext_phy_type);
 
-                       bp->supported |= (SUPPORTED_10000baseT_Full |
-                                         SUPPORTED_1000baseT_Full |
-                                         SUPPORTED_FIBRE |
-                                         SUPPORTED_Autoneg |
-                                         SUPPORTED_Pause |
-                                         SUPPORTED_Asym_Pause);
+                       bp->port.supported |= (SUPPORTED_10000baseT_Full |
+                                              SUPPORTED_1000baseT_Full |
+                                              SUPPORTED_FIBRE |
+                                              SUPPORTED_Autoneg |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
+                       break;
+
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:
+                       BNX2X_DEV_INFO("ext_phy_type 0x%x (8073)\n",
+                                      ext_phy_type);
+
+                       bp->port.supported |= (SUPPORTED_10000baseT_Full |
+                                              SUPPORTED_2500baseX_Full |
+                                              SUPPORTED_1000baseT_Full |
+                                              SUPPORTED_FIBRE |
+                                              SUPPORTED_Autoneg |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
                        break;
 
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
                        BNX2X_DEV_INFO("ext_phy_type 0x%x (SFX7101)\n",
                                       ext_phy_type);
 
-                       bp->supported |= (SUPPORTED_10000baseT_Full |
-                                         SUPPORTED_TP |
-                                         SUPPORTED_Autoneg |
-                                         SUPPORTED_Pause |
-                                         SUPPORTED_Asym_Pause);
+                       bp->port.supported |= (SUPPORTED_10000baseT_Full |
+                                              SUPPORTED_TP |
+                                              SUPPORTED_Autoneg |
+                                              SUPPORTED_Pause |
+                                              SUPPORTED_Asym_Pause);
+                       break;
+
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:
+                       BNX2X_ERR("XGXS PHY Failure detected 0x%x\n",
+                                 bp->link_params.ext_phy_config);
                        break;
 
                default:
                        BNX2X_ERR("NVRAM config error. "
                                  "BAD XGXS ext_phy_config 0x%x\n",
-                                 bp->ext_phy_config);
+                                 bp->link_params.ext_phy_config);
                        return;
                }
 
-               bp->phy_addr = REG_RD(bp, NIG_REG_XGXS0_CTRL_PHY_ADDR +
-                                     port*0x18);
-               BNX2X_DEV_INFO("phy_addr 0x%x\n", bp->phy_addr);
-
-               bp->ser_lane = ((bp->lane_config &
-                                PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
-                               PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
-               bp->rx_lane_swap = ((bp->lane_config &
-                                    PORT_HW_CFG_LANE_SWAP_CFG_RX_MASK) >>
-                                   PORT_HW_CFG_LANE_SWAP_CFG_RX_SHIFT);
-               bp->tx_lane_swap = ((bp->lane_config &
-                                    PORT_HW_CFG_LANE_SWAP_CFG_TX_MASK) >>
-                                   PORT_HW_CFG_LANE_SWAP_CFG_TX_SHIFT);
-               BNX2X_DEV_INFO("rx_lane_swap 0x%x  tx_lane_swap 0x%x\n",
-                              bp->rx_lane_swap, bp->tx_lane_swap);
+               bp->port.phy_addr = REG_RD(bp, NIG_REG_XGXS0_CTRL_PHY_ADDR +
+                                          port*0x18);
+               BNX2X_DEV_INFO("phy_addr 0x%x\n", bp->port.phy_addr);
+
                break;
 
        default:
                BNX2X_ERR("BAD switch_cfg link_config 0x%x\n",
-                         bp->link_config);
+                         bp->port.link_config);
                return;
        }
+       bp->link_params.phy_addr = bp->port.phy_addr;
 
        /* mask what we support according to speed_cap_mask */
-       if (!(bp->speed_cap_mask &
-             PORT_HW_CFG_SPEED_CAPABILITY_D0_10M_HALF))
-               bp->supported &= ~SUPPORTED_10baseT_Half;
+       if (!(bp->link_params.speed_cap_mask &
+                               PORT_HW_CFG_SPEED_CAPABILITY_D0_10M_HALF))
+               bp->port.supported &= ~SUPPORTED_10baseT_Half;
 
-       if (!(bp->speed_cap_mask &
-             PORT_HW_CFG_SPEED_CAPABILITY_D0_10M_FULL))
-               bp->supported &= ~SUPPORTED_10baseT_Full;
+       if (!(bp->link_params.speed_cap_mask &
+                               PORT_HW_CFG_SPEED_CAPABILITY_D0_10M_FULL))
+               bp->port.supported &= ~SUPPORTED_10baseT_Full;
 
-       if (!(bp->speed_cap_mask &
-             PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF))
-               bp->supported &= ~SUPPORTED_100baseT_Half;
+       if (!(bp->link_params.speed_cap_mask &
+                               PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF))
+               bp->port.supported &= ~SUPPORTED_100baseT_Half;
 
-       if (!(bp->speed_cap_mask &
-             PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_FULL))
-               bp->supported &= ~SUPPORTED_100baseT_Full;
+       if (!(bp->link_params.speed_cap_mask &
+                               PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_FULL))
+               bp->port.supported &= ~SUPPORTED_100baseT_Full;
 
-       if (!(bp->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))
-               bp->supported &= ~(SUPPORTED_1000baseT_Half |
-                                  SUPPORTED_1000baseT_Full);
+       if (!(bp->link_params.speed_cap_mask &
+                                       PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))
+               bp->port.supported &= ~(SUPPORTED_1000baseT_Half |
+                                       SUPPORTED_1000baseT_Full);
 
-       if (!(bp->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G))
-               bp->supported &= ~SUPPORTED_2500baseX_Full;
+       if (!(bp->link_params.speed_cap_mask &
+                                       PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G))
+               bp->port.supported &= ~SUPPORTED_2500baseX_Full;
 
-       if (!(bp->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_10G))
-               bp->supported &= ~SUPPORTED_10000baseT_Full;
+       if (!(bp->link_params.speed_cap_mask &
+                                       PORT_HW_CFG_SPEED_CAPABILITY_D0_10G))
+               bp->port.supported &= ~SUPPORTED_10000baseT_Full;
 
-       BNX2X_DEV_INFO("supported 0x%x\n", bp->supported);
+       BNX2X_DEV_INFO("supported 0x%x\n", bp->port.supported);
 }
 
-static void bnx2x_link_settings_requested(struct bnx2x *bp)
+static void __devinit bnx2x_link_settings_requested(struct bnx2x *bp)
 {
-       bp->req_autoneg = 0;
-       bp->req_duplex = DUPLEX_FULL;
+       bp->link_params.req_duplex = DUPLEX_FULL;
 
-       switch (bp->link_config & PORT_FEATURE_LINK_SPEED_MASK) {
+       switch (bp->port.link_config & PORT_FEATURE_LINK_SPEED_MASK) {
        case PORT_FEATURE_LINK_SPEED_AUTO:
-               if (bp->supported & SUPPORTED_Autoneg) {
-                       bp->req_autoneg |= AUTONEG_SPEED;
-                       bp->req_line_speed = 0;
-                       bp->advertising = bp->supported;
+               if (bp->port.supported & SUPPORTED_Autoneg) {
+                       bp->link_params.req_line_speed = SPEED_AUTO_NEG;
+                       bp->port.advertising = bp->port.supported;
                } else {
-                       if (XGXS_EXT_PHY_TYPE(bp) ==
-                               PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705) {
+                       u32 ext_phy_type =
+                           XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
+
+                       if ((ext_phy_type ==
+                            PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705) ||
+                           (ext_phy_type ==
+                            PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706)) {
                                /* force 10G, no AN */
-                               bp->req_line_speed = SPEED_10000;
-                               bp->advertising =
+                               bp->link_params.req_line_speed = SPEED_10000;
+                               bp->port.advertising =
                                                (ADVERTISED_10000baseT_Full |
                                                 ADVERTISED_FIBRE);
                                break;
@@ -7683,93 +7076,99 @@ static void bnx2x_link_settings_requested(struct bnx2x *bp)
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  Autoneg not supported\n",
-                                 bp->link_config);
+                                 bp->port.link_config);
                        return;
                }
                break;
 
        case PORT_FEATURE_LINK_SPEED_10M_FULL:
-               if (bp->supported & SUPPORTED_10baseT_Full) {
-                       bp->req_line_speed = SPEED_10;
-                       bp->advertising = (ADVERTISED_10baseT_Full |
-                                          ADVERTISED_TP);
+               if (bp->port.supported & SUPPORTED_10baseT_Full) {
+                       bp->link_params.req_line_speed = SPEED_10;
+                       bp->port.advertising = (ADVERTISED_10baseT_Full |
+                                               ADVERTISED_TP);
                } else {
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  speed_cap_mask 0x%x\n",
-                                 bp->link_config, bp->speed_cap_mask);
+                                 bp->port.link_config,
+                                 bp->link_params.speed_cap_mask);
                        return;
                }
                break;
 
        case PORT_FEATURE_LINK_SPEED_10M_HALF:
-               if (bp->supported & SUPPORTED_10baseT_Half) {
-                       bp->req_line_speed = SPEED_10;
-                       bp->req_duplex = DUPLEX_HALF;
-                       bp->advertising = (ADVERTISED_10baseT_Half |
-                                          ADVERTISED_TP);
+               if (bp->port.supported & SUPPORTED_10baseT_Half) {
+                       bp->link_params.req_line_speed = SPEED_10;
+                       bp->link_params.req_duplex = DUPLEX_HALF;
+                       bp->port.advertising = (ADVERTISED_10baseT_Half |
+                                               ADVERTISED_TP);
                } else {
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  speed_cap_mask 0x%x\n",
-                                 bp->link_config, bp->speed_cap_mask);
+                                 bp->port.link_config,
+                                 bp->link_params.speed_cap_mask);
                        return;
                }
                break;
 
        case PORT_FEATURE_LINK_SPEED_100M_FULL:
-               if (bp->supported & SUPPORTED_100baseT_Full) {
-                       bp->req_line_speed = SPEED_100;
-                       bp->advertising = (ADVERTISED_100baseT_Full |
-                                          ADVERTISED_TP);
+               if (bp->port.supported & SUPPORTED_100baseT_Full) {
+                       bp->link_params.req_line_speed = SPEED_100;
+                       bp->port.advertising = (ADVERTISED_100baseT_Full |
+                                               ADVERTISED_TP);
                } else {
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  speed_cap_mask 0x%x\n",
-                                 bp->link_config, bp->speed_cap_mask);
+                                 bp->port.link_config,
+                                 bp->link_params.speed_cap_mask);
                        return;
                }
                break;
 
        case PORT_FEATURE_LINK_SPEED_100M_HALF:
-               if (bp->supported & SUPPORTED_100baseT_Half) {
-                       bp->req_line_speed = SPEED_100;
-                       bp->req_duplex = DUPLEX_HALF;
-                       bp->advertising = (ADVERTISED_100baseT_Half |
-                                          ADVERTISED_TP);
+               if (bp->port.supported & SUPPORTED_100baseT_Half) {
+                       bp->link_params.req_line_speed = SPEED_100;
+                       bp->link_params.req_duplex = DUPLEX_HALF;
+                       bp->port.advertising = (ADVERTISED_100baseT_Half |
+                                               ADVERTISED_TP);
                } else {
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  speed_cap_mask 0x%x\n",
-                                 bp->link_config, bp->speed_cap_mask);
+                                 bp->port.link_config,
+                                 bp->link_params.speed_cap_mask);
                        return;
                }
                break;
 
        case PORT_FEATURE_LINK_SPEED_1G:
-               if (bp->supported & SUPPORTED_1000baseT_Full) {
-                       bp->req_line_speed = SPEED_1000;
-                       bp->advertising = (ADVERTISED_1000baseT_Full |
-                                          ADVERTISED_TP);
+               if (bp->port.supported & SUPPORTED_1000baseT_Full) {
+                       bp->link_params.req_line_speed = SPEED_1000;
+                       bp->port.advertising = (ADVERTISED_1000baseT_Full |
+                                               ADVERTISED_TP);
                } else {
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  speed_cap_mask 0x%x\n",
-                                 bp->link_config, bp->speed_cap_mask);
+                                 bp->port.link_config,
+                                 bp->link_params.speed_cap_mask);
                        return;
                }
                break;
 
        case PORT_FEATURE_LINK_SPEED_2_5G:
-               if (bp->supported & SUPPORTED_2500baseX_Full) {
-                       bp->req_line_speed = SPEED_2500;
-                       bp->advertising = (ADVERTISED_2500baseX_Full |
-                                          ADVERTISED_TP);
+               if (bp->port.supported & SUPPORTED_2500baseX_Full) {
+                       bp->link_params.req_line_speed = SPEED_2500;
+                       bp->port.advertising = (ADVERTISED_2500baseX_Full |
+                                               ADVERTISED_TP);
                } else {
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  speed_cap_mask 0x%x\n",
-                                 bp->link_config, bp->speed_cap_mask);
+                                 bp->port.link_config,
+                                 bp->link_params.speed_cap_mask);
                        return;
                }
                break;
@@ -7777,15 +7176,16 @@ static void bnx2x_link_settings_requested(struct bnx2x *bp)
        case PORT_FEATURE_LINK_SPEED_10G_CX4:
        case PORT_FEATURE_LINK_SPEED_10G_KX4:
        case PORT_FEATURE_LINK_SPEED_10G_KR:
-               if (bp->supported & SUPPORTED_10000baseT_Full) {
-                       bp->req_line_speed = SPEED_10000;
-                       bp->advertising = (ADVERTISED_10000baseT_Full |
-                                          ADVERTISED_FIBRE);
+               if (bp->port.supported & SUPPORTED_10000baseT_Full) {
+                       bp->link_params.req_line_speed = SPEED_10000;
+                       bp->port.advertising = (ADVERTISED_10000baseT_Full |
+                                               ADVERTISED_FIBRE);
                } else {
                        BNX2X_ERR("NVRAM config error. "
                                  "Invalid link_config 0x%x"
                                  "  speed_cap_mask 0x%x\n",
-                                 bp->link_config, bp->speed_cap_mask);
+                                 bp->port.link_config,
+                                 bp->link_params.speed_cap_mask);
                        return;
                }
                break;
@@ -7793,142 +7193,201 @@ static void bnx2x_link_settings_requested(struct bnx2x *bp)
        default:
                BNX2X_ERR("NVRAM config error. "
                          "BAD link speed link_config 0x%x\n",
-                         bp->link_config);
-               bp->req_autoneg |= AUTONEG_SPEED;
-               bp->req_line_speed = 0;
-               bp->advertising = bp->supported;
+                         bp->port.link_config);
+               bp->link_params.req_line_speed = SPEED_AUTO_NEG;
+               bp->port.advertising = bp->port.supported;
                break;
        }
-       BNX2X_DEV_INFO("req_line_speed %d  req_duplex %d\n",
-                      bp->req_line_speed, bp->req_duplex);
 
-       bp->req_flow_ctrl = (bp->link_config &
-                            PORT_FEATURE_FLOW_CONTROL_MASK);
-       if ((bp->req_flow_ctrl == FLOW_CTRL_AUTO) &&
-           (bp->supported & SUPPORTED_Autoneg))
-               bp->req_autoneg |= AUTONEG_FLOW_CTRL;
+       bp->link_params.req_flow_ctrl = (bp->port.link_config &
+                                        PORT_FEATURE_FLOW_CONTROL_MASK);
+       if ((bp->link_params.req_flow_ctrl == FLOW_CTRL_AUTO) &&
+           (!bp->port.supported & SUPPORTED_Autoneg))
+               bp->link_params.req_flow_ctrl = FLOW_CTRL_NONE;
 
-       BNX2X_DEV_INFO("req_autoneg 0x%x  req_flow_ctrl 0x%x"
+       BNX2X_DEV_INFO("req_line_speed %d  req_duplex %d  req_flow_ctrl 0x%x"
                       "  advertising 0x%x\n",
-                      bp->req_autoneg, bp->req_flow_ctrl, bp->advertising);
+                      bp->link_params.req_line_speed,
+                      bp->link_params.req_duplex,
+                      bp->link_params.req_flow_ctrl, bp->port.advertising);
 }
 
-static void bnx2x_get_hwinfo(struct bnx2x *bp)
+static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
 {
-       u32 val, val2, val3, val4, id;
-       int port = bp->port;
-       u32 switch_cfg;
-
-       bp->shmem_base = REG_RD(bp, MISC_REG_SHARED_MEM_ADDR);
-       BNX2X_DEV_INFO("shmem offset is %x\n", bp->shmem_base);
-
-       /* Get the chip revision id and number. */
-       /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */
-       val = REG_RD(bp, MISC_REG_CHIP_NUM);
-       id = ((val & 0xffff) << 16);
-       val = REG_RD(bp, MISC_REG_CHIP_REV);
-       id |= ((val & 0xf) << 12);
-       val = REG_RD(bp, MISC_REG_CHIP_METAL);
-       id |= ((val & 0xff) << 4);
-       REG_RD(bp, MISC_REG_BOND_ID);
-       id |= (val & 0xf);
-       bp->chip_id = id;
-       BNX2X_DEV_INFO("chip ID is %x\n", id);
-
-       if (!bp->shmem_base || (bp->shmem_base != 0xAF900)) {
-               BNX2X_DEV_INFO("MCP not active\n");
-               nomcp = 1;
-               goto set_mac;
-       }
-
-       val = SHMEM_RD(bp, validity_map[port]);
-       if ((val & (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))
-               != (SHR_MEM_VALIDITY_DEV_INFO | SHR_MEM_VALIDITY_MB))
-               BNX2X_ERR("BAD MCP validity signature\n");
+       int port = BP_PORT(bp);
+       u32 val, val2;
 
-       bp->fw_seq = (SHMEM_RD(bp, func_mb[port].drv_mb_header) &
-                     DRV_MSG_SEQ_NUMBER_MASK);
+       bp->link_params.bp = bp;
+       bp->link_params.port = port;
 
-       bp->hw_config = SHMEM_RD(bp, dev_info.shared_hw_config.config);
-       bp->board = SHMEM_RD(bp, dev_info.shared_hw_config.board);
-       bp->serdes_config =
+       bp->link_params.serdes_config =
                SHMEM_RD(bp, dev_info.port_hw_config[port].serdes_config);
-       bp->lane_config =
+       bp->link_params.lane_config =
                SHMEM_RD(bp, dev_info.port_hw_config[port].lane_config);
-       bp->ext_phy_config =
+       bp->link_params.ext_phy_config =
                SHMEM_RD(bp,
                         dev_info.port_hw_config[port].external_phy_config);
-       bp->speed_cap_mask =
+       bp->link_params.speed_cap_mask =
                SHMEM_RD(bp,
                         dev_info.port_hw_config[port].speed_capability_mask);
 
-       bp->link_config =
+       bp->port.link_config =
                SHMEM_RD(bp, dev_info.port_feature_config[port].link_config);
 
-       BNX2X_DEV_INFO("hw_config (%08x) board (%08x)  serdes_config (%08x)\n"
-            KERN_INFO "  lane_config (%08x)  ext_phy_config (%08x)\n"
-            KERN_INFO "  speed_cap_mask (%08x)  link_config (%08x)"
-                      "  fw_seq (%08x)\n",
-                      bp->hw_config, bp->board, bp->serdes_config,
-                      bp->lane_config, bp->ext_phy_config,
-                      bp->speed_cap_mask, bp->link_config, bp->fw_seq);
+       BNX2X_DEV_INFO("serdes_config 0x%08x  lane_config 0x%08x\n"
+            KERN_INFO "  ext_phy_config 0x%08x  speed_cap_mask 0x%08x"
+                      "  link_config 0x%08x\n",
+                      bp->link_params.serdes_config,
+                      bp->link_params.lane_config,
+                      bp->link_params.ext_phy_config,
+                      bp->link_params.speed_cap_mask, bp->port.link_config);
+
+       bp->link_params.switch_cfg = (bp->port.link_config &
+                                     PORT_FEATURE_CONNECTED_SWITCH_MASK);
+       bnx2x_link_settings_supported(bp, bp->link_params.switch_cfg);
+
+       bnx2x_link_settings_requested(bp);
+
+       val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_upper);
+       val = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_lower);
+       bp->dev->dev_addr[0] = (u8)(val2 >> 8 & 0xff);
+       bp->dev->dev_addr[1] = (u8)(val2 & 0xff);
+       bp->dev->dev_addr[2] = (u8)(val >> 24 & 0xff);
+       bp->dev->dev_addr[3] = (u8)(val >> 16 & 0xff);
+       bp->dev->dev_addr[4] = (u8)(val >> 8  & 0xff);
+       bp->dev->dev_addr[5] = (u8)(val & 0xff);
+       memcpy(bp->link_params.mac_addr, bp->dev->dev_addr, ETH_ALEN);
+       memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN);
+}
+
+static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
+{
+       int func = BP_FUNC(bp);
+       u32 val, val2;
+       int rc = 0;
+
+       bnx2x_get_common_hwinfo(bp);
+
+       bp->e1hov = 0;
+       bp->e1hmf = 0;
+       if (CHIP_IS_E1H(bp)) {
+               bp->mf_config =
+                       SHMEM_RD(bp, mf_cfg.func_mf_config[func].config);
+
+               val =
+                  (SHMEM_RD(bp, mf_cfg.func_mf_config[func].e1hov_tag) &
+                   FUNC_MF_CFG_E1HOV_TAG_MASK);
+               if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) {
+
+                       bp->e1hov = val;
+                       bp->e1hmf = 1;
+                       BNX2X_DEV_INFO("MF mode  E1HOV for func %d is %d "
+                                      "(0x%04x)\n",
+                                      func, bp->e1hov, bp->e1hov);
+               } else {
+                       BNX2X_DEV_INFO("Single function mode\n");
+                       if (BP_E1HVN(bp)) {
+                               BNX2X_ERR("!!!  No valid E1HOV for func %d,"
+                                         "  aborting\n", func);
+                               rc = -EPERM;
+                       }
+               }
+       }
+
+       if (!BP_NOMCP(bp)) {
+               bnx2x_get_port_hwinfo(bp);
+
+               bp->fw_seq = (SHMEM_RD(bp, func_mb[func].drv_mb_header) &
+                             DRV_MSG_SEQ_NUMBER_MASK);
+               BNX2X_DEV_INFO("fw_seq 0x%08x\n", bp->fw_seq);
+       }
+
+       if (IS_E1HMF(bp)) {
+               val2 = SHMEM_RD(bp, mf_cfg.func_mf_config[func].mac_upper);
+               val = SHMEM_RD(bp,  mf_cfg.func_mf_config[func].mac_lower);
+               if ((val2 != FUNC_MF_CFG_UPPERMAC_DEFAULT) &&
+                   (val != FUNC_MF_CFG_LOWERMAC_DEFAULT)) {
+                       bp->dev->dev_addr[0] = (u8)(val2 >> 8 & 0xff);
+                       bp->dev->dev_addr[1] = (u8)(val2 & 0xff);
+                       bp->dev->dev_addr[2] = (u8)(val >> 24 & 0xff);
+                       bp->dev->dev_addr[3] = (u8)(val >> 16 & 0xff);
+                       bp->dev->dev_addr[4] = (u8)(val >> 8  & 0xff);
+                       bp->dev->dev_addr[5] = (u8)(val & 0xff);
+                       memcpy(bp->link_params.mac_addr, bp->dev->dev_addr,
+                              ETH_ALEN);
+                       memcpy(bp->dev->perm_addr, bp->dev->dev_addr,
+                              ETH_ALEN);
+               }
+
+               return rc;
+       }
+
+       if (BP_NOMCP(bp)) {
+               /* only supposed to happen on emulation/FPGA */
+               BNX2X_ERR("warning rendom MAC workaround active\n");
+               random_ether_addr(bp->dev->dev_addr);
+               memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN);
+       }
+
+       return rc;
+}
 
-       switch_cfg = (bp->link_config & PORT_FEATURE_CONNECTED_SWITCH_MASK);
-       bnx2x_link_settings_supported(bp, switch_cfg);
+static int __devinit bnx2x_init_bp(struct bnx2x *bp)
+{
+       int func = BP_FUNC(bp);
+       int rc;
 
-       bp->autoneg = (bp->hw_config & SHARED_HW_CFG_AN_ENABLE_MASK);
-       /* for now disable cl73 */
-       bp->autoneg &= ~SHARED_HW_CFG_AN_ENABLE_CL73;
-       BNX2X_DEV_INFO("autoneg 0x%x\n", bp->autoneg);
+       if (nomcp)
+               bp->flags |= NO_MCP_FLAG;
 
-       bnx2x_link_settings_requested(bp);
+       mutex_init(&bp->port.phy_mutex);
 
-       val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_upper);
-       val = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_lower);
-       bp->dev->dev_addr[0] = (u8)(val2 >> 8 & 0xff);
-       bp->dev->dev_addr[1] = (u8)(val2 & 0xff);
-       bp->dev->dev_addr[2] = (u8)(val >> 24 & 0xff);
-       bp->dev->dev_addr[3] = (u8)(val >> 16 & 0xff);
-       bp->dev->dev_addr[4] = (u8)(val >> 8  & 0xff);
-       bp->dev->dev_addr[5] = (u8)(val & 0xff);
+       INIT_WORK(&bp->sp_task, bnx2x_sp_task);
+       INIT_WORK(&bp->reset_task, bnx2x_reset_task);
 
-       memcpy(bp->dev->perm_addr, bp->dev->dev_addr, 6);
+       rc = bnx2x_get_hwinfo(bp);
 
+       /* need to reset chip if undi was active */
+       if (!BP_NOMCP(bp))
+               bnx2x_undi_unload(bp);
 
-       val = SHMEM_RD(bp, dev_info.shared_hw_config.part_num);
-       val2 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[4]);
-       val3 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[8]);
-       val4 = SHMEM_RD(bp, dev_info.shared_hw_config.part_num[12]);
+       if (CHIP_REV_IS_FPGA(bp))
+               printk(KERN_ERR PFX "FPGA detected\n");
 
-       printk(KERN_INFO PFX "part number %X-%X-%X-%X\n",
-              val, val2, val3, val4);
+       if (BP_NOMCP(bp) && (func == 0))
+               printk(KERN_ERR PFX
+                      "MCP disabled, must load devices in order!\n");
 
-       /* bc ver */
-       if (!nomcp) {
-               bp->bc_ver = val = ((SHMEM_RD(bp, dev_info.bc_rev)) >> 8);
-               BNX2X_DEV_INFO("bc_ver %X\n", val);
-               if (val < BNX2X_BC_VER) {
-                       /* for now only warn
-                        * later we might need to enforce this */
-                       BNX2X_ERR("This driver needs bc_ver %X but found %X,"
-                                 " please upgrade BC\n", BNX2X_BC_VER, val);
-               }
+       /* Set TPA flags */
+       if (disable_tpa) {
+               bp->flags &= ~TPA_ENABLE_FLAG;
+               bp->dev->features &= ~NETIF_F_LRO;
        } else {
-               bp->bc_ver = 0;
+               bp->flags |= TPA_ENABLE_FLAG;
+               bp->dev->features |= NETIF_F_LRO;
        }
 
-       val = REG_RD(bp, MCP_REG_MCPR_NVM_CFG4);
-       bp->flash_size = (NVRAM_1MB_SIZE << (val & MCPR_NVM_CFG4_FLASH_SIZE));
-       BNX2X_DEV_INFO("flash_size 0x%x (%d)\n",
-                      bp->flash_size, bp->flash_size);
 
-       return;
+       bp->tx_ring_size = MAX_TX_AVAIL;
+       bp->rx_ring_size = MAX_RX_AVAIL;
+
+       bp->rx_csum = 1;
+       bp->rx_offset = 0;
+
+       bp->tx_ticks = 50;
+       bp->rx_ticks = 25;
+
+       bp->stats_ticks = 1000000 & 0xffff00;
+
+       bp->timer_interval = (CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ);
+       bp->current_interval = (poll ? poll : bp->timer_interval);
 
-set_mac: /* only supposed to happen on emulation/FPGA */
-       BNX2X_ERR("warning rendom MAC workaround active\n");
-       random_ether_addr(bp->dev->dev_addr);
-       memcpy(bp->dev->perm_addr, bp->dev->dev_addr, 6);
+       init_timer(&bp->timer);
+       bp->timer.expires = jiffies + bp->current_interval;
+       bp->timer.data = (unsigned long) bp;
+       bp->timer.function = bnx2x_timer;
 
+       return rc;
 }
 
 /*
@@ -7941,25 +7400,35 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct bnx2x *bp = netdev_priv(dev);
 
-       cmd->supported = bp->supported;
-       cmd->advertising = bp->advertising;
+       cmd->supported = bp->port.supported;
+       cmd->advertising = bp->port.advertising;
 
        if (netif_carrier_ok(dev)) {
-               cmd->speed = bp->line_speed;
-               cmd->duplex = bp->duplex;
+               cmd->speed = bp->link_vars.line_speed;
+               cmd->duplex = bp->link_vars.duplex;
        } else {
-               cmd->speed = bp->req_line_speed;
-               cmd->duplex = bp->req_duplex;
+               cmd->speed = bp->link_params.req_line_speed;
+               cmd->duplex = bp->link_params.req_duplex;
+       }
+       if (IS_E1HMF(bp)) {
+               u16 vn_max_rate;
+
+               vn_max_rate = ((bp->mf_config & FUNC_MF_CFG_MAX_BW_MASK) >>
+                               FUNC_MF_CFG_MAX_BW_SHIFT) * 100;
+               if (vn_max_rate < cmd->speed)
+                       cmd->speed = vn_max_rate;
        }
 
-       if (bp->phy_flags & PHY_XGXS_FLAG) {
-               u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp);
+       if (bp->link_params.switch_cfg == SWITCH_CFG_10G) {
+               u32 ext_phy_type =
+                       XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);
 
                switch (ext_phy_type) {
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:
                        cmd->port = PORT_FIBRE;
                        break;
 
@@ -7967,17 +7436,23 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                        cmd->port = PORT_TP;
                        break;
 
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:
+                       BNX2X_ERR("XGXS PHY Failure detected 0x%x\n",
+                                 bp->link_params.ext_phy_config);
+                       break;
+
                default:
                        DP(NETIF_MSG_LINK, "BAD XGXS ext_phy_config 0x%x\n",
-                          bp->ext_phy_config);
+                          bp->link_params.ext_phy_config);
+                       break;
                }
        } else
                cmd->port = PORT_TP;
 
-       cmd->phy_address = bp->phy_addr;
+       cmd->phy_address = bp->port.phy_addr;
        cmd->transceiver = XCVR_INTERNAL;
 
-       if (bp->req_autoneg & AUTONEG_SPEED)
+       if (bp->link_params.req_line_speed == SPEED_AUTO_NEG)
                cmd->autoneg = AUTONEG_ENABLE;
        else
                cmd->autoneg = AUTONEG_DISABLE;
@@ -8001,6 +7476,9 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
        struct bnx2x *bp = netdev_priv(dev);
        u32 advertising;
 
+       if (IS_E1HMF(bp))
+               return 0;
+
        DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"
           DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %d\n"
           DP_LEVEL "  duplex %d  port %d  phy_address %d  transceiver %d\n"
@@ -8010,25 +7488,25 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
           cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
 
        if (cmd->autoneg == AUTONEG_ENABLE) {
-               if (!(bp->supported & SUPPORTED_Autoneg)) {
-                       DP(NETIF_MSG_LINK, "Aotoneg not supported\n");
+               if (!(bp->port.supported & SUPPORTED_Autoneg)) {
+                       DP(NETIF_MSG_LINK, "Autoneg not supported\n");
                        return -EINVAL;
                }
 
                /* advertise the requested speed and duplex if supported */
-               cmd->advertising &= bp->supported;
+               cmd->advertising &= bp->port.supported;
 
-               bp->req_autoneg |= AUTONEG_SPEED;
-               bp->req_line_speed = 0;
-               bp->req_duplex = DUPLEX_FULL;
-               bp->advertising |= (ADVERTISED_Autoneg | cmd->advertising);
+               bp->link_params.req_line_speed = SPEED_AUTO_NEG;
+               bp->link_params.req_duplex = DUPLEX_FULL;
+               bp->port.advertising |= (ADVERTISED_Autoneg |
+                                        cmd->advertising);
 
        } else { /* forced speed */
                /* advertise the requested speed and duplex if supported */
                switch (cmd->speed) {
                case SPEED_10:
                        if (cmd->duplex == DUPLEX_FULL) {
-                               if (!(bp->supported &
+                               if (!(bp->port.supported &
                                      SUPPORTED_10baseT_Full)) {
                                        DP(NETIF_MSG_LINK,
                                           "10M full not supported\n");
@@ -8038,7 +7516,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                advertising = (ADVERTISED_10baseT_Full |
                                               ADVERTISED_TP);
                        } else {
-                               if (!(bp->supported &
+                               if (!(bp->port.supported &
                                      SUPPORTED_10baseT_Half)) {
                                        DP(NETIF_MSG_LINK,
                                           "10M half not supported\n");
@@ -8052,7 +7530,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
                case SPEED_100:
                        if (cmd->duplex == DUPLEX_FULL) {
-                               if (!(bp->supported &
+                               if (!(bp->port.supported &
                                                SUPPORTED_100baseT_Full)) {
                                        DP(NETIF_MSG_LINK,
                                           "100M full not supported\n");
@@ -8062,7 +7540,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                advertising = (ADVERTISED_100baseT_Full |
                                               ADVERTISED_TP);
                        } else {
-                               if (!(bp->supported &
+                               if (!(bp->port.supported &
                                                SUPPORTED_100baseT_Half)) {
                                        DP(NETIF_MSG_LINK,
                                           "100M half not supported\n");
@@ -8080,7 +7558,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                return -EINVAL;
                        }
 
-                       if (!(bp->supported & SUPPORTED_1000baseT_Full)) {
+                       if (!(bp->port.supported & SUPPORTED_1000baseT_Full)) {
                                DP(NETIF_MSG_LINK, "1G full not supported\n");
                                return -EINVAL;
                        }
@@ -8096,7 +7574,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                return -EINVAL;
                        }
 
-                       if (!(bp->supported & SUPPORTED_2500baseX_Full)) {
+                       if (!(bp->port.supported & SUPPORTED_2500baseX_Full)) {
                                DP(NETIF_MSG_LINK,
                                   "2.5G full not supported\n");
                                return -EINVAL;
@@ -8112,7 +7590,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                return -EINVAL;
                        }
 
-                       if (!(bp->supported & SUPPORTED_10000baseT_Full)) {
+                       if (!(bp->port.supported & SUPPORTED_10000baseT_Full)) {
                                DP(NETIF_MSG_LINK, "10G full not supported\n");
                                return -EINVAL;
                        }
@@ -8126,38 +7604,53 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                        return -EINVAL;
                }
 
-               bp->req_autoneg &= ~AUTONEG_SPEED;
-               bp->req_line_speed = cmd->speed;
-               bp->req_duplex = cmd->duplex;
-               bp->advertising = advertising;
+               bp->link_params.req_line_speed = cmd->speed;
+               bp->link_params.req_duplex = cmd->duplex;
+               bp->port.advertising = advertising;
        }
 
-       DP(NETIF_MSG_LINK, "req_autoneg 0x%x  req_line_speed %d\n"
+       DP(NETIF_MSG_LINK, "req_line_speed %d\n"
           DP_LEVEL "  req_duplex %d  advertising 0x%x\n",
-          bp->req_autoneg, bp->req_line_speed, bp->req_duplex,
-          bp->advertising);
+          bp->link_params.req_line_speed, bp->link_params.req_duplex,
+          bp->port.advertising);
 
-       bnx2x_stop_stats(bp);
-       bnx2x_link_initialize(bp);
+       if (netif_running(dev)) {
+               bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+               bnx2x_link_set(bp);
+       }
 
        return 0;
 }
 
+#define PHY_FW_VER_LEN                 10
+
 static void bnx2x_get_drvinfo(struct net_device *dev,
                              struct ethtool_drvinfo *info)
 {
        struct bnx2x *bp = netdev_priv(dev);
+       char phy_fw_ver[PHY_FW_VER_LEN];
 
        strcpy(info->driver, DRV_MODULE_NAME);
        strcpy(info->version, DRV_MODULE_VERSION);
-       snprintf(info->fw_version, 32, "%d.%d.%d:%d (BC VER %x)",
+
+       phy_fw_ver[0] = '\0';
+       if (bp->port.pmf) {
+               bnx2x_phy_hw_lock(bp);
+               bnx2x_get_ext_phy_fw_version(&bp->link_params,
+                                            (bp->state != BNX2X_STATE_CLOSED),
+                                            phy_fw_ver, PHY_FW_VER_LEN);
+               bnx2x_phy_hw_unlock(bp);
+       }
+
+       snprintf(info->fw_version, 32, "%d.%d.%d:%d BC:%x%s%s",
                 BCM_5710_FW_MAJOR_VERSION, BCM_5710_FW_MINOR_VERSION,
-                BCM_5710_FW_REVISION_VERSION, BCM_5710_FW_COMPILE_FLAGS,
-                bp->bc_ver);
+                BCM_5710_FW_REVISION_VERSION,
+                BCM_5710_FW_COMPILE_FLAGS, bp->common.bc_ver,
+                ((phy_fw_ver[0] != '\0')? " PHY:":""), phy_fw_ver);
        strcpy(info->bus_info, pci_name(bp->pdev));
        info->n_stats = BNX2X_NUM_STATS;
        info->testinfo_len = BNX2X_NUM_TESTS;
-       info->eedump_len = bp->flash_size;
+       info->eedump_len = bp->common.flash_size;
        info->regdump_len = 0;
 }
 
@@ -8190,9 +7683,9 @@ static int bnx2x_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
                        return -EINVAL;
 
                bp->wol = 1;
-       } else {
+       } else
                bp->wol = 0;
-       }
+
        return 0;
 }
 
@@ -8215,13 +7708,13 @@ static int bnx2x_nway_reset(struct net_device *dev)
 {
        struct bnx2x *bp = netdev_priv(dev);
 
-       if (bp->state != BNX2X_STATE_OPEN) {
-               DP(NETIF_MSG_PROBE, "state is %x, returning\n", bp->state);
-               return -EAGAIN;
-       }
+       if (!bp->port.pmf)
+               return 0;
 
-       bnx2x_stop_stats(bp);
-       bnx2x_link_initialize(bp);
+       if (netif_running(dev)) {
+               bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+               bnx2x_link_set(bp);
+       }
 
        return 0;
 }
@@ -8230,12 +7723,12 @@ static int bnx2x_get_eeprom_len(struct net_device *dev)
 {
        struct bnx2x *bp = netdev_priv(dev);
 
-       return bp->flash_size;
+       return bp->common.flash_size;
 }
 
 static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
        int count, i;
        u32 val = 0;
 
@@ -8257,7 +7750,7 @@ static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)
        }
 
        if (!(val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port))) {
-               DP(NETIF_MSG_NVM, "cannot get access to nvram interface\n");
+               DP(BNX2X_MSG_NVM, "cannot get access to nvram interface\n");
                return -EBUSY;
        }
 
@@ -8266,7 +7759,7 @@ static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)
 
 static int bnx2x_release_nvram_lock(struct bnx2x *bp)
 {
-       int port = bp->port;
+       int port = BP_PORT(bp);
        int count, i;
        u32 val = 0;
 
@@ -8288,7 +7781,7 @@ static int bnx2x_release_nvram_lock(struct bnx2x *bp)
        }
 
        if (val & (MCPR_NVM_SW_ARB_ARB_ARB1 << port)) {
-               DP(NETIF_MSG_NVM, "cannot free access to nvram interface\n");
+               DP(BNX2X_MSG_NVM, "cannot free access to nvram interface\n");
                return -EBUSY;
        }
 
@@ -8352,7 +7845,6 @@ static int bnx2x_nvram_read_dword(struct bnx2x *bp, u32 offset, u32 *ret_val,
 
                if (val & MCPR_NVM_COMMAND_DONE) {
                        val = REG_RD(bp, MCP_REG_MCPR_NVM_READ);
-                       DP(NETIF_MSG_NVM, "val 0x%08x\n", val);
                        /* we read nvram data in cpu order
                         * but ethtool sees it as an array of bytes
                         * converting to big-endian will do the work */
@@ -8374,16 +7866,16 @@ static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
        u32 val;
 
        if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
-               DP(NETIF_MSG_NVM,
+               DP(BNX2X_MSG_NVM,
                   "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
                   offset, buf_size);
                return -EINVAL;
        }
 
-       if (offset + buf_size > bp->flash_size) {
-               DP(NETIF_MSG_NVM, "Invalid parameter: offset (0x%x) +"
+       if (offset + buf_size > bp->common.flash_size) {
+               DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
                                  " buf_size (0x%x) > flash_size (0x%x)\n",
-                  offset, buf_size, bp->flash_size);
+                  offset, buf_size, bp->common.flash_size);
                return -EINVAL;
        }
 
@@ -8427,7 +7919,7 @@ static int bnx2x_get_eeprom(struct net_device *dev,
        struct bnx2x *bp = netdev_priv(dev);
        int rc;
 
-       DP(NETIF_MSG_NVM, "ethtool_eeprom: cmd %d\n"
+       DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
           DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
           eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
           eeprom->len, eeprom->len);
@@ -8489,10 +7981,10 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
        u32 align_offset;
        u32 val;
 
-       if (offset + buf_size > bp->flash_size) {
-               DP(NETIF_MSG_NVM, "Invalid parameter: offset (0x%x) +"
+       if (offset + buf_size > bp->common.flash_size) {
+               DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
                                  " buf_size (0x%x) > flash_size (0x%x)\n",
-                  offset, buf_size, bp->flash_size);
+                  offset, buf_size, bp->common.flash_size);
                return -EINVAL;
        }
 
@@ -8516,8 +8008,6 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
                 * convert it back to cpu order */
                val = be32_to_cpu(val);
 
-               DP(NETIF_MSG_NVM, "val 0x%08x\n", val);
-
                rc = bnx2x_nvram_write_dword(bp, align_offset, val,
                                             cmd_flags);
        }
@@ -8537,21 +8027,20 @@ static int bnx2x_nvram_write(struct bnx2x *bp, u32 offset, u8 *data_buf,
        u32 val;
        u32 written_so_far;
 
-       if (buf_size == 1) {    /* ethtool */
+       if (buf_size == 1)      /* ethtool */
                return bnx2x_nvram_write1(bp, offset, data_buf, buf_size);
-       }
 
        if ((offset & 0x03) || (buf_size & 0x03) || (buf_size == 0)) {
-               DP(NETIF_MSG_NVM,
+               DP(BNX2X_MSG_NVM,
                   "Invalid parameter: offset 0x%x  buf_size 0x%x\n",
                   offset, buf_size);
                return -EINVAL;
        }
 
-       if (offset + buf_size > bp->flash_size) {
-               DP(NETIF_MSG_NVM, "Invalid parameter: offset (0x%x) +"
+       if (offset + buf_size > bp->common.flash_size) {
+               DP(BNX2X_MSG_NVM, "Invalid parameter: offset (0x%x) +"
                                  " buf_size (0x%x) > flash_size (0x%x)\n",
-                  offset, buf_size, bp->flash_size);
+                  offset, buf_size, bp->common.flash_size);
                return -EINVAL;
        }
 
@@ -8574,7 +8063,6 @@ static int bnx2x_nvram_write(struct bnx2x *bp, u32 offset, u8 *data_buf,
                        cmd_flags |= MCPR_NVM_COMMAND_FIRST;
 
                memcpy(&val, data_buf, 4);
-               DP(NETIF_MSG_NVM, "val 0x%08x\n", val);
 
                rc = bnx2x_nvram_write_dword(bp, offset, val, cmd_flags);
 
@@ -8598,14 +8086,35 @@ static int bnx2x_set_eeprom(struct net_device *dev,
        struct bnx2x *bp = netdev_priv(dev);
        int rc;
 
-       DP(NETIF_MSG_NVM, "ethtool_eeprom: cmd %d\n"
+       DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"
           DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",
           eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,
           eeprom->len, eeprom->len);
 
        /* parameters already validated in ethtool_set_eeprom */
 
-       rc = bnx2x_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);
+       /* If the magic number is PHY (0x00504859) upgrade the PHY FW */
+       if (eeprom->magic == 0x00504859)
+               if (bp->port.pmf) {
+
+                       bnx2x_phy_hw_lock(bp);
+                       rc = bnx2x_flash_download(bp, BP_PORT(bp),
+                                            bp->link_params.ext_phy_config,
+                                            (bp->state != BNX2X_STATE_CLOSED),
+                                            eebuf, eeprom->len);
+                       if ((bp->state == BNX2X_STATE_OPEN) ||
+                           (bp->state == BNX2X_STATE_DISABLED)) {
+                               rc |= bnx2x_link_reset(&bp->link_params,
+                                                      &bp->link_vars);
+                               rc |= bnx2x_phy_init(&bp->link_params,
+                                                    &bp->link_vars);
+                       }
+                       bnx2x_phy_hw_unlock(bp);
+
+               } else /* Only the PMF can access the PHY */
+                       return -EINVAL;
+       else
+               rc = bnx2x_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);
 
        return rc;
 }
@@ -8642,12 +8151,39 @@ static int bnx2x_set_coalesce(struct net_device *dev,
                bp->stats_ticks = 0xffff00;
        bp->stats_ticks &= 0xffff00;
 
-       if (netif_running(bp->dev))
+       if (netif_running(dev))
                bnx2x_update_coalesce(bp);
 
        return 0;
 }
 
+static int bnx2x_set_flags(struct net_device *dev, u32 data)
+{
+       struct bnx2x *bp = netdev_priv(dev);
+       int changed = 0;
+       int rc = 0;
+
+       if (data & ETH_FLAG_LRO) {
+               if (!(dev->features & NETIF_F_LRO)) {
+                       dev->features |= NETIF_F_LRO;
+                       bp->flags |= TPA_ENABLE_FLAG;
+                       changed = 1;
+               }
+
+       } else if (dev->features & NETIF_F_LRO) {
+               dev->features &= ~NETIF_F_LRO;
+               bp->flags &= ~TPA_ENABLE_FLAG;
+               changed = 1;
+       }
+
+       if (changed && netif_running(dev)) {
+               bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+               rc = bnx2x_nic_load(bp, LOAD_NORMAL);
+       }
+
+       return rc;
+}
+
 static void bnx2x_get_ringparam(struct net_device *dev,
                                struct ethtool_ringparam *ering)
 {
@@ -8669,6 +8205,7 @@ static int bnx2x_set_ringparam(struct net_device *dev,
                               struct ethtool_ringparam *ering)
 {
        struct bnx2x *bp = netdev_priv(dev);
+       int rc = 0;
 
        if ((ering->rx_pending > MAX_RX_AVAIL) ||
            (ering->tx_pending > MAX_TX_AVAIL) ||
@@ -8678,12 +8215,12 @@ static int bnx2x_set_ringparam(struct net_device *dev,
        bp->rx_ring_size = ering->rx_pending;
        bp->tx_ring_size = ering->tx_pending;
 
-       if (netif_running(bp->dev)) {
-               bnx2x_nic_unload(bp, 0);
-               bnx2x_nic_load(bp, 0);
+       if (netif_running(dev)) {
+               bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+               rc = bnx2x_nic_load(bp, LOAD_NORMAL);
        }
 
-       return 0;
+       return rc;
 }
 
 static void bnx2x_get_pauseparam(struct net_device *dev,
@@ -8691,10 +8228,13 @@ static void bnx2x_get_pauseparam(struct net_device *dev,
 {
        struct bnx2x *bp = netdev_priv(dev);
 
-       epause->autoneg =
-               ((bp->req_autoneg & AUTONEG_FLOW_CTRL) == AUTONEG_FLOW_CTRL);
-       epause->rx_pause = ((bp->flow_ctrl & FLOW_CTRL_RX) == FLOW_CTRL_RX);
-       epause->tx_pause = ((bp->flow_ctrl & FLOW_CTRL_TX) == FLOW_CTRL_TX);
+       epause->autoneg = (bp->link_params.req_flow_ctrl == FLOW_CTRL_AUTO) &&
+                         (bp->link_params.req_line_speed == SPEED_AUTO_NEG);
+
+       epause->rx_pause = ((bp->link_vars.flow_ctrl & FLOW_CTRL_RX) ==
+                           FLOW_CTRL_RX);
+       epause->tx_pause = ((bp->link_vars.flow_ctrl & FLOW_CTRL_TX) ==
+                           FLOW_CTRL_TX);
 
        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
           DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",
@@ -8706,36 +8246,41 @@ static int bnx2x_set_pauseparam(struct net_device *dev,
 {
        struct bnx2x *bp = netdev_priv(dev);
 
+       if (IS_E1HMF(bp))
+               return 0;
+
        DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"
           DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",
           epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);
 
-       if (epause->autoneg) {
-               if (!(bp->supported & SUPPORTED_Autoneg)) {
-                       DP(NETIF_MSG_LINK, "Aotoneg not supported\n");
-                       return -EINVAL;
-               }
-
-               bp->req_autoneg |= AUTONEG_FLOW_CTRL;
-       } else
-               bp->req_autoneg &= ~AUTONEG_FLOW_CTRL;
-
-       bp->req_flow_ctrl = FLOW_CTRL_AUTO;
+       bp->link_params.req_flow_ctrl = FLOW_CTRL_AUTO;
 
        if (epause->rx_pause)
-               bp->req_flow_ctrl |= FLOW_CTRL_RX;
+               bp->link_params.req_flow_ctrl |= FLOW_CTRL_RX;
+
        if (epause->tx_pause)
-               bp->req_flow_ctrl |= FLOW_CTRL_TX;
+               bp->link_params.req_flow_ctrl |= FLOW_CTRL_TX;
+
+       if (bp->link_params.req_flow_ctrl == FLOW_CTRL_AUTO)
+               bp->link_params.req_flow_ctrl = FLOW_CTRL_NONE;
+
+       if (epause->autoneg) {
+               if (!(bp->port.supported & SUPPORTED_Autoneg)) {
+                       DP(NETIF_MSG_LINK, "Autoneg not supported\n");
+                       return -EINVAL;
+               }
 
-       if (!(bp->req_autoneg & AUTONEG_FLOW_CTRL) &&
-           (bp->req_flow_ctrl == FLOW_CTRL_AUTO))
-               bp->req_flow_ctrl = FLOW_CTRL_NONE;
+               if (bp->link_params.req_line_speed == SPEED_AUTO_NEG)
+                       bp->link_params.req_flow_ctrl = FLOW_CTRL_AUTO;
+       }
 
-       DP(NETIF_MSG_LINK, "req_autoneg 0x%x  req_flow_ctrl 0x%x\n",
-          bp->req_autoneg, bp->req_flow_ctrl);
+       DP(NETIF_MSG_LINK,
+          "req_flow_ctrl 0x%x\n", bp->link_params.req_flow_ctrl);
 
-       bnx2x_stop_stats(bp);
-       bnx2x_link_initialize(bp);
+       if (netif_running(dev)) {
+               bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+               bnx2x_link_set(bp);
+       }
 
        return 0;
 }
@@ -8757,142 +8302,615 @@ static int bnx2x_set_rx_csum(struct net_device *dev, u32 data)
 
 static int bnx2x_set_tso(struct net_device *dev, u32 data)
 {
-       if (data)
+       if (data) {
                dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
-       else
+               dev->features |= NETIF_F_TSO6;
+       } else {
                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
+               dev->features &= ~NETIF_F_TSO6;
+       }
+
        return 0;
 }
 
-static struct {
-       char string[ETH_GSTRING_LEN];
-} bnx2x_tests_str_arr[BNX2X_NUM_TESTS] = {
-       { "MC Errors  (online)" }
-};
+static const struct {
+       char string[ETH_GSTRING_LEN];
+} bnx2x_tests_str_arr[BNX2X_NUM_TESTS] = {
+       { "register_test (offline)" },
+       { "memory_test (offline)" },
+       { "loopback_test (offline)" },
+       { "nvram_test (online)" },
+       { "interrupt_test (online)" },
+       { "link_test (online)" },
+       { "idle check (online)" },
+       { "MC errors (online)" }
+};
+
+static int bnx2x_self_test_count(struct net_device *dev)
+{
+       return BNX2X_NUM_TESTS;
+}
+
+static int bnx2x_test_registers(struct bnx2x *bp)
+{
+       int idx, i, rc = -ENODEV;
+       u32 wr_val = 0;
+       static const struct {
+               u32  offset0;
+               u32  offset1;
+               u32  mask;
+       } reg_tbl[] = {
+/* 0 */                { BRB1_REG_PAUSE_LOW_THRESHOLD_0,      4, 0x000003ff },
+               { DORQ_REG_DB_ADDR0,                   4, 0xffffffff },
+               { HC_REG_AGG_INT_0,                    4, 0x000003ff },
+               { PBF_REG_MAC_IF0_ENABLE,              4, 0x00000001 },
+               { PBF_REG_P0_INIT_CRD,                 4, 0x000007ff },
+               { PRS_REG_CID_PORT_0,                  4, 0x00ffffff },
+               { PXP2_REG_PSWRQ_CDU0_L2P,             4, 0x000fffff },
+               { PXP2_REG_RQ_CDU0_EFIRST_MEM_ADDR,    8, 0x0003ffff },
+               { PXP2_REG_PSWRQ_TM0_L2P,              4, 0x000fffff },
+               { PXP2_REG_RQ_USDM0_EFIRST_MEM_ADDR,   8, 0x0003ffff },
+/* 10 */       { PXP2_REG_PSWRQ_TSDM0_L2P,            4, 0x000fffff },
+               { QM_REG_CONNNUM_0,                    4, 0x000fffff },
+               { TM_REG_LIN0_MAX_ACTIVE_CID,          4, 0x0003ffff },
+               { SRC_REG_KEYRSS0_0,                  40, 0xffffffff },
+               { SRC_REG_KEYRSS0_7,                  40, 0xffffffff },
+               { XCM_REG_WU_DA_SET_TMR_CNT_FLG_CMD00, 4, 0x00000001 },
+               { XCM_REG_WU_DA_CNT_CMD00,             4, 0x00000003 },
+               { XCM_REG_GLB_DEL_ACK_MAX_CNT_0,       4, 0x000000ff },
+               { NIG_REG_EGRESS_MNG0_FIFO,           20, 0xffffffff },
+               { NIG_REG_LLH0_T_BIT,                  4, 0x00000001 },
+/* 20 */       { NIG_REG_EMAC0_IN_EN,                 4, 0x00000001 },
+               { NIG_REG_BMAC0_IN_EN,                 4, 0x00000001 },
+               { NIG_REG_XCM0_OUT_EN,                 4, 0x00000001 },
+               { NIG_REG_BRB0_OUT_EN,                 4, 0x00000001 },
+               { NIG_REG_LLH0_XCM_MASK,               4, 0x00000007 },
+               { NIG_REG_LLH0_ACPI_PAT_6_LEN,        68, 0x000000ff },
+               { NIG_REG_LLH0_ACPI_PAT_0_CRC,        68, 0xffffffff },
+               { NIG_REG_LLH0_DEST_MAC_0_0,         160, 0xffffffff },
+               { NIG_REG_LLH0_DEST_IP_0_1,          160, 0xffffffff },
+               { NIG_REG_LLH0_IPV4_IPV6_0,          160, 0x00000001 },
+/* 30 */       { NIG_REG_LLH0_DEST_UDP_0,           160, 0x0000ffff },
+               { NIG_REG_LLH0_DEST_TCP_0,           160, 0x0000ffff },
+               { NIG_REG_LLH0_VLAN_ID_0,            160, 0x00000fff },
+               { NIG_REG_XGXS_SERDES0_MODE_SEL,       4, 0x00000001 },
+               { NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0, 4, 0x00000001 },
+               { NIG_REG_STATUS_INTERRUPT_PORT0,      4, 0x07ffffff },
+               { NIG_REG_XGXS0_CTRL_EXTREMOTEMDIOST, 24, 0x00000001 },
+               { NIG_REG_SERDES0_CTRL_PHY_ADDR,      16, 0x0000001f },
+
+               { 0xffffffff, 0, 0x00000000 }
+       };
+
+       if (!netif_running(bp->dev))
+               return rc;
+
+       /* Repeat the test twice:
+          First by writing 0x00000000, second by writing 0xffffffff */
+       for (idx = 0; idx < 2; idx++) {
+
+               switch (idx) {
+               case 0:
+                       wr_val = 0;
+                       break;
+               case 1:
+                       wr_val = 0xffffffff;
+                       break;
+               }
+
+               for (i = 0; reg_tbl[i].offset0 != 0xffffffff; i++) {
+                       u32 offset, mask, save_val, val;
+                       int port = BP_PORT(bp);
+
+                       offset = reg_tbl[i].offset0 + port*reg_tbl[i].offset1;
+                       mask = reg_tbl[i].mask;
+
+                       save_val = REG_RD(bp, offset);
+
+                       REG_WR(bp, offset, wr_val);
+                       val = REG_RD(bp, offset);
+
+                       /* Restore the original register's value */
+                       REG_WR(bp, offset, save_val);
+
+                       /* verify that value is as expected value */
+                       if ((val & mask) != (wr_val & mask))
+                               goto test_reg_exit;
+               }
+       }
+
+       rc = 0;
+
+test_reg_exit:
+       return rc;
+}
+
+static int bnx2x_test_memory(struct bnx2x *bp)
+{
+       int i, j, rc = -ENODEV;
+       u32 val;
+       static const struct {
+               u32 offset;
+               int size;
+       } mem_tbl[] = {
+               { CCM_REG_XX_DESCR_TABLE,   CCM_REG_XX_DESCR_TABLE_SIZE },
+               { CFC_REG_ACTIVITY_COUNTER, CFC_REG_ACTIVITY_COUNTER_SIZE },
+               { CFC_REG_LINK_LIST,        CFC_REG_LINK_LIST_SIZE },
+               { DMAE_REG_CMD_MEM,         DMAE_REG_CMD_MEM_SIZE },
+               { TCM_REG_XX_DESCR_TABLE,   TCM_REG_XX_DESCR_TABLE_SIZE },
+               { UCM_REG_XX_DESCR_TABLE,   UCM_REG_XX_DESCR_TABLE_SIZE },
+               { XCM_REG_XX_DESCR_TABLE,   XCM_REG_XX_DESCR_TABLE_SIZE },
+
+               { 0xffffffff, 0 }
+       };
+       static const struct {
+               char *name;
+               u32 offset;
+               u32 mask;
+       } prty_tbl[] = {
+               { "CCM_REG_CCM_PRTY_STS",     CCM_REG_CCM_PRTY_STS,     0 },
+               { "CFC_REG_CFC_PRTY_STS",     CFC_REG_CFC_PRTY_STS,     0 },
+               { "DMAE_REG_DMAE_PRTY_STS",   DMAE_REG_DMAE_PRTY_STS,   0 },
+               { "TCM_REG_TCM_PRTY_STS",     TCM_REG_TCM_PRTY_STS,     0 },
+               { "UCM_REG_UCM_PRTY_STS",     UCM_REG_UCM_PRTY_STS,     0 },
+               { "XCM_REG_XCM_PRTY_STS",     XCM_REG_XCM_PRTY_STS,     0x1 },
+
+               { NULL, 0xffffffff, 0 }
+       };
+
+       if (!netif_running(bp->dev))
+               return rc;
+
+       /* Go through all the memories */
+       for (i = 0; mem_tbl[i].offset != 0xffffffff; i++)
+               for (j = 0; j < mem_tbl[i].size; j++)
+                       REG_RD(bp, mem_tbl[i].offset + j*4);
+
+       /* Check the parity status */
+       for (i = 0; prty_tbl[i].offset != 0xffffffff; i++) {
+               val = REG_RD(bp, prty_tbl[i].offset);
+               if (val & ~(prty_tbl[i].mask)) {
+                       DP(NETIF_MSG_HW,
+                          "%s is 0x%x\n", prty_tbl[i].name, val);
+                       goto test_mem_exit;
+               }
+       }
+
+       rc = 0;
+
+test_mem_exit:
+       return rc;
+}
+
+static void bnx2x_netif_start(struct bnx2x *bp)
+{
+       int i;
+
+       if (atomic_dec_and_test(&bp->intr_sem)) {
+               if (netif_running(bp->dev)) {
+                       bnx2x_int_enable(bp);
+                       for_each_queue(bp, i)
+                               napi_enable(&bnx2x_fp(bp, i, napi));
+                       if (bp->state == BNX2X_STATE_OPEN)
+                               netif_wake_queue(bp->dev);
+               }
+       }
+}
+
+static void bnx2x_netif_stop(struct bnx2x *bp)
+{
+       int i;
+
+       if (netif_running(bp->dev)) {
+               netif_tx_disable(bp->dev);
+               bp->dev->trans_start = jiffies; /* prevent tx timeout */
+               for_each_queue(bp, i)
+                       napi_disable(&bnx2x_fp(bp, i, napi));
+       }
+       bnx2x_int_disable_sync(bp);
+}
+
+static void bnx2x_wait_for_link(struct bnx2x *bp, u8 link_up)
+{
+       int cnt = 1000;
+
+       if (link_up)
+               while (bnx2x_link_test(bp) && cnt--)
+                       msleep(10);
+}
+
+static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
+{
+       unsigned int pkt_size, num_pkts, i;
+       struct sk_buff *skb;
+       unsigned char *packet;
+       struct bnx2x_fastpath *fp = &bp->fp[0];
+       u16 tx_start_idx, tx_idx;
+       u16 rx_start_idx, rx_idx;
+       u16 pkt_prod;
+       struct sw_tx_bd *tx_buf;
+       struct eth_tx_bd *tx_bd;
+       dma_addr_t mapping;
+       union eth_rx_cqe *cqe;
+       u8 cqe_fp_flags;
+       struct sw_rx_bd *rx_buf;
+       u16 len;
+       int rc = -ENODEV;
+
+       if (loopback_mode == BNX2X_MAC_LOOPBACK) {
+               bp->link_params.loopback_mode = LOOPBACK_BMAC;
+               bnx2x_phy_hw_lock(bp);
+               bnx2x_phy_init(&bp->link_params, &bp->link_vars);
+               bnx2x_phy_hw_unlock(bp);
+
+       } else if (loopback_mode == BNX2X_PHY_LOOPBACK) {
+               bp->link_params.loopback_mode = LOOPBACK_XGXS_10;
+               bnx2x_phy_hw_lock(bp);
+               bnx2x_phy_init(&bp->link_params, &bp->link_vars);
+               bnx2x_phy_hw_unlock(bp);
+               /* wait until link state is restored */
+               bnx2x_wait_for_link(bp, link_up);
+
+       } else
+               return -EINVAL;
+
+       pkt_size = 1514;
+       skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+       if (!skb) {
+               rc = -ENOMEM;
+               goto test_loopback_exit;
+       }
+       packet = skb_put(skb, pkt_size);
+       memcpy(packet, bp->dev->dev_addr, ETH_ALEN);
+       memset(packet + ETH_ALEN, 0, (ETH_HLEN - ETH_ALEN));
+       for (i = ETH_HLEN; i < pkt_size; i++)
+               packet[i] = (unsigned char) (i & 0xff);
+
+       num_pkts = 0;
+       tx_start_idx = le16_to_cpu(*fp->tx_cons_sb);
+       rx_start_idx = le16_to_cpu(*fp->rx_cons_sb);
+
+       pkt_prod = fp->tx_pkt_prod++;
+       tx_buf = &fp->tx_buf_ring[TX_BD(pkt_prod)];
+       tx_buf->first_bd = fp->tx_bd_prod;
+       tx_buf->skb = skb;
+
+       tx_bd = &fp->tx_desc_ring[TX_BD(fp->tx_bd_prod)];
+       mapping = pci_map_single(bp->pdev, skb->data,
+                                skb_headlen(skb), PCI_DMA_TODEVICE);
+       tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+       tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+       tx_bd->nbd = cpu_to_le16(1);
+       tx_bd->nbytes = cpu_to_le16(skb_headlen(skb));
+       tx_bd->vlan = cpu_to_le16(pkt_prod);
+       tx_bd->bd_flags.as_bitfield = (ETH_TX_BD_FLAGS_START_BD |
+                                      ETH_TX_BD_FLAGS_END_BD);
+       tx_bd->general_data = ((UNICAST_ADDRESS <<
+                               ETH_TX_BD_ETH_ADDR_TYPE_SHIFT) | 1);
+
+       fp->hw_tx_prods->bds_prod =
+               cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + 1);
+       mb(); /* FW restriction: must not reorder writing nbd and packets */
+       fp->hw_tx_prods->packets_prod =
+               cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1);
+       DOORBELL(bp, FP_IDX(fp), 0);
+
+       mmiowb();
+
+       num_pkts++;
+       fp->tx_bd_prod++;
+       bp->dev->trans_start = jiffies;
+
+       udelay(100);
+
+       tx_idx = le16_to_cpu(*fp->tx_cons_sb);
+       if (tx_idx != tx_start_idx + num_pkts)
+               goto test_loopback_exit;
+
+       rx_idx = le16_to_cpu(*fp->rx_cons_sb);
+       if (rx_idx != rx_start_idx + num_pkts)
+               goto test_loopback_exit;
+
+       cqe = &fp->rx_comp_ring[RCQ_BD(fp->rx_comp_cons)];
+       cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
+       if (CQE_TYPE(cqe_fp_flags) || (cqe_fp_flags & ETH_RX_ERROR_FALGS))
+               goto test_loopback_rx_exit;
+
+       len = le16_to_cpu(cqe->fast_path_cqe.pkt_len);
+       if (len != pkt_size)
+               goto test_loopback_rx_exit;
+
+       rx_buf = &fp->rx_buf_ring[RX_BD(fp->rx_bd_cons)];
+       skb = rx_buf->skb;
+       skb_reserve(skb, cqe->fast_path_cqe.placement_offset);
+       for (i = ETH_HLEN; i < pkt_size; i++)
+               if (*(skb->data + i) != (unsigned char) (i & 0xff))
+                       goto test_loopback_rx_exit;
+
+       rc = 0;
+
+test_loopback_rx_exit:
+       bp->dev->last_rx = jiffies;
+
+       fp->rx_bd_cons = NEXT_RX_IDX(fp->rx_bd_cons);
+       fp->rx_bd_prod = NEXT_RX_IDX(fp->rx_bd_prod);
+       fp->rx_comp_cons = NEXT_RCQ_IDX(fp->rx_comp_cons);
+       fp->rx_comp_prod = NEXT_RCQ_IDX(fp->rx_comp_prod);
+
+       /* Update producers */
+       bnx2x_update_rx_prod(bp, fp, fp->rx_bd_prod, fp->rx_comp_prod,
+                            fp->rx_sge_prod);
+       mmiowb(); /* keep prod updates ordered */
+
+test_loopback_exit:
+       bp->link_params.loopback_mode = LOOPBACK_NONE;
+
+       return rc;
+}
+
+static int bnx2x_test_loopback(struct bnx2x *bp, u8 link_up)
+{
+       int rc = 0;
+
+       if (!netif_running(bp->dev))
+               return BNX2X_LOOPBACK_FAILED;
+
+       bnx2x_netif_stop(bp);
+
+       if (bnx2x_run_loopback(bp, BNX2X_MAC_LOOPBACK, link_up)) {
+               DP(NETIF_MSG_PROBE, "MAC loopback failed\n");
+               rc |= BNX2X_MAC_LOOPBACK_FAILED;
+       }
+
+       if (bnx2x_run_loopback(bp, BNX2X_PHY_LOOPBACK, link_up)) {
+               DP(NETIF_MSG_PROBE, "PHY loopback failed\n");
+               rc |= BNX2X_PHY_LOOPBACK_FAILED;
+       }
+
+       bnx2x_netif_start(bp);
+
+       return rc;
+}
+
+#define CRC32_RESIDUAL                 0xdebb20e3
+
+static int bnx2x_test_nvram(struct bnx2x *bp)
+{
+       static const struct {
+               int offset;
+               int size;
+       } nvram_tbl[] = {
+               {     0,  0x14 }, /* bootstrap */
+               {  0x14,  0xec }, /* dir */
+               { 0x100, 0x350 }, /* manuf_info */
+               { 0x450,  0xf0 }, /* feature_info */
+               { 0x640,  0x64 }, /* upgrade_key_info */
+               { 0x6a4,  0x64 },
+               { 0x708,  0x70 }, /* manuf_key_info */
+               { 0x778,  0x70 },
+               {     0,     0 }
+       };
+       u32 buf[0x350 / 4];
+       u8 *data = (u8 *)buf;
+       int i, rc;
+       u32 magic, csum;
+
+       rc = bnx2x_nvram_read(bp, 0, data, 4);
+       if (rc) {
+               DP(NETIF_MSG_PROBE, "magic value read (rc -%d)\n", -rc);
+               goto test_nvram_exit;
+       }
+
+       magic = be32_to_cpu(buf[0]);
+       if (magic != 0x669955aa) {
+               DP(NETIF_MSG_PROBE, "magic value (0x%08x)\n", magic);
+               rc = -ENODEV;
+               goto test_nvram_exit;
+       }
+
+       for (i = 0; nvram_tbl[i].size; i++) {
+
+               rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, data,
+                                     nvram_tbl[i].size);
+               if (rc) {
+                       DP(NETIF_MSG_PROBE,
+                          "nvram_tbl[%d] read data (rc -%d)\n", i, -rc);
+                       goto test_nvram_exit;
+               }
+
+               csum = ether_crc_le(nvram_tbl[i].size, data);
+               if (csum != CRC32_RESIDUAL) {
+                       DP(NETIF_MSG_PROBE,
+                          "nvram_tbl[%d] csum value (0x%08x)\n", i, csum);
+                       rc = -ENODEV;
+                       goto test_nvram_exit;
+               }
+       }
+
+test_nvram_exit:
+       return rc;
+}
 
-static int bnx2x_self_test_count(struct net_device *dev)
+static int bnx2x_test_intr(struct bnx2x *bp)
 {
-       return BNX2X_NUM_TESTS;
+       struct mac_configuration_cmd *config = bnx2x_sp(bp, mac_config);
+       int i, rc;
+
+       if (!netif_running(bp->dev))
+               return -ENODEV;
+
+       config->hdr.length_6b = 0;
+       config->hdr.offset = 0;
+       config->hdr.client_id = BP_CL_ID(bp);
+       config->hdr.reserved1 = 0;
+
+       rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0,
+                          U64_HI(bnx2x_sp_mapping(bp, mac_config)),
+                          U64_LO(bnx2x_sp_mapping(bp, mac_config)), 0);
+       if (rc == 0) {
+               bp->set_mac_pending++;
+               for (i = 0; i < 10; i++) {
+                       if (!bp->set_mac_pending)
+                               break;
+                       msleep_interruptible(10);
+               }
+               if (i == 10)
+                       rc = -ENODEV;
+       }
+
+       return rc;
 }
 
 static void bnx2x_self_test(struct net_device *dev,
                            struct ethtool_test *etest, u64 *buf)
 {
        struct bnx2x *bp = netdev_priv(dev);
-       int stats_state;
 
        memset(buf, 0, sizeof(u64) * BNX2X_NUM_TESTS);
 
-       if (bp->state != BNX2X_STATE_OPEN) {
-               DP(NETIF_MSG_PROBE, "state is %x, returning\n", bp->state);
+       if (!netif_running(dev))
                return;
-       }
 
-       stats_state = bp->stats_state;
-       bnx2x_stop_stats(bp);
+       /* offline tests are not suppoerted in MF mode */
+       if (IS_E1HMF(bp))
+               etest->flags &= ~ETH_TEST_FL_OFFLINE;
+
+       if (etest->flags & ETH_TEST_FL_OFFLINE) {
+               u8 link_up;
+
+               link_up = bp->link_vars.link_up;
+               bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+               bnx2x_nic_load(bp, LOAD_DIAG);
+               /* wait until link state is restored */
+               bnx2x_wait_for_link(bp, link_up);
 
-       if (bnx2x_mc_assert(bp) != 0) {
-               buf[0] = 1;
+               if (bnx2x_test_registers(bp) != 0) {
+                       buf[0] = 1;
+                       etest->flags |= ETH_TEST_FL_FAILED;
+               }
+               if (bnx2x_test_memory(bp) != 0) {
+                       buf[1] = 1;
+                       etest->flags |= ETH_TEST_FL_FAILED;
+               }
+               buf[2] = bnx2x_test_loopback(bp, link_up);
+               if (buf[2] != 0)
+                       etest->flags |= ETH_TEST_FL_FAILED;
+
+               bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+               bnx2x_nic_load(bp, LOAD_NORMAL);
+               /* wait until link state is restored */
+               bnx2x_wait_for_link(bp, link_up);
+       }
+       if (bnx2x_test_nvram(bp) != 0) {
+               buf[3] = 1;
                etest->flags |= ETH_TEST_FL_FAILED;
        }
+       if (bnx2x_test_intr(bp) != 0) {
+               buf[4] = 1;
+               etest->flags |= ETH_TEST_FL_FAILED;
+       }
+       if (bp->port.pmf)
+               if (bnx2x_link_test(bp) != 0) {
+                       buf[5] = 1;
+                       etest->flags |= ETH_TEST_FL_FAILED;
+               }
+       buf[7] = bnx2x_mc_assert(bp);
+       if (buf[7] != 0)
+               etest->flags |= ETH_TEST_FL_FAILED;
 
 #ifdef BNX2X_EXTRA_DEBUG
        bnx2x_panic_dump(bp);
 #endif
-       bp->stats_state = stats_state;
 }
 
-static struct {
+static const struct {
+       long offset;
+       int size;
+       u32 flags;
        char string[ETH_GSTRING_LEN];
-} bnx2x_stats_str_arr[BNX2X_NUM_STATS] = {
-       { "rx_bytes"},
-       { "rx_error_bytes"},
-       { "tx_bytes"},
-       { "tx_error_bytes"},
-       { "rx_ucast_packets"},
-       { "rx_mcast_packets"},
-       { "rx_bcast_packets"},
-       { "tx_ucast_packets"},
-       { "tx_mcast_packets"},
-       { "tx_bcast_packets"},
-       { "tx_mac_errors"},     /* 10 */
-       { "tx_carrier_errors"},
-       { "rx_crc_errors"},
-       { "rx_align_errors"},
-       { "tx_single_collisions"},
-       { "tx_multi_collisions"},
-       { "tx_deferred"},
-       { "tx_excess_collisions"},
-       { "tx_late_collisions"},
-       { "tx_total_collisions"},
-       { "rx_fragments"},      /* 20 */
-       { "rx_jabbers"},
-       { "rx_undersize_packets"},
-       { "rx_oversize_packets"},
-       { "rx_xon_frames"},
-       { "rx_xoff_frames"},
-       { "tx_xon_frames"},
-       { "tx_xoff_frames"},
-       { "rx_mac_ctrl_frames"},
-       { "rx_filtered_packets"},
-       { "rx_discards"},       /* 30 */
-       { "brb_discard"},
-       { "brb_truncate"},
-       { "xxoverflow"}
-};
-
-#define STATS_OFFSET32(offset_name) \
-       (offsetof(struct bnx2x_eth_stats, offset_name) / 4)
-
-static unsigned long bnx2x_stats_offset_arr[BNX2X_NUM_STATS] = {
-       STATS_OFFSET32(total_bytes_received_hi),
-       STATS_OFFSET32(stat_IfHCInBadOctets_hi),
-       STATS_OFFSET32(total_bytes_transmitted_hi),
-       STATS_OFFSET32(stat_IfHCOutBadOctets_hi),
-       STATS_OFFSET32(total_unicast_packets_received_hi),
-       STATS_OFFSET32(total_multicast_packets_received_hi),
-       STATS_OFFSET32(total_broadcast_packets_received_hi),
-       STATS_OFFSET32(total_unicast_packets_transmitted_hi),
-       STATS_OFFSET32(total_multicast_packets_transmitted_hi),
-       STATS_OFFSET32(total_broadcast_packets_transmitted_hi),
-       STATS_OFFSET32(stat_Dot3statsInternalMacTransmitErrors), /* 10 */
-       STATS_OFFSET32(stat_Dot3StatsCarrierSenseErrors),
-       STATS_OFFSET32(crc_receive_errors),
-       STATS_OFFSET32(alignment_errors),
-       STATS_OFFSET32(single_collision_transmit_frames),
-       STATS_OFFSET32(multiple_collision_transmit_frames),
-       STATS_OFFSET32(stat_Dot3StatsDeferredTransmissions),
-       STATS_OFFSET32(excessive_collision_frames),
-       STATS_OFFSET32(late_collision_frames),
-       STATS_OFFSET32(number_of_bugs_found_in_stats_spec),
-       STATS_OFFSET32(runt_packets_received),                  /* 20 */
-       STATS_OFFSET32(jabber_packets_received),
-       STATS_OFFSET32(error_runt_packets_received),
-       STATS_OFFSET32(error_jabber_packets_received),
-       STATS_OFFSET32(pause_xon_frames_received),
-       STATS_OFFSET32(pause_xoff_frames_received),
-       STATS_OFFSET32(pause_xon_frames_transmitted),
-       STATS_OFFSET32(pause_xoff_frames_transmitted),
-       STATS_OFFSET32(control_frames_received),
-       STATS_OFFSET32(mac_filter_discard),
-       STATS_OFFSET32(no_buff_discard),                        /* 30 */
-       STATS_OFFSET32(brb_discard),
-       STATS_OFFSET32(brb_truncate_discard),
-       STATS_OFFSET32(xxoverflow_discard)
-};
-
-static u8 bnx2x_stats_len_arr[BNX2X_NUM_STATS] = {
-       8, 0, 8, 0, 8, 8, 8, 8, 8, 8,
-       4, 0, 4, 4, 4, 4, 4, 4, 4, 4,
-       4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-       4, 4, 4, 4
+} bnx2x_stats_arr[BNX2X_NUM_STATS] = {
+/* 1 */        { STATS_OFFSET32(valid_bytes_received_hi),     8, 1, "rx_bytes" },
+       { STATS_OFFSET32(error_bytes_received_hi),     8, 1, "rx_error_bytes" },
+       { STATS_OFFSET32(total_bytes_transmitted_hi),  8, 1, "tx_bytes" },
+       { STATS_OFFSET32(tx_stat_ifhcoutbadoctets_hi), 8, 0, "tx_error_bytes" },
+       { STATS_OFFSET32(total_unicast_packets_received_hi),
+                                               8, 1, "rx_ucast_packets" },
+       { STATS_OFFSET32(total_multicast_packets_received_hi),
+                                               8, 1, "rx_mcast_packets" },
+       { STATS_OFFSET32(total_broadcast_packets_received_hi),
+                                               8, 1, "rx_bcast_packets" },
+       { STATS_OFFSET32(total_unicast_packets_transmitted_hi),
+                                               8, 1, "tx_packets" },
+       { STATS_OFFSET32(tx_stat_dot3statsinternalmactransmiterrors_hi),
+                                               8, 0, "tx_mac_errors" },
+/* 10 */{ STATS_OFFSET32(rx_stat_dot3statscarriersenseerrors_hi),
+                                               8, 0, "tx_carrier_errors" },
+       { STATS_OFFSET32(rx_stat_dot3statsfcserrors_hi),
+                                               8, 0, "rx_crc_errors" },
+       { STATS_OFFSET32(rx_stat_dot3statsalignmenterrors_hi),
+                                               8, 0, "rx_align_errors" },
+       { STATS_OFFSET32(tx_stat_dot3statssinglecollisionframes_hi),
+                                               8, 0, "tx_single_collisions" },
+       { STATS_OFFSET32(tx_stat_dot3statsmultiplecollisionframes_hi),
+                                               8, 0, "tx_multi_collisions" },
+       { STATS_OFFSET32(tx_stat_dot3statsdeferredtransmissions_hi),
+                                               8, 0, "tx_deferred" },
+       { STATS_OFFSET32(tx_stat_dot3statsexcessivecollisions_hi),
+                                               8, 0, "tx_excess_collisions" },
+       { STATS_OFFSET32(tx_stat_dot3statslatecollisions_hi),
+                                               8, 0, "tx_late_collisions" },
+       { STATS_OFFSET32(tx_stat_etherstatscollisions_hi),
+                                               8, 0, "tx_total_collisions" },
+       { STATS_OFFSET32(rx_stat_etherstatsfragments_hi),
+                                               8, 0, "rx_fragments" },
+/* 20 */{ STATS_OFFSET32(rx_stat_etherstatsjabbers_hi), 8, 0, "rx_jabbers" },
+       { STATS_OFFSET32(rx_stat_etherstatsundersizepkts_hi),
+                                               8, 0, "rx_undersize_packets" },
+       { STATS_OFFSET32(jabber_packets_received),
+                                               4, 1, "rx_oversize_packets" },
+       { STATS_OFFSET32(tx_stat_etherstatspkts64octets_hi),
+                                               8, 0, "tx_64_byte_packets" },
+       { STATS_OFFSET32(tx_stat_etherstatspkts65octetsto127octets_hi),
+                                       8, 0, "tx_65_to_127_byte_packets" },
+       { STATS_OFFSET32(tx_stat_etherstatspkts128octetsto255octets_hi),
+                                       8, 0, "tx_128_to_255_byte_packets" },
+       { STATS_OFFSET32(tx_stat_etherstatspkts256octetsto511octets_hi),
+                                       8, 0, "tx_256_to_511_byte_packets" },
+       { STATS_OFFSET32(tx_stat_etherstatspkts512octetsto1023octets_hi),
+                                       8, 0, "tx_512_to_1023_byte_packets" },
+       { STATS_OFFSET32(etherstatspkts1024octetsto1522octets_hi),
+                                       8, 0, "tx_1024_to_1522_byte_packets" },
+       { STATS_OFFSET32(etherstatspktsover1522octets_hi),
+                                       8, 0, "tx_1523_to_9022_byte_packets" },
+/* 30 */{ STATS_OFFSET32(rx_stat_xonpauseframesreceived_hi),
+                                               8, 0, "rx_xon_frames" },
+       { STATS_OFFSET32(rx_stat_xoffpauseframesreceived_hi),
+                                               8, 0, "rx_xoff_frames" },
+       { STATS_OFFSET32(tx_stat_outxonsent_hi),  8, 0, "tx_xon_frames" },
+       { STATS_OFFSET32(tx_stat_outxoffsent_hi), 8, 0, "tx_xoff_frames" },
+       { STATS_OFFSET32(rx_stat_maccontrolframesreceived_hi),
+                                               8, 0, "rx_mac_ctrl_frames" },
+       { STATS_OFFSET32(mac_filter_discard),   4, 1, "rx_filtered_packets" },
+       { STATS_OFFSET32(no_buff_discard),      4, 1, "rx_discards" },
+       { STATS_OFFSET32(xxoverflow_discard),   4, 1, "rx_fw_discards" },
+       { STATS_OFFSET32(brb_drop_hi),          8, 1, "brb_discard" },
+/* 39 */{ STATS_OFFSET32(brb_truncate_discard), 8, 1, "brb_truncate" }
 };
 
 static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
 {
+       struct bnx2x *bp = netdev_priv(dev);
+       int i, j;
+
        switch (stringset) {
        case ETH_SS_STATS:
-               memcpy(buf, bnx2x_stats_str_arr, sizeof(bnx2x_stats_str_arr));
+               for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
+                       if (IS_E1HMF(bp) && (!bnx2x_stats_arr[i].flags))
+                               continue;
+                       strcpy(buf + j*ETH_GSTRING_LEN,
+                              bnx2x_stats_arr[i].string);
+                       j++;
+               }
                break;
 
        case ETH_SS_TEST:
@@ -8903,95 +8921,121 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
 
 static int bnx2x_get_stats_count(struct net_device *dev)
 {
-       return BNX2X_NUM_STATS;
+       struct bnx2x *bp = netdev_priv(dev);
+       int i, num_stats = 0;
+
+       for (i = 0; i < BNX2X_NUM_STATS; i++) {
+               if (IS_E1HMF(bp) && (!bnx2x_stats_arr[i].flags))
+                       continue;
+               num_stats++;
+       }
+       return num_stats;
 }
 
 static void bnx2x_get_ethtool_stats(struct net_device *dev,
                                    struct ethtool_stats *stats, u64 *buf)
 {
        struct bnx2x *bp = netdev_priv(dev);
-       u32 *hw_stats = (u32 *)bnx2x_sp_check(bp, eth_stats);
-       int i;
+       u32 *hw_stats = (u32 *)&bp->eth_stats;
+       int i, j;
 
-       for (i = 0; i < BNX2X_NUM_STATS; i++) {
-               if (bnx2x_stats_len_arr[i] == 0) {
-                       /* skip this counter */
-                       buf[i] = 0;
+       for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
+               if (IS_E1HMF(bp) && (!bnx2x_stats_arr[i].flags))
                        continue;
-               }
-               if (!hw_stats) {
-                       buf[i] = 0;
+
+               if (bnx2x_stats_arr[i].size == 0) {
+                       /* skip this counter */
+                       buf[j] = 0;
+                       j++;
                        continue;
                }
-               if (bnx2x_stats_len_arr[i] == 4) {
+               if (bnx2x_stats_arr[i].size == 4) {
                        /* 4-byte counter */
-                      buf[i] = (u64) *(hw_stats + bnx2x_stats_offset_arr[i]);
+                       buf[j] = (u64) *(hw_stats + bnx2x_stats_arr[i].offset);
+                       j++;
                        continue;
                }
                /* 8-byte counter */
-               buf[i] = HILO_U64(*(hw_stats + bnx2x_stats_offset_arr[i]),
-                                *(hw_stats + bnx2x_stats_offset_arr[i] + 1));
+               buf[j] = HILO_U64(*(hw_stats + bnx2x_stats_arr[i].offset),
+                                 *(hw_stats + bnx2x_stats_arr[i].offset + 1));
+               j++;
        }
 }
 
 static int bnx2x_phys_id(struct net_device *dev, u32 data)
 {
        struct bnx2x *bp = netdev_priv(dev);
+       int port = BP_PORT(bp);
        int i;
 
+       if (!netif_running(dev))
+               return 0;
+
+       if (!bp->port.pmf)
+               return 0;
+
        if (data == 0)
                data = 2;
 
        for (i = 0; i < (data * 2); i++) {
-               if ((i % 2) == 0) {
-                       bnx2x_leds_set(bp, SPEED_1000);
-               } else {
-                       bnx2x_leds_unset(bp);
-               }
+               if ((i % 2) == 0)
+                       bnx2x_set_led(bp, port, LED_MODE_OPER, SPEED_1000,
+                                     bp->link_params.hw_led_mode,
+                                     bp->link_params.chip_id);
+               else
+                       bnx2x_set_led(bp, port, LED_MODE_OFF, 0,
+                                     bp->link_params.hw_led_mode,
+                                     bp->link_params.chip_id);
+
                msleep_interruptible(500);
                if (signal_pending(current))
                        break;
        }
 
-       if (bp->link_up)
-               bnx2x_leds_set(bp, bp->line_speed);
+       if (bp->link_vars.link_up)
+               bnx2x_set_led(bp, port, LED_MODE_OPER,
+                             bp->link_vars.line_speed,
+                             bp->link_params.hw_led_mode,
+                             bp->link_params.chip_id);
 
        return 0;
 }
 
 static struct ethtool_ops bnx2x_ethtool_ops = {
-       .get_settings           = bnx2x_get_settings,
-       .set_settings           = bnx2x_set_settings,
-       .get_drvinfo            = bnx2x_get_drvinfo,
+       .get_settings           = bnx2x_get_settings,
+       .set_settings           = bnx2x_set_settings,
+       .get_drvinfo            = bnx2x_get_drvinfo,
        .get_wol                = bnx2x_get_wol,
        .set_wol                = bnx2x_set_wol,
-       .get_msglevel           = bnx2x_get_msglevel,
-       .set_msglevel           = bnx2x_set_msglevel,
-       .nway_reset             = bnx2x_nway_reset,
-       .get_link               = ethtool_op_get_link,
-       .get_eeprom_len         = bnx2x_get_eeprom_len,
-       .get_eeprom             = bnx2x_get_eeprom,
-       .set_eeprom             = bnx2x_set_eeprom,
-       .get_coalesce           = bnx2x_get_coalesce,
-       .set_coalesce           = bnx2x_set_coalesce,
-       .get_ringparam          = bnx2x_get_ringparam,
-       .set_ringparam          = bnx2x_set_ringparam,
-       .get_pauseparam         = bnx2x_get_pauseparam,
-       .set_pauseparam         = bnx2x_set_pauseparam,
-       .get_rx_csum            = bnx2x_get_rx_csum,
-       .set_rx_csum            = bnx2x_set_rx_csum,
-       .get_tx_csum            = ethtool_op_get_tx_csum,
-       .set_tx_csum            = ethtool_op_set_tx_csum,
-       .get_sg                 = ethtool_op_get_sg,
-       .set_sg                 = ethtool_op_set_sg,
+       .get_msglevel           = bnx2x_get_msglevel,
+       .set_msglevel           = bnx2x_set_msglevel,
+       .nway_reset             = bnx2x_nway_reset,
+       .get_link               = ethtool_op_get_link,
+       .get_eeprom_len         = bnx2x_get_eeprom_len,
+       .get_eeprom             = bnx2x_get_eeprom,
+       .set_eeprom             = bnx2x_set_eeprom,
+       .get_coalesce           = bnx2x_get_coalesce,
+       .set_coalesce           = bnx2x_set_coalesce,
+       .get_ringparam          = bnx2x_get_ringparam,
+       .set_ringparam          = bnx2x_set_ringparam,
+       .get_pauseparam         = bnx2x_get_pauseparam,
+       .set_pauseparam         = bnx2x_set_pauseparam,
+       .get_rx_csum            = bnx2x_get_rx_csum,
+       .set_rx_csum            = bnx2x_set_rx_csum,
+       .get_tx_csum            = ethtool_op_get_tx_csum,
+       .set_tx_csum            = ethtool_op_set_tx_hw_csum,
+       .set_flags              = bnx2x_set_flags,
+       .get_flags              = ethtool_op_get_flags,
+       .get_sg                 = ethtool_op_get_sg,
+       .set_sg                 = ethtool_op_set_sg,
        .get_tso                = ethtool_op_get_tso,
        .set_tso                = bnx2x_set_tso,
        .self_test_count        = bnx2x_self_test_count,
-       .self_test              = bnx2x_self_test,
-       .get_strings            = bnx2x_get_strings,
+       .self_test              = bnx2x_self_test,
+       .get_strings            = bnx2x_get_strings,
        .phys_id                = bnx2x_phys_id,
        .get_stats_count        = bnx2x_get_stats_count,
-       .get_ethtool_stats      = bnx2x_get_ethtool_stats
+       .get_ethtool_stats      = bnx2x_get_ethtool_stats,
 };
 
 /* end of ethtool_ops */
@@ -9008,8 +9052,7 @@ static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state)
 
        switch (state) {
        case PCI_D0:
-               pci_write_config_word(bp->pdev,
-                                     bp->pm_cap + PCI_PM_CTRL,
+               pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
                                      ((pmcsr & ~PCI_PM_CTRL_STATE_MASK) |
                                       PCI_PM_CTRL_PME_STATUS));
 
@@ -9043,82 +9086,6 @@ static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state)
  * net_device service functions
  */
 
-/* called with netif_tx_lock from set_multicast */
-static void bnx2x_set_rx_mode(struct net_device *dev)
-{
-       struct bnx2x *bp = netdev_priv(dev);
-       u32 rx_mode = BNX2X_RX_MODE_NORMAL;
-
-       DP(NETIF_MSG_IFUP, "called dev->flags = %x\n", dev->flags);
-
-       if (dev->flags & IFF_PROMISC)
-               rx_mode = BNX2X_RX_MODE_PROMISC;
-
-       else if ((dev->flags & IFF_ALLMULTI) ||
-                (dev->mc_count > BNX2X_MAX_MULTICAST))
-               rx_mode = BNX2X_RX_MODE_ALLMULTI;
-
-       else { /* some multicasts */
-               int i, old, offset;
-               struct dev_mc_list *mclist;
-               struct mac_configuration_cmd *config =
-                                               bnx2x_sp(bp, mcast_config);
-
-               for (i = 0, mclist = dev->mc_list;
-                    mclist && (i < dev->mc_count);
-                    i++, mclist = mclist->next) {
-
-                       config->config_table[i].cam_entry.msb_mac_addr =
-                                       swab16(*(u16 *)&mclist->dmi_addr[0]);
-                       config->config_table[i].cam_entry.middle_mac_addr =
-                                       swab16(*(u16 *)&mclist->dmi_addr[2]);
-                       config->config_table[i].cam_entry.lsb_mac_addr =
-                                       swab16(*(u16 *)&mclist->dmi_addr[4]);
-                       config->config_table[i].cam_entry.flags =
-                                                       cpu_to_le16(bp->port);
-                       config->config_table[i].target_table_entry.flags = 0;
-                       config->config_table[i].target_table_entry.
-                                                               client_id = 0;
-                       config->config_table[i].target_table_entry.
-                                                               vlan_id = 0;
-
-                       DP(NETIF_MSG_IFUP,
-                          "setting MCAST[%d] (%04x:%04x:%04x)\n",
-                          i, config->config_table[i].cam_entry.msb_mac_addr,
-                          config->config_table[i].cam_entry.middle_mac_addr,
-                          config->config_table[i].cam_entry.lsb_mac_addr);
-               }
-               old = config->hdr.length_6b;
-               if (old > i) {
-                       for (; i < old; i++) {
-                               if (CAM_IS_INVALID(config->config_table[i])) {
-                                       i--; /* already invalidated */
-                                       break;
-                               }
-                               /* invalidate */
-                               CAM_INVALIDATE(config->config_table[i]);
-                       }
-               }
-
-               if (CHIP_REV_IS_SLOW(bp))
-                       offset = BNX2X_MAX_EMUL_MULTI*(1 + bp->port);
-               else
-                       offset = BNX2X_MAX_MULTICAST*(1 + bp->port);
-
-               config->hdr.length_6b = i;
-               config->hdr.offset = offset;
-               config->hdr.reserved0 = 0;
-               config->hdr.reserved1 = 0;
-
-               bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0,
-                             U64_HI(bnx2x_sp_mapping(bp, mcast_config)),
-                             U64_LO(bnx2x_sp_mapping(bp, mcast_config)), 0);
-       }
-
-       bp->rx_mode = rx_mode;
-       bnx2x_set_storm_rx_mode(bp);
-}
-
 static int bnx2x_poll(struct napi_struct *napi, int budget)
 {
        struct bnx2x_fastpath *fp = container_of(napi, struct bnx2x_fastpath,
@@ -9128,7 +9095,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
 
 #ifdef BNX2X_STOP_ON_ERROR
        if (unlikely(bp->panic))
-               goto out_panic;
+               goto poll_panic;
 #endif
 
        prefetch(fp->tx_buf_ring[TX_BD(fp->tx_pkt_cons)].skb);
@@ -9137,36 +9104,205 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
 
        bnx2x_update_fpsb_idx(fp);
 
-       if (le16_to_cpu(*fp->tx_cons_sb) != fp->tx_pkt_cons)
+       if ((fp->tx_pkt_prod != le16_to_cpu(*fp->tx_cons_sb)) ||
+           (fp->tx_pkt_prod != fp->tx_pkt_cons))
                bnx2x_tx_int(fp, budget);
 
-
        if (le16_to_cpu(*fp->rx_cons_sb) != fp->rx_comp_cons)
                work_done = bnx2x_rx_int(fp, budget);
 
-
        rmb(); /* bnx2x_has_work() reads the status block */
 
        /* must not complete if we consumed full budget */
        if ((work_done < budget) && !bnx2x_has_work(fp)) {
 
 #ifdef BNX2X_STOP_ON_ERROR
-out_panic:
+poll_panic:
 #endif
                netif_rx_complete(bp->dev, napi);
 
-               bnx2x_ack_sb(bp, fp->index, USTORM_ID,
+               bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID,
                             le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1);
-               bnx2x_ack_sb(bp, fp->index, CSTORM_ID,
+               bnx2x_ack_sb(bp, FP_SB_ID(fp), CSTORM_ID,
                             le16_to_cpu(fp->fp_c_idx), IGU_INT_ENABLE, 1);
        }
-
        return work_done;
 }
 
-/* Called with netif_tx_lock.
+
+/* we split the first BD into headers and data BDs
+ * to ease the pain of our fellow micocode engineers
+ * we use one mapping for both BDs
+ * So far this has only been observed to happen
+ * in Other Operating Systems(TM)
+ */
+static noinline u16 bnx2x_tx_split(struct bnx2x *bp,
+                                  struct bnx2x_fastpath *fp,
+                                  struct eth_tx_bd **tx_bd, u16 hlen,
+                                  u16 bd_prod, int nbd)
+{
+       struct eth_tx_bd *h_tx_bd = *tx_bd;
+       struct eth_tx_bd *d_tx_bd;
+       dma_addr_t mapping;
+       int old_len = le16_to_cpu(h_tx_bd->nbytes);
+
+       /* first fix first BD */
+       h_tx_bd->nbd = cpu_to_le16(nbd);
+       h_tx_bd->nbytes = cpu_to_le16(hlen);
+
+       DP(NETIF_MSG_TX_QUEUED, "TSO split header size is %d "
+          "(%x:%x) nbd %d\n", h_tx_bd->nbytes, h_tx_bd->addr_hi,
+          h_tx_bd->addr_lo, h_tx_bd->nbd);
+
+       /* now get a new data BD
+        * (after the pbd) and fill it */
+       bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+       d_tx_bd = &fp->tx_desc_ring[bd_prod];
+
+       mapping = HILO_U64(le32_to_cpu(h_tx_bd->addr_hi),
+                          le32_to_cpu(h_tx_bd->addr_lo)) + hlen;
+
+       d_tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+       d_tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+       d_tx_bd->nbytes = cpu_to_le16(old_len - hlen);
+       d_tx_bd->vlan = 0;
+       /* this marks the BD as one that has no individual mapping
+        * the FW ignores this flag in a BD not marked start
+        */
+       d_tx_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_SW_LSO;
+       DP(NETIF_MSG_TX_QUEUED,
+          "TSO split data size is %d (%x:%x)\n",
+          d_tx_bd->nbytes, d_tx_bd->addr_hi, d_tx_bd->addr_lo);
+
+       /* update tx_bd for marking the last BD flag */
+       *tx_bd = d_tx_bd;
+
+       return bd_prod;
+}
+
+static inline u16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)
+{
+       if (fix > 0)
+               csum = (u16) ~csum_fold(csum_sub(csum,
+                               csum_partial(t_header - fix, fix, 0)));
+
+       else if (fix < 0)
+               csum = (u16) ~csum_fold(csum_add(csum,
+                               csum_partial(t_header, -fix, 0)));
+
+       return swab16(csum);
+}
+
+static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
+{
+       u32 rc;
+
+       if (skb->ip_summed != CHECKSUM_PARTIAL)
+               rc = XMIT_PLAIN;
+
+       else {
+               if (skb->protocol == ntohs(ETH_P_IPV6)) {
+                       rc = XMIT_CSUM_V6;
+                       if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
+                               rc |= XMIT_CSUM_TCP;
+
+               } else {
+                       rc = XMIT_CSUM_V4;
+                       if (ip_hdr(skb)->protocol == IPPROTO_TCP)
+                               rc |= XMIT_CSUM_TCP;
+               }
+       }
+
+       if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4)
+               rc |= XMIT_GSO_V4;
+
+       else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
+               rc |= XMIT_GSO_V6;
+
+       return rc;
+}
+
+/* check if packet requires linearization (packet is too fragmented) */
+static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,
+                            u32 xmit_type)
+{
+       int to_copy = 0;
+       int hlen = 0;
+       int first_bd_sz = 0;
+
+       /* 3 = 1 (for linear data BD) + 2 (for PBD and last BD) */
+       if (skb_shinfo(skb)->nr_frags >= (MAX_FETCH_BD - 3)) {
+
+               if (xmit_type & XMIT_GSO) {
+                       unsigned short lso_mss = skb_shinfo(skb)->gso_size;
+                       /* Check if LSO packet needs to be copied:
+                          3 = 1 (for headers BD) + 2 (for PBD and last BD) */
+                       int wnd_size = MAX_FETCH_BD - 3;
+                       /* Number of widnows to check */
+                       int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size;
+                       int wnd_idx = 0;
+                       int frag_idx = 0;
+                       u32 wnd_sum = 0;
+
+                       /* Headers length */
+                       hlen = (int)(skb_transport_header(skb) - skb->data) +
+                               tcp_hdrlen(skb);
+
+                       /* Amount of data (w/o headers) on linear part of SKB*/
+                       first_bd_sz = skb_headlen(skb) - hlen;
+
+                       wnd_sum  = first_bd_sz;
+
+                       /* Calculate the first sum - it's special */
+                       for (frag_idx = 0; frag_idx < wnd_size - 1; frag_idx++)
+                               wnd_sum +=
+                                       skb_shinfo(skb)->frags[frag_idx].size;
+
+                       /* If there was data on linear skb data - check it */
+                       if (first_bd_sz > 0) {
+                               if (unlikely(wnd_sum < lso_mss)) {
+                                       to_copy = 1;
+                                       goto exit_lbl;
+                               }
+
+                               wnd_sum -= first_bd_sz;
+                       }
+
+                       /* Others are easier: run through the frag list and
+                          check all windows */
+                       for (wnd_idx = 0; wnd_idx <= num_wnds; wnd_idx++) {
+                               wnd_sum +=
+                         skb_shinfo(skb)->frags[wnd_idx + wnd_size - 1].size;
+
+                               if (unlikely(wnd_sum < lso_mss)) {
+                                       to_copy = 1;
+                                       break;
+                               }
+                               wnd_sum -=
+                                       skb_shinfo(skb)->frags[wnd_idx].size;
+                       }
+
+               } else {
+                       /* in non-LSO too fragmented packet should always
+                          be linearized */
+                       to_copy = 1;
+               }
+       }
+
+exit_lbl:
+       if (unlikely(to_copy))
+               DP(NETIF_MSG_TX_QUEUED,
+                  "Linearization IS REQUIRED for %s packet. "
+                  "num_frags %d  hlen %d  first_bd_sz %d\n",
+                  (xmit_type & XMIT_GSO) ? "LSO" : "non-LSO",
+                  skb_shinfo(skb)->nr_frags, hlen, first_bd_sz);
+
+       return to_copy;
+}
+
+/* called with netif_tx_lock
  * bnx2x_tx_int() runs without netif_tx_lock unless it needs to call
- * netif_wake_queue().
+ * netif_wake_queue()
  */
 static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
@@ -9176,39 +9312,60 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct eth_tx_bd *tx_bd;
        struct eth_tx_parse_bd *pbd = NULL;
        u16 pkt_prod, bd_prod;
-       int nbd, fp_index = 0;
+       int nbd, fp_index;
        dma_addr_t mapping;
+       u32 xmit_type = bnx2x_xmit_type(bp, skb);
+       int vlan_off = (bp->e1hov ? 4 : 0);
+       int i;
+       u8 hlen = 0;
 
 #ifdef BNX2X_STOP_ON_ERROR
        if (unlikely(bp->panic))
                return NETDEV_TX_BUSY;
 #endif
 
-       fp_index = smp_processor_id() % (bp->num_queues);
-
+       fp_index = (smp_processor_id() % bp->num_queues);
        fp = &bp->fp[fp_index];
+
        if (unlikely(bnx2x_tx_avail(bp->fp) <
                                        (skb_shinfo(skb)->nr_frags + 3))) {
-               bp->slowpath->eth_stats.driver_xoff++,
+               bp->eth_stats.driver_xoff++,
                netif_stop_queue(dev);
                BNX2X_ERR("BUG! Tx ring full when queue awake!\n");
                return NETDEV_TX_BUSY;
        }
 
+       DP(NETIF_MSG_TX_QUEUED, "SKB: summed %x  protocol %x  protocol(%x,%x)"
+          "  gso type %x  xmit_type %x\n",
+          skb->ip_summed, skb->protocol, ipv6_hdr(skb)->nexthdr,
+          ip_hdr(skb)->protocol, skb_shinfo(skb)->gso_type, xmit_type);
+
+       /* First, check if we need to linearaize the skb
+          (due to FW restrictions) */
+       if (bnx2x_pkt_req_lin(bp, skb, xmit_type)) {
+               /* Statistics of linearization */
+               bp->lin_cnt++;
+               if (skb_linearize(skb) != 0) {
+                       DP(NETIF_MSG_TX_QUEUED, "SKB linearization failed - "
+                          "silently dropping this SKB\n");
+                       dev_kfree_skb_any(skb);
+                       return 0;
+               }
+       }
+
        /*
-       This is a bit ugly. First we use one BD which we mark as start,
+       Please read carefully. First we use one BD which we mark as start,
        then for TSO or xsum we have a parsing info BD,
-       and only then we have the rest of the TSO bds.
+       and only then we have the rest of the TSO BDs.
        (don't forget to mark the last one as last,
        and to unmap only AFTER you write to the BD ...)
-       I would like to thank DovH for this mess.
+       And above all, all pdb sizes are in words - NOT DWORDS!
        */
 
        pkt_prod = fp->tx_pkt_prod++;
-       bd_prod = fp->tx_bd_prod;
-       bd_prod = TX_BD(bd_prod);
+       bd_prod = TX_BD(fp->tx_bd_prod);
 
-       /* get a tx_buff and first bd */
+       /* get a tx_buf and first BD */
        tx_buf = &fp->tx_buf_ring[TX_BD(pkt_prod)];
        tx_bd = &fp->tx_desc_ring[bd_prod];
 
@@ -9217,65 +9374,80 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                               ETH_TX_BD_ETH_ADDR_TYPE_SHIFT);
        tx_bd->general_data |= 1; /* header nbd */
 
-       /* remember the first bd of the packet */
-       tx_buf->first_bd = bd_prod;
+       /* remember the first BD of the packet */
+       tx_buf->first_bd = fp->tx_bd_prod;
+       tx_buf->skb = skb;
 
        DP(NETIF_MSG_TX_QUEUED,
           "sending pkt %u @%p  next_idx %u  bd %u @%p\n",
           pkt_prod, tx_buf, fp->tx_pkt_prod, bd_prod, tx_bd);
 
-       if (skb->ip_summed == CHECKSUM_PARTIAL) {
-               struct iphdr *iph = ip_hdr(skb);
-               u8 len;
+       if ((bp->vlgrp != NULL) && vlan_tx_tag_present(skb)) {
+               tx_bd->vlan = cpu_to_le16(vlan_tx_tag_get(skb));
+               tx_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_VLAN_TAG;
+               vlan_off += 4;
+       } else
+               tx_bd->vlan = cpu_to_le16(pkt_prod);
 
-               tx_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_IP_CSUM;
+       if (xmit_type) {
 
-               /* turn on parsing and get a bd */
+               /* turn on parsing and get a BD */
                bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
                pbd = (void *)&fp->tx_desc_ring[bd_prod];
-               len = ((u8 *)iph - (u8 *)skb->data) / 2;
+
+               memset(pbd, 0, sizeof(struct eth_tx_parse_bd));
+       }
+
+       if (xmit_type & XMIT_CSUM) {
+               hlen = (skb_network_header(skb) - skb->data + vlan_off) / 2;
 
                /* for now NS flag is not used in Linux */
-               pbd->global_data = (len |
+               pbd->global_data = (hlen |
                                    ((skb->protocol == ntohs(ETH_P_8021Q)) <<
                                     ETH_TX_PARSE_BD_LLC_SNAP_EN_SHIFT));
-               pbd->ip_hlen = ip_hdrlen(skb) / 2;
-               pbd->total_hlen = cpu_to_le16(len + pbd->ip_hlen);
-               if (iph->protocol == IPPROTO_TCP) {
-                       struct tcphdr *th = tcp_hdr(skb);
 
-                       tx_bd->bd_flags.as_bitfield |=
-                                               ETH_TX_BD_FLAGS_TCP_CSUM;
-                       pbd->tcp_flags = pbd_tcp_flags(skb);
-                       pbd->total_hlen += cpu_to_le16(tcp_hdrlen(skb) / 2);
-                       pbd->tcp_pseudo_csum = swab16(th->check);
+               pbd->ip_hlen = (skb_transport_header(skb) -
+                               skb_network_header(skb)) / 2;
 
-               } else if (iph->protocol == IPPROTO_UDP) {
-                       struct udphdr *uh = udp_hdr(skb);
+               hlen += pbd->ip_hlen + tcp_hdrlen(skb) / 2;
 
+               pbd->total_hlen = cpu_to_le16(hlen);
+               hlen = hlen*2 - vlan_off;
+
+               tx_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_TCP_CSUM;
+
+               if (xmit_type & XMIT_CSUM_V4)
                        tx_bd->bd_flags.as_bitfield |=
-                                               ETH_TX_BD_FLAGS_TCP_CSUM;
-                       pbd->total_hlen += cpu_to_le16(4);
+                                               ETH_TX_BD_FLAGS_IP_CSUM;
+               else
+                       tx_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_IPV6;
+
+               if (xmit_type & XMIT_CSUM_TCP) {
+                       pbd->tcp_pseudo_csum = swab16(tcp_hdr(skb)->check);
+
+               } else {
+                       s8 fix = SKB_CS_OFF(skb); /* signed! */
+
                        pbd->global_data |= ETH_TX_PARSE_BD_CS_ANY_FLG;
-                       pbd->cs_offset = 5; /* 10 >> 1 */
-                       pbd->tcp_pseudo_csum = 0;
-                       /* HW bug: we need to subtract 10 bytes before the
-                        * UDP header from the csum
-                        */
-                       uh->check = (u16) ~csum_fold(csum_sub(uh->check,
-                               csum_partial(((u8 *)(uh)-10), 10, 0)));
-               }
-       }
+                       pbd->cs_offset = fix / 2;
 
-       if ((bp->vlgrp != NULL) && vlan_tx_tag_present(skb)) {
-               tx_bd->vlan = cpu_to_le16(vlan_tx_tag_get(skb));
-               tx_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_VLAN_TAG;
-       } else {
-               tx_bd->vlan = cpu_to_le16(pkt_prod);
+                       DP(NETIF_MSG_TX_QUEUED,
+                          "hlen %d  offset %d  fix %d  csum before fix %x\n",
+                          le16_to_cpu(pbd->total_hlen), pbd->cs_offset, fix,
+                          SKB_CS(skb));
+
+                       /* HW bug: fixup the CSUM */
+                       pbd->tcp_pseudo_csum =
+                               bnx2x_csum_fix(skb_transport_header(skb),
+                                              SKB_CS(skb), fix);
+
+                       DP(NETIF_MSG_TX_QUEUED, "csum after fix %x\n",
+                          pbd->tcp_pseudo_csum);
+               }
        }
 
        mapping = pci_map_single(bp->pdev, skb->data,
-                                skb->len, PCI_DMA_TODEVICE);
+                                skb_headlen(skb), PCI_DMA_TODEVICE);
 
        tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
        tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
@@ -9284,13 +9456,12 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
        tx_bd->nbytes = cpu_to_le16(skb_headlen(skb));
 
        DP(NETIF_MSG_TX_QUEUED, "first bd @%p  addr (%x:%x)  nbd %d"
-          "  nbytes %d  flags %x  vlan %u\n",
-          tx_bd, tx_bd->addr_hi, tx_bd->addr_lo, tx_bd->nbd,
-          tx_bd->nbytes, tx_bd->bd_flags.as_bitfield, tx_bd->vlan);
+          "  nbytes %d  flags %x  vlan %x\n",
+          tx_bd, tx_bd->addr_hi, tx_bd->addr_lo, le16_to_cpu(tx_bd->nbd),
+          le16_to_cpu(tx_bd->nbytes), tx_bd->bd_flags.as_bitfield,
+          le16_to_cpu(tx_bd->vlan));
 
-       if (skb_shinfo(skb)->gso_size &&
-           (skb->len > (bp->dev->mtu + ETH_HLEN))) {
-               int hlen = 2 * le16_to_cpu(pbd->total_hlen);
+       if (xmit_type & XMIT_GSO) {
 
                DP(NETIF_MSG_TX_QUEUED,
                   "TSO packet len %d  hlen %d  total len %d  tso size %d\n",
@@ -9299,99 +9470,60 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                tx_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_SW_LSO;
 
-               if (tx_bd->nbytes > cpu_to_le16(hlen)) {
-                       /* we split the first bd into headers and data bds
-                        * to ease the pain of our fellow micocode engineers
-                        * we use one mapping for both bds
-                        * So far this has only been observed to happen
-                        * in Other Operating Systems(TM)
-                        */
-
-                       /* first fix first bd */
-                       nbd++;
-                       tx_bd->nbd = cpu_to_le16(nbd);
-                       tx_bd->nbytes = cpu_to_le16(hlen);
-
-                       /* we only print this as an error
-                        * because we don't think this will ever happen.
-                        */
-                       BNX2X_ERR("TSO split header size is %d (%x:%x)"
-                                 "  nbd %d\n", tx_bd->nbytes, tx_bd->addr_hi,
-                                 tx_bd->addr_lo, tx_bd->nbd);
-
-                       /* now get a new data bd
-                        * (after the pbd) and fill it */
-                       bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
-                       tx_bd = &fp->tx_desc_ring[bd_prod];
-
-                       tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-                       tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping) + hlen);
-                       tx_bd->nbytes = cpu_to_le16(skb_headlen(skb) - hlen);
-                       tx_bd->vlan = cpu_to_le16(pkt_prod);
-                       /* this marks the bd
-                        * as one that has no individual mapping
-                        * the FW ignores this flag in a bd not marked start
-                        */
-                       tx_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_SW_LSO;
-                       DP(NETIF_MSG_TX_QUEUED,
-                          "TSO split data size is %d (%x:%x)\n",
-                          tx_bd->nbytes, tx_bd->addr_hi, tx_bd->addr_lo);
-               }
-
-               if (!pbd) {
-                       /* supposed to be unreached
-                        * (and therefore not handled properly...)
-                        */
-                       BNX2X_ERR("LSO with no PBD\n");
-                       BUG();
-               }
+               if (unlikely(skb_headlen(skb) > hlen))
+                       bd_prod = bnx2x_tx_split(bp, fp, &tx_bd, hlen,
+                                                bd_prod, ++nbd);
 
                pbd->lso_mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
                pbd->tcp_send_seq = swab32(tcp_hdr(skb)->seq);
-               pbd->ip_id = swab16(ip_hdr(skb)->id);
-               pbd->tcp_pseudo_csum =
+               pbd->tcp_flags = pbd_tcp_flags(skb);
+
+               if (xmit_type & XMIT_GSO_V4) {
+                       pbd->ip_id = swab16(ip_hdr(skb)->id);
+                       pbd->tcp_pseudo_csum =
                                swab16(~csum_tcpudp_magic(ip_hdr(skb)->saddr,
                                                          ip_hdr(skb)->daddr,
                                                          0, IPPROTO_TCP, 0));
+
+               } else
+                       pbd->tcp_pseudo_csum =
+                               swab16(~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+                                                       &ipv6_hdr(skb)->daddr,
+                                                       0, IPPROTO_TCP, 0));
+
                pbd->global_data |= ETH_TX_PARSE_BD_PSEUDO_CS_WITHOUT_LEN;
        }
 
-       {
-               int i;
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+               skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
-               for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                       skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+               bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
+               tx_bd = &fp->tx_desc_ring[bd_prod];
 
-                       bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
-                       tx_bd = &fp->tx_desc_ring[bd_prod];
+               mapping = pci_map_page(bp->pdev, frag->page, frag->page_offset,
+                                      frag->size, PCI_DMA_TODEVICE);
 
-                       mapping = pci_map_page(bp->pdev, frag->page,
-                                              frag->page_offset,
-                                              frag->size, PCI_DMA_TODEVICE);
+               tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
+               tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
+               tx_bd->nbytes = cpu_to_le16(frag->size);
+               tx_bd->vlan = cpu_to_le16(pkt_prod);
+               tx_bd->bd_flags.as_bitfield = 0;
 
-                       tx_bd->addr_hi = cpu_to_le32(U64_HI(mapping));
-                       tx_bd->addr_lo = cpu_to_le32(U64_LO(mapping));
-                       tx_bd->nbytes = cpu_to_le16(frag->size);
-                       tx_bd->vlan = cpu_to_le16(pkt_prod);
-                       tx_bd->bd_flags.as_bitfield = 0;
-                       DP(NETIF_MSG_TX_QUEUED, "frag %d  bd @%p"
-                          "  addr (%x:%x)  nbytes %d  flags %x\n",
-                          i, tx_bd, tx_bd->addr_hi, tx_bd->addr_lo,
-                          tx_bd->nbytes, tx_bd->bd_flags.as_bitfield);
-               } /* for */
+               DP(NETIF_MSG_TX_QUEUED,
+                  "frag %d  bd @%p  addr (%x:%x)  nbytes %d  flags %x\n",
+                  i, tx_bd, tx_bd->addr_hi, tx_bd->addr_lo,
+                  le16_to_cpu(tx_bd->nbytes), tx_bd->bd_flags.as_bitfield);
        }
 
-       /* now at last mark the bd as the last bd */
+       /* now at last mark the BD as the last BD */
        tx_bd->bd_flags.as_bitfield |= ETH_TX_BD_FLAGS_END_BD;
 
        DP(NETIF_MSG_TX_QUEUED, "last bd @%p  flags %x\n",
           tx_bd, tx_bd->bd_flags.as_bitfield);
 
-       tx_buf->skb = skb;
-
        bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
 
-       /* now send a tx doorbell, counting the next bd
+       /* now send a tx doorbell, counting the next BD
         * if the packet contains or ends with it
         */
        if (TX_BD_POFF(bd_prod) < nbd)
@@ -9403,25 +9535,25 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                   "  tcp_flags %x  xsum %x  seq %u  hlen %u\n",
                   pbd, pbd->global_data, pbd->ip_hlen, pbd->ip_id,
                   pbd->lso_mss, pbd->tcp_flags, pbd->tcp_pseudo_csum,
-                  pbd->tcp_send_seq, pbd->total_hlen);
+                  pbd->tcp_send_seq, le16_to_cpu(pbd->total_hlen));
 
-       DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %u  bd %d\n", nbd, bd_prod);
+       DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %d  bd %u\n", nbd, bd_prod);
 
        fp->hw_tx_prods->bds_prod =
                cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + nbd);
        mb(); /* FW restriction: must not reorder writing nbd and packets */
        fp->hw_tx_prods->packets_prod =
                cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1);
-       DOORBELL(bp, fp_index, 0);
+       DOORBELL(bp, FP_IDX(fp), 0);
 
        mmiowb();
 
-       fp->tx_bd_prod = bd_prod;
+       fp->tx_bd_prod += nbd;
        dev->trans_start = jiffies;
 
        if (unlikely(bnx2x_tx_avail(fp) < MAX_SKB_FRAGS + 3)) {
                netif_stop_queue(dev);
-               bp->slowpath->eth_stats.driver_xoff++;
+               bp->eth_stats.driver_xoff++;
                if (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3)
                        netif_wake_queue(dev);
        }
@@ -9430,47 +9562,174 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
        return NETDEV_TX_OK;
 }
 
-/* Called with rtnl_lock */
+/* called with rtnl_lock */
 static int bnx2x_open(struct net_device *dev)
 {
        struct bnx2x *bp = netdev_priv(dev);
 
        bnx2x_set_power_state(bp, PCI_D0);
 
-       return bnx2x_nic_load(bp, 1);
+       return bnx2x_nic_load(bp, LOAD_OPEN);
 }
 
-/* Called with rtnl_lock */
+/* called with rtnl_lock */
 static int bnx2x_close(struct net_device *dev)
 {
        struct bnx2x *bp = netdev_priv(dev);
 
-       /* Unload the driver, release IRQs */
-       bnx2x_nic_unload(bp, 1);
+       /* Unload the driver, release IRQs */
+       bnx2x_nic_unload(bp, UNLOAD_CLOSE);
+       if (atomic_read(&bp->pdev->enable_cnt) == 1)
+               if (!CHIP_REV_IS_SLOW(bp))
+                       bnx2x_set_power_state(bp, PCI_D3hot);
+
+       return 0;
+}
+
+/* called with netif_tx_lock from set_multicast */
+static void bnx2x_set_rx_mode(struct net_device *dev)
+{
+       struct bnx2x *bp = netdev_priv(dev);
+       u32 rx_mode = BNX2X_RX_MODE_NORMAL;
+       int port = BP_PORT(bp);
+
+       if (bp->state != BNX2X_STATE_OPEN) {
+               DP(NETIF_MSG_IFUP, "state is %x, returning\n", bp->state);
+               return;
+       }
+
+       DP(NETIF_MSG_IFUP, "dev->flags = %x\n", dev->flags);
+
+       if (dev->flags & IFF_PROMISC)
+               rx_mode = BNX2X_RX_MODE_PROMISC;
+
+       else if ((dev->flags & IFF_ALLMULTI) ||
+                ((dev->mc_count > BNX2X_MAX_MULTICAST) && CHIP_IS_E1(bp)))
+               rx_mode = BNX2X_RX_MODE_ALLMULTI;
+
+       else { /* some multicasts */
+               if (CHIP_IS_E1(bp)) {
+                       int i, old, offset;
+                       struct dev_mc_list *mclist;
+                       struct mac_configuration_cmd *config =
+                                               bnx2x_sp(bp, mcast_config);
+
+                       for (i = 0, mclist = dev->mc_list;
+                            mclist && (i < dev->mc_count);
+                            i++, mclist = mclist->next) {
+
+                               config->config_table[i].
+                                       cam_entry.msb_mac_addr =
+                                       swab16(*(u16 *)&mclist->dmi_addr[0]);
+                               config->config_table[i].
+                                       cam_entry.middle_mac_addr =
+                                       swab16(*(u16 *)&mclist->dmi_addr[2]);
+                               config->config_table[i].
+                                       cam_entry.lsb_mac_addr =
+                                       swab16(*(u16 *)&mclist->dmi_addr[4]);
+                               config->config_table[i].cam_entry.flags =
+                                                       cpu_to_le16(port);
+                               config->config_table[i].
+                                       target_table_entry.flags = 0;
+                               config->config_table[i].
+                                       target_table_entry.client_id = 0;
+                               config->config_table[i].
+                                       target_table_entry.vlan_id = 0;
+
+                               DP(NETIF_MSG_IFUP,
+                                  "setting MCAST[%d] (%04x:%04x:%04x)\n", i,
+                                  config->config_table[i].
+                                               cam_entry.msb_mac_addr,
+                                  config->config_table[i].
+                                               cam_entry.middle_mac_addr,
+                                  config->config_table[i].
+                                               cam_entry.lsb_mac_addr);
+                       }
+                       old = config->hdr.length_6b;
+                       if (old > i) {
+                               for (; i < old; i++) {
+                                       if (CAM_IS_INVALID(config->
+                                                          config_table[i])) {
+                                               i--; /* already invalidated */
+                                               break;
+                                       }
+                                       /* invalidate */
+                                       CAM_INVALIDATE(config->
+                                                      config_table[i]);
+                               }
+                       }
+
+                       if (CHIP_REV_IS_SLOW(bp))
+                               offset = BNX2X_MAX_EMUL_MULTI*(1 + port);
+                       else
+                               offset = BNX2X_MAX_MULTICAST*(1 + port);
+
+                       config->hdr.length_6b = i;
+                       config->hdr.offset = offset;
+                       config->hdr.client_id = BP_CL_ID(bp);
+                       config->hdr.reserved1 = 0;
+
+                       bnx2x_sp_post(bp, RAMROD_CMD_ID_ETH_SET_MAC, 0,
+                                  U64_HI(bnx2x_sp_mapping(bp, mcast_config)),
+                                  U64_LO(bnx2x_sp_mapping(bp, mcast_config)),
+                                     0);
+               } else { /* E1H */
+                       /* Accept one or more multicasts */
+                       struct dev_mc_list *mclist;
+                       u32 mc_filter[MC_HASH_SIZE];
+                       u32 crc, bit, regidx;
+                       int i;
+
+                       memset(mc_filter, 0, 4 * MC_HASH_SIZE);
+
+                       for (i = 0, mclist = dev->mc_list;
+                            mclist && (i < dev->mc_count);
+                            i++, mclist = mclist->next) {
+
+                               DP(NETIF_MSG_IFUP, "Adding mcast MAC: "
+                                  "%02x:%02x:%02x:%02x:%02x:%02x\n",
+                                  mclist->dmi_addr[0], mclist->dmi_addr[1],
+                                  mclist->dmi_addr[2], mclist->dmi_addr[3],
+                                  mclist->dmi_addr[4], mclist->dmi_addr[5]);
+
+                               crc = crc32c_le(0, mclist->dmi_addr, ETH_ALEN);
+                               bit = (crc >> 24) & 0xff;
+                               regidx = bit >> 5;
+                               bit &= 0x1f;
+                               mc_filter[regidx] |= (1 << bit);
+                       }
 
-       if (!CHIP_REV_IS_SLOW(bp))
-               bnx2x_set_power_state(bp, PCI_D3hot);
+                       for (i = 0; i < MC_HASH_SIZE; i++)
+                               REG_WR(bp, MC_HASH_OFFSET(bp, i),
+                                      mc_filter[i]);
+               }
+       }
 
-       return 0;
+       bp->rx_mode = rx_mode;
+       bnx2x_set_storm_rx_mode(bp);
 }
 
-/* Called with rtnl_lock */
+/* called with rtnl_lock */
 static int bnx2x_change_mac_addr(struct net_device *dev, void *p)
 {
        struct sockaddr *addr = p;
        struct bnx2x *bp = netdev_priv(dev);
 
-       if (!is_valid_ether_addr(addr->sa_data))
+       if (!is_valid_ether_addr((u8 *)(addr->sa_data)))
                return -EINVAL;
 
        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-       if (netif_running(dev))
-               bnx2x_set_mac_addr(bp);
+       if (netif_running(dev)) {
+               if (CHIP_IS_E1(bp))
+                       bnx2x_set_mac_addr_e1(bp);
+               else
+                       bnx2x_set_mac_addr_e1h(bp);
+       }
 
        return 0;
 }
 
-/* Called with rtnl_lock */
+/* called with rtnl_lock */
 static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        struct mii_ioctl_data *data = if_mii(ifr);
@@ -9479,22 +9738,22 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
        switch (cmd) {
        case SIOCGMIIPHY:
-               data->phy_id = bp->phy_addr;
+               data->phy_id = bp->port.phy_addr;
 
                /* fallthrough */
+
        case SIOCGMIIREG: {
-               u32 mii_regval;
+               u16 mii_regval;
 
-               spin_lock_bh(&bp->phy_lock);
-               if (bp->state == BNX2X_STATE_OPEN) {
-                       err = bnx2x_mdio22_read(bp, data->reg_num & 0x1f,
-                                               &mii_regval);
+               if (!netif_running(dev))
+                       return -EAGAIN;
 
-                       data->val_out = mii_regval;
-               } else {
-                       err = -EAGAIN;
-               }
-               spin_unlock_bh(&bp->phy_lock);
+               mutex_lock(&bp->port.phy_mutex);
+               err = bnx2x_cl45_read(bp, BP_PORT(bp), 0, bp->port.phy_addr,
+                                     DEFAULT_PHY_DEV_ADDR,
+                                     (data->reg_num & 0x1f), &mii_regval);
+               data->val_out = mii_regval;
+               mutex_unlock(&bp->port.phy_mutex);
                return err;
        }
 
@@ -9502,14 +9761,14 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
-               spin_lock_bh(&bp->phy_lock);
-               if (bp->state == BNX2X_STATE_OPEN) {
-                       err = bnx2x_mdio22_write(bp, data->reg_num & 0x1f,
-                                                data->val_in);
-               } else {
-                       err = -EAGAIN;
-               }
-               spin_unlock_bh(&bp->phy_lock);
+               if (!netif_running(dev))
+                       return -EAGAIN;
+
+               mutex_lock(&bp->port.phy_mutex);
+               err = bnx2x_cl45_write(bp, BP_PORT(bp), 0, bp->port.phy_addr,
+                                      DEFAULT_PHY_DEV_ADDR,
+                                      (data->reg_num & 0x1f), data->val_in);
+               mutex_unlock(&bp->port.phy_mutex);
                return err;
 
        default:
@@ -9520,10 +9779,11 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return -EOPNOTSUPP;
 }
 
-/* Called with rtnl_lock */
+/* called with rtnl_lock */
 static int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct bnx2x *bp = netdev_priv(dev);
+       int rc = 0;
 
        if ((new_mtu > ETH_MAX_JUMBO_PACKET_SIZE) ||
            ((new_mtu + ETH_HLEN) < ETH_MIN_PACKET_SIZE))
@@ -9536,10 +9796,11 @@ static int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
        dev->mtu = new_mtu;
 
        if (netif_running(dev)) {
-               bnx2x_nic_unload(bp, 0);
-               bnx2x_nic_load(bp, 0);
+               bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+               rc = bnx2x_nic_load(bp, LOAD_NORMAL);
        }
-       return 0;
+
+       return rc;
 }
 
 static void bnx2x_tx_timeout(struct net_device *dev)
@@ -9555,7 +9816,7 @@ static void bnx2x_tx_timeout(struct net_device *dev)
 }
 
 #ifdef BCM_VLAN
-/* Called with rtnl_lock */
+/* called with rtnl_lock */
 static void bnx2x_vlan_rx_register(struct net_device *dev,
                                   struct vlan_group *vlgrp)
 {
@@ -9565,6 +9826,7 @@ static void bnx2x_vlan_rx_register(struct net_device *dev,
        if (netif_running(dev))
                bnx2x_set_client_config(bp);
 }
+
 #endif
 
 #if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
@@ -9578,36 +9840,8 @@ static void poll_bnx2x(struct net_device *dev)
 }
 #endif
 
-static void bnx2x_reset_task(struct work_struct *work)
-{
-       struct bnx2x *bp = container_of(work, struct bnx2x, reset_task);
-
-#ifdef BNX2X_STOP_ON_ERROR
-       BNX2X_ERR("reset task called but STOP_ON_ERROR defined"
-                 " so reset not done to allow debug dump,\n"
-        KERN_ERR " you will need to reboot when done\n");
-       return;
-#endif
-
-       if (!netif_running(bp->dev))
-               return;
-
-       rtnl_lock();
-
-       if (bp->state != BNX2X_STATE_OPEN) {
-               DP(NETIF_MSG_TX_ERR, "state is %x, returning\n", bp->state);
-               goto reset_task_exit;
-       }
-
-       bnx2x_nic_unload(bp, 0);
-       bnx2x_nic_load(bp, 0);
-
-reset_task_exit:
-       rtnl_unlock();
-}
-
-static int __devinit bnx2x_init_board(struct pci_dev *pdev,
-                                     struct net_device *dev)
+static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
+                                   struct net_device *dev)
 {
        struct bnx2x *bp;
        int rc;
@@ -9615,8 +9849,10 @@ static int __devinit bnx2x_init_board(struct pci_dev *pdev,
        SET_NETDEV_DEV(dev, &pdev->dev);
        bp = netdev_priv(dev);
 
+       bp->dev = dev;
+       bp->pdev = pdev;
        bp->flags = 0;
-       bp->port = PCI_FUNC(pdev->devfn);
+       bp->func = PCI_FUNC(pdev->devfn);
 
        rc = pci_enable_device(pdev);
        if (rc) {
@@ -9638,14 +9874,17 @@ static int __devinit bnx2x_init_board(struct pci_dev *pdev,
                goto err_out_disable;
        }
 
-       rc = pci_request_regions(pdev, DRV_MODULE_NAME);
-       if (rc) {
-               printk(KERN_ERR PFX "Cannot obtain PCI resources,"
-                      " aborting\n");
-               goto err_out_disable;
-       }
+       if (atomic_read(&pdev->enable_cnt) == 1) {
+               rc = pci_request_regions(pdev, DRV_MODULE_NAME);
+               if (rc) {
+                       printk(KERN_ERR PFX "Cannot obtain PCI resources,"
+                              " aborting\n");
+                       goto err_out_disable;
+               }
 
-       pci_set_master(pdev);
+               pci_set_master(pdev);
+               pci_save_state(pdev);
+       }
 
        bp->pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
        if (bp->pm_cap == 0) {
@@ -9679,15 +9918,9 @@ static int __devinit bnx2x_init_board(struct pci_dev *pdev,
                goto err_out_release;
        }
 
-       bp->dev = dev;
-       bp->pdev = pdev;
-
-       spin_lock_init(&bp->phy_lock);
-
-       INIT_WORK(&bp->reset_task, bnx2x_reset_task);
-       INIT_WORK(&bp->sp_task, bnx2x_sp_task);
-
-       dev->base_addr = pci_resource_start(pdev, 0);
+       dev->mem_start = pci_resource_start(pdev, 0);
+       dev->base_addr = dev->mem_start;
+       dev->mem_end = pci_resource_end(pdev, 0);
 
        dev->irq = pdev->irq;
 
@@ -9699,8 +9932,9 @@ static int __devinit bnx2x_init_board(struct pci_dev *pdev,
                goto err_out_release;
        }
 
-       bp->doorbells = ioremap_nocache(pci_resource_start(pdev , 2),
-                                       pci_resource_len(pdev, 2));
+       bp->doorbells = ioremap_nocache(pci_resource_start(pdev, 2),
+                                       min_t(u64, BNX2X_DB_SIZE,
+                                             pci_resource_len(pdev, 2)));
        if (!bp->doorbells) {
                printk(KERN_ERR PFX "Cannot map doorbell space, aborting\n");
                rc = -ENOMEM;
@@ -9709,53 +9943,40 @@ static int __devinit bnx2x_init_board(struct pci_dev *pdev,
 
        bnx2x_set_power_state(bp, PCI_D0);
 
-       bnx2x_get_hwinfo(bp);
-
-       if (CHIP_REV(bp) == CHIP_REV_FPGA) {
-               printk(KERN_ERR PFX "FPGA detected. MCP disabled,"
-                      " will only init first device\n");
-               onefunc = 1;
-               nomcp = 1;
-       }
-
-       if (nomcp) {
-               printk(KERN_ERR PFX "MCP disabled, will only"
-                      " init first device\n");
-               onefunc = 1;
-       }
-
-       if (onefunc && bp->port) {
-               printk(KERN_ERR PFX "Second device disabled, exiting\n");
-               rc = -ENODEV;
-               goto err_out_unmap;
-       }
-
-       bp->tx_ring_size = MAX_TX_AVAIL;
-       bp->rx_ring_size = MAX_RX_AVAIL;
-
-       bp->rx_csum = 1;
-
-       bp->rx_offset = 0;
-
-       bp->tx_quick_cons_trip_int = 0xff;
-       bp->tx_quick_cons_trip = 0xff;
-       bp->tx_ticks_int = 50;
-       bp->tx_ticks = 50;
-
-       bp->rx_quick_cons_trip_int = 0xff;
-       bp->rx_quick_cons_trip = 0xff;
-       bp->rx_ticks_int = 25;
-       bp->rx_ticks = 25;
-
-       bp->stats_ticks = 1000000 & 0xffff00;
+       /* clean indirect addresses */
+       pci_write_config_dword(bp->pdev, PCICFG_GRC_ADDRESS,
+                              PCICFG_VENDOR_ID_OFFSET);
+       REG_WR(bp, PXP2_REG_PGL_ADDR_88_F0 + BP_PORT(bp)*16, 0);
+       REG_WR(bp, PXP2_REG_PGL_ADDR_8C_F0 + BP_PORT(bp)*16, 0);
+       REG_WR(bp, PXP2_REG_PGL_ADDR_90_F0 + BP_PORT(bp)*16, 0);
+       REG_WR(bp, PXP2_REG_PGL_ADDR_94_F0 + BP_PORT(bp)*16, 0);
 
-       bp->timer_interval = HZ;
-       bp->current_interval = (poll ? poll : HZ);
+       dev->hard_start_xmit = bnx2x_start_xmit;
+       dev->watchdog_timeo = TX_TIMEOUT;
 
-       init_timer(&bp->timer);
-       bp->timer.expires = jiffies + bp->current_interval;
-       bp->timer.data = (unsigned long) bp;
-       bp->timer.function = bnx2x_timer;
+       dev->ethtool_ops = &bnx2x_ethtool_ops;
+       dev->open = bnx2x_open;
+       dev->stop = bnx2x_close;
+       dev->set_multicast_list = bnx2x_set_rx_mode;
+       dev->set_mac_address = bnx2x_change_mac_addr;
+       dev->do_ioctl = bnx2x_ioctl;
+       dev->change_mtu = bnx2x_change_mtu;
+       dev->tx_timeout = bnx2x_tx_timeout;
+#ifdef BCM_VLAN
+       dev->vlan_rx_register = bnx2x_vlan_rx_register;
+#endif
+#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
+       dev->poll_controller = poll_bnx2x;
+#endif
+       dev->features |= NETIF_F_SG;
+       dev->features |= NETIF_F_HW_CSUM;
+       if (bp->flags & USING_DAC_FLAG)
+               dev->features |= NETIF_F_HIGHDMA;
+#ifdef BCM_VLAN
+       dev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
+#endif
+       dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
+       dev->features |= NETIF_F_TSO6;
 
        return 0;
 
@@ -9764,14 +9985,14 @@ err_out_unmap:
                iounmap(bp->regview);
                bp->regview = NULL;
        }
-
        if (bp->doorbells) {
                iounmap(bp->doorbells);
                bp->doorbells = NULL;
        }
 
 err_out_release:
-       pci_release_regions(pdev);
+       if (atomic_read(&pdev->enable_cnt) == 1)
+               pci_release_regions(pdev);
 
 err_out_disable:
        pci_disable_device(pdev);
@@ -9805,7 +10026,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
        struct net_device *dev = NULL;
        struct bnx2x *bp;
        int rc;
-       int port = PCI_FUNC(pdev->devfn);
        DECLARE_MAC_BUF(mac);
 
        if (version_printed++ == 0)
@@ -9813,78 +10033,62 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 
        /* dev zeroed in init_etherdev */
        dev = alloc_etherdev(sizeof(*bp));
-       if (!dev)
+       if (!dev) {
+               printk(KERN_ERR PFX "Cannot allocate net device\n");
                return -ENOMEM;
+       }
 
        netif_carrier_off(dev);
 
        bp = netdev_priv(dev);
        bp->msglevel = debug;
 
-       if (port && onefunc) {
-               printk(KERN_ERR PFX "second function disabled. exiting\n");
-               free_netdev(dev);
-               return 0;
-       }
-
-       rc = bnx2x_init_board(pdev, dev);
+       rc = bnx2x_init_dev(pdev, dev);
        if (rc < 0) {
                free_netdev(dev);
                return rc;
        }
 
-       dev->hard_start_xmit = bnx2x_start_xmit;
-       dev->watchdog_timeo = TX_TIMEOUT;
-
-       dev->ethtool_ops = &bnx2x_ethtool_ops;
-       dev->open = bnx2x_open;
-       dev->stop = bnx2x_close;
-       dev->set_multicast_list = bnx2x_set_rx_mode;
-       dev->set_mac_address = bnx2x_change_mac_addr;
-       dev->do_ioctl = bnx2x_ioctl;
-       dev->change_mtu = bnx2x_change_mtu;
-       dev->tx_timeout = bnx2x_tx_timeout;
-#ifdef BCM_VLAN
-       dev->vlan_rx_register = bnx2x_vlan_rx_register;
-#endif
-#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
-       dev->poll_controller = poll_bnx2x;
-#endif
-       dev->features |= NETIF_F_SG;
-       if (bp->flags & USING_DAC_FLAG)
-               dev->features |= NETIF_F_HIGHDMA;
-       dev->features |= NETIF_F_IP_CSUM;
-#ifdef BCM_VLAN
-       dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-#endif
-       dev->features |= NETIF_F_TSO | NETIF_F_TSO_ECN;
-
        rc = register_netdev(dev);
        if (rc) {
                dev_err(&pdev->dev, "Cannot register net device\n");
-               if (bp->regview)
-                       iounmap(bp->regview);
-               if (bp->doorbells)
-                       iounmap(bp->doorbells);
-               pci_release_regions(pdev);
-               pci_disable_device(pdev);
-               pci_set_drvdata(pdev, NULL);
-               free_netdev(dev);
-               return rc;
+               goto init_one_exit;
        }
 
        pci_set_drvdata(pdev, dev);
 
-       bp->name = board_info[ent->driver_data].name;
+       rc = bnx2x_init_bp(bp);
+       if (rc) {
+               unregister_netdev(dev);
+               goto init_one_exit;
+       }
+
+       bp->common.name = board_info[ent->driver_data].name;
        printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx,"
-              " IRQ %d, ", dev->name, bp->name,
-              ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
-              ((CHIP_ID(bp) & 0x0ff0) >> 4),
+              " IRQ %d, ", dev->name, bp->common.name,
+              (CHIP_REV(bp) >> 12) + 'A', (CHIP_METAL(bp) >> 4),
               bnx2x_get_pcie_width(bp),
               (bnx2x_get_pcie_speed(bp) == 2) ? "5GHz (Gen2)" : "2.5GHz",
               dev->base_addr, bp->pdev->irq);
        printk(KERN_CONT "node addr %s\n", print_mac(mac, dev->dev_addr));
        return 0;
+
+init_one_exit:
+       if (bp->regview)
+               iounmap(bp->regview);
+
+       if (bp->doorbells)
+               iounmap(bp->doorbells);
+
+       free_netdev(dev);
+
+       if (atomic_read(&pdev->enable_cnt) == 1)
+               pci_release_regions(pdev);
+
+       pci_disable_device(pdev);
+       pci_set_drvdata(pdev, NULL);
+
+       return rc;
 }
 
 static void __devexit bnx2x_remove_one(struct pci_dev *pdev)
@@ -9893,11 +10097,9 @@ static void __devexit bnx2x_remove_one(struct pci_dev *pdev)
        struct bnx2x *bp;
 
        if (!dev) {
-               /* we get here if init_one() fails */
                printk(KERN_ERR PFX "BAD net device from bnx2x_init_one\n");
                return;
        }
-
        bp = netdev_priv(dev);
 
        unregister_netdev(dev);
@@ -9909,7 +10111,10 @@ static void __devexit bnx2x_remove_one(struct pci_dev *pdev)
                iounmap(bp->doorbells);
 
        free_netdev(dev);
-       pci_release_regions(pdev);
+
+       if (atomic_read(&pdev->enable_cnt) == 1)
+               pci_release_regions(pdev);
+
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
 }
@@ -9919,21 +10124,29 @@ static int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)
        struct net_device *dev = pci_get_drvdata(pdev);
        struct bnx2x *bp;
 
-       if (!dev)
-               return 0;
+       if (!dev) {
+               printk(KERN_ERR PFX "BAD net device from bnx2x_init_one\n");
+               return -ENODEV;
+       }
+       bp = netdev_priv(dev);
 
-       if (!netif_running(dev))
-               return 0;
+       rtnl_lock();
 
-       bp = netdev_priv(dev);
+       pci_save_state(pdev);
 
-       bnx2x_nic_unload(bp, 0);
+       if (!netif_running(dev)) {
+               rtnl_unlock();
+               return 0;
+       }
 
        netif_device_detach(dev);
 
-       pci_save_state(pdev);
+       bnx2x_nic_unload(bp, UNLOAD_NORMAL);
+
        bnx2x_set_power_state(bp, pci_choose_state(pdev, state));
 
+       rtnl_unlock();
+
        return 0;
 }
 
@@ -9947,30 +10160,123 @@ static int bnx2x_resume(struct pci_dev *pdev)
                printk(KERN_ERR PFX "BAD net device from bnx2x_init_one\n");
                return -ENODEV;
        }
-
-       if (!netif_running(dev))
-               return 0;
-
        bp = netdev_priv(dev);
 
+       rtnl_lock();
+
        pci_restore_state(pdev);
+
+       if (!netif_running(dev)) {
+               rtnl_unlock();
+               return 0;
+       }
+
        bnx2x_set_power_state(bp, PCI_D0);
        netif_device_attach(dev);
 
-       rc = bnx2x_nic_load(bp, 0);
-       if (rc)
-               return rc;
+       rc = bnx2x_nic_load(bp, LOAD_NORMAL);
 
-       return 0;
+       rtnl_unlock();
+
+       return rc;
+}
+
+/**
+ * bnx2x_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci connection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+static pci_ers_result_t bnx2x_io_error_detected(struct pci_dev *pdev,
+                                               pci_channel_state_t state)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+       struct bnx2x *bp = netdev_priv(dev);
+
+       rtnl_lock();
+
+       netif_device_detach(dev);
+
+       if (netif_running(dev))
+               bnx2x_nic_unload(bp, UNLOAD_CLOSE);
+
+       pci_disable_device(pdev);
+
+       rtnl_unlock();
+
+       /* Request a slot reset */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * bnx2x_io_slot_reset - called after the PCI bus has been reset
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot.
+ */
+static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+       struct bnx2x *bp = netdev_priv(dev);
+
+       rtnl_lock();
+
+       if (pci_enable_device(pdev)) {
+               dev_err(&pdev->dev,
+                       "Cannot re-enable PCI device after reset\n");
+               rtnl_unlock();
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+
+       pci_set_master(pdev);
+       pci_restore_state(pdev);
+
+       if (netif_running(dev))
+               bnx2x_set_power_state(bp, PCI_D0);
+
+       rtnl_unlock();
+
+       return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * bnx2x_io_resume - called when traffic can start flowing again
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation.
+ */
+static void bnx2x_io_resume(struct pci_dev *pdev)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+       struct bnx2x *bp = netdev_priv(dev);
+
+       rtnl_lock();
+
+       if (netif_running(dev))
+               bnx2x_nic_load(bp, LOAD_OPEN);
+
+       netif_device_attach(dev);
+
+       rtnl_unlock();
 }
 
+static struct pci_error_handlers bnx2x_err_handler = {
+       .error_detected = bnx2x_io_error_detected,
+       .slot_reset = bnx2x_io_slot_reset,
+       .resume = bnx2x_io_resume,
+};
+
 static struct pci_driver bnx2x_pci_driver = {
-       .name       = DRV_MODULE_NAME,
-       .id_table   = bnx2x_pci_tbl,
-       .probe      = bnx2x_init_one,
-       .remove     = __devexit_p(bnx2x_remove_one),
-       .suspend    = bnx2x_suspend,
-       .resume     = bnx2x_resume,
+       .name        = DRV_MODULE_NAME,
+       .id_table    = bnx2x_pci_tbl,
+       .probe       = bnx2x_init_one,
+       .remove      = __devexit_p(bnx2x_remove_one),
+       .suspend     = bnx2x_suspend,
+       .resume      = bnx2x_resume,
+       .err_handler = &bnx2x_err_handler,
 };
 
 static int __init bnx2x_init(void)