commit db70b84329315c52f6ec77f5ae5ca1afe970a9bb
author Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Wed Jul 09 21:07:34 2008 +0900
committer Ben Warren <biggerbadderben@gmail.com> Mon Aug 18 23:11:07 2008 -0700
tree 727440188ccb00da8e7fb78d8baa45031aca9324
parent 943b825bf15e6a28ac8328e0f6489478bceef1ea

rtl8169: add support for RTL8110SCL

This patch fixes a problem that RTL8110SCL started transfer
with an incorrect memory address.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

drivers/net/rtl8169.c

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index d069afb..7c00926 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -112,8 +112,10 @@
 enum RTL8169_registers {
 	MAC0 = 0,		/* Ethernet hardware address. */
 	MAR0 = 8,		/* Multicast filter. */
-	TxDescStartAddr = 0x20,
-	TxHDescStartAddr = 0x28,
+	TxDescStartAddrLow = 0x20,
+	TxDescStartAddrHigh = 0x24,
+	TxHDescStartAddrLow = 0x28,
+	TxHDescStartAddrHigh = 0x2c,
 	FLASH = 0x30,
 	ERSR = 0x36,
 	ChipCmd = 0x37,
@@ -138,7 +140,8 @@
 	PHYstatus = 0x6C,
 	RxMaxSize = 0xDA,
 	CPlusCmd = 0xE0,
-	RxDescStartAddr = 0xE4,
+	RxDescStartAddrLow = 0xE4,
+	RxDescStartAddrHigh = 0xE8,
 	EarlyTxThres = 0xEC,
 	FuncEvent = 0xF0,
 	FuncEventMask = 0xF4,
@@ -478,6 +481,7 @@
 	while (len < ETH_ZLEN)
 		ptxb[len++] = '\0';
 
+	tpc->TxDescArray[entry].buf_Haddr = 0;
 	tpc->TxDescArray[entry].buf_addr = cpu_to_le32((unsigned long)ptxb);
 	if (entry != (NUM_TX_DESC - 1)) {
 		tpc->TxDescArray[entry].status =
@@ -558,7 +562,11 @@
 #endif
 
 	RTL_W8(Cfg9346, Cfg9346_Unlock);
-	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+
+	/* RTL-8169sb/8110sb or previous version */
+	if (tpc->chipset <= 5)
+		RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+
 	RTL_W8(EarlyTxThres, EarlyTxThld);
 
 	/* For gigabit rtl8169 */
@@ -576,8 +584,15 @@
 
 	tpc->cur_rx = 0;
 
-	RTL_W32(TxDescStartAddr, (unsigned long)tpc->TxDescArray);
-	RTL_W32(RxDescStartAddr, (unsigned long)tpc->RxDescArray);
+	RTL_W32(TxDescStartAddrLow, (unsigned long)tpc->TxDescArray);
+	RTL_W32(TxDescStartAddrHigh, (unsigned long)0);
+	RTL_W32(RxDescStartAddrLow, (unsigned long)tpc->RxDescArray);
+	RTL_W32(RxDescStartAddrHigh, (unsigned long)0);
+
+	/* RTL-8169sc/8110sc or later version */
+	if (tpc->chipset > 5)
+		RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
+
 	RTL_W8(Cfg9346, Cfg9346_Lock);
 	udelay(10);
 
@@ -737,6 +752,7 @@
 		bis->bi_enetaddr[i] = dev->enetaddr[i] = RTL_R8(MAC0 + i);
 
 #ifdef DEBUG_RTL8169
+	printf("chipset = %d\n", tpc->chipset);
 	printf("MAC Address");
 	for (i = 0; i < MAC_ADDR_LEN; i++)
 		printf(":%02x", dev->enetaddr[i]);