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

Merge branch 'r8169-extend-eee-tx-idle-timer-support'

Browse Source 
Heiner Kallweit says:

====================
r8169: extend EEE tx idle timer support

This series extends EEE tx idle timer support, and exposes the timer
value to userspace.
====================

Link: https://lore.kernel.org/r/89a5fef5-a4b7-4d5d-9c35-764248be5a19@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2024-02-13 18:53:06 -08:00
commit 239ce99c28
1 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/net/ethernet/realtek/r8169_main.c
View File

@ -619,6 +619,7 @@ struct rtl8169_private {
struct page *Rx_databuff[NUM_RX_DESC]; /* Rx data buffers */
struct ring_info tx_skb[NUM_TX_DESC]; /* Tx data buffers */
u16 cp_cmd;
u16 tx_lpi_timer;
u32 irq_mask;
int irq;
struct clk *clk;
@ -2031,14 +2032,55 @@ static int rtl_set_coalesce(struct net_device *dev,
return 0;
}
static void rtl_set_eee_txidle_timer(struct rtl8169_private *tp)
{
unsigned int timer_val = READ_ONCE(tp->dev->mtu) + ETH_HLEN + 0x20;
switch (tp->mac_version) {
case RTL_GIGA_MAC_VER_46:
case RTL_GIGA_MAC_VER_48:
tp->tx_lpi_timer = timer_val;
r8168_mac_ocp_write(tp, 0xe048, timer_val);
break;
case RTL_GIGA_MAC_VER_61:
case RTL_GIGA_MAC_VER_63:
case RTL_GIGA_MAC_VER_65:
tp->tx_lpi_timer = timer_val;
RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);
break;
default:
break;
}
}
static unsigned int r8169_get_tx_lpi_timer_us(struct rtl8169_private *tp)
{
unsigned int speed = tp->phydev->speed;
unsigned int timer = tp->tx_lpi_timer;
if (!timer || speed == SPEED_UNKNOWN)
return 0;
/* tx_lpi_timer value is in bytes */
return DIV_ROUND_CLOSEST(timer * BITS_PER_BYTE, speed);
}
static int rtl8169_get_eee(struct net_device *dev, struct ethtool_keee *data)
{
struct rtl8169_private *tp = netdev_priv(dev);
int ret;
if (!rtl_supports_eee(tp))
return -EOPNOTSUPP;
return phy_ethtool_get_eee(tp->phydev, data);
ret = phy_ethtool_get_eee(tp->phydev, data);
if (ret)
return ret;
data->tx_lpi_timer = r8169_get_tx_lpi_timer_us(tp);
data->tx_lpi_enabled = data->tx_lpi_timer ? data->eee_enabled : false;
return 0;
}
static int rtl8169_set_eee(struct net_device *dev, struct ethtool_keee *data)
@ -2289,14 +2331,8 @@ static void rtl8125a_config_eee_mac(struct rtl8169_private *tp)
r8168_mac_ocp_modify(tp, 0xeb62, 0, BIT(2) | BIT(1));
}
static void rtl8125_set_eee_txidle_timer(struct rtl8169_private *tp)
{
RTL_W16(tp, EEE_TXIDLE_TIMER_8125, tp->dev->mtu + ETH_HLEN + 0x20);
}
static void rtl8125b_config_eee_mac(struct rtl8169_private *tp)
{
rtl8125_set_eee_txidle_timer(tp);
r8168_mac_ocp_modify(tp, 0xe040, 0, BIT(1) | BIT(0));
}
@ -3829,6 +3865,8 @@ static void rtl_hw_start(struct rtl8169_private *tp)
rtl_hw_aspm_clkreq_enable(tp, false);
RTL_W16(tp, CPlusCmd, tp->cp_cmd);
rtl_set_eee_txidle_timer(tp);
if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
rtl_hw_start_8169(tp);
else if (rtl_is_8125(tp))
@ -3862,14 +3900,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
dev->mtu = new_mtu;
netdev_update_features(dev);
rtl_jumbo_config(tp);
switch (tp->mac_version) {
case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_65:
rtl8125_set_eee_txidle_timer(tp);
break;
default:
break;
}
rtl_set_eee_txidle_timer(tp);
return 0;
}