Skip to content

Commit efc3710

Browse files
hkallweitdavem330
hkallweit
authored and
davem330
committed
r8169: remove support for chip version 60
Detection of this chip version has been disabled for few kernel versions now. Nobody complained, so remove support for this chip version. Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 133706a commit efc3710

File tree

3 files changed

+8
-90
lines changed

3 files changed

+8
-90
lines changed

‎drivers/net/ethernet/realtek/r8169.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ enum mac_version {
6464
RTL_GIGA_MAC_VER_51,
6565
RTL_GIGA_MAC_VER_52,
6666
RTL_GIGA_MAC_VER_53,
67-
RTL_GIGA_MAC_VER_60,
67+
/* support for RTL_GIGA_MAC_VER_60 has been removed */
6868
RTL_GIGA_MAC_VER_61,
6969
RTL_GIGA_MAC_VER_63,
7070
RTL_GIGA_MAC_NONE

‎drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ static const struct {
137137
[RTL_GIGA_MAC_VER_51] = {"RTL8168ep/8111ep" },
138138
[RTL_GIGA_MAC_VER_52] = {"RTL8168fp/RTL8117", FIRMWARE_8168FP_3},
139139
[RTL_GIGA_MAC_VER_53] = {"RTL8168fp/RTL8117", },
140-
[RTL_GIGA_MAC_VER_60] = {"RTL8125A" },
141140
[RTL_GIGA_MAC_VER_61] = {"RTL8125A", FIRMWARE_8125A_3},
142141
/* reserve 62 for CFG_METHOD_4 in the vendor driver */
143142
[RTL_GIGA_MAC_VER_63] = {"RTL8125B", FIRMWARE_8125B_2},
@@ -680,7 +679,7 @@ static void rtl_pci_commit(struct rtl8169_private *tp)
680679

681680
static bool rtl_is_8125(struct rtl8169_private *tp)
682681
{
683-
return tp->mac_version >= RTL_GIGA_MAC_VER_60;
682+
return tp->mac_version >= RTL_GIGA_MAC_VER_61;
684683
}
685684

686685
static bool rtl_is_8168evl_up(struct rtl8169_private *tp)
@@ -2258,7 +2257,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
22582257
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
22592258
RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST | RX_EARLY_OFF);
22602259
break;
2261-
case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:
2260+
case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_63:
22622261
RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST);
22632262
break;
22642263
default:
@@ -2442,7 +2441,7 @@ static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp)
24422441
rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42);
24432442
rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
24442443
break;
2445-
case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_61:
2444+
case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_61:
24462445
rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
24472446
break;
24482447
case RTL_GIGA_MAC_VER_63:
@@ -2688,7 +2687,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
26882687

26892688
switch (tp->mac_version) {
26902689
case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:
2691-
case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:
2690+
case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_63:
26922691
/* reset ephy tx/rx disable timer */
26932692
r8168_mac_ocp_modify(tp, 0xe094, 0xff00, 0);
26942693
/* chip can trigger L1.2 */
@@ -2700,7 +2699,7 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
27002699
} else {
27012700
switch (tp->mac_version) {
27022701
case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:
2703-
case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:
2702+
case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_63:
27042703
r8168_mac_ocp_modify(tp, 0xe092, 0x00ff, 0);
27052704
break;
27062705
default:
@@ -3573,46 +3572,6 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp)
35733572
udelay(10);
35743573
}
35753574

3576-
static void rtl_hw_start_8125a_1(struct rtl8169_private *tp)
3577-
{
3578-
static const struct ephy_info e_info_8125a_1[] = {
3579-
{ 0x01, 0xffff, 0xa812 },
3580-
{ 0x09, 0xffff, 0x520c },
3581-
{ 0x04, 0xffff, 0xd000 },
3582-
{ 0x0d, 0xffff, 0xf702 },
3583-
{ 0x0a, 0xffff, 0x8653 },
3584-
{ 0x06, 0xffff, 0x001e },
3585-
{ 0x08, 0xffff, 0x3595 },
3586-
{ 0x20, 0xffff, 0x9455 },
3587-
{ 0x21, 0xffff, 0x99ff },
3588-
{ 0x02, 0xffff, 0x6046 },
3589-
{ 0x29, 0xffff, 0xfe00 },
3590-
{ 0x23, 0xffff, 0xab62 },
3591-
3592-
{ 0x41, 0xffff, 0xa80c },
3593-
{ 0x49, 0xffff, 0x520c },
3594-
{ 0x44, 0xffff, 0xd000 },
3595-
{ 0x4d, 0xffff, 0xf702 },
3596-
{ 0x4a, 0xffff, 0x8653 },
3597-
{ 0x46, 0xffff, 0x001e },
3598-
{ 0x48, 0xffff, 0x3595 },
3599-
{ 0x60, 0xffff, 0x9455 },
3600-
{ 0x61, 0xffff, 0x99ff },
3601-
{ 0x42, 0xffff, 0x6046 },
3602-
{ 0x69, 0xffff, 0xfe00 },
3603-
{ 0x63, 0xffff, 0xab62 },
3604-
};
3605-
3606-
rtl_set_def_aspm_entry_latency(tp);
3607-
3608-
/* disable aspm and clock request before access ephy */
3609-
rtl_hw_aspm_clkreq_enable(tp, false);
3610-
rtl_ephy_init(tp, e_info_8125a_1);
3611-
3612-
rtl_hw_start_8125_common(tp);
3613-
rtl_hw_aspm_clkreq_enable(tp, true);
3614-
}
3615-
36163575
static void rtl_hw_start_8125a_2(struct rtl8169_private *tp)
36173576
{
36183577
static const struct ephy_info e_info_8125a_2[] = {
@@ -3704,7 +3663,6 @@ static void rtl_hw_config(struct rtl8169_private *tp)
37043663
[RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3,
37053664
[RTL_GIGA_MAC_VER_52] = rtl_hw_start_8117,
37063665
[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
3707-
[RTL_GIGA_MAC_VER_60] = rtl_hw_start_8125a_1,
37083666
[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
37093667
[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
37103668
};
@@ -4099,7 +4057,6 @@ static unsigned int rtl_quirk_packet_padto(struct rtl8169_private *tp,
40994057

41004058
switch (tp->mac_version) {
41014059
case RTL_GIGA_MAC_VER_34:
4102-
case RTL_GIGA_MAC_VER_60:
41034060
case RTL_GIGA_MAC_VER_61:
41044061
case RTL_GIGA_MAC_VER_63:
41054062
padto = max_t(unsigned int, padto, ETH_ZLEN);
@@ -5143,7 +5100,7 @@ static void rtl_hw_initialize(struct rtl8169_private *tp)
51435100
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
51445101
rtl_hw_init_8168g(tp);
51455102
break;
5146-
case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_63:
5103+
case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_63:
51475104
rtl_hw_init_8125(tp);
51485105
break;
51495106
default:
@@ -5234,7 +5191,7 @@ static void rtl_init_mac_address(struct rtl8169_private *tp)
52345191
/* register is set if system vendor successfully tested ASPM 1.2 */
52355192
static bool rtl_aspm_is_safe(struct rtl8169_private *tp)
52365193
{
5237-
if (tp->mac_version >= RTL_GIGA_MAC_VER_60 &&
5194+
if (tp->mac_version >= RTL_GIGA_MAC_VER_61 &&
52385195
r8168_mac_ocp_read(tp, 0xc0b2) & 0xf)
52395196
return true;
52405197

‎drivers/net/ethernet/realtek/r8169_phy_config.c

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -995,44 +995,6 @@ static void rtl8125_legacy_force_mode(struct phy_device *phydev)
995995
phy_modify_paged(phydev, 0xa5b, 0x12, BIT(15), 0);
996996
}
997997

998-
static void rtl8125a_1_hw_phy_config(struct rtl8169_private *tp,
999-
struct phy_device *phydev)
1000-
{
1001-
phy_modify_paged(phydev, 0xad4, 0x10, 0x03ff, 0x0084);
1002-
phy_modify_paged(phydev, 0xad4, 0x17, 0x0000, 0x0010);
1003-
phy_modify_paged(phydev, 0xad1, 0x13, 0x03ff, 0x0006);
1004-
phy_modify_paged(phydev, 0xad3, 0x11, 0x003f, 0x0006);
1005-
phy_modify_paged(phydev, 0xac0, 0x14, 0x0000, 0x1100);
1006-
phy_modify_paged(phydev, 0xac8, 0x15, 0xf000, 0x7000);
1007-
phy_modify_paged(phydev, 0xad1, 0x14, 0x0000, 0x0400);
1008-
phy_modify_paged(phydev, 0xad1, 0x15, 0x0000, 0x03ff);
1009-
phy_modify_paged(phydev, 0xad1, 0x16, 0x0000, 0x03ff);
1010-
1011-
r8168g_phy_param(phydev, 0x80ea, 0xff00, 0xc400);
1012-
r8168g_phy_param(phydev, 0x80eb, 0x0700, 0x0300);
1013-
r8168g_phy_param(phydev, 0x80f8, 0xff00, 0x1c00);
1014-
r8168g_phy_param(phydev, 0x80f1, 0xff00, 0x3000);
1015-
r8168g_phy_param(phydev, 0x80fe, 0xff00, 0xa500);
1016-
r8168g_phy_param(phydev, 0x8102, 0xff00, 0x5000);
1017-
r8168g_phy_param(phydev, 0x8105, 0xff00, 0x3300);
1018-
r8168g_phy_param(phydev, 0x8100, 0xff00, 0x7000);
1019-
r8168g_phy_param(phydev, 0x8104, 0xff00, 0xf000);
1020-
r8168g_phy_param(phydev, 0x8106, 0xff00, 0x6500);
1021-
r8168g_phy_param(phydev, 0x80dc, 0xff00, 0xed00);
1022-
r8168g_phy_param(phydev, 0x80df, 0x0000, 0x0100);
1023-
r8168g_phy_param(phydev, 0x80e1, 0x0100, 0x0000);
1024-
1025-
phy_modify_paged(phydev, 0xbf0, 0x13, 0x003f, 0x0038);
1026-
r8168g_phy_param(phydev, 0x819f, 0xffff, 0xd0b6);
1027-
1028-
phy_write_paged(phydev, 0xbc3, 0x12, 0x5555);
1029-
phy_modify_paged(phydev, 0xbf0, 0x15, 0x0e00, 0x0a00);
1030-
phy_modify_paged(phydev, 0xa5c, 0x10, 0x0400, 0x0000);
1031-
rtl8168g_enable_gphy_10m(phydev);
1032-
1033-
rtl8125a_config_eee_phy(phydev);
1034-
}
1035-
1036998
static void rtl8125a_2_hw_phy_config(struct rtl8169_private *tp,
1037999
struct phy_device *phydev)
10381000
{
@@ -1188,7 +1150,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
11881150
[RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config,
11891151
[RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config,
11901152
[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
1191-
[RTL_GIGA_MAC_VER_60] = rtl8125a_1_hw_phy_config,
11921153
[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
11931154
[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
11941155
};

0 commit comments

Comments
 (0)