Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ee1dc3 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by David S. Miller
Browse files

stmmac: Stop advertising 1000Base capabilties for non GMII iface (V4). 

This patch stops advertising 1000Base capablities if GMAC is either
configured for MII or RMII mode and on board there is a GPHY plugged on.
Without this patch if an GBit switch is connected on MII interface,
Ethernet stops working at all.

Discovered as part of
https://bugzilla.stlinux.com/show_bug.cgi?id=14148

 triage

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 903e21e2

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+10 −3
Original line number Original line Diff line number Diff line
@@ -304,7 +304,7 @@ static int stmmac_init_phy(struct net_device *dev) 
	struct phy_device *phydev;

	struct phy_device *phydev;

	char phy_id[MII_BUS_ID_SIZE + 3];

	char phy_id[MII_BUS_ID_SIZE + 3];

	char bus_id[MII_BUS_ID_SIZE];

	char bus_id[MII_BUS_ID_SIZE];



	int interface = priv->plat->interface;

	priv->oldlink = 0;

	priv->oldlink = 0;

	priv->speed = 0;

	priv->speed = 0;

	priv->oldduplex = -1;

	priv->oldduplex = -1;
@@ -314,14 +314,21 @@ static int stmmac_init_phy(struct net_device *dev) 
		 priv->plat->phy_addr);

		 priv->plat->phy_addr);

	pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id);

	pr_debug("stmmac_init_phy:  trying to attach to %s\n", phy_id);





	phydev = phy_connect(dev, phy_id, &stmmac_adjust_link, 0,

	phydev = phy_connect(dev, phy_id, &stmmac_adjust_link, 0, interface);

			     priv->plat->interface);





	if (IS_ERR(phydev)) {

	if (IS_ERR(phydev)) {

		pr_err("%s: Could not attach to PHY\n", dev->name);

		pr_err("%s: Could not attach to PHY\n", dev->name);

		return PTR_ERR(phydev);

		return PTR_ERR(phydev);

	}

	}





	/* Stop Advertising 1000BASE Capability if interface is not GMII */

	if ((interface) && ((interface == PHY_INTERFACE_MODE_MII) ||

	    (interface == PHY_INTERFACE_MODE_RMII))) {

		phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |

				      SUPPORTED_Asym_Pause);

		priv->phydev->advertising = priv->phydev->supported;

	}



	/*

	/*

	 * Broken HW is sometimes missing the pull-up resistor on the

	 * Broken HW is sometimes missing the pull-up resistor on the

	 * MDIO line, which results in reads to non-existent devices returning

	 * MDIO line, which results in reads to non-existent devices returning