renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 01:04:08 +08:00
Code

bnx2x: Read FIP mac from SHMEM in single function mode

Browse Source 
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>
This commit is contained in:
Vladislav Zolotarov 2011-07-21 07:57:52 +00:00 committed by David S. Miller
parent 0fea29c129
commit c03bd39c56
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/bnx2x/bnx2x_main.c
View File

@ -9251,6 +9251,12 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
val = SHMEM_RD(bp, dev_info.port_hw_config[port]. val = SHMEM_RD(bp, dev_info.port_hw_config[port].
iscsi_mac_lower); iscsi_mac_lower);
bnx2x_set_mac_buf(iscsi_mac, val, val2); 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 #endif
} }
@ -9258,13 +9264,9 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN); memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN);
#ifdef BCM_CNIC #ifdef BCM_CNIC
/* Set the FCoE MAC in modes other then MF_SI */ /* Set the FCoE MAC in MF_SD mode */
if (!CHIP_IS_E1x(bp)) { if (!CHIP_IS_E1x(bp) && IS_MF_SD(bp))
if (IS_MF_SD(bp)) memcpy(fip_mac, bp->dev->dev_addr, ETH_ALEN);
memcpy(fip_mac, bp->dev->dev_addr, ETH_ALEN);
else if (!IS_MF(bp))
memcpy(fip_mac, iscsi_mac, ETH_ALEN);
}
/* Disable iSCSI if MAC configuration is /* Disable iSCSI if MAC configuration is
* invalid. * invalid.