Merge tag 'mm-nonmm-stable-2024-03-14-09-36' of git://git.kernel.org/pub/scm/linux...

[thirdparty/linux.git] / drivers / net / ethernet / broadcom / tg3.c

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 61a0168f9b0eb2afaab83a5da1e2e97b7247df70..62ff4381ac83cfd6a27a3763603f6ce8392043c6 100644 (file)
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -2338,10 +2338,10 @@ static void tg3_phy_apply_otp(struct tg3 *tp)
        tg3_phy_toggle_auxctl_smdsp(tp, false);
 }
 
-static void tg3_eee_pull_config(struct tg3 *tp, struct ethtool_eee *eee)
+static void tg3_eee_pull_config(struct tg3 *tp, struct ethtool_keee *eee)
 {
        u32 val;
-       struct ethtool_eee *dest = &tp->eee;
+       struct ethtool_keee *dest = &tp->eee;
 
        if (!(tp->phy_flags & TG3_PHYFLG_EEE_CAP))
                return;
@@ -2362,13 +2362,13 @@ static void tg3_eee_pull_config(struct tg3 *tp, struct ethtool_eee *eee)
        /* Pull lp advertised settings */
        if (tg3_phy_cl45_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE, &val))
                return;
-       dest->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(val);
+       mii_eee_cap1_mod_linkmode_t(dest->lp_advertised, val);
 
        /* Pull advertised and eee_enabled settings */
        if (tg3_phy_cl45_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, &val))
                return;
        dest->eee_enabled = !!val;
-       dest->advertised = mmd_eee_adv_to_ethtool_adv_t(val);
+       mii_eee_cap1_mod_linkmode_t(dest->advertised, val);
 
        /* Pull tx_lpi_enabled */
        val = tr32(TG3_CPMU_EEE_MODE);
@@ -4354,23 +4354,12 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)
        if (!err) {
                u32 err2;
 
-               val = 0;
-               /* Advertise 100-BaseTX EEE ability */
-               if (advertise & ADVERTISED_100baseT_Full)
-                       val |= MDIO_AN_EEE_ADV_100TX;
-               /* Advertise 1000-BaseT EEE ability */
-               if (advertise & ADVERTISED_1000baseT_Full)
-                       val |= MDIO_AN_EEE_ADV_1000T;
-
-               if (!tp->eee.eee_enabled) {
+               if (!tp->eee.eee_enabled)
                        val = 0;
-                       tp->eee.advertised = 0;
-               } else {
-                       tp->eee.advertised = advertise &
-                                            (ADVERTISED_100baseT_Full |
-                                             ADVERTISED_1000baseT_Full);
-               }
+               else
+                       val = ethtool_adv_to_mmd_eee_adv_t(advertise);
 
+               mii_eee_cap1_mod_linkmode_t(tp->eee.advertised, val);
                err = tg3_phy_cl45_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);
                if (err)
                        val = 0;
@@ -4618,7 +4607,7 @@ static int tg3_init_5401phy_dsp(struct tg3 *tp)
 
 static bool tg3_phy_eee_config_ok(struct tg3 *tp)
 {
-       struct ethtool_eee eee;
+       struct ethtool_keee eee = {};
 
        if (!(tp->phy_flags & TG3_PHYFLG_EEE_CAP))
                return true;
@@ -4626,13 +4615,13 @@ static bool tg3_phy_eee_config_ok(struct tg3 *tp)
        tg3_eee_pull_config(tp, &eee);
 
        if (tp->eee.eee_enabled) {
-               if (tp->eee.advertised != eee.advertised ||
+               if (!linkmode_equal(tp->eee.advertised, eee.advertised) ||
                    tp->eee.tx_lpi_timer != eee.tx_lpi_timer ||
                    tp->eee.tx_lpi_enabled != eee.tx_lpi_enabled)
                        return false;
        } else {
                /* EEE is disabled but we're advertising */
-               if (eee.advertised)
+               if (!linkmode_empty(eee.advertised))
                        return false;
        }
 
@@ -14180,7 +14169,7 @@ static int tg3_set_coalesce(struct net_device *dev,
        return 0;
 }
 
-static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)
+static int tg3_set_eee(struct net_device *dev, struct ethtool_keee *edata)
 {
        struct tg3 *tp = netdev_priv(dev);
 
@@ -14189,7 +14178,7 @@ static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)
                return -EOPNOTSUPP;
        }
 
-       if (edata->advertised != tp->eee.advertised) {
+       if (!linkmode_equal(edata->advertised, tp->eee.advertised)) {
                netdev_warn(tp->dev,
                            "Direct manipulation of EEE advertisement is not supported\n");
                return -EINVAL;
@@ -14202,7 +14191,9 @@ static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)
                return -EINVAL;
        }
 
-       tp->eee = *edata;
+       tp->eee.eee_enabled = edata->eee_enabled;
+       tp->eee.tx_lpi_enabled = edata->tx_lpi_enabled;
+       tp->eee.tx_lpi_timer = edata->tx_lpi_timer;
 
        tp->phy_flags |= TG3_PHYFLG_USER_CONFIGURED;
        tg3_warn_mgmt_link_flap(tp);
@@ -14217,7 +14208,7 @@ static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)
        return 0;
 }
 
-static int tg3_get_eee(struct net_device *dev, struct ethtool_eee *edata)
+static int tg3_get_eee(struct net_device *dev, struct ethtool_keee *edata)
 {
        struct tg3 *tp = netdev_priv(dev);
 
@@ -15655,10 +15646,13 @@ static int tg3_phy_probe(struct tg3 *tp)
              tg3_chip_rev_id(tp) != CHIPREV_ID_57765_A0))) {
                tp->phy_flags |= TG3_PHYFLG_EEE_CAP;
 
-               tp->eee.supported = SUPPORTED_100baseT_Full |
-                                   SUPPORTED_1000baseT_Full;
-               tp->eee.advertised = ADVERTISED_100baseT_Full |
-                                    ADVERTISED_1000baseT_Full;
+               linkmode_zero(tp->eee.supported);
+               linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,
+                                tp->eee.supported);
+               linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
+                                tp->eee.supported);
+               linkmode_copy(tp->eee.advertised, tp->eee.supported);
+
                tp->eee.eee_enabled = 1;
                tp->eee.tx_lpi_enabled = 1;
                tp->eee.tx_lpi_timer = TG3_CPMU_DBTMR1_LNKIDLE_2047US;