lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 153/207] net: phy: micrel: fix shared interrupt on LAN8814
    Date
    From: Michael Walle <michael@walle.cc>

    [ Upstream commit 2002fbac743b6e2391b4ed50ad9eb626768dd78a ]

    Since commit ece19502834d ("net: phy: micrel: 1588 support for LAN8814
    phy") the handler always returns IRQ_HANDLED, except in an error case.
    Before that commit, the interrupt status register was checked and if
    it was empty, IRQ_NONE was returned. Restore that behavior to play nice
    with the interrupt line being shared with others.

    Fixes: ece19502834d ("net: phy: micrel: 1588 support for LAN8814 phy")
    Signed-off-by: Michael Walle <michael@walle.cc>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
    Reviewed-by: Divya Koppera <Divya.Koppera@microchip.com>
    Link: https://lore.kernel.org/r/20220920141619.808117-1-michael@walle.cc
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/phy/micrel.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
    index 34483a4bd688..e8e1101911b2 100644
    --- a/drivers/net/phy/micrel.c
    +++ b/drivers/net/phy/micrel.c
    @@ -2662,16 +2662,19 @@ static int lan8804_config_init(struct phy_device *phydev)
    static irqreturn_t lan8814_handle_interrupt(struct phy_device *phydev)
    {
    int irq_status, tsu_irq_status;
    + int ret = IRQ_NONE;

    irq_status = phy_read(phydev, LAN8814_INTS);
    - if (irq_status > 0 && (irq_status & LAN8814_INT_LINK))
    - phy_trigger_machine(phydev);
    -
    if (irq_status < 0) {
    phy_error(phydev);
    return IRQ_NONE;
    }

    + if (irq_status & LAN8814_INT_LINK) {
    + phy_trigger_machine(phydev);
    + ret = IRQ_HANDLED;
    + }
    +
    while (1) {
    tsu_irq_status = lanphy_read_page_reg(phydev, 4,
    LAN8814_INTR_STS_REG);
    @@ -2680,12 +2683,15 @@ static irqreturn_t lan8814_handle_interrupt(struct phy_device *phydev)
    (tsu_irq_status & (LAN8814_INTR_STS_REG_1588_TSU0_ |
    LAN8814_INTR_STS_REG_1588_TSU1_ |
    LAN8814_INTR_STS_REG_1588_TSU2_ |
    - LAN8814_INTR_STS_REG_1588_TSU3_)))
    + LAN8814_INTR_STS_REG_1588_TSU3_))) {
    lan8814_handle_ptp_interrupt(phydev);
    - else
    + ret = IRQ_HANDLED;
    + } else {
    break;
    + }
    }
    - return IRQ_HANDLED;
    +
    + return ret;
    }

    static int lan8814_ack_interrupt(struct phy_device *phydev)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 13:57    [W:2.779 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site