Commit 4f51e7d3 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

r8169: merge chip versions 52 and 53 (RTL8117) 



Handling of both chip versions is the same, only difference is
the firmware. So we can merge handling of both chip versions.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/ae866b71-c904-434e-befb-848c831e33ff@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f372ef6e

drivers/net/ethernet/realtek/r8169.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ enum mac_version { 
	/* support for RTL_GIGA_MAC_VER_50 has been removed */

	RTL_GIGA_MAC_VER_51,

	RTL_GIGA_MAC_VER_52,

	RTL_GIGA_MAC_VER_53,

	/* support for RTL_GIGA_MAC_VER_60 has been removed */

	RTL_GIGA_MAC_VER_61,

	RTL_GIGA_MAC_VER_63,

drivers/net/ethernet/realtek/r8169_main.c

+7 −10
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static const struct rtl_chip_info { 
	{ 0x7cf, 0x609,	RTL_GIGA_MAC_VER_61, "RTL8125A", FIRMWARE_8125A_3 },



	/* RTL8117 */

	{ 0x7cf, 0x54b,	RTL_GIGA_MAC_VER_53, "RTL8168fp/RTL8117" },

	{ 0x7cf, 0x54b,	RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117" },

	{ 0x7cf, 0x54a,	RTL_GIGA_MAC_VER_52, "RTL8168fp/RTL8117",

	  FIRMWARE_8168FP_3 },
@@ -830,7 +830,7 @@ static bool rtl_is_8168evl_up(struct rtl8169_private *tp) 
{

	return tp->mac_version >= RTL_GIGA_MAC_VER_34 &&

	       tp->mac_version != RTL_GIGA_MAC_VER_39 &&

	       tp->mac_version <= RTL_GIGA_MAC_VER_53;

	       tp->mac_version <= RTL_GIGA_MAC_VER_52;

}



static bool rtl_supports_eee(struct rtl8169_private *tp)
@@ -998,9 +998,7 @@ void r8169_get_led_name(struct rtl8169_private *tp, int idx, 
static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int type)

{

	/* based on RTL8168FP_OOBMAC_BASE in vendor driver */

	if (type == ERIAR_OOB &&

	    (tp->mac_version == RTL_GIGA_MAC_VER_52 ||

	     tp->mac_version == RTL_GIGA_MAC_VER_53))

	if (type == ERIAR_OOB && tp->mac_version == RTL_GIGA_MAC_VER_52)

		*cmd |= 0xf70 << 18;

}
@@ -1500,7 +1498,7 @@ static enum rtl_dash_type rtl_get_dash_type(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_28:

	case RTL_GIGA_MAC_VER_31:

		return RTL_DASH_DP;

	case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:

	case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:

		return RTL_DASH_EP;

	case RTL_GIGA_MAC_VER_66:

		return RTL_DASH_25_BP;
@@ -2485,7 +2483,7 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_38:

		RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST);

		break;

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:

		RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST | RX_EARLY_OFF);

		break;

	case RTL_GIGA_MAC_VER_61:
@@ -2616,7 +2614,7 @@ DECLARE_RTL_COND(rtl_rxtx_empty_cond_2) 
static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp)

{

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_53:

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52:

		rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42);

		rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);

		break;
@@ -3826,7 +3824,6 @@ static void rtl_hw_config(struct rtl8169_private *tp) 
		[RTL_GIGA_MAC_VER_48] = rtl_hw_start_8168h_1,

		[RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3,

		[RTL_GIGA_MAC_VER_52] = rtl_hw_start_8117,

		[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,

		[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,

		[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,

		[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
@@ -5285,7 +5282,7 @@ static void rtl_hw_init_8125(struct rtl8169_private *tp) 
static void rtl_hw_initialize(struct rtl8169_private *tp)

{

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_53:

	case RTL_GIGA_MAC_VER_51 ... RTL_GIGA_MAC_VER_52:

		rtl8168ep_stop_cmac(tp);

		fallthrough;

	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:

drivers/net/ethernet/realtek/r8169_phy_config.c

+0 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, 
		[RTL_GIGA_MAC_VER_48] = rtl8168h_2_hw_phy_config,

		[RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config,

		[RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config,

		[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,

		[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,

		[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,

		[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,