bnx2x: Read FIP mac from SHMEM in single function mode

Read FIP MAC address from SHMEM's "port" section
similar to what we do in a MF mode when we read it from
a "func" section of SHMEM.

Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit c03bd39c564f4b5d7683514e9249986e1404940d)

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 175320ebb00fa51ab1bd18ed0c44618c1642b774..fe3e9f48bf37795154e1c6999cecb2f98ede34d5 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -9253,6 +9253,12 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                val = SHMEM_RD(bp, dev_info.port_hw_config[port].
                                   iscsi_mac_lower);
                bnx2x_set_mac_buf(iscsi_mac, val, val2);
+
+               val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].
+                                   fcoe_fip_mac_upper);
+               val = SHMEM_RD(bp, dev_info.port_hw_config[port].
+                                  fcoe_fip_mac_lower);
+               bnx2x_set_mac_buf(fip_mac, val, val2);
 #endif
        }
 
@@ -9260,13 +9266,9 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
        memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN);
 
 #ifdef BCM_CNIC
-       /* Set the FCoE MAC in modes other then MF_SI */
-       if (!CHIP_IS_E1x(bp)) {
-               if (IS_MF_SD(bp))
-                       memcpy(fip_mac, bp->dev->dev_addr, ETH_ALEN);
-               else if (!IS_MF(bp))
-                       memcpy(fip_mac, iscsi_mac, ETH_ALEN);
-       }
+       /* Set the FCoE MAC in MF_SD mode */
+       if (!CHIP_IS_E1x(bp) && IS_MF_SD(bp))
+               memcpy(fip_mac, bp->dev->dev_addr, ETH_ALEN);
 
        /* Disable iSCSI if MAC configuration is
         * invalid.