From: rick <r...@andestech.com>

Add eth DM driver for ag101p board.
Enable random ethaddr.

Signed-off-by: rick <r...@andestech.com>
Cc: Andes <ub...@andestech.com>
---
 arch/nds32/dts/ag101p.dts               |    1 +
 board/AndesTech/adp-ag101p/adp-ag101p.c |    5 +-
 configs/adp-ag101p_defconfig            |    3 +
 drivers/net/Kconfig                     |    5 +
 drivers/net/ftmac100.c                  |  281 +++++++++++++++++++++++++------
 include/configs/adp-ag101p.h            |    6 -
 6 files changed, 241 insertions(+), 60 deletions(-)

diff --git a/arch/nds32/dts/ag101p.dts b/arch/nds32/dts/ag101p.dts
index c87d0bd..dd2bf8f 100644
--- a/arch/nds32/dts/ag101p.dts
+++ b/arch/nds32/dts/ag101p.dts
@@ -7,6 +7,7 @@
 
        aliases {
                uart0 = &serial0;
+               ethernet0 = &mac0;
        } ;
 
        chosen {
diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c 
b/board/AndesTech/adp-ag101p/adp-ag101p.c
index dbeb662..430e611 100644
--- a/board/AndesTech/adp-ag101p/adp-ag101p.c
+++ b/board/AndesTech/adp-ag101p/adp-ag101p.c
@@ -7,9 +7,10 @@
  */
 
 #include <common.h>
+#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
+#endif
 #include <asm/io.h>
-
 #include <faraday/ftsdc010.h>
 #include <faraday/ftsmc020.h>
 
@@ -57,10 +58,12 @@ void dram_init_banksize(void)
        gd->bd->bi_dram[1].size =  PHYS_SDRAM_1_SIZE;
 }
 
+#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 int board_eth_init(bd_t *bd)
 {
        return ftmac100_initialize(bd);
 }
+#endif
 
 ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
 {
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index f22a85b..0514f6e 100644
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -11,11 +11,14 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
+CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_BLK=y
 CONFIG_DM_MMC=y
 CONFIG_DM_MMC_OPS=y
 CONFIG_NDS32_MMC=y
+CONFIG_DM_ETH=y
+CONFIG_FTMAC100=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_TIMER=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 302c005..48ec1ef 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -197,4 +197,9 @@ config PIC32_ETH
          This driver implements 10/100 Mbps Ethernet and MAC layer for
          Microchip PIC32 microcontrollers.
 
+config FTMAC100
+       bool "Ftmac100 Ethernet Support"
+       help
+         This MAC is present in Andestech AG101P SoCs.
+
 endif # NETDEVICES
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 1fc7da9..1479294 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -12,23 +12,27 @@
 #include <malloc.h>
 #include <net.h>
 #include <asm/io.h>
-
 #include "ftmac100.h"
-
+#ifdef CONFIG_DM_ETH
+#include <dm.h>
+DECLARE_GLOBAL_DATA_PTR;
+#endif
 #define ETH_ZLEN       60
 
 struct ftmac100_data {
        struct ftmac100_txdes txdes[1];
        struct ftmac100_rxdes rxdes[PKTBUFSRX];
        int rx_index;
+       const char *name;
+       phys_addr_t iobase;
 };
 
 /*
  * Reset MAC
  */
-static void ftmac100_reset (struct eth_device *dev)
+static void ftmac100_reset(struct ftmac100_data *priv)
 {
-       struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase;
+       struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
 
        debug ("%s()\n", __func__);
 
@@ -41,9 +45,10 @@ static void ftmac100_reset (struct eth_device *dev)
 /*
  * Set MAC address
  */
-static void ftmac100_set_mac (struct eth_device *dev, const unsigned char *mac)
+static void ftmac100_set_mac(struct ftmac100_data *priv ,
+       const unsigned char *mac)
 {
-       struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase;
+       struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
        unsigned int maddr = mac[0] << 8 | mac[1];
        unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5];
 
@@ -53,29 +58,22 @@ static void ftmac100_set_mac (struct eth_device *dev, const 
unsigned char *mac)
        writel (laddr, &ftmac100->mac_ladr);
 }
 
-static void ftmac100_set_mac_from_env (struct eth_device *dev)
-{
-       eth_getenv_enetaddr ("ethaddr", dev->enetaddr);
-
-       ftmac100_set_mac (dev, dev->enetaddr);
-}
-
 /*
- * disable transmitter, receiver
- */
-static void ftmac100_halt (struct eth_device *dev)
+ * Disable MAC
+*/
+static void _ftmac100_halt(struct ftmac100_data *priv)
 {
-       struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase;
-
+       struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
        debug ("%s()\n", __func__);
-
        writel (0, &ftmac100->maccr);
 }
 
-static int ftmac100_init (struct eth_device *dev, bd_t *bd)
+/*
+ * Initialize MAC
+ */
+static int _ftmac100_init(struct ftmac100_data *priv, unsigned char 
enetaddr[6])
 {
-       struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase;
-       struct ftmac100_data *priv = dev->priv;
+       struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
        struct ftmac100_txdes *txdes = priv->txdes;
        struct ftmac100_rxdes *rxdes = priv->rxdes;
        unsigned int maccr;
@@ -83,15 +81,15 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd)
 
        debug ("%s()\n", __func__);
 
-       ftmac100_reset (dev);
+       ftmac100_reset(priv);
 
        /* set the ethernet address */
+       ftmac100_set_mac(priv, enetaddr);
 
-       ftmac100_set_mac_from_env (dev);
 
        /* disable all interrupts */
 
-       writel (0, &ftmac100->imr);
+       writel(0, &ftmac100->imr);
 
        /* initialize descriptors */
 
@@ -109,15 +107,15 @@ static int ftmac100_init (struct eth_device *dev, bd_t 
*bd)
 
        /* transmit ring */
 
-       writel ((unsigned int)txdes, &ftmac100->txr_badr);
+       writel((unsigned int)txdes, &ftmac100->txr_badr);
 
        /* receive ring */
 
-       writel ((unsigned int)rxdes, &ftmac100->rxr_badr);
+       writel((unsigned int)rxdes, &ftmac100->rxr_badr);
 
        /* poll receive descriptor automatically */
 
-       writel (FTMAC100_APTC_RXPOLL_CNT (1), &ftmac100->aptc);
+       writel(FTMAC100_APTC_RXPOLL_CNT(1) , &ftmac100->aptc);
 
        /* enable transmitter, receiver */
 
@@ -130,31 +128,43 @@ static int ftmac100_init (struct eth_device *dev, bd_t 
*bd)
                FTMAC100_MACCR_RX_RUNT |
                FTMAC100_MACCR_RX_BROADPKT;
 
-       writel (maccr, &ftmac100->maccr);
+       writel(maccr, &ftmac100->maccr);
 
        return 0;
 }
 
 /*
- * Get a data block via Ethernet
+ * Free receiving buffer
  */
-static int ftmac100_recv (struct eth_device *dev)
+static int _ftmac100_free_pkt(struct ftmac100_data *priv)
+{
+       struct ftmac100_rxdes *curr_des;
+       curr_des = &priv->rxdes[priv->rx_index];
+       /* release buffer to DMA */
+       curr_des->rxdes0 |= FTMAC100_RXDES0_RXDMA_OWN;
+       priv->rx_index = (priv->rx_index + 1) % PKTBUFSRX;
+       return 0;
+}
+
+/*
+ * Receive a data block via Ethernet
+ */
+static int __ftmac100_recv(struct ftmac100_data *priv)
 {
-       struct ftmac100_data *priv = dev->priv;
        struct ftmac100_rxdes *curr_des;
        unsigned short rxlen;
 
        curr_des = &priv->rxdes[priv->rx_index];
 
        if (curr_des->rxdes0 & FTMAC100_RXDES0_RXDMA_OWN)
-               return -1;
+               return 0;
 
        if (curr_des->rxdes0 & (FTMAC100_RXDES0_RX_ERR |
                                FTMAC100_RXDES0_CRC_ERR |
                                FTMAC100_RXDES0_FTL |
                                FTMAC100_RXDES0_RUNT |
                                FTMAC100_RXDES0_RX_ODD_NB)) {
-               return -1;
+               return 0;
        }
 
        rxlen = FTMAC100_RXDES0_RFL (curr_des->rxdes0);
@@ -162,26 +172,15 @@ static int ftmac100_recv (struct eth_device *dev)
        debug ("%s(): RX buffer %d, %x received\n",
               __func__, priv->rx_index, rxlen);
 
-       /* pass the packet up to the protocol layers. */
-
-       net_process_received_packet((void *)curr_des->rxdes2, rxlen);
-
-       /* release buffer to DMA */
-
-       curr_des->rxdes0 |= FTMAC100_RXDES0_RXDMA_OWN;
-
-       priv->rx_index = (priv->rx_index + 1) % PKTBUFSRX;
-
-       return 0;
+       return rxlen;
 }
 
 /*
  * Send a data block via Ethernet
  */
-static int ftmac100_send(struct eth_device *dev, void *packet, int length)
+static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length)
 {
-       struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase;
-       struct ftmac100_data *priv = dev->priv;
+       struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
        struct ftmac100_txdes *curr_des = priv->txdes;
        ulong start;
 
@@ -224,25 +223,69 @@ static int ftmac100_send(struct eth_device *dev, void 
*packet, int length)
        return 0;
 }
 
+#ifndef CONFIG_DM_ETH
+/*
+ * disable transmitter, receiver
+ */
+static void ftmac100_halt(struct eth_device *dev)
+{
+       struct ftmac100_data *priv = dev->priv;
+       return _ftmac100_halt(priv);
+}
+
+static int ftmac100_init(struct eth_device *dev, bd_t *bd)
+{
+       struct ftmac100_data *priv = dev->priv;
+       return _ftmac100_init(priv , dev->enetaddr);
+}
+
+static int _ftmac100_recv(struct ftmac100_data *priv)
+{
+       struct ftmac100_rxdes *curr_des;
+       unsigned short len;
+       curr_des = &priv->rxdes[priv->rx_index];
+       len = __ftmac100_recv(priv);
+       if (len) {
+               /* pass the packet up to the protocol layers. */
+               net_process_received_packet((void *)curr_des->rxdes2, len);
+               _ftmac100_free_pkt(priv);
+       }
+       return len ? 1 : 0;
+}
+
+/*
+ * Get a data block via Ethernet
+ */
+static int ftmac100_recv(struct eth_device *dev)
+{
+       struct ftmac100_data *priv = dev->priv;
+       return _ftmac100_recv(priv);
+}
+
+/*
+ * Send a data block via Ethernet
+ */
+static int ftmac100_send(struct eth_device *dev, void *packet, int length)
+{
+       struct ftmac100_data *priv = dev->priv;
+       return _ftmac100_send(priv , packet , length);
+}
+
 int ftmac100_initialize (bd_t *bd)
 {
        struct eth_device *dev;
        struct ftmac100_data *priv;
-
        dev = malloc (sizeof *dev);
        if (!dev) {
                printf ("%s(): failed to allocate dev\n", __func__);
                goto out;
        }
-
        /* Transmit and receive descriptors should align to 16 bytes */
-
        priv = memalign (16, sizeof (struct ftmac100_data));
        if (!priv) {
                printf ("%s(): failed to allocate priv\n", __func__);
                goto free_dev;
        }
-
        memset (dev, 0, sizeof (*dev));
        memset (priv, 0, sizeof (*priv));
 
@@ -253,7 +296,7 @@ int ftmac100_initialize (bd_t *bd)
        dev->send       = ftmac100_send;
        dev->recv       = ftmac100_recv;
        dev->priv       = priv;
-
+       priv->iobase    = dev->iobase;
        eth_register (dev);
 
        return 1;
@@ -263,3 +306,135 @@ free_dev:
 out:
        return 0;
 }
+#endif
+
+#ifdef CONFIG_DM_ETH
+static int ftmac100_start(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct ftmac100_data *priv = dev_get_priv(dev);
+
+       return _ftmac100_init(priv, plat->enetaddr);
+}
+
+static void ftmac100_stop(struct udevice *dev)
+{
+       struct ftmac100_data *priv = dev_get_priv(dev);
+       _ftmac100_halt(priv);
+}
+
+static int ftmac100_send(struct udevice *dev, void *packet, int length)
+{
+       struct ftmac100_data *priv = dev_get_priv(dev);
+       int ret;
+       ret = _ftmac100_send(priv , packet , length);
+       return ret ? 0 : -ETIMEDOUT;
+}
+
+static int ftmac100_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+       struct ftmac100_data *priv = dev_get_priv(dev);
+       struct ftmac100_rxdes *curr_des;
+       curr_des = &priv->rxdes[priv->rx_index];
+       int len;
+       len = __ftmac100_recv(priv);
+       if (len)
+               *packetp = (void *)curr_des->rxdes2;
+
+       return len ? len : -EAGAIN;
+}
+
+static int ftmac100_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+       struct ftmac100_data *priv = dev_get_priv(dev);
+       _ftmac100_free_pkt(priv);
+       return 0;
+}
+
+int ftmac100_read_rom_hwaddr(struct udevice *dev)
+{
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+       eth_getenv_enetaddr("ethaddr", pdata->enetaddr);
+       return 0;
+}
+
+static const char *dtbmacaddr(u32 ifno)
+{
+       int node, len;
+       char enet[16];
+       const char *mac;
+       const char *path;
+       if (gd->fdt_blob == NULL) {
+               printf("%s: don't have a valid gd->fdt_blob!\n", __func__);
+               return NULL;
+       }
+       node = fdt_path_offset(gd->fdt_blob, "/aliases");
+       if (node < 0)
+               return NULL;
+
+       sprintf(enet, "ethernet%d", ifno);
+       path = fdt_getprop(gd->fdt_blob, node, enet, NULL);
+       if (!path) {
+               printf("no alias for %s\n", enet);
+               return NULL;
+       }
+       node = fdt_path_offset(gd->fdt_blob, path);
+       mac = fdt_getprop(gd->fdt_blob, node, "mac-address", &len);
+       if (mac && is_valid_ethaddr((u8 *)mac))
+               return mac;
+
+       return NULL;
+}
+
+static int ftmac100_ofdata_to_platdata(struct udevice *dev)
+{
+       struct ftmac100_data *priv = dev_get_priv(dev);
+       struct eth_pdata *pdata = dev_get_platdata(dev);
+       const char *mac;
+       pdata->iobase = dev_get_addr(dev);
+       priv->iobase = pdata->iobase;
+       mac = dtbmacaddr(0);
+       if (mac)
+               memcpy(pdata->enetaddr , mac , 6);
+
+       return 0;
+}
+
+static int ftmac100_probe(struct udevice *dev)
+{
+       struct ftmac100_data *priv = dev_get_priv(dev);
+       priv->name = dev->name;
+       return 0;
+}
+
+static int ftmac100_bind(struct udevice *dev)
+{
+       return device_set_name(dev, dev->name);
+}
+
+static const struct eth_ops ftmac100_ops = {
+       .start  = ftmac100_start,
+       .send   = ftmac100_send,
+       .recv   = ftmac100_recv,
+       .stop   = ftmac100_stop,
+       .free_pkt = ftmac100_free_pkt,
+};
+
+static const struct udevice_id ftmac100_ids[] = {
+       { .compatible = "andestech,atmac100" },
+       { }
+};
+
+U_BOOT_DRIVER(ftmac100) = {
+       .name   = "nds32_mac",
+       .id     = UCLASS_ETH,
+       .of_match = ftmac100_ids,
+       .bind   = ftmac100_bind,
+       .ofdata_to_platdata = ftmac100_ofdata_to_platdata,
+       .probe  = ftmac100_probe,
+       .ops    = &ftmac100_ops,
+       .priv_auto_alloc_size = sizeof(struct ftmac100_data),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+       .flags  = DM_FLAG_ALLOC_PRIV_DMA,
+};
+#endif
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index eb8b2d3..136149e 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -96,12 +96,6 @@
 #define CONFIG_SYS_NS16550_CLK         ((18432000 * 20) / 25)  /* AG101P */
 
 /*
- * Ethernet
- */
-#define CONFIG_FTMAC100
-
-
-/*
  * SD (MMC) controller
  */
 #define CONFIG_MMC
-- 
1.7.9.5

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to