projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44307b2)
r8169: remove support for chip versions 45 and 47
authorHeiner Kallweit <hkallweit1@gmail.com>
Tue, 23 Aug 2022 18:35:25 +0000 (20:35 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Aug 2022 12:24:10 +0000 (13:24 +0100)
Detection of these chip versions has been disabled for few kernel versions now.
Nobody complained, so remove support for this chip version.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.h patch | blob | history
drivers/net/ethernet/realtek/r8169_main.c patch | blob | history
drivers/net/ethernet/realtek/r8169_phy_config.c patch | blob | history

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index e2ace50..a66b108 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -55,9 +55,9 @@ enum mac_version {
        RTL_GIGA_MAC_VER_42,
        RTL_GIGA_MAC_VER_43,
        RTL_GIGA_MAC_VER_44,
-       RTL_GIGA_MAC_VER_45,
+       /* support for RTL_GIGA_MAC_VER_45 has been removed */
        RTL_GIGA_MAC_VER_46,
-       RTL_GIGA_MAC_VER_47,
+       /* support for RTL_GIGA_MAC_VER_47 has been removed */
        RTL_GIGA_MAC_VER_48,
        RTL_GIGA_MAC_VER_49,
        RTL_GIGA_MAC_VER_50,
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index a2baeb8..0e7d10c 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -49,10 +49,8 @@
 #define FIRMWARE_8106E_2       "rtl_nic/rtl8106e-2.fw"
 #define FIRMWARE_8168G_2       "rtl_nic/rtl8168g-2.fw"
 #define FIRMWARE_8168G_3       "rtl_nic/rtl8168g-3.fw"
-#define FIRMWARE_8168H_1       "rtl_nic/rtl8168h-1.fw"
 #define FIRMWARE_8168H_2       "rtl_nic/rtl8168h-2.fw"
 #define FIRMWARE_8168FP_3      "rtl_nic/rtl8168fp-3.fw"
-#define FIRMWARE_8107E_1       "rtl_nic/rtl8107e-1.fw"
 #define FIRMWARE_8107E_2       "rtl_nic/rtl8107e-2.fw"
 #define FIRMWARE_8125A_3       "rtl_nic/rtl8125a-3.fw"
 #define FIRMWARE_8125B_2       "rtl_nic/rtl8125b-2.fw"
@@ -134,9 +132,7 @@ static const struct {
        [RTL_GIGA_MAC_VER_42] = {"RTL8168gu/8111gu",    FIRMWARE_8168G_3},
        [RTL_GIGA_MAC_VER_43] = {"RTL8106eus",          FIRMWARE_8106E_2},
        [RTL_GIGA_MAC_VER_44] = {"RTL8411b",            FIRMWARE_8411_2 },
-       [RTL_GIGA_MAC_VER_45] = {"RTL8168h/8111h",      FIRMWARE_8168H_1},
        [RTL_GIGA_MAC_VER_46] = {"RTL8168h/8111h",      FIRMWARE_8168H_2},
-       [RTL_GIGA_MAC_VER_47] = {"RTL8107e",            FIRMWARE_8107E_1},
        [RTL_GIGA_MAC_VER_48] = {"RTL8107e",            FIRMWARE_8107E_2},
        [RTL_GIGA_MAC_VER_49] = {"RTL8168ep/8111ep"                     },
        [RTL_GIGA_MAC_VER_50] = {"RTL8168ep/8111ep"                     },
@@ -657,10 +653,8 @@ MODULE_FIRMWARE(FIRMWARE_8106E_1);
 MODULE_FIRMWARE(FIRMWARE_8106E_2);
 MODULE_FIRMWARE(FIRMWARE_8168G_2);
 MODULE_FIRMWARE(FIRMWARE_8168G_3);
-MODULE_FIRMWARE(FIRMWARE_8168H_1);
 MODULE_FIRMWARE(FIRMWARE_8168H_2);
 MODULE_FIRMWARE(FIRMWARE_8168FP_3);
-MODULE_FIRMWARE(FIRMWARE_8107E_1);
 MODULE_FIRMWARE(FIRMWARE_8107E_2);
 MODULE_FIRMWARE(FIRMWARE_8125A_3);
 MODULE_FIRMWARE(FIRMWARE_8125B_2);
@@ -2086,8 +2080,6 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
        if (ver != RTL_GIGA_MAC_NONE && !gmii) {
                if (ver == RTL_GIGA_MAC_VER_42)
                        ver = RTL_GIGA_MAC_VER_43;
-               else if (ver == RTL_GIGA_MAC_VER_45)
-                       ver = RTL_GIGA_MAC_VER_47;
                else if (ver == RTL_GIGA_MAC_VER_46)
                        ver = RTL_GIGA_MAC_VER_48;
        }
@@ -2698,7 +2690,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
                RTL_W8(tp, Config2, RTL_R8(tp, Config2) | ClkReqEn);
 
                switch (tp->mac_version) {
-               case RTL_GIGA_MAC_VER_45 ... RTL_GIGA_MAC_VER_48:
+               case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:
                case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:
                        /* reset ephy tx/rx disable timer */
                        r8168_mac_ocp_modify(tp, 0xe094, 0xff00, 0);
@@ -2710,7 +2702,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
                }
        } else {
                switch (tp->mac_version) {
-               case RTL_GIGA_MAC_VER_45 ... RTL_GIGA_MAC_VER_48:
+               case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:
                case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:
                        r8168_mac_ocp_modify(tp, 0xe092, 0x00ff, 0);
                        break;
@@ -3749,9 +3741,7 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_42] = rtl_hw_start_8168g_2,
                [RTL_GIGA_MAC_VER_43] = rtl_hw_start_8168g_2,
                [RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2,
-               [RTL_GIGA_MAC_VER_45] = rtl_hw_start_8168h_1,
                [RTL_GIGA_MAC_VER_46] = rtl_hw_start_8168h_1,
-               [RTL_GIGA_MAC_VER_47] = rtl_hw_start_8168h_1,
                [RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1,
                [RTL_GIGA_MAC_VER_49] = rtl_hw_start_8168ep_1,
                [RTL_GIGA_MAC_VER_50] = rtl_hw_start_8168ep_2,
@@ -5375,7 +5365,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         */
        if (rtl_aspm_is_safe(tp))
                rc = 0;
-       else if (tp->mac_version >= RTL_GIGA_MAC_VER_45)
+       else if (tp->mac_version >= RTL_GIGA_MAC_VER_46)
                rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2);
        else
                rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1);
diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 2b4bc2d..8653f67 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -793,71 +793,6 @@ static void rtl8168g_2_hw_phy_config(struct rtl8169_private *tp,
        rtl8168g_config_eee_phy(phydev);
 }
 
-static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp,
-                                    struct phy_device *phydev)
-{
-       u16 dout_tapbin;
-       u32 data;
-
-       r8169_apply_firmware(tp);
-
-       /* CHN EST parameters adjust - giga master */
-       r8168g_phy_param(phydev, 0x809b, 0xf800, 0x8000);
-       r8168g_phy_param(phydev, 0x80a2, 0xff00, 0x8000);
-       r8168g_phy_param(phydev, 0x80a4, 0xff00, 0x8500);
-       r8168g_phy_param(phydev, 0x809c, 0xff00, 0xbd00);
-
-       /* CHN EST parameters adjust - giga slave */
-       r8168g_phy_param(phydev, 0x80ad, 0xf800, 0x7000);
-       r8168g_phy_param(phydev, 0x80b4, 0xff00, 0x5000);
-       r8168g_phy_param(phydev, 0x80ac, 0xff00, 0x4000);
-
-       /* CHN EST parameters adjust - fnet */
-       r8168g_phy_param(phydev, 0x808e, 0xff00, 0x1200);
-       r8168g_phy_param(phydev, 0x8090, 0xff00, 0xe500);
-       r8168g_phy_param(phydev, 0x8092, 0xff00, 0x9f00);
-
-       /* enable R-tune & PGA-retune function */
-       dout_tapbin = 0;
-       data = phy_read_paged(phydev, 0x0a46, 0x13);
-       data &= 3;
-       data <<= 2;
-       dout_tapbin |= data;
-       data = phy_read_paged(phydev, 0x0a46, 0x12);
-       data &= 0xc000;
-       data >>= 14;
-       dout_tapbin |= data;
-       dout_tapbin = ~(dout_tapbin ^ 0x08);
-       dout_tapbin <<= 12;
-       dout_tapbin &= 0xf000;
-
-       r8168g_phy_param(phydev, 0x827a, 0xf000, dout_tapbin);
-       r8168g_phy_param(phydev, 0x827b, 0xf000, dout_tapbin);
-       r8168g_phy_param(phydev, 0x827c, 0xf000, dout_tapbin);
-       r8168g_phy_param(phydev, 0x827d, 0xf000, dout_tapbin);
-       r8168g_phy_param(phydev, 0x0811, 0x0000, 0x0800);
-       phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002);
-
-       rtl8168g_enable_gphy_10m(phydev);
-
-       /* SAR ADC performance */
-       phy_modify_paged(phydev, 0x0bca, 0x17, BIT(12) | BIT(13), BIT(14));
-
-       r8168g_phy_param(phydev, 0x803f, 0x3000, 0x0000);
-       r8168g_phy_param(phydev, 0x8047, 0x3000, 0x0000);
-       r8168g_phy_param(phydev, 0x804f, 0x3000, 0x0000);
-       r8168g_phy_param(phydev, 0x8057, 0x3000, 0x0000);
-       r8168g_phy_param(phydev, 0x805f, 0x3000, 0x0000);
-       r8168g_phy_param(phydev, 0x8067, 0x3000, 0x0000);
-       r8168g_phy_param(phydev, 0x806f, 0x3000, 0x0000);
-
-       /* disable phy pfm mode */
-       phy_modify_paged(phydev, 0x0a44, 0x11, BIT(7), 0);
-
-       rtl8168g_disable_aldps(phydev);
-       rtl8168h_config_eee_phy(phydev);
-}
-
 static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp,
                                     struct phy_device *phydev)
 {
@@ -1269,9 +1204,7 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_42] = rtl8168g_2_hw_phy_config,
                [RTL_GIGA_MAC_VER_43] = rtl8168g_2_hw_phy_config,
                [RTL_GIGA_MAC_VER_44] = rtl8168g_2_hw_phy_config,
-               [RTL_GIGA_MAC_VER_45] = rtl8168h_1_hw_phy_config,
                [RTL_GIGA_MAC_VER_46] = rtl8168h_2_hw_phy_config,
-               [RTL_GIGA_MAC_VER_47] = rtl8168h_1_hw_phy_config,
                [RTL_GIGA_MAC_VER_48] = rtl8168h_2_hw_phy_config,
                [RTL_GIGA_MAC_VER_49] = rtl8168ep_1_hw_phy_config,
                [RTL_GIGA_MAC_VER_50] = rtl8168ep_2_hw_phy_config,
Domain: System / Kernel;