| Message ID | 20230515025608.2587012-1-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 225c657945c4a6307741cb3cc89467eadcc26e9b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: bcmgenet: Restore phy_stop() depending upon suspend/close | expand |
On Mon, May 15, 2023 at 8:26 AM Florian Fainelli <f.fainelli@gmail.com> wrote: > > Removing the phy_stop() from bcmgenet_netif_stop() ended up causing > warnings from the PHY library that phy_start() is called from the > RUNNING state since we are no longer stopping the PHY state machine > during bcmgenet_suspend(). > > Restore the call to phy_stop() but make it conditional on being called > from the close or suspend path. > > Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") > Fixes: 93e0401e0fc0 ("net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()") > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- Looks good to me. Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com> PS: I was only curious as to why is it not a v2 (I see only another Fixes got added though) > drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c > index f28ffc31df22..eca0c92c0c84 100644 > --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c > +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c > @@ -3450,7 +3450,7 @@ static int bcmgenet_open(struct net_device *dev) > return ret; > } > > -static void bcmgenet_netif_stop(struct net_device *dev) > +static void bcmgenet_netif_stop(struct net_device *dev, bool stop_phy) > { > struct bcmgenet_priv *priv = netdev_priv(dev); > > @@ -3465,6 +3465,8 @@ static void bcmgenet_netif_stop(struct net_device *dev) > /* Disable MAC transmit. TX DMA disabled must be done before this */ > umac_enable_set(priv, CMD_TX_EN, false); > > + if (stop_phy) > + phy_stop(dev->phydev); > bcmgenet_disable_rx_napi(priv); > bcmgenet_intr_disable(priv); > > @@ -3485,7 +3487,7 @@ static int bcmgenet_close(struct net_device *dev) > > netif_dbg(priv, ifdown, dev, "bcmgenet_close\n"); > > - bcmgenet_netif_stop(dev); > + bcmgenet_netif_stop(dev, false); > > /* Really kill the PHY state machine and disconnect from it */ > phy_disconnect(dev->phydev); > @@ -4303,7 +4305,7 @@ static int bcmgenet_suspend(struct device *d) > > netif_device_detach(dev); > > - bcmgenet_netif_stop(dev); > + bcmgenet_netif_stop(dev, true); > > if (!device_may_wakeup(d)) > phy_suspend(dev->phydev); > -- > 2.34.1 > >
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: On Sun, 14 May 2023 19:56:07 -0700 you wrote: > Removing the phy_stop() from bcmgenet_netif_stop() ended up causing > warnings from the PHY library that phy_start() is called from the > RUNNING state since we are no longer stopping the PHY state machine > during bcmgenet_suspend(). > > Restore the call to phy_stop() but make it conditional on being called > from the close or suspend path. > > [...] Here is the summary with links: - [net] net: bcmgenet: Restore phy_stop() depending upon suspend/close https://git.kernel.org/netdev/net/c/225c657945c4 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index f28ffc31df22..eca0c92c0c84 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3450,7 +3450,7 @@ static int bcmgenet_open(struct net_device *dev) return ret; } -static void bcmgenet_netif_stop(struct net_device *dev) +static void bcmgenet_netif_stop(struct net_device *dev, bool stop_phy) { struct bcmgenet_priv *priv = netdev_priv(dev); @@ -3465,6 +3465,8 @@ static void bcmgenet_netif_stop(struct net_device *dev) /* Disable MAC transmit. TX DMA disabled must be done before this */ umac_enable_set(priv, CMD_TX_EN, false); + if (stop_phy) + phy_stop(dev->phydev); bcmgenet_disable_rx_napi(priv); bcmgenet_intr_disable(priv); @@ -3485,7 +3487,7 @@ static int bcmgenet_close(struct net_device *dev) netif_dbg(priv, ifdown, dev, "bcmgenet_close\n"); - bcmgenet_netif_stop(dev); + bcmgenet_netif_stop(dev, false); /* Really kill the PHY state machine and disconnect from it */ phy_disconnect(dev->phydev); @@ -4303,7 +4305,7 @@ static int bcmgenet_suspend(struct device *d) netif_device_detach(dev); - bcmgenet_netif_stop(dev); + bcmgenet_netif_stop(dev, true); if (!device_may_wakeup(d)) phy_suspend(dev->phydev);
Removing the phy_stop() from bcmgenet_netif_stop() ended up causing warnings from the PHY library that phy_start() is called from the RUNNING state since we are no longer stopping the PHY state machine during bcmgenet_suspend(). Restore the call to phy_stop() but make it conditional on being called from the close or suspend path. Fixes: c96e731c93ff ("net: bcmgenet: connect and disconnect from the PHY state machine") Fixes: 93e0401e0fc0 ("net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)