lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 836/846] net: phy: micrel: use kszphy_suspend()/kszphy_resume for irq aware devices
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    commit f1131b9c23fb4a3540a774828ff49f421619f902 upstream.

    On a setup with KSZ9131 and MACB drivers it happens on suspend path, from
    time to time, that the PHY interrupt arrives after PHY and MACB were
    suspended (PHY via genphy_suspend(), MACB via macb_suspend()). In this
    case the phy_read() at the beginning of kszphy_handle_interrupt() will
    fail (as MACB driver is suspended at this time) leading to phy_error()
    being called and a stack trace being displayed on console. To solve this
    .suspend/.resume functions for all KSZ devices implementing
    .handle_interrupt were replaced with kszphy_suspend()/kszphy_resume()
    which disable/enable interrupt before/after calling
    genphy_suspend()/genphy_resume().

    The fix has been adapted for all KSZ devices which implements
    .handle_interrupt but it has been tested only on KSZ9131.

    Fixes: 59ca4e58b917 ("net: phy: micrel: implement generic .handle_interrupt() callback")
    Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/phy/micrel.c | 36 ++++++++++++++++++------------------
    1 file changed, 18 insertions(+), 18 deletions(-)

    --- a/drivers/net/phy/micrel.c
    +++ b/drivers/net/phy/micrel.c
    @@ -1547,8 +1547,8 @@ static struct phy_driver ksphy_driver[]
    .config_init = kszphy_config_init,
    .config_intr = kszphy_config_intr,
    .handle_interrupt = kszphy_handle_interrupt,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_KSZ8021,
    .phy_id_mask = 0x00ffffff,
    @@ -1562,8 +1562,8 @@ static struct phy_driver ksphy_driver[]
    .get_sset_count = kszphy_get_sset_count,
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_KSZ8031,
    .phy_id_mask = 0x00ffffff,
    @@ -1577,8 +1577,8 @@ static struct phy_driver ksphy_driver[]
    .get_sset_count = kszphy_get_sset_count,
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_KSZ8041,
    .phy_id_mask = MICREL_PHY_ID_MASK,
    @@ -1609,8 +1609,8 @@ static struct phy_driver ksphy_driver[]
    .get_sset_count = kszphy_get_sset_count,
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    }, {
    .name = "Micrel KSZ8051",
    /* PHY_BASIC_FEATURES */
    @@ -1623,8 +1623,8 @@ static struct phy_driver ksphy_driver[]
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    .match_phy_device = ksz8051_match_phy_device,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_KSZ8001,
    .name = "Micrel KSZ8001 or KS8721",
    @@ -1638,8 +1638,8 @@ static struct phy_driver ksphy_driver[]
    .get_sset_count = kszphy_get_sset_count,
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_KSZ8081,
    .name = "Micrel KSZ8081 or KSZ8091",
    @@ -1669,8 +1669,8 @@ static struct phy_driver ksphy_driver[]
    .config_init = ksz8061_config_init,
    .config_intr = kszphy_config_intr,
    .handle_interrupt = kszphy_handle_interrupt,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_KSZ9021,
    .phy_id_mask = 0x000ffffe,
    @@ -1685,8 +1685,8 @@ static struct phy_driver ksphy_driver[]
    .get_sset_count = kszphy_get_sset_count,
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    - .suspend = genphy_suspend,
    - .resume = genphy_resume,
    + .suspend = kszphy_suspend,
    + .resume = kszphy_resume,
    .read_mmd = genphy_read_mmd_unsupported,
    .write_mmd = genphy_write_mmd_unsupported,
    }, {
    @@ -1704,7 +1704,7 @@ static struct phy_driver ksphy_driver[]
    .get_sset_count = kszphy_get_sset_count,
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    - .suspend = genphy_suspend,
    + .suspend = kszphy_suspend,
    .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_LAN8814,
    @@ -1732,7 +1732,7 @@ static struct phy_driver ksphy_driver[]
    .get_sset_count = kszphy_get_sset_count,
    .get_strings = kszphy_get_strings,
    .get_stats = kszphy_get_stats,
    - .suspend = genphy_suspend,
    + .suspend = kszphy_suspend,
    .resume = kszphy_resume,
    }, {
    .phy_id = PHY_ID_KSZ8873MLL,

    \
     
     \ /
      Last update: 2022-01-24 23:11    [W:4.184 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site