r8169: remove support for chip version 11

This is a follow-up to 982300c115d2 ("r8169: remove detection of chip
version 11 (early RTL8168b)"). Nobody complained yet, so remove
support for this chip version.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/b689ab6d-20b5-4b64-bd7e-531a0a972ba3@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index be4c9622618d84cfd0179f4ebac5ba19e4f035ea..8904aae41acaeea53b1213c59f8037347d195714 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -23,7 +23,7 @@ enum mac_version {
        RTL_GIGA_MAC_VER_08,
        RTL_GIGA_MAC_VER_09,
        RTL_GIGA_MAC_VER_10,
-       RTL_GIGA_MAC_VER_11,
+       /* support for RTL_GIGA_MAC_VER_11 has been removed */
        /* RTL_GIGA_MAC_VER_12 was handled the same as VER_17 */
        /* RTL_GIGA_MAC_VER_13 was merged with VER_10 */
        RTL_GIGA_MAC_VER_14,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 4b96b4ad81b96b3d97a9c96941853f3fb645a66c..cc14cd540f74860571182500a2c8769fdc6b85f2 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -104,7 +104,6 @@ static const struct {
        [RTL_GIGA_MAC_VER_08] = {"RTL8102e"                             },
        [RTL_GIGA_MAC_VER_09] = {"RTL8102e/RTL8103e"                    },
        [RTL_GIGA_MAC_VER_10] = {"RTL8101e/RTL8100e"                    },
-       [RTL_GIGA_MAC_VER_11] = {"RTL8168b/8111b"                       },
        [RTL_GIGA_MAC_VER_14] = {"RTL8401"                              },
        [RTL_GIGA_MAC_VER_17] = {"RTL8168b/8111b"                       },
        [RTL_GIGA_MAC_VER_18] = {"RTL8168cp/8111cp"                     },
@@ -2335,7 +2334,7 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
 
                /* 8168B family. */
                { 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 },
-               /* This one is very old and rare, let's see if anybody complains.
+               /* This one is very old and rare, support has been removed.
                 * { 0x7c8, 0x300,      RTL_GIGA_MAC_VER_11 },
                 */
 
@@ -3803,7 +3802,6 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_08] = rtl_hw_start_8102e_3,
                [RTL_GIGA_MAC_VER_09] = rtl_hw_start_8102e_2,
                [RTL_GIGA_MAC_VER_10] = NULL,
-               [RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168b,
                [RTL_GIGA_MAC_VER_14] = rtl_hw_start_8401,
                [RTL_GIGA_MAC_VER_17] = rtl_hw_start_8168b,
                [RTL_GIGA_MAC_VER_18] = rtl_hw_start_8168cp_1,
@@ -4679,12 +4677,6 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
        if (status & LinkChg)
                phy_mac_interrupt(tp->phydev);
 
-       if (unlikely(status & RxFIFOOver &&
-           tp->mac_version == RTL_GIGA_MAC_VER_11)) {
-               netif_stop_queue(tp->dev);
-               rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
-       }
-
        rtl_irq_disable(tp);
        napi_schedule(&tp->napi);
 out:
@@ -5100,9 +5092,6 @@ static void rtl_set_irq_mask(struct rtl8169_private *tp)
 
        if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
                tp->irq_mask |= SYSErr | RxFIFOOver;
-       else if (tp->mac_version == RTL_GIGA_MAC_VER_11)
-               /* special workaround needed */
-               tp->irq_mask |= RxFIFOOver;
 }
 
 static int rtl_alloc_irq(struct rtl8169_private *tp)
@@ -5297,7 +5286,6 @@ static int rtl_jumbo_max(struct rtl8169_private *tp)
        case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06:
                return JUMBO_7K;
        /* RTL8168b */
-       case RTL_GIGA_MAC_VER_11:
        case RTL_GIGA_MAC_VER_17:
                return JUMBO_4K;
        /* RTL8168c */

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 5307c6ff4e2523380771181364dc73cdd2485aa7..b28b30390e84d9773382164456b40bb95ffcf439 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -276,15 +276,6 @@ static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp,
        rtl_writephy_batch(phydev, phy_reg_init);
 }
 
-static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp,
-                                   struct phy_device *phydev)
-{
-       phy_write(phydev, 0x1f, 0x0001);
-       phy_set_bits(phydev, 0x16, BIT(0));
-       phy_write(phydev, 0x10, 0xf41b);
-       phy_write(phydev, 0x1f, 0x0000);
-}
-
 static void rtl8168bef_hw_phy_config(struct rtl8169_private *tp,
                                     struct phy_device *phydev)
 {
@@ -1136,7 +1127,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_08] = rtl8102e_hw_phy_config,
                [RTL_GIGA_MAC_VER_09] = rtl8102e_hw_phy_config,
                [RTL_GIGA_MAC_VER_10] = NULL,
-               [RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config,
                [RTL_GIGA_MAC_VER_14] = rtl8401_hw_phy_config,
                [RTL_GIGA_MAC_VER_17] = rtl8168bef_hw_phy_config,
                [RTL_GIGA_MAC_VER_18] = rtl8168cp_1_hw_phy_config,