Redundant changes in "net: dsa: mt7530: add support for in-band link status"

Redundant changes in "net: dsa: mt7530: add support for in-band link status"

[Russell King (Oracle)]

Hi Daniel,

While updating my tree, I notice that the above referenced commit
contains a redundant change, namely in mt753x_phylink_get_caps():

        config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
                                   MAC_10 | MAC_100 | MAC_1000FD;

+       if ((priv->id == ID_MT7531) && mt753x_is_mac_port(port))
+               config->mac_capabilities |= MAC_2500FD;
+

This shouldn't be necessary. mt753x_phylink_get_caps() goes on to
call the obviously named mt753x "mac_port_get_caps" method, which
for a MT7531 is mt7531_mac_port_get_caps().

mt7531_mac_port_get_caps() will already set MAC_2500FD for ports
5 and 6 where appropriate.

Please submit a patch to remove the above change if you agree that
it is already covered.

Thanks.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

[PATCH net-next] net: dsa: mt7530: remove reduntant assignment

[Daniel Golle]

Russell King correctly pointed out that the MAC_2500FD capability is
already added for port 5 (if not in RGMII mode) and port 6 (which only
supports SGMII) by mt7531_mac_port_get_caps. Remove the reduntant
setting of this capability flag which was added by a previous commit.

Fixes: e19de30d20 ("net: dsa: mt7530: add support for in-band link status")
Reported-by: Russell King <linux@armlinux.org.uk>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 drivers/net/dsa/mt7530.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index e74c6b406172..908fa89444c9 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2919,9 +2919,6 @@ static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port,
 	config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
 				   MAC_10 | MAC_100 | MAC_1000FD;
 
-	if ((priv->id == ID_MT7531) && mt753x_is_mac_port(port))
-		config->mac_capabilities |= MAC_2500FD;
-
 	/* This driver does not make use of the speed, duplex, pause or the
 	 * advertisement in its mac_config, so it is safe to mark this driver
 	 * as non-legacy.
-- 
2.39.0

Re: [PATCH net-next] net: dsa: mt7530: remove reduntant assignment

[Russell King (Oracle)]

On Tue, Dec 13, 2022 at 04:07:35AM +0000, Daniel Golle wrote:
> Russell King correctly pointed out that the MAC_2500FD capability is
> already added for port 5 (if not in RGMII mode) and port 6 (which only
> supports SGMII) by mt7531_mac_port_get_caps. Remove the reduntant
> setting of this capability flag which was added by a previous commit.
> 
> Fixes: e19de30d20 ("net: dsa: mt7530: add support for in-band link status")
> Reported-by: Russell King <linux@armlinux.org.uk>

Please update the name and email address as per my reviewed-by below
(the "(Oracle)" bit is important since I now work for Oracle.)

> Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

Thanks!

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

Re: [PATCH net-next] net: dsa: mt7530: remove reduntant assignment

[Jakub Kicinski]

On Tue, 13 Dec 2022 04:07:35 +0000 Daniel Golle wrote:
> Fixes: e19de30d20 ("net: dsa: mt7530: add support for in-band link status")

Apart from the changes requested by Russell, could you also correct
this Fixes tag to have the required 12 characters of the commit ID?

You can post as [PATCH net v2], net-next has just made it to Linus
and became net.