MPC512x: reduce timeout waiting for Ethernet autonegotiation to 2.5s

[karo-tx-uboot.git] / drivers / net / rtl8169.c

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index d39ac7c4c1bc97b64d1029f4783de8c8196231c6..e9f6391b3c1f57f77a9df7c6939075a82e9f59fc 100644 (file)
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -55,12 +55,10 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
 
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_RTL8169)
-
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
 #undef DEBUG_RTL8169_RX
@@ -115,8 +113,10 @@ static int media[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 };
 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,
@@ -141,7 +141,8 @@ enum RTL8169_registers {
        PHYstatus = 0x6C,
        RxMaxSize = 0xDA,
        CPlusCmd = 0xE0,
-       RxDescStartAddr = 0xE4,
+       RxDescStartAddrLow = 0xE4,
+       RxDescStartAddrHigh = 0xE8,
        EarlyTxThres = 0xEC,
        FuncEvent = 0xF0,
        FuncEventMask = 0xF4,
@@ -395,7 +396,7 @@ static int rtl8169_init_board(struct eth_device *dev)
 
        /* if unknown chip, assume array element #0, original RTL-8169 in this case */
        printf("PCI device %s: unknown chip version, assuming RTL-8169\n", dev->name);
-       printf("PCI device: TxConfig = 0x%hX\n", (unsigned long) RTL_R32(TxConfig));
+       printf("PCI device: TxConfig = 0x%lX\n", (unsigned long) RTL_R32(TxConfig));
        tpc->chipset = 0;
 
 match:
@@ -435,7 +436,7 @@ static int rtl_recv(struct eth_device *dev)
                                tpc->RxDescArray[cur_rx].status =
                                        cpu_to_le32(OWNbit + RX_BUF_SIZE);
                        tpc->RxDescArray[cur_rx].buf_addr =
-                               cpu_to_le32(tpc->RxBufferRing[cur_rx]);
+                               cpu_to_le32((unsigned long)tpc->RxBufferRing[cur_rx]);
                } else {
                        puts("Error Rx");
                }
@@ -481,7 +482,8 @@ static int rtl_send(struct eth_device *dev, volatile void *packet, int length)
        while (len < ETH_ZLEN)
                ptxb[len++] = '\0';
 
-       tpc->TxDescArray[entry].buf_addr = cpu_to_le32(ptxb);
+       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 =
                        cpu_to_le32((OWNbit | FSbit | LSbit) |
@@ -561,7 +563,11 @@ static void rtl8169_hw_start(struct eth_device *dev)
 #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 */
@@ -579,8 +585,15 @@ static void rtl8169_hw_start(struct eth_device *dev)
 
        tpc->cur_rx = 0;
 
-       RTL_W32(TxDescStartAddr, tpc->TxDescArray);
-       RTL_W32(RxDescStartAddr, 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);
 
@@ -625,7 +638,7 @@ static void rtl8169_init_ring(struct eth_device *dev)
 
                tpc->RxBufferRing[i] = &rxb[i * RX_BUF_SIZE];
                tpc->RxDescArray[i].buf_addr =
-                       cpu_to_le32(tpc->RxBufferRing[i]);
+                       cpu_to_le32((unsigned long)tpc->RxBufferRing[i]);
        }
 
 #ifdef DEBUG_RTL8169
@@ -740,6 +753,7 @@ static int rtl_init(struct eth_device *dev, bd_t *bis)
                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]);
@@ -887,5 +901,3 @@ int rtl8169_initialize(bd_t *bis)
        }
        return card_number;
 }
-
-#endif