2020-04-27 02:06:45

by Anthony Felice

Subject: [PATCH] net: tc35815: Fix phydev supported/advertising mask

Commit 3c1bcc8614db ("net: ethernet: Convert phydev advertize and
supported from u32 to link mode") updated ethernet drivers to use a
linkmode bitmap. It mistakenly dropped a bitwise negation in the
tc35815 ethernet driver on a bitmask to set the supported/advertising
flags.

Found by Anthony via code inspection, not tested as I do not have the
required hardware.

Fixes: 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")
Signed-off-by: Anthony Felice <[email protected]>
Reviewed-by: Akshay Bhat <[email protected]>
---
drivers/net/ethernet/toshiba/tc35815.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 3fd43d30b20d..a1066fbb93b5 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -643,7 +643,7 @@ static int tc_mii_probe(struct net_device *dev)
linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, mask);
linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, mask);
}
- linkmode_and(phydev->supported, phydev->supported, mask);
+ linkmode_andnot(phydev->supported, phydev->supported, mask);
linkmode_copy(phydev->advertising, phydev->supported);

lp->link = 0;

base-commit: 55b2af1c23eb12663015998079992f79fdfa56c8
--
2.26.1

2020-04-27 09:12:37

by Heiner Kallweit

Subject: Re: [PATCH] net: tc35815: Fix phydev supported/advertising mask

On 27.04.2020 04:00, Anthony Felice wrote:
> Commit 3c1bcc8614db ("net: ethernet: Convert phydev advertize and
> supported from u32 to link mode") updated ethernet drivers to use a
> linkmode bitmap. It mistakenly dropped a bitwise negation in the
> tc35815 ethernet driver on a bitmask to set the supported/advertising
> flags.
>
> Found by Anthony via code inspection, not tested as I do not have the
> required hardware.
>
> Fixes: 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")
> Signed-off-by: Anthony Felice <[email protected]>
> Reviewed-by: Akshay Bhat <[email protected]>
> ---
> drivers/net/ethernet/toshiba/tc35815.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
> index 3fd43d30b20d..a1066fbb93b5 100644
> --- a/drivers/net/ethernet/toshiba/tc35815.c
> +++ b/drivers/net/ethernet/toshiba/tc35815.c
> @@ -643,7 +643,7 @@ static int tc_mii_probe(struct net_device *dev)
> linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, mask);
> linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, mask);
> }
> - linkmode_and(phydev->supported, phydev->supported, mask);
> + linkmode_andnot(phydev->supported, phydev->supported, mask);
> linkmode_copy(phydev->advertising, phydev->supported);
>
> lp->link = 0;
>
> base-commit: 55b2af1c23eb12663015998079992f79fdfa56c8
>
Reviewed-by: Heiner Kallweit <[email protected]>

The complete structure of this code is quite weird (e.g. using module
parameters to force a link mode), but the driver seems to be too old
that anybody would spend effort on refactoring it.

2020-04-27 12:40:09

by Andrew Lunn

Subject: Re: [PATCH] net: tc35815: Fix phydev supported/advertising mask

On Sun, Apr 26, 2020 at 10:00:59PM -0400, Anthony Felice wrote:
> Commit 3c1bcc8614db ("net: ethernet: Convert phydev advertize and
> supported from u32 to link mode") updated ethernet drivers to use a
> linkmode bitmap. It mistakenly dropped a bitwise negation in the
> tc35815 ethernet driver on a bitmask to set the supported/advertising
> flags.
>
> Found by Anthony via code inspection, not tested as I do not have the
> required hardware.
>
> Fixes: 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")
> Signed-off-by: Anthony Felice <[email protected]>
> Reviewed-by: Akshay Bhat <[email protected]>

Reviewed-by: Andrew Lunn <[email protected]>

Thanks.

Andrew

2020-04-27 18:56:36

by David Miller

Subject: Re: [PATCH] net: tc35815: Fix phydev supported/advertising mask

From: Anthony Felice <[email protected]>
Date: Sun, 26 Apr 2020 22:00:59 -0400

> Commit 3c1bcc8614db ("net: ethernet: Convert phydev advertize and
> supported from u32 to link mode") updated ethernet drivers to use a
> linkmode bitmap. It mistakenly dropped a bitwise negation in the
> tc35815 ethernet driver on a bitmask to set the supported/advertising
> flags.
>
> Found by Anthony via code inspection, not tested as I do not have the
> required hardware.
>
> Fixes: 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")
> Signed-off-by: Anthony Felice <[email protected]>
> Reviewed-by: Akshay Bhat <[email protected]>

Applied.