Commit fef599ff authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-phy-realtek-complete-5gbps-support-and-replace-private-constants' 

Heiner Kallweit says:

====================
net: phy: realtek: complete 5Gbps support and replace private constants

Realtek maps standard C45 registers to vendor-specific registers which
can be accessed via C22 w/o MMD. For an unknown reason C22 MMD access
to C45 registers isn't supported for integrated PHY's.
However the vendor-specific registers preserve the format of the C45
registers, so we can use standard constants. First two patches are
cherry-picked from a series posted by Marek some time ago.

RTL8126 supports 5Gbps, therefore add the missing 5Gbps support to
rtl822x_config_aneg().
====================

Link: https://lore.kernel.org/r/31a83fd9-90ce-402a-84c7-d5c20540b730@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9736c648 db1bb774

drivers/net/phy/realtek.c

+18 −18
Original line number Diff line number Diff line
@@ -57,14 +57,6 @@ 
#define RTL8366RB_POWER_SAVE			0x15

#define RTL8366RB_POWER_SAVE_ON			BIT(12)



#define RTL_SUPPORTS_5000FULL			BIT(14)

#define RTL_SUPPORTS_2500FULL			BIT(13)

#define RTL_SUPPORTS_10000FULL			BIT(0)

#define RTL_ADV_2500FULL			BIT(7)

#define RTL_LPADV_10000FULL			BIT(11)

#define RTL_LPADV_5000FULL			BIT(6)

#define RTL_LPADV_2500FULL			BIT(5)



#define RTL9000A_GINMR				0x14

#define RTL9000A_GINMR_LINK_STATUS		BIT(4)
@@ -674,11 +666,11 @@ static int rtl822x_get_features(struct phy_device *phydev) 
		return val;



	linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,

			 phydev->supported, val & RTL_SUPPORTS_2500FULL);

			 phydev->supported, val & MDIO_PMA_SPEED_2_5G);

	linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,

			 phydev->supported, val & RTL_SUPPORTS_5000FULL);

			 phydev->supported, val & MDIO_PMA_SPEED_5G);

	linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

			 phydev->supported, val & RTL_SUPPORTS_10000FULL);

			 phydev->supported, val & MDIO_SPEED_10G);



	return genphy_read_abilities(phydev);

}
@@ -688,14 +680,19 @@ static int rtl822x_config_aneg(struct phy_device *phydev) 
	int ret = 0;



	if (phydev->autoneg == AUTONEG_ENABLE) {

		u16 adv2500 = 0;

		u16 adv = 0;



		if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,

				      phydev->advertising))

			adv2500 = RTL_ADV_2500FULL;

			adv |= MDIO_AN_10GBT_CTRL_ADV2_5G;

		if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,

				      phydev->advertising))

			adv |= MDIO_AN_10GBT_CTRL_ADV5G;



		ret = phy_modify_paged_changed(phydev, 0xa5d, 0x12,

					       RTL_ADV_2500FULL, adv2500);

					       MDIO_AN_10GBT_CTRL_ADV2_5G |

					       MDIO_AN_10GBT_CTRL_ADV5G,

					       adv);

		if (ret < 0)

			return ret;

	}
@@ -714,11 +711,14 @@ static int rtl822x_read_status(struct phy_device *phydev) 
			return lpadv;



		linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

			phydev->lp_advertising, lpadv & RTL_LPADV_10000FULL);

				 phydev->lp_advertising,

				 lpadv & MDIO_AN_10GBT_STAT_LP10G);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,

			phydev->lp_advertising, lpadv & RTL_LPADV_5000FULL);

				 phydev->lp_advertising,

				 lpadv & MDIO_AN_10GBT_STAT_LP5G);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,

			phydev->lp_advertising, lpadv & RTL_LPADV_2500FULL);

				 phydev->lp_advertising,

				 lpadv & MDIO_AN_10GBT_STAT_LP2_5G);

	}



	ret = genphy_read_status(phydev);
@@ -736,7 +736,7 @@ static bool rtlgen_supports_2_5gbps(struct phy_device *phydev) 
	val = phy_read(phydev, 0x13);

	phy_write(phydev, RTL821x_PAGE_SELECT, 0);



	return val >= 0 && val & RTL_SUPPORTS_2500FULL;

	return val >= 0 && val & MDIO_PMA_SPEED_2_5G;

}



static int rtlgen_match_phy_device(struct phy_device *phydev)

include/uapi/linux/mdio.h

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ 
#define MDIO_PMA_SPEED_1000		0x0010	/* 1000M capable */

#define MDIO_PMA_SPEED_100		0x0020	/* 100M capable */

#define MDIO_PMA_SPEED_10		0x0040	/* 10M capable */

#define MDIO_PMA_SPEED_2_5G		0x2000	/* 2.5G capable */

#define MDIO_PMA_SPEED_5G		0x4000	/* 5G capable */

#define MDIO_PCS_SPEED_10P2B		0x0002	/* 10PASS-TS/2BASE-TL capable */

#define MDIO_PCS_SPEED_2_5G		0x0040	/* 2.5G capable */

#define MDIO_PCS_SPEED_5G		0x0080	/* 5G capable */