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

Commit 32761add authored by Bhadram Varka's avatar Bhadram Varka Committed by Greg Kroah-Hartman
Browse files

stmmac: fix DMA channel hang in half-duplex mode 



[ Upstream commit b6cfffa7 ]

HW does not support Half-duplex mode in multi-queue
scenario. Fix it by not advertising the Half-Duplex
mode if multi-queue enabled.

Signed-off-by: default avatarBhadram Varka <vbhadram@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e90946b

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

+10 −0
Original line number Diff line number Diff line
@@ -914,6 +914,7 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv) 
static int stmmac_init_phy(struct net_device *dev)

{

	struct stmmac_priv *priv = netdev_priv(dev);

	u32 tx_cnt = priv->plat->tx_queues_to_use;

	struct phy_device *phydev;

	char phy_id_fmt[MII_BUS_ID_SIZE + 3];

	char bus_id[MII_BUS_ID_SIZE];
@@ -954,6 +955,15 @@ static int stmmac_init_phy(struct net_device *dev) 
		phydev->advertising &= ~(SUPPORTED_1000baseT_Half |

					 SUPPORTED_1000baseT_Full);



	/*

	 * Half-duplex mode not supported with multiqueue

	 * half-duplex can only works with single queue

	 */

	if (tx_cnt > 1)

		phydev->supported &= ~(SUPPORTED_1000baseT_Half |

				       SUPPORTED_100baseT_Half |

				       SUPPORTED_10baseT_Half);



	/*

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

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