Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / drivers / net / bnx2x_link.c
index db4f3c0..ff70be8 100644 (file)
@@ -14,6 +14,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
@@ -182,6 +184,7 @@ static void bnx2x_set_serdes_access(struct link_params *params)
 {
        struct bnx2x *bp = params->bp;
        u32 emac_base = (params->port) ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
+
        /* Set Clause 22 */
        REG_WR(bp, NIG_REG_SERDES0_CTRL_MD_ST + params->port*0x10, 1);
        REG_WR(bp, emac_base + EMAC_REG_EMAC_MDIO_COMM, 0x245f8000);
@@ -194,6 +197,7 @@ static void bnx2x_set_serdes_access(struct link_params *params)
 static void bnx2x_set_phy_mdio(struct link_params *params, u8 phy_flags)
 {
        struct bnx2x *bp = params->bp;
+
        if (phy_flags & PHY_XGXS_FLAG) {
                REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST +
                           params->port*0x18, 0);
@@ -397,7 +401,8 @@ static u8 bnx2x_emac_enable(struct link_params *params,
 
                /* enable access for bmac registers */
                REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
-       }
+       } else
+               REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x0);
 
        vars->mac_type = MAC_TYPE_EMAC;
        return 0;
@@ -464,7 +469,6 @@ static u8 bnx2x_bmac_enable(struct link_params *params, struct link_vars *vars,
        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL,
                    wb_data, 2);
 
-
        /* set rx mtu */
        wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
        wb_data[1] = 0;
@@ -683,6 +687,7 @@ void bnx2x_link_status_update(struct link_params *params,
 static void bnx2x_update_mng(struct link_params *params, u32 link_status)
 {
        struct bnx2x *bp = params->bp;
+
        REG_WR(bp, params->shmem_base +
                   offsetof(struct shmem_region,
                            port_mb[params->port].link_status),
@@ -779,7 +784,6 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
                        DP(NETIF_MSG_LINK, "Invalid line_speed 0x%x\n",
                                  line_speed);
                        return -EINVAL;
-                       break;
                }
        }
        REG_WR(bp, PBF_REG_P0_INIT_CRD + port*4, init_crd);
@@ -799,6 +803,7 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
 static u32 bnx2x_get_emac_base(struct bnx2x *bp, u32 ext_phy_type, u8 port)
 {
        u32 emac_base;
+
        switch (ext_phy_type) {
        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
@@ -904,7 +909,7 @@ u8 bnx2x_cl45_read(struct bnx2x *bp, u8 port, u32 ext_phy_type,
        val = saved_mode & ((EMAC_MDIO_MODE_AUTO_POLL |
                             EMAC_MDIO_MODE_CLOCK_CNT));
        val |= (EMAC_MDIO_MODE_CLAUSE_45 |
-               (49 << EMAC_MDIO_MODE_CLOCK_CNT_BITSHIFT));
+               (49L << 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);
@@ -1021,8 +1026,8 @@ static u8 bnx2x_reset_unicore(struct link_params *params)
                              MDIO_COMBO_IEEE0_MII_CONTROL,
                              (mii_control |
                               MDIO_COMBO_IEEO_MII_CONTROL_RESET));
-
-       bnx2x_set_serdes_access(params);
+       if (params->switch_cfg == SWITCH_CFG_1G)
+               bnx2x_set_serdes_access(params);
 
        /* wait for the reset to self clear */
        for (i = 0; i < MDIO_ACCESS_TIMEOUT; i++) {
@@ -1104,18 +1109,21 @@ static void bnx2x_set_parallel_detection(struct link_params *params,
                              MDIO_REG_BANK_SERDES_DIGITAL,
                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
                              &control2);
-
-
-       control2 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
-
-
+       if (params->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)
+               control2 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
+       else
+               control2 &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
+       DP(NETIF_MSG_LINK, "params->speed_cap_mask = 0x%x, control2 = 0x%x\n",
+               params->speed_cap_mask, control2);
        CL45_WR_OVER_CL22(bp, params->port,
                              params->phy_addr,
                              MDIO_REG_BANK_SERDES_DIGITAL,
                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
                              control2);
 
-       if (phy_flags & PHY_XGXS_FLAG) {
+       if ((phy_flags & PHY_XGXS_FLAG) &&
+            (params->speed_cap_mask &
+                   PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)) {
                DP(NETIF_MSG_LINK, "XGXS\n");
 
                CL45_WR_OVER_CL22(bp, params->port,
@@ -1151,7 +1159,8 @@ static void bnx2x_set_parallel_detection(struct link_params *params,
 }
 
 static void bnx2x_set_autoneg(struct link_params *params,
-                           struct link_vars   *vars)
+                           struct link_vars *vars,
+                           u8 enable_cl73)
 {
        struct bnx2x *bp = params->bp;
        u16 reg_val;
@@ -1181,7 +1190,9 @@ static void bnx2x_set_autoneg(struct link_params *params,
                              params->phy_addr,
                              MDIO_REG_BANK_SERDES_DIGITAL,
                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, &reg_val);
-       reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN;
+       reg_val &= ~(MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN |
+                   MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_INVERT_SIGNAL_DETECT);
+       reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_FIBER_MODE;
        if (vars->line_speed == SPEED_AUTO_NEG)
                reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET;
        else
@@ -1213,8 +1224,47 @@ static void bnx2x_set_autoneg(struct link_params *params,
                              MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
                              reg_val);
 
-       /* CL73 Autoneg Disabled */
-       reg_val = 0;
+       if (enable_cl73) {
+               /* Enable Cl73 FSM status bits */
+               CL45_WR_OVER_CL22(bp, params->port,
+                                     params->phy_addr,
+                                     MDIO_REG_BANK_CL73_USERB0,
+                                   MDIO_CL73_USERB0_CL73_UCTRL,
+                                     0xe);
+
+               /* Enable BAM Station Manager*/
+               CL45_WR_OVER_CL22(bp, params->port,
+                       params->phy_addr,
+                       MDIO_REG_BANK_CL73_USERB0,
+                       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);
+
+               /* Advertise CL73 link speeds */
+                       CL45_RD_OVER_CL22(bp, params->port,
+                                             params->phy_addr,
+                                             MDIO_REG_BANK_CL73_IEEEB1,
+                                             MDIO_CL73_IEEEB1_AN_ADV2,
+                                             &reg_val);
+               if (params->speed_cap_mask &
+                   PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
+                       reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_10G_KX4;
+               if (params->speed_cap_mask &
+                   PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)
+                       reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_1000M_KX;
+
+                       CL45_WR_OVER_CL22(bp, params->port,
+                                             params->phy_addr,
+                                             MDIO_REG_BANK_CL73_IEEEB1,
+                                             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;
 
        CL45_WR_OVER_CL22(bp, params->port,
                              params->phy_addr,
@@ -1229,14 +1279,14 @@ static void bnx2x_program_serdes(struct link_params *params,
        struct bnx2x *bp = params->bp;
        u16 reg_val;
 
-       /* program duplex, disable autoneg */
-
+       /* program duplex, disable autoneg and sgmii*/
        CL45_RD_OVER_CL22(bp, params->port,
                              params->phy_addr,
                              MDIO_REG_BANK_COMBO_IEEE0,
                              MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
        reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX |
-                    MDIO_COMBO_IEEO_MII_CONTROL_AN_EN);
+                    MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
+                    MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK);
        if (params->req_duplex == DUPLEX_FULL)
                reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
        CL45_WR_OVER_CL22(bp, params->port,
@@ -1297,11 +1347,12 @@ static void bnx2x_set_brcm_cl37_advertisment(struct link_params *params)
        CL45_WR_OVER_CL22(bp, params->port,
                              params->phy_addr,
                              MDIO_REG_BANK_OVER_1G,
-                             MDIO_OVER_1G_UP3, 0);
+                             MDIO_OVER_1G_UP3, 0x400);
 }
 
-static void bnx2x_calc_ieee_aneg_adv(struct link_params *params, u32 *ieee_fc)
+static void bnx2x_calc_ieee_aneg_adv(struct link_params *params, u16 *ieee_fc)
 {
+       struct bnx2x *bp = params->bp;
        *ieee_fc = 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 */
@@ -1331,42 +1382,72 @@ static void bnx2x_calc_ieee_aneg_adv(struct link_params *params, u32 *ieee_fc)
                *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_NONE;
                break;
        }
+       DP(NETIF_MSG_LINK, "ieee_fc = 0x%x\n", *ieee_fc);
 }
 
 static void bnx2x_set_ieee_aneg_advertisment(struct link_params *params,
-                                          u32 ieee_fc)
+                                          u16 ieee_fc)
 {
        struct bnx2x *bp = params->bp;
+       u16 val;
        /* for AN, we are always publishing full duplex */
 
        CL45_WR_OVER_CL22(bp, params->port,
                              params->phy_addr,
                              MDIO_REG_BANK_COMBO_IEEE0,
-                             MDIO_COMBO_IEEE0_AUTO_NEG_ADV, (u16)ieee_fc);
+                             MDIO_COMBO_IEEE0_AUTO_NEG_ADV, ieee_fc);
+       CL45_RD_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_CL73_IEEEB1,
+                             MDIO_CL73_IEEEB1_AN_ADV1, &val);
+       val &= ~MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_BOTH;
+       val |= ((ieee_fc<<3) & MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_MASK);
+       CL45_WR_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_CL73_IEEEB1,
+                             MDIO_CL73_IEEEB1_AN_ADV1, val);
 }
 
-static void bnx2x_restart_autoneg(struct link_params *params)
+static void bnx2x_restart_autoneg(struct link_params *params, u8 enable_cl73)
 {
        struct bnx2x *bp = params->bp;
        u16 mii_control;
+
        DP(NETIF_MSG_LINK, "bnx2x_restart_autoneg\n");
        /* Enable and restart BAM/CL37 aneg */
 
-       CL45_RD_OVER_CL22(bp, params->port,
-                             params->phy_addr,
-                             MDIO_REG_BANK_COMBO_IEEE0,
-                             MDIO_COMBO_IEEE0_MII_CONTROL,
-                             &mii_control);
-       DP(NETIF_MSG_LINK,
-                "bnx2x_restart_autoneg mii_control before = 0x%x\n",
-                mii_control);
-       CL45_WR_OVER_CL22(bp, params->port,
-                             params->phy_addr,
-                             MDIO_REG_BANK_COMBO_IEEE0,
-                             MDIO_COMBO_IEEE0_MII_CONTROL,
-                             (mii_control |
-                              MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
-                              MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN));
+       if (enable_cl73) {
+               CL45_RD_OVER_CL22(bp, params->port,
+                                     params->phy_addr,
+                                     MDIO_REG_BANK_CL73_IEEEB0,
+                                     MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                     &mii_control);
+
+               CL45_WR_OVER_CL22(bp, params->port,
+                               params->phy_addr,
+                               MDIO_REG_BANK_CL73_IEEEB0,
+                               MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                               (mii_control |
+                               MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN |
+                               MDIO_CL73_IEEEB0_CL73_AN_CONTROL_RESTART_AN));
+       } else {
+
+               CL45_RD_OVER_CL22(bp, params->port,
+                                     params->phy_addr,
+                                     MDIO_REG_BANK_COMBO_IEEE0,
+                                     MDIO_COMBO_IEEE0_MII_CONTROL,
+                                     &mii_control);
+               DP(NETIF_MSG_LINK,
+                        "bnx2x_restart_autoneg mii_control before = 0x%x\n",
+                        mii_control);
+               CL45_WR_OVER_CL22(bp, params->port,
+                                     params->phy_addr,
+                                     MDIO_REG_BANK_COMBO_IEEE0,
+                                     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 link_params *params,
@@ -1438,7 +1519,7 @@ static void bnx2x_initialize_sgmii_process(struct link_params *params,
 
        } else { /* AN mode */
                /* enable and restart AN */
-               bnx2x_restart_autoneg(params);
+               bnx2x_restart_autoneg(params, 0);
        }
 }
 
@@ -1470,22 +1551,19 @@ static void bnx2x_pause_resolve(struct link_vars *vars, u32 pause_result)
        }
 }
 
-static u8 bnx2x_ext_phy_resove_fc(struct link_params *params,
+static u8 bnx2x_ext_phy_resolve_fc(struct link_params *params,
                                  struct link_vars *vars)
 {
        struct bnx2x *bp = params->bp;
        u8 ext_phy_addr;
-       u16 ld_pause;   /* local */
-       u16 lp_pause;   /* link partner */
-       u16 an_complete; /* AN complete */
+       u16 ld_pause;           /* local */
+       u16 lp_pause;           /* link partner */
+       u16 an_complete;        /* AN complete */
        u16 pause_result;
        u8 ret = 0;
        u32 ext_phy_type;
        u8 port = params->port;
-       ext_phy_addr = ((params->ext_phy_config &
-                        PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
-
+       ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
        /* read twice */
 
@@ -1516,7 +1594,7 @@ static u8 bnx2x_ext_phy_resove_fc(struct link_params *params,
                                MDIO_AN_REG_ADV_PAUSE_MASK) >> 8;
                pause_result |= (lp_pause &
                                 MDIO_AN_REG_ADV_PAUSE_MASK) >> 10;
-               DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x \n",
+               DP(NETIF_MSG_LINK, "Ext PHY pause result 0x%x\n",
                   pause_result);
                bnx2x_pause_resolve(vars, pause_result);
                if (vars->flow_ctrl == BNX2X_FLOW_CTRL_NONE &&
@@ -1538,13 +1616,46 @@ static u8 bnx2x_ext_phy_resove_fc(struct link_params *params,
                                MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) >> 7;
 
                        bnx2x_pause_resolve(vars, pause_result);
-                       DP(NETIF_MSG_LINK, "Ext PHY CL37 pause result 0x%x \n",
+                       DP(NETIF_MSG_LINK, "Ext PHY CL37 pause result 0x%x\n",
                                 pause_result);
                }
        }
        return ret;
 }
 
+static u8 bnx2x_direct_parallel_detect_used(struct link_params *params)
+{
+       struct bnx2x *bp = params->bp;
+       u16 pd_10g, status2_1000x;
+       CL45_RD_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_SERDES_DIGITAL,
+                             MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
+                             &status2_1000x);
+       CL45_RD_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_SERDES_DIGITAL,
+                             MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
+                             &status2_1000x);
+       if (status2_1000x & MDIO_SERDES_DIGITAL_A_1000X_STATUS2_AN_DISABLED) {
+               DP(NETIF_MSG_LINK, "1G parallel detect link on port %d\n",
+                        params->port);
+               return 1;
+       }
+
+       CL45_RD_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                             MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS,
+                             &pd_10g);
+
+       if (pd_10g & MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS_PD_LINK) {
+               DP(NETIF_MSG_LINK, "10G parallel detect link on port %d\n",
+                        params->port);
+               return 1;
+       }
+       return 0;
+}
 
 static void bnx2x_flow_ctrl_resolve(struct link_params *params,
                                  struct link_vars *vars,
@@ -1563,24 +1674,56 @@ static void bnx2x_flow_ctrl_resolve(struct link_params *params,
            (!(vars->phy_flags & PHY_SGMII_FLAG)) &&
            (XGXS_EXT_PHY_TYPE(params->ext_phy_config) ==
             PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT)) {
-               CL45_RD_OVER_CL22(bp, params->port,
-                                     params->phy_addr,
-                                     MDIO_REG_BANK_COMBO_IEEE0,
-                                     MDIO_COMBO_IEEE0_AUTO_NEG_ADV,
-                                     &ld_pause);
-               CL45_RD_OVER_CL22(bp, params->port,
-                                     params->phy_addr,
-                       MDIO_REG_BANK_COMBO_IEEE0,
-                       MDIO_COMBO_IEEE0_AUTO_NEG_LINK_PARTNER_ABILITY1,
-                       &lp_pause);
-               pause_result = (ld_pause &
+               if (bnx2x_direct_parallel_detect_used(params)) {
+                       vars->flow_ctrl = params->req_fc_auto_adv;
+                       return;
+               }
+               if ((gp_status &
+                   (MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_AUTONEG_COMPLETE |
+                    MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_MR_LP_NP_AN_ABLE)) ==
+                   (MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_AUTONEG_COMPLETE |
+                    MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_MR_LP_NP_AN_ABLE)) {
+
+                       CL45_RD_OVER_CL22(bp, params->port,
+                                             params->phy_addr,
+                                             MDIO_REG_BANK_CL73_IEEEB1,
+                                             MDIO_CL73_IEEEB1_AN_ADV1,
+                                             &ld_pause);
+                       CL45_RD_OVER_CL22(bp, params->port,
+                                            params->phy_addr,
+                                            MDIO_REG_BANK_CL73_IEEEB1,
+                                            MDIO_CL73_IEEEB1_AN_LP_ADV1,
+                                            &lp_pause);
+                       pause_result = (ld_pause &
+                                       MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_MASK)
+                                       >> 8;
+                       pause_result |= (lp_pause &
+                                       MDIO_CL73_IEEEB1_AN_LP_ADV1_PAUSE_MASK)
+                                       >> 10;
+                       DP(NETIF_MSG_LINK, "pause_result CL73 0x%x\n",
+                                pause_result);
+               } else {
+
+                       CL45_RD_OVER_CL22(bp, params->port,
+                                             params->phy_addr,
+                                             MDIO_REG_BANK_COMBO_IEEE0,
+                                             MDIO_COMBO_IEEE0_AUTO_NEG_ADV,
+                                             &ld_pause);
+                       CL45_RD_OVER_CL22(bp, params->port,
+                              params->phy_addr,
+                              MDIO_REG_BANK_COMBO_IEEE0,
+                              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 &
+                       pause_result |= (lp_pause &
                                 MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>7;
-               DP(NETIF_MSG_LINK, "pause_result 0x%x\n", pause_result);
+                       DP(NETIF_MSG_LINK, "pause_result CL37 0x%x\n",
+                                pause_result);
+               }
                bnx2x_pause_resolve(vars, pause_result);
        } else if ((params->req_flow_ctrl == BNX2X_FLOW_CTRL_AUTO) &&
-                  (bnx2x_ext_phy_resove_fc(params, vars))) {
+                  (bnx2x_ext_phy_resolve_fc(params, vars))) {
                return;
        } else {
                if (params->req_flow_ctrl == BNX2X_FLOW_CTRL_AUTO)
@@ -1591,7 +1734,73 @@ static void bnx2x_flow_ctrl_resolve(struct link_params *params,
        DP(NETIF_MSG_LINK, "flow_ctrl 0x%x\n", vars->flow_ctrl);
 }
 
-
+static void bnx2x_check_fallback_to_cl37(struct link_params *params)
+{
+       struct bnx2x *bp = params->bp;
+       u16 rx_status, ustat_val, cl37_fsm_recieved;
+       DP(NETIF_MSG_LINK, "bnx2x_check_fallback_to_cl37\n");
+       /* Step 1: Make sure signal is detected */
+       CL45_RD_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_RX0,
+                             MDIO_RX0_RX_STATUS,
+                             &rx_status);
+       if ((rx_status & MDIO_RX0_RX_STATUS_SIGDET) !=
+           (MDIO_RX0_RX_STATUS_SIGDET)) {
+               DP(NETIF_MSG_LINK, "Signal is not detected. Restoring CL73."
+                            "rx_status(0x80b0) = 0x%x\n", rx_status);
+               CL45_WR_OVER_CL22(bp, params->port,
+                                     params->phy_addr,
+                                     MDIO_REG_BANK_CL73_IEEEB0,
+                                     MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                     MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN);
+               return;
+       }
+       /* Step 2: Check CL73 state machine */
+       CL45_RD_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_CL73_USERB0,
+                             MDIO_CL73_USERB0_CL73_USTAT1,
+                             &ustat_val);
+       if ((ustat_val &
+            (MDIO_CL73_USERB0_CL73_USTAT1_LINK_STATUS_CHECK |
+             MDIO_CL73_USERB0_CL73_USTAT1_AN_GOOD_CHECK_BAM37)) !=
+           (MDIO_CL73_USERB0_CL73_USTAT1_LINK_STATUS_CHECK |
+             MDIO_CL73_USERB0_CL73_USTAT1_AN_GOOD_CHECK_BAM37)) {
+               DP(NETIF_MSG_LINK, "CL73 state-machine is not stable. "
+                            "ustat_val(0x8371) = 0x%x\n", ustat_val);
+               return;
+       }
+       /* Step 3: Check CL37 Message Pages received to indicate LP
+       supports only CL37 */
+       CL45_RD_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_REMOTE_PHY,
+                             MDIO_REMOTE_PHY_MISC_RX_STATUS,
+                             &cl37_fsm_recieved);
+       if ((cl37_fsm_recieved &
+            (MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_OVER1G_MSG |
+            MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_BRCM_OUI_MSG)) !=
+           (MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_OVER1G_MSG |
+             MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_BRCM_OUI_MSG)) {
+               DP(NETIF_MSG_LINK, "No CL37 FSM were received. "
+                            "misc_rx_status(0x8330) = 0x%x\n",
+                        cl37_fsm_recieved);
+               return;
+       }
+       /* The combined cl37/cl73 fsm state information indicating that we are
+       connected to a device which does not support cl73, but does support
+       cl37 BAM. In this case we disable cl73 and restart cl37 auto-neg */
+       /* Disable CL73 */
+       CL45_WR_OVER_CL22(bp, params->port,
+                             params->phy_addr,
+                             MDIO_REG_BANK_CL73_IEEEB0,
+                             MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                             0);
+       /* Restart CL37 autoneg */
+       bnx2x_restart_autoneg(params, 0);
+       DP(NETIF_MSG_LINK, "Disabling CL73, and restarting CL37 autoneg\n");
+}
 static u8 bnx2x_link_settings_status(struct link_params *params,
                                   struct link_vars *vars,
                                   u32 gp_status,
@@ -1656,7 +1865,7 @@ static u8 bnx2x_link_settings_status(struct link_params *params,
                                 "link speed unsupported  gp_status 0x%x\n",
                                  gp_status);
                        return -EINVAL;
-                       break;
+
                case GP_STATUS_10G_KX4:
                case GP_STATUS_10G_HIG:
                case GP_STATUS_10G_CX4:
@@ -1693,8 +1902,7 @@ static u8 bnx2x_link_settings_status(struct link_params *params,
                        DP(NETIF_MSG_LINK,
                                  "link speed unsupported gp_status 0x%x\n",
                                  gp_status);
-               return -EINVAL;
-                       break;
+                       return -EINVAL;
                }
 
                /* Upon link speed change set the NIG into drain mode.
@@ -1724,6 +1932,8 @@ static u8 bnx2x_link_settings_status(struct link_params *params,
                    (XGXS_EXT_PHY_TYPE(params->ext_phy_config) ==
                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705) ||
                    (XGXS_EXT_PHY_TYPE(params->ext_phy_config) ==
+                    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706) ||
+                   (XGXS_EXT_PHY_TYPE(params->ext_phy_config) ==
                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726))) {
                        vars->autoneg = AUTO_NEG_ENABLED;
 
@@ -1755,9 +1965,16 @@ static u8 bnx2x_link_settings_status(struct link_params *params,
                vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
                vars->autoneg = AUTO_NEG_DISABLED;
                vars->mac_type = MAC_TYPE_NONE;
+
+               if ((params->req_line_speed == SPEED_AUTO_NEG) &&
+                   ((XGXS_EXT_PHY_TYPE(params->ext_phy_config) ==
+                    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT))) {
+                       /* Check signal is detected */
+                       bnx2x_check_fallback_to_cl37(params);
+               }
        }
 
-       DP(NETIF_MSG_LINK, "gp_status 0x%x  phy_link_up %x line_speed %x \n",
+       DP(NETIF_MSG_LINK, "gp_status 0x%x  phy_link_up %x line_speed %x\n",
                 gp_status, vars->phy_link_up, vars->line_speed);
        DP(NETIF_MSG_LINK, "duplex %x  flow_ctrl 0x%x"
                 " autoneg 0x%x\n",
@@ -1851,15 +2068,14 @@ static u8 bnx2x_emac_program(struct link_params *params,
                    GRCBASE_EMAC0 + port*0x400 + EMAC_REG_EMAC_MODE,
                    mode);
 
-       bnx2x_set_led(bp, params->port, LED_MODE_OPER,
-                   line_speed, params->hw_led_mode, params->chip_id);
+       bnx2x_set_led(params, LED_MODE_OPER, line_speed);
        return 0;
 }
 
 /*****************************************************************************/
 /*                          External Phy section                            */
 /*****************************************************************************/
-static void bnx2x_hw_reset(struct bnx2x *bp, u8 port)
+void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port)
 {
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
                       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
@@ -1873,9 +2089,8 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
 {
        struct bnx2x *bp = params->bp;
        u32 ext_phy_type;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                          PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
+
        DP(NETIF_MSG_LINK, "Port %x: bnx2x_ext_phy_reset\n", params->port);
        ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
        /* The PHY reset is controled by GPIO 1
@@ -1898,7 +2113,7 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
                                          params->port);
 
                        /* HW reset */
-                       bnx2x_hw_reset(bp, params->port);
+                       bnx2x_ext_phy_hw_reset(bp, params->port);
 
                        bnx2x_cl45_write(bp, params->port,
                                       ext_phy_type,
@@ -1927,16 +2142,17 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
                                       MDIO_PMA_DEVAD,
                                       MDIO_PMA_REG_CTRL,
                                       1<<15);
-
                        break;
+
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
+                       DP(NETIF_MSG_LINK, "XGXS 8072\n");
+
                        /* Unset Low Power Mode and SW reset */
                        /* Restore normal power mode*/
                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
                                      MISC_REGISTERS_GPIO_OUTPUT_HIGH,
                                          params->port);
 
-                       DP(NETIF_MSG_LINK, "XGXS 8072\n");
                        bnx2x_cl45_write(bp, params->port,
                                       ext_phy_type,
                                       ext_phy_addr,
@@ -1944,8 +2160,9 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
                                       MDIO_PMA_REG_CTRL,
                                       1<<15);
                        break;
+
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:
-                       {
+                       DP(NETIF_MSG_LINK, "XGXS 8073\n");
 
                        /* Restore normal power mode*/
                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
@@ -1955,9 +2172,6 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
                                      MISC_REGISTERS_GPIO_OUTPUT_HIGH,
                                          params->port);
-
-                       DP(NETIF_MSG_LINK, "XGXS 8073\n");
-                       }
                        break;
 
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
@@ -1969,19 +2183,17 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
                                          params->port);
 
                        /* HW reset */
-                       bnx2x_hw_reset(bp, params->port);
-
+                       bnx2x_ext_phy_hw_reset(bp, params->port);
                        break;
 
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481:
-
                        /* Restore normal power mode*/
                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
                                      MISC_REGISTERS_GPIO_OUTPUT_HIGH,
                                          params->port);
 
                        /* HW reset */
-                       bnx2x_hw_reset(bp, params->port);
+                       bnx2x_ext_phy_hw_reset(bp, params->port);
 
                        bnx2x_cl45_write(bp, params->port,
                                       ext_phy_type,
@@ -1990,6 +2202,8 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
                                       MDIO_PMA_REG_CTRL,
                                       1<<15);
                        break;
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
+                       break;
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:
                        DP(NETIF_MSG_LINK, "XGXS PHY Failure detected\n");
                        break;
@@ -2009,24 +2223,22 @@ static void bnx2x_ext_phy_reset(struct link_params *params,
 
                case PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482:
                        DP(NETIF_MSG_LINK, "SerDes 5482\n");
-                       bnx2x_hw_reset(bp, params->port);
+                       bnx2x_ext_phy_hw_reset(bp, params->port);
                        break;
 
                default:
-                       DP(NETIF_MSG_LINK,
-                                "BAD SerDes ext_phy_config 0x%x\n",
+                       DP(NETIF_MSG_LINK, "BAD SerDes ext_phy_config 0x%x\n",
                                 params->ext_phy_config);
                        break;
                }
        }
 }
 
-
 static void bnx2x_save_spirom_version(struct bnx2x *bp, u8 port,
                                    u32 shmem_base, u32 spirom_ver)
 {
-       DP(NETIF_MSG_LINK, "FW version 0x%x:0x%x\n",
-                (u16)(spirom_ver>>16), (u16)spirom_ver);
+       DP(NETIF_MSG_LINK, "FW version 0x%x:0x%x for port %d\n",
+                (u16)(spirom_ver>>16), (u16)spirom_ver, port);
        REG_WR(bp, shmem_base +
                   offsetof(struct shmem_region,
                            port_mb[port].ext_phy_fw_version),
@@ -2038,6 +2250,7 @@ static void bnx2x_save_bcm_spirom_ver(struct bnx2x *bp, u8 port,
                                    u32 shmem_base)
 {
        u16 fw_ver1, fw_ver2;
+
        bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr, MDIO_PMA_DEVAD,
                      MDIO_PMA_REG_ROM_VER1, &fw_ver1);
        bnx2x_cl45_read(bp, port, ext_phy_type, ext_phy_addr, MDIO_PMA_DEVAD,
@@ -2155,9 +2368,7 @@ static void bnx2x_bcm8072_external_rom_boot(struct link_params *params)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
 
        /* Need to wait 200ms after reset */
@@ -2205,9 +2416,7 @@ static u8 bnx2x_8073_is_snr_needed(struct link_params *params)
        /* This is only required for 8073A1, version 102 only */
 
        struct bnx2x *bp = params->bp;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u16 val;
 
        /* Read 8073 HW revision*/
@@ -2238,9 +2447,7 @@ static u8 bnx2x_8073_is_snr_needed(struct link_params *params)
 static u8 bnx2x_bcm8073_xaui_wa(struct link_params *params)
 {
        struct bnx2x *bp = params->bp;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u16 val, cnt, cnt1 ;
 
        bnx2x_cl45_read(bp, params->port,
@@ -2296,7 +2503,6 @@ static u8 bnx2x_bcm8073_xaui_wa(struct link_params *params)
        }
        DP(NETIF_MSG_LINK, "Warning: XAUI work-around timeout !!!\n");
        return -EINVAL;
-
 }
 
 static void bnx2x_bcm8073_bcm8727_external_rom_boot(struct bnx2x *bp, u8 port,
@@ -2382,24 +2588,17 @@ static void bnx2x_bcm8726_external_rom_boot(struct link_params *params)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
 
        /* Need to wait 100ms after reset */
        msleep(100);
 
-       /* Set serial boot control for external load */
-       bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_MISC_CTRL1, 0x0001);
-
        /* Micro controller re-boot */
        bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,
                       MDIO_PMA_DEVAD,
                       MDIO_PMA_REG_GEN_CTRL,
-                      MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
+                      0x018B);
 
        /* Set soft reset */
        bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,
@@ -2407,14 +2606,10 @@ static void bnx2x_bcm8726_external_rom_boot(struct link_params *params)
                       MDIO_PMA_REG_GEN_CTRL,
                       MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
 
-       /* Set PLL register value to be same like in P13 ver */
        bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,
                       MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_PLL_CTRL,
-                      0x73A0);
+                      MDIO_PMA_REG_MISC_CTRL1, 0x0001);
 
-       /* Clear soft reset.
-       Will automatically reset micro-controller re-boot */
        bnx2x_cl45_write(bp, port, ext_phy_type, ext_phy_addr,
                       MDIO_PMA_DEVAD,
                       MDIO_PMA_REG_GEN_CTRL,
@@ -2440,6 +2635,7 @@ static void bnx2x_sfp_set_transmitter(struct bnx2x *bp, u8 port,
                                    u8 tx_en)
 {
        u16 val;
+
        DP(NETIF_MSG_LINK, "Setting transmitter tx_en=%x for port %x\n",
                 tx_en, port);
        /* Disable/Enable transmitter ( TX laser of the SFP+ module.)*/
@@ -2470,10 +2666,9 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct link_params *params,
        u16 val = 0;
        u16 i;
        u8 port = params->port;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                          PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
+
        if (byte_cnt > 16) {
                DP(NETIF_MSG_LINK, "Reading from eeprom is"
                            " is limited to 0xf\n");
@@ -2554,9 +2749,7 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct link_params *params,
        struct bnx2x *bp = params->bp;
        u16 val, i;
        u8 port = params->port;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                          PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
 
        if (byte_cnt > 16) {
@@ -2687,6 +2880,7 @@ static u8 bnx2x_get_edc_mode(struct link_params *params,
        case SFP_EEPROM_CON_TYPE_VAL_COPPER:
        {
                u8 copper_module_type;
+
                /* Check if its active cable( includes SFP+ module)
                of passive cable*/
                if (bnx2x_read_sfp_module_eeprom(params,
@@ -2721,7 +2915,6 @@ static u8 bnx2x_get_edc_mode(struct link_params *params,
                DP(NETIF_MSG_LINK, "Optic module detected\n");
                check_limiting_mode = 1;
                break;
-
        default:
                DP(NETIF_MSG_LINK, "Unable to determine module type 0x%x !!!\n",
                         val);
@@ -2796,11 +2989,8 @@ static u8 bnx2x_verify_sfp_module(struct link_params *params)
        else
                vendor_pn[SFP_EEPROM_PART_NO_SIZE] = '\0';
 
-       printk(KERN_INFO PFX  "Warning: "
-                        "Unqualified SFP+ module "
-                        "detected on %s, Port %d from %s part number %s\n"
-                       , bp->dev->name, params->port,
-                       vendor_name, vendor_pn);
+       netdev_info(bp->dev, "Warning: Unqualified SFP+ module detected, Port %d from %s part number %s\n",
+                   params->port, vendor_name, vendor_pn);
        return -EINVAL;
 }
 
@@ -2809,9 +2999,7 @@ static u8 bnx2x_bcm8726_set_limiting_mode(struct link_params *params,
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                          PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u16 cur_limiting_mode;
 
        bnx2x_cl45_read(bp, port,
@@ -2877,9 +3065,7 @@ static u8 bnx2x_bcm8727_set_limiting_mode(struct link_params *params,
        u8 port = params->port;
        u16 phy_identifier;
        u16 rom_ver2_val;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                          PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
 
        bnx2x_cl45_read(bp, port,
                       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727,
@@ -2983,9 +3169,7 @@ static u8 bnx2x_sfp_module_detection(struct link_params *params)
        struct bnx2x *bp = params->bp;
        u16 edc_mode;
        u8 rc = 0;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
        u32 val = REG_RD(bp, params->shmem_base +
                             offsetof(struct shmem_region, dev_info.
@@ -3054,6 +3238,7 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
        struct bnx2x *bp = params->bp;
        u32 gpio_val;
        u8 port = params->port;
+
        /* Set valid module led off */
        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
                          MISC_REGISTERS_GPIO_HIGH,
@@ -3075,9 +3260,8 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
                else
                        DP(NETIF_MSG_LINK, "SFP+ module is not initialized\n");
        } else {
-               u8 ext_phy_addr = ((params->ext_phy_config &
-                                   PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                                  PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+               u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
+
                u32 ext_phy_type =
                        XGXS_EXT_PHY_TYPE(params->ext_phy_config);
                u32 val = REG_RD(bp, params->shmem_base +
@@ -3101,9 +3285,7 @@ static void bnx2x_bcm807x_force_10G(struct link_params *params)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
 
        /* Force KR or KX */
@@ -3124,14 +3306,13 @@ static void bnx2x_bcm807x_force_10G(struct link_params *params)
                       MDIO_AN_REG_CTRL,
                       0x0000);
 }
+
 static void bnx2x_bcm8073_set_xaui_low_power_mode(struct link_params *params)
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
        u16 val;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                            PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
 
        bnx2x_cl45_read(bp, params->port,
@@ -3193,12 +3374,9 @@ static void bnx2x_bcm8073_set_xaui_low_power_mode(struct link_params *params)
 static void bnx2x_8073_set_pause_cl37(struct link_params *params,
                                  struct link_vars *vars)
 {
-
        struct bnx2x *bp = params->bp;
        u16 cl37_val;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
 
        bnx2x_cl45_read(bp, params->port,
@@ -3241,9 +3419,7 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params,
 {
        struct bnx2x *bp = params->bp;
        u16 val;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
 
        /* read modify write pause advertizing */
@@ -3356,8 +3532,8 @@ static void bnx2x_8481_set_10G_led_mode(struct link_params *params,
                       MDIO_PMA_REG_8481_LINK_SIGNAL,
                       &val1);
        /* Set bit 2 to 0, and bits [1:0] to 10 */
-       val1 &= ~((1<<0) | (1<<2)); /* Clear bits 0,2*/
-       val1 |= (1<<1); /* Set bit 1 */
+       val1 &= ~((1<<0) | (1<<2) | (1<<7)); /* Clear bits 0,2,7*/
+       val1 |= ((1<<1) | (1<<6)); /* Set bit 1, 6 */
 
        bnx2x_cl45_write(bp, params->port,
                       ext_phy_type,
@@ -3391,43 +3567,28 @@ static void bnx2x_8481_set_10G_led_mode(struct link_params *params,
                       MDIO_PMA_REG_8481_LED2_MASK,
                       0);
 
-       /* LED3 (10G/1G/100/10G Activity) */
-       bnx2x_cl45_read(bp, params->port,
-                     ext_phy_type,
-                     ext_phy_addr,
-                     MDIO_PMA_DEVAD,
-                     MDIO_PMA_REG_8481_LINK_SIGNAL,
-                     &val1);
-       /* Enable blink based on source 4(Activity) */
-       val1 &= ~((1<<7) | (1<<8)); /* Clear bits 7,8 */
-       val1 |= (1<<6); /* Set only bit 6 */
+       /* Unmask LED3 for 10G link */
        bnx2x_cl45_write(bp, params->port,
                       ext_phy_type,
                       ext_phy_addr,
                       MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_8481_LINK_SIGNAL,
-                      val1);
-
-       bnx2x_cl45_read(bp, params->port,
-                     ext_phy_type,
-                     ext_phy_addr,
-                     MDIO_PMA_DEVAD,
                      MDIO_PMA_REG_8481_LED3_MASK,
-                     &val1);
-       val1 |= (1<<4); /* Unmask LED3 for 10G link */
+                      0x6);
        bnx2x_cl45_write(bp, params->port,
                       ext_phy_type,
                       ext_phy_addr,
                       MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_8481_LED3_MASK,
-                      val1);
+                      MDIO_PMA_REG_8481_LED3_BLINK,
+                      0);
 }
 
 
 static void bnx2x_init_internal_phy(struct link_params *params,
-                               struct link_vars *vars)
+                                 struct link_vars *vars,
+                                 u8 enable_cl73)
 {
        struct bnx2x *bp = params->bp;
+
        if (!(vars->phy_flags & PHY_SGMII_FLAG)) {
                if ((XGXS_EXT_PHY_TYPE(params->ext_phy_config) ==
                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &&
@@ -3436,11 +3597,14 @@ static void bnx2x_init_internal_phy(struct link_params *params,
                        bnx2x_set_preemphasis(params);
 
                /* forced speed requested? */
-               if (vars->line_speed != SPEED_AUTO_NEG) {
+               if (vars->line_speed != SPEED_AUTO_NEG ||
+                   ((XGXS_EXT_PHY_TYPE(params->ext_phy_config) ==
+                    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &&
+                         params->loopback_mode == LOOPBACK_EXT)) {
                        DP(NETIF_MSG_LINK, "not SGMII, no AN\n");
 
                        /* disable autoneg */
-                       bnx2x_set_autoneg(params, vars);
+                       bnx2x_set_autoneg(params, vars, 0);
 
                        /* program speed and duplex */
                        bnx2x_program_serdes(params, vars);
@@ -3456,10 +3620,10 @@ static void bnx2x_init_internal_phy(struct link_params *params,
                                                       vars->ieee_fc);
 
                        /* enable autoneg */
-                       bnx2x_set_autoneg(params, vars);
+                       bnx2x_set_autoneg(params, vars, enable_cl73);
 
                        /* enable and restart AN */
-                       bnx2x_restart_autoneg(params);
+                       bnx2x_restart_autoneg(params, enable_cl73);
                }
 
        } else { /* SGMII mode */
@@ -3478,10 +3642,9 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
        u16 ctrl = 0;
        u16 val = 0;
        u8 rc = 0;
+
        if (vars->phy_flags & PHY_XGXS_FLAG) {
-               ext_phy_addr = ((params->ext_phy_config &
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+               ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
 
                ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
                /* Make sure that the soft reset is off (expect for the 8072:
@@ -3586,19 +3749,6 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                }
                        }
                        /* Force speed */
-                       /* First enable LASI */
-                       bnx2x_cl45_write(bp, params->port,
-                                      ext_phy_type,
-                                      ext_phy_addr,
-                                      MDIO_PMA_DEVAD,
-                                      MDIO_PMA_REG_RX_ALARM_CTRL,
-                                      0x0400);
-                       bnx2x_cl45_write(bp, params->port,
-                                      ext_phy_type,
-                                      ext_phy_addr,
-                                      MDIO_PMA_DEVAD,
-                                      MDIO_PMA_REG_LASI_CTRL, 0x0004);
-
                        if (params->req_line_speed == SPEED_10000) {
                                DP(NETIF_MSG_LINK, "XGXS 8706 force 10Gbps\n");
 
@@ -3608,6 +3758,9 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                               MDIO_PMA_DEVAD,
                                               MDIO_PMA_REG_DIGITAL_CTRL,
                                               0x400);
+                               bnx2x_cl45_write(bp, params->port, ext_phy_type,
+                                              ext_phy_addr, MDIO_PMA_DEVAD,
+                                              MDIO_PMA_REG_LASI_CTRL, 1);
                        } else {
                                /* Force 1Gbps using autoneg with 1G
                                advertisment */
@@ -3649,6 +3802,17 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                               MDIO_AN_DEVAD,
                                               MDIO_AN_REG_CTRL,
                                               0x1200);
+                               bnx2x_cl45_write(bp, params->port,
+                                              ext_phy_type,
+                                              ext_phy_addr,
+                                              MDIO_PMA_DEVAD,
+                                              MDIO_PMA_REG_RX_ALARM_CTRL,
+                                              0x0400);
+                               bnx2x_cl45_write(bp, params->port,
+                                              ext_phy_type,
+                                              ext_phy_addr,
+                                              MDIO_PMA_DEVAD,
+                                              MDIO_PMA_REG_LASI_CTRL, 0x0004);
 
                        }
                        bnx2x_save_bcm_spirom_ver(bp, params->port,
@@ -3688,7 +3852,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                    SPEED_AUTO_NEG) &&
                                   ((params->speed_cap_mask &
                                     PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))) {
-                               DP(NETIF_MSG_LINK, "Setting 1G clause37 \n");
+                               DP(NETIF_MSG_LINK, "Setting 1G clause37\n");
                                bnx2x_cl45_write(bp, params->port, ext_phy_type,
                                               ext_phy_addr, MDIO_AN_DEVAD,
                                               MDIO_AN_REG_ADV, 0x20);
@@ -3776,14 +3940,12 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                        bnx2x_8073_set_pause_cl37(params, vars);
 
                        if (ext_phy_type ==
-                           PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072){
+                           PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072)
                                bnx2x_bcm8072_external_rom_boot(params);
-                       } else {
-
+                       else
                                /* In case of 8073 with long xaui lines,
                                don't set the 8073 xaui low power*/
                                bnx2x_bcm8073_set_xaui_low_power_mode(params);
-                       }
 
                        bnx2x_cl45_read(bp, params->port,
                                      ext_phy_type,
@@ -3848,10 +4010,8 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                       ext_phy_addr,
                                       MDIO_AN_DEVAD,
                                       MDIO_AN_REG_ADV, val);
-
                        if (ext_phy_type ==
                            PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073) {
-
                                bnx2x_cl45_read(bp, params->port,
                                              ext_phy_type,
                                              ext_phy_addr,
@@ -4074,14 +4234,14 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                      ext_phy_addr,
                                      MDIO_PMA_DEVAD,
                                      MDIO_PMA_REG_10G_CTRL2, &tmp1);
-                               DP(NETIF_MSG_LINK, "1.7 = 0x%x \n", tmp1);
+                               DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1);
 
                        } else if ((params->req_line_speed ==
                                    SPEED_AUTO_NEG) &&
                                   ((params->speed_cap_mask &
                                     PORT_HW_CFG_SPEED_CAPABILITY_D0_1G))) {
 
-                               DP(NETIF_MSG_LINK, "Setting 1G clause37 \n");
+                               DP(NETIF_MSG_LINK, "Setting 1G clause37\n");
                                bnx2x_cl45_write(bp, params->port, ext_phy_type,
                                               ext_phy_addr, MDIO_AN_DEVAD,
                                               MDIO_PMA_REG_8727_MISC_CTRL, 0);
@@ -4185,10 +4345,10 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                        bnx2x_save_spirom_version(params->bp, params->port,
                                                params->shmem_base,
                                                (u32)(fw_ver1<<16 | fw_ver2));
-
                        break;
                }
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481:
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
                        /* This phy uses the NIG latch mechanism since link
                                indication arrives through its LED4 and not via
                                its LASI signal, so we get steady signal
@@ -4196,6 +4356,12 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                        bnx2x_bits_en(bp, NIG_REG_LATCH_BC_0 + params->port*4,
                                    1 << NIG_LATCH_BC_ENABLE_MI_INT);
 
+                       bnx2x_cl45_write(bp, params->port,
+                                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481,
+                                      ext_phy_addr,
+                                      MDIO_PMA_DEVAD,
+                                      MDIO_PMA_REG_CTRL, 0x0000);
+
                        bnx2x_8481_set_led4(params, ext_phy_type, ext_phy_addr);
                        if (params->req_line_speed == SPEED_AUTO_NEG) {
 
@@ -4292,17 +4458,12 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
                                    PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) {
                                        DP(NETIF_MSG_LINK, "Advertising 10G\n");
                                        /* Restart autoneg for 10G*/
-                       bnx2x_cl45_read(bp, params->port,
-                                     ext_phy_type,
-                                     ext_phy_addr,
-                                     MDIO_AN_DEVAD,
-                                     MDIO_AN_REG_CTRL, &val);
-                       val |= 0x200;
+
                        bnx2x_cl45_write(bp, params->port,
                                       ext_phy_type,
                                       ext_phy_addr,
                                       MDIO_AN_DEVAD,
-                                      MDIO_AN_REG_CTRL, val);
+                                      MDIO_AN_REG_CTRL, 0x3200);
                                }
                        } else {
                                /* Force speed */
@@ -4417,9 +4578,7 @@ static void bnx2x_8727_handle_mod_abs(struct link_params *params)
 {
        struct bnx2x *bp = params->bp;
        u16 mod_abs, rx_alarm_status;
-       u8 ext_phy_addr = ((params->ext_phy_config &
-                           PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                          PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+       u8 ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
        u32 val = REG_RD(bp, params->shmem_base +
                             offsetof(struct shmem_region, dev_info.
                                      port_feature_config[params->port].
@@ -4518,11 +4677,9 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
        u16 rx_sd, pcs_status;
        u8 ext_phy_link_up = 0;
        u8 port = params->port;
-       if (vars->phy_flags & PHY_XGXS_FLAG) {
-               ext_phy_addr = ((params->ext_phy_config &
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                               PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
 
+       if (vars->phy_flags & PHY_XGXS_FLAG) {
+               ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
                ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
                switch (ext_phy_type) {
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
@@ -4559,8 +4716,8 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                                      0xc809, &val1);
 
                        DP(NETIF_MSG_LINK, "8705 1.c809 val=0x%x\n", val1);
-                       ext_phy_link_up = ((rx_sd & 0x1) && (val1 & (1<<9))
-                                          && ((val1 & (1<<8)) == 0));
+                       ext_phy_link_up = ((rx_sd & 0x1) && (val1 & (1<<9)) &&
+                                          ((val1 & (1<<8)) == 0));
                        if (ext_phy_link_up)
                                vars->line_speed = SPEED_10000;
                        break;
@@ -4629,7 +4786,6 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                                                break;
                                        }
                                }
-
                                if (val2 & (1<<1))
                                        vars->line_speed = SPEED_1000;
                                else
@@ -4686,18 +4842,11 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
 
                                if ((val1 & (1<<8)) == 0) {
                                        DP(NETIF_MSG_LINK, "8727 Power fault"
-                                                " has been detected on port"
-                                                " %d\n", params->port);
-                                       printk(KERN_ERR PFX  "Error:  Power"
-                                                " fault on %s Port %d has"
-                                                " been detected and the"
-                                                " power to that SFP+ module"
-                                                " has been removed to prevent"
-                                                " failure of the card. Please"
-                                                " remove the SFP+ module and"
-                                                " restart the system to clear"
-                                                " this error.\n"
-                       , bp->dev->name, params->port);
+                                                    " has been detected on "
+                                                    "port %d\n",
+                                                params->port);
+                                       netdev_err(bp->dev, "Error:  Power fault on Port %d has been detected and the power to that SFP+ module has been removed to prevent failure of the card. Please remove the SFP+ module and restart the system to clear this error.\n",
+                                                  params->port);
                                        /*
                                         * Disable all RX_ALARMs except for
                                         * mod_abs
@@ -4794,6 +4943,7 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                {
                        u16 link_status = 0;
                        u16 an1000_status = 0;
+
                        if (ext_phy_type ==
                             PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072) {
                                bnx2x_cl45_read(bp, params->port,
@@ -4809,7 +4959,6 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                        DP(NETIF_MSG_LINK,
                                 "870x LASI status 0x%x->0x%x\n",
                                  val1, val2);
-
                        } else {
                                /* In 8073, port1 is directed through emac0 and
                                 * port0 is directed through emac1
@@ -4939,8 +5088,6 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                                                    MDIO_PMA_DEVAD,
                                                    MDIO_PMA_REG_CDR_BANDWIDTH,
                                                    0x0333);
-
-
                                }
                                bnx2x_cl45_read(bp, params->port,
                                           ext_phy_type,
@@ -5052,6 +5199,7 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                        }
                        break;
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481:
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
                        /* Check 10G-BaseT link status */
                        /* Check PMD signal ok */
                        bnx2x_cl45_read(bp, params->port, ext_phy_type,
@@ -5125,7 +5273,6 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                                                                 ext_phy_addr);
                                }
                        }
-
                        break;
                default:
                        DP(NETIF_MSG_LINK, "BAD XGXS ext_phy_config 0x%x\n",
@@ -5133,6 +5280,13 @@ static u8 bnx2x_ext_phy_is_link_up(struct link_params *params,
                        ext_phy_link_up = 0;
                        break;
                }
+               /* Set SGMII mode for external phy */
+               if (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) {
+                       if (vars->line_speed < SPEED_1000)
+                               vars->phy_flags |= PHY_SGMII_FLAG;
+                       else
+                               vars->phy_flags &= ~PHY_SGMII_FLAG;
+               }
 
        } else { /* SerDes */
                ext_phy_type = SERDES_EXT_PHY_TYPE(params->ext_phy_config);
@@ -5165,6 +5319,7 @@ static void bnx2x_link_int_enable(struct link_params *params)
        u32 ext_phy_type;
        u32 mask;
        struct bnx2x *bp = params->bp;
+
        /* setting the status to report on link up
           for either XGXS or SerDes */
 
@@ -5196,10 +5351,10 @@ static void bnx2x_link_int_enable(struct link_params *params)
        bnx2x_bits_en(bp,
                      NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
                      mask);
-       DP(NETIF_MSG_LINK, "port %x, is_xgxs=%x, int_status 0x%x\n", port,
+
+       DP(NETIF_MSG_LINK, "port %x, is_xgxs %x, int_status 0x%x\n", port,
                 (params->switch_cfg == SWITCH_CFG_10G),
                 REG_RD(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4));
-
        DP(NETIF_MSG_LINK, " int_mask 0x%x, MI_INT %x, SERDES_LINK %x\n",
                 REG_RD(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4),
                 REG_RD(bp, NIG_REG_EMAC0_STATUS_MISC_MI_INT + port*0x18),
@@ -5260,8 +5415,10 @@ static void bnx2x_link_int_ack(struct link_params *params,
                     (NIG_STATUS_XGXS0_LINK10G |
                      NIG_STATUS_XGXS0_LINK_STATUS |
                      NIG_STATUS_SERDES0_LINK_STATUS));
-       if (XGXS_EXT_PHY_TYPE(params->ext_phy_config)
-           == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481) {
+       if ((XGXS_EXT_PHY_TYPE(params->ext_phy_config)
+               == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481) ||
+       (XGXS_EXT_PHY_TYPE(params->ext_phy_config)
+               == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823)) {
                bnx2x_8481_rearm_latch_signal(bp, port, is_mi_int);
        }
        if (vars->phy_link_up) {
@@ -5334,59 +5491,6 @@ static u8 bnx2x_format_ver(u32 num, u8 *str, u16 len)
        return 0;
 }
 
-
-static void bnx2x_turn_on_ef(struct bnx2x *bp, u8 port, u8 ext_phy_addr,
-                          u32 ext_phy_type)
-{
-       u32 cnt = 0;
-       u16 ctrl = 0;
-       /* Enable EMAC0 in to enable MDIO */
-       REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-              (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
-       msleep(5);
-
-       /* take ext phy out of reset */
-       bnx2x_set_gpio(bp,
-                         MISC_REGISTERS_GPIO_2,
-                         MISC_REGISTERS_GPIO_HIGH,
-                         port);
-
-       bnx2x_set_gpio(bp,
-                         MISC_REGISTERS_GPIO_1,
-                         MISC_REGISTERS_GPIO_HIGH,
-                         port);
-
-       /* wait for 5ms */
-       msleep(5);
-
-       for (cnt = 0; cnt < 1000; cnt++) {
-               msleep(1);
-               bnx2x_cl45_read(bp, port,
-                             ext_phy_type,
-                             ext_phy_addr,
-                             MDIO_PMA_DEVAD,
-                             MDIO_PMA_REG_CTRL,
-                             &ctrl);
-               if (!(ctrl & (1<<15))) {
-                       DP(NETIF_MSG_LINK, "Reset completed\n\n");
-                               break;
-               }
-       }
-}
-
-static void bnx2x_turn_off_sf(struct bnx2x *bp, u8 port)
-{
-       /* put sf to reset */
-       bnx2x_set_gpio(bp,
-                         MISC_REGISTERS_GPIO_1,
-                         MISC_REGISTERS_GPIO_LOW,
-                         port);
-       bnx2x_set_gpio(bp,
-                         MISC_REGISTERS_GPIO_2,
-                         MISC_REGISTERS_GPIO_LOW,
-                         port);
-}
-
 u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,
                              u8 *version, u16 len)
 {
@@ -5427,6 +5531,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,
                status = bnx2x_format_ver(spirom_ver, version, len);
                break;
        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481:
+       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
                spirom_ver = ((spirom_ver & 0xF80) >> 7) << 16 |
                        (spirom_ver & 0x7F);
                status = bnx2x_format_ver(spirom_ver, version, len);
@@ -5516,10 +5621,8 @@ static void bnx2x_ext_phy_loopback(struct link_params *params)
 
        if (params->switch_cfg == SWITCH_CFG_10G) {
                ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
+               ext_phy_addr = XGXS_EXT_PHY_ADDR(params->ext_phy_config);
                /* CL37 Autoneg Enabled */
-               ext_phy_addr = ((params->ext_phy_config &
-                                       PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                                       PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
                switch (ext_phy_type) {
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN:
@@ -5680,12 +5783,15 @@ u8 bnx2x_override_led_value(struct bnx2x *bp, u8 port,
 }
 
 
-u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,
-              u16 hw_led_mode, u32 chip_id)
+u8 bnx2x_set_led(struct link_params *params, u8 mode, u32 speed)
 {
+       u8 port = params->port;
+       u16 hw_led_mode = params->hw_led_mode;
        u8 rc = 0;
        u32 tmp;
        u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;
+       u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
+       struct bnx2x *bp = params->bp;
        DP(NETIF_MSG_LINK, "bnx2x_set_led: port %x, mode %d\n", port, mode);
        DP(NETIF_MSG_LINK, "speed 0x%x, hw_led_mode 0x%x\n",
                 speed, hw_led_mode);
@@ -5700,7 +5806,14 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,
                break;
 
        case LED_MODE_OPER:
-               REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, hw_led_mode);
+               if (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) {
+                       REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
+                       REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
+               } else {
+                       REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
+                                  hw_led_mode);
+               }
+
                REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 +
                           port*4, 0);
                /* Set blinking rate to ~15.9Hz */
@@ -5712,7 +5825,7 @@ u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,
                EMAC_WR(bp, EMAC_REG_EMAC_LED,
                            (tmp & (~EMAC_LED_OVERRIDE)));
 
-               if (!CHIP_IS_E1H(bp) &&
+               if (CHIP_IS_E1(bp) &&
                    ((speed == SPEED_2500) ||
                     (speed == SPEED_1000) ||
                     (speed == SPEED_100) ||
@@ -5764,6 +5877,7 @@ static u8 bnx2x_link_initialize(struct link_params *params,
        u8 rc = 0;
        u8 non_ext_phy;
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(params->ext_phy_config);
+
        /* Activate the external PHY */
        bnx2x_ext_phy_reset(params, vars);
 
@@ -5814,12 +5928,12 @@ static u8 bnx2x_link_initialize(struct link_params *params,
 
        if (non_ext_phy ||
            (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705) ||
+           (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706) ||
            (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726) ||
-           (ext_phy_type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481) ||
            (params->loopback_mode == LOOPBACK_EXT_PHY)) {
                if (params->req_line_speed == SPEED_AUTO_NEG)
                        bnx2x_set_parallel_detection(params, vars->phy_flags);
-               bnx2x_init_internal_phy(params, vars);
+               bnx2x_init_internal_phy(params, vars, non_ext_phy);
        }
 
        if (!non_ext_phy)
@@ -5838,11 +5952,11 @@ static u8 bnx2x_link_initialize(struct link_params *params,
 u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
 {
        struct bnx2x *bp = params->bp;
-
        u32 val;
-       DP(NETIF_MSG_LINK, "Phy Initialization started \n");
-       DP(NETIF_MSG_LINK, "req_speed = %d, req_flowctrl=%d\n",
-                 params->req_line_speed, params->req_flow_ctrl);
+
+       DP(NETIF_MSG_LINK, "Phy Initialization started\n");
+       DP(NETIF_MSG_LINK, "req_speed %d, req_flowctrl %d\n",
+                params->req_line_speed, params->req_flow_ctrl);
        vars->link_status = 0;
        vars->phy_link_up = 0;
        vars->link_up = 0;
@@ -5856,7 +5970,6 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
        else
                vars->phy_flags = PHY_XGXS_FLAG;
 
-
        /* disable attentions */
        bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + params->port*4,
                       (NIG_MASK_XGXS0_LINK_STATUS |
@@ -5867,6 +5980,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
        bnx2x_emac_init(params, vars);
 
        if (CHIP_REV_IS_FPGA(bp)) {
+
                vars->link_up = 1;
                vars->line_speed = SPEED_10000;
                vars->duplex = DUPLEX_FULL;
@@ -5875,7 +5989,8 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                /* enable on E1.5 FPGA */
                if (CHIP_IS_E1H(bp)) {
                        vars->flow_ctrl |=
-                               (BNX2X_FLOW_CTRL_TX | BNX2X_FLOW_CTRL_RX);
+                                       (BNX2X_FLOW_CTRL_TX |
+                                        BNX2X_FLOW_CTRL_RX);
                        vars->link_status |=
                                        (LINK_STATUS_TX_FLOW_CONTROL_ENABLED |
                                         LINK_STATUS_RX_FLOW_CONTROL_ENABLED);
@@ -5884,8 +5999,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                bnx2x_emac_enable(params, vars, 0);
                bnx2x_pbf_update(params, vars->flow_ctrl, vars->line_speed);
                /* disable drain */
-               REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE
-                                   + params->port*4, 0);
+               REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
 
                /* update shared memory */
                bnx2x_update_mng(params, vars->link_status);
@@ -5915,6 +6029,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
 
        } else
        if (params->loopback_mode == LOOPBACK_BMAC) {
+
                vars->link_up = 1;
                vars->line_speed = SPEED_10000;
                vars->duplex = DUPLEX_FULL;
@@ -5929,7 +6044,9 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
 
                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
                    params->port*4, 0);
+
        } else if (params->loopback_mode == LOOPBACK_EMAC) {
+
                vars->link_up = 1;
                vars->line_speed = SPEED_1000;
                vars->duplex = DUPLEX_FULL;
@@ -5945,8 +6062,10 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                                              vars->duplex);
                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
                    params->port*4, 0);
+
        } else if ((params->loopback_mode == LOOPBACK_XGXS_10) ||
-                 (params->loopback_mode == LOOPBACK_EXT_PHY)) {
+                  (params->loopback_mode == LOOPBACK_EXT_PHY)) {
+
                vars->link_up = 1;
                vars->line_speed = SPEED_10000;
                vars->duplex = DUPLEX_FULL;
@@ -5976,14 +6095,10 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
                            params->port*4, 0);
 
-               bnx2x_set_led(bp, params->port, LED_MODE_OPER,
-                           vars->line_speed, params->hw_led_mode,
-                           params->chip_id);
-
+               bnx2x_set_led(params, LED_MODE_OPER, vars->line_speed);
        } else
        /* No loopback */
        {
-
                bnx2x_phy_deassert(params, vars->phy_flags);
                switch (params->switch_cfg) {
                case SWITCH_CFG_1G:
@@ -5991,8 +6106,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                        if ((params->ext_phy_config &
                             PORT_HW_CFG_SERDES_EXT_PHY_TYPE_MASK) ==
                             PORT_HW_CFG_SERDES_EXT_PHY_TYPE_BCM5482) {
-                               vars->phy_flags |=
-                                       PHY_SGMII_FLAG;
+                               vars->phy_flags |= PHY_SGMII_FLAG;
                        }
 
                        val = REG_RD(bp,
@@ -6013,7 +6127,6 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                default:
                        DP(NETIF_MSG_LINK, "Invalid switch_cfg\n");
                        return -EINVAL;
-                       break;
                }
                DP(NETIF_MSG_LINK, "Phy address = 0x%x\n", params->phy_addr);
 
@@ -6038,20 +6151,16 @@ static void bnx2x_8726_reset_phy(struct bnx2x *bp, u8 port, u8 ext_phy_addr)
 u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
                  u8 reset_ext_phy)
 {
-
        struct bnx2x *bp = params->bp;
        u32 ext_phy_config = params->ext_phy_config;
-       u16 hw_led_mode = params->hw_led_mode;
-       u32 chip_id = params->chip_id;
        u8 port = params->port;
        u32 ext_phy_type = XGXS_EXT_PHY_TYPE(ext_phy_config);
        u32 val = REG_RD(bp, params->shmem_base +
                             offsetof(struct shmem_region, dev_info.
                                      port_feature_config[params->port].
                                      config));
-
+       DP(NETIF_MSG_LINK, "Resetting the link of port %d\n", port);
        /* disable attentions */
-
        vars->link_status = 0;
        bnx2x_update_mng(params, vars->link_status);
        bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
@@ -6078,7 +6187,7 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
         * Hold it as vars low
         */
         /* clear link led */
-       bnx2x_set_led(bp, port, LED_MODE_OFF, 0, hw_led_mode, chip_id);
+       bnx2x_set_led(params, LED_MODE_OFF, 0);
        if (reset_ext_phy) {
                switch (ext_phy_type) {
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
@@ -6089,9 +6198,8 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
                {
 
                        /* Disable Transmitter */
-                       u8 ext_phy_addr = ((params->ext_phy_config &
-                                   PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                                  PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+                       u8 ext_phy_addr =
+                               XGXS_EXT_PHY_ADDR(params->ext_phy_config);
                        if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) ==
                            PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_DISABLE_TX_LASER)
                                bnx2x_sfp_set_transmitter(bp, port,
@@ -6109,13 +6217,28 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
                        break;
                case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
                {
-                       u8 ext_phy_addr = ((params->ext_phy_config &
-                                        PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                                        PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+                       u8 ext_phy_addr =
+                               XGXS_EXT_PHY_ADDR(params->ext_phy_config);
                        /* Set soft reset */
                        bnx2x_8726_reset_phy(bp, params->port, ext_phy_addr);
                        break;
                }
+               case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
+               {
+                       u8 ext_phy_addr =
+                               XGXS_EXT_PHY_ADDR(params->ext_phy_config);
+                       bnx2x_cl45_write(bp, port,
+                                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481,
+                                      ext_phy_addr,
+                                      MDIO_AN_DEVAD,
+                                      MDIO_AN_REG_CTRL, 0x0000);
+                       bnx2x_cl45_write(bp, port,
+                                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481,
+                                      ext_phy_addr,
+                                      MDIO_PMA_DEVAD,
+                                      MDIO_PMA_REG_CTRL, 1);
+                       break;
+               }
                default:
                        /* HW reset */
                        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
@@ -6149,10 +6272,9 @@ static u8 bnx2x_update_link_down(struct link_params *params,
 {
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
+
        DP(NETIF_MSG_LINK, "Port %x: Link is down\n", port);
-       bnx2x_set_led(bp, port, LED_MODE_OFF,
-                   0, params->hw_led_mode,
-                   params->chip_id);
+       bnx2x_set_led(params, LED_MODE_OFF, 0);
 
        /* indicate no mac active */
        vars->mac_type = MAC_TYPE_NONE;
@@ -6185,18 +6307,17 @@ static u8 bnx2x_update_link_up(struct link_params *params,
        struct bnx2x *bp = params->bp;
        u8 port = params->port;
        u8 rc = 0;
+
        vars->link_status |= LINK_STATUS_LINK_UP;
        if (link_10g) {
                bnx2x_bmac_enable(params, vars, 0);
-               bnx2x_set_led(bp, port, LED_MODE_OPER,
-                           SPEED_10000, params->hw_led_mode,
-                           params->chip_id);
-
+               bnx2x_set_led(params, LED_MODE_OPER, SPEED_10000);
        } else {
-               bnx2x_emac_enable(params, vars, 0);
                rc = bnx2x_emac_program(params, vars->line_speed,
                                      vars->duplex);
 
+               bnx2x_emac_enable(params, vars, 0);
+
                /* AN complete? */
                if (gp_status & MDIO_AN_CL73_OR_37_COMPLETE) {
                        if (!(vars->phy_flags &
@@ -6294,9 +6415,10 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
 
        if ((ext_phy_type != PORT_HW_CFG_SERDES_EXT_PHY_TYPE_DIRECT) &&
            (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705) &&
+           (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706) &&
            (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726) &&
            (ext_phy_link_up && !vars->phy_link_up))
-               bnx2x_init_internal_phy(params, vars);
+               bnx2x_init_internal_phy(params, vars, 0);
 
        /* link is up only if both local phy and external phy are up */
        vars->link_up = (ext_phy_link_up && vars->phy_link_up);
@@ -6329,10 +6451,7 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp, u32 shmem_base)
                              NIG_MASK_SERDES0_LINK_STATUS |
                              NIG_MASK_MI_INT));
 
-               ext_phy_addr[port] =
-                       ((ext_phy_config &
-                             PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                             PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+               ext_phy_addr[port] = XGXS_EXT_PHY_ADDR(ext_phy_config);
 
                /* Need to take the phy out of low power mode in order
                        to write to access its registers */
@@ -6436,7 +6555,7 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp, u32 shmem_base)
        swap_val = REG_RD(bp,  NIG_REG_PORT_SWAP);
        swap_override = REG_RD(bp,  NIG_REG_STRAP_OVERRIDE);
 
-       bnx2x_hw_reset(bp, 1 ^ (swap_val && swap_override));
+       bnx2x_ext_phy_hw_reset(bp, 1 ^ (swap_val && swap_override));
        msleep(5);
 
        if (swap_val && swap_override)
@@ -6458,9 +6577,7 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp, u32 shmem_base)
                              NIG_MASK_SERDES0_LINK_STATUS |
                              NIG_MASK_MI_INT));
 
-               ext_phy_addr[port] = ((ext_phy_config &
-                                       PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                                       PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+               ext_phy_addr[port] = XGXS_EXT_PHY_ADDR(ext_phy_config);
 
                /* Reset the phy */
                bnx2x_cl45_write(bp, port,
@@ -6503,6 +6620,7 @@ static u8 bnx2x_8726_common_init_phy(struct bnx2x *bp, u32 shmem_base)
        u8 ext_phy_addr;
        u32 val;
        s8 port;
+
        /* Use port1 because of the static port-swap */
        /* Enable the module detection interrupt */
        val = REG_RD(bp, MISC_REG_GPIO_EVENT_EN);
@@ -6510,7 +6628,7 @@ static u8 bnx2x_8726_common_init_phy(struct bnx2x *bp, u32 shmem_base)
                (1<<(MISC_REGISTERS_GPIO_3 + MISC_REGISTERS_GPIO_PORT_SHIFT)));
        REG_WR(bp, MISC_REG_GPIO_EVENT_EN, val);
 
-       bnx2x_hw_reset(bp, 1);
+       bnx2x_ext_phy_hw_reset(bp, 1);
        msleep(5);
        for (port = 0; port < PORT_MAX; port++) {
                /* Extract the ext phy address for the port */
@@ -6518,10 +6636,7 @@ static u8 bnx2x_8726_common_init_phy(struct bnx2x *bp, u32 shmem_base)
                                        offsetof(struct shmem_region,
                        dev_info.port_hw_config[port].external_phy_config));
 
-               ext_phy_addr =
-                       ((ext_phy_config &
-                             PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >>
-                             PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT);
+               ext_phy_addr = XGXS_EXT_PHY_ADDR(ext_phy_config);
                DP(NETIF_MSG_LINK, "8726_common_init : ext_phy_addr = 0x%x\n",
                         ext_phy_addr);
 
@@ -6536,6 +6651,13 @@ static u8 bnx2x_8726_common_init_phy(struct bnx2x *bp, u32 shmem_base)
        return 0;
 }
 
+
+static u8 bnx2x_84823_common_init_phy(struct bnx2x *bp, u32 shmem_base)
+{
+       /* HW reset */
+       bnx2x_ext_phy_hw_reset(bp, 1);
+       return 0;
+}
 u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base)
 {
        u8 rc = 0;
@@ -6565,7 +6687,9 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base)
                /* GPIO1 affects both ports, so there's need to pull
                it for single port alone */
                rc = bnx2x_8726_common_init_phy(bp, shmem_base);
-
+               break;
+       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
+               rc = bnx2x_84823_common_init_phy(bp, shmem_base);
                break;
        default:
                DP(NETIF_MSG_LINK,
@@ -6577,9 +6701,7 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base)
        return rc;
 }
 
-
-
-static void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr)
+void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr)
 {
        u16 val, cnt;
 
@@ -6609,377 +6731,3 @@ static void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr)
                        break;
        }
 }
-#define RESERVED_SIZE 256
-/* max application is 160K bytes - data at end of RAM */
-#define MAX_APP_SIZE (160*1024 - RESERVED_SIZE)
-
-/* Header is 14 bytes */
-#define HEADER_SIZE 14
-#define DATA_OFFSET HEADER_SIZE
-
-#define SPI_START_TRANSFER(bp, port, ext_phy_addr) \
-       bnx2x_cl45_write(bp, port, PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101, \
-                       ext_phy_addr, \
-                       MDIO_PCS_DEVAD, \
-                       MDIO_PCS_REG_7101_SPI_CTRL_ADDR, 1)
-
-/* Programs an image to DSP's flash via the SPI port*/
-static u8 bnx2x_sfx7101_flash_download(struct bnx2x *bp, u8 port,
-                                    u8 ext_phy_addr,
-                                    char data[], u32 size)
-{
-       const u16 num_trans = size/4; /* 4 bytes can be sent at a time */
-       /* Doesn't include last trans!*/
-       const u16 last_trans_size = size%4; /* Num bytes on last trans */
-       u16 trans_cnt, byte_cnt;
-       u32 data_index;
-       u16 tmp;
-       u16 code_started = 0;
-       u16 image_revision1, image_revision2;
-       u16 cnt;
-
-       DP(NETIF_MSG_LINK, "bnx2x_sfx7101_flash_download file_size=%d\n", size);
-       /* Going to flash*/
-       if ((size-HEADER_SIZE) > MAX_APP_SIZE) {
-               /* This very often will be the case, because the image is built
-               with 160Kbytes size whereas the total image size must actually
-               be 160Kbytes-RESERVED_SIZE */
-               DP(NETIF_MSG_LINK, "Warning, file size was %d bytes "
-                        "truncated to %d bytes\n", size, MAX_APP_SIZE);
-               size = MAX_APP_SIZE+HEADER_SIZE;
-       }
-       DP(NETIF_MSG_LINK, "File version is %c%c\n", data[0x14e], data[0x14f]);
-       DP(NETIF_MSG_LINK, "          %c%c\n", data[0x150], data[0x151]);
-       /* Put the DSP in download mode by setting FLASH_CFG[2] to 1
-          and issuing a reset.*/
-
-       bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                         MISC_REGISTERS_GPIO_HIGH, port);
-
-       bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr);
-
-       /* wait 0.5 sec */
-       for (cnt = 0; cnt < 100; cnt++)
-               msleep(5);
-
-       /* Make sure we can access the DSP
-          And it's in the correct mode (waiting for download) */
-
-       bnx2x_cl45_read(bp, port,
-                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                     ext_phy_addr,
-                     MDIO_PCS_DEVAD,
-                     MDIO_PCS_REG_7101_DSP_ACCESS, &tmp);
-
-       if (tmp != 0x000A) {
-               DP(NETIF_MSG_LINK, "DSP is not in waiting on download mode. "
-                        "Expected 0x000A, read 0x%04X\n", tmp);
-               DP(NETIF_MSG_LINK, "Download failed\n");
-               return -EINVAL;
-       }
-
-       /* Mux the SPI interface away from the internal processor */
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_MUX, 1);
-
-       /* Reset the SPI port */
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_CTRL_ADDR, 0);
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_CTRL_ADDR,
-                      (1<<MDIO_PCS_REG_7101_SPI_RESET_BIT));
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_CTRL_ADDR, 0);
-
-       /* Erase the flash */
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                      MDIO_PCS_REG_7101_SPI_FIFO_ADDR_WRITE_ENABLE_CMD);
-
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_BYTES_TO_TRANSFER_ADDR,
-                      1);
-
-       SPI_START_TRANSFER(bp, port, ext_phy_addr);
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                      MDIO_PCS_REG_7101_SPI_FIFO_ADDR_BULK_ERASE_CMD);
-
-       bnx2x_cl45_write(bp, port,
-                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                      ext_phy_addr,
-                      MDIO_PCS_DEVAD,
-                      MDIO_PCS_REG_7101_SPI_BYTES_TO_TRANSFER_ADDR,
-                      1);
-       SPI_START_TRANSFER(bp, port, ext_phy_addr);
-
-       /* Wait 10 seconds, the maximum time for the erase to complete */
-       DP(NETIF_MSG_LINK, "Erasing flash, this takes 10 seconds...\n");
-       for (cnt = 0; cnt < 1000; cnt++)
-               msleep(10);
-
-       DP(NETIF_MSG_LINK, "Downloading flash, please wait...\n");
-       data_index = 0;
-       for (trans_cnt = 0; trans_cnt < num_trans; trans_cnt++) {
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                            ext_phy_addr,
-                            MDIO_PCS_DEVAD,
-                            MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                            MDIO_PCS_REG_7101_SPI_FIFO_ADDR_WRITE_ENABLE_CMD);
-
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_BYTES_TO_TRANSFER_ADDR,
-                              1);
-               SPI_START_TRANSFER(bp, port, ext_phy_addr);
-
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                            MDIO_PCS_REG_7101_SPI_FIFO_ADDR_PAGE_PROGRAM_CMD);
-
-               /* Bits 23-16 of address */
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                              (data_index>>16));
-               /* Bits 15-8 of address */
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                              (data_index>>8));
-
-               /* Bits 7-0 of address */
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                              ((u16)data_index));
-
-               byte_cnt = 0;
-               while (byte_cnt < 4 && data_index < size) {
-                       bnx2x_cl45_write(bp, port,
-                                      PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                                      ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                              data[data_index++]);
-                       byte_cnt++;
-               }
-
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_BYTES_TO_TRANSFER_ADDR,
-                              byte_cnt+4);
-
-               SPI_START_TRANSFER(bp, port, ext_phy_addr);
-               msleep(5); /* Wait 5 ms minimum between transs */
-
-               /* Let the user know something's going on.*/
-               /* a pacifier ever 4K */
-               if ((data_index % 1023) == 0)
-                       DP(NETIF_MSG_LINK, "Download %d%%\n", data_index/size);
-       }
-
-       DP(NETIF_MSG_LINK, "\n");
-       /* Transfer the last block if there is data remaining */
-       if (last_trans_size) {
-               bnx2x_cl45_write(bp, port,
-                       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                       ext_phy_addr,
-                       MDIO_PCS_DEVAD,
-                       MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                       MDIO_PCS_REG_7101_SPI_FIFO_ADDR_WRITE_ENABLE_CMD);
-
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_BYTES_TO_TRANSFER_ADDR,
-                              1);
-
-               SPI_START_TRANSFER(bp, port, ext_phy_addr);
-
-               bnx2x_cl45_write(bp, port,
-                            PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                            ext_phy_addr,
-                            MDIO_PCS_DEVAD,
-                            MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                            MDIO_PCS_REG_7101_SPI_FIFO_ADDR_PAGE_PROGRAM_CMD);
-
-               /* Bits 23-16 of address */
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                              (data_index>>16));
-               /* Bits 15-8 of address */
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                              (data_index>>8));
-
-               /* Bits 7-0 of address */
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                              ((u16)data_index));
-
-               byte_cnt = 0;
-               while (byte_cnt < last_trans_size && data_index < size) {
-                       /* Bits 7-0 of address */
-                       bnx2x_cl45_write(bp, port,
-                               PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                               ext_phy_addr,
-                               MDIO_PCS_DEVAD,
-                               MDIO_PCS_REG_7101_SPI_FIFO_ADDR,
-                               data[data_index++]);
-                       byte_cnt++;
-               }
-
-               bnx2x_cl45_write(bp, port,
-                              PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                              ext_phy_addr,
-                              MDIO_PCS_DEVAD,
-                              MDIO_PCS_REG_7101_SPI_BYTES_TO_TRANSFER_ADDR,
-                              byte_cnt+4);
-
-               SPI_START_TRANSFER(bp, port, ext_phy_addr);
-       }
-
-       /* DSP Remove Download Mode */
-       bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                         MISC_REGISTERS_GPIO_LOW, port);
-
-       bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr);
-
-       /* wait 0.5 sec to allow it to run */
-       for (cnt = 0; cnt < 100; cnt++)
-               msleep(5);
-
-       bnx2x_hw_reset(bp, port);
-
-       for (cnt = 0; cnt < 100; cnt++)
-               msleep(5);
-
-       /* Check that the code is started. In case the download
-       checksum failed, the code won't be started. */
-       bnx2x_cl45_read(bp, port,
-                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                     ext_phy_addr,
-                     MDIO_PCS_DEVAD,
-                     MDIO_PCS_REG_7101_DSP_ACCESS,
-                     &tmp);
-
-       code_started = (tmp & (1<<4));
-       if (!code_started) {
-               DP(NETIF_MSG_LINK, "Download failed. Please check file.\n");
-               return -EINVAL;
-       }
-
-       /* Verify that the file revision is now equal to the image
-       revision within the DSP */
-       bnx2x_cl45_read(bp, port,
-                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                     ext_phy_addr,
-                     MDIO_PMA_DEVAD,
-                     MDIO_PMA_REG_7101_VER1,
-                     &image_revision1);
-
-       bnx2x_cl45_read(bp, port,
-                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101,
-                     ext_phy_addr,
-                     MDIO_PMA_DEVAD,
-                     MDIO_PMA_REG_7101_VER2,
-                     &image_revision2);
-
-       if (data[0x14e] != (image_revision2&0xFF) ||
-           data[0x14f] != ((image_revision2&0xFF00)>>8) ||
-           data[0x150] != (image_revision1&0xFF) ||
-           data[0x151] != ((image_revision1&0xFF00)>>8)) {
-               DP(NETIF_MSG_LINK, "Download failed.\n");
-               return -EINVAL;
-       }
-       DP(NETIF_MSG_LINK, "Download %d%%\n", data_index/size);
-       return 0;
-}
-
-u8 bnx2x_flash_download(struct bnx2x *bp, u8 port, u32 ext_phy_config,
-                     u8 driver_loaded, char data[], u32 size)
-{
-       u8 rc = 0;
-       u32 ext_phy_type;
-       u8 ext_phy_addr;
-       ext_phy_addr = ((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(ext_phy_config);
-
-       switch (ext_phy_type) {
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8072:
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073:
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705:
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706:
-               DP(NETIF_MSG_LINK,
-                       "Flash download not supported for this ext phy\n");
-               rc = -EINVAL;
-               break;
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
-               /* Take ext phy out of reset */
-               if (!driver_loaded)
-                       bnx2x_turn_on_ef(bp, port, ext_phy_addr, ext_phy_type);
-               rc = bnx2x_sfx7101_flash_download(bp, port, ext_phy_addr,
-                                               data, size);
-               if (!driver_loaded)
-                       bnx2x_turn_off_sf(bp, port);
-               break;
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT:
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE:
-       case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN:
-       default:
-               DP(NETIF_MSG_LINK, "Invalid ext phy type\n");
-               rc = -EINVAL;
-               break;
-       }
-       return rc;
-}
-