lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 037/102] net: bcmgenet: Check for Wake-on-LAN interrupt probe deferral
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    [ Upstream commit 6b77c06655b8a749c1a3d9ebc51e9717003f7e5a ]

    The interrupt controller supplying the Wake-on-LAN interrupt line maybe
    modular on some platforms (irq-bcm7038-l1.c) and might be probed at a
    later time than the GENET driver. We need to specifically check for
    -EPROBE_DEFER and propagate that error to ensure that we eventually
    fetch the interrupt descriptor.

    Fixes: 9deb48b53e7f ("bcmgenet: add WOL IRQ check")
    Fixes: 5b1f0e62941b ("net: bcmgenet: Avoid touching non-existent interrupt")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Reviewed-by: Stefan Wahren <stefan.wahren@i2se.com>
    Link: https://lore.kernel.org/r/20220511031752.2245566-1-f.fainelli@gmail.com
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    index 8bcc39b1575c..ea1391753752 100644
    --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
    @@ -3950,6 +3950,10 @@ static int bcmgenet_probe(struct platform_device *pdev)
    goto err;
    }
    priv->wol_irq = platform_get_irq_optional(pdev, 2);
    + if (priv->wol_irq == -EPROBE_DEFER) {
    + err = priv->wol_irq;
    + goto err;
    + }

    priv->base = devm_platform_ioremap_resource(pdev, 0);
    if (IS_ERR(priv->base)) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-16 22:10    [W:2.610 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site