From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 4B2C33E49F6 for ; Fri, 14 Aug 2026 21:16:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786742169; cv=none; b=eNGRssjTzih1v3PeIhHlhRiL+uYpqvaqzguf6jFzJ6o3Wtp9I2xp/mT6dDouGwJeyAmephdC26zMtSbzT2212Q+tLnyT0+Q7IkZj+XJICWklZb8DUngYxbe0ufMm4os5N/OigUKy1fgMLqbipDQ+WnntAmUTnjNNPtx9/YSrFpA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786742169; c=relaxed/simple; bh=olW/oaiu18B2Xf7Gdi6WTgFTrvmTZ5V4wg8vNM698Lg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GJkNuqLmM/JeuvShyZGNhCqe3zhSa1dJFQSUzUEmPGwkUuv66F7E9tBEdt2fwJ5tkJIqOOodb7cLgN84qbv74rVYYi7KiRPBRZrHK3B0LEisYoFSKDp95r03Rz4ocIpFp1cJmaexT/ZlpjeeZ9CJwXiPiKWOIB+5aRMD1oaLoB0= 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=D+/YL2sR; arc=none smtp.client-ip=209.85.160.182 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="D+/YL2sR" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-52d7a3defe8so9420131cf.0 for ; Fri, 14 Aug 2026 14:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786742167; x=1787346967; 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=iUuph7+GUGabAzz9uo8lYg5bSl89amlm6cPhmSveu4Q=; b=D+/YL2sRf/UTeI/YrpGvUMDKhJdiVvqMUMpDKe5T7pfpH6g6maZ25JUDxHim095Vbg CGPgvboJL0elz5fMHcRlqON6ZOyIbDnMNnJTaCRZbLFdK5pg9/FZQUwOXEAFUrTEVFz+ ll08XVpUjujb/662c5K9Lejb/U3aUy38hDEynbx4d5WK/JV1cxI870wXFJ0Xnry8jUVk 0NeFURUuWrtyfg2sJ55llAcqOkovjHS8InJhxtBqex9yVVgx8qa58cClCSLHho8mhNUc GviGnyjcWGNwLQeKxB95mCv48GQjjEdAz50yeHVn3eLfN8/7JpEVagZFTjB/+XqlKKgy 580A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786742167; x=1787346967; 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=iUuph7+GUGabAzz9uo8lYg5bSl89amlm6cPhmSveu4Q=; b=Tr6bL/QK2oFUe3K704xqGQjpCUfES+86BMevgaz0TBuXYOvDmjRTJrQ6qEMVF+1Kef YQO324WwtDPgrMa9iE9B2cs40cJ/qLhdzJGYdo7I6LZNe7erue+iEyng4Fou6B3OOzru psjshIu+G3laxWElB8tq9Ni/HBqqOfDgh1a+fPBTh1QFH1PhjlHpTj0LmilKBQUzcDyB 68yxL9D1CXNpBrdxO3m8xzKNvm+TzDBl7bfR9WAmvFzlR6N4yKRGEUqzXEF/S/u2mRVt iEtBJT1HxgMK0tEcoUtWr4t+HYvHRjteuOJ/NOYqQDejBECPqs/Hw/g1wBuUyv3cbzPI 91NQ== X-Forwarded-Encrypted: i=1; AHgh+RoUN42svV3lXCZ6/DqC4UE3lS/GUlENigg/KlybHJsE1i7VR1aXiApnWmGC3M+LWpYZJn9km7yPFITHqt8=@vger.kernel.org X-Gm-Message-State: AOJu0Yzt4JMGjcWu5Bssr/zYbiP0dsyzCJCH7cWbBGfmBhHfU/O7e2Kj L4S8HKFGbJd0HMvYpqAeVHSOxhcO4xrMwQ29l15BgeK9kf3hO9tkYfLk X-Gm-Gg: AR+sD11yFeLhosRt5JSmj5Wu+LaBSfs1R7+ktbkL5h+ivXa/1cLzpSaJUc2vID6eRXH YDiOL+/IjQCncg86c+NRk/VJvlnkPAlovRFlislIgUjAOHABdG7zNi4qPG9alAX6kvWtaHX+Vme xJiZo+oIzf73rC0loNRjvRGGHq9boWcRPD1MGhE5YnQ3rPPGRbhtnNTiuyFj4o/G+vPb2VBIxpj hhcC8BDgfJeLjUOYVM6yaBuX1lKv8WgmM1J1VgIukTCLIxuYuwZvHdixMdWugU8l07+zCTwDu1i hvxpZGIaLj9IHLAYy8mTY4wh2XcXbAdj0YJgWLX0JVh8yQ31QofT0Q/bUt+sctudghsCKF/64ax ydu/XSEPzAaIvJRLMdtlwWFWlPFNdcsqDdZATbP/p9vvBPGDt7B2iO9ljgA7jmVyBfD2xDbpcEH FFbaUZD5kekg87UzsczQnIQgn/SJALb+tmPif2LXgYMgT+CL191vXe3+pje6dx93cEsaO9LRzyE cgJG/xHhCgql35no7BP6xLi9zF9QmCiIKD2Ug3HzCscQbbpqeyNE5iJNKeURsmeUiO1wK7d7/Zz POcBrdgl89eKEsDxgBw678tlg3/xF9XnluQMHzcZ9GwZqyE3 X-Received: by 2002:a05:622a:418d:b0:517:72e0:612 with SMTP id d75a77b69052e-52d855ae71emr113034251cf.42.1786742167082; Fri, 14 Aug 2026 14:16:07 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-90a9359338dsm25695766d6.44.2026.08.14.14.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 14:16:06 -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: [PATCHv4 net-next] net: dsa: b53: srab: propagate errors from init helpers Date: Fri, 14 Aug 2026 14:16:03 -0700 Message-ID: <20260814211603.53670-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. To keep the same behavior, warn on failure and continue. Return on -EPROBE_DEFER. 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(). Assisted-by: Opencode:Big-Pickle Signed-off-by: Rosen Penev --- v4: ignore b53_srab_mux_init() failure to keep same behavior. v3: move mux_config to function. v2: address memory leak in b53_srab_prepare_irq(). drivers/net/dsa/b53/b53_srab.c | 51 +++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c index b9939bbd2cd5..d5213e34266a 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,28 @@ 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 == -EPROBE_DEFER) + goto err_irq; + + if (err) + dev_warn(&pdev->dev, + "failed to read port mux config, ports 4 and 5 may be unavailable: %pe\n", + ERR_PTR(err)); + + 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