]> Git Repo - J-u-boot.git/blobdiff - drivers/net/eepro100.c
treewide: convert bd_t to struct bd_info by coccinelle
[J-u-boot.git] / drivers / net / eepro100.c
index 03ba9a41a5d915c6dffcce39210bc280bffa4f2b..feba5327da4d3f02b9acbeb782aa2397606e9a7e 100644 (file)
@@ -5,12 +5,13 @@
  */
 
 #include <common.h>
+#include <asm/io.h>
+#include <cpu_func.h>
 #include <malloc.h>
+#include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
-#include <asm/io.h>
 #include <pci.h>
-#include <miiphy.h>
 #include <linux/delay.h>
 
 /* Ethernet chip registers. */
 #define EE_DATA_BITS           16
 
 /* The EEPROM commands include the alway-set leading bit. */
-#define EE_EWENB_CMD           (4 << addr_len)
-#define EE_WRITE_CMD           (5 << addr_len)
-#define EE_READ_CMD            (6 << addr_len)
-#define EE_ERASE_CMD           (7 << addr_len)
+#define EE_EWENB_CMD(addr_len) (4 << (addr_len))
+#define EE_WRITE_CMD(addr_len) (5 << (addr_len))
+#define EE_READ_CMD(addr_len)  (6 << (addr_len))
+#define EE_ERASE_CMD(addr_len) (7 << (addr_len))
 
 /* Receive frame descriptors. */
 struct eepro100_rxfd {
-       volatile u16 status;
-       volatile u16 control;
-       volatile u32 link;              /* struct eepro100_rxfd * */
-       volatile u32 rx_buf_addr;       /* void * */
-       volatile u32 count;
+       u16 status;
+       u16 control;
+       u32 link;               /* struct eepro100_rxfd * */
+       u32 rx_buf_addr;        /* void * */
+       u32 count;
 
-       volatile u8 data[PKTSIZE_ALIGN];
+       u8 data[PKTSIZE_ALIGN];
 };
 
 #define RFD_STATUS_C           0x8000  /* completion of received frame */
@@ -135,17 +136,17 @@ struct eepro100_rxfd {
 #define RFD_RX_TCO             0x0001  /* TCO indication */
 
 /* Transmit frame descriptors */
-struct eepro100_txfd {                 /* Transmit frame descriptor set. */
-       volatile u16 status;
-       volatile u16 command;
-       volatile u32 link;              /* void * */
-       volatile u32 tx_desc_addr;      /* Always points to the tx_buf_addr element. */
-       volatile s32 count;
-
-       volatile u32 tx_buf_addr0;      /* void *, frame to be transmitted. */
-       volatile s32 tx_buf_size0;      /* Length of Tx frame. */
-       volatile u32 tx_buf_addr1;      /* void *, frame to be transmitted. */
-       volatile s32 tx_buf_size1;      /* Length of Tx frame. */
+struct eepro100_txfd {         /* Transmit frame descriptor set. */
+       u16 status;
+       u16 command;
+       u32 link;               /* void * */
+       u32 tx_desc_addr;       /* Always points to the tx_buf_addr element. */
+       s32 count;
+
+       u32 tx_buf_addr0;       /* void *, frame to be transmitted. */
+       s32 tx_buf_size0;       /* Length of Tx frame. */
+       u32 tx_buf_addr1;       /* void *, frame to be transmitted. */
+       s32 tx_buf_size1;       /* Length of Tx frame. */
 };
 
 #define TXCB_CMD_TRANSMIT      0x0004  /* transmit command */
@@ -159,10 +160,10 @@ struct eepro100_txfd {                    /* Transmit frame descriptor set. */
 #define TXCB_COUNT_EOF         0x8000
 
 /* The Speedo3 Rx and Tx frame/buffer descriptors. */
-struct descriptor {                    /* A generic descriptor. */
-       volatile u16 status;
-       volatile u16 command;
-       volatile u32 link;              /* struct descriptor * */
+struct descriptor {            /* A generic descriptor. */
+       u16 status;
+       u16 command;
+       u32 link;               /* struct descriptor * */
 
        unsigned char params[0];
 };
@@ -182,12 +183,6 @@ struct descriptor {                        /* A generic descriptor. */
 
 #define TOUT_LOOP              1000000
 
-static struct eepro100_rxfd rx_ring[NUM_RX_DESC]; /* RX descriptor ring */
-static struct eepro100_txfd tx_ring[NUM_TX_DESC]; /* TX descriptor ring */
-static int rx_next;                    /* RX descriptor ring pointer */
-static int tx_next;                    /* TX descriptor ring pointer */
-static int tx_threshold;
-
 /*
  * The parameters for a CmdConfigure operation.
  * There are so many options that it would be difficult to document
@@ -200,58 +195,73 @@ static const char i82558_config_cmd[] = {
        0x31, 0x05,
 };
 
-static void init_rx_ring(struct eth_device *dev);
-static void purge_tx_ring(struct eth_device *dev);
-
-static void read_hw_addr(struct eth_device *dev, bd_t *bis);
-
-static int eepro100_init(struct eth_device *dev, bd_t *bis);
-static int eepro100_send(struct eth_device *dev, void *packet, int length);
-static int eepro100_recv(struct eth_device *dev);
-static void eepro100_halt(struct eth_device *dev);
+struct eepro100_priv {
+       /* RX descriptor ring */
+       struct eepro100_rxfd    rx_ring[NUM_RX_DESC];
+       /* TX descriptor ring */
+       struct eepro100_txfd    tx_ring[NUM_TX_DESC];
+       /* RX descriptor ring pointer */
+       int                     rx_next;
+       u16                     rx_stat;
+       /* TX descriptor ring pointer */
+       int                     tx_next;
+       int                     tx_threshold;
+#ifdef CONFIG_DM_ETH
+       struct udevice          *devno;
+#else
+       struct eth_device       dev;
+       pci_dev_t               devno;
+#endif
+       char                    *name;
+       void __iomem            *iobase;
+       u8                      *enetaddr;
+};
 
-#if defined(CONFIG_E500)
-#define bus_to_phys(a) (a)
-#define phys_to_bus(a) (a)
+#if defined(CONFIG_DM_ETH)
+#define bus_to_phys(dev, a)    dm_pci_mem_to_phys((dev), (a))
+#define phys_to_bus(dev, a)    dm_pci_phys_to_mem((dev), (a))
+#elif defined(CONFIG_E500)
+#define bus_to_phys(dev, a)    (a)
+#define phys_to_bus(dev, a)    (a)
 #else
-#define bus_to_phys(a) pci_mem_to_phys((pci_dev_t)dev->priv, a)
-#define phys_to_bus(a) pci_phys_to_mem((pci_dev_t)dev->priv, a)
+#define bus_to_phys(dev, a)    pci_mem_to_phys((dev), (a))
+#define phys_to_bus(dev, a)    pci_phys_to_mem((dev), (a))
 #endif
 
-static inline int INW(struct eth_device *dev, u_long addr)
+static int INW(struct eepro100_priv *priv, u_long addr)
 {
-       return le16_to_cpu(readw(addr + (void *)dev->iobase));
+       return le16_to_cpu(readw(addr + priv->iobase));
 }
 
-static inline void OUTW(struct eth_device *dev, int command, u_long addr)
+static void OUTW(struct eepro100_priv *priv, int command, u_long addr)
 {
-       writew(cpu_to_le16(command), addr + (void *)dev->iobase);
+       writew(cpu_to_le16(command), addr + priv->iobase);
 }
 
-static inline void OUTL(struct eth_device *dev, int command, u_long addr)
+static void OUTL(struct eepro100_priv *priv, int command, u_long addr)
 {
-       writel(cpu_to_le32(command), addr + (void *)dev->iobase);
+       writel(cpu_to_le32(command), addr + priv->iobase);
 }
 
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-static inline int INL(struct eth_device *dev, u_long addr)
+static int INL(struct eepro100_priv *priv, u_long addr)
 {
-       return le32_to_cpu(readl(addr + (void *)dev->iobase));
+       return le32_to_cpu(readl(addr + priv->iobase));
 }
 
-static int get_phyreg(struct eth_device *dev, unsigned char addr,
+static int get_phyreg(struct eepro100_priv *priv, unsigned char addr,
                      unsigned char reg, unsigned short *value)
 {
-       int cmd;
        int timeout = 50;
+       int cmd;
 
        /* read requested data */
        cmd = (2 << 26) | ((addr & 0x1f) << 21) | ((reg & 0x1f) << 16);
-       OUTL(dev, cmd, SCB_CTRL_MDI);
+       OUTL(priv, cmd, SCB_CTRL_MDI);
 
        do {
                udelay(1000);
-               cmd = INL(dev, SCB_CTRL_MDI);
+               cmd = INL(priv, SCB_CTRL_MDI);
        } while (!(cmd & (1 << 28)) && (--timeout));
 
        if (timeout == 0)
@@ -262,17 +272,17 @@ static int get_phyreg(struct eth_device *dev, unsigned char addr,
        return 0;
 }
 
-static int set_phyreg(struct eth_device *dev, unsigned char addr,
+static int set_phyreg(struct eepro100_priv *priv, unsigned char addr,
                      unsigned char reg, unsigned short value)
 {
-       int cmd;
        int timeout = 50;
+       int cmd;
 
        /* write requested data */
        cmd = (1 << 26) | ((addr & 0x1f) << 21) | ((reg & 0x1f) << 16);
-       OUTL(dev, cmd | value, SCB_CTRL_MDI);
+       OUTL(priv, cmd | value, SCB_CTRL_MDI);
 
-       while (!(INL(dev, SCB_CTRL_MDI) & (1 << 28)) && (--timeout))
+       while (!(INL(priv, SCB_CTRL_MDI) & (1 << 28)) && (--timeout))
                udelay(1000);
 
        if (timeout == 0)
@@ -285,49 +295,43 @@ static int set_phyreg(struct eth_device *dev, unsigned char addr,
  * Check if given phyaddr is valid, i.e. there is a PHY connected.
  * Do this by checking model value field from ID2 register.
  */
-static struct eth_device *verify_phyaddr(const char *devname,
-                                        unsigned char addr)
+static int verify_phyaddr(struct eepro100_priv *priv, unsigned char addr)
 {
-       struct eth_device *dev;
-       unsigned short value;
-       unsigned char model;
-
-       dev = eth_get_dev_by_name(devname);
-       if (!dev) {
-               printf("%s: no such device\n", devname);
-               return NULL;
-       }
+       unsigned short value, model;
+       int ret;
 
        /* read id2 register */
-       if (get_phyreg(dev, addr, MII_PHYSID2, &value) != 0) {
-               printf("%s: mii read timeout!\n", devname);
-               return NULL;
+       ret = get_phyreg(priv, addr, MII_PHYSID2, &value);
+       if (ret) {
+               printf("%s: mii read timeout!\n", priv->name);
+               return ret;
        }
 
        /* get model */
-       model = (unsigned char)((value >> 4) & 0x003f);
-
-       if (model == 0) {
-               printf("%s: no PHY at address %d\n", devname, addr);
-               return NULL;
+       model = (value >> 4) & 0x003f;
+       if (!model) {
+               printf("%s: no PHY at address %d\n", priv->name, addr);
+               return -EINVAL;
        }
 
-       return dev;
+       return 0;
 }
 
 static int eepro100_miiphy_read(struct mii_dev *bus, int addr, int devad,
                                int reg)
 {
+       struct eepro100_priv *priv = bus->priv;
        unsigned short value = 0;
-       struct eth_device *dev;
+       int ret;
 
-       dev = verify_phyaddr(bus->name, addr);
-       if (!dev)
-               return -1;
+       ret = verify_phyaddr(priv, addr);
+       if (ret)
+               return ret;
 
-       if (get_phyreg(dev, addr, reg, &value) != 0) {
+       ret = get_phyreg(priv, addr, reg, &value);
+       if (ret) {
                printf("%s: mii read timeout!\n", bus->name);
-               return -1;
+               return ret;
        }
 
        return value;
@@ -336,146 +340,103 @@ static int eepro100_miiphy_read(struct mii_dev *bus, int addr, int devad,
 static int eepro100_miiphy_write(struct mii_dev *bus, int addr, int devad,
                                 int reg, u16 value)
 {
-       struct eth_device *dev;
+       struct eepro100_priv *priv = bus->priv;
+       int ret;
 
-       dev = verify_phyaddr(bus->name, addr);
-       if (!dev)
-               return -1;
+       ret = verify_phyaddr(priv, addr);
+       if (ret)
+               return ret;
 
-       if (set_phyreg(dev, addr, reg, value) != 0) {
+       ret = set_phyreg(priv, addr, reg, value);
+       if (ret) {
                printf("%s: mii write timeout!\n", bus->name);
-               return -1;
+               return ret;
        }
 
        return 0;
 }
-
 #endif
 
-/* Wait for the chip get the command. */
-static int wait_for_eepro100(struct eth_device *dev)
+static void init_rx_ring(struct eepro100_priv *priv)
 {
+       struct eepro100_rxfd *rx_ring = priv->rx_ring;
        int i;
 
-       for (i = 0; INW(dev, SCB_CMD) & (CU_CMD_MASK | RU_CMD_MASK); i++) {
-               if (i >= TOUT_LOOP)
-                       return 0;
+       for (i = 0; i < NUM_RX_DESC; i++) {
+               rx_ring[i].status = 0;
+               rx_ring[i].control = (i == NUM_RX_DESC - 1) ?
+                                    cpu_to_le16 (RFD_CONTROL_S) : 0;
+               rx_ring[i].link =
+                       cpu_to_le32(phys_to_bus(priv->devno,
+                                               (u32)&rx_ring[(i + 1) %
+                                               NUM_RX_DESC]));
+               rx_ring[i].rx_buf_addr = 0xffffffff;
+               rx_ring[i].count = cpu_to_le32(PKTSIZE_ALIGN << 16);
        }
 
-       return 1;
-}
+       flush_dcache_range((unsigned long)rx_ring,
+                          (unsigned long)rx_ring +
+                          (sizeof(*rx_ring) * NUM_RX_DESC));
 
-static struct pci_device_id supported[] = {
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82557},
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82559},
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82559ER},
-       {}
-};
+       priv->rx_next = 0;
+}
 
-int eepro100_initialize(bd_t *bis)
+static void purge_tx_ring(struct eepro100_priv *priv)
 {
-       pci_dev_t devno;
-       int card_number = 0;
-       struct eth_device *dev;
-       u32 iobase, status;
-       int idx = 0;
-
-       while (1) {
-               /* Find PCI device */
-               devno = pci_find_devices(supported, idx++);
-               if (devno < 0)
-                       break;
-
-               pci_read_config_dword(devno, PCI_BASE_ADDRESS_0, &iobase);
-               iobase &= ~0xf;
-
-               debug("eepro100: Intel i82559 PCI EtherExpressPro @0x%x\n",
-                     iobase);
-
-               pci_write_config_dword(devno, PCI_COMMAND,
-                                      PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
-
-               /* Check if I/O accesses and Bus Mastering are enabled. */
-               pci_read_config_dword(devno, PCI_COMMAND, &status);
-               if (!(status & PCI_COMMAND_MEMORY)) {
-                       printf("Error: Can not enable MEM access.\n");
-                       continue;
-               }
-
-               if (!(status & PCI_COMMAND_MASTER)) {
-                       printf("Error: Can not enable Bus Mastering.\n");
-                       continue;
-               }
-
-               dev = (struct eth_device *)malloc(sizeof(*dev));
-               if (!dev) {
-                       printf("eepro100: Can not allocate memory\n");
-                       break;
-               }
-               memset(dev, 0, sizeof(*dev));
-
-               sprintf(dev->name, "i82559#%d", card_number);
-               dev->priv = (void *)devno; /* this have to come before bus_to_phys() */
-               dev->iobase = bus_to_phys(iobase);
-               dev->init = eepro100_init;
-               dev->halt = eepro100_halt;
-               dev->send = eepro100_send;
-               dev->recv = eepro100_recv;
-
-               eth_register(dev);
+       struct eepro100_txfd *tx_ring = priv->tx_ring;
 
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-               /* register mii command access routines */
-               int retval;
-               struct mii_dev *mdiodev = mdio_alloc();
-
-               if (!mdiodev)
-                       return -ENOMEM;
-               strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
-               mdiodev->read = eepro100_miiphy_read;
-               mdiodev->write = eepro100_miiphy_write;
-
-               retval = mdio_register(mdiodev);
-               if (retval < 0)
-                       return retval;
-#endif
-
-               card_number++;
+       priv->tx_next = 0;
+       priv->tx_threshold = 0x01208000;
+       memset(tx_ring, 0, sizeof(*tx_ring) * NUM_TX_DESC);
 
-               /* Set the latency timer for value. */
-               pci_write_config_byte(devno, PCI_LATENCY_TIMER, 0x20);
+       flush_dcache_range((unsigned long)tx_ring,
+                          (unsigned long)tx_ring +
+                          (sizeof(*tx_ring) * NUM_TX_DESC));
+}
 
-               udelay(10 * 1000);
+/* Wait for the chip get the command. */
+static int wait_for_eepro100(struct eepro100_priv *priv)
+{
+       int i;
 
-               read_hw_addr(dev, bis);
+       for (i = 0; INW(priv, SCB_CMD) & (CU_CMD_MASK | RU_CMD_MASK); i++) {
+               if (i >= TOUT_LOOP)
+                       return 0;
        }
 
-       return card_number;
+       return 1;
 }
 
-static int eepro100_txcmd_send(struct eth_device *dev,
+static int eepro100_txcmd_send(struct eepro100_priv *priv,
                               struct eepro100_txfd *desc)
 {
        u16 rstat;
        int i = 0;
 
-       if (!wait_for_eepro100(dev))
+       flush_dcache_range((unsigned long)desc,
+                          (unsigned long)desc + sizeof(*desc));
+
+       if (!wait_for_eepro100(priv))
                return -ETIMEDOUT;
 
-       OUTL(dev, phys_to_bus((u32)desc), SCB_POINTER);
-       OUTW(dev, SCB_M | CU_START, SCB_CMD);
+       OUTL(priv, phys_to_bus(priv->devno, (u32)desc), SCB_POINTER);
+       OUTW(priv, SCB_M | CU_START, SCB_CMD);
 
        while (true) {
+               invalidate_dcache_range((unsigned long)desc,
+                                       (unsigned long)desc + sizeof(*desc));
                rstat = le16_to_cpu(desc->status);
                if (rstat & CONFIG_SYS_STATUS_C)
                        break;
 
                if (i++ >= TOUT_LOOP) {
-                       printf("%s: Tx error buffer not ready\n", dev->name);
+                       printf("%s: Tx error buffer not ready\n", priv->name);
                        return -EINVAL;
                }
        }
 
+       invalidate_dcache_range((unsigned long)desc,
+                               (unsigned long)desc + sizeof(*desc));
        rstat = le16_to_cpu(desc->status);
 
        if (!(rstat & CONFIG_SYS_STATUS_OK)) {
@@ -486,60 +447,161 @@ static int eepro100_txcmd_send(struct eth_device *dev,
        return 0;
 }
 
-static int eepro100_init(struct eth_device *dev, bd_t *bis)
+/* SROM Read. */
+static int read_eeprom(struct eepro100_priv *priv, int location, int addr_len)
+{
+       unsigned short retval = 0;
+       int read_cmd = location | EE_READ_CMD(addr_len);
+       int i;
+
+       OUTW(priv, EE_ENB & ~EE_CS, SCB_EEPROM);
+       OUTW(priv, EE_ENB, SCB_EEPROM);
+
+       /* Shift the read command bits out. */
+       for (i = 12; i >= 0; i--) {
+               short dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
+
+               OUTW(priv, EE_ENB | dataval, SCB_EEPROM);
+               udelay(1);
+               OUTW(priv, EE_ENB | dataval | EE_SHIFT_CLK, SCB_EEPROM);
+               udelay(1);
+       }
+       OUTW(priv, EE_ENB, SCB_EEPROM);
+
+       for (i = 15; i >= 0; i--) {
+               OUTW(priv, EE_ENB | EE_SHIFT_CLK, SCB_EEPROM);
+               udelay(1);
+               retval = (retval << 1) |
+                        !!(INW(priv, SCB_EEPROM) & EE_DATA_READ);
+               OUTW(priv, EE_ENB, SCB_EEPROM);
+               udelay(1);
+       }
+
+       /* Terminate the EEPROM access. */
+       OUTW(priv, EE_ENB & ~EE_CS, SCB_EEPROM);
+       return retval;
+}
+
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
+static int eepro100_initialize_mii(struct eepro100_priv *priv)
+{
+       /* register mii command access routines */
+       struct mii_dev *mdiodev;
+       int ret;
+
+       mdiodev = mdio_alloc();
+       if (!mdiodev)
+               return -ENOMEM;
+
+       strncpy(mdiodev->name, priv->name, MDIO_NAME_LEN);
+       mdiodev->read = eepro100_miiphy_read;
+       mdiodev->write = eepro100_miiphy_write;
+       mdiodev->priv = priv;
+
+       ret = mdio_register(mdiodev);
+       if (ret < 0) {
+               mdio_free(mdiodev);
+               return ret;
+       }
+
+       return 0;
+}
+#else
+static int eepro100_initialize_mii(struct eepro100_priv *priv)
+{
+       return 0;
+}
+#endif
+
+static struct pci_device_id supported[] = {
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82557) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82559) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82559ER) },
+       { }
+};
+
+static void eepro100_get_hwaddr(struct eepro100_priv *priv)
+{
+       u16 sum = 0;
+       int i, j;
+       int addr_len = read_eeprom(priv, 0, 6) == 0xffff ? 8 : 6;
+
+       for (j = 0, i = 0; i < 0x40; i++) {
+               u16 value = read_eeprom(priv, i, addr_len);
+
+               sum += value;
+               if (i < 3) {
+                       priv->enetaddr[j++] = value;
+                       priv->enetaddr[j++] = value >> 8;
+               }
+       }
+
+       if (sum != 0xBABA) {
+               memset(priv->enetaddr, 0, ETH_ALEN);
+               debug("%s: Invalid EEPROM checksum %#4.4x, check settings before activating this device!\n",
+                     priv->name, sum);
+       }
+}
+
+static int eepro100_init_common(struct eepro100_priv *priv)
 {
+       struct eepro100_rxfd *rx_ring = priv->rx_ring;
+       struct eepro100_txfd *tx_ring = priv->tx_ring;
        struct eepro100_txfd *ias_cmd, *cfg_cmd;
        int ret, status = -1;
        int tx_cur;
 
        /* Reset the ethernet controller */
-       OUTL(dev, I82559_SELECTIVE_RESET, SCB_PORT);
+       OUTL(priv, I82559_SELECTIVE_RESET, SCB_PORT);
        udelay(20);
 
-       OUTL(dev, I82559_RESET, SCB_PORT);
+       OUTL(priv, I82559_RESET, SCB_PORT);
        udelay(20);
 
-       if (!wait_for_eepro100(dev)) {
+       if (!wait_for_eepro100(priv)) {
                printf("Error: Can not reset ethernet controller.\n");
                goto done;
        }
-       OUTL(dev, 0, SCB_POINTER);
-       OUTW(dev, SCB_M | RUC_ADDR_LOAD, SCB_CMD);
+       OUTL(priv, 0, SCB_POINTER);
+       OUTW(priv, SCB_M | RUC_ADDR_LOAD, SCB_CMD);
 
-       if (!wait_for_eepro100(dev)) {
+       if (!wait_for_eepro100(priv)) {
                printf("Error: Can not reset ethernet controller.\n");
                goto done;
        }
-       OUTL(dev, 0, SCB_POINTER);
-       OUTW(dev, SCB_M | CU_ADDR_LOAD, SCB_CMD);
+       OUTL(priv, 0, SCB_POINTER);
+       OUTW(priv, SCB_M | CU_ADDR_LOAD, SCB_CMD);
 
        /* Initialize Rx and Tx rings. */
-       init_rx_ring(dev);
-       purge_tx_ring(dev);
+       init_rx_ring(priv);
+       purge_tx_ring(priv);
 
        /* Tell the adapter where the RX ring is located. */
-       if (!wait_for_eepro100(dev)) {
+       if (!wait_for_eepro100(priv)) {
                printf("Error: Can not reset ethernet controller.\n");
                goto done;
        }
 
-       OUTL(dev, phys_to_bus((u32)&rx_ring[rx_next]), SCB_POINTER);
-       OUTW(dev, SCB_M | RUC_START, SCB_CMD);
+       /* RX ring cache was already flushed in init_rx_ring() */
+       OUTL(priv, phys_to_bus(priv->devno, (u32)&rx_ring[priv->rx_next]),
+            SCB_POINTER);
+       OUTW(priv, SCB_M | RUC_START, SCB_CMD);
 
        /* Send the Configure frame */
-       tx_cur = tx_next;
-       tx_next = ((tx_next + 1) % NUM_TX_DESC);
+       tx_cur = priv->tx_next;
+       priv->tx_next = ((priv->tx_next + 1) % NUM_TX_DESC);
 
        cfg_cmd = &tx_ring[tx_cur];
        cfg_cmd->command = cpu_to_le16(CONFIG_SYS_CMD_SUSPEND |
                                       CONFIG_SYS_CMD_CONFIGURE);
        cfg_cmd->status = 0;
-       cfg_cmd->link = cpu_to_le32(phys_to_bus((u32)&tx_ring[tx_next]));
+       cfg_cmd->link = cpu_to_le32(phys_to_bus(priv->devno,
+                                               (u32)&tx_ring[priv->tx_next]));
 
        memcpy(((struct descriptor *)cfg_cmd)->params, i82558_config_cmd,
               sizeof(i82558_config_cmd));
 
-       ret = eepro100_txcmd_send(dev, cfg_cmd);
+       ret = eepro100_txcmd_send(priv, cfg_cmd);
        if (ret) {
                if (ret == -ETIMEDOUT)
                        printf("Error---CONFIG_SYS_CMD_CONFIGURE: Can not reset ethernet controller.\n");
@@ -547,18 +609,19 @@ static int eepro100_init(struct eth_device *dev, bd_t *bis)
        }
 
        /* Send the Individual Address Setup frame */
-       tx_cur = tx_next;
-       tx_next = ((tx_next + 1) % NUM_TX_DESC);
+       tx_cur = priv->tx_next;
+       priv->tx_next = ((priv->tx_next + 1) % NUM_TX_DESC);
 
        ias_cmd = &tx_ring[tx_cur];
        ias_cmd->command = cpu_to_le16(CONFIG_SYS_CMD_SUSPEND |
                                       CONFIG_SYS_CMD_IAS);
        ias_cmd->status = 0;
-       ias_cmd->link = cpu_to_le32(phys_to_bus((u32)&tx_ring[tx_next]));
+       ias_cmd->link = cpu_to_le32(phys_to_bus(priv->devno,
+                                               (u32)&tx_ring[priv->tx_next]));
 
-       memcpy(((struct descriptor *)ias_cmd)->params, dev->enetaddr, 6);
+       memcpy(((struct descriptor *)ias_cmd)->params, priv->enetaddr, 6);
 
-       ret = eepro100_txcmd_send(dev, ias_cmd);
+       ret = eepro100_txcmd_send(priv, ias_cmd);
        if (ret) {
                if (ret == -ETIMEDOUT)
                        printf("Error: Can not reset ethernet controller.\n");
@@ -571,36 +634,40 @@ done:
        return status;
 }
 
-static int eepro100_send(struct eth_device *dev, void *packet, int length)
+static int eepro100_send_common(struct eepro100_priv *priv,
+                               void *packet, int length)
 {
+       struct eepro100_txfd *tx_ring = priv->tx_ring;
+       struct eepro100_txfd *desc;
        int ret, status = -1;
        int tx_cur;
 
        if (length <= 0) {
-               printf("%s: bad packet size: %d\n", dev->name, length);
+               printf("%s: bad packet size: %d\n", priv->name, length);
                goto done;
        }
 
-       tx_cur = tx_next;
-       tx_next = (tx_next + 1) % NUM_TX_DESC;
-
-       tx_ring[tx_cur].command = cpu_to_le16(TXCB_CMD_TRANSMIT | TXCB_CMD_SF |
-                                             TXCB_CMD_S | TXCB_CMD_EL);
-       tx_ring[tx_cur].status = 0;
-       tx_ring[tx_cur].count = cpu_to_le32 (tx_threshold);
-       tx_ring[tx_cur].link =
-               cpu_to_le32 (phys_to_bus((u32)&tx_ring[tx_next]));
-       tx_ring[tx_cur].tx_desc_addr =
-               cpu_to_le32 (phys_to_bus((u32)&tx_ring[tx_cur].tx_buf_addr0));
-       tx_ring[tx_cur].tx_buf_addr0 =
-               cpu_to_le32 (phys_to_bus((u_long)packet));
-       tx_ring[tx_cur].tx_buf_size0 = cpu_to_le32 (length);
-
-       ret = eepro100_txcmd_send(dev, &tx_ring[tx_cur]);
+       tx_cur = priv->tx_next;
+       priv->tx_next = (priv->tx_next + 1) % NUM_TX_DESC;
+
+       desc = &tx_ring[tx_cur];
+       desc->command = cpu_to_le16(TXCB_CMD_TRANSMIT | TXCB_CMD_SF |
+                                   TXCB_CMD_S | TXCB_CMD_EL);
+       desc->status = 0;
+       desc->count = cpu_to_le32(priv->tx_threshold);
+       desc->link = cpu_to_le32(phys_to_bus(priv->devno,
+                                            (u32)&tx_ring[priv->tx_next]));
+       desc->tx_desc_addr = cpu_to_le32(phys_to_bus(priv->devno,
+                                                    (u32)&desc->tx_buf_addr0));
+       desc->tx_buf_addr0 = cpu_to_le32(phys_to_bus(priv->devno,
+                                                    (u_long)packet));
+       desc->tx_buf_size0 = cpu_to_le32(length);
+
+       ret = eepro100_txcmd_send(priv, &tx_ring[tx_cur]);
        if (ret) {
                if (ret == -ETIMEDOUT)
                        printf("%s: Tx error ethernet controller not ready.\n",
-                              dev->name);
+                              priv->name);
                goto done;
        }
 
@@ -610,169 +677,341 @@ done:
        return status;
 }
 
-static int eepro100_recv(struct eth_device *dev)
+static int eepro100_recv_common(struct eepro100_priv *priv, uchar **packetp)
 {
-       u16 status, stat;
-       int rx_prev, length = 0;
-
-       stat = INW(dev, SCB_STATUS);
-       OUTW(dev, stat & SCB_STATUS_RNR, SCB_STATUS);
+       struct eepro100_rxfd *rx_ring = priv->rx_ring;
+       struct eepro100_rxfd *desc;
+       int length;
+       u16 status;
+
+       priv->rx_stat = INW(priv, SCB_STATUS);
+       OUTW(priv, priv->rx_stat & SCB_STATUS_RNR, SCB_STATUS);
+
+       desc = &rx_ring[priv->rx_next];
+       invalidate_dcache_range((unsigned long)desc,
+                               (unsigned long)desc + sizeof(*desc));
+       status = le16_to_cpu(desc->status);
+
+       if (!(status & RFD_STATUS_C))
+               return 0;
+
+       /* Valid frame status. */
+       if (status & RFD_STATUS_OK) {
+               /* A valid frame received. */
+               length = le32_to_cpu(desc->count) & 0x3fff;
+               /* Pass the packet up to the protocol layers. */
+               *packetp = desc->data;
+               return length;
+       }
 
-       for (;;) {
-               status = le16_to_cpu(rx_ring[rx_next].status);
+       /* There was an error. */
+       printf("RX error status = 0x%08X\n", status);
+       return -EINVAL;
+}
 
-               if (!(status & RFD_STATUS_C))
-                       break;
+static void eepro100_free_pkt_common(struct eepro100_priv *priv)
+{
+       struct eepro100_rxfd *rx_ring = priv->rx_ring;
+       struct eepro100_rxfd *desc;
+       int rx_prev;
 
-               /* Valid frame status. */
-               if ((status & RFD_STATUS_OK)) {
-                       /* A valid frame received. */
-                       length = le32_to_cpu(rx_ring[rx_next].count) & 0x3fff;
-
-                       /* Pass the packet up to the protocol layers. */
-                       net_process_received_packet((u8 *)rx_ring[rx_next].data,
-                                                   length);
-               } else {
-                       /* There was an error. */
-                       printf("RX error status = 0x%08X\n", status);
-               }
+       desc = &rx_ring[priv->rx_next];
 
-               rx_ring[rx_next].control = cpu_to_le16 (RFD_CONTROL_S);
-               rx_ring[rx_next].status = 0;
-               rx_ring[rx_next].count = cpu_to_le32 (PKTSIZE_ALIGN << 16);
+       desc->control = cpu_to_le16(RFD_CONTROL_S);
+       desc->status = 0;
+       desc->count = cpu_to_le32(PKTSIZE_ALIGN << 16);
+       flush_dcache_range((unsigned long)desc,
+                          (unsigned long)desc + sizeof(*desc));
 
-               rx_prev = (rx_next + NUM_RX_DESC - 1) % NUM_RX_DESC;
-               rx_ring[rx_prev].control = 0;
+       rx_prev = (priv->rx_next + NUM_RX_DESC - 1) % NUM_RX_DESC;
+       desc = &rx_ring[rx_prev];
+       desc->control = 0;
+       flush_dcache_range((unsigned long)desc,
+                          (unsigned long)desc + sizeof(*desc));
 
-               /* Update entry information. */
-               rx_next = (rx_next + 1) % NUM_RX_DESC;
-       }
+       /* Update entry information. */
+       priv->rx_next = (priv->rx_next + 1) % NUM_RX_DESC;
 
-       if (stat & SCB_STATUS_RNR) {
-               printf("%s: Receiver is not ready, restart it !\n", dev->name);
+       if (!(priv->rx_stat & SCB_STATUS_RNR))
+               return;
 
-               /* Reinitialize Rx ring. */
-               init_rx_ring(dev);
+       printf("%s: Receiver is not ready, restart it !\n", priv->name);
 
-               if (!wait_for_eepro100(dev)) {
-                       printf("Error: Can not restart ethernet controller.\n");
-                       goto done;
-               }
+       /* Reinitialize Rx ring. */
+       init_rx_ring(priv);
 
-               OUTL(dev, phys_to_bus((u32)&rx_ring[rx_next]), SCB_POINTER);
-               OUTW(dev, SCB_M | RUC_START, SCB_CMD);
+       if (!wait_for_eepro100(priv)) {
+               printf("Error: Can not restart ethernet controller.\n");
+               return;
        }
 
-done:
-       return length;
+       /* RX ring cache was already flushed in init_rx_ring() */
+       OUTL(priv, phys_to_bus(priv->devno, (u32)&rx_ring[priv->rx_next]),
+            SCB_POINTER);
+       OUTW(priv, SCB_M | RUC_START, SCB_CMD);
 }
 
-static void eepro100_halt(struct eth_device *dev)
+static void eepro100_halt_common(struct eepro100_priv *priv)
 {
        /* Reset the ethernet controller */
-       OUTL(dev, I82559_SELECTIVE_RESET, SCB_PORT);
+       OUTL(priv, I82559_SELECTIVE_RESET, SCB_PORT);
        udelay(20);
 
-       OUTL(dev, I82559_RESET, SCB_PORT);
+       OUTL(priv, I82559_RESET, SCB_PORT);
        udelay(20);
 
-       if (!wait_for_eepro100(dev)) {
+       if (!wait_for_eepro100(priv)) {
                printf("Error: Can not reset ethernet controller.\n");
                goto done;
        }
-       OUTL(dev, 0, SCB_POINTER);
-       OUTW(dev, SCB_M | RUC_ADDR_LOAD, SCB_CMD);
+       OUTL(priv, 0, SCB_POINTER);
+       OUTW(priv, SCB_M | RUC_ADDR_LOAD, SCB_CMD);
 
-       if (!wait_for_eepro100(dev)) {
+       if (!wait_for_eepro100(priv)) {
                printf("Error: Can not reset ethernet controller.\n");
                goto done;
        }
-       OUTL(dev, 0, SCB_POINTER);
-       OUTW(dev, SCB_M | CU_ADDR_LOAD, SCB_CMD);
+       OUTL(priv, 0, SCB_POINTER);
+       OUTW(priv, SCB_M | CU_ADDR_LOAD, SCB_CMD);
 
 done:
        return;
 }
 
-/* SROM Read. */
-static int read_eeprom(struct eth_device *dev, int location, int addr_len)
+#ifndef CONFIG_DM_ETH
+static int eepro100_init(struct eth_device *dev, struct bd_info *bis)
 {
-       unsigned short retval = 0;
-       int read_cmd = location | EE_READ_CMD;
-       int i;
+       struct eepro100_priv *priv =
+               container_of(dev, struct eepro100_priv, dev);
 
-       OUTW(dev, EE_ENB & ~EE_CS, SCB_EEPROM);
-       OUTW(dev, EE_ENB, SCB_EEPROM);
+       return eepro100_init_common(priv);
+}
 
-       /* Shift the read command bits out. */
-       for (i = 12; i >= 0; i--) {
-               short dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
+static void eepro100_halt(struct eth_device *dev)
+{
+       struct eepro100_priv *priv =
+               container_of(dev, struct eepro100_priv, dev);
 
-               OUTW(dev, EE_ENB | dataval, SCB_EEPROM);
-               udelay(1);
-               OUTW(dev, EE_ENB | dataval | EE_SHIFT_CLK, SCB_EEPROM);
-               udelay(1);
-       }
-       OUTW(dev, EE_ENB, SCB_EEPROM);
+       eepro100_halt_common(priv);
+}
 
-       for (i = 15; i >= 0; i--) {
-               OUTW(dev, EE_ENB | EE_SHIFT_CLK, SCB_EEPROM);
-               udelay(1);
-               retval = (retval << 1) |
-                               ((INW(dev, SCB_EEPROM) & EE_DATA_READ) ? 1 : 0);
-               OUTW(dev, EE_ENB, SCB_EEPROM);
-               udelay(1);
-       }
+static int eepro100_send(struct eth_device *dev, void *packet, int length)
+{
+       struct eepro100_priv *priv =
+               container_of(dev, struct eepro100_priv, dev);
 
-       /* Terminate the EEPROM access. */
-       OUTW(dev, EE_ENB & ~EE_CS, SCB_EEPROM);
-       return retval;
+       return eepro100_send_common(priv, packet, length);
 }
 
-static void init_rx_ring(struct eth_device *dev)
+static int eepro100_recv(struct eth_device *dev)
 {
-       int i;
+       struct eepro100_priv *priv =
+               container_of(dev, struct eepro100_priv, dev);
+       uchar *packet;
+       int ret;
+
+       ret = eepro100_recv_common(priv, &packet);
+       if (ret > 0)
+               net_process_received_packet(packet, ret);
+       if (ret)
+               eepro100_free_pkt_common(priv);
+
+       return ret;
+}
 
-       for (i = 0; i < NUM_RX_DESC; i++) {
-               rx_ring[i].status = 0;
-               rx_ring[i].control = (i == NUM_RX_DESC - 1) ?
-                                    cpu_to_le16 (RFD_CONTROL_S) : 0;
-               rx_ring[i].link =
-                       cpu_to_le32(phys_to_bus((u32)&rx_ring[(i + 1) %
-                                               NUM_RX_DESC]));
-               rx_ring[i].rx_buf_addr = 0xffffffff;
-               rx_ring[i].count = cpu_to_le32(PKTSIZE_ALIGN << 16);
+int eepro100_initialize(struct bd_info *bis)
+{
+       struct eepro100_priv *priv;
+       struct eth_device *dev;
+       int card_number = 0;
+       u32 iobase, status;
+       pci_dev_t devno;
+       int idx = 0;
+       int ret;
+
+       while (1) {
+               /* Find PCI device */
+               devno = pci_find_devices(supported, idx++);
+               if (devno < 0)
+                       break;
+
+               pci_read_config_dword(devno, PCI_BASE_ADDRESS_0, &iobase);
+               iobase &= ~0xf;
+
+               debug("eepro100: Intel i82559 PCI EtherExpressPro @0x%x\n",
+                     iobase);
+
+               pci_write_config_dword(devno, PCI_COMMAND,
+                                      PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
+
+               /* Check if I/O accesses and Bus Mastering are enabled. */
+               pci_read_config_dword(devno, PCI_COMMAND, &status);
+               if (!(status & PCI_COMMAND_MEMORY)) {
+                       printf("Error: Can not enable MEM access.\n");
+                       continue;
+               }
+
+               if (!(status & PCI_COMMAND_MASTER)) {
+                       printf("Error: Can not enable Bus Mastering.\n");
+                       continue;
+               }
+
+               priv = calloc(1, sizeof(*priv));
+               if (!priv) {
+                       printf("eepro100: Can not allocate memory\n");
+                       break;
+               }
+               dev = &priv->dev;
+
+               sprintf(dev->name, "i82559#%d", card_number);
+               priv->name = dev->name;
+               /* this have to come before bus_to_phys() */
+               priv->devno = devno;
+               priv->iobase = (void __iomem *)bus_to_phys(devno, iobase);
+               priv->enetaddr = dev->enetaddr;
+
+               dev->init = eepro100_init;
+               dev->halt = eepro100_halt;
+               dev->send = eepro100_send;
+               dev->recv = eepro100_recv;
+
+               eth_register(dev);
+
+               ret = eepro100_initialize_mii(priv);
+               if (ret) {
+                       eth_unregister(dev);
+                       free(priv);
+                       return ret;
+               }
+
+               card_number++;
+
+               /* Set the latency timer for value. */
+               pci_write_config_byte(devno, PCI_LATENCY_TIMER, 0x20);
+
+               udelay(10 * 1000);
+
+               eepro100_get_hwaddr(priv);
        }
 
-       rx_next = 0;
+       return card_number;
 }
 
-static void purge_tx_ring(struct eth_device *dev)
+#else  /* DM_ETH */
+static int eepro100_start(struct udevice *dev)
 {
-       tx_next = 0;
-       tx_threshold = 0x01208000;
-       memset(tx_ring, 0, sizeof(*tx_ring) * NUM_TX_DESC);
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct eepro100_priv *priv = dev_get_priv(dev);
+
+       memcpy(priv->enetaddr, plat->enetaddr, sizeof(plat->enetaddr));
+
+       return eepro100_init_common(priv);
 }
 
-static void read_hw_addr(struct eth_device *dev, bd_t *bis)
+static void eepro100_stop(struct udevice *dev)
 {
-       u16 sum = 0;
-       int i, j;
-       int addr_len = read_eeprom(dev, 0, 6) == 0xffff ? 8 : 6;
+       struct eepro100_priv *priv = dev_get_priv(dev);
 
-       for (j = 0, i = 0; i < 0x40; i++) {
-               u16 value = read_eeprom(dev, i, addr_len);
+       eepro100_halt_common(priv);
+}
 
-               sum += value;
-               if (i < 3) {
-                       dev->enetaddr[j++] = value;
-                       dev->enetaddr[j++] = value >> 8;
-               }
-       }
+static int eepro100_send(struct udevice *dev, void *packet, int length)
+{
+       struct eepro100_priv *priv = dev_get_priv(dev);
+       int ret;
 
-       if (sum != 0xBABA) {
-               memset(dev->enetaddr, 0, ETH_ALEN);
-               debug("%s: Invalid EEPROM checksum %#4.4x, check settings before activating this device!\n",
-                     dev->name, sum);
+       ret = eepro100_send_common(priv, packet, length);
+
+       return ret ? 0 : -ETIMEDOUT;
+}
+
+static int eepro100_recv(struct udevice *dev, int flags, uchar **packetp)
+{
+       struct eepro100_priv *priv = dev_get_priv(dev);
+
+       return eepro100_recv_common(priv, packetp);
+}
+
+static int eepro100_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+       struct eepro100_priv *priv = dev_get_priv(dev);
+
+       eepro100_free_pkt_common(priv);
+
+       return 0;
+}
+
+static int eepro100_read_rom_hwaddr(struct udevice *dev)
+{
+       struct eepro100_priv *priv = dev_get_priv(dev);
+
+       eepro100_get_hwaddr(priv);
+
+       return 0;
+}
+
+static int eepro100_bind(struct udevice *dev)
+{
+       static int card_number;
+       char name[16];
+
+       sprintf(name, "eepro100#%u", card_number++);
+
+       return device_set_name(dev, name);
+}
+
+static int eepro100_probe(struct udevice *dev)
+{
+       struct eth_pdata *plat = dev_get_platdata(dev);
+       struct eepro100_priv *priv = dev_get_priv(dev);
+       u16 command, status;
+       u32 iobase;
+       int ret;
+
+       dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase);
+       iobase &= ~0xf;
+
+       debug("eepro100: Intel i82559 PCI EtherExpressPro @0x%x\n", iobase);
+
+       priv->devno = dev;
+       priv->enetaddr = plat->enetaddr;
+       priv->iobase = (void __iomem *)bus_to_phys(dev, iobase);
+
+       command = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
+       dm_pci_write_config16(dev, PCI_COMMAND, command);
+       dm_pci_read_config16(dev, PCI_COMMAND, &status);
+       if ((status & command) != command) {
+               printf("eepro100: Couldn't enable IO access or Bus Mastering\n");
+               return -EINVAL;
        }
+
+       ret = eepro100_initialize_mii(priv);
+       if (ret)
+               return ret;
+
+       dm_pci_write_config8(dev, PCI_LATENCY_TIMER, 0x20);
+
+       return 0;
 }
+
+static const struct eth_ops eepro100_ops = {
+       .start          = eepro100_start,
+       .send           = eepro100_send,
+       .recv           = eepro100_recv,
+       .stop           = eepro100_stop,
+       .free_pkt       = eepro100_free_pkt,
+       .read_rom_hwaddr = eepro100_read_rom_hwaddr,
+};
+
+U_BOOT_DRIVER(eth_eepro100) = {
+       .name   = "eth_eepro100",
+       .id     = UCLASS_ETH,
+       .bind   = eepro100_bind,
+       .probe  = eepro100_probe,
+       .ops    = &eepro100_ops,
+       .priv_auto_alloc_size = sizeof(struct eepro100_priv),
+       .platdata_auto_alloc_size = sizeof(struct eth_pdata),
+};
+
+U_BOOT_PCI_DEVICE(eth_eepro100, supported);
+#endif
This page took 0.067665 seconds and 4 git commands to generate.