lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 119/339] net: phy: at803x: disable WOL at probe
    Date
    From: Viorel Suman <viorel.suman@nxp.com>

    [ Upstream commit d7cd5e06c9dd70a82f1461c7b5f676bc03f5cd61 ]

    Before 7beecaf7d507b ("net: phy: at803x: improve the WOL feature") patch
    "at803x_get_wol" implementation used AT803X_INTR_ENABLE_WOL value to set
    WAKE_MAGIC flag, and now AT803X_WOL_EN value is used for the same purpose.
    The problem here is that the values of these two bits are different after
    hardware reset: AT803X_INTR_ENABLE_WOL=0 after hardware reset, but
    AT803X_WOL_EN=1. So now, if called right after boot, "at803x_get_wol" will
    set WAKE_MAGIC flag, even if WOL function is not enabled by calling
    "at803x_set_wol" function. The patch disables WOL function on probe thus
    the behavior is consistent.

    Fixes: 7beecaf7d507b ("net: phy: at803x: improve the WOL feature")
    Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
    Link: https://lore.kernel.org/r/20220527084935.235274-1-viorel.suman@oss.nxp.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/phy/at803x.c | 33 ++++++++++++++++++++++-----------
    1 file changed, 22 insertions(+), 11 deletions(-)

    diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
    index 73926006d319..6a467e7817a6 100644
    --- a/drivers/net/phy/at803x.c
    +++ b/drivers/net/phy/at803x.c
    @@ -433,20 +433,21 @@ static void at803x_context_restore(struct phy_device *phydev,
    static int at803x_set_wol(struct phy_device *phydev,
    struct ethtool_wolinfo *wol)
    {
    - struct net_device *ndev = phydev->attached_dev;
    - const u8 *mac;
    int ret, irq_enabled;
    - unsigned int i;
    - static const unsigned int offsets[] = {
    - AT803X_LOC_MAC_ADDR_32_47_OFFSET,
    - AT803X_LOC_MAC_ADDR_16_31_OFFSET,
    - AT803X_LOC_MAC_ADDR_0_15_OFFSET,
    - };
    -
    - if (!ndev)
    - return -ENODEV;

    if (wol->wolopts & WAKE_MAGIC) {
    + struct net_device *ndev = phydev->attached_dev;
    + const u8 *mac;
    + unsigned int i;
    + static const unsigned int offsets[] = {
    + AT803X_LOC_MAC_ADDR_32_47_OFFSET,
    + AT803X_LOC_MAC_ADDR_16_31_OFFSET,
    + AT803X_LOC_MAC_ADDR_0_15_OFFSET,
    + };
    +
    + if (!ndev)
    + return -ENODEV;
    +
    mac = (const u8 *) ndev->dev_addr;

    if (!is_valid_ether_addr(mac))
    @@ -857,6 +858,9 @@ static int at803x_probe(struct phy_device *phydev)
    if (phydev->drv->phy_id == ATH8031_PHY_ID) {
    int ccr = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
    int mode_cfg;
    + struct ethtool_wolinfo wol = {
    + .wolopts = 0,
    + };

    if (ccr < 0)
    goto err;
    @@ -872,6 +876,13 @@ static int at803x_probe(struct phy_device *phydev)
    priv->is_fiber = true;
    break;
    }
    +
    + /* Disable WOL by default */
    + ret = at803x_set_wol(phydev, &wol);
    + if (ret < 0) {
    + phydev_err(phydev, "failed to disable WOL on probe: %d\n", ret);
    + goto err;
    + }
    }

    return 0;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 15:47    [W:2.117 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site