Commit 15c22101 authored by Linus Walleij's avatar Linus Walleij Committed by Jakub Kicinski
Browse files

net: ethernet: cortina: Use negotiated TX/RX pause 



Instead of directly poking into registers of the PHY, use
the existing function to query phylib about this directly.

Suggested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240529-gemini-phylib-fixes-v4-2-16487ca4c2fe@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a967d3ce

drivers/net/ethernet/cortina/gemini.c

+5 −10
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ static void gmac_adjust_link(struct net_device *netdev) 
	struct gemini_ethernet_port *port = netdev_priv(netdev);

	struct phy_device *phydev = netdev->phydev;

	union gmac_status status, old_status;

	int pause_tx = 0;

	int pause_rx = 0;

	bool pause_tx = false;

	bool pause_rx = false;



	status.bits32 = readl(port->gmac_base + GMAC_STATUS);

	old_status.bits32 = status.bits32;
@@ -329,14 +329,9 @@ static void gmac_adjust_link(struct net_device *netdev) 
	}



	if (phydev->duplex == DUPLEX_FULL) {

		u16 lcladv = phy_read(phydev, MII_ADVERTISE);

		u16 rmtadv = phy_read(phydev, MII_LPA);

		u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);



		if (cap & FLOW_CTRL_RX)

			pause_rx = 1;

		if (cap & FLOW_CTRL_TX)

			pause_tx = 1;

		phy_get_pause(phydev, &pause_tx, &pause_rx);

		netdev_dbg(netdev, "set negotiated pause params pause TX = %s, pause RX = %s\n",

			   pause_tx ? "ON" : "OFF", pause_rx ? "ON" : "OFF");

	}



	gmac_set_flow_control(netdev, pause_tx, pause_rx);