3 files changed, 22 insertions, 1 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 54d522da1aa7..2d30979e8dad 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2248,7 +2248,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                          DRV_PULSE_SEQ_MASK);
                 BNX2X_DEV_INFO("drv_pulse 0x%x\n", bp->fw_drv_pulse_wr_seq);
 
-                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ, 0);
+                load_code = bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_REQ,
+                                             DRV_MSG_CODE_LOAD_REQ_WITH_LFA);
                 if (!load_code) {
                         BNX2X_ERR("MCP response failure, aborting\n");
                         rc = -EBUSY;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index 7eaa74b78a5b..f478bedf9e9e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -2159,6 +2159,14 @@ struct shmem2_region {
         #define SHMEM_EEE_TIME_OUTPUT_BIT          0x80000000
 
         u32 sizeof_port_stats;
+
+        /* Link Flap Avoidance */
+        u32 lfa_host_addr[PORT_MAX];
+        u32 reserved1;
+
+        u32 reserved2;                          /* Offset 0x148 */
+        u32 reserved3;                          /* Offset 0x14C */
+        u32 reserved4;                          /* Offset 0x150 */
 };
 
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 54b8c1f19d39..4f33170a18d2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -6267,6 +6267,10 @@ void bnx2x_pf_disable(struct bnx2x *bp)
 static void bnx2x__common_init_phy(struct bnx2x *bp)
 {
         u32 shmem_base[2], shmem2_base[2];
+        /* Avoid common init in case MFW supports LFA */
+        if (SHMEM2_RD(bp, size) >
+            (u32)offsetof(struct shmem2_region, lfa_host_addr[BP_PORT(bp)]))
+                return;
         shmem_base[0] =  bp->common.shmem_base;
         shmem2_base[0] = bp->common.shmem2_base;
         if (!CHIP_IS_E1x(bp)) {
@@ -9862,6 +9866,14 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
 
         bp->link_params.shmem_base = bp->common.shmem_base;
         bp->link_params.shmem2_base = bp->common.shmem2_base;
+        if (SHMEM2_RD(bp, size) >
+            (u32)offsetof(struct shmem2_region, lfa_host_addr[BP_PORT(bp)]))
+                bp->link_params.lfa_base =
+                REG_RD(bp, bp->common.shmem2_base +
+                       (u32)offsetof(struct shmem2_region,
+                                     lfa_host_addr[BP_PORT(bp)]));
+        else
+                bp->link_params.lfa_base = 0;
         BNX2X_DEV_INFO("shmem offset 0x%x  shmem2 offset 0x%x\n",
                        bp->common.shmem_base, bp->common.shmem2_base);