Commit 7e04a111 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: merge handling of chip versions 12 and 17 (RTL8168B) 



It's not clear why XID's 380 and 381..387 ever got different chip
version id's. VER_12 and VER_17 are handled exactly the same.
Therefore merge handling under the VER_17 umbrella.

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

drivers/net/ethernet/realtek/r8169.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ enum mac_version { 
	RTL_GIGA_MAC_VER_09,

	RTL_GIGA_MAC_VER_09,

	RTL_GIGA_MAC_VER_10,

	RTL_GIGA_MAC_VER_10,

	RTL_GIGA_MAC_VER_11,

	RTL_GIGA_MAC_VER_11,

	RTL_GIGA_MAC_VER_12,

	/* RTL_GIGA_MAC_VER_12 was handled the same as VER_17 */

	RTL_GIGA_MAC_VER_13,

	RTL_GIGA_MAC_VER_13,

	RTL_GIGA_MAC_VER_14,

	RTL_GIGA_MAC_VER_14,

	RTL_GIGA_MAC_VER_16,

	RTL_GIGA_MAC_VER_16,

drivers/net/ethernet/realtek/r8169_main.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -102,7 +102,6 @@ static const struct { 
	[RTL_GIGA_MAC_VER_09] = {"RTL8102e/RTL8103e"			},

	[RTL_GIGA_MAC_VER_09] = {"RTL8102e/RTL8103e"			},

	[RTL_GIGA_MAC_VER_10] = {"RTL8101e"				},

	[RTL_GIGA_MAC_VER_10] = {"RTL8101e"				},

	[RTL_GIGA_MAC_VER_11] = {"RTL8168b/8111b"			},

	[RTL_GIGA_MAC_VER_11] = {"RTL8168b/8111b"			},

	[RTL_GIGA_MAC_VER_12] = {"RTL8168b/8111b"			},

	[RTL_GIGA_MAC_VER_13] = {"RTL8101e/RTL8100e"			},

	[RTL_GIGA_MAC_VER_13] = {"RTL8101e/RTL8100e"			},

	[RTL_GIGA_MAC_VER_14] = {"RTL8401"				},

	[RTL_GIGA_MAC_VER_14] = {"RTL8401"				},

	[RTL_GIGA_MAC_VER_16] = {"RTL8101e"				},

	[RTL_GIGA_MAC_VER_16] = {"RTL8101e"				},
@@ -2029,7 +2028,6 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) 
		{ 0x7c8, 0x3c0,	RTL_GIGA_MAC_VER_22 },

		{ 0x7c8, 0x3c0,	RTL_GIGA_MAC_VER_22 },





		/* 8168B family. */

		/* 8168B family. */

		{ 0x7cf, 0x380,	RTL_GIGA_MAC_VER_12 },

		{ 0x7c8, 0x380,	RTL_GIGA_MAC_VER_17 },

		{ 0x7c8, 0x380,	RTL_GIGA_MAC_VER_17 },

		{ 0x7c8, 0x300,	RTL_GIGA_MAC_VER_11 },

		{ 0x7c8, 0x300,	RTL_GIGA_MAC_VER_11 },
@@ -2324,7 +2322,6 @@ static void rtl_jumbo_config(struct rtl8169_private *tp) 




	rtl_unlock_config_regs(tp);

	rtl_unlock_config_regs(tp);

	switch (tp->mac_version) {

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_12:

	case RTL_GIGA_MAC_VER_17:

	case RTL_GIGA_MAC_VER_17:

		if (jumbo) {

		if (jumbo) {

			readrq = 512;

			readrq = 512;
@@ -3628,7 +3625,6 @@ static void rtl_hw_config(struct rtl8169_private *tp) 
		[RTL_GIGA_MAC_VER_09] = rtl_hw_start_8102e_2,

		[RTL_GIGA_MAC_VER_09] = rtl_hw_start_8102e_2,

		[RTL_GIGA_MAC_VER_10] = NULL,

		[RTL_GIGA_MAC_VER_10] = NULL,

		[RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168b,

		[RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168b,

		[RTL_GIGA_MAC_VER_12] = rtl_hw_start_8168b,

		[RTL_GIGA_MAC_VER_13] = NULL,

		[RTL_GIGA_MAC_VER_13] = NULL,

		[RTL_GIGA_MAC_VER_14] = rtl_hw_start_8401,

		[RTL_GIGA_MAC_VER_14] = rtl_hw_start_8401,

		[RTL_GIGA_MAC_VER_16] = NULL,

		[RTL_GIGA_MAC_VER_16] = NULL,
@@ -4859,7 +4855,6 @@ static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp) 
	/* WoL fails with 8168b when the receiver is disabled. */

	/* WoL fails with 8168b when the receiver is disabled. */

	switch (tp->mac_version) {

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_11:

	case RTL_GIGA_MAC_VER_11:

	case RTL_GIGA_MAC_VER_12:

	case RTL_GIGA_MAC_VER_17:

	case RTL_GIGA_MAC_VER_17:

		pci_clear_master(tp->pci_dev);

		pci_clear_master(tp->pci_dev);
@@ -5120,7 +5115,6 @@ static int rtl_jumbo_max(struct rtl8169_private *tp) 
		return JUMBO_7K;

		return JUMBO_7K;

	/* RTL8168b */

	/* RTL8168b */

	case RTL_GIGA_MAC_VER_11:

	case RTL_GIGA_MAC_VER_11:

	case RTL_GIGA_MAC_VER_12:

	case RTL_GIGA_MAC_VER_17:

	case RTL_GIGA_MAC_VER_17:

		return JUMBO_4K;

		return JUMBO_4K;

	/* RTL8168c */

	/* RTL8168c */

drivers/net/ethernet/realtek/r8169_phy_config.c

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

		[RTL_GIGA_MAC_VER_09] = rtl8102e_hw_phy_config,

		[RTL_GIGA_MAC_VER_10] = NULL,

		[RTL_GIGA_MAC_VER_10] = NULL,

		[RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config,

		[RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config,

		[RTL_GIGA_MAC_VER_12] = rtl8168bef_hw_phy_config,

		[RTL_GIGA_MAC_VER_13] = NULL,

		[RTL_GIGA_MAC_VER_13] = NULL,

		[RTL_GIGA_MAC_VER_14] = rtl8401_hw_phy_config,

		[RTL_GIGA_MAC_VER_14] = rtl8401_hw_phy_config,

		[RTL_GIGA_MAC_VER_16] = NULL,

		[RTL_GIGA_MAC_VER_16] = NULL,