Message ID | 20231211-b4-stmmac-handle-mdio-enodev-v1-1-73c20c44f8d6@redhat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7349847vqy; Mon, 11 Dec 2023 13:31:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMYMozRgmO/gXNiYIv6ZrQmLlDpStL3jMTVEvv6M5SPhSdU9GmJzICKbjpfzi8aDfEscma X-Received: by 2002:a05:6a00:10d1:b0:6ce:5fc9:8d8d with SMTP id d17-20020a056a0010d100b006ce5fc98d8dmr2769301pfu.14.1702330316149; Mon, 11 Dec 2023 13:31:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702330316; cv=none; d=google.com; s=arc-20160816; b=AqdRGOvW4NXaNTcy/fz1T4KJL1+NqnYdzq3nTnlxOVTk501VtleVCYStXatWx9jiJa pmk5Y9U7t9gtPikIafMUeAhVURq8SWgwA+UrQODVMajZEIz9gMA+AGZhZafE0dDE34OC Y44i5mndFcOgVModxQlyDwkhnVNmdA52GjTc/QLGTRmnBOHRWvPUwgqy3UpD1qex9zKw chjuEYhBknpm1KImbrjti7Uxwwa2byfhidMSOEAzUhuVH1CoPWQG052CEPPfzaQv30/h Q7eOUMi5+acP3Stj07gGvuA3lQ1AnJMWoWWu5QwBkkSAzztf2Tlduh0rNvjFTjajhDdF DaUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=3m2lRSq/x6O1AvE2D5Tmo4LBWE3DJjeKHdxsqLlOX9k=; fh=1Y5nX35coyO4igDVd7iwjrwViv6+rfvO+PB2pWweuxg=; b=BJqMO2hCpH5jdid76LqQShxqQukNti+dUQxDatzWU3SOX7HEDc8mhz5bd2P8R+9eQ+ M9cBJsDbVijKFq1LKY5OH/J6saRxCXg01L03aXgcwAEg+A6Tys58whoH9D6iAa2pbqAo WYFGXOjuIHBH2q+9/QKZgCgT0qqfTdwAZ3TWWNesBvrt32cweY4Dk4AFa6JDdAgl/dnz 2NBEfdpugXqZDyRv8r1SR4SQnWpaxsDorKjapZPiTNoZIjHQssF8xQJ65fdsKtWNaglp NVmIy764/iF8/2n5RPgWU0lT6xKDJU+fuVpRvU2sXHljf/1se0sJIJmVa04iig+V/1Q8 2lVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XSq9T581; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id i12-20020a63cd0c000000b005c676c2d80bsi6554116pgg.389.2023.12.11.13.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 13:31:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XSq9T581; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 05349805CAB2; Mon, 11 Dec 2023 13:31:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344937AbjLKVbn (ORCPT <rfc822;dexuan.linux@gmail.com> + 99 others); Mon, 11 Dec 2023 16:31:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230073AbjLKVbm (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 11 Dec 2023 16:31:42 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AE70CE for <linux-kernel@vger.kernel.org>; Mon, 11 Dec 2023 13:31:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702330307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3m2lRSq/x6O1AvE2D5Tmo4LBWE3DJjeKHdxsqLlOX9k=; b=XSq9T5819UXeCy2oCcVbcqkO/PEl5Xy3hWna1/qq4FdejdYPoNVKW98uZ5ksKSscY8kCuB vfSMMXVFtIZCjRfXRqN4MfFACaEHeLp5KzIUWQKTPjCm9n6dIBCo4tGpiqCAePaDLpG5KO G3i5untxB/se+NGqsAnMHJ/MUFV1aHE= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-64-OgT3NVCfNTqrN1w6xMuSAg-1; Mon, 11 Dec 2023 16:31:40 -0500 X-MC-Unique: OgT3NVCfNTqrN1w6xMuSAg-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-67aa2707000so70442456d6.3 for <linux-kernel@vger.kernel.org>; Mon, 11 Dec 2023 13:31:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702330299; x=1702935099; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3m2lRSq/x6O1AvE2D5Tmo4LBWE3DJjeKHdxsqLlOX9k=; b=mp9Ged/8CS1pXsRMWZ7i4um4+vpQzU9LAFwiMzHEzT7VfRfV0O7hKzSkN898PqMuE5 9nrn8D2SW99A9dSuLoGUPPAUwSBw+AVkJkserZeXy+Ezaz4yS6hd9wDLMCdaRTNBs2ot yJfuSfYx6zCJABut+QaOIbr0N6lCox3vQRnxwXKVV0VY+H+VOU0Qq4+BxuQ7Vg8I4QiG Yopqm+lKGNChQq/WvE2C6Ws8Rh+jw2umyLLhg0W9xgt1X5HZvoRd0f/oFv/yjUL2d+FA /9zVOSBHqhN30LM2l9wyoMLUxUzsHbmp66hG+h7BbDN4whOXlo2HllEu5MGf747U+07a o9XQ== X-Gm-Message-State: AOJu0YyNXGgh/NRabNvV6Pd8id4BZI2lM5Tm8rVS2nEHC4Z6+2tHXY6r xVyPlTlVtcvtjzVn9oRTbf587WJbbBDM5W7/9h29sPoRaWgs8jBbd2nomaO+3LPpWGh2PNdXbW1 k68dhP4uoPsYPXGrngT4rYTY8 X-Received: by 2002:a0c:fb42:0:b0:67a:98bc:4b45 with SMTP id b2-20020a0cfb42000000b0067a98bc4b45mr6325899qvq.25.1702330299795; Mon, 11 Dec 2023 13:31:39 -0800 (PST) X-Received: by 2002:a0c:fb42:0:b0:67a:98bc:4b45 with SMTP id b2-20020a0cfb42000000b0067a98bc4b45mr6325895qvq.25.1702330299614; Mon, 11 Dec 2023 13:31:39 -0800 (PST) Received: from [192.168.1.164] ([2600:1700:1ff0:d0e0::37]) by smtp.gmail.com with ESMTPSA id t18-20020a05621405d200b00677a12f11bcsm3579945qvz.24.2023.12.11.13.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 13:31:39 -0800 (PST) From: Andrew Halaney <ahalaney@redhat.com> Date: Mon, 11 Dec 2023 15:31:17 -0600 Subject: [PATCH net] net: stmmac: Handle disabled MDIO busses from devicetree MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231211-b4-stmmac-handle-mdio-enodev-v1-1-73c20c44f8d6@redhat.com> X-B4-Tracking: v=1; b=H4sIAKR/d2UC/x3MQQrCMBBG4auUWTvgxBKCVxEXMfOrAyaRpJRC6 d0NLj8evJ06mqHTddqpYbVutQzIaaL0juUFNh0md3YXcSL8mLkvOcfEI+sHnNUqo1TFysGJDwo fko80Ft+Gp23//Y0KFrofxw8QHoykcwAAAA== To: Alexandre Torgue <alexandre.torgue@foss.st.com>, Jose Abreu <joabreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Andrew Lunn <andrew@lunn.ch>, Serge Semin <fancer.lancer@gmail.com>, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Halaney <ahalaney@redhat.com> X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 11 Dec 2023 13:31:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785022713314121483 X-GMAIL-MSGID: 1785022713314121483 |
Series |
[net] net: stmmac: Handle disabled MDIO busses from devicetree
|
|
Commit Message
Andrew Halaney
Dec. 11, 2023, 9:31 p.m. UTC
Many hardware configurations have the MDIO bus disabled, and are instead
using some other MDIO bus to talk to the MAC's phy.
of_mdiobus_register() returns -ENODEV in this case. Let's handle it
gracefully instead of failing to probe the MAC.
Fixes: 47dd7a540b8a (net: add support for STMicroelectronics Ethernet controllers.")
Signed-off-by: Andrew Halaney <ahalaney@redhat.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
base-commit: bbd220ce4e29ed55ab079007cff0b550895258eb
change-id: 20231211-b4-stmmac-handle-mdio-enodev-82168de68c6a
Best regards,
Comments
On Mon, Dec 11, 2023 at 03:31:17PM -0600, Andrew Halaney wrote: > Many hardware configurations have the MDIO bus disabled, and are instead > using some other MDIO bus to talk to the MAC's phy. > > of_mdiobus_register() returns -ENODEV in this case. Let's handle it > gracefully instead of failing to probe the MAC. > > Fixes: 47dd7a540b8a (net: add support for STMicroelectronics Ethernet controllers.") > Signed-off-by: Andrew Halaney <ahalaney@redhat.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > index fa9e7e7040b9..a39be15d41a8 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > @@ -591,7 +591,13 @@ int stmmac_mdio_register(struct net_device *ndev) > new_bus->parent = priv->device; > > err = of_mdiobus_register(new_bus, mdio_node); > - if (err != 0) { > + if (err) { > + if (err == -ENODEV) { > + /* The bus is disabled in the devicetree, that's ok */ > + mdiobus_free(new_bus); > + return 0; > + } > + > dev_err_probe(dev, err, "Cannot register the MDIO bus\n"); > goto bus_register_fail; > } This can be implemented a bit simpler, more maintainable and saving one indentations level: err = of_mdiobus_register(new_bus, mdio_node); if (err == -ENODEV) { err = 0; dev_warn(dev, "MDIO bus is disabled\n"); goto bus_register_fail; } else if (err) { dev_err_probe(dev, err, "Cannot register the MDIO bus\n"); goto bus_register_fail; } -Serge(y) > > --- > base-commit: bbd220ce4e29ed55ab079007cff0b550895258eb > change-id: 20231211-b4-stmmac-handle-mdio-enodev-82168de68c6a > > Best regards, > -- > Andrew Halaney <ahalaney@redhat.com> >
On Tue, Dec 12, 2023 at 01:59:25PM +0300, Serge Semin wrote: > On Mon, Dec 11, 2023 at 03:31:17PM -0600, Andrew Halaney wrote: > > Many hardware configurations have the MDIO bus disabled, and are instead > > using some other MDIO bus to talk to the MAC's phy. > > > > of_mdiobus_register() returns -ENODEV in this case. Let's handle it > > gracefully instead of failing to probe the MAC. > > > > Fixes: 47dd7a540b8a (net: add support for STMicroelectronics Ethernet controllers.") > > Signed-off-by: Andrew Halaney <ahalaney@redhat.com> > > --- > > drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > > index fa9e7e7040b9..a39be15d41a8 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > > @@ -591,7 +591,13 @@ int stmmac_mdio_register(struct net_device *ndev) > > new_bus->parent = priv->device; > > > > err = of_mdiobus_register(new_bus, mdio_node); > > - if (err != 0) { > > + if (err) { > > + if (err == -ENODEV) { > > + /* The bus is disabled in the devicetree, that's ok */ > > + mdiobus_free(new_bus); > > + return 0; > > + } > > + > > dev_err_probe(dev, err, "Cannot register the MDIO bus\n"); > > goto bus_register_fail; > > } > > This can be implemented a bit simpler, more maintainable and saving > one indentations level: > > err = of_mdiobus_register(new_bus, mdio_node); > if (err == -ENODEV) { > err = 0; > dev_warn(dev, "MDIO bus is disabled\n"); Thanks for all your reviews, I agree this is cleaner! I'm going to opt to use dev_info() here as this isn't something that's wrong, just worth noting. > goto bus_register_fail; > } else if (err) { > dev_err_probe(dev, err, "Cannot register the MDIO bus\n"); > goto bus_register_fail; > } > > -Serge(y) > > > > > --- > > base-commit: bbd220ce4e29ed55ab079007cff0b550895258eb > > change-id: 20231211-b4-stmmac-handle-mdio-enodev-82168de68c6a > > > > Best regards, > > -- > > Andrew Halaney <ahalaney@redhat.com> > > >
On Mon, Dec 11, 2023 at 03:31:17PM -0600, Andrew Halaney wrote: > Many hardware configurations have the MDIO bus disabled, and are instead > using some other MDIO bus to talk to the MAC's phy. > > of_mdiobus_register() returns -ENODEV in this case. Let's handle it > gracefully instead of failing to probe the MAC. > > Fixes: 47dd7a540b8a (net: add support for STMicroelectronics Ethernet controllers.") nit: the tag above is malformed, there is a '"' missing before 'net:'. Fixes: 47dd7a540b8a ("net: add support for STMicroelectronics Ethernet controllers.") > Signed-off-by: Andrew Halaney <ahalaney@redhat.com> ...
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index fa9e7e7040b9..a39be15d41a8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -591,7 +591,13 @@ int stmmac_mdio_register(struct net_device *ndev) new_bus->parent = priv->device; err = of_mdiobus_register(new_bus, mdio_node); - if (err != 0) { + if (err) { + if (err == -ENODEV) { + /* The bus is disabled in the devicetree, that's ok */ + mdiobus_free(new_bus); + return 0; + } + dev_err_probe(dev, err, "Cannot register the MDIO bus\n"); goto bus_register_fail; }