From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B16243C345C for ; Wed, 29 Jul 2026 20:29:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785357002; cv=none; b=lmyV06vctgo2twbWNa2Nmd+IBTwonVgDAyAciGdz56zAOscAooZ11kDMXYPwyKr7YTGmOcAEj1nAgntwjEc7ZV8zCGEOwZZLebqcDMm5pLCMwSNRyEcSFsaz+eH8xmptOJg6wOzqscRszpxr0wzgSSJU23dbZ9PoQ+gKUPPWqKw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785357002; c=relaxed/simple; bh=H9bDi7hL01TAucB5lO49EUPFSlIgRngaywv1aRrohWk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gNP5ll+uVGxKvm2iLOPs7hPQtGPA6e4kndYvIScq1MwmwYwa9FeIJSMO/lfCdPq5VCZLiYeVYRk7e0OboZRm+uLOsCVCCKjovPeMhELtOJluUGm81ABUSbM6SvIN5bWJPTYXQ5s2DlA/d+HOey7yc1tFTcH/0ffigryzQAqzbwQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qlPfEHh+; arc=none smtp.client-ip=209.85.219.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qlPfEHh+" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-8edda5d56a5so12890016d6.3 for ; Wed, 29 Jul 2026 13:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785356997; x=1785961797; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=vfZQeSMzdITyjFS9OMFudbjyXgRSJSCBaN6S7210wng=; b=qlPfEHh+C4shZhekBnxO0cRZ7EhkxX0wWEsqeNv2dyG1UHmU/TZx0bLktsXzdjtbpN zu2n/dL/e3piDXNvvkhh5cz+tjs3M7gArK8YTdlEgzwS6b4hprE1Ik5uKlhCcyhJcog2 /qQWAd6sCBEFdGKyUEGZpYv97BdpK805UjG6UDELg2fo11jZdM1FS6zpypMHXXjb8ZX9 HvtQIGiTfiEo2+qTaO/DAmmXsao1SA5KOad1UAlesQubLzJpQf2ZzWCsfOKR5ZskNchy SrtsAK5LlI23p7m/TbqjtziXWmv/WjwnxZGMBaZ+sNrjIX0mKHpBR2YJW/3XvvS9NaUp xTvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785356997; x=1785961797; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vfZQeSMzdITyjFS9OMFudbjyXgRSJSCBaN6S7210wng=; b=eWFoS7iNHm5wfo5cKxQZatdg0ExCv/px4GhIzPno1Hb0CsIOnrCDjyK8yfD6zsqvlF /RFIR/R6u654PZ4o4yrwCsrgwv/mqbRwIfv6ocgh/h75J4q3Z/nOOdK1znEgvgM8KFbY hj0evkyLxrPBq756uhYmPc7SjzlVY9qahco0nAZLMC5qGy2rGMPCKCDfqjq6XksBumri F2ddxkpMgB/DYQwLxmxONo/h90q76cDbpABG13Z6G/ah1pMHqJKSurCkEfxK4A0fetY9 Xl2hxASgOcASn4BJ/tbRa/5LRJ7gaECXTAj4mM6jB8K6ywX92nYq5LVhki3ypH0edvS5 hulw== X-Forwarded-Encrypted: i=1; AHgh+RrbbPr+IjpKofzVq/lI1IflbWjrOh29+af0ln+VmFLYTD1NRhAO22/ooqsr8KKNsRrViT0MFTdzmsMHLiY=@vger.kernel.org X-Gm-Message-State: AOJu0YzGFxeddYANYRmaC+9Hj1tlNIrvQzBGDVGe3/vLAz/gprNmBfAE 359wgE/kyjUoUzv0dS+QNsSOlbP6CMZMP1moblOwqW/NMwKe1Uy4YYBb X-Gm-Gg: AR+sD11g0SjJeL587mRS5ufp14IYgTbniK6Gph3kJ6OL+o4IWp9203GNxvWHBIWGShQ X1WytWji+NDmJialFqZSZBbeDMYtwgWCo6SSxGR0+6ehHg6Y0BHO/wex9iSt53xBHoqnGR3iHTW IJWakZjEU8GH3ynSBlqNHqwvVAt+vVrws5XNPCOUP/enOCM9CqQTQXkkY+wOV0EWvCwKFB7GtAW mf4vGR4TCsJKFyyV6GaxSt/xJ++XbjQvvbonNeCXEnnMm/8+kHl/FgmDle0dbJNuvTNF1dK8u6M EZs5rRceAtmBO1D4JlMNwa35XKP1CZznC5xTwr7JuwxQlJyDKSJzxF5V8HSopn/0tEgp4wJvSWw ReoIEW8Ux80377EufVGcmTROo2bbwLK9XW6Y2HVjOGCkpZTTIbVPd0r3cwKKsTwPrw9GmRxiCz1 ghLyGE/AxELtUUIz827rmxzkkyUqJn4loYp6+K+xXRBYLyiTXyBpuKXIwMJsU2mSC6z0F1iWdjn oTxqK5/Z0M97CqfIZe/SrDBofAxRYp7rjpeHnVq/spa8zdl235slwfpeyuXllYLgZwJuFNgo7Hh hPgP9N0rvS86Ms+BtCuWXgg5jgCA9pbXaigB8w== X-Received: by 2002:a05:6214:20ee:b0:908:23fd:8147 with SMTP id 6a1803df08f44-90830180b97mr5068696d6.23.1785356997367; Wed, 29 Jul 2026 13:29:57 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-9081dd68d45sm32660646d6.33.2026.07.29.13.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 13:29:56 -0700 (PDT) From: Rosen Penev To: netdev@vger.kernel.org Cc: Florian Fainelli , Jonas Gorski , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv3 net-next] net: dsa: b53: srab: propagate errors from init helpers Date: Wed, 29 Jul 2026 13:29:53 -0700 Message-ID: <20260729202953.704662-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert b53_srab_prepare_irq() and b53_srab_mux_init() from void to int-returning functions so probe failures are properly propagated. b53_srab_prepare_irq() now returns -ENOMEM on allocation failure and -EPROBE_DEFER if any port IRQ is not yet available. b53_srab_mux_init() now returns PTR_ERR on ioremap failure instead of silently ignoring it. Check and propagate both return values in b53_srab_probe() so the driver core sees the real error instead of always reaching b53_switch_register(). Add error handling in probe as a result of b53_srab_prepare_irq(). Move mux_config out of private struct. This was needed when devm was not used. Assisted-by: Opencode:Big-Pickle Signed-off-by: Rosen Penev --- v3: move mux_config to function. v2: address memory leak in b53_srab_prepare_irq(). drivers/net/dsa/b53/b53_srab.c | 46 ++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c index b9939bbd2cd5..81bfd5cd1022 100644 --- a/drivers/net/dsa/b53/b53_srab.c +++ b/drivers/net/dsa/b53/b53_srab.c @@ -84,7 +84,6 @@ struct b53_srab_port_priv { struct b53_srab_priv { void __iomem *regs; - void __iomem *mux_config; struct b53_srab_port_priv port_intrs[B53_N_PORTS]; }; @@ -531,7 +530,7 @@ static void b53_srab_intr_set(struct b53_srab_priv *priv, bool set) writel(reg, priv->regs + B53_SRAB_CTRLS); } -static void b53_srab_prepare_irq(struct platform_device *pdev) +static int b53_srab_prepare_irq(struct platform_device *pdev) { struct b53_device *dev = platform_get_drvdata(pdev); struct b53_srab_priv *priv = dev->priv; @@ -551,32 +550,37 @@ static void b53_srab_prepare_irq(struct platform_device *pdev) name = kasprintf(GFP_KERNEL, "link_state_p%d", i); if (!name) - return; + return -ENOMEM; port->num = i; port->dev = dev; port->irq = platform_get_irq_byname_optional(pdev, name); kfree(name); + if (port->irq == -EPROBE_DEFER) + return port->irq; } b53_srab_intr_set(priv, true); + + return 0; } -static void b53_srab_mux_init(struct platform_device *pdev) +static int b53_srab_mux_init(struct platform_device *pdev) { struct b53_device *dev = platform_get_drvdata(pdev); struct b53_srab_priv *priv = dev->priv; struct b53_srab_port_priv *p; + void __iomem *mux_config; unsigned int port; u32 reg, off = 0; int ret; - if (dev->pdata && dev->pdata->chip_id != BCM58XX_DEVICE_ID) - return; + if (!dev->pdata || dev->pdata->chip_id != BCM58XX_DEVICE_ID) + return 0; - priv->mux_config = devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(priv->mux_config)) - return; + mux_config = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(mux_config)) + return PTR_ERR(mux_config); /* Obtain the port mux configuration so we know which lanes * actually map to SerDes lanes @@ -584,7 +588,7 @@ static void b53_srab_mux_init(struct platform_device *pdev) for (port = 5; port > 3; port--, off += 4) { p = &priv->port_intrs[port]; - reg = readl(priv->mux_config + B53_MUX_CONFIG_P5 + off); + reg = readl(mux_config + B53_MUX_CONFIG_P5 + off); switch (reg & MUX_CONFIG_MASK) { case MUX_CONFIG_SGMII: p->mode = PHY_INTERFACE_MODE_SGMII; @@ -613,6 +617,8 @@ static void b53_srab_mux_init(struct platform_device *pdev) dev_info(&pdev->dev, "Port %d mode: %s\n", port, phy_modes(p->mode)); } + + return 0; } static int b53_srab_probe(struct platform_device *pdev) @@ -622,6 +628,7 @@ static int b53_srab_probe(struct platform_device *pdev) const struct of_device_id *of_id = NULL; struct b53_srab_priv *priv; struct b53_device *dev; + int err; if (dn) of_id = of_match_node(b53_srab_of_match, dn); @@ -651,10 +658,23 @@ static int b53_srab_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dev); - b53_srab_prepare_irq(pdev); - b53_srab_mux_init(pdev); + err = b53_srab_prepare_irq(pdev); + if (err) + return err; + + err = b53_srab_mux_init(pdev); + if (err) + goto err_irq; + + err = b53_switch_register(dev); + if (err) + goto err_irq; + + return 0; - return b53_switch_register(dev); +err_irq: + b53_srab_intr_set(priv, false); + return err; } static void b53_srab_remove(struct platform_device *pdev) -- 2.55.0