From: Alexander Stein <alexander.stein@ew.tq-group.com>
To: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Jose Abreu <joabreu@synopsys.com>,
"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Cc: "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>,
netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH net-next] net: stmmac: failure to probe without MAC interface specified
Date: Tue, 29 Aug 2023 16:05:03 +0200 [thread overview]
Message-ID: <4507976.LvFx2qVVIh@steina-w> (raw)
In-Reply-To: <E1qayn0-006Q8J-GE@rmk-PC.armlinux.org.uk>
Am Dienstag, 29. August 2023, 15:29:50 CEST schrieb Russell King (Oracle):
> Alexander Stein reports that commit a014c35556b9 ("net: stmmac: clarify
> difference between "interface" and "phy_interface"") caused breakage,
> because plat->mac_interface will never be negative. Fix this by using
> the "rc" temporary variable in stmmac_probe_config_dt().
>
> Reported-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> ---
> I don't think the net tree is up to date with the net-next, so this
> patch needs applying to net-next preferably before the pull request
> to fix a regression.
On top of next-20230829:
Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Thanks
> Thanks.
>
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index
> 35f4b1484029..0f28795e581c 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -419,9 +419,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8
> *mac) return ERR_PTR(phy_mode);
>
> plat->phy_interface = phy_mode;
> - plat->mac_interface = stmmac_of_get_mac_mode(np);
> - if (plat->mac_interface < 0)
> - plat->mac_interface = plat->phy_interface;
> + rc = stmmac_of_get_mac_mode(np);
> + plat->mac_interface = rc < 0 ? plat->phy_interface : rc;
>
> /* Some wrapper drivers still rely on phy_node. Let's save it while
> * they are not converted to phylink. */
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq-group.com/
next prev parent reply other threads:[~2023-08-29 14:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 13:29 [PATCH net-next] net: stmmac: failure to probe without MAC interface specified Russell King (Oracle)
2023-08-29 14:05 ` Alexander Stein [this message]
2023-08-31 1:40 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4507976.LvFx2qVVIh@steina-w \
--to=alexander.stein@ew.tq-group.com \
--cc=alexandre.torgue@foss.st.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rmk+kernel@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).