bnx2x: Fix over current port display
On 57712 chip, port number is enumerated per engine, so it requires adjustment in port display to the user. Signed-off-by: Yaniv Rosner <yanivr@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c688fe2fc0
commit
27d024321c
|
@ -4919,15 +4919,14 @@ static void bnx2x_8727_power_module(struct bnx2x *bp,
|
|||
*/
|
||||
if (phy->flags & FLAGS_NOC)
|
||||
return;
|
||||
if (!(phy->flags &
|
||||
FLAGS_NOC) && is_power_up)
|
||||
if (is_power_up)
|
||||
val = (1<<4);
|
||||
else
|
||||
/*
|
||||
* Set GPIO control to OUTPUT, and set the power bit
|
||||
* to according to the is_power_up
|
||||
*/
|
||||
val = ((!(is_power_up)) << 1);
|
||||
val = (1<<1);
|
||||
|
||||
bnx2x_cl45_write(bp, phy,
|
||||
MDIO_PMA_DEVAD,
|
||||
|
@ -5928,7 +5927,7 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
|
|||
|
||||
{
|
||||
struct bnx2x *bp = params->bp;
|
||||
u8 link_up = 0;
|
||||
u8 link_up = 0, oc_port = params->port;
|
||||
u16 link_status = 0;
|
||||
u16 rx_alarm_status, lasi_ctrl, val1;
|
||||
|
||||
|
@ -5969,8 +5968,10 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
|
|||
&val1);
|
||||
|
||||
if ((val1 & (1<<8)) == 0) {
|
||||
if (!CHIP_IS_E1x(bp))
|
||||
oc_port = BP_PATH(bp) + (params->port << 1);
|
||||
DP(NETIF_MSG_LINK, "8727 Power fault has been detected"
|
||||
" on port %d\n", params->port);
|
||||
" on port %d\n", oc_port);
|
||||
netdev_err(bp->dev, "Error: Power fault on Port %d has"
|
||||
" been detected and the power to "
|
||||
"that SFP+ module has been removed"
|
||||
|
@ -5978,7 +5979,7 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
|
|||
" Please remove the SFP+ module and"
|
||||
" restart the system to clear this"
|
||||
" error.\n",
|
||||
params->port);
|
||||
oc_port);
|
||||
/* Disable all RX_ALARMs except for mod_abs */
|
||||
bnx2x_cl45_write(bp, phy,
|
||||
MDIO_PMA_DEVAD,
|
||||
|
|
Loading…
Reference in New Issue