GRETH: fixed 2 decriptor table typos
[oweals/u-boot.git] / drivers / net / davinci_emac.c
index fa8cee4d2ef20183c1c38c6c744a92444016dd8a..e06896fea710fa8141a03f74adb8d03bbd89ef06 100644 (file)
 #include <miiphy.h>
 #include <malloc.h>
 #include <asm/arch/emac_defs.h>
+#include <asm/io.h>
 
 unsigned int   emac_dbg = 0;
 #define debug_emac(fmt,args...)        if (emac_dbg) printf(fmt,##args)
 
+#ifdef DAVINCI_EMAC_GIG_ENABLE
+#define emac_gigabit_enable()  davinci_eth_gigabit_enable()
+#else
+#define emac_gigabit_enable()  /* no gigabit to enable */
+#endif
+
 static void davinci_eth_mdio_enable(void);
 
 static int gen_init_phy(int phy_addr);
@@ -58,21 +65,6 @@ void eth_mdio_enable(void)
        davinci_eth_mdio_enable();
 }
 
-static u_int8_t davinci_eth_mac_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-
-/*
- * This function must be called before emac_open() if you want to override
- * the default mac address.
- */
-void davinci_eth_set_mac_addr(const u_int8_t *addr)
-{
-       int i;
-
-       for (i = 0; i < sizeof (davinci_eth_mac_addr); i++) {
-               davinci_eth_mac_addr[i] = addr[i];
-       }
-}
-
 /* EMAC Addresses */
 static volatile emac_regs      *adap_emac = (emac_regs *)EMAC_BASE_ADDR;
 static volatile ewrap_regs     *adap_ewrap = (ewrap_regs *)EMAC_WRAPPER_BASE_ADDR;
@@ -93,18 +85,57 @@ static volatile u_int8_t    active_phy_addr = 0xff;
 
 phy_t                          phy;
 
+static int davinci_eth_set_mac_addr(struct eth_device *dev)
+{
+       unsigned long           mac_hi;
+       unsigned long           mac_lo;
+
+       /*
+        * Set MAC Addresses & Init multicast Hash to 0 (disable any multicast
+        * receive)
+        *  Using channel 0 only - other channels are disabled
+        *  */
+       writel(0, &adap_emac->MACINDEX);
+       mac_hi = (dev->enetaddr[3] << 24) |
+                (dev->enetaddr[2] << 16) |
+                (dev->enetaddr[1] << 8)  |
+                (dev->enetaddr[0]);
+       mac_lo = (dev->enetaddr[5] << 8) |
+                (dev->enetaddr[4]);
+
+       writel(mac_hi, &adap_emac->MACADDRHI);
+#if defined(DAVINCI_EMAC_VERSION2)
+       writel(mac_lo | EMAC_MAC_ADDR_IS_VALID | EMAC_MAC_ADDR_MATCH,
+              &adap_emac->MACADDRLO);
+#else
+       writel(mac_lo, &adap_emac->MACADDRLO);
+#endif
+
+       writel(0, &adap_emac->MACHASH1);
+       writel(0, &adap_emac->MACHASH2);
+
+       /* Set source MAC address - REQUIRED */
+       writel(mac_hi, &adap_emac->MACSRCADDRHI);
+       writel(mac_lo, &adap_emac->MACSRCADDRLO);
+
+
+       return 0;
+}
+
 static void davinci_eth_mdio_enable(void)
 {
        u_int32_t       clkdiv;
 
        clkdiv = (EMAC_MDIO_BUS_FREQ / EMAC_MDIO_CLOCK_FREQ) - 1;
 
-       adap_mdio->CONTROL = (clkdiv & 0xff) |
-               MDIO_CONTROL_ENABLE |
-               MDIO_CONTROL_FAULT |
-               MDIO_CONTROL_FAULT_ENABLE;
+       writel((clkdiv & 0xff) |
+              MDIO_CONTROL_ENABLE |
+              MDIO_CONTROL_FAULT |
+              MDIO_CONTROL_FAULT_ENABLE,
+              &adap_mdio->CONTROL);
 
-       while (adap_mdio->CONTROL & MDIO_CONTROL_IDLE) {;}
+       while (readl(&adap_mdio->CONTROL) & MDIO_CONTROL_IDLE)
+               ;
 }
 
 /*
@@ -119,7 +150,8 @@ static int davinci_eth_phy_detect(void)
 
        active_phy_addr = 0xff;
 
-       if ((phy_act_state = adap_mdio->ALIVE) == 0)
+       phy_act_state = readl(&adap_mdio->ALIVE) & EMAC_MDIO_PHY_MASK;
+       if (phy_act_state == 0)
                return(0);                              /* No active PHYs */
 
        debug_emac("davinci_eth_phy_detect(), ALIVE = 0x%08x\n", phy_act_state);
@@ -144,15 +176,18 @@ int davinci_eth_phy_read(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t *data)
 {
        int     tmp;
 
-       while (adap_mdio->USERACCESS0 & MDIO_USERACCESS0_GO) {;}
+       while (readl(&adap_mdio->USERACCESS0) & MDIO_USERACCESS0_GO)
+               ;
 
-       adap_mdio->USERACCESS0 = MDIO_USERACCESS0_GO |
-                               MDIO_USERACCESS0_WRITE_READ |
-                               ((reg_num & 0x1f) << 21) |
-                               ((phy_addr & 0x1f) << 16);
+       writel(MDIO_USERACCESS0_GO |
+              MDIO_USERACCESS0_WRITE_READ |
+              ((reg_num & 0x1f) << 21) |
+              ((phy_addr & 0x1f) << 16),
+              &adap_mdio->USERACCESS0);
 
        /* Wait for command to complete */
-       while ((tmp = adap_mdio->USERACCESS0) & MDIO_USERACCESS0_GO) {;}
+       while ((tmp = readl(&adap_mdio->USERACCESS0)) & MDIO_USERACCESS0_GO)
+               ;
 
        if (tmp & MDIO_USERACCESS0_ACK) {
                *data = tmp & 0xffff;
@@ -167,16 +202,19 @@ int davinci_eth_phy_read(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t *data)
 int davinci_eth_phy_write(u_int8_t phy_addr, u_int8_t reg_num, u_int16_t data)
 {
 
-       while (adap_mdio->USERACCESS0 & MDIO_USERACCESS0_GO) {;}
+       while (readl(&adap_mdio->USERACCESS0) & MDIO_USERACCESS0_GO)
+               ;
 
-       adap_mdio->USERACCESS0 = MDIO_USERACCESS0_GO |
-                               MDIO_USERACCESS0_WRITE_WRITE |
-                               ((reg_num & 0x1f) << 21) |
-                               ((phy_addr & 0x1f) << 16) |
-                               (data & 0xffff);
+       writel(MDIO_USERACCESS0_GO |
+              MDIO_USERACCESS0_WRITE_WRITE |
+              ((reg_num & 0x1f) << 21) |
+              ((phy_addr & 0x1f) << 16) |
+              (data & 0xffff),
+              &adap_mdio->USERACCESS0);
 
        /* Wait for command to complete */
-       while (adap_mdio->USERACCESS0 & MDIO_USERACCESS0_GO) {;}
+       while (readl(&adap_mdio->USERACCESS0) & MDIO_USERACCESS0_GO)
+               ;
 
        return(1);
 }
@@ -236,18 +274,33 @@ static int gen_auto_negotiate(int phy_addr)
 
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-static int davinci_mii_phy_read(char *devname, unsigned char addr, unsigned char reg, unsigned short *value)
+static int davinci_mii_phy_read(const char *devname, unsigned char addr, unsigned char reg, unsigned short *value)
 {
        return(davinci_eth_phy_read(addr, reg, value) ? 0 : 1);
 }
 
-static int davinci_mii_phy_write(char *devname, unsigned char addr, unsigned char reg, unsigned short value)
+static int davinci_mii_phy_write(const char *devname, unsigned char addr, unsigned char reg, unsigned short value)
 {
        return(davinci_eth_phy_write(addr, reg, value) ? 0 : 1);
 }
-
 #endif
 
+static void  __attribute__((unused)) davinci_eth_gigabit_enable(void)
+{
+       u_int16_t data;
+
+       if (davinci_eth_phy_read(EMAC_MDIO_PHY_NUM, 0, &data)) {
+               if (data & (1 << 6)) { /* speed selection MSB */
+                       /*
+                        * Check if link detected is giga-bit
+                        * If Gigabit mode detected, enable gigbit in MAC
+                        */
+                       writel(EMAC_MACCONTROL_GIGFORCE |
+                              EMAC_MACCONTROL_GIGABIT_ENABLE,
+                              &adap_emac->MACCONTROL);
+               }
+       }
+}
 
 /* Eth device open */
 static int davinci_eth_open(struct eth_device *dev, bd_t *bis)
@@ -259,60 +312,44 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis)
        debug_emac("+ emac_open\n");
 
        /* Reset EMAC module and disable interrupts in wrapper */
-       adap_emac->SOFTRESET = 1;
-       while (adap_emac->SOFTRESET != 0) {;}
-       adap_ewrap->EWCTL = 0;
+       writel(1, &adap_emac->SOFTRESET);
+       while (readl(&adap_emac->SOFTRESET) != 0)
+               ;
+#if defined(DAVINCI_EMAC_VERSION2)
+       writel(1, &adap_ewrap->softrst);
+       while (readl(&adap_ewrap->softrst) != 0)
+               ;
+#else
+       writel(0, &adap_ewrap->EWCTL);
        for (cnt = 0; cnt < 5; cnt++) {
-               clkdiv = adap_ewrap->EWCTL;
+               clkdiv = readl(&adap_ewrap->EWCTL);
        }
+#endif
 
        rx_desc = emac_rx_desc;
 
-       adap_emac->TXCONTROL = 0x01;
-       adap_emac->RXCONTROL = 0x01;
-
-       /* Set MAC Addresses & Init multicast Hash to 0 (disable any multicast receive) */
-       /* Using channel 0 only - other channels are disabled */
-       adap_emac->MACINDEX = 0;
-       adap_emac->MACADDRHI =
-               (davinci_eth_mac_addr[3] << 24) |
-               (davinci_eth_mac_addr[2] << 16) |
-               (davinci_eth_mac_addr[1] << 8)  |
-               (davinci_eth_mac_addr[0]);
-       adap_emac->MACADDRLO =
-               (davinci_eth_mac_addr[5] << 8) |
-               (davinci_eth_mac_addr[4]);
+       writel(1, &adap_emac->TXCONTROL);
+       writel(1, &adap_emac->RXCONTROL);
 
-       adap_emac->MACHASH1 = 0;
-       adap_emac->MACHASH2 = 0;
-
-       /* Set source MAC address - REQUIRED */
-       adap_emac->MACSRCADDRHI =
-               (davinci_eth_mac_addr[3] << 24) |
-               (davinci_eth_mac_addr[2] << 16) |
-               (davinci_eth_mac_addr[1] << 8)  |
-               (davinci_eth_mac_addr[0]);
-       adap_emac->MACSRCADDRLO =
-               (davinci_eth_mac_addr[4] << 8) |
-               (davinci_eth_mac_addr[5]);
+       davinci_eth_set_mac_addr(dev);
 
        /* Set DMA 8 TX / 8 RX Head pointers to 0 */
        addr = &adap_emac->TX0HDP;
        for(cnt = 0; cnt < 16; cnt++)
-               *addr++ = 0;
+               writel(0, addr++);
 
        addr = &adap_emac->RX0HDP;
        for(cnt = 0; cnt < 16; cnt++)
-               *addr++ = 0;
+               writel(0, addr++);
 
        /* Clear Statistics (do this before setting MacControl register) */
        addr = &adap_emac->RXGOODFRAMES;
        for(cnt = 0; cnt < EMAC_NUM_STATS; cnt++)
-               *addr++ = 0;
+               writel(0, addr++);
 
        /* No multicast addressing */
-       adap_emac->MACHASH1 = 0;
-       adap_emac->MACHASH2 = 0;
+       writel(0, &adap_emac->MACHASH1);
+       writel(0, &adap_emac->MACHASH2);
 
        /* Create RX queue and set receive process in place */
        emac_rx_active_head = emac_rx_desc;
@@ -324,34 +361,52 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis)
                rx_desc++;
        }
 
-       /* Set the last descriptor's "next" parameter to 0 to end the RX desc list */
+       /* Finalize the rx desc list */
        rx_desc--;
        rx_desc->next = 0;
        emac_rx_active_tail = rx_desc;
        emac_rx_queue_active = 1;
 
        /* Enable TX/RX */
-       adap_emac->RXMAXLEN = EMAC_MAX_ETHERNET_PKT_SIZE;
-       adap_emac->RXBUFFEROFFSET = 0;
+       writel(EMAC_MAX_ETHERNET_PKT_SIZE, &adap_emac->RXMAXLEN);
+       writel(0, &adap_emac->RXBUFFEROFFSET);
 
-       /* No fancy configs - Use this for promiscous for debug - EMAC_RXMBPENABLE_RXCAFEN_ENABLE */
-       adap_emac->RXMBPENABLE = EMAC_RXMBPENABLE_RXBROADEN;
+       /*
+        * No fancy configs - Use this for promiscous debug
+        *   - EMAC_RXMBPENABLE_RXCAFEN_ENABLE
+        */
+       writel(EMAC_RXMBPENABLE_RXBROADEN, &adap_emac->RXMBPENABLE);
 
        /* Enable ch 0 only */
-       adap_emac->RXUNICASTSET = 0x01;
+       writel(1, &adap_emac->RXUNICASTSET);
 
        /* Enable MII interface and Full duplex mode */
-       adap_emac->MACCONTROL = (EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE);
+#ifdef CONFIG_SOC_DA8XX
+       writel((EMAC_MACCONTROL_MIIEN_ENABLE |
+               EMAC_MACCONTROL_FULLDUPLEX_ENABLE |
+               EMAC_MACCONTROL_RMIISPEED_100),
+              &adap_emac->MACCONTROL);
+#else
+       writel((EMAC_MACCONTROL_MIIEN_ENABLE |
+               EMAC_MACCONTROL_FULLDUPLEX_ENABLE),
+              &adap_emac->MACCONTROL);
+#endif
 
        /* Init MDIO & get link state */
        clkdiv = (EMAC_MDIO_BUS_FREQ / EMAC_MDIO_CLOCK_FREQ) - 1;
-       adap_mdio->CONTROL = ((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | MDIO_CONTROL_FAULT);
+       writel((clkdiv & 0xff) | MDIO_CONTROL_ENABLE | MDIO_CONTROL_FAULT,
+              &adap_mdio->CONTROL);
+
+       /* We need to wait for MDIO to start */
+       udelay(1000);
 
        if (!phy.get_link_speed(active_phy_addr))
                return(0);
 
+       emac_gigabit_enable();
+
        /* Start receive process */
-       adap_emac->RX0HDP = (u_int32_t)emac_rx_desc;
+       writel((u_int32_t)emac_rx_desc, &adap_emac->RX0HDP);
 
        debug_emac("- emac_open\n");
 
@@ -368,34 +423,42 @@ static void davinci_eth_ch_teardown(int ch)
 
        if (ch == EMAC_CH_TX) {
                /* Init TX channel teardown */
-               adap_emac->TXTEARDOWN = 1;
-               for(cnt = 0; cnt != 0xfffffffc; cnt = adap_emac->TX0CP) {
-                       /* Wait here for Tx teardown completion interrupt to occur
-                        * Note: A task delay can be called here to pend rather than
-                        * occupying CPU cycles - anyway it has been found that teardown
-                        * takes very few cpu cycles and does not affect functionality */
-                        dly--;
-                        udelay(1);
-                        if (dly == 0)
+               writel(1, &adap_emac->TXTEARDOWN);
+               do {
+                       /*
+                        * Wait here for Tx teardown completion interrupt to
+                        * occur. Note: A task delay can be called here to pend
+                        * rather than occupying CPU cycles - anyway it has
+                        * been found that teardown takes very few cpu cycles
+                        * and does not affect functionality
+                        */
+                       dly--;
+                       udelay(1);
+                       if (dly == 0)
                                break;
-               }
-               adap_emac->TX0CP = cnt;
-               adap_emac->TX0HDP = 0;
+                       cnt = readl(&adap_emac->TX0CP);
+               } while (cnt != 0xfffffffc);
+               writel(cnt, &adap_emac->TX0CP);
+               writel(0, &adap_emac->TX0HDP);
        } else {
                /* Init RX channel teardown */
-               adap_emac->RXTEARDOWN = 1;
-               for(cnt = 0; cnt != 0xfffffffc; cnt = adap_emac->RX0CP) {
-                       /* Wait here for Rx teardown completion interrupt to occur
-                        * Note: A task delay can be called here to pend rather than
-                        * occupying CPU cycles - anyway it has been found that teardown
-                        * takes very few cpu cycles and does not affect functionality */
-                        dly--;
-                        udelay(1);
-                        if (dly == 0)
+               writel(1, &adap_emac->RXTEARDOWN);
+               do {
+                       /*
+                        * Wait here for Rx teardown completion interrupt to
+                        * occur. Note: A task delay can be called here to pend
+                        * rather than occupying CPU cycles - anyway it has
+                        * been found that teardown takes very few cpu cycles
+                        * and does not affect functionality
+                        */
+                       dly--;
+                       udelay(1);
+                       if (dly == 0)
                                break;
-               }
-               adap_emac->RX0CP = cnt;
-               adap_emac->RX0HDP = 0;
+                       cnt = readl(&adap_emac->RX0CP);
+               } while (cnt != 0xfffffffc);
+               writel(cnt, &adap_emac->RX0CP);
+               writel(0, &adap_emac->RX0HDP);
        }
 
        debug_emac("- emac_ch_teardown\n");
@@ -410,8 +473,12 @@ static void davinci_eth_close(struct eth_device *dev)
        davinci_eth_ch_teardown(EMAC_CH_RX);    /* RX Channel teardown */
 
        /* Reset EMAC module and disable interrupts in wrapper */
-       adap_emac->SOFTRESET = 1;
-       adap_ewrap->EWCTL = 0;
+       writel(1, &adap_emac->SOFTRESET);
+#if defined(DAVINCI_EMAC_VERSION2)
+       writel(1, &adap_ewrap->softrst);
+#else
+       writel(0, &adap_ewrap->EWCTL);
+#endif
 
        debug_emac("- emac_close\n");
 }
@@ -435,6 +502,8 @@ static int davinci_eth_send_packet (struct eth_device *dev,
                return (ret_status);
        }
 
+       emac_gigabit_enable();
+
        /* Check packet size and if < EMAC_MIN_ETHERNET_PKT_SIZE, pad it up */
        if (length < EMAC_MIN_ETHERNET_PKT_SIZE) {
                length = EMAC_MIN_ETHERNET_PKT_SIZE;
@@ -449,7 +518,7 @@ static int davinci_eth_send_packet (struct eth_device *dev,
                                      EMAC_CPPI_OWNERSHIP_BIT |
                                      EMAC_CPPI_EOP_BIT);
        /* Send the packet */
-       adap_emac->TX0HDP = (unsigned int) emac_tx_desc;
+       writel((unsigned long)emac_tx_desc, &adap_emac->TX0HDP);
 
        /* Wait for packet to complete or link down */
        while (1) {
@@ -457,7 +526,10 @@ static int davinci_eth_send_packet (struct eth_device *dev,
                        davinci_eth_ch_teardown (EMAC_CH_TX);
                        return (ret_status);
                }
-               if (adap_emac->TXINTSTATRAW & 0x01) {
+
+               emac_gigabit_enable();
+
+               if (readl(&adap_emac->TXINTSTATRAW) & 0x01) {
                        ret_status = length;
                        break;
                }
@@ -490,15 +562,15 @@ static int davinci_eth_rcv_packet (struct eth_device *dev)
                }
 
                /* Ack received packet descriptor */
-               adap_emac->RX0CP = (unsigned int) rx_curr_desc;
+               writel((unsigned long)rx_curr_desc, &adap_emac->RX0CP);
                curr_desc = rx_curr_desc;
                emac_rx_active_head =
                        (volatile emac_desc *) rx_curr_desc->next;
 
                if (status & EMAC_CPPI_EOQ_BIT) {
                        if (emac_rx_active_head) {
-                               adap_emac->RX0HDP =
-                                       (unsigned int) emac_rx_active_head;
+                               writel((unsigned long)emac_rx_active_head,
+                                      &adap_emac->RX0HDP);
                        } else {
                                emac_rx_queue_active = 0;
                                printf ("INFO:emac_rcv_packet: RX Queue not active\n");
@@ -515,8 +587,8 @@ static int davinci_eth_rcv_packet (struct eth_device *dev)
                        emac_rx_active_head = curr_desc;
                        emac_rx_active_tail = curr_desc;
                        if (emac_rx_queue_active != 0) {
-                               adap_emac->RX0HDP =
-                                       (unsigned int) emac_rx_active_head;
+                               writel((unsigned long)emac_rx_active_head,
+                                      &adap_emac->RX0HDP);
                                printf ("INFO: emac_rcv_pkt: active queue head = 0, HDP fired\n");
                                emac_rx_queue_active = 1;
                        }
@@ -526,7 +598,8 @@ static int davinci_eth_rcv_packet (struct eth_device *dev)
                        tail_desc->next = (unsigned int) curr_desc;
                        status = tail_desc->pkt_flag_len;
                        if (status & EMAC_CPPI_EOQ_BIT) {
-                               adap_emac->RX0HDP = (unsigned int) curr_desc;
+                               writel((unsigned long)curr_desc,
+                                      &adap_emac->RX0HDP);
                                status &= ~EMAC_CPPI_EOQ_BIT;
                                tail_desc->pkt_flag_len = status;
                        }
@@ -560,13 +633,14 @@ int davinci_emac_initialize(void)
        dev->halt = davinci_eth_close;
        dev->send = davinci_eth_send_packet;
        dev->recv = davinci_eth_rcv_packet;
+       dev->write_hwaddr = davinci_eth_set_mac_addr;
 
        eth_register(dev);
 
        davinci_eth_mdio_enable();
 
        for (i = 0; i < 256; i++) {
-               if (adap_mdio->ALIVE)
+               if (readl(&adap_mdio->ALIVE))
                        break;
                udelay(10);
        }