Commit be0f6c41 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch... 

Merge branch 'r8169-disable-detection-of-further-chip-versions-that-didn-t-make-it-to-the-mass-market'

Heiner Kallweit says:

====================
r8169: disable detection of further chip versions that didn't make it to the mass market

There's no sign of life from further chip versions. Seems they didn't
make it to the mass market. Let's disable detection and if nobody
complains remove support a few kernel versions later.
====================

Link: https://lore.kernel.org/r/7708d13a-4a2b-090d-fadf-ecdd0fff5d2e@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4b5f82f6 364ef1f3

drivers/net/ethernet/realtek/r8169_main.c

+13 −4
Original line number Diff line number Diff line
@@ -1978,17 +1978,26 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii) 


		/* 8168EP family. */

		{ 0x7cf, 0x502,	RTL_GIGA_MAC_VER_51 },

		{ 0x7cf, 0x501,	RTL_GIGA_MAC_VER_50 },

		{ 0x7cf, 0x500,	RTL_GIGA_MAC_VER_49 },

		/* It seems this chip version never made it to

		 * the wild. Let's disable detection.

		 * { 0x7cf, 0x501,      RTL_GIGA_MAC_VER_50 },

		 * { 0x7cf, 0x500,      RTL_GIGA_MAC_VER_49 },

		 */



		/* 8168H family. */

		{ 0x7cf, 0x541,	RTL_GIGA_MAC_VER_46 },

		{ 0x7cf, 0x540,	RTL_GIGA_MAC_VER_45 },

		/* It seems this chip version never made it to

		 * the wild. Let's disable detection.

		 * { 0x7cf, 0x540,	RTL_GIGA_MAC_VER_45 },

		 */



		/* 8168G family. */

		{ 0x7cf, 0x5c8,	RTL_GIGA_MAC_VER_44 },

		{ 0x7cf, 0x509,	RTL_GIGA_MAC_VER_42 },

		{ 0x7cf, 0x4c1,	RTL_GIGA_MAC_VER_41 },

		/* It seems this chip version never made it to

		 * the wild. Let's disable detection.

		 * { 0x7cf, 0x4c1,	RTL_GIGA_MAC_VER_41 },

		 */

		{ 0x7cf, 0x4c0,	RTL_GIGA_MAC_VER_40 },



		/* 8168F family. */