1 files changed, 86 insertions, 7 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 1fa4927a45b..0ced154129a 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 
+#include <linux/stringify.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/errno.h>
@@ -57,8 +58,8 @@
 #include "bnx2_fw.h"
 
 #define DRV_MODULE_NAME         "bnx2"
-#define DRV_MODULE_VERSION      "2.2.1"
-#define DRV_MODULE_RELDATE      "Dec 18, 2011"
+#define DRV_MODULE_VERSION      "2.2.3"
+#define DRV_MODULE_RELDATE      "June 27, 2012"
 #define FW_MIPS_FILE_06         "bnx2/bnx2-mips-06-6.2.3.fw"
 #define FW_RV2P_FILE_06         "bnx2/bnx2-rv2p-06-6.0.15.fw"
 #define FW_MIPS_FILE_09         "bnx2/bnx2-mips-09-6.2.1b.fw"
@@ -872,8 +873,7 @@ bnx2_alloc_mem(struct bnx2 *bp)
 
                         bnapi = &bp->bnx2_napi[i];
 
-                        sblk = (void *) (status_blk +
-                                         BNX2_SBLK_MSIX_ALIGN_SIZE * i);
+                        sblk = (status_blk + BNX2_SBLK_MSIX_ALIGN_SIZE * i);
                         bnapi->status_blk.msix = sblk;
                         bnapi->hw_tx_cons_ptr =
                                 &sblk->status_tx_quick_consumer_index;
@@ -1972,22 +1972,26 @@ bnx2_remote_phy_event(struct bnx2 *bp)
                 switch (speed) {
                         case BNX2_LINK_STATUS_10HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_10FULL:
                                 bp->line_speed = SPEED_10;
                                 break;
                         case BNX2_LINK_STATUS_100HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_100BASE_T4:
                         case BNX2_LINK_STATUS_100FULL:
                                 bp->line_speed = SPEED_100;
                                 break;
                         case BNX2_LINK_STATUS_1000HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_1000FULL:
                                 bp->line_speed = SPEED_1000;
                                 break;
                         case BNX2_LINK_STATUS_2500HALF:
                                 bp->duplex = DUPLEX_HALF;
+                                /* fall through */
                         case BNX2_LINK_STATUS_2500FULL:
                                 bp->line_speed = SPEED_2500;
                                 break;
@@ -2473,6 +2477,7 @@ bnx2_dump_mcp_state(struct bnx2 *bp)
                    bnx2_shmem_rd(bp, BNX2_BC_STATE_RESET_TYPE));
         pr_cont(" condition[%08x]\n",
                 bnx2_shmem_rd(bp, BNX2_BC_STATE_CONDITION));
+        DP_SHMEM_LINE(bp, BNX2_BC_RESET_TYPE);
         DP_SHMEM_LINE(bp, 0x3cc);
         DP_SHMEM_LINE(bp, 0x3dc);
         DP_SHMEM_LINE(bp, 0x3ec);
@@ -6245,7 +6250,7 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
 static int
 bnx2_setup_int_mode(struct bnx2 *bp, int dis_msi)
 {
-        int cpus = num_online_cpus();
+        int cpus = netif_get_num_default_rss_queues();
         int msix_vecs;
 
         if (!bp->num_req_rx_rings)
@@ -6406,6 +6411,75 @@ bnx2_reset_task(struct work_struct *work)
         rtnl_unlock();
 }
 
+#define BNX2_FTQ_ENTRY(ftq) { __stringify(ftq##FTQ_CTL), BNX2_##ftq##FTQ_CTL }
+
+static void
+bnx2_dump_ftq(struct bnx2 *bp)
+{
+        int i;
+        u32 reg, bdidx, cid, valid;
+        struct net_device *dev = bp->dev;
+        static const struct ftq_reg {
+                char *name;
+                u32 off;
+        } ftq_arr[] = {
+                BNX2_FTQ_ENTRY(RV2P_P),
+                BNX2_FTQ_ENTRY(RV2P_T),
+                BNX2_FTQ_ENTRY(RV2P_M),
+                BNX2_FTQ_ENTRY(TBDR_),
+                BNX2_FTQ_ENTRY(TDMA_),
+                BNX2_FTQ_ENTRY(TXP_),
+                BNX2_FTQ_ENTRY(TXP_),
+                BNX2_FTQ_ENTRY(TPAT_),
+                BNX2_FTQ_ENTRY(RXP_C),
+                BNX2_FTQ_ENTRY(RXP_),
+                BNX2_FTQ_ENTRY(COM_COMXQ_),
+                BNX2_FTQ_ENTRY(COM_COMTQ_),
+                BNX2_FTQ_ENTRY(COM_COMQ_),
+                BNX2_FTQ_ENTRY(CP_CPQ_),
+        };
+
+        netdev_err(dev, "<--- start FTQ dump --->\n");
+        for (i = 0; i < ARRAY_SIZE(ftq_arr); i++)
+                netdev_err(dev, "%s %08x\n", ftq_arr[i].name,
+                           bnx2_reg_rd_ind(bp, ftq_arr[i].off));
+
+        netdev_err(dev, "CPU states:\n");
+        for (reg = BNX2_TXP_CPU_MODE; reg <= BNX2_CP_CPU_MODE; reg += 0x40000)
+                netdev_err(dev, "%06x mode %x state %x evt_mask %x pc %x pc %x instr %x\n",
+                           reg, bnx2_reg_rd_ind(bp, reg),
+                           bnx2_reg_rd_ind(bp, reg + 4),
+                           bnx2_reg_rd_ind(bp, reg + 8),
+                           bnx2_reg_rd_ind(bp, reg + 0x1c),
+                           bnx2_reg_rd_ind(bp, reg + 0x1c),
+                           bnx2_reg_rd_ind(bp, reg + 0x20));
+
+        netdev_err(dev, "<--- end FTQ dump --->\n");
+        netdev_err(dev, "<--- start TBDC dump --->\n");
+        netdev_err(dev, "TBDC free cnt: %ld\n",
+                   REG_RD(bp, BNX2_TBDC_STATUS) & BNX2_TBDC_STATUS_FREE_CNT);
+        netdev_err(dev, "LINE     CID  BIDX   CMD  VALIDS\n");
+        for (i = 0; i < 0x20; i++) {
+                int j = 0;
+
+                REG_WR(bp, BNX2_TBDC_BD_ADDR, i);
+                REG_WR(bp, BNX2_TBDC_CAM_OPCODE,
+                       BNX2_TBDC_CAM_OPCODE_OPCODE_CAM_READ);
+                REG_WR(bp, BNX2_TBDC_COMMAND, BNX2_TBDC_COMMAND_CMD_REG_ARB);
+                while ((REG_RD(bp, BNX2_TBDC_COMMAND) &
+                        BNX2_TBDC_COMMAND_CMD_REG_ARB) && j < 100)
+                        j++;
+
+                cid = REG_RD(bp, BNX2_TBDC_CID);
+                bdidx = REG_RD(bp, BNX2_TBDC_BIDX);
+                valid = REG_RD(bp, BNX2_TBDC_CAM_OPCODE);
+                netdev_err(dev, "%02x    %06x  %04lx   %02x    [%x]\n",
+                           i, cid, bdidx & BNX2_TBDC_BDIDX_BDIDX,
+                           bdidx >> 24, (valid >> 8) & 0x0ff);
+        }
+        netdev_err(dev, "<--- end TBDC dump --->\n");
+}
+
 static void
 bnx2_dump_state(struct bnx2 *bp)
 {
@@ -6435,6 +6509,7 @@ bnx2_tx_timeout(struct net_device *dev)
 {
         struct bnx2 *bp = netdev_priv(dev);
 
+        bnx2_dump_ftq(bp);
         bnx2_dump_state(bp);
         bnx2_dump_mcp_state(bp);
 
@@ -6628,6 +6703,7 @@ bnx2_close(struct net_device *dev)
 
         bnx2_disable_int_sync(bp);
         bnx2_napi_disable(bp);
+        netif_tx_disable(dev);
         del_timer_sync(&bp->timer);
         bnx2_shutdown_chip(bp);
         bnx2_free_irq(bp);
@@ -7832,7 +7908,7 @@ bnx2_get_5709_media(struct bnx2 *bp)
         else
                 strap = (val & BNX2_MISC_DUAL_MEDIA_CTRL_PHY_CTRL_STRAP) >> 8;
 
-        if (PCI_FUNC(bp->pdev->devfn) == 0) {
+        if (bp->func == 0) {
                 switch (strap) {
                 case 0x4:
                 case 0x5:
@@ -8131,9 +8207,12 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         reg = bnx2_reg_rd_ind(bp, BNX2_SHM_HDR_SIGNATURE);
 
+        if (bnx2_reg_rd_ind(bp, BNX2_MCP_TOE_ID) & BNX2_MCP_TOE_ID_FUNCTION_ID)
+                bp->func = 1;
+
         if ((reg & BNX2_SHM_HDR_SIGNATURE_SIG_MASK) ==
             BNX2_SHM_HDR_SIGNATURE_SIG) {
-                u32 off = PCI_FUNC(pdev->devfn) << 2;
+                u32 off = bp->func << 2;
 
                 bp->shmem_base = bnx2_reg_rd_ind(bp, BNX2_SHM_HDR_ADDR_0 + off);
         } else