Commit 6fb07058 authored by Francois Romieu's avatar Francois Romieu
Browse files

r8169: add a new 8168c flavor (bis) 



Taken from Realtek's 8.006.00 r8168 driver.

I have left some bits related to jumbo frame aside for now.

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent 197ff761

drivers/net/r8169.c

+24 −2
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ enum mac_version { 
	RTL_GIGA_MAC_VER_18 = 0x12, // 8168CP

	RTL_GIGA_MAC_VER_19 = 0x13, // 8168C

	RTL_GIGA_MAC_VER_20 = 0x14, // 8168C

	RTL_GIGA_MAC_VER_21 = 0x15  // 8168C

	RTL_GIGA_MAC_VER_21 = 0x15, // 8168C

	RTL_GIGA_MAC_VER_22 = 0x16  // 8168C

};



#define _R(NAME,MAC,MASK) \
@@ -141,7 +142,8 @@ static const struct { 
	_R("RTL8168cp/8111cp",	RTL_GIGA_MAC_VER_18, 0xff7e1880), // PCI-E

	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_19, 0xff7e1880), // PCI-E

	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_20, 0xff7e1880), // PCI-E

	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_21, 0xff7e1880)  // PCI-E

	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_21, 0xff7e1880), // PCI-E

	_R("RTL8168c/8111c",	RTL_GIGA_MAC_VER_22, 0xff7e1880)  // PCI-E

};

#undef _R
@@ -1223,6 +1225,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, 
		{ 0x7cf00000, 0x3c000000,	RTL_GIGA_MAC_VER_19 },

		{ 0x7cf00000, 0x3c200000,	RTL_GIGA_MAC_VER_20 },

		{ 0x7cf00000, 0x3c300000,	RTL_GIGA_MAC_VER_21 },

		{ 0x7cf00000, 0x3c400000,	RTL_GIGA_MAC_VER_22 },

		{ 0x7c800000, 0x3c000000,	RTL_GIGA_MAC_VER_20 },



		/* 8168B family. */
@@ -1469,6 +1472,11 @@ static void rtl8168c_3_hw_phy_config(void __iomem *ioaddr) 
	mdio_write(ioaddr, 0x1f, 0x0000);

}



static void rtl8168c_4_hw_phy_config(void __iomem *ioaddr)

{

	rtl8168c_3_hw_phy_config(ioaddr);

}



static void rtl8102e_hw_phy_config(void __iomem *ioaddr)

{

	struct phy_reg phy_reg_init[] = {
@@ -1528,6 +1536,9 @@ static void rtl_hw_phy_config(struct net_device *dev) 
	case RTL_GIGA_MAC_VER_21:

		rtl8168c_3_hw_phy_config(ioaddr);

		break;

	case RTL_GIGA_MAC_VER_22:

		rtl8168c_4_hw_phy_config(ioaddr);

		break;

	default:

		break;

	}
@@ -2523,6 +2534,13 @@ static void rtl_hw_start_8168c_3(void __iomem *ioaddr, struct pci_dev *pdev) 
	rtl_hw_start_8168c_2(ioaddr, pdev);

}



static void rtl_hw_start_8168c_4(void __iomem *ioaddr, struct pci_dev *pdev)

{

	rtl_csi_access_enable(ioaddr);



	__rtl_hw_start_8168cp(ioaddr, pdev);

}



static void rtl_hw_start_8168(struct net_device *dev)

{

	struct rtl8169_private *tp = netdev_priv(dev);
@@ -2582,6 +2600,10 @@ static void rtl_hw_start_8168(struct net_device *dev) 
		rtl_hw_start_8168c_3(ioaddr, pdev);

	break;



	case RTL_GIGA_MAC_VER_22:

		rtl_hw_start_8168c_4(ioaddr, pdev);

	break;



	default:

		printk(KERN_ERR PFX "%s: unknown chipset (mac_version = %d).\n",

			dev->name, tp->mac_version);