lkml.org 
[lkml]   [2020]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net v2 2/2] net: phy: DP83TC811: Fix WoL in config init to be disabled
    Date
    The WoL feature should be disabled when config_init is called and the
    feature should turned on or off when set_wol is called.

    In addition updated the calls to modify the registers to use the set_bit
    and clear_bit function calls.

    Fixes: 6d749428788b ("net: phy: DP83TC811: Introduce support for the
    DP83TC811 phy")
    Signed-off-by: Dan Murphy <dmurphy@ti.com>
    ---
    drivers/net/phy/dp83tc811.c | 21 ++++++++++++---------
    1 file changed, 12 insertions(+), 9 deletions(-)

    diff --git a/drivers/net/phy/dp83tc811.c b/drivers/net/phy/dp83tc811.c
    index 06f08832ebcd..ff325fb748b9 100644
    --- a/drivers/net/phy/dp83tc811.c
    +++ b/drivers/net/phy/dp83tc811.c
    @@ -139,16 +139,19 @@ static int dp83811_set_wol(struct phy_device *phydev,
    value &= ~DP83811_WOL_SECURE_ON;
    }

    - value |= (DP83811_WOL_EN | DP83811_WOL_INDICATION_SEL |
    - DP83811_WOL_CLR_INDICATION);
    - phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
    - value);
    + /* Clear any pending WoL interrupt */
    + phy_read(phydev, MII_DP83811_INT_STAT1);
    +
    + value |= DP83811_WOL_EN | DP83811_WOL_INDICATION_SEL |
    + DP83811_WOL_CLR_INDICATION;
    +
    + return phy_write_mmd(phydev, DP83822_DEVADDR,
    + MII_DP83811_WOL_CFG, value);
    } else {
    - phy_clear_bits_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
    - DP83811_WOL_EN);
    + return phy_clear_bits_mmd(phydev, DP83811_DEVADDR,
    + MII_DP83811_WOL_CFG, DP83811_WOL_EN);
    }

    - return 0;
    }

    static void dp83811_get_wol(struct phy_device *phydev,
    @@ -292,8 +295,8 @@ static int dp83811_config_init(struct phy_device *phydev)

    value = DP83811_WOL_MAGIC_EN | DP83811_WOL_SECURE_ON | DP83811_WOL_EN;

    - return phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
    - value);
    + return phy_clear_bits_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG,
    + value);
    }

    static int dp83811_phy_reset(struct phy_device *phydev)
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-04-27 23:28    [W:3.002 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site