iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: stmmac: check if MAC needs to attach to a PHY

Browse Source 
[ Upstream commit fe2cfbc968 ]

After the introduction of the fixed-link support, the MAC driver
no longer attempt to scan for a PHY to attach to. This causes the
non fixed-link setups to stop working.

Using the phylink_expects_phy() to check and determine if the MAC
should expect and attach a PHY.

Fixes: ab21cf9209 ("net: stmmac: make mdio register skips PHY scanning for fixed-link")
Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
Signed-off-by: Lai Peter Jun Ann <peter.jun.ann.lai@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michael Sit Wei Hong
2023-03-30 17:14:03 +08:00
committed by Greg Kroah-Hartman
parent 2b15feabc9
commit 1aca718e1a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -1133,6 +1133,7 @@ static int stmmac_init_phy(struct net_device *dev)
{ {
struct stmmac_priv *priv = netdev_priv(dev); struct stmmac_priv *priv = netdev_priv(dev);
struct fwnode_handle *fwnode; struct fwnode_handle *fwnode;
bool phy_needed;
int ret; int ret;
fwnode = of_fwnode_handle(priv->plat->phylink_node); fwnode = of_fwnode_handle(priv->plat->phylink_node);
@ -1142,10 +1143,11 @@ static int stmmac_init_phy(struct net_device *dev)
if (fwnode) if (fwnode)
ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0); ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0);
phy_needed = phylink_expects_phy(priv->phylink);
/* Some DT bindings do not set-up the PHY handle. Let's try to /* Some DT bindings do not set-up the PHY handle. Let's try to
* manually parse it * manually parse it
*/ */
if (!fwnode || ret) { if (!fwnode || phy_needed || ret) {
int addr = priv->plat->phy_addr; int addr = priv->plat->phy_addr;
struct phy_device *phydev; struct phy_device *phydev;