mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
97 lines
2.9 KiB
Diff
97 lines
2.9 KiB
Diff
|
From f5d59230ec26aa5e8b59e9f4a4d288703a737479 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
||
|
|
Date: Wed, 31 Jan 2024 21:31:01 +0100
|
||
|
|
Subject: [PATCH] r8169: simplify EEE handling
|
||
|
|
|
||
|
|
We don't have to store the EEE modes to be advertised in the driver,
|
||
|
|
phylib does this for us and stores it in phydev->advertising_eee.
|
||
|
|
phylib also takes care of properly handling the EEE advertisement.
|
||
|
|
|
||
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
||
|
|
Link: https://lore.kernel.org/r/27c336a8-ea47-483d-815b-02c45ae41da2@gmail.com
|
||
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/realtek/r8169_main.c | 32 +++--------------------
|
||
|
|
1 file changed, 4 insertions(+), 28 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
||
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
||
|
|
@@ -629,7 +629,6 @@ struct rtl8169_private {
|
||
|
|
struct rtl8169_counters *counters;
|
||
|
|
struct rtl8169_tc_offsets tc_offset;
|
||
|
|
u32 saved_wolopts;
|
||
|
|
- int eee_adv;
|
||
|
|
|
||
|
|
const char *fw_name;
|
||
|
|
struct rtl_fw *rtl_fw;
|
||
|
|
@@ -2010,17 +2009,11 @@ static int rtl8169_get_eee(struct net_de
|
||
|
|
static int rtl8169_set_eee(struct net_device *dev, struct ethtool_eee *data)
|
||
|
|
{
|
||
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
||
|
|
- int ret;
|
||
|
|
|
||
|
|
if (!rtl_supports_eee(tp))
|
||
|
|
return -EOPNOTSUPP;
|
||
|
|
|
||
|
|
- ret = phy_ethtool_set_eee(tp->phydev, data);
|
||
|
|
-
|
||
|
|
- if (!ret)
|
||
|
|
- tp->eee_adv = phy_read_mmd(dev->phydev, MDIO_MMD_AN,
|
||
|
|
- MDIO_AN_EEE_ADV);
|
||
|
|
- return ret;
|
||
|
|
+ return phy_ethtool_set_eee(tp->phydev, data);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void rtl8169_get_ringparam(struct net_device *dev,
|
||
|
|
@@ -2085,21 +2078,6 @@ static const struct ethtool_ops rtl8169_
|
||
|
|
.set_pauseparam = rtl8169_set_pauseparam,
|
||
|
|
};
|
||
|
|
|
||
|
|
-static void rtl_enable_eee(struct rtl8169_private *tp)
|
||
|
|
-{
|
||
|
|
- struct phy_device *phydev = tp->phydev;
|
||
|
|
- int adv;
|
||
|
|
-
|
||
|
|
- /* respect EEE advertisement the user may have set */
|
||
|
|
- if (tp->eee_adv >= 0)
|
||
|
|
- adv = tp->eee_adv;
|
||
|
|
- else
|
||
|
|
- adv = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE);
|
||
|
|
-
|
||
|
|
- if (adv >= 0)
|
||
|
|
- phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, adv);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
|
||
|
|
{
|
||
|
|
/*
|
||
|
|
@@ -2336,9 +2314,6 @@ static void rtl8169_init_phy(struct rtl8
|
||
|
|
/* We may have called phy_speed_down before */
|
||
|
|
phy_speed_up(tp->phydev);
|
||
|
|
|
||
|
|
- if (rtl_supports_eee(tp))
|
||
|
|
- rtl_enable_eee(tp);
|
||
|
|
-
|
||
|
|
genphy_soft_reset(tp->phydev);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -5085,7 +5060,9 @@ static int r8169_mdio_register(struct rt
|
||
|
|
}
|
||
|
|
|
||
|
|
tp->phydev->mac_managed_pm = true;
|
||
|
|
-
|
||
|
|
+ if (rtl_supports_eee(tp))
|
||
|
|
+ linkmode_copy(tp->phydev->advertising_eee,
|
||
|
|
+ tp->phydev->supported_eee);
|
||
|
|
phy_support_asym_pause(tp->phydev);
|
||
|
|
|
||
|
|
/* PHY will be woken up in rtl_open() */
|
||
|
|
@@ -5220,7 +5197,6 @@ static int rtl_init_one(struct pci_dev *
|
||
|
|
tp->dev = dev;
|
||
|
|
tp->pci_dev = pdev;
|
||
|
|
tp->supports_gmii = ent->driver_data == RTL_CFG_NO_GBIT ? 0 : 1;
|
||
|
|
- tp->eee_adv = -1;
|
||
|
|
tp->ocp_base = OCP_STD_PHY_BASE;
|
||
|
|
|
||
|
|
raw_spin_lock_init(&tp->cfg9346_usage_lock);
|