Skip to content

Commit cd7276e

Browse files
kuba-mookuba-moo
committed
Merge branch 'r8169-merge-chip-versions'
Heiner Kallweit says: ==================== r8169: merge chip versions After 2b065c0 ("r8169: refactor chip version detection") we can merge handling of few chip versions. ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 52358dd + 4f51e7d commit cd7276e

File tree

3 files changed

+12
-30
lines changed

3 files changed

+12
-30
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,12 @@ enum mac_version {
6464
/* support for RTL_GIGA_MAC_VER_50 has been removed */
6565
RTL_GIGA_MAC_VER_51,
6666
RTL_GIGA_MAC_VER_52,
67-
RTL_GIGA_MAC_VER_53,
6867
/* support for RTL_GIGA_MAC_VER_60 has been removed */
6968
RTL_GIGA_MAC_VER_61,
7069
RTL_GIGA_MAC_VER_63,
7170
RTL_GIGA_MAC_VER_64,
72-
RTL_GIGA_MAC_VER_65,
7371
RTL_GIGA_MAC_VER_66,
7472
RTL_GIGA_MAC_VER_70,
75-
RTL_GIGA_MAC_VER_71,
7673
RTL_GIGA_MAC_NONE,
7774
RTL_GIGA_MAC_VER_LAST = RTL_GIGA_MAC_NONE - 1
7875
};

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

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ static const struct rtl_chip_info {
9999
const char *fw_name;
100100
} rtl_chip_infos[] = {
101101
/* 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 },
103103
{ 0x7cf, 0x649, RTL_GIGA_MAC_VER_70, "RTL8126A", FIRMWARE_8126A_2 },
104104

105105
/* 8125BP family. */
106106
{ 0x7cf, 0x681, RTL_GIGA_MAC_VER_66, "RTL8125BP", FIRMWARE_8125BP_2 },
107107

108108
/* 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 },
110110
{ 0x7cf, 0x688, RTL_GIGA_MAC_VER_64, "RTL8125D", FIRMWARE_8125D_1 },
111111

112112
/* 8125B family. */
@@ -116,7 +116,7 @@ static const struct rtl_chip_info {
116116
{ 0x7cf, 0x609, RTL_GIGA_MAC_VER_61, "RTL8125A", FIRMWARE_8125A_3 },
117117

118118
/* RTL8117 */
119-
{ 0x7cf, 0x54b, RTL_GIGA_MAC_VER_53, "RTL8168fp/RTL8117" },
119+
{ 0x7cf, 0x54b, RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117" },
120120
{ 0x7cf, 0x54a, RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117",
121121
FIRMWARE_8168FP_3 },
122122

@@ -830,7 +830,7 @@ static bool rtl_is_8168evl_up(struct rtl8169_private *tp)
830830
{
831831
return tp->mac_version >= RTL_GIGA_MAC_VER_34 &&
832832
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;
834834
}
835835

836836
static bool rtl_supports_eee(struct rtl8169_private *tp)
@@ -998,9 +998,7 @@ void r8169_get_led_name(struct rtl8169_private *tp, int idx,
998998
static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int type)
999999
{
10001000
/* 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)
10041002
*cmd |= 0xf70 << 18;
10051003
}
10061004

@@ -1500,7 +1498,7 @@ static enum rtl_dash_type rtl_get_dash_type(struct rtl8169_private *tp)
15001498
case RTL_GIGA_MAC_VER_28:
15011499
case RTL_GIGA_MAC_VER_31:
15021500
return RTL_DASH_DP;
1503-
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:
1501+
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:
15041502
return RTL_DASH_EP;
15051503
case RTL_GIGA_MAC_VER_66:
15061504
return RTL_DASH_25_BP;
@@ -2485,7 +2483,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)
24852483
case RTL_GIGA_MAC_VER_38:
24862484
RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST);
24872485
break;
2488-
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
2486+
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:
24892487
RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST | RX_EARLY_OFF);
24902488
break;
24912489
case RTL_GIGA_MAC_VER_61:
@@ -2616,7 +2614,7 @@ DECLARE_RTL_COND(rtl_rxtx_empty_cond_2)
26162614
static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp)
26172615
{
26182616
switch (tp->mac_version) {
2619-
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:
2617+
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:
26202618
rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42);
26212619
rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
26222620
break;
@@ -2939,7 +2937,6 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
29392937
rtl_mod_config5(tp, 0, ASPM_en);
29402938
switch (tp->mac_version) {
29412939
case RTL_GIGA_MAC_VER_70:
2942-
case RTL_GIGA_MAC_VER_71:
29432940
val8 = RTL_R8(tp, INT_CFG0_8125) | INT_CFG0_CLKREQEN;
29442941
RTL_W8(tp, INT_CFG0_8125, val8);
29452942
break;
@@ -2971,7 +2968,6 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
29712968

29722969
switch (tp->mac_version) {
29732970
case RTL_GIGA_MAC_VER_70:
2974-
case RTL_GIGA_MAC_VER_71:
29752971
val8 = RTL_R8(tp, INT_CFG0_8125) & ~INT_CFG0_CLKREQEN;
29762972
RTL_W8(tp, INT_CFG0_8125, val8);
29772973
break;
@@ -3691,12 +3687,10 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp)
36913687
/* disable new tx descriptor format */
36923688
r8168_mac_ocp_modify(tp, 0xeb58, 0x0001, 0x0000);
36933689

3694-
if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
3695-
tp->mac_version == RTL_GIGA_MAC_VER_71)
3690+
if (tp->mac_version == RTL_GIGA_MAC_VER_70)
36963691
RTL_W8(tp, 0xD8, RTL_R8(tp, 0xD8) & ~0x02);
36973692

3698-
if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
3699-
tp->mac_version == RTL_GIGA_MAC_VER_71)
3693+
if (tp->mac_version == RTL_GIGA_MAC_VER_70)
37003694
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0400);
37013695
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
37023696
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
@@ -3714,8 +3708,7 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp)
37143708
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
37153709
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
37163710
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
3717-
if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
3718-
tp->mac_version == RTL_GIGA_MAC_VER_71)
3711+
if (tp->mac_version == RTL_GIGA_MAC_VER_70)
37193712
r8168_mac_ocp_modify(tp, 0xea1c, 0x0300, 0x0000);
37203713
else
37213714
r8168_mac_ocp_modify(tp, 0xea1c, 0x0004, 0x0000);
@@ -3831,14 +3824,11 @@ static void rtl_hw_config(struct rtl8169_private *tp)
38313824
[RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1,
38323825
[RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3,
38333826
[RTL_GIGA_MAC_VER_52] = rtl_hw_start_8117,
3834-
[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
38353827
[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
38363828
[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
38373829
[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
3838-
[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8125d,
38393830
[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8125d,
38403831
[RTL_GIGA_MAC_VER_70] = rtl_hw_start_8126a,
3841-
[RTL_GIGA_MAC_VER_71] = rtl_hw_start_8126a,
38423832
};
38433833

38443834
if (hw_configs[tp->mac_version])
@@ -3855,14 +3845,12 @@ static void rtl_hw_start_8125(struct rtl8169_private *tp)
38553845
switch (tp->mac_version) {
38563846
case RTL_GIGA_MAC_VER_61:
38573847
case RTL_GIGA_MAC_VER_64:
3858-
case RTL_GIGA_MAC_VER_65:
38593848
case RTL_GIGA_MAC_VER_66:
38603849
for (i = 0xa00; i < 0xb00; i += 4)
38613850
RTL_W32(tp, i, 0);
38623851
break;
38633852
case RTL_GIGA_MAC_VER_63:
38643853
case RTL_GIGA_MAC_VER_70:
3865-
case RTL_GIGA_MAC_VER_71:
38663854
for (i = 0xa00; i < 0xa80; i += 4)
38673855
RTL_W32(tp, i, 0);
38683856
RTL_W16(tp, INT_CFG1_8125, 0x0000);
@@ -5294,7 +5282,7 @@ static void rtl_hw_init_8125(struct rtl8169_private *tp)
52945282
static void rtl_hw_initialize(struct rtl8169_private *tp)
52955283
{
52965284
switch (tp->mac_version) {
5297-
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:
5285+
case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:
52985286
rtl8168ep_stop_cmac(tp);
52995287
fallthrough;
53005288
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,14 +1176,11 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
11761176
[RTL_GIGA_MAC_VER_48] = rtl8168h_2_hw_phy_config,
11771177
[RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config,
11781178
[RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config,
1179-
[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
11801179
[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
11811180
[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
11821181
[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
1183-
[RTL_GIGA_MAC_VER_65] = rtl8125d_hw_phy_config,
11841182
[RTL_GIGA_MAC_VER_66] = rtl8125bp_hw_phy_config,
11851183
[RTL_GIGA_MAC_VER_70] = rtl8126a_hw_phy_config,
1186-
[RTL_GIGA_MAC_VER_71] = rtl8126a_hw_phy_config,
11871184
};
11881185

11891186
if (phy_configs[ver])

0 commit comments

Comments
 (0)