Commit 8a1ab0c4 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: remove support for chip version 49 



Detection of this chip version has been disabled for few kernel versions now.
Nobody complained, so remove support for this chip version.

v2:
- fix a typo: RTL_GIGA_MAC_VER_40 -> RTL_GIGA_MAC_VER_50

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebe59898

drivers/net/ethernet/realtek/r8169.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ enum mac_version { 
	RTL_GIGA_MAC_VER_46,

	/* support for RTL_GIGA_MAC_VER_47 has been removed */

	RTL_GIGA_MAC_VER_48,

	RTL_GIGA_MAC_VER_49,

	/* support for RTL_GIGA_MAC_VER_49 has been removed */

	RTL_GIGA_MAC_VER_50,

	RTL_GIGA_MAC_VER_51,

	RTL_GIGA_MAC_VER_52,

drivers/net/ethernet/realtek/r8169_main.c

+2 −24
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ static const struct { 
	[RTL_GIGA_MAC_VER_44] = {"RTL8411b",		FIRMWARE_8411_2 },

	[RTL_GIGA_MAC_VER_46] = {"RTL8168h/8111h",	FIRMWARE_8168H_2},

	[RTL_GIGA_MAC_VER_48] = {"RTL8107e",		FIRMWARE_8107E_2},

	[RTL_GIGA_MAC_VER_49] = {"RTL8168ep/8111ep"			},

	[RTL_GIGA_MAC_VER_50] = {"RTL8168ep/8111ep"			},

	[RTL_GIGA_MAC_VER_51] = {"RTL8168ep/8111ep"			},

	[RTL_GIGA_MAC_VER_52] = {"RTL8168fp/RTL8117",  FIRMWARE_8168FP_3},
@@ -885,7 +884,6 @@ static void rtl8168g_phy_suspend_quirk(struct rtl8169_private *tp, int value) 
{

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_40:

	case RTL_GIGA_MAC_VER_49:

		if (value & BMCR_RESET || !(value & BMCR_PDOWN))

			rtl_eri_set_bits(tp, 0x1a8, 0xfc000000);

		else
@@ -1199,7 +1197,7 @@ static enum rtl_dash_type rtl_check_dash(struct rtl8169_private *tp) 
	case RTL_GIGA_MAC_VER_28:

	case RTL_GIGA_MAC_VER_31:

		return r8168dp_check_dash(tp) ? RTL_DASH_DP : RTL_DASH_NONE;

	case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_53:

	case RTL_GIGA_MAC_VER_50 ... RTL_GIGA_MAC_VER_53:

		return r8168ep_check_dash(tp) ? RTL_DASH_EP : RTL_DASH_NONE;

	default:

		return RTL_DASH_NONE;
@@ -3278,25 +3276,6 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp) 
	rtl_pcie_state_l2l3_disable(tp);

}



static void rtl_hw_start_8168ep_1(struct rtl8169_private *tp)

{

	static const struct ephy_info e_info_8168ep_1[] = {

		{ 0x00, 0xffff,	0x10ab },

		{ 0x06, 0xffff,	0xf030 },

		{ 0x08, 0xffff,	0x2006 },

		{ 0x0d, 0xffff,	0x1666 },

		{ 0x0c, 0x3ff0,	0x0000 }

	};



	/* disable aspm and clock request before access ephy */

	rtl_hw_aspm_clkreq_enable(tp, false);

	rtl_ephy_init(tp, e_info_8168ep_1);



	rtl_hw_start_8168ep(tp);



	rtl_hw_aspm_clkreq_enable(tp, true);

}



static void rtl_hw_start_8168ep_2(struct rtl8169_private *tp)

{

	static const struct ephy_info e_info_8168ep_2[] = {
@@ -3743,7 +3722,6 @@ static void rtl_hw_config(struct rtl8169_private *tp) 
		[RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2,

		[RTL_GIGA_MAC_VER_46] = 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,

		[RTL_GIGA_MAC_VER_51] = rtl_hw_start_8168ep_3,

		[RTL_GIGA_MAC_VER_52] = rtl_hw_start_8117,
@@ -5181,7 +5159,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_49 ... RTL_GIGA_MAC_VER_53:

	case RTL_GIGA_MAC_VER_50 ... RTL_GIGA_MAC_VER_53:

		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 −22
Original line number Diff line number Diff line
@@ -830,27 +830,6 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp, 
	rtl8168g_config_eee_phy(phydev);

}



static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp,

				      struct phy_device *phydev)

{

	/* Enable PHY auto speed down */

	phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(3) | BIT(2));



	rtl8168g_phy_adjust_10m_aldps(phydev);



	/* Enable EEE auto-fallback function */

	phy_modify_paged(phydev, 0x0a4b, 0x11, 0, BIT(2));



	/* Enable UC LPF tune function */

	r8168g_phy_param(phydev, 0x8012, 0x0000, 0x8000);



	/* set rg_sel_sdm_rate */

	phy_modify_paged(phydev, 0x0c42, 0x11, BIT(13), BIT(14));



	rtl8168g_disable_aldps(phydev);

	rtl8168g_config_eee_phy(phydev);

}



static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp,

				      struct phy_device *phydev)

{
@@ -1206,7 +1185,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, 
		[RTL_GIGA_MAC_VER_44] = rtl8168g_2_hw_phy_config,

		[RTL_GIGA_MAC_VER_46] = rtl8168h_2_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,

		[RTL_GIGA_MAC_VER_51] = rtl8168ep_2_hw_phy_config,

		[RTL_GIGA_MAC_VER_52] = rtl8117_hw_phy_config,