Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
  tg3: Fix single-vector MSI-X code
  openvswitch: Fix multipart datapath dumps.
  ipv6: fix per device IP snmp counters
  inetpeer: initialize ->redirect_genid in inet_getpeer()
  net: fix NULL-deref in WARN() in skb_gso_segment()
  net: WARN if skb_checksum_help() is called on skb requiring segmentation
  caif: Remove bad WARN_ON in caif_dev
  caif: Fix typo in Vendor/Product-ID for CAIF modems
  bnx2x: Disable AN KR work-around for BCM57810
  bnx2x: Remove AutoGrEEEn for BCM84833
  bnx2x: Remove 100Mb force speed for BCM84833
  bnx2x: Fix PFC setting on BCM57840
  bnx2x: Fix Super-Isolate mode for BCM84833
  net: fix some sparse errors
  net: kill duplicate included header
  net: sh-eth: Fix build error by the value which is not defined
  net: Use device model to get driver name in skb_gso_segment()
  bridge: BH already disabled in br_fdb_cleanup()
  net: move sock_update_memcg outside of CONFIG_INET
  mwl8k: Fixing Sparse ENDIAN CHECK warning
  ...

8 files changed, 214 insertions, 169 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index a688b9d975a..f99c6e312a5 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -365,13 +365,18 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         DP(NETIF_MSG_LINK, "cfg_idx = %x\n", cfg_idx);
 
         if (cmd->autoneg == AUTONEG_ENABLE) {
+                u32 an_supported_speed = bp->port.supported[cfg_idx];
+                if (bp->link_params.phy[EXT_PHY1].type ==
+                    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                        an_supported_speed |= (SUPPORTED_100baseT_Half |
+                                               SUPPORTED_100baseT_Full);
                 if (!(bp->port.supported[cfg_idx] & SUPPORTED_Autoneg)) {
                         DP(NETIF_MSG_LINK, "Autoneg not supported\n");
                         return -EINVAL;
                 }
 
                 /* advertise the requested speed and duplex if supported */
-                if (cmd->advertising & ~(bp->port.supported[cfg_idx])) {
+                if (cmd->advertising & ~an_supported_speed) {
                         DP(NETIF_MSG_LINK, "Advertisement parameters "
                                            "are not supported\n");
                         return -EINVAL;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 4df9505b67b..2091e5dbbcd 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -2502,7 +2502,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
                 struct bnx2x_nig_brb_pfc_port_params *nig_params)
 {
         u32 xcm_mask = 0, ppp_enable = 0, pause_enable = 0, llfc_out_en = 0;
-        u32 llfc_enable = 0, xcm0_out_en = 0, p0_hwpfc_enable = 0;
+        u32 llfc_enable = 0, xcm_out_en = 0, hwpfc_enable = 0;
         u32 pkt_priority_to_cos = 0;
         struct bnx2x *bp = params->bp;
         u8 port = params->port;
@@ -2516,9 +2516,8 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
          * MAC control frames (that are not pause packets)
          * will be forwarded to the XCM.
          */
-        xcm_mask = REG_RD(bp,
-                                port ? NIG_REG_LLH1_XCM_MASK :
-                                NIG_REG_LLH0_XCM_MASK);
+        xcm_mask = REG_RD(bp, port ? NIG_REG_LLH1_XCM_MASK :
+                          NIG_REG_LLH0_XCM_MASK);
         /*
          * nig params will override non PFC params, since it's possible to
          * do transition from PFC to SAFC
@@ -2533,8 +2532,8 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
                 ppp_enable = 1;
                 xcm_mask &= ~(port ? NIG_LLH1_XCM_MASK_REG_LLH1_XCM_MASK_BCN :
                                      NIG_LLH0_XCM_MASK_REG_LLH0_XCM_MASK_BCN);
-                xcm0_out_en = 0;
-                p0_hwpfc_enable = 1;
+                xcm_out_en = 0;
+                hwpfc_enable = 1;
         } else  {
                 if (nig_params) {
                         llfc_out_en = nig_params->llfc_out_en;
@@ -2545,7 +2544,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
 
                 xcm_mask |= (port ? NIG_LLH1_XCM_MASK_REG_LLH1_XCM_MASK_BCN :
                         NIG_LLH0_XCM_MASK_REG_LLH0_XCM_MASK_BCN);
-                xcm0_out_en = 1;
+                xcm_out_en = 1;
         }
 
         if (CHIP_IS_E3(bp))
@@ -2564,13 +2563,16 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
         REG_WR(bp, port ? NIG_REG_LLH1_XCM_MASK :
                NIG_REG_LLH0_XCM_MASK, xcm_mask);
 
-        REG_WR(bp,  NIG_REG_LLFC_EGRESS_SRC_ENABLE_0, 0x7);
+        REG_WR(bp, port ? NIG_REG_LLFC_EGRESS_SRC_ENABLE_1 :
+               NIG_REG_LLFC_EGRESS_SRC_ENABLE_0, 0x7);
 
         /* output enable for RX_XCM # IF */
-        REG_WR(bp, NIG_REG_XCM0_OUT_EN, xcm0_out_en);
+        REG_WR(bp, port ? NIG_REG_XCM1_OUT_EN :
+               NIG_REG_XCM0_OUT_EN, xcm_out_en);
 
         /* HW PFC TX enable */
-        REG_WR(bp, NIG_REG_P0_HWPFC_ENABLE, p0_hwpfc_enable);
+        REG_WR(bp, port ? NIG_REG_P1_HWPFC_ENABLE :
+               NIG_REG_P0_HWPFC_ENABLE, hwpfc_enable);
 
         if (nig_params) {
                 u8 i = 0;
@@ -3761,7 +3763,15 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
         /* Advertise pause */
         bnx2x_ext_phy_set_pause(params, phy, vars);
 
-        vars->rx_tx_asic_rst = MAX_KR_LINK_RETRY;
+        /*
+         * Set KR Autoneg Work-Around flag for Warpcore version older than D108
+         */
+        bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
+                        MDIO_WC_REG_UC_INFO_B1_VERSION, &val16);
+        if (val16 < 0xd108) {
+                DP(NETIF_MSG_LINK, "Enable AN KR work-around\n");
+                vars->rx_tx_asic_rst = MAX_KR_LINK_RETRY;
+        }
 
         bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD,
                         MDIO_WC_REG_DIGITAL5_MISC7, &val16);
@@ -9266,62 +9276,68 @@ static void bnx2x_8727_link_reset(struct bnx2x_phy *phy,
 /*              BCM8481/BCM84823/BCM84833 PHY SECTION             */
 /******************************************************************/
 static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
-                                           struct link_params *params)
+                                            struct bnx2x *bp,
+                                            u8 port)
 {
         u16 val, fw_ver1, fw_ver2, cnt;
-        u8 port;
-        struct bnx2x *bp = params->bp;
 
-        port = params->port;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
+                bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD, 0x400f, &fw_ver1);
+                bnx2x_save_spirom_version(bp, port,
+                                ((fw_ver1 & 0xf000)>>5) | (fw_ver1 & 0x7f),
+                                phy->ver_addr);
+        } else {
+                /* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */
+                /* (1) set reg 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0014);
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B, 0x0000);
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C, 0x0300);
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x0009);
+
+                for (cnt = 0; cnt < 100; cnt++) {
+                        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
+                        if (val & 1)
+                                break;
+                        udelay(5);
+                }
+                if (cnt == 100) {
+                        DP(NETIF_MSG_LINK, "Unable to read 848xx "
+                                        "phy fw version(1)\n");
+                        bnx2x_save_spirom_version(bp, port, 0,
+                                                  phy->ver_addr);
+                        return;
+                }
 
-        /* For the 32 bits registers in 848xx, access via MDIO2ARM interface.*/
-        /* (1) set register 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0014);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C, 0x0300);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x0009);
 
-        for (cnt = 0; cnt < 100; cnt++) {
-                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
-                if (val & 1)
-                        break;
-                udelay(5);
-        }
-        if (cnt == 100) {
-                DP(NETIF_MSG_LINK, "Unable to read 848xx phy fw version(1)\n");
-                bnx2x_save_spirom_version(bp, port, 0,
-                                          phy->ver_addr);
-                return;
-        }
+                /* 2) read register 0xc200_0000 (SPI_FW_STATUS) */
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0000);
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
+                bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x000A);
+                for (cnt = 0; cnt < 100; cnt++) {
+                        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
+                        if (val & 1)
+                                break;
+                        udelay(5);
+                }
+                if (cnt == 100) {
+                        DP(NETIF_MSG_LINK, "Unable to read 848xx phy fw "
+                                        "version(2)\n");
+                        bnx2x_save_spirom_version(bp, port, 0,
+                                                  phy->ver_addr);
+                        return;
+                }
 
+                /* lower 16 bits of the register SPI_FW_STATUS */
+                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B, &fw_ver1);
+                /* upper 16 bits of register SPI_FW_STATUS */
+                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C, &fw_ver2);
 
-        /* 2) read register 0xc200_0000 (SPI_FW_STATUS) */
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x000A);
-        for (cnt = 0; cnt < 100; cnt++) {
-                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
-                if (val & 1)
-                        break;
-                udelay(5);
-        }
-        if (cnt == 100) {
-                DP(NETIF_MSG_LINK, "Unable to read 848xx phy fw version(2)\n");
-                bnx2x_save_spirom_version(bp, port, 0,
+                bnx2x_save_spirom_version(bp, port, (fw_ver2<<16) | fw_ver1,
                                           phy->ver_addr);
-                return;
         }
 
-        /* lower 16 bits of the register SPI_FW_STATUS */
-        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B, &fw_ver1);
-        /* upper 16 bits of register SPI_FW_STATUS */
-        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C, &fw_ver2);
-
-        bnx2x_save_spirom_version(bp, port, (fw_ver2<<16) | fw_ver1,
-                                  phy->ver_addr);
 }
-
 static void bnx2x_848xx_set_led(struct bnx2x *bp,
                                 struct bnx2x_phy *phy)
 {
@@ -9392,10 +9408,13 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,
         u16 tmp_req_line_speed;
 
         tmp_req_line_speed = phy->req_line_speed;
-        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
                 if (phy->req_line_speed == SPEED_10000)
                         phy->req_line_speed = SPEED_AUTO_NEG;
-
+        } else {
+                /* Save spirom version */
+                bnx2x_save_848xx_spirom_version(phy, bp, params->port);
+        }
         /*
          * This phy uses the NIG latch mechanism since link indication
          * arrives through its LED4 and not via its LASI signal, so we
@@ -9443,13 +9462,10 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,
                          an_1000_val);
 
         /* set 100 speed advertisement */
-        if (((phy->req_line_speed == SPEED_AUTO_NEG) &&
+        if ((phy->req_line_speed == SPEED_AUTO_NEG) &&
              (phy->speed_cap_mask &
               (PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_FULL |
-               PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF)) &&
-             (phy->supported &
-              (SUPPORTED_100baseT_Half |
-               SUPPORTED_100baseT_Full)))) {
+               PORT_HW_CFG_SPEED_CAPABILITY_D0_100M_HALF))) {
                 an_10_100_val |= (1<<7);
                 /* Enable autoneg and restart autoneg for legacy speeds */
                 autoneg_val |= (1<<9 | 1<<12);
@@ -9539,9 +9555,6 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,
                                  MDIO_AN_REG_8481_10GBASE_T_AN_CTRL,
                                  1);
 
-        /* Save spirom version */
-        bnx2x_save_848xx_spirom_version(phy, params);
-
         phy->req_line_speed = tmp_req_line_speed;
 
         return 0;
@@ -9749,17 +9762,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
 
         /* Wait for GPHY to come out of reset */
         msleep(50);
-        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
-                /* Bring PHY out of super isolate mode */
-                bnx2x_cl45_read(bp, phy,
-                                MDIO_CTL_DEVAD,
-                                MDIO_84833_TOP_CFG_XGPHY_STRAP1, &val);
-                val &= ~MDIO_84833_SUPER_ISOLATE;
-                bnx2x_cl45_write(bp, phy,
-                                MDIO_CTL_DEVAD,
-                                MDIO_84833_TOP_CFG_XGPHY_STRAP1, val);
-                bnx2x_84833_pair_swap_cfg(phy, params, vars);
-        } else {
+        if (phy->type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
                 /*
                  * BCM84823 requires that XGXS links up first @ 10G for normal
                  * behavior.
@@ -9816,24 +9819,23 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "Multi_phy config = 0x%x, Media control = 0x%x\n",
                    params->multi_phy_config, val);
 
-        /* AutogrEEEn */
-        if (params->feature_config_flags &
-                FEATURE_CONFIG_AUTOGREEEN_ENABLED)
-                cmd_args[0] = 0x2;
-        else
-                cmd_args[0] = 0x0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
+                bnx2x_84833_pair_swap_cfg(phy, params, vars);
 
-        cmd_args[1] = 0x0;
-        cmd_args[2] = PHY84833_CONSTANT_LATENCY + 1;
-        cmd_args[3] = PHY84833_CONSTANT_LATENCY;
-        rc = bnx2x_84833_cmd_hdlr(phy, params,
-                PHY84833_CMD_SET_EEE_MODE, cmd_args);
-        if (rc != 0)
-                DP(NETIF_MSG_LINK, "Cfg AutogrEEEn failed.\n");
+                /* Keep AutogrEEEn disabled. */
+                cmd_args[0] = 0x0;
+                cmd_args[1] = 0x0;
+                cmd_args[2] = PHY84833_CONSTANT_LATENCY + 1;
+                cmd_args[3] = PHY84833_CONSTANT_LATENCY;
+                rc = bnx2x_84833_cmd_hdlr(phy, params,
+                        PHY84833_CMD_SET_EEE_MODE, cmd_args);
+                if (rc != 0)
+                        DP(NETIF_MSG_LINK, "Cfg AutogrEEEn failed.\n");
+        }
         if (initialize)
                 rc = bnx2x_848xx_cmn_config_init(phy, params, vars);
         else
-                bnx2x_save_848xx_spirom_version(phy, params);
+                bnx2x_save_848xx_spirom_version(phy, bp, params->port);
         /* 84833 PHY has a better feature and doesn't need to support this. */
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823) {
                 cms_enable = REG_RD(bp, params->shmem_base +
@@ -9851,6 +9853,16 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                                  MDIO_CTL_REG_84823_USER_CTRL_REG, val);
         }
 
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
+                /* Bring PHY out of super isolate mode as the final step. */
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_CTL_DEVAD,
+                                MDIO_84833_TOP_CFG_XGPHY_STRAP1, &val);
+                val &= ~MDIO_84833_SUPER_ISOLATE;
+                bnx2x_cl45_write(bp, phy,
+                                MDIO_CTL_DEVAD,
+                                MDIO_84833_TOP_CFG_XGPHY_STRAP1, val);
+        }
         return rc;
 }
 
@@ -9988,10 +10000,11 @@ static void bnx2x_848x3_link_reset(struct bnx2x_phy *phy,
         } else {
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_CTL_DEVAD,
-                                0x400f, &val16);
+                                MDIO_84833_TOP_CFG_XGPHY_STRAP1, &val16);
+                val16 |= MDIO_84833_SUPER_ISOLATE;
                 bnx2x_cl45_write(bp, phy,
-                                MDIO_PMA_DEVAD,
-                                MDIO_PMA_REG_CTRL, 0x800);
+                                 MDIO_CTL_DEVAD,
+                                 MDIO_84833_TOP_CFG_XGPHY_STRAP1, val16);
         }
 }
 
@@ -11516,6 +11529,19 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,
         }
         phy->mdio_ctrl = bnx2x_get_emac_base(bp, mdc_mdio_access, port);
 
+        if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) &&
+            (phy->ver_addr)) {
+                /*
+                 * Remove 100Mb link supported for BCM84833 when phy fw
+                 * version lower than or equal to 1.39
+                 */
+                u32 raw_ver = REG_RD(bp, phy->ver_addr);
+                if (((raw_ver & 0x7F) <= 39) &&
+                    (((raw_ver & 0xF80) >> 7) <= 1))
+                        phy->supported &= ~(SUPPORTED_100baseT_Half |
+                                            SUPPORTED_100baseT_Full);
+        }
+
         /*
          * In case mdc/mdio_access of the external phy is different than the
          * mdc/mdio access of the XGXS, a HW lock must be taken in each access
@@ -12333,55 +12359,69 @@ static int bnx2x_84833_common_init_phy(struct bnx2x *bp,
                                                 u32 chip_id)
 {
         u8 reset_gpios;
-        struct bnx2x_phy phy;
-        u32 shmem_base, shmem2_base, cnt;
-        s8 port = 0;
-        u16 val;
-
         reset_gpios = bnx2x_84833_get_reset_gpios(bp, shmem_base_path, chip_id);
         bnx2x_set_mult_gpio(bp, reset_gpios, MISC_REGISTERS_GPIO_OUTPUT_LOW);
         udelay(10);
         bnx2x_set_mult_gpio(bp, reset_gpios, MISC_REGISTERS_GPIO_OUTPUT_HIGH);
         DP(NETIF_MSG_LINK, "84833 reset pulse on pin values 0x%x\n",
                 reset_gpios);
-        for (port = PORT_MAX - 1; port >= PORT_0; port--) {
-                /* This PHY is for E2 and E3. */
-                shmem_base = shmem_base_path[port];
-                shmem2_base = shmem2_base_path[port];
-                /* Extract the ext phy address for the port */
-                if (bnx2x_populate_phy(bp, phy_index, shmem_base, shmem2_base,
-                                       0, &phy) !=
-                    0) {
-                        DP(NETIF_MSG_LINK, "populate_phy failed\n");
-                        return -EINVAL;
-                }
+        return 0;
+}
 
-                /* Wait for FW completing its initialization. */
-                for (cnt = 0; cnt < 1000; cnt++) {
-                        bnx2x_cl45_read(bp, &phy,
+static int bnx2x_84833_pre_init_phy(struct bnx2x *bp,
+                                               struct bnx2x_phy *phy)
+{
+        u16 val, cnt;
+        /* Wait for FW completing its initialization. */
+        for (cnt = 0; cnt < 1500; cnt++) {
+                bnx2x_cl45_read(bp, phy,
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_CTRL, &val);
-                        if (!(val & (1<<15)))
-                                break;
-                        msleep(1);
-                }
-                if (cnt >= 1000)
-                        DP(NETIF_MSG_LINK,
-                                "84833 Cmn reset timeout (%d)\n", port);
-
-                /* Put the port in super isolate mode. */
-                bnx2x_cl45_read(bp, &phy,
-                                MDIO_CTL_DEVAD,
-                                MDIO_84833_TOP_CFG_XGPHY_STRAP1, &val);
-                val |= MDIO_84833_SUPER_ISOLATE;
-                bnx2x_cl45_write(bp, &phy,
-                                MDIO_CTL_DEVAD,
-                                MDIO_84833_TOP_CFG_XGPHY_STRAP1, val);
+                if (!(val & (1<<15)))
+                        break;
+                msleep(1);
+        }
+        if (cnt >= 1500) {
+                DP(NETIF_MSG_LINK, "84833 reset timeout\n");
+                return -EINVAL;
         }
 
+        /* Put the port in super isolate mode. */
+        bnx2x_cl45_read(bp, phy,
+                        MDIO_CTL_DEVAD,
+                        MDIO_84833_TOP_CFG_XGPHY_STRAP1, &val);
+        val |= MDIO_84833_SUPER_ISOLATE;
+        bnx2x_cl45_write(bp, phy,
+                         MDIO_CTL_DEVAD,
+                         MDIO_84833_TOP_CFG_XGPHY_STRAP1, val);
+
+        /* Save spirom version */
+        bnx2x_save_848xx_spirom_version(phy, bp, PORT_0);
         return 0;
 }
 
+int bnx2x_pre_init_phy(struct bnx2x *bp,
+                                  u32 shmem_base,
+                                  u32 shmem2_base,
+                                  u32 chip_id)
+{
+        int rc = 0;
+        struct bnx2x_phy phy;
+        bnx2x_set_mdio_clk(bp, chip_id, PORT_0);
+        if (bnx2x_populate_phy(bp, EXT_PHY1, shmem_base, shmem2_base,
+                               PORT_0, &phy)) {
+                DP(NETIF_MSG_LINK, "populate_phy failed\n");
+                return -EINVAL;
+        }
+        switch (phy.type) {
+        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833:
+                rc = bnx2x_84833_pre_init_phy(bp, &phy);
+                break;
+        default:
+                break;
+        }
+        return rc;
+}
 
 static int bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                                      u32 shmem2_base_path[], u8 phy_index,
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index 44609de4e5d..dddbcf6e154 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -2176,6 +2176,7 @@
  * set to 0x345678021. This is a new register (with 2_) added in E3 B0 to
  * accommodate the 9 input clients to ETS arbiter. */
 #define NIG_REG_P0_TX_ARB_PRIORITY_CLIENT2_MSB                   0x18684
+#define NIG_REG_P1_HWPFC_ENABLE                                  0x181d0
 #define NIG_REG_P1_MAC_IN_EN                                     0x185c0
 /* [RW 1] Output enable for TX MAC interface */
 #define NIG_REG_P1_MAC_OUT_EN                                    0x185c4
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 076e02a415a..d529af99157 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -8846,9 +8846,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
         udelay(100);
 
-        if (tg3_flag(tp, USING_MSIX) && tp->irq_cnt > 1) {
+        if (tg3_flag(tp, USING_MSIX)) {
                 val = tr32(MSGINT_MODE);
-                val |= MSGINT_MODE_MULTIVEC_EN | MSGINT_MODE_ENABLE;
+                val |= MSGINT_MODE_ENABLE;
+                if (tp->irq_cnt > 1)
+                        val |= MSGINT_MODE_MULTIVEC_EN;
                 if (!tg3_flag(tp, 1SHOT_MSI))
                         val |= MSGINT_MODE_ONE_SHOT_DISABLE;
                 tw32(MSGINT_MODE, val);
@@ -9548,19 +9550,18 @@ static int tg3_request_firmware(struct tg3 *tp)
 
 static bool tg3_enable_msix(struct tg3 *tp)
 {
-        int i, rc, cpus = num_online_cpus();
+        int i, rc;
         struct msix_entry msix_ent[tp->irq_max];
 
-        if (cpus == 1)
-                /* Just fallback to the simpler MSI mode. */
-                return false;
-
-        /*
-         * We want as many rx rings enabled as there are cpus.
-         * The first MSIX vector only deals with link interrupts, etc,
-         * so we add one to the number of vectors we are requesting.
-         */
-        tp->irq_cnt = min_t(unsigned, cpus + 1, tp->irq_max);
+        tp->irq_cnt = num_online_cpus();
+        if (tp->irq_cnt > 1) {
+                /* We want as many rx rings enabled as there are cpus.
+                 * In multiqueue MSI-X mode, the first MSI-X vector
+                 * only deals with link interrupts, etc, so we add
+                 * one to the number of vectors we are requesting.
+                 */
+                tp->irq_cnt = min_t(unsigned, tp->irq_cnt + 1, tp->irq_max);
+        }
 
         for (i = 0; i < tp->irq_max; i++) {
                 msix_ent[i].entry  = i;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
index 05b7359bde8..6bdd8e36e56 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
@@ -263,7 +263,7 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
                 data[i++] = atomic_read(&port->port_res[k].swqe_avail);
 }
 
-const struct ethtool_ops ehea_ethtool_ops = {
+static const struct ethtool_ops ehea_ethtool_ops = {
         .get_settings = ehea_get_settings,
         .get_drvinfo = ehea_get_drvinfo,
         .get_msglevel = ehea_get_msglevel,
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 3554414eb5e..5d5fb262718 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -94,8 +94,8 @@ static int port_name_cnt;
 static LIST_HEAD(adapter_list);
 static unsigned long ehea_driver_flags;
 static DEFINE_MUTEX(dlpar_mem_lock);
-struct ehea_fw_handle_array ehea_fw_handles;
-struct ehea_bcmc_reg_array ehea_bcmc_regs;
+static struct ehea_fw_handle_array ehea_fw_handles;
+static struct ehea_bcmc_reg_array ehea_bcmc_regs;
 
 
 static int __devinit ehea_probe_adapter(struct platform_device *dev,
@@ -133,7 +133,7 @@ void ehea_dump(void *adr, int len, char *msg)
         }
 }
 
-void ehea_schedule_port_reset(struct ehea_port *port)
+static void ehea_schedule_port_reset(struct ehea_port *port)
 {
         if (!test_bit(__EHEA_DISABLE_PORT_RESET, &port->flags))
                 schedule_work(&port->reset_task);
@@ -1404,7 +1404,7 @@ out:
         return ret;
 }
 
-int ehea_gen_smrs(struct ehea_port_res *pr)
+static int ehea_gen_smrs(struct ehea_port_res *pr)
 {
         int ret;
         struct ehea_adapter *adapter = pr->port->adapter;
@@ -1426,7 +1426,7 @@ out:
         return -EIO;
 }
 
-int ehea_rem_smrs(struct ehea_port_res *pr)
+static int ehea_rem_smrs(struct ehea_port_res *pr)
 {
         if ((ehea_rem_mr(&pr->send_mr)) ||
             (ehea_rem_mr(&pr->recv_mr)))
@@ -2190,7 +2190,7 @@ out:
         return err;
 }
 
-int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
+static int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
 {
         int ret = -EIO;
         u64 hret;
@@ -2531,7 +2531,7 @@ static void ehea_flush_sq(struct ehea_port *port)
         }
 }
 
-int ehea_stop_qps(struct net_device *dev)
+static int ehea_stop_qps(struct net_device *dev)
 {
         struct ehea_port *port = netdev_priv(dev);
         struct ehea_adapter *adapter = port->adapter;
@@ -2600,7 +2600,7 @@ out:
         return ret;
 }
 
-void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
+static void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
 {
         struct ehea_qp qp = *orig_qp;
         struct ehea_qp_init_attr *init_attr = &qp.init_attr;
@@ -2633,7 +2633,7 @@ void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
         }
 }
 
-int ehea_restart_qps(struct net_device *dev)
+static int ehea_restart_qps(struct net_device *dev)
 {
         struct ehea_port *port = netdev_priv(dev);
         struct ehea_adapter *adapter = port->adapter;
@@ -2824,7 +2824,7 @@ static void ehea_tx_watchdog(struct net_device *dev)
                 ehea_schedule_port_reset(port);
 }
 
-int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
+static int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
 {
         struct hcp_query_ehea *cb;
         u64 hret;
@@ -2852,7 +2852,7 @@ out:
         return ret;
 }
 
-int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
+static int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
 {
         struct hcp_ehea_port_cb4 *cb4;
         u64 hret;
@@ -2966,7 +2966,7 @@ static const struct net_device_ops ehea_netdev_ops = {
         .ndo_tx_timeout         = ehea_tx_watchdog,
 };
 
-struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
+static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
                                          u32 logical_port_id,
                                          struct device_node *dn)
 {
@@ -3237,7 +3237,7 @@ static ssize_t ehea_remove_port(struct device *dev,
 static DEVICE_ATTR(probe_port, S_IWUSR, NULL, ehea_probe_port);
 static DEVICE_ATTR(remove_port, S_IWUSR, NULL, ehea_remove_port);
 
-int ehea_create_device_sysfs(struct platform_device *dev)
+static int ehea_create_device_sysfs(struct platform_device *dev)
 {
         int ret = device_create_file(&dev->dev, &dev_attr_probe_port);
         if (ret)
@@ -3248,7 +3248,7 @@ out:
         return ret;
 }
 
-void ehea_remove_device_sysfs(struct platform_device *dev)
+static void ehea_remove_device_sysfs(struct platform_device *dev)
 {
         device_remove_file(&dev->dev, &dev_attr_probe_port);
         device_remove_file(&dev->dev, &dev_attr_remove_port);
@@ -3379,7 +3379,7 @@ static int __devexit ehea_remove(struct platform_device *dev)
         return 0;
 }
 
-void ehea_crash_handler(void)
+static void ehea_crash_handler(void)
 {
         int i;
 
@@ -3491,7 +3491,7 @@ static ssize_t ehea_show_capabilities(struct device_driver *drv,
 static DRIVER_ATTR(capabilities, S_IRUSR | S_IRGRP | S_IROTH,
                    ehea_show_capabilities, NULL);
 
-int __init ehea_module_init(void)
+static int __init ehea_module_init(void)
 {
         int ret;
 
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
index 95b9f4fa811..c25b05b94da 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
@@ -34,9 +34,7 @@
 #include "ehea_phyp.h"
 #include "ehea_qmr.h"
 
-struct ehea_bmap *ehea_bmap = NULL;
-
-
+static struct ehea_bmap *ehea_bmap;
 
 static void *hw_qpageit_get_inc(struct hw_queue *queue)
 {
@@ -212,7 +210,7 @@ out_nomem:
         return NULL;
 }
 
-u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)
+static u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)
 {
         u64 hret;
         u64 adapter_handle = cq->adapter->handle;
@@ -337,7 +335,7 @@ struct ehea_eqe *ehea_poll_eq(struct ehea_eq *eq)
         return eqe;
 }
 
-u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)
+static u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)
 {
         u64 hret;
         unsigned long flags;
@@ -381,7 +379,7 @@ int ehea_destroy_eq(struct ehea_eq *eq)
 /**
  * allocates memory for a queue and registers pages in phyp
  */
-int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
+static int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
                            int nr_pages, int wqe_size, int act_nr_sges,
                            struct ehea_adapter *adapter, int h_call_q_selector)
 {
@@ -516,7 +514,7 @@ out_freemem:
         return NULL;
 }
 
-u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)
+static u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)
 {
         u64 hret;
         struct ehea_qp_init_attr *qp_attr = &qp->init_attr;
@@ -976,7 +974,7 @@ int ehea_gen_smr(struct ehea_adapter *adapter, struct ehea_mr *old_mr,
         return 0;
 }
 
-void print_error_data(u64 *data)
+static void print_error_data(u64 *data)
 {
         int length;
         u64 type = EHEA_BMASK_GET(ERROR_DATA_TYPE, data[2]);
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6ece4295d78..813d41c4a84 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1703,7 +1703,7 @@ static int sh_mdio_init(struct net_device *ndev, int id,
         mdp->mii_bus->name = "sh_mii";
         mdp->mii_bus->parent = &ndev->dev;
         snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
-                mdp->pdev->name, pdid);
+                mdp->pdev->name, id);
 
         /* PHY IRQ */
         mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);