2021-09-16 01:25:49

by Colin Foster

Subject: [PATCH v1 net] net: mscc: ocelot: remove buggy duplicate write to DEV_CLOCK_CFG

When updating ocelot to use phylink, a second write to DEV_CLOCK_CFG was
mistakenly left in. It used the variable "speed" which, previously, would
would have been assigned a value of OCELOT_SPEED_1000. In phylink the
variable is be SPEED_1000, which is invalid for the
DEV_CLOCK_LINK_SPEED macro. Removing it as unnecessary and buggy.

Fixes: e6e12df625f2 ("net: mscc: ocelot: convert to phylink")
Signed-off-by: Colin Foster <[email protected]>
---
drivers/net/ethernet/mscc/ocelot.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 08be0440af28..729ba826ba17 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -563,12 +563,6 @@ void ocelot_phylink_mac_link_up(struct ocelot *ocelot, int port,
ocelot_port_writel(ocelot_port, DEV_MAC_ENA_CFG_RX_ENA |
DEV_MAC_ENA_CFG_TX_ENA, DEV_MAC_ENA_CFG);

- /* Take MAC, Port, Phy (intern) and PCS (SGMII/Serdes) clock out of
- * reset
- */
- ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed),
- DEV_CLOCK_CFG);
-
/* Core: Enable port for frame transfer */
ocelot_fields_write(ocelot, port,
QSYS_SWITCH_PORT_MODE_PORT_ENA, 1);
--
2.25.1

2021-09-16 11:41:10

by Vladimir Oltean

Subject: Re: [PATCH v1 net] net: mscc: ocelot: remove buggy duplicate write to DEV_CLOCK_CFG

On Wed, Sep 15, 2021 at 06:23:40PM -0700, Colin Foster wrote:
> When updating ocelot to use phylink, a second write to DEV_CLOCK_CFG was
> mistakenly left in. It used the variable "speed" which, previously, would
> would have been assigned a value of OCELOT_SPEED_1000. In phylink the
> variable is be SPEED_1000, which is invalid for the
> DEV_CLOCK_LINK_SPEED macro. Removing it as unnecessary and buggy.
>
> Fixes: e6e12df625f2 ("net: mscc: ocelot: convert to phylink")
> Signed-off-by: Colin Foster <[email protected]>
> ---

Reviewed-by: Vladimir Oltean <[email protected]>