iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: usb: r8152: Use linkmode helpers for EEE

Browse Source 
Make use of the existing linkmode helpers for converting PHY EEE
register values into links modes, now that ethtool_keee uses link
modes, rather than u32 values.

Rework determining if EEE is active to make is similar as to how
phylib decides, and make use of a phylib helper to validate if EEE is
valid in for the current link mode. This then requires that PHYLIB is
selected.

Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2024-02-26 19:29:07 -06:00 committed by David S. Miller
parent 2e26b6dfad
commit 17206c116d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/usb/Kconfig
View File

@ -99,6 +99,7 @@ config USB_RTL8150
config USB_RTL8152 config USB_RTL8152
tristate "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters" tristate "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
select MII select MII
select PHYLIB
select CRC32 select CRC32
select CRYPTO select CRYPTO
select CRYPTO_HASH select CRYPTO_HASH

33
drivers/net/usb/r8152.c
View File

@ -10,6 +10,7 @@
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/phy.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
@ -8924,30 +8925,29 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data)
static int r8152_get_eee(struct r8152 *tp, struct ethtool_keee *eee) static int r8152_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
{ {
u32 lp, adv, supported = 0; __ETHTOOL_DECLARE_LINK_MODE_MASK(common);
u16 val; u16 val;
val = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE); val = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE);
supported = mmd_eee_cap_to_ethtool_sup_t(val); mii_eee_cap1_mod_linkmode_t(eee->supported, val);
val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV); val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV);
adv = mmd_eee_adv_to_ethtool_adv_t(val); mii_eee_cap1_mod_linkmode_t(eee->advertised, val);
val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE); val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE);
lp = mmd_eee_adv_to_ethtool_adv_t(val); mii_eee_cap1_mod_linkmode_t(eee->lp_advertised, val);
eee->eee_enabled = tp->eee_en; eee->eee_enabled = tp->eee_en;
eee->eee_active = !!(supported & adv & lp);
eee->supported_u32 = supported; linkmode_and(common, eee->advertised, eee->lp_advertised);
eee->advertised_u32 = tp->eee_adv; eee->eee_active = phy_check_valid(tp->speed, tp->duplex, common);
eee->lp_advertised_u32 = lp;
return 0; return 0;
} }
static int r8152_set_eee(struct r8152 *tp, struct ethtool_keee *eee) static int r8152_set_eee(struct r8152 *tp, struct ethtool_keee *eee)
{ {
u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised_u32); u16 val = linkmode_to_mii_eee_cap1_t(eee->advertised);
tp->eee_en = eee->eee_enabled; tp->eee_en = eee->eee_enabled;
tp->eee_adv = val; tp->eee_adv = val;
@ -8959,23 +8959,22 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_keee *eee)
static int r8153_get_eee(struct r8152 *tp, struct ethtool_keee *eee) static int r8153_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
{ {
u32 lp, adv, supported = 0; __ETHTOOL_DECLARE_LINK_MODE_MASK(common);
u16 val; u16 val;
val = ocp_reg_read(tp, OCP_EEE_ABLE); val = ocp_reg_read(tp, OCP_EEE_ABLE);
supported = mmd_eee_cap_to_ethtool_sup_t(val); mii_eee_cap1_mod_linkmode_t(eee->supported, val);
val = ocp_reg_read(tp, OCP_EEE_ADV); val = ocp_reg_read(tp, OCP_EEE_ADV);
adv = mmd_eee_adv_to_ethtool_adv_t(val); mii_eee_cap1_mod_linkmode_t(eee->advertised, val);
val = ocp_reg_read(tp, OCP_EEE_LPABLE); val = ocp_reg_read(tp, OCP_EEE_LPABLE);
lp = mmd_eee_adv_to_ethtool_adv_t(val); mii_eee_cap1_mod_linkmode_t(eee->lp_advertised, val);
eee->eee_enabled = tp->eee_en; eee->eee_enabled = tp->eee_en;
eee->eee_active = !!(supported & adv & lp);
eee->supported_u32 = supported; linkmode_and(common, eee->advertised, eee->lp_advertised);
eee->advertised_u32 = tp->eee_adv; eee->eee_active = phy_check_valid(tp->speed, tp->duplex, common);
eee->lp_advertised_u32 = lp;
return 0; return 0;
} }