net: pcnet: Remove CONFIG_PCNET_79C97x
[platform/kernel/u-boot.git] / drivers / net / pcnet.c
index 71a3110..59241c9 100644 (file)
@@ -1,13 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002 Wolfgang Grandegger, wg@denx.de.
  *
  * This driver for AMD PCnet network controllers is derived from the
  * Linux driver pcnet32.c written 1996-1999 by Thomas Bogendoerfer.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
 #define PCNET_DEBUG2(fmt,args...)      \
        debug_cond(PCNET_DEBUG_LEVEL > 1, fmt ,##args)
 
-#if !defined(CONF_PCNET_79C973) && defined(CONF_PCNET_79C975)
-#error "Macro for PCnet chip version is not defined!"
-#endif
-
 /*
  * Set the number of Tx and Rx buffers, using Log_2(# buffers).
  * Reasonable default values are 4 Tx buffers, and 16 Rx buffers.
@@ -71,12 +67,16 @@ struct pcnet_init_block {
        u32 reserved2;
 };
 
-typedef struct pcnet_priv {
+struct pcnet_uncached_priv {
        struct pcnet_rx_head rx_ring[RX_RING_SIZE];
        struct pcnet_tx_head tx_ring[TX_RING_SIZE];
        struct pcnet_init_block init_block;
+};
+
+typedef struct pcnet_priv {
+       struct pcnet_uncached_priv *uc;
        /* Receive Buffer space */
-       unsigned char rx_buf[RX_RING_SIZE][PKT_BUF_SZ + 4];
+       unsigned char (*rx_buf)[RX_RING_SIZE][PKT_BUF_SZ + 4];
        int cur_rx;
        int cur_tx;
 } pcnet_priv_t;
@@ -130,8 +130,14 @@ static int pcnet_recv (struct eth_device *dev);
 static void pcnet_halt (struct eth_device *dev);
 static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_num);
 
-#define PCI_TO_MEM(d, a) pci_virt_to_mem((pci_dev_t)d->priv, (a))
-#define PCI_TO_MEM_LE(d,a) (u32)(cpu_to_le32(PCI_TO_MEM(d,a)))
+static inline pci_addr_t pcnet_virt_to_mem(const struct eth_device *dev,
+                                               void *addr)
+{
+       pci_dev_t devbusfn = (pci_dev_t)(unsigned long)dev->priv;
+       void *virt_addr = addr;
+
+       return pci_virt_to_mem(devbusfn, virt_addr);
+}
 
 static struct pci_device_id supported[] = {
        {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE},
@@ -145,6 +151,7 @@ int pcnet_initialize(bd_t *bis)
        struct eth_device *dev;
        u16 command, status;
        int dev_nr = 0;
+       u32 bar;
 
        PCNET_DEBUG1("\npcnet_initialize...\n");
 
@@ -166,19 +173,18 @@ int pcnet_initialize(bd_t *bis)
                        break;
                }
                memset(dev, 0, sizeof(*dev));
-               dev->priv = (void *)devbusfn;
+               dev->priv = (void *)(unsigned long)devbusfn;
                sprintf(dev->name, "pcnet#%d", dev_nr);
 
                /*
                 * Setup the PCI device.
                 */
-               pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0,
-                                     (unsigned int *)&dev->iobase);
-               dev->iobase = pci_io_to_phys(devbusfn, dev->iobase);
+               pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, &bar);
+               dev->iobase = pci_io_to_phys(devbusfn, bar);
                dev->iobase &= ~0xf;
 
-               PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%x: ",
-                            dev->name, devbusfn, dev->iobase);
+               PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%lx: ",
+                            dev->name, devbusfn, (unsigned long)dev->iobase);
 
                command = PCI_COMMAND_IO | PCI_COMMAND_MASTER;
                pci_write_config_word(devbusfn, PCI_COMMAND, command);
@@ -244,16 +250,12 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
        case 0x2621:
                chipname = "PCnet/PCI II 79C970A";      /* PCI */
                break;
-#ifdef CONFIG_PCNET_79C973
        case 0x2625:
                chipname = "PCnet/FAST III 79C973";     /* PCI */
                break;
-#endif
-#ifdef CONFIG_PCNET_79C975
        case 0x2627:
                chipname = "PCnet/FAST III 79C975";     /* PCI */
                break;
-#endif
        default:
                printf("%s: PCnet version %#x not supported\n",
                       dev->name, chip_version);
@@ -283,8 +285,9 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 
 static int pcnet_init(struct eth_device *dev, bd_t *bis)
 {
+       struct pcnet_uncached_priv *uc;
        int i, val;
-       u32 addr;
+       unsigned long addr;
 
        PCNET_DEBUG1("%s: pcnet_init...\n", dev->name);
 
@@ -322,27 +325,41 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
         * must be aligned on 16-byte boundaries.
         */
        if (lp == NULL) {
-               addr = (u32)malloc(sizeof(pcnet_priv_t) + 0x10);
+               addr = (unsigned long)malloc(sizeof(pcnet_priv_t) + 0x10);
                addr = (addr + 0xf) & ~0xf;
                lp = (pcnet_priv_t *)addr;
+
+               addr = (unsigned long)memalign(ARCH_DMA_MINALIGN,
+                                              sizeof(*lp->uc));
+               flush_dcache_range(addr, addr + sizeof(*lp->uc));
+               addr = UNCACHED_SDRAM(addr);
+               lp->uc = (struct pcnet_uncached_priv *)addr;
+
+               addr = (unsigned long)memalign(ARCH_DMA_MINALIGN,
+                                              sizeof(*lp->rx_buf));
+               flush_dcache_range(addr, addr + sizeof(*lp->rx_buf));
+               lp->rx_buf = (void *)addr;
        }
 
-       lp->init_block.mode = cpu_to_le16(0x0000);
-       lp->init_block.filter[0] = 0x00000000;
-       lp->init_block.filter[1] = 0x00000000;
+       uc = lp->uc;
+
+       uc->init_block.mode = cpu_to_le16(0x0000);
+       uc->init_block.filter[0] = 0x00000000;
+       uc->init_block.filter[1] = 0x00000000;
 
        /*
         * Initialize the Rx ring.
         */
        lp->cur_rx = 0;
        for (i = 0; i < RX_RING_SIZE; i++) {
-               lp->rx_ring[i].base = PCI_TO_MEM_LE(dev, lp->rx_buf[i]);
-               lp->rx_ring[i].buf_length = cpu_to_le16(-PKT_BUF_SZ);
-               lp->rx_ring[i].status = cpu_to_le16(0x8000);
+               addr = pcnet_virt_to_mem(dev, (*lp->rx_buf)[i]);
+               uc->rx_ring[i].base = cpu_to_le32(addr);
+               uc->rx_ring[i].buf_length = cpu_to_le16(-PKT_BUF_SZ);
+               uc->rx_ring[i].status = cpu_to_le16(0x8000);
                PCNET_DEBUG1
                        ("Rx%d: base=0x%x buf_length=0x%hx status=0x%hx\n", i,
-                        lp->rx_ring[i].base, lp->rx_ring[i].buf_length,
-                        lp->rx_ring[i].status);
+                        uc->rx_ring[i].base, uc->rx_ring[i].buf_length,
+                        uc->rx_ring[i].status);
        }
 
        /*
@@ -351,34 +368,36 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
         */
        lp->cur_tx = 0;
        for (i = 0; i < TX_RING_SIZE; i++) {
-               lp->tx_ring[i].base = 0;
-               lp->tx_ring[i].status = 0;
+               uc->tx_ring[i].base = 0;
+               uc->tx_ring[i].status = 0;
        }
 
        /*
         * Setup Init Block.
         */
-       PCNET_DEBUG1("Init block at 0x%p: MAC", &lp->init_block);
+       PCNET_DEBUG1("Init block at 0x%p: MAC", &lp->uc->init_block);
 
        for (i = 0; i < 6; i++) {
-               lp->init_block.phys_addr[i] = dev->enetaddr[i];
-               PCNET_DEBUG1(" %02x", lp->init_block.phys_addr[i]);
+               lp->uc->init_block.phys_addr[i] = dev->enetaddr[i];
+               PCNET_DEBUG1(" %02x", lp->uc->init_block.phys_addr[i]);
        }
 
-       lp->init_block.tlen_rlen = cpu_to_le16(TX_RING_LEN_BITS |
+       uc->init_block.tlen_rlen = cpu_to_le16(TX_RING_LEN_BITS |
                                               RX_RING_LEN_BITS);
-       lp->init_block.rx_ring = PCI_TO_MEM_LE(dev, lp->rx_ring);
-       lp->init_block.tx_ring = PCI_TO_MEM_LE(dev, lp->tx_ring);
-       flush_dcache_range((unsigned long)lp, (unsigned long)&lp->rx_buf);
+       addr = pcnet_virt_to_mem(dev, uc->rx_ring);
+       uc->init_block.rx_ring = cpu_to_le32(addr);
+       addr = pcnet_virt_to_mem(dev, uc->tx_ring);
+       uc->init_block.tx_ring = cpu_to_le32(addr);
 
        PCNET_DEBUG1("\ntlen_rlen=0x%x rx_ring=0x%x tx_ring=0x%x\n",
-                    lp->init_block.tlen_rlen,
-                    lp->init_block.rx_ring, lp->init_block.tx_ring);
+                    uc->init_block.tlen_rlen,
+                    uc->init_block.rx_ring, uc->init_block.tx_ring);
 
        /*
         * Tell the controller where the Init Block is located.
         */
-       addr = PCI_TO_MEM(dev, &lp->init_block);
+       barrier();
+       addr = pcnet_virt_to_mem(dev, &lp->uc->init_block);
        pcnet_write_csr(dev, 1, addr & 0xffff);
        pcnet_write_csr(dev, 2, (addr >> 16) & 0xffff);
 
@@ -408,7 +427,8 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
 static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 {
        int i, status;
-       struct pcnet_tx_head *entry = &lp->tx_ring[lp->cur_tx];
+       u32 addr;
+       struct pcnet_tx_head *entry = &lp->uc->tx_ring[lp->cur_tx];
 
        PCNET_DEBUG2("Tx%d: %d bytes from 0x%p ", lp->cur_tx, pkt_len,
                     packet);
@@ -418,9 +438,7 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 
        /* Wait for completion by testing the OWN bit */
        for (i = 1000; i > 0; i--) {
-               invalidate_dcache_range((unsigned long)entry,
-                                       (unsigned long)entry + sizeof(*entry));
-               status = le16_to_cpu(entry->status);
+               status = readw(&entry->status);
                if ((status & 0x8000) == 0)
                        break;
                udelay(100);
@@ -437,13 +455,11 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
         * Setup Tx ring. Caution: the write order is important here,
         * set the status with the "ownership" bits last.
         */
-       status = 0x8300;
-       entry->length = cpu_to_le16(-pkt_len);
-       entry->misc = 0x00000000;
-       entry->base = PCI_TO_MEM_LE(dev, packet);
-       entry->status = cpu_to_le16(status);
-       flush_dcache_range((unsigned long)entry,
-                          (unsigned long)entry + sizeof(*entry));
+       addr = pcnet_virt_to_mem(dev, packet);
+       writew(-pkt_len, &entry->length);
+       writel(0, &entry->misc);
+       writel(addr, &entry->base);
+       writew(0x8300, &entry->status);
 
        /* Trigger an immediate send poll. */
        pcnet_write_csr(dev, 0, 0x0008);
@@ -459,54 +475,51 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 static int pcnet_recv (struct eth_device *dev)
 {
        struct pcnet_rx_head *entry;
+       unsigned char *buf;
        int pkt_len = 0;
-       u16 status;
+       u16 status, err_status;
 
        while (1) {
-               entry = &lp->rx_ring[lp->cur_rx];
-               invalidate_dcache_range((unsigned long)entry,
-                                       (unsigned long)entry + sizeof(*entry));
+               entry = &lp->uc->rx_ring[lp->cur_rx];
                /*
                 * If we own the next entry, it's a new packet. Send it up.
                 */
-               status = le16_to_cpu(entry->status);
+               status = readw(&entry->status);
                if ((status & 0x8000) != 0)
                        break;
-               status >>= 8;
+               err_status = status >> 8;
 
-               if (status != 0x03) {   /* There was an error. */
+               if (err_status != 0x03) {       /* There was an error. */
                        printf("%s: Rx%d", dev->name, lp->cur_rx);
-                       PCNET_DEBUG1(" (status=0x%x)", status);
-                       if (status & 0x20)
+                       PCNET_DEBUG1(" (status=0x%x)", err_status);
+                       if (err_status & 0x20)
                                printf(" Frame");
-                       if (status & 0x10)
+                       if (err_status & 0x10)
                                printf(" Overflow");
-                       if (status & 0x08)
+                       if (err_status & 0x08)
                                printf(" CRC");
-                       if (status & 0x04)
+                       if (err_status & 0x04)
                                printf(" Fifo");
                        printf(" Error\n");
-                       entry->status &= le16_to_cpu(0x03ff);
+                       status &= 0x03ff;
 
                } else {
-                       pkt_len = (le32_to_cpu(entry->msg_length) & 0xfff) - 4;
+                       pkt_len = (readl(&entry->msg_length) & 0xfff) - 4;
                        if (pkt_len < 60) {
                                printf("%s: Rx%d: invalid packet length %d\n",
                                       dev->name, lp->cur_rx, pkt_len);
                        } else {
-                               invalidate_dcache_range(
-                                       (unsigned long)lp->rx_buf[lp->cur_rx],
-                                       (unsigned long)lp->rx_buf[lp->cur_rx] +
-                                       pkt_len);
-                               NetReceive(lp->rx_buf[lp->cur_rx], pkt_len);
+                               buf = (*lp->rx_buf)[lp->cur_rx];
+                               invalidate_dcache_range((unsigned long)buf,
+                                       (unsigned long)buf + pkt_len);
+                               net_process_received_packet(buf, pkt_len);
                                PCNET_DEBUG2("Rx%d: %d bytes from 0x%p\n",
-                                            lp->cur_rx, pkt_len,
-                                            lp->rx_buf[lp->cur_rx]);
+                                            lp->cur_rx, pkt_len, buf);
                        }
                }
-               entry->status |= cpu_to_le16(0x8000);
-               flush_dcache_range((unsigned long)entry,
-                                  (unsigned long)entry + sizeof(*entry));
+
+               status |= 0x8000;
+               writew(status, &entry->status);
 
                if (++lp->cur_rx >= RX_RING_SIZE)
                        lp->cur_rx = 0;