Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'r8169-merge-chip-versions'
Heiner Kallweit says:
====================
r8169: merge chip versions
After 2b065c098c37 ("r8169: refactor chip version detection") we can
merge handling of few chip versions.
====================
Link: https://patch.msgid.link/5e1e14ea-d60f-4608-88eb-3104b6bbace8@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+12
-30
-3
drivers/net/ethernet/realtek/r8169.h
-3
drivers/net/ethernet/realtek/r8169.h
···
64
64
/* support for RTL_GIGA_MAC_VER_50 has been removed */
65
65
RTL_GIGA_MAC_VER_51,
66
66
RTL_GIGA_MAC_VER_52,
67
-
RTL_GIGA_MAC_VER_53,
68
67
/* support for RTL_GIGA_MAC_VER_60 has been removed */
69
68
RTL_GIGA_MAC_VER_61,
70
69
RTL_GIGA_MAC_VER_63,
71
70
RTL_GIGA_MAC_VER_64,
72
-
RTL_GIGA_MAC_VER_65,
73
71
RTL_GIGA_MAC_VER_66,
74
72
RTL_GIGA_MAC_VER_70,
75
-
RTL_GIGA_MAC_VER_71,
76
73
RTL_GIGA_MAC_NONE,
77
74
RTL_GIGA_MAC_VER_LAST = RTL_GIGA_MAC_NONE - 1
78
75
};
+12
-24
drivers/net/ethernet/realtek/r8169_main.c
+12
-24
drivers/net/ethernet/realtek/r8169_main.c
···
99
99
const char *fw_name;
100
100
} rtl_chip_infos[] = {
101
101
/* 8126A family. */
102
-
{ 0x7cf, 0x64a, RTL_GIGA_MAC_VER_71, "RTL8126A", FIRMWARE_8126A_3 },
102
+
{ 0x7cf, 0x64a, RTL_GIGA_MAC_VER_70, "RTL8126A", FIRMWARE_8126A_3 },
103
103
{ 0x7cf, 0x649, RTL_GIGA_MAC_VER_70, "RTL8126A", FIRMWARE_8126A_2 },
104
104
105
105
/* 8125BP family. */
106
106
{ 0x7cf, 0x681, RTL_GIGA_MAC_VER_66, "RTL8125BP", FIRMWARE_8125BP_2 },
107
107
108
108
/* 8125D family. */
109
-
{ 0x7cf, 0x689, RTL_GIGA_MAC_VER_65, "RTL8125D", FIRMWARE_8125D_2 },
109
+
{ 0x7cf, 0x689, RTL_GIGA_MAC_VER_64, "RTL8125D", FIRMWARE_8125D_2 },
110
110
{ 0x7cf, 0x688, RTL_GIGA_MAC_VER_64, "RTL8125D", FIRMWARE_8125D_1 },
111
111
112
112
/* 8125B family. */
···
116
116
{ 0x7cf, 0x609, RTL_GIGA_MAC_VER_61, "RTL8125A", FIRMWARE_8125A_3 },
117
117
118
118
/* RTL8117 */
119
-
{ 0x7cf, 0x54b, RTL_GIGA_MAC_VER_53, "RTL8168fp/RTL8117" },
119
+
{ 0x7cf, 0x54b, RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117" },
120
120
{ 0x7cf, 0x54a, RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117",
121
121
FIRMWARE_8168FP_3 },
122
122
···
830
830
{
831
831
return tp->mac_version >= RTL_GIGA_MAC_VER_34 &&
832
832
tp->mac_version != RTL_GIGA_MAC_VER_39 &&
833
-
tp->mac_version <= RTL_GIGA_MAC_VER_53;
833
+
tp->mac_version <= RTL_GIGA_MAC_VER_52;
834
834
}
835
835
836
836
static bool rtl_supports_eee(struct rtl8169_private *tp)
···
998
998
static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int type)
999
999
{
1000
1000
/* based on RTL8168FP_OOBMAC_BASE in vendor driver */
1001
-
if (type == ERIAR_OOB &&
1002
-
(tp->mac_version == RTL_GIGA_MAC_VER_52 ||
1003
-
tp->mac_version == RTL_GIGA_MAC_VER_53))
1001
+
if (type == ERIAR_OOB && tp->mac_version == RTL_GIGA_MAC_VER_52)
1004
1002
*cmd |= 0xf70 << 18;
1005
1003
}
1006
1004
···
1498
1500
case RTL_GIGA_MAC_VER_28:
1499
1501
case RTL_GIGA_MAC_VER_31:
1500
1502
return RTL_DASH_DP;
1501
-
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:
1503
+
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:
1502
1504
return RTL_DASH_EP;
1503
1505
case RTL_GIGA_MAC_VER_66:
1504
1506
return RTL_DASH_25_BP;
···
2483
2485
case RTL_GIGA_MAC_VER_38:
2484
2486
RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST);
2485
2487
break;
2486
-
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
2488
+
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:
2487
2489
RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST | RX_EARLY_OFF);
2488
2490
break;
2489
2491
case RTL_GIGA_MAC_VER_61:
···
2614
2616
static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp)
2615
2617
{
2616
2618
switch (tp->mac_version) {
2617
-
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
2619
+
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:
2618
2620
rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42);
2619
2621
rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
2620
2622
break;
···
2937
2939
rtl_mod_config5(tp, 0, ASPM_en);
2938
2940
switch (tp->mac_version) {
2939
2941
case RTL_GIGA_MAC_VER_70:
2940
-
case RTL_GIGA_MAC_VER_71:
2941
2942
val8 = RTL_R8(tp, INT_CFG0_8125) | INT_CFG0_CLKREQEN;
2942
2943
RTL_W8(tp, INT_CFG0_8125, val8);
2943
2944
break;
···
2968
2971
2969
2972
switch (tp->mac_version) {
2970
2973
case RTL_GIGA_MAC_VER_70:
2971
-
case RTL_GIGA_MAC_VER_71:
2972
2974
val8 = RTL_R8(tp, INT_CFG0_8125) & ~INT_CFG0_CLKREQEN;
2973
2975
RTL_W8(tp, INT_CFG0_8125, val8);
2974
2976
break;
···
3687
3691
/* disable new tx descriptor format */
3688
3692
r8168_mac_ocp_modify(tp, 0xeb58, 0x0001, 0x0000);
3689
3693
3690
-
if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
3691
-
tp->mac_version == RTL_GIGA_MAC_VER_71)
3694
+
if (tp->mac_version == RTL_GIGA_MAC_VER_70)
3692
3695
RTL_W8(tp, 0xD8, RTL_R8(tp, 0xD8) & ~0x02);
3693
3696
3694
-
if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
3695
-
tp->mac_version == RTL_GIGA_MAC_VER_71)
3697
+
if (tp->mac_version == RTL_GIGA_MAC_VER_70)
3696
3698
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0400);
3697
3699
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
3698
3700
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
···
3708
3714
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
3709
3715
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
3710
3716
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
3711
-
if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
3712
-
tp->mac_version == RTL_GIGA_MAC_VER_71)
3717
+
if (tp->mac_version == RTL_GIGA_MAC_VER_70)
3713
3718
r8168_mac_ocp_modify(tp, 0xea1c, 0x0300, 0x0000);
3714
3719
else
3715
3720
r8168_mac_ocp_modify(tp, 0xea1c, 0x0004, 0x0000);
···
3824
3831
[RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1,
3825
3832
[RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3,
3826
3833
[RTL_GIGA_MAC_VER_52] = rtl_hw_start_8117,
3827
-
[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
3828
3834
[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
3829
3835
[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
3830
3836
[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
3831
-
[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8125d,
3832
3837
[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8125d,
3833
3838
[RTL_GIGA_MAC_VER_70] = rtl_hw_start_8126a,
3834
-
[RTL_GIGA_MAC_VER_71] = rtl_hw_start_8126a,
3835
3839
};
3836
3840
3837
3841
if (hw_configs[tp->mac_version])
···
3845
3855
switch (tp->mac_version) {
3846
3856
case RTL_GIGA_MAC_VER_61:
3847
3857
case RTL_GIGA_MAC_VER_64:
3848
-
case RTL_GIGA_MAC_VER_65:
3849
3858
case RTL_GIGA_MAC_VER_66:
3850
3859
for (i = 0xa00; i < 0xb00; i += 4)
3851
3860
RTL_W32(tp, i, 0);
3852
3861
break;
3853
3862
case RTL_GIGA_MAC_VER_63:
3854
3863
case RTL_GIGA_MAC_VER_70:
3855
-
case RTL_GIGA_MAC_VER_71:
3856
3864
for (i = 0xa00; i < 0xa80; i += 4)
3857
3865
RTL_W32(tp, i, 0);
3858
3866
RTL_W16(tp, INT_CFG1_8125, 0x0000);
···
5282
5294
static void rtl_hw_initialize(struct rtl8169_private *tp)
5283
5295
{
5284
5296
switch (tp->mac_version) {
5285
-
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:
5297
+
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:
5286
5298
rtl8168ep_stop_cmac(tp);
5287
5299
fallthrough;
5288
5300
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
-3
drivers/net/ethernet/realtek/r8169_phy_config.c
-3
drivers/net/ethernet/realtek/r8169_phy_config.c
···
1176
1176
[RTL_GIGA_MAC_VER_48] = rtl8168h_2_hw_phy_config,
1177
1177
[RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config,
1178
1178
[RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config,
1179
-
[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
1180
1179
[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
1181
1180
[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
1182
1181
[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
1183
-
[RTL_GIGA_MAC_VER_65] = rtl8125d_hw_phy_config,
1184
1182
[RTL_GIGA_MAC_VER_66] = rtl8125bp_hw_phy_config,
1185
1183
[RTL_GIGA_MAC_VER_70] = rtl8126a_hw_phy_config,
1186
-
[RTL_GIGA_MAC_VER_71] = rtl8126a_hw_phy_config,
1187
1184
};
1188
1185
1189
1186
if (phy_configs[ver])