From: Ong Boon Leong <boon.leong.ong@intel.com>
To: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King i <linux@armlinux.org.uk>,
Alexandre Torgue <alexandre.torgue@st.com>,
Jose Abreu <joabreu@synopsys.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>,
netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Ong Boon Leong <boon.leong.ong@intel.com>,
Voon Weifeng <weifeng.voon@intel.com>,
Wong Vee Khee <vee.khee.wong@intel.com>,
Fugang Duan <fugang.duan@nxp.com>
Subject: [PATCH net-next 5/6] net: stmmac: ensure phydev is attached to phylink for C37 AN
Date: Mon, 15 Mar 2021 13:27:10 +0800 [thread overview]
Message-ID: <20210315052711.16728-6-boon.leong.ong@intel.com> (raw)
In-Reply-To: <20210315052711.16728-1-boon.leong.ong@intel.com>
As the support for MAC-side SGMII C37 AN is added to pcs-xpcs, phydev
should be attached to phylink during driver's open(). So, we change the
condition to "Not C73 AN" instead.
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index b64ee029d41f..e58ff652e95f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2898,7 +2898,7 @@ static int stmmac_open(struct net_device *dev)
if (priv->hw->pcs != STMMAC_PCS_TBI &&
priv->hw->pcs != STMMAC_PCS_RTBI &&
- priv->hw->xpcs == NULL) {
+ priv->hw->xpcs_args.an_mode != DW_AN_C73) {
ret = stmmac_init_phy(dev);
if (ret) {
netdev_err(priv->dev,
--
2.25.1
next prev parent reply other threads:[~2021-03-15 5:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 5:27 [PATCH net-next 0/6] net: pcs, stmmac: add C37 AN SGMII support Ong Boon Leong
2021-03-15 5:27 ` [PATCH net-next 1/6] net: pcs: rearrange C73 functions to prepare for C37 support later Ong Boon Leong
2021-03-15 5:27 ` [PATCH net-next 2/6] net: pcs: add C37 SGMII AN support for intel mGbE controller Ong Boon Leong
2021-03-15 5:27 ` [PATCH net-next 3/6] net: phylink: make phylink_parse_mode() support non-DT platform Ong Boon Leong
2021-03-15 5:27 ` [PATCH net-next 4/6] net: stmmac: make in-band AN mode parsing is supported for non-DT Ong Boon Leong
2021-03-15 5:27 ` Ong Boon Leong [this message]
2021-03-15 5:27 ` [PATCH net-next 6/6] stmmac: intel: add pcs-xpcs for Intel mGbE controller Ong Boon Leong
2021-03-15 20:00 ` [PATCH net-next 0/6] net: pcs, stmmac: add C37 AN SGMII support 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=20210315052711.16728-6-boon.leong.ong@intel.com \
--to=boon.leong.ong@intel.com \
--cc=alexandre.torgue@st.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=fugang.duan@nxp.com \
--cc=hkallweit1@gmail.com \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=vee.khee.wong@intel.com \
--cc=weifeng.voon@intel.com \
/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).