linux-kernel - Re: [PATCH net] net: bcmgenet: Restore phy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CALs4sv1gTuuw1k9R8+6foBGVtuoq7_V-rKB6t3Ripd++=VFfRw@mail.gmail.com>
Date:   Mon, 15 May 2023 09:45:31 +0530
From:   Pavan Chebbi <pavan.chebbi@...adcom.com>
To:     Florian Fainelli <f.fainelli@...il.com>
Cc:     netdev@...r.kernel.org, Doug Berger <opendmb@...il.com>,
        Broadcom internal kernel review list 
        <bcm-kernel-feedback-list@...adcom.com>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH net] net: bcmgenet: Restore phy_stop() depending upon suspend/close

On Mon, May 15, 2023 at 8:26 AM Florian Fainelli <f.fainelli@...il.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@...il.com>
> ---

Looks good to me.
Reviewed-by: Pavan Chebbi <pavan.chebbi@...adcom.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
>
>

Download attachment "smime.p7s" of type "application/pkcs7-signature" (4209 bytes)