Commit 76e81a5a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-phy-switch-eee_broken_modes-to-linkmode-bitmap-and-add-accessor' 

Heiner Kallweit says:

====================
net: phy: switch eee_broken_modes to linkmode bitmap and add accessor

eee_broken_modes has a eee_cap1 register layout currently. This doesn't
allow to flag e.g. 2.5Gbps or 5Gbps BaseT EEE as broken. To overcome
this limitation switch eee_broken_modes to a linkmode bitmap.
Add an accessor for the bitmap and use it in r8169.
====================

Link: https://patch.msgid.link/405734c5-0ed4-40e4-9ac9-91084b9536d6@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a79993b5 e340bff2

drivers/net/ethernet/realtek/r8169_main.c

+6 −0
Original line number Diff line number Diff line
@@ -5228,6 +5228,12 @@ static int r8169_mdio_register(struct rtl8169_private *tp) 
		phy_support_eee(tp->phydev);

	phy_support_asym_pause(tp->phydev);



	/* mimic behavior of r8125/r8126 vendor drivers */

	if (tp->mac_version == RTL_GIGA_MAC_VER_61)

		phy_set_eee_broken(tp->phydev,

				   ETHTOOL_LINK_MODE_2500baseT_Full_BIT);

	phy_set_eee_broken(tp->phydev, ETHTOOL_LINK_MODE_5000baseT_Full_BIT);



	/* PHY will be woken up in rtl_open() */

	phy_suspend(tp->phydev);

drivers/net/ethernet/realtek/r8169_phy_config.c

+4 −12
Original line number Diff line number Diff line
@@ -96,15 +96,7 @@ static void rtl8125_common_config_eee_phy(struct phy_device *phydev) 
	phy_modify_paged(phydev, 0xa4a, 0x11, 0x0200, 0x0000);

}



static void rtl8125a_config_eee_phy(struct phy_device *phydev)

{

	rtl8168g_config_eee_phy(phydev);

	/* disable EEE at 2.5Gbps */

	phy_modify_paged(phydev, 0xa6d, 0x12, 0x0001, 0x0000);

	rtl8125_common_config_eee_phy(phydev);

}



static void rtl8125b_config_eee_phy(struct phy_device *phydev)

static void rtl8125_config_eee_phy(struct phy_device *phydev)

{

	rtl8168g_config_eee_phy(phydev);

	rtl8125_common_config_eee_phy(phydev);
@@ -1066,7 +1058,7 @@ static void rtl8125a_2_hw_phy_config(struct rtl8169_private *tp, 
	rtl8168g_enable_gphy_10m(phydev);



	rtl8168g_disable_aldps(phydev);

	rtl8125a_config_eee_phy(phydev);

	rtl8125_config_eee_phy(phydev);

}



static void rtl8125b_hw_phy_config(struct rtl8169_private *tp,
@@ -1106,7 +1098,7 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp, 


	rtl8125_legacy_force_mode(phydev);

	rtl8168g_disable_aldps(phydev);

	rtl8125b_config_eee_phy(phydev);

	rtl8125_config_eee_phy(phydev);

}



static void rtl8125d_hw_phy_config(struct rtl8169_private *tp,
@@ -1116,7 +1108,7 @@ static void rtl8125d_hw_phy_config(struct rtl8169_private *tp, 
	rtl8168g_enable_gphy_10m(phydev);

	rtl8125_legacy_force_mode(phydev);

	rtl8168g_disable_aldps(phydev);

	rtl8125b_config_eee_phy(phydev);

	rtl8125_config_eee_phy(phydev);

}



static void rtl8126a_hw_phy_config(struct rtl8169_private *tp,

drivers/net/phy/micrel.c

+1 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,7 @@ static int ksz9477_config_init(struct phy_device *phydev) 
	 * in this switch shall be regarded as broken.

	 */

	if (phydev->dev_flags & MICREL_NO_EEE)

		phydev->eee_broken_modes = -1;

		linkmode_fill(phydev->eee_broken_modes);



	return kszphy_config_init(phydev);

}

drivers/net/phy/phy-c45.c

+5 −7
Original line number Diff line number Diff line
@@ -683,15 +683,13 @@ EXPORT_SYMBOL_GPL(genphy_c45_read_mdix); 
static int genphy_c45_write_eee_adv(struct phy_device *phydev,

				    unsigned long *adv)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);

	int val, changed = 0;



	if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) {

		val = linkmode_to_mii_eee_cap1_t(adv);

	linkmode_andnot(tmp, adv, phydev->eee_broken_modes);



		/* In eee_broken_modes are stored MDIO_AN_EEE_ADV specific raw

		 * register values.

		 */

		val &= ~phydev->eee_broken_modes;

	if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP1_FEATURES)) {

		val = linkmode_to_mii_eee_cap1_t(tmp);



		/* IEEE 802.3-2018 45.2.7.13 EEE advertisement 1

		 * (Register 7.60)
@@ -709,7 +707,7 @@ static int genphy_c45_write_eee_adv(struct phy_device *phydev, 
	}



	if (linkmode_intersects(phydev->supported_eee, PHY_EEE_CAP2_FEATURES)) {

		val = linkmode_to_mii_eee_cap2_t(adv);

		val = linkmode_to_mii_eee_cap2_t(tmp);



		/* IEEE 802.3-2022 45.2.7.16 EEE advertisement 2

		 * (Register 7.62)

drivers/net/phy/phy-core.c

+9 −12
Original line number Diff line number Diff line
@@ -388,28 +388,25 @@ void of_set_phy_supported(struct phy_device *phydev) 
void of_set_phy_eee_broken(struct phy_device *phydev)

{

	struct device_node *node = phydev->mdio.dev.of_node;

	u32 broken = 0;

	unsigned long *modes = phydev->eee_broken_modes;



	if (!IS_ENABLED(CONFIG_OF_MDIO))

	if (!IS_ENABLED(CONFIG_OF_MDIO) || !node)

		return;



	if (!node)

		return;

	linkmode_zero(modes);



	if (of_property_read_bool(node, "eee-broken-100tx"))

		broken |= MDIO_EEE_100TX;

		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, modes);

	if (of_property_read_bool(node, "eee-broken-1000t"))

		broken |= MDIO_EEE_1000T;

		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, modes);

	if (of_property_read_bool(node, "eee-broken-10gt"))

		broken |= MDIO_EEE_10GT;

		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, modes);

	if (of_property_read_bool(node, "eee-broken-1000kx"))

		broken |= MDIO_EEE_1000KX;

		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT, modes);

	if (of_property_read_bool(node, "eee-broken-10gkx4"))

		broken |= MDIO_EEE_10GKX4;

		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT, modes);

	if (of_property_read_bool(node, "eee-broken-10gkr"))

		broken |= MDIO_EEE_10GKR;



	phydev->eee_broken_modes = broken;

		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT, modes);

}



/**