2008-01-30 14:08:34

by Roel Kluin

Subject: [drivers/net/bnx2.c] ADVERTISE_1000XPSE_ASYM

In drivers/net/bnx2.c:1285: it reads in function bnx2_setup_remote_phy():

if (pause_adv & (ADVERTISE_1000XPSE_ASYM | ADVERTISE_1000XPSE_ASYM))

Note that the two are the same and this is therefore equivalent to

if (pause_adv & ADVERTISE_1000XPSE_ASYM)

This appears to be incorrect, was maybe '| ADVERTISE_1000XPAUSE' intended?

2008-01-30 18:55:13

by Michael Chan

Subject: Re: [drivers/net/bnx2.c] ADVERTISE_1000XPSE_ASYM

On Wed, 2008-01-30 at 15:07 +0100, Roel Kluin wrote:
> In drivers/net/bnx2.c:1285: it reads in function bnx2_setup_remote_phy():
>
> if (pause_adv & (ADVERTISE_1000XPSE_ASYM | ADVERTISE_1000XPSE_ASYM))
>
> Note that the two are the same and this is therefore equivalent to
>
> if (pause_adv & ADVERTISE_1000XPSE_ASYM)
>
> This appears to be incorrect, was maybe '| ADVERTISE_1000XPAUSE' intended?
>

Thanks for catching this. The patch below will fix it.

[BNX2]: Fix ASYM PAUSE advertisement for remote PHY.

We were checking for the ASYM_PAUSE bit for 1000Base-X twice instead
checking for both the 1000Base-X bit and the 10/100/1000Base-T bit.
The purpose of the logic is to tell the firmware that ASYM_PAUSE is
set on either the Serdes or Copper interface.

Problem was discovered by Roel Kluin <[email protected]>

Signed-off-by: Michael Chan <[email protected]>

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index be7e8f8..77400ad 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1429,7 +1429,7 @@ bnx2_setup_remote_phy(struct bnx2 *bp, u8 port)

if (pause_adv & (ADVERTISE_1000XPAUSE | ADVERTISE_PAUSE_CAP))
speed_arg |= BNX2_NETLINK_SET_LINK_FC_SYM_PAUSE;
- if (pause_adv & (ADVERTISE_1000XPSE_ASYM | ADVERTISE_1000XPSE_ASYM))
+ if (pause_adv & (ADVERTISE_1000XPSE_ASYM | ADVERTISE_PAUSE_ASYM))
speed_arg |= BNX2_NETLINK_SET_LINK_FC_ASYM_PAUSE;

if (port == PORT_TP)

2008-02-01 01:07:31

by David Miller

Subject: Re: [drivers/net/bnx2.c] ADVERTISE_1000XPSE_ASYM

From: "Michael Chan" <[email protected]>
Date: Wed, 30 Jan 2008 10:51:10 -0800

> [BNX2]: Fix ASYM PAUSE advertisement for remote PHY.
>
> We were checking for the ASYM_PAUSE bit for 1000Base-X twice instead
> checking for both the 1000Base-X bit and the 10/100/1000Base-T bit.
> The purpose of the logic is to tell the firmware that ASYM_PAUSE is
> set on either the Serdes or Copper interface.
>
> Problem was discovered by Roel Kluin <[email protected]>
>
> Signed-off-by: Michael Chan <[email protected]>

Applied, thanks Michael.