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

Commit 5f991f7b authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: phy: Add helper for advertise to lcl value 



Add a helper to convert the local advertising to an LCL capabilities,
which is then used to resolve pause flow control settings.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent edc7ccbb

drivers/net/dsa/mt7530.c

+1 −5
Original line number Diff line number Diff line
@@ -658,11 +658,7 @@ static void mt7530_adjust_link(struct dsa_switch *ds, int port, 
			if (phydev->asym_pause)

				rmt_adv |= LPA_PAUSE_ASYM;



			if (phydev->advertising & ADVERTISED_Pause)

				lcl_adv |= ADVERTISE_PAUSE_CAP;

			if (phydev->advertising & ADVERTISED_Asym_Pause)

				lcl_adv |= ADVERTISE_PAUSE_ASYM;



			lcl_adv = ethtool_adv_to_lcl_adv_t(phydev->advertising);

			flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);



			if (flowctrl & FLOW_CTRL_TX)

drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c

+1 −4
Original line number Diff line number Diff line
@@ -1495,10 +1495,7 @@ static void xgbe_phy_phydev_flowctrl(struct xgbe_prv_data *pdata) 
	if (!phy_data->phydev)

		return;



	if (phy_data->phydev->advertising & ADVERTISED_Pause)

		lcl_adv |= ADVERTISE_PAUSE_CAP;

	if (phy_data->phydev->advertising & ADVERTISED_Asym_Pause)

		lcl_adv |= ADVERTISE_PAUSE_ASYM;

	lcl_adv = ethtool_adv_to_lcl_adv_t(phy_data->phydev->advertising);



	if (phy_data->phydev->pause) {

		XGBE_SET_LP_ADV(lks, Pause);

drivers/net/ethernet/freescale/fman/mac.c

+1 −5
Original line number Diff line number Diff line
@@ -393,11 +393,7 @@ void fman_get_pause_cfg(struct mac_device *mac_dev, bool *rx_pause, 
	 */



	/* get local capabilities */

	lcl_adv = 0;

	if (phy_dev->advertising & ADVERTISED_Pause)

		lcl_adv |= ADVERTISE_PAUSE_CAP;

	if (phy_dev->advertising & ADVERTISED_Asym_Pause)

		lcl_adv |= ADVERTISE_PAUSE_ASYM;

	lcl_adv = ethtool_adv_to_lcl_adv_t(phy_dev->advertising);



	/* get link partner capabilities */

	rmt_adv = 0;

drivers/net/ethernet/freescale/gianfar.c

+1 −6
Original line number Diff line number Diff line
@@ -3656,12 +3656,7 @@ static u32 gfar_get_flowctrl_cfg(struct gfar_private *priv) 
		if (phydev->asym_pause)

			rmt_adv |= LPA_PAUSE_ASYM;



		lcl_adv = 0;

		if (phydev->advertising & ADVERTISED_Pause)

			lcl_adv |= ADVERTISE_PAUSE_CAP;

		if (phydev->advertising & ADVERTISED_Asym_Pause)

			lcl_adv |= ADVERTISE_PAUSE_ASYM;



		lcl_adv = ethtool_adv_to_lcl_adv_t(phydev->advertising);

		flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);

		if (flowctrl & FLOW_CTRL_TX)

			val |= MACCFG1_TX_FLOW;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+1 −5
Original line number Diff line number Diff line
@@ -5006,11 +5006,7 @@ int hclge_cfg_flowctrl(struct hclge_dev *hdev) 
	if (!phydev->link || !phydev->autoneg)

		return 0;



	if (phydev->advertising & ADVERTISED_Pause)

		local_advertising = ADVERTISE_PAUSE_CAP;



	if (phydev->advertising & ADVERTISED_Asym_Pause)

		local_advertising |= ADVERTISE_PAUSE_ASYM;

	local_advertising = ethtool_adv_to_lcl_adv_t(phydev->advertising);



	if (phydev->pause)

		remote_advertising = LPA_PAUSE_CAP;