Commit 2bb05261 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: c45: change genphy_c45_ethtool_[get|set]_eee to use EEE linkmode bitmaps 



Change genphy_c45_ethtool_[get|set]_eee to use EEE linkmode bitmaps.
This is a prerequisite for adding support for EEE modes beyond bit 31.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f069de6

drivers/net/phy/phy-c45.c

+13 −23
Original line number Diff line number Diff line
@@ -1453,7 +1453,7 @@ int genphy_c45_ethtool_get_eee(struct phy_device *phydev, 
{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(adv) = {};

	__ETHTOOL_DECLARE_LINK_MODE_MASK(lp) = {};

	bool overflow = false, is_enabled;

	bool is_enabled;

	int ret;



	ret = genphy_c45_eee_is_active(phydev, adv, lp, &is_enabled);
@@ -1462,17 +1462,9 @@ int genphy_c45_ethtool_get_eee(struct phy_device *phydev, 


	data->eee_enabled = is_enabled;

	data->eee_active = ret;



	if (!ethtool_convert_link_mode_to_legacy_u32(&data->supported_u32,

						     phydev->supported_eee))

		overflow = true;

	if (!ethtool_convert_link_mode_to_legacy_u32(&data->advertised_u32, adv))

		overflow = true;

	if (!ethtool_convert_link_mode_to_legacy_u32(&data->lp_advertised_u32, lp))

		overflow = true;



	if (overflow)

		phydev_warn(phydev, "Not all supported or advertised EEE link modes were passed to the user space\n");

	linkmode_copy(data->supported, phydev->supported_eee);

	linkmode_copy(data->advertised, adv);

	linkmode_copy(data->lp_advertised, lp);



	return 0;

}
@@ -1495,24 +1487,22 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev, 
	int ret;



	if (data->eee_enabled) {

		if (data->advertised_u32) {

			__ETHTOOL_DECLARE_LINK_MODE_MASK(adv);

		unsigned long *adv = data->advertised;



			ethtool_convert_legacy_u32_to_link_mode(adv,

								data->advertised_u32);

			linkmode_andnot(adv, adv, phydev->supported_eee);

		if (!linkmode_empty(adv)) {

			__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);

			bool unsupp;



			unsupp = linkmode_andnot(tmp, adv, phydev->supported_eee);

			if (unsupp) {

				phydev_warn(phydev, "At least some EEE link modes are not supported.\n");

				return -EINVAL;

			}



			ethtool_convert_legacy_u32_to_link_mode(phydev->advertising_eee,

								data->advertised_u32);

		} else {

			linkmode_copy(phydev->advertising_eee,

				      phydev->supported_eee);

			adv = phydev->supported_eee;

		}



		linkmode_copy(phydev->advertising_eee, adv);

		phydev->eee_enabled = true;

	} else {

		phydev->eee_enabled = false;