mv643xx_eth: remove port serial status register bit defines
[safe/jmp/linux-2.6] / drivers / net / mv643xx_eth.c
index 59de3e7..6324556 100644 (file)
@@ -1,9 +1,10 @@
 /*
- * drivers/net/mv643xx_eth.c - Driver for MV643XX ethernet ports
+ * Driver for Marvell Discovery (MV643XX) and Marvell Orion ethernet ports
  * Copyright (C) 2002 Matthew Dharm <mdharm@momenco.com>
  *
  * Based on the 64360 driver from:
- * Copyright (C) 2002 rabeeh@galileo.co.il
+ * Copyright (C) 2002 Rabeeh Khoury <rabeeh@galileo.co.il>
+ *                   Rabeeh Khoury <rabeeh@marvell.com>
  *
  * Copyright (C) 2003 PMC-Sierra, Inc.,
  *     written by Manish Lachwani
@@ -16,6 +17,9 @@
  * Copyright (C) 2004 Steven J. Hill <sjhill1@rockwellcollins.com>
  *                                  <sjhill@realitydiluted.com>
  *
+ * Copyright (C) 2007-2008 Marvell Semiconductor
+ *                        Lennert Buytenhek <buytenh@marvell.com>
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
 #include <linux/in.h>
-#include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/etherdevice.h>
-
-#include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/platform_device.h>
-
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/mii.h>
+#include <linux/mv643xx_eth.h>
 #include <asm/io.h>
 #include <asm/types.h>
-#include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/delay.h>
-#include "mv643xx_eth.h"
-
-/* Static function declarations */
-static void eth_port_uc_addr_get(struct net_device *dev,
-                                               unsigned char *MacAddr);
-static void eth_port_set_multicast_list(struct net_device *);
-static void mv643xx_eth_port_enable_tx(unsigned int port_num,
-                                               unsigned int queues);
-static void mv643xx_eth_port_enable_rx(unsigned int port_num,
-                                               unsigned int queues);
-static unsigned int mv643xx_eth_port_disable_tx(unsigned int port_num);
-static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num);
-static int mv643xx_eth_open(struct net_device *);
-static int mv643xx_eth_stop(struct net_device *);
-static int mv643xx_eth_change_mtu(struct net_device *, int);
-static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *);
-static void eth_port_init_mac_tables(unsigned int eth_port_num);
-#ifdef MV643XX_NAPI
-static int mv643xx_poll(struct net_device *dev, int *budget);
-#endif
-static int ethernet_phy_get(unsigned int eth_port_num);
-static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
-static int ethernet_phy_detect(unsigned int eth_port_num);
-static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location);
-static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val);
-static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-static struct ethtool_ops mv643xx_ethtool_ops;
 
 static char mv643xx_driver_name[] = "mv643xx_eth";
 static char mv643xx_driver_version[] = "1.0";
 
-static void __iomem *mv643xx_eth_shared_base;
+#define MV643XX_CHECKSUM_OFFLOAD_TX
+#define MV643XX_NAPI
+#define MV643XX_TX_FAST_REFILL
+#undef MV643XX_COAL
+
+#define MV643XX_TX_COAL 100
+#ifdef MV643XX_COAL
+#define MV643XX_RX_COAL 100
+#endif
+
+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+#define MAX_DESCS_PER_SKB      (MAX_SKB_FRAGS + 1)
+#else
+#define MAX_DESCS_PER_SKB      1
+#endif
+
+#define ETH_VLAN_HLEN          4
+#define ETH_FCS_LEN            4
+#define ETH_HW_IP_ALIGN                2               /* hw aligns IP header */
+#define ETH_WRAPPER_LEN                (ETH_HW_IP_ALIGN + ETH_HLEN + \
+                                       ETH_VLAN_HLEN + ETH_FCS_LEN)
+#define ETH_RX_SKB_SIZE                (dev->mtu + ETH_WRAPPER_LEN + \
+                                       dma_get_cache_alignment())
+
+/*
+ * Registers shared between all ports.
+ */
+#define PHY_ADDR                       0x0000
+#define SMI_REG                                0x0004
+#define WINDOW_BASE(w)                 (0x0200 + ((w) << 3))
+#define WINDOW_SIZE(w)                 (0x0204 + ((w) << 3))
+#define WINDOW_REMAP_HIGH(w)           (0x0280 + ((w) << 2))
+#define WINDOW_BAR_ENABLE              0x0290
+#define WINDOW_PROTECT(w)              (0x0294 + ((w) << 4))
+
+/*
+ * Per-port registers.
+ */
+#define PORT_CONFIG(p)                 (0x0400 + ((p) << 10))
+#define  UNICAST_PROMISCUOUS_MODE      0x00000001
+#define PORT_CONFIG_EXT(p)             (0x0404 + ((p) << 10))
+#define MAC_ADDR_LOW(p)                        (0x0414 + ((p) << 10))
+#define MAC_ADDR_HIGH(p)               (0x0418 + ((p) << 10))
+#define SDMA_CONFIG(p)                 (0x041c + ((p) << 10))
+#define PORT_SERIAL_CONTROL(p)         (0x043c + ((p) << 10))
+#define PORT_STATUS(p)                 (0x0444 + ((p) << 10))
+#define  TX_FIFO_EMPTY                 0x00000400
+#define TXQ_COMMAND(p)                 (0x0448 + ((p) << 10))
+#define TX_BW_MTU(p)                   (0x0458 + ((p) << 10))
+#define INT_CAUSE(p)                   (0x0460 + ((p) << 10))
+#define  INT_RX                                0x00000804
+#define  INT_EXT                       0x00000002
+#define INT_CAUSE_EXT(p)               (0x0464 + ((p) << 10))
+#define  INT_EXT_LINK                  0x00100000
+#define  INT_EXT_PHY                   0x00010000
+#define  INT_EXT_TX_ERROR_0            0x00000100
+#define  INT_EXT_TX_0                  0x00000001
+#define  INT_EXT_TX                    0x00000101
+#define INT_MASK(p)                    (0x0468 + ((p) << 10))
+#define INT_MASK_EXT(p)                        (0x046c + ((p) << 10))
+#define TX_FIFO_URGENT_THRESHOLD(p)    (0x0474 + ((p) << 10))
+#define RXQ_CURRENT_DESC_PTR(p)                (0x060c + ((p) << 10))
+#define RXQ_COMMAND(p)                 (0x0680 + ((p) << 10))
+#define TXQ_CURRENT_DESC_PTR(p)                (0x06c0 + ((p) << 10))
+#define MIB_COUNTERS(p)                        (0x1000 + ((p) << 7))
+#define SPECIAL_MCAST_TABLE(p)         (0x1400 + ((p) << 10))
+#define OTHER_MCAST_TABLE(p)           (0x1500 + ((p) << 10))
+#define UNICAST_TABLE(p)               (0x1600 + ((p) << 10))
+
+
+/*
+ * SDMA configuration register.
+ */
+#define RX_BURST_SIZE_4_64BIT          (2 << 1)
+#define BLM_RX_NO_SWAP                 (1 << 4)
+#define BLM_TX_NO_SWAP                 (1 << 5)
+#define TX_BURST_SIZE_4_64BIT          (2 << 22)
+
+#if defined(__BIG_ENDIAN)
+#define PORT_SDMA_CONFIG_DEFAULT_VALUE         \
+               RX_BURST_SIZE_4_64BIT   |       \
+               TX_BURST_SIZE_4_64BIT
+#elif defined(__LITTLE_ENDIAN)
+#define PORT_SDMA_CONFIG_DEFAULT_VALUE         \
+               RX_BURST_SIZE_4_64BIT   |       \
+               BLM_RX_NO_SWAP          |       \
+               BLM_TX_NO_SWAP          |       \
+               TX_BURST_SIZE_4_64BIT
+#else
+#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
+#endif
+
+
+/*
+ * Port serial control register.
+ */
+#define SET_MII_SPEED_TO_100                   (1 << 24)
+#define SET_GMII_SPEED_TO_1000                 (1 << 23)
+#define SET_FULL_DUPLEX_MODE                   (1 << 21)
+#define MAX_RX_PACKET_1522BYTE                 (1 << 17)
+#define MAX_RX_PACKET_9700BYTE                 (5 << 17)
+#define MAX_RX_PACKET_MASK                     (7 << 17)
+#define DISABLE_AUTO_NEG_SPEED_GMII            (1 << 13)
+#define DO_NOT_FORCE_LINK_FAIL                 (1 << 10)
+#define SERIAL_PORT_CONTROL_RESERVED           (1 << 9)
+#define DISABLE_AUTO_NEG_FOR_FLOW_CTRL         (1 << 3)
+#define DISABLE_AUTO_NEG_FOR_DUPLEX            (1 << 2)
+#define FORCE_LINK_PASS                                (1 << 1)
+#define SERIAL_PORT_ENABLE                     (1 << 0)
+
+#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE       800
+#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE                400
+
+/* SMI reg */
+#define ETH_SMI_BUSY           0x10000000      /* 0 - Write, 1 - Read  */
+#define ETH_SMI_READ_VALID     0x08000000      /* 0 - Write, 1 - Read  */
+#define ETH_SMI_OPCODE_WRITE   0               /* Completion of Read   */
+#define ETH_SMI_OPCODE_READ    0x04000000      /* Operation is in progress */
+
+/* Interrupt Cause Register Bit Definitions */
+
+/* SDMA command status fields macros */
+
+/* Tx & Rx descriptors status */
+#define ETH_ERROR_SUMMARY                      0x00000001
+
+/* Tx & Rx descriptors command */
+#define ETH_BUFFER_OWNED_BY_DMA                        0x80000000
+
+/* Tx descriptors status */
+#define ETH_LC_ERROR                           0
+#define ETH_UR_ERROR                           0x00000002
+#define ETH_RL_ERROR                           0x00000004
+#define ETH_LLC_SNAP_FORMAT                    0x00000200
+
+/* Rx descriptors status */
+#define ETH_OVERRUN_ERROR                      0x00000002
+#define ETH_MAX_FRAME_LENGTH_ERROR             0x00000004
+#define ETH_RESOURCE_ERROR                     0x00000006
+#define ETH_VLAN_TAGGED                                0x00080000
+#define ETH_BPDU_FRAME                         0x00100000
+#define ETH_UDP_FRAME_OVER_IP_V_4              0x00200000
+#define ETH_OTHER_FRAME_TYPE                   0x00400000
+#define ETH_LAYER_2_IS_ETH_V_2                 0x00800000
+#define ETH_FRAME_TYPE_IP_V_4                  0x01000000
+#define ETH_FRAME_HEADER_OK                    0x02000000
+#define ETH_RX_LAST_DESC                       0x04000000
+#define ETH_RX_FIRST_DESC                      0x08000000
+#define ETH_UNKNOWN_DESTINATION_ADDR           0x10000000
+#define ETH_RX_ENABLE_INTERRUPT                        0x20000000
+#define ETH_LAYER_4_CHECKSUM_OK                        0x40000000
+
+/* Rx descriptors byte count */
+#define ETH_FRAME_FRAGMENTED                   0x00000004
+
+/* Tx descriptors command */
+#define ETH_LAYER_4_CHECKSUM_FIRST_DESC                0x00000400
+#define ETH_FRAME_SET_TO_VLAN                  0x00008000
+#define ETH_UDP_FRAME                          0x00010000
+#define ETH_GEN_TCP_UDP_CHECKSUM               0x00020000
+#define ETH_GEN_IP_V_4_CHECKSUM                        0x00040000
+#define ETH_ZERO_PADDING                       0x00080000
+#define ETH_TX_LAST_DESC                       0x00100000
+#define ETH_TX_FIRST_DESC                      0x00200000
+#define ETH_GEN_CRC                            0x00400000
+#define ETH_TX_ENABLE_INTERRUPT                        0x00800000
+#define ETH_AUTO_MODE                          0x40000000
+
+#define ETH_TX_IHL_SHIFT                       11
+
+/* typedefs */
+
+typedef enum _eth_func_ret_status {
+       ETH_OK,                 /* Returned as expected.                */
+       ETH_ERROR,              /* Fundamental error.                   */
+       ETH_RETRY,              /* Could not process request. Try later.*/
+       ETH_END_OF_JOB,         /* Ring has nothing to process.         */
+       ETH_QUEUE_FULL,         /* Ring resource error.                 */
+       ETH_QUEUE_LAST_RESOURCE /* Ring resources about to exhaust.     */
+} ETH_FUNC_RET_STATUS;
+
+/* These are for big-endian machines.  Little endian needs different
+ * definitions.
+ */
+#if defined(__BIG_ENDIAN)
+struct eth_rx_desc {
+       u16 byte_cnt;           /* Descriptor buffer byte count         */
+       u16 buf_size;           /* Buffer size                          */
+       u32 cmd_sts;            /* Descriptor command status            */
+       u32 next_desc_ptr;      /* Next descriptor pointer              */
+       u32 buf_ptr;            /* Descriptor buffer pointer            */
+};
+
+struct eth_tx_desc {
+       u16 byte_cnt;           /* buffer byte count                    */
+       u16 l4i_chk;            /* CPU provided TCP checksum            */
+       u32 cmd_sts;            /* Command/status field                 */
+       u32 next_desc_ptr;      /* Pointer to next descriptor           */
+       u32 buf_ptr;            /* pointer to buffer for this descriptor*/
+};
+#elif defined(__LITTLE_ENDIAN)
+struct eth_rx_desc {
+       u32 cmd_sts;            /* Descriptor command status            */
+       u16 buf_size;           /* Buffer size                          */
+       u16 byte_cnt;           /* Descriptor buffer byte count         */
+       u32 buf_ptr;            /* Descriptor buffer pointer            */
+       u32 next_desc_ptr;      /* Next descriptor pointer              */
+};
+
+struct eth_tx_desc {
+       u32 cmd_sts;            /* Command/status field                 */
+       u16 l4i_chk;            /* CPU provided TCP checksum            */
+       u16 byte_cnt;           /* buffer byte count                    */
+       u32 buf_ptr;            /* pointer to buffer for this descriptor*/
+       u32 next_desc_ptr;      /* Pointer to next descriptor           */
+};
+#else
+#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
+#endif
+
+/* Unified struct for Rx and Tx operations. The user is not required to        */
+/* be familier with neither Tx nor Rx descriptors.                     */
+struct pkt_info {
+       unsigned short byte_cnt;        /* Descriptor buffer byte count */
+       unsigned short l4i_chk;         /* Tx CPU provided TCP Checksum */
+       unsigned int cmd_sts;           /* Descriptor command status    */
+       dma_addr_t buf_ptr;             /* Descriptor buffer pointer    */
+       struct sk_buff *return_info;    /* User resource return information */
+};
+
+
+/* global *******************************************************************/
+struct mv643xx_shared_private {
+       void __iomem *eth_base;
+
+       /* used to protect SMI_REG, which is shared across ports */
+       spinlock_t phy_lock;
+
+       u32 win_protect;
+
+       unsigned int t_clk;
+};
+
+
+/* per-port *****************************************************************/
+struct mv643xx_mib_counters {
+       u64 good_octets_received;
+       u32 bad_octets_received;
+       u32 internal_mac_transmit_err;
+       u32 good_frames_received;
+       u32 bad_frames_received;
+       u32 broadcast_frames_received;
+       u32 multicast_frames_received;
+       u32 frames_64_octets;
+       u32 frames_65_to_127_octets;
+       u32 frames_128_to_255_octets;
+       u32 frames_256_to_511_octets;
+       u32 frames_512_to_1023_octets;
+       u32 frames_1024_to_max_octets;
+       u64 good_octets_sent;
+       u32 good_frames_sent;
+       u32 excessive_collision;
+       u32 multicast_frames_sent;
+       u32 broadcast_frames_sent;
+       u32 unrec_mac_control_received;
+       u32 fc_sent;
+       u32 good_fc_received;
+       u32 bad_fc_received;
+       u32 undersize_received;
+       u32 fragments_received;
+       u32 oversize_received;
+       u32 jabber_received;
+       u32 mac_receive_error;
+       u32 bad_crc_event;
+       u32 collision;
+       u32 late_collision;
+};
+
+struct mv643xx_private {
+       struct mv643xx_shared_private *shared;
+       int port_num;                   /* User Ethernet port number    */
+
+       struct mv643xx_shared_private *shared_smi;
+
+       u32 rx_sram_addr;               /* Base address of rx sram area */
+       u32 rx_sram_size;               /* Size of rx sram area         */
+       u32 tx_sram_addr;               /* Base address of tx sram area */
+       u32 tx_sram_size;               /* Size of tx sram area         */
+
+       int rx_resource_err;            /* Rx ring resource error flag */
+
+       /* Tx/Rx rings managment indexes fields. For driver use */
+
+       /* Next available and first returning Rx resource */
+       int rx_curr_desc_q, rx_used_desc_q;
+
+       /* Next available and first returning Tx resource */
+       int tx_curr_desc_q, tx_used_desc_q;
+
+#ifdef MV643XX_TX_FAST_REFILL
+       u32 tx_clean_threshold;
+#endif
+
+       struct eth_rx_desc *p_rx_desc_area;
+       dma_addr_t rx_desc_dma;
+       int rx_desc_area_size;
+       struct sk_buff **rx_skb;
+
+       struct eth_tx_desc *p_tx_desc_area;
+       dma_addr_t tx_desc_dma;
+       int tx_desc_area_size;
+       struct sk_buff **tx_skb;
+
+       struct work_struct tx_timeout_task;
+
+       struct net_device *dev;
+       struct napi_struct napi;
+       struct net_device_stats stats;
+       struct mv643xx_mib_counters mib_counters;
+       spinlock_t lock;
+       /* Size of Tx Ring per queue */
+       int tx_ring_size;
+       /* Number of tx descriptors in use */
+       int tx_desc_count;
+       /* Size of Rx Ring per queue */
+       int rx_ring_size;
+       /* Number of rx descriptors in use */
+       int rx_desc_count;
+
+       /*
+        * Used in case RX Ring is empty, which can be caused when
+        * system does not have resources (skb's)
+        */
+       struct timer_list timeout;
+
+       u32 rx_int_coal;
+       u32 tx_int_coal;
+       struct mii_if_info mii;
+};
+
+
+/* port register accessors **************************************************/
+static inline u32 rdl(struct mv643xx_private *mp, int offset)
+{
+       return readl(mp->shared->eth_base + offset);
+}
+
+static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)
+{
+       writel(data, mp->shared->eth_base + offset);
+}
+
 
-/* used to protect MV643XX_ETH_SMI_REG, which is shared across ports */
-static DEFINE_SPINLOCK(mv643xx_eth_phy_lock);
+/* rxq/txq helper functions *************************************************/
+static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
+                                       unsigned int queues)
+{
+       wrl(mp, RXQ_COMMAND(mp->port_num), queues);
+}
 
-static inline u32 mv_read(int offset)
+static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
 {
-       void __iomem *reg_base;
+       unsigned int port_num = mp->port_num;
+       u32 queues;
+
+       /* Stop Rx port activity. Check port Rx activity. */
+       queues = rdl(mp, RXQ_COMMAND(port_num)) & 0xFF;
+       if (queues) {
+               /* Issue stop command for active queues only */
+               wrl(mp, RXQ_COMMAND(port_num), (queues << 8));
+
+               /* Wait for all Rx activity to terminate. */
+               /* Check port cause register that all Rx queues are stopped */
+               while (rdl(mp, RXQ_COMMAND(port_num)) & 0xFF)
+                       udelay(10);
+       }
 
-       reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
+       return queues;
+}
 
-       return readl(reg_base + offset);
+static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
+                                       unsigned int queues)
+{
+       wrl(mp, TXQ_COMMAND(mp->port_num), queues);
 }
 
-static inline void mv_write(int offset, u32 data)
+static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
 {
-       void __iomem *reg_base;
+       unsigned int port_num = mp->port_num;
+       u32 queues;
+
+       /* Stop Tx port activity. Check port Tx activity. */
+       queues = rdl(mp, TXQ_COMMAND(port_num)) & 0xFF;
+       if (queues) {
+               /* Issue stop command for active queues only */
+               wrl(mp, TXQ_COMMAND(port_num), (queues << 8));
+
+               /* Wait for all Tx activity to terminate. */
+               /* Check port cause register that all Tx queues are stopped */
+               while (rdl(mp, TXQ_COMMAND(port_num)) & 0xFF)
+                       udelay(10);
 
-       reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
-       writel(data, reg_base + offset);
+               /* Wait for Tx FIFO to empty */
+               while (rdl(mp, PORT_STATUS(port_num)) & TX_FIFO_EMPTY)
+                       udelay(10);
+       }
+
+       return queues;
 }
 
+
+/* rx ***********************************************************************/
+static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
+
 /*
- * Changes MTU (maximum transfer unit) of the gigabit ethenret port
+ * eth_rx_return_buff - Returns a Rx buffer back to the Rx ring.
  *
- * Input :     pointer to ethernet interface network device structure
- *             new mtu size
- * Output :    0 upon success, -EINVAL upon failure
+ * DESCRIPTION:
+ *     This routine returns a Rx buffer back to the Rx ring. It retrieves the
+ *     next 'used' descriptor and attached the returned buffer to it.
+ *     In case the Rx ring was in "resource error" condition, where there are
+ *     no available Rx resources, the function resets the resource error flag.
+ *
+ * INPUT:
+ *     struct mv643xx_private  *mp             Ethernet Port Control srtuct.
+ *     struct pkt_info         *p_pkt_info     Information on returned buffer.
+ *
+ * OUTPUT:
+ *     New available Rx resource in Rx descriptor ring.
+ *
+ * RETURN:
+ *     ETH_ERROR in case the routine can not access Rx desc ring.
+ *     ETH_OK otherwise.
  */
-static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
+static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
+                                               struct pkt_info *p_pkt_info)
 {
-       if ((new_mtu > 9500) || (new_mtu < 64))
-               return -EINVAL;
+       int used_rx_desc;       /* Where to return Rx resource */
+       volatile struct eth_rx_desc *p_used_rx_desc;
+       unsigned long flags;
 
-       dev->mtu = new_mtu;
-       /*
-        * Stop then re-open the interface. This will allocate RX skb's with
-        * the new MTU.
-        * There is a possible danger that the open will not successed, due
-        * to memory is full, which might fail the open function.
-        */
-       if (netif_running(dev)) {
-               mv643xx_eth_stop(dev);
-               if (mv643xx_eth_open(dev))
-                       printk(KERN_ERR
-                               "%s: Fatal error on opening device\n",
-                               dev->name);
-       }
+       spin_lock_irqsave(&mp->lock, flags);
 
-       return 0;
+       /* Get 'used' Rx descriptor */
+       used_rx_desc = mp->rx_used_desc_q;
+       p_used_rx_desc = &mp->p_rx_desc_area[used_rx_desc];
+
+       p_used_rx_desc->buf_ptr = p_pkt_info->buf_ptr;
+       p_used_rx_desc->buf_size = p_pkt_info->byte_cnt;
+       mp->rx_skb[used_rx_desc] = p_pkt_info->return_info;
+
+       /* Flush the write pipe */
+
+       /* Return the descriptor to DMA ownership */
+       wmb();
+       p_used_rx_desc->cmd_sts =
+                       ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
+       wmb();
+
+       /* Move the used descriptor pointer to the next descriptor */
+       mp->rx_used_desc_q = (used_rx_desc + 1) % mp->rx_ring_size;
+
+       /* Any Rx return cancels the Rx resource error status */
+       mp->rx_resource_err = 0;
+
+       spin_unlock_irqrestore(&mp->lock, flags);
+
+       return ETH_OK;
 }
 
 /*
@@ -147,13 +543,13 @@ static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
        int unaligned;
 
        while (mp->rx_desc_count < mp->rx_ring_size) {
-               skb = dev_alloc_skb(ETH_RX_SKB_SIZE + ETH_DMA_ALIGN);
+               skb = dev_alloc_skb(ETH_RX_SKB_SIZE + dma_get_cache_alignment());
                if (!skb)
                        break;
                mp->rx_desc_count++;
-               unaligned = (u32)skb->data & (ETH_DMA_ALIGN - 1);
+               unaligned = (u32)skb->data & (dma_get_cache_alignment() - 1);
                if (unaligned)
-                       skb_reserve(skb, ETH_DMA_ALIGN - unaligned);
+                       skb_reserve(skb, dma_get_cache_alignment() - unaligned);
                pkt_info.cmd_sts = ETH_RX_ENABLE_INTERRUPT;
                pkt_info.byte_cnt = ETH_RX_SKB_SIZE;
                pkt_info.buf_ptr = dma_map_single(NULL, skb->data,
@@ -193,176 +589,81 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
 }
 
 /*
- * mv643xx_eth_update_mac_address
+ * eth_port_receive - Get received information from Rx ring.
  *
- * Update the MAC address of the port in the address table
+ * DESCRIPTION:
+ *     This routine returns the received data to the caller. There is no
+ *     data copying during routine operation. All information is returned
+ *     using pointer to packet information struct passed from the caller.
+ *     If the routine exhausts Rx ring resources then the resource error flag
+ *     is set.
  *
- * Input :     pointer to ethernet interface network device structure
- * Output :    N/A
- */
-static void mv643xx_eth_update_mac_address(struct net_device *dev)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
-       unsigned int port_num = mp->port_num;
-
-       eth_port_init_mac_tables(port_num);
-       eth_port_uc_addr_set(port_num, dev->dev_addr);
-}
-
-/*
- * mv643xx_eth_set_rx_mode
+ * INPUT:
+ *     struct mv643xx_private  *mp             Ethernet Port Control srtuct.
+ *     struct pkt_info         *p_pkt_info     User packet buffer.
  *
- * Change from promiscuos to regular rx mode
+ * OUTPUT:
+ *     Rx ring current and used indexes are updated.
  *
- * Input :     pointer to ethernet interface network device structure
- * Output :    N/A
+ * RETURN:
+ *     ETH_ERROR in case the routine can not access Rx desc ring.
+ *     ETH_QUEUE_FULL if Rx ring resources are exhausted.
+ *     ETH_END_OF_JOB if there is no received data.
+ *     ETH_OK otherwise.
  */
-static void mv643xx_eth_set_rx_mode(struct net_device *dev)
+static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
+                                               struct pkt_info *p_pkt_info)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-       u32 config_reg;
+       int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
+       volatile struct eth_rx_desc *p_rx_desc;
+       unsigned int command_status;
+       unsigned long flags;
 
-       config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_REG(mp->port_num));
-       if (dev->flags & IFF_PROMISC)
-               config_reg |= (u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
-       else
-               config_reg &= ~(u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
-       mv_write(MV643XX_ETH_PORT_CONFIG_REG(mp->port_num), config_reg);
+       /* Do not process Rx ring in case of Rx ring resource error */
+       if (mp->rx_resource_err)
+               return ETH_QUEUE_FULL;
 
-       eth_port_set_multicast_list(dev);
-}
+       spin_lock_irqsave(&mp->lock, flags);
 
-/*
- * mv643xx_eth_set_mac_address
- *
- * Change the interface's mac address.
- * No special hardware thing should be done because interface is always
- * put in promiscuous mode.
- *
- * Input :     pointer to ethernet interface network device structure and
- *             a pointer to the designated entry to be added to the cache.
- * Output :    zero upon success, negative upon failure
- */
-static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
-{
-       int i;
+       /* Get the Rx Desc ring 'curr and 'used' indexes */
+       rx_curr_desc = mp->rx_curr_desc_q;
+       rx_used_desc = mp->rx_used_desc_q;
 
-       for (i = 0; i < 6; i++)
-               /* +2 is for the offset of the HW addr type */
-               dev->dev_addr[i] = ((unsigned char *)addr)[i + 2];
-       mv643xx_eth_update_mac_address(dev);
-       return 0;
-}
+       p_rx_desc = &mp->p_rx_desc_area[rx_curr_desc];
 
-/*
- * mv643xx_eth_tx_timeout
- *
- * Called upon a timeout on transmitting a packet
- *
- * Input :     pointer to ethernet interface network device structure.
- * Output :    N/A
- */
-static void mv643xx_eth_tx_timeout(struct net_device *dev)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
-
-       printk(KERN_INFO "%s: TX timeout  ", dev->name);
-
-       /* Do the reset outside of interrupt context */
-       schedule_work(&mp->tx_timeout_task);
-}
-
-/*
- * mv643xx_eth_tx_timeout_task
- *
- * Actual routine to reset the adapter when a timeout on Tx has occurred
- */
-static void mv643xx_eth_tx_timeout_task(struct net_device *dev)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
-
-       if (!netif_running(dev))
-               return;
-
-       netif_stop_queue(dev);
-
-       eth_port_reset(mp->port_num);
-       eth_port_start(dev);
-
-       if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
-               netif_wake_queue(dev);
-}
-
-/**
- * mv643xx_eth_free_tx_descs - Free the tx desc data for completed descriptors
- *
- * If force is non-zero, frees uncompleted descriptors as well
- */
-int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
-       struct eth_tx_desc *desc;
-       u32 cmd_sts;
-       struct sk_buff *skb;
-       unsigned long flags;
-       int tx_index;
-       dma_addr_t addr;
-       int count;
-       int released = 0;
-
-       while (mp->tx_desc_count > 0) {
-               spin_lock_irqsave(&mp->lock, flags);
-               tx_index = mp->tx_used_desc_q;
-               desc = &mp->p_tx_desc_area[tx_index];
-               cmd_sts = desc->cmd_sts;
-
-               if (!force && (cmd_sts & ETH_BUFFER_OWNED_BY_DMA)) {
-                       spin_unlock_irqrestore(&mp->lock, flags);
-                       return released;
-               }
-
-               mp->tx_used_desc_q = (tx_index + 1) % mp->tx_ring_size;
-               mp->tx_desc_count--;
-
-               addr = desc->buf_ptr;
-               count = desc->byte_cnt;
-               skb = mp->tx_skb[tx_index];
-               if (skb)
-                       mp->tx_skb[tx_index] = NULL;
+       /* The following parameters are used to save readings from memory */
+       command_status = p_rx_desc->cmd_sts;
+       rmb();
 
+       /* Nothing to receive... */
+       if (command_status & (ETH_BUFFER_OWNED_BY_DMA)) {
                spin_unlock_irqrestore(&mp->lock, flags);
+               return ETH_END_OF_JOB;
+       }
 
-               if (cmd_sts & ETH_ERROR_SUMMARY) {
-                       printk("%s: Error in TX\n", dev->name);
-                       mp->stats.tx_errors++;
-               }
-
-               if (cmd_sts & ETH_TX_FIRST_DESC)
-                       dma_unmap_single(NULL, addr, count, DMA_TO_DEVICE);
-               else
-                       dma_unmap_page(NULL, addr, count, DMA_TO_DEVICE);
-
-               if (skb)
-                       dev_kfree_skb_irq(skb);
+       p_pkt_info->byte_cnt = p_rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
+       p_pkt_info->cmd_sts = command_status;
+       p_pkt_info->buf_ptr = p_rx_desc->buf_ptr + ETH_HW_IP_ALIGN;
+       p_pkt_info->return_info = mp->rx_skb[rx_curr_desc];
+       p_pkt_info->l4i_chk = p_rx_desc->buf_size;
 
-               released = 1;
-       }
+       /*
+        * Clean the return info field to indicate that the
+        * packet has been moved to the upper layers
+        */
+       mp->rx_skb[rx_curr_desc] = NULL;
 
-       return released;
-}
+       /* Update current index in data structure */
+       rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
+       mp->rx_curr_desc_q = rx_next_curr_desc;
 
-static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
+       /* Rx descriptors exhausted. Set the Rx ring resource error flag */
+       if (rx_next_curr_desc == rx_used_desc)
+               mp->rx_resource_err = 1;
 
-       if (mv643xx_eth_free_tx_descs(dev, 0) &&
-           mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
-               netif_wake_queue(dev);
-}
+       spin_unlock_irqrestore(&mp->lock, flags);
 
-static void mv643xx_eth_free_all_tx_descs(struct net_device *dev)
-{
-       mv643xx_eth_free_tx_descs(dev, 1);
+       return ETH_OK;
 }
 
 /*
@@ -379,7 +680,7 @@ static void mv643xx_eth_free_all_tx_descs(struct net_device *dev)
 static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
 {
        struct mv643xx_private *mp = netdev_priv(dev);
-       struct net_device_stats *stats = &mp->stats;
+       struct net_device_stats *stats = &dev->stats;
        unsigned int received_packets = 0;
        struct sk_buff *skb;
        struct pkt_info pkt_info;
@@ -425,7 +726,6 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
                         * received packet
                         */
                        skb_put(skb, pkt_info.byte_cnt - 4);
-                       skb->dev = dev;
 
                        if (pkt_info.cmd_sts & ETH_LAYER_4_CHECKSUM_OK) {
                                skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -446,1284 +746,1270 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
        return received_packets;
 }
 
-/* Set the mv643xx port configuration register for the speed/duplex mode. */
-static void mv643xx_eth_update_pscr(struct net_device *dev,
-                                   struct ethtool_cmd *ecmd)
+#ifdef MV643XX_NAPI
+/*
+ * mv643xx_poll
+ *
+ * This function is used in case of NAPI
+ */
+static int mv643xx_poll(struct napi_struct *napi, int budget)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-       int port_num = mp->port_num;
-       u32 o_pscr, n_pscr;
-       unsigned int queues;
-
-       o_pscr = mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num));
-       n_pscr = o_pscr;
+       struct mv643xx_private *mp = container_of(napi, struct mv643xx_private, napi);
+       struct net_device *dev = mp->dev;
+       unsigned int port_num = mp->port_num;
+       int work_done;
 
-       /* clear speed, duplex and rx buffer size fields */
-       n_pscr &= ~(MV643XX_ETH_SET_MII_SPEED_TO_100  |
-                  MV643XX_ETH_SET_GMII_SPEED_TO_1000 |
-                  MV643XX_ETH_SET_FULL_DUPLEX_MODE   |
-                  MV643XX_ETH_MAX_RX_PACKET_MASK);
+#ifdef MV643XX_TX_FAST_REFILL
+       if (++mp->tx_clean_threshold > 5) {
+               mv643xx_eth_free_completed_tx_descs(dev);
+               mp->tx_clean_threshold = 0;
+       }
+#endif
 
-       if (ecmd->duplex == DUPLEX_FULL)
-               n_pscr |= MV643XX_ETH_SET_FULL_DUPLEX_MODE;
+       work_done = 0;
+       if ((rdl(mp, RXQ_CURRENT_DESC_PTR(port_num)))
+           != (u32) mp->rx_used_desc_q)
+               work_done = mv643xx_eth_receive_queue(dev, budget);
 
-       if (ecmd->speed == SPEED_1000)
-               n_pscr |= MV643XX_ETH_SET_GMII_SPEED_TO_1000 |
-                         MV643XX_ETH_MAX_RX_PACKET_9700BYTE;
-       else {
-               if (ecmd->speed == SPEED_100)
-                       n_pscr |= MV643XX_ETH_SET_MII_SPEED_TO_100;
-               n_pscr |= MV643XX_ETH_MAX_RX_PACKET_1522BYTE;
+       if (work_done < budget) {
+               netif_rx_complete(dev, napi);
+               wrl(mp, INT_CAUSE(port_num), 0);
+               wrl(mp, INT_CAUSE_EXT(port_num), 0);
+               wrl(mp, INT_MASK(port_num), INT_RX | INT_EXT);
        }
 
-       if (n_pscr != o_pscr) {
-               if ((o_pscr & MV643XX_ETH_SERIAL_PORT_ENABLE) == 0)
-                       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
-                                                               n_pscr);
-               else {
-                       queues = mv643xx_eth_port_disable_tx(port_num);
-
-                       o_pscr &= ~MV643XX_ETH_SERIAL_PORT_ENABLE;
-                       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
-                                                               o_pscr);
-                       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
-                                                               n_pscr);
-                       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
-                                                               n_pscr);
-                       if (queues)
-                               mv643xx_eth_port_enable_tx(port_num, queues);
-               }
-       }
+       return work_done;
 }
+#endif
 
-/*
- * mv643xx_eth_int_handler
- *
- * Main interrupt handler for the gigbit ethernet ports
+
+/* tx ***********************************************************************/
+/**
+ * has_tiny_unaligned_frags - check if skb has any small, unaligned fragments
  *
- * Input :     irq     - irq number (not used)
- *             dev_id  - a pointer to the required interface's data structure
- *             regs    - not used
- * Output :    N/A
+ * Hardware can't handle unaligned fragments smaller than 9 bytes.
+ * This helper function detects that case.
  */
 
-static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id,
-                                               struct pt_regs *regs)
+static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
 {
-       struct net_device *dev = (struct net_device *)dev_id;
-       struct mv643xx_private *mp = netdev_priv(dev);
-       u32 eth_int_cause, eth_int_cause_ext = 0;
-       unsigned int port_num = mp->port_num;
+       unsigned int frag;
+       skb_frag_t *fragp;
 
-       /* Read interrupt cause registers */
-       eth_int_cause = mv_read(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num)) &
-                                               ETH_INT_UNMASK_ALL;
-       if (eth_int_cause & ETH_INT_CAUSE_EXT) {
-               eth_int_cause_ext = mv_read(
-                       MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
-                                               ETH_INT_UNMASK_ALL_EXT;
-               mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num),
-                                                       ~eth_int_cause_ext);
+       for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
+               fragp = &skb_shinfo(skb)->frags[frag];
+               if (fragp->size <= 8 && fragp->page_offset & 0x7)
+                       return 1;
        }
+       return 0;
+}
 
-       /* PHY status changed */
-       if (eth_int_cause_ext & ETH_INT_CAUSE_PHY) {
-               struct ethtool_cmd cmd;
-
-               if (mii_link_ok(&mp->mii)) {
-                       mii_ethtool_gset(&mp->mii, &cmd);
-                       mv643xx_eth_update_pscr(dev, &cmd);
-                       mv643xx_eth_port_enable_tx(port_num,
-                                                  ETH_TX_QUEUES_ENABLED);
-                       if (!netif_carrier_ok(dev)) {
-                               netif_carrier_on(dev);
-                               if (mp->tx_ring_size - mp->tx_desc_count >=
-                                                       MAX_DESCS_PER_SKB)
-                                       netif_wake_queue(dev);
-                       }
-               } else if (netif_carrier_ok(dev)) {
-                       netif_stop_queue(dev);
-                       netif_carrier_off(dev);
-               }
-       }
+/**
+ * eth_alloc_tx_desc_index - return the index of the next available tx desc
+ */
+static int eth_alloc_tx_desc_index(struct mv643xx_private *mp)
+{
+       int tx_desc_curr;
 
-#ifdef MV643XX_NAPI
-       if (eth_int_cause & ETH_INT_CAUSE_RX) {
-               /* schedule the NAPI poll routine to maintain port */
-               mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
-                                                       ETH_INT_MASK_ALL);
-               /* wait for previous write to complete */
-               mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
+       BUG_ON(mp->tx_desc_count >= mp->tx_ring_size);
 
-               netif_rx_schedule(dev);
-       }
-#else
-       if (eth_int_cause & ETH_INT_CAUSE_RX)
-               mv643xx_eth_receive_queue(dev, INT_MAX);
-#endif
-       if (eth_int_cause_ext & ETH_INT_CAUSE_TX)
-               mv643xx_eth_free_completed_tx_descs(dev);
+       tx_desc_curr = mp->tx_curr_desc_q;
+       mp->tx_curr_desc_q = (tx_desc_curr + 1) % mp->tx_ring_size;
 
-       /*
-        * If no real interrupt occured, exit.
-        * This can happen when using gigE interrupt coalescing mechanism.
-        */
-       if ((eth_int_cause == 0x0) && (eth_int_cause_ext == 0x0))
-               return IRQ_NONE;
+       BUG_ON(mp->tx_curr_desc_q == mp->tx_used_desc_q);
 
-       return IRQ_HANDLED;
+       return tx_desc_curr;
 }
 
-#ifdef MV643XX_COAL
-
-/*
- * eth_port_set_rx_coal - Sets coalescing interrupt mechanism on RX path
- *
- * DESCRIPTION:
- *     This routine sets the RX coalescing interrupt mechanism parameter.
- *     This parameter is a timeout counter, that counts in 64 t_clk
- *     chunks ; that when timeout event occurs a maskable interrupt
- *     occurs.
- *     The parameter is calculated using the tClk of the MV-643xx chip
- *     , and the required delay of the interrupt in usec.
- *
- * INPUT:
- *     unsigned int eth_port_num       Ethernet port number
- *     unsigned int t_clk              t_clk of the MV-643xx chip in HZ units
- *     unsigned int delay              Delay in usec
- *
- * OUTPUT:
- *     Interrupt coalescing mechanism value is set in MV-643xx chip.
- *
- * RETURN:
- *     The interrupt coalescing value set in the gigE port.
+/**
+ * eth_tx_fill_frag_descs - fill tx hw descriptors for an skb's fragments.
  *
+ * Ensure the data for each fragment to be transmitted is mapped properly,
+ * then fill in descriptors in the tx hw queue.
  */
-static unsigned int eth_port_set_rx_coal(unsigned int eth_port_num,
-                                       unsigned int t_clk, unsigned int delay)
+static void eth_tx_fill_frag_descs(struct mv643xx_private *mp,
+                                  struct sk_buff *skb)
 {
-       unsigned int coal = ((t_clk / 1000000) * delay) / 64;
+       int frag;
+       int tx_index;
+       struct eth_tx_desc *desc;
 
-       /* Set RX Coalescing mechanism */
-       mv_write(MV643XX_ETH_SDMA_CONFIG_REG(eth_port_num),
-               ((coal & 0x3fff) << 8) |
-               (mv_read(MV643XX_ETH_SDMA_CONFIG_REG(eth_port_num))
-                       & 0xffc000ff));
+       for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
+               skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
 
-       return coal;
-}
-#endif
+               tx_index = eth_alloc_tx_desc_index(mp);
+               desc = &mp->p_tx_desc_area[tx_index];
 
-/*
- * eth_port_set_tx_coal - Sets coalescing interrupt mechanism on TX path
- *
+               desc->cmd_sts = ETH_BUFFER_OWNED_BY_DMA;
+               /* Last Frag enables interrupt and frees the skb */
+               if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
+                       desc->cmd_sts |= ETH_ZERO_PADDING |
+                                        ETH_TX_LAST_DESC |
+                                        ETH_TX_ENABLE_INTERRUPT;
+                       mp->tx_skb[tx_index] = skb;
+               } else
+                       mp->tx_skb[tx_index] = NULL;
+
+               desc = &mp->p_tx_desc_area[tx_index];
+               desc->l4i_chk = 0;
+               desc->byte_cnt = this_frag->size;
+               desc->buf_ptr = dma_map_page(NULL, this_frag->page,
+                                               this_frag->page_offset,
+                                               this_frag->size,
+                                               DMA_TO_DEVICE);
+       }
+}
+
+static inline __be16 sum16_as_be(__sum16 sum)
+{
+       return (__force __be16)sum;
+}
+
+/**
+ * eth_tx_submit_descs_for_skb - submit data from an skb to the tx hw
+ *
+ * Ensure the data for an skb to be transmitted is mapped properly,
+ * then fill in descriptors in the tx hw queue and start the hardware.
+ */
+static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
+                                       struct sk_buff *skb)
+{
+       int tx_index;
+       struct eth_tx_desc *desc;
+       u32 cmd_sts;
+       int length;
+       int nr_frags = skb_shinfo(skb)->nr_frags;
+
+       cmd_sts = ETH_TX_FIRST_DESC | ETH_GEN_CRC | ETH_BUFFER_OWNED_BY_DMA;
+
+       tx_index = eth_alloc_tx_desc_index(mp);
+       desc = &mp->p_tx_desc_area[tx_index];
+
+       if (nr_frags) {
+               eth_tx_fill_frag_descs(mp, skb);
+
+               length = skb_headlen(skb);
+               mp->tx_skb[tx_index] = NULL;
+       } else {
+               cmd_sts |= ETH_ZERO_PADDING |
+                          ETH_TX_LAST_DESC |
+                          ETH_TX_ENABLE_INTERRUPT;
+               length = skb->len;
+               mp->tx_skb[tx_index] = skb;
+       }
+
+       desc->byte_cnt = length;
+       desc->buf_ptr = dma_map_single(NULL, skb->data, length, DMA_TO_DEVICE);
+
+       if (skb->ip_summed == CHECKSUM_PARTIAL) {
+               BUG_ON(skb->protocol != htons(ETH_P_IP));
+
+               cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
+                          ETH_GEN_IP_V_4_CHECKSUM  |
+                          ip_hdr(skb)->ihl << ETH_TX_IHL_SHIFT;
+
+               switch (ip_hdr(skb)->protocol) {
+               case IPPROTO_UDP:
+                       cmd_sts |= ETH_UDP_FRAME;
+                       desc->l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)->check));
+                       break;
+               case IPPROTO_TCP:
+                       desc->l4i_chk = ntohs(sum16_as_be(tcp_hdr(skb)->check));
+                       break;
+               default:
+                       BUG();
+               }
+       } else {
+               /* Errata BTS #50, IHL must be 5 if no HW checksum */
+               cmd_sts |= 5 << ETH_TX_IHL_SHIFT;
+               desc->l4i_chk = 0;
+       }
+
+       /* ensure all other descriptors are written before first cmd_sts */
+       wmb();
+       desc->cmd_sts = cmd_sts;
+
+       /* ensure all descriptors are written before poking hardware */
+       wmb();
+       mv643xx_eth_port_enable_tx(mp, 1);
+
+       mp->tx_desc_count += nr_frags + 1;
+}
+
+/**
+ * mv643xx_eth_start_xmit - queue an skb to the hardware for transmission
+ *
+ */
+static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
+       struct net_device_stats *stats = &dev->stats;
+       unsigned long flags;
+
+       BUG_ON(netif_queue_stopped(dev));
+
+       if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {
+               stats->tx_dropped++;
+               printk(KERN_DEBUG "%s: failed to linearize tiny "
+                               "unaligned fragment\n", dev->name);
+               return NETDEV_TX_BUSY;
+       }
+
+       spin_lock_irqsave(&mp->lock, flags);
+
+       if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
+               printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
+               netif_stop_queue(dev);
+               spin_unlock_irqrestore(&mp->lock, flags);
+               return NETDEV_TX_BUSY;
+       }
+
+       eth_tx_submit_descs_for_skb(mp, skb);
+       stats->tx_bytes += skb->len;
+       stats->tx_packets++;
+       dev->trans_start = jiffies;
+
+       if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB)
+               netif_stop_queue(dev);
+
+       spin_unlock_irqrestore(&mp->lock, flags);
+
+       return NETDEV_TX_OK;
+}
+
+
+/* mii management interface *************************************************/
+static int ethernet_phy_get(struct mv643xx_private *mp);
+
+/*
+ * eth_port_read_smi_reg - Read PHY registers
+ *
  * DESCRIPTION:
- *     This routine sets the TX coalescing interrupt mechanism parameter.
- *     This parameter is a timeout counter, that counts in 64 t_clk
- *     chunks ; that when timeout event occurs a maskable interrupt
- *     occurs.
- *     The parameter is calculated using the t_cLK frequency of the
- *     MV-643xx chip and the required delay in the interrupt in uSec
+ *     This routine utilize the SMI interface to interact with the PHY in
+ *     order to perform PHY register read.
  *
  * INPUT:
- *     unsigned int eth_port_num       Ethernet port number
- *     unsigned int t_clk              t_clk of the MV-643xx chip in HZ units
- *     unsigned int delay              Delay in uSeconds
+ *     struct mv643xx_private *mp      Ethernet Port.
+ *     unsigned int    phy_reg         PHY register address offset.
+ *     unsigned int    *value          Register value buffer.
  *
  * OUTPUT:
- *     Interrupt coalescing mechanism value is set in MV-643xx chip.
+ *     Write the value of a specified PHY register into given buffer.
  *
  * RETURN:
- *     The interrupt coalescing value set in the gigE port.
+ *     false if the PHY is busy or read data is not in valid state.
+ *     true otherwise.
  *
  */
-static unsigned int eth_port_set_tx_coal(unsigned int eth_port_num,
-                                       unsigned int t_clk, unsigned int delay)
+static void eth_port_read_smi_reg(struct mv643xx_private *mp,
+                               unsigned int phy_reg, unsigned int *value)
 {
-       unsigned int coal;
-       coal = ((t_clk / 1000000) * delay) / 64;
-       /* Set TX Coalescing mechanism */
-       mv_write(MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(eth_port_num),
-                                                               coal << 4);
-       return coal;
+       void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
+       int phy_addr = ethernet_phy_get(mp);
+       unsigned long flags;
+       int i;
+
+       /* the SMI register is a shared resource */
+       spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
+
+       /* wait for the SMI register to become available */
+       for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
+               if (i == 1000) {
+                       printk("%s: PHY busy timeout\n", mp->dev->name);
+                       goto out;
+               }
+               udelay(10);
+       }
+
+       writel((phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ,
+               smi_reg);
+
+       /* now wait for the data to be valid */
+       for (i = 0; !(readl(smi_reg) & ETH_SMI_READ_VALID); i++) {
+               if (i == 1000) {
+                       printk("%s: PHY read timeout\n", mp->dev->name);
+                       goto out;
+               }
+               udelay(10);
+       }
+
+       *value = readl(smi_reg) & 0xffff;
+out:
+       spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
 }
 
 /*
- * ether_init_rx_desc_ring - Curve a Rx chain desc list and buffer in memory.
+ * eth_port_write_smi_reg - Write to PHY registers
  *
  * DESCRIPTION:
- *     This function prepares a Rx chained list of descriptors and packet
- *     buffers in a form of a ring. The routine must be called after port
- *     initialization routine and before port start routine.
- *     The Ethernet SDMA engine uses CPU bus addresses to access the various
- *     devices in the system (i.e. DRAM). This function uses the ethernet
- *     struct 'virtual to physical' routine (set by the user) to set the ring
- *     with physical addresses.
+ *     This routine utilize the SMI interface to interact with the PHY in
+ *     order to perform writes to PHY registers.
  *
  * INPUT:
- *     struct mv643xx_private *mp      Ethernet Port Control srtuct.
+ *     struct mv643xx_private *mp      Ethernet Port.
+ *     unsigned int    phy_reg         PHY register address offset.
+ *     unsigned int    value           Register value.
  *
  * OUTPUT:
- *     The routine updates the Ethernet port control struct with information
- *     regarding the Rx descriptors and buffers.
+ *     Write the given value to the specified PHY register.
  *
  * RETURN:
- *     None.
+ *     false if the PHY is busy.
+ *     true otherwise.
+ *
  */
-static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
+static void eth_port_write_smi_reg(struct mv643xx_private *mp,
+                                  unsigned int phy_reg, unsigned int value)
 {
-       volatile struct eth_rx_desc *p_rx_desc;
-       int rx_desc_num = mp->rx_ring_size;
+       void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
+       int phy_addr = ethernet_phy_get(mp);
+       unsigned long flags;
        int i;
 
-       /* initialize the next_desc_ptr links in the Rx descriptors ring */
-       p_rx_desc = (struct eth_rx_desc *)mp->p_rx_desc_area;
-       for (i = 0; i < rx_desc_num; i++) {
-               p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
-                       ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
-       }
+       /* the SMI register is a shared resource */
+       spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
 
-       /* Save Rx desc pointer to driver struct. */
-       mp->rx_curr_desc_q = 0;
-       mp->rx_used_desc_q = 0;
+       /* wait for the SMI register to become available */
+       for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
+               if (i == 1000) {
+                       printk("%s: PHY busy timeout\n", mp->dev->name);
+                       goto out;
+               }
+               udelay(10);
+       }
 
-       mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
+       writel((phy_addr << 16) | (phy_reg << 21) |
+               ETH_SMI_OPCODE_WRITE | (value & 0xffff), smi_reg);
+out:
+       spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
 }
 
+
+/* mib counters *************************************************************/
 /*
- * ether_init_tx_desc_ring - Curve a Tx chain desc list and buffer in memory.
+ * eth_clear_mib_counters - Clear all MIB counters
  *
  * DESCRIPTION:
- *     This function prepares a Tx chained list of descriptors and packet
- *     buffers in a form of a ring. The routine must be called after port
- *     initialization routine and before port start routine.
- *     The Ethernet SDMA engine uses CPU bus addresses to access the various
- *     devices in the system (i.e. DRAM). This function uses the ethernet
- *     struct 'virtual to physical' routine (set by the user) to set the ring
- *     with physical addresses.
+ *     This function clears all MIB counters of a specific ethernet port.
+ *     A read from the MIB counter will reset the counter.
  *
  * INPUT:
- *     struct mv643xx_private *mp      Ethernet Port Control srtuct.
+ *     struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
- *     The routine updates the Ethernet port control struct with information
- *     regarding the Tx descriptors and buffers.
+ *     After reading all MIB counters, the counters resets.
  *
  * RETURN:
- *     None.
+ *     MIB counter value.
+ *
  */
-static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
+static void eth_clear_mib_counters(struct mv643xx_private *mp)
 {
-       int tx_desc_num = mp->tx_ring_size;
-       struct eth_tx_desc *p_tx_desc;
+       unsigned int port_num = mp->port_num;
        int i;
 
-       /* Initialize the next_desc_ptr links in the Tx descriptors ring */
-       p_tx_desc = (struct eth_tx_desc *)mp->p_tx_desc_area;
-       for (i = 0; i < tx_desc_num; i++) {
-               p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
-                       ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
-       }
-
-       mp->tx_curr_desc_q = 0;
-       mp->tx_used_desc_q = 0;
-
-       mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
+       /* Perform dummy reads from MIB counters */
+       for (i = 0; i < 0x80; i += 4)
+               rdl(mp, MIB_COUNTERS(port_num) + i);
 }
 
-static int mv643xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static inline u32 read_mib(struct mv643xx_private *mp, int offset)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-       int err;
-
-       spin_lock_irq(&mp->lock);
-       err = mii_ethtool_sset(&mp->mii, cmd);
-       spin_unlock_irq(&mp->lock);
-
-       return err;
+       return rdl(mp, MIB_COUNTERS(mp->port_num) + offset);
 }
 
-static int mv643xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static void eth_update_mib_counters(struct mv643xx_private *mp)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-       int err;
-
-       spin_lock_irq(&mp->lock);
-       err = mii_ethtool_gset(&mp->mii, cmd);
-       spin_unlock_irq(&mp->lock);
+       struct mv643xx_mib_counters *p = &mp->mib_counters;
 
-       /* The PHY may support 1000baseT_Half, but the mv643xx does not */
-       cmd->supported &= ~SUPPORTED_1000baseT_Half;
-       cmd->advertising &= ~ADVERTISED_1000baseT_Half;
+       p->good_octets_received += read_mib(mp, 0x00);
+       p->good_octets_received += (u64)read_mib(mp, 0x04) << 32;
+       p->bad_octets_received += read_mib(mp, 0x08);
+       p->internal_mac_transmit_err += read_mib(mp, 0x0c);
+       p->good_frames_received += read_mib(mp, 0x10);
+       p->bad_frames_received += read_mib(mp, 0x14);
+       p->broadcast_frames_received += read_mib(mp, 0x18);
+       p->multicast_frames_received += read_mib(mp, 0x1c);
+       p->frames_64_octets += read_mib(mp, 0x20);
+       p->frames_65_to_127_octets += read_mib(mp, 0x24);
+       p->frames_128_to_255_octets += read_mib(mp, 0x28);
+       p->frames_256_to_511_octets += read_mib(mp, 0x2c);
+       p->frames_512_to_1023_octets += read_mib(mp, 0x30);
+       p->frames_1024_to_max_octets += read_mib(mp, 0x34);
+       p->good_octets_sent += read_mib(mp, 0x38);
+       p->good_octets_sent += (u64)read_mib(mp, 0x3c) << 32;
+       p->good_frames_sent += read_mib(mp, 0x40);
+       p->excessive_collision += read_mib(mp, 0x44);
+       p->multicast_frames_sent += read_mib(mp, 0x48);
+       p->broadcast_frames_sent += read_mib(mp, 0x4c);
+       p->unrec_mac_control_received += read_mib(mp, 0x50);
+       p->fc_sent += read_mib(mp, 0x54);
+       p->good_fc_received += read_mib(mp, 0x58);
+       p->bad_fc_received += read_mib(mp, 0x5c);
+       p->undersize_received += read_mib(mp, 0x60);
+       p->fragments_received += read_mib(mp, 0x64);
+       p->oversize_received += read_mib(mp, 0x68);
+       p->jabber_received += read_mib(mp, 0x6c);
+       p->mac_receive_error += read_mib(mp, 0x70);
+       p->bad_crc_event += read_mib(mp, 0x74);
+       p->collision += read_mib(mp, 0x78);
+       p->late_collision += read_mib(mp, 0x7c);
+}
+
+
+/* ethtool ******************************************************************/
+struct mv643xx_stats {
+       char stat_string[ETH_GSTRING_LEN];
+       int sizeof_stat;
+       int stat_offset;
+};
 
-       return err;
-}
+#define MV643XX_STAT(m) FIELD_SIZEOF(struct mv643xx_private, m), \
+                                       offsetof(struct mv643xx_private, m)
 
-/*
- * mv643xx_eth_open
- *
- * This function is called when openning the network device. The function
- * should initialize all the hardware, initialize cyclic Rx/Tx
- * descriptors chain and buffers and allocate an IRQ to the network
- * device.
- *
- * Input :     a pointer to the network device structure
- *
- * Output :    zero of success , nonzero if fails.
- */
+static const struct mv643xx_stats mv643xx_gstrings_stats[] = {
+       { "rx_packets", MV643XX_STAT(stats.rx_packets) },
+       { "tx_packets", MV643XX_STAT(stats.tx_packets) },
+       { "rx_bytes", MV643XX_STAT(stats.rx_bytes) },
+       { "tx_bytes", MV643XX_STAT(stats.tx_bytes) },
+       { "rx_errors", MV643XX_STAT(stats.rx_errors) },
+       { "tx_errors", MV643XX_STAT(stats.tx_errors) },
+       { "rx_dropped", MV643XX_STAT(stats.rx_dropped) },
+       { "tx_dropped", MV643XX_STAT(stats.tx_dropped) },
+       { "good_octets_received", MV643XX_STAT(mib_counters.good_octets_received) },
+       { "bad_octets_received", MV643XX_STAT(mib_counters.bad_octets_received) },
+       { "internal_mac_transmit_err", MV643XX_STAT(mib_counters.internal_mac_transmit_err) },
+       { "good_frames_received", MV643XX_STAT(mib_counters.good_frames_received) },
+       { "bad_frames_received", MV643XX_STAT(mib_counters.bad_frames_received) },
+       { "broadcast_frames_received", MV643XX_STAT(mib_counters.broadcast_frames_received) },
+       { "multicast_frames_received", MV643XX_STAT(mib_counters.multicast_frames_received) },
+       { "frames_64_octets", MV643XX_STAT(mib_counters.frames_64_octets) },
+       { "frames_65_to_127_octets", MV643XX_STAT(mib_counters.frames_65_to_127_octets) },
+       { "frames_128_to_255_octets", MV643XX_STAT(mib_counters.frames_128_to_255_octets) },
+       { "frames_256_to_511_octets", MV643XX_STAT(mib_counters.frames_256_to_511_octets) },
+       { "frames_512_to_1023_octets", MV643XX_STAT(mib_counters.frames_512_to_1023_octets) },
+       { "frames_1024_to_max_octets", MV643XX_STAT(mib_counters.frames_1024_to_max_octets) },
+       { "good_octets_sent", MV643XX_STAT(mib_counters.good_octets_sent) },
+       { "good_frames_sent", MV643XX_STAT(mib_counters.good_frames_sent) },
+       { "excessive_collision", MV643XX_STAT(mib_counters.excessive_collision) },
+       { "multicast_frames_sent", MV643XX_STAT(mib_counters.multicast_frames_sent) },
+       { "broadcast_frames_sent", MV643XX_STAT(mib_counters.broadcast_frames_sent) },
+       { "unrec_mac_control_received", MV643XX_STAT(mib_counters.unrec_mac_control_received) },
+       { "fc_sent", MV643XX_STAT(mib_counters.fc_sent) },
+       { "good_fc_received", MV643XX_STAT(mib_counters.good_fc_received) },
+       { "bad_fc_received", MV643XX_STAT(mib_counters.bad_fc_received) },
+       { "undersize_received", MV643XX_STAT(mib_counters.undersize_received) },
+       { "fragments_received", MV643XX_STAT(mib_counters.fragments_received) },
+       { "oversize_received", MV643XX_STAT(mib_counters.oversize_received) },
+       { "jabber_received", MV643XX_STAT(mib_counters.jabber_received) },
+       { "mac_receive_error", MV643XX_STAT(mib_counters.mac_receive_error) },
+       { "bad_crc_event", MV643XX_STAT(mib_counters.bad_crc_event) },
+       { "collision", MV643XX_STAT(mib_counters.collision) },
+       { "late_collision", MV643XX_STAT(mib_counters.late_collision) },
+};
 
-static int mv643xx_eth_open(struct net_device *dev)
+#define MV643XX_STATS_LEN      ARRAY_SIZE(mv643xx_gstrings_stats)
+
+static int mv643xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct mv643xx_private *mp = netdev_priv(dev);
-       unsigned int port_num = mp->port_num;
-       unsigned int size;
        int err;
 
-       err = request_irq(dev->irq, mv643xx_eth_int_handler,
-                       IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
-       if (err) {
-               printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
-                                                               port_num);
-               return -EAGAIN;
-       }
-
-       eth_port_init(mp);
-
-       memset(&mp->timeout, 0, sizeof(struct timer_list));
-       mp->timeout.function = mv643xx_eth_rx_refill_descs_timer_wrapper;
-       mp->timeout.data = (unsigned long)dev;
-
-       /* Allocate RX and TX skb rings */
-       mp->rx_skb = kmalloc(sizeof(*mp->rx_skb) * mp->rx_ring_size,
-                                                               GFP_KERNEL);
-       if (!mp->rx_skb) {
-               printk(KERN_ERR "%s: Cannot allocate Rx skb ring\n", dev->name);
-               err = -ENOMEM;
-               goto out_free_irq;
-       }
-       mp->tx_skb = kmalloc(sizeof(*mp->tx_skb) * mp->tx_ring_size,
-                                                               GFP_KERNEL);
-       if (!mp->tx_skb) {
-               printk(KERN_ERR "%s: Cannot allocate Tx skb ring\n", dev->name);
-               err = -ENOMEM;
-               goto out_free_rx_skb;
-       }
-
-       /* Allocate TX ring */
-       mp->tx_desc_count = 0;
-       size = mp->tx_ring_size * sizeof(struct eth_tx_desc);
-       mp->tx_desc_area_size = size;
-
-       if (mp->tx_sram_size) {
-               mp->p_tx_desc_area = ioremap(mp->tx_sram_addr,
-                                                       mp->tx_sram_size);
-               mp->tx_desc_dma = mp->tx_sram_addr;
-       } else
-               mp->p_tx_desc_area = dma_alloc_coherent(NULL, size,
-                                                       &mp->tx_desc_dma,
-                                                       GFP_KERNEL);
-
-       if (!mp->p_tx_desc_area) {
-               printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
-                                                       dev->name, size);
-               err = -ENOMEM;
-               goto out_free_tx_skb;
-       }
-       BUG_ON((u32) mp->p_tx_desc_area & 0xf); /* check 16-byte alignment */
-       memset((void *)mp->p_tx_desc_area, 0, mp->tx_desc_area_size);
-
-       ether_init_tx_desc_ring(mp);
-
-       /* Allocate RX ring */
-       mp->rx_desc_count = 0;
-       size = mp->rx_ring_size * sizeof(struct eth_rx_desc);
-       mp->rx_desc_area_size = size;
-
-       if (mp->rx_sram_size) {
-               mp->p_rx_desc_area = ioremap(mp->rx_sram_addr,
-                                                       mp->rx_sram_size);
-               mp->rx_desc_dma = mp->rx_sram_addr;
-       } else
-               mp->p_rx_desc_area = dma_alloc_coherent(NULL, size,
-                                                       &mp->rx_desc_dma,
-                                                       GFP_KERNEL);
-
-       if (!mp->p_rx_desc_area) {
-               printk(KERN_ERR "%s: Cannot allocate Rx ring (size %d bytes)\n",
-                                                       dev->name, size);
-               printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
-                                                       dev->name);
-               if (mp->rx_sram_size)
-                       iounmap(mp->p_tx_desc_area);
-               else
-                       dma_free_coherent(NULL, mp->tx_desc_area_size,
-                                       mp->p_tx_desc_area, mp->tx_desc_dma);
-               err = -ENOMEM;
-               goto out_free_tx_skb;
-       }
-       memset((void *)mp->p_rx_desc_area, 0, size);
-
-       ether_init_rx_desc_ring(mp);
-
-       mv643xx_eth_rx_refill_descs(dev);       /* Fill RX ring with skb's */
-
-       /* Clear any pending ethernet port interrupts */
-       mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
-       mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-
-       eth_port_start(dev);
+       spin_lock_irq(&mp->lock);
+       err = mii_ethtool_gset(&mp->mii, cmd);
+       spin_unlock_irq(&mp->lock);
 
-       /* Interrupt Coalescing */
+       /* The PHY may support 1000baseT_Half, but the mv643xx does not */
+       cmd->supported &= ~SUPPORTED_1000baseT_Half;
+       cmd->advertising &= ~ADVERTISED_1000baseT_Half;
 
-#ifdef MV643XX_COAL
-       mp->rx_int_coal =
-               eth_port_set_rx_coal(port_num, 133000000, MV643XX_RX_COAL);
-#endif
+       return err;
+}
 
-       mp->tx_int_coal =
-               eth_port_set_tx_coal(port_num, 133000000, MV643XX_TX_COAL);
+static int mv643xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
+       int err;
 
-       /* Unmask phy and link status changes interrupts */
-       mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
-                                               ETH_INT_UNMASK_ALL_EXT);
+       spin_lock_irq(&mp->lock);
+       err = mii_ethtool_sset(&mp->mii, cmd);
+       spin_unlock_irq(&mp->lock);
 
-       /* Unmask RX buffer and TX end interrupt */
-       mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+       return err;
+}
 
-       return 0;
+static void mv643xx_get_drvinfo(struct net_device *netdev,
+                               struct ethtool_drvinfo *drvinfo)
+{
+       strncpy(drvinfo->driver,  mv643xx_driver_name, 32);
+       strncpy(drvinfo->version, mv643xx_driver_version, 32);
+       strncpy(drvinfo->fw_version, "N/A", 32);
+       strncpy(drvinfo->bus_info, "mv643xx", 32);
+       drvinfo->n_stats = MV643XX_STATS_LEN;
+}
 
-out_free_tx_skb:
-       kfree(mp->tx_skb);
-out_free_rx_skb:
-       kfree(mp->rx_skb);
-out_free_irq:
-       free_irq(dev->irq, dev);
+static int mv643xx_eth_nway_restart(struct net_device *dev)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
 
-       return err;
+       return mii_nway_restart(&mp->mii);
 }
 
-static void mv643xx_eth_free_tx_rings(struct net_device *dev)
+static u32 mv643xx_eth_get_link(struct net_device *dev)
 {
        struct mv643xx_private *mp = netdev_priv(dev);
 
-       /* Stop Tx Queues */
-       mv643xx_eth_port_disable_tx(mp->port_num);
-
-       /* Free outstanding skb's on TX ring */
-       mv643xx_eth_free_all_tx_descs(dev);
+       return mii_link_ok(&mp->mii);
+}
 
-       BUG_ON(mp->tx_used_desc_q != mp->tx_curr_desc_q);
+static void mv643xx_get_strings(struct net_device *netdev, uint32_t stringset,
+                               uint8_t *data)
+{
+       int i;
 
-       /* Free TX ring */
-       if (mp->tx_sram_size)
-               iounmap(mp->p_tx_desc_area);
-       else
-               dma_free_coherent(NULL, mp->tx_desc_area_size,
-                               mp->p_tx_desc_area, mp->tx_desc_dma);
+       switch(stringset) {
+       case ETH_SS_STATS:
+               for (i=0; i < MV643XX_STATS_LEN; i++) {
+                       memcpy(data + i * ETH_GSTRING_LEN,
+                                       mv643xx_gstrings_stats[i].stat_string,
+                                       ETH_GSTRING_LEN);
+               }
+               break;
+       }
 }
 
-static void mv643xx_eth_free_rx_rings(struct net_device *dev)
+static void mv643xx_get_ethtool_stats(struct net_device *netdev,
+                               struct ethtool_stats *stats, uint64_t *data)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-       unsigned int port_num = mp->port_num;
-       int curr;
+       struct mv643xx_private *mp = netdev->priv;
+       int i;
 
-       /* Stop RX Queues */
-       mv643xx_eth_port_disable_rx(port_num);
+       eth_update_mib_counters(mp);
 
-       /* Free preallocated skb's on RX rings */
-       for (curr = 0; mp->rx_desc_count && curr < mp->rx_ring_size; curr++) {
-               if (mp->rx_skb[curr]) {
-                       dev_kfree_skb(mp->rx_skb[curr]);
-                       mp->rx_desc_count--;
-               }
+       for (i = 0; i < MV643XX_STATS_LEN; i++) {
+               char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
+               data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
+                       sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
        }
+}
 
-       if (mp->rx_desc_count)
-               printk(KERN_ERR
-                       "%s: Error in freeing Rx Ring. %d skb's still"
-                       " stuck in RX Ring - ignoring them\n", dev->name,
-                       mp->rx_desc_count);
-       /* Free RX ring */
-       if (mp->rx_sram_size)
-               iounmap(mp->p_rx_desc_area);
-       else
-               dma_free_coherent(NULL, mp->rx_desc_area_size,
-                               mp->p_rx_desc_area, mp->rx_desc_dma);
+static int mv643xx_get_sset_count(struct net_device *netdev, int sset)
+{
+       switch (sset) {
+       case ETH_SS_STATS:
+               return MV643XX_STATS_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
 }
 
+static const struct ethtool_ops mv643xx_ethtool_ops = {
+       .get_settings           = mv643xx_get_settings,
+       .set_settings           = mv643xx_set_settings,
+       .get_drvinfo            = mv643xx_get_drvinfo,
+       .get_link               = mv643xx_eth_get_link,
+       .set_sg                 = ethtool_op_set_sg,
+       .get_sset_count         = mv643xx_get_sset_count,
+       .get_ethtool_stats      = mv643xx_get_ethtool_stats,
+       .get_strings            = mv643xx_get_strings,
+       .nway_reset             = mv643xx_eth_nway_restart,
+};
+
+
+/* address handling *********************************************************/
 /*
- * mv643xx_eth_stop
- *
- * This function is used when closing the network device.
- * It updates the hardware,
- * release all memory that holds buffers and descriptors and release the IRQ.
- * Input :     a pointer to the device structure
- * Output :    zero if success , nonzero if fails
+ * eth_port_uc_addr_get - Read the MAC address from the port's hw registers
  */
-
-static int mv643xx_eth_stop(struct net_device *dev)
+static void eth_port_uc_addr_get(struct mv643xx_private *mp,
+                                unsigned char *p_addr)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
        unsigned int port_num = mp->port_num;
+       unsigned int mac_h;
+       unsigned int mac_l;
 
-       /* Mask all interrupts on ethernet port */
-       mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
-       /* wait for previous write to complete */
-       mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
-
-#ifdef MV643XX_NAPI
-       netif_poll_disable(dev);
-#endif
-       netif_carrier_off(dev);
-       netif_stop_queue(dev);
-
-       eth_port_reset(mp->port_num);
-
-       mv643xx_eth_free_tx_rings(dev);
-       mv643xx_eth_free_rx_rings(dev);
-
-#ifdef MV643XX_NAPI
-       netif_poll_enable(dev);
-#endif
-
-       free_irq(dev->irq, dev);
+       mac_h = rdl(mp, MAC_ADDR_HIGH(port_num));
+       mac_l = rdl(mp, MAC_ADDR_LOW(port_num));
 
-       return 0;
+       p_addr[0] = (mac_h >> 24) & 0xff;
+       p_addr[1] = (mac_h >> 16) & 0xff;
+       p_addr[2] = (mac_h >> 8) & 0xff;
+       p_addr[3] = mac_h & 0xff;
+       p_addr[4] = (mac_l >> 8) & 0xff;
+       p_addr[5] = mac_l & 0xff;
 }
 
-#ifdef MV643XX_NAPI
 /*
- * mv643xx_poll
+ * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
  *
- * This function is used in case of NAPI
+ * DESCRIPTION:
+ *     Go through all the DA filter tables (Unicast, Special Multicast &
+ *     Other Multicast) and set each entry to 0.
+ *
+ * INPUT:
+ *     struct mv643xx_private *mp      Ethernet Port.
+ *
+ * OUTPUT:
+ *     Multicast and Unicast packets are rejected.
+ *
+ * RETURN:
+ *     None.
  */
-static int mv643xx_poll(struct net_device *dev, int *budget)
+static void eth_port_init_mac_tables(struct mv643xx_private *mp)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-       int done = 1, orig_budget, work_done;
        unsigned int port_num = mp->port_num;
+       int table_index;
 
-#ifdef MV643XX_TX_FAST_REFILL
-       if (++mp->tx_clean_threshold > 5) {
-               mv643xx_eth_free_completed_tx_descs(dev);
-               mp->tx_clean_threshold = 0;
-       }
-#endif
-
-       if ((mv_read(MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port_num)))
-                                               != (u32) mp->rx_used_desc_q) {
-               orig_budget = *budget;
-               if (orig_budget > dev->quota)
-                       orig_budget = dev->quota;
-               work_done = mv643xx_eth_receive_queue(dev, orig_budget);
-               *budget -= work_done;
-               dev->quota -= work_done;
-               if (work_done >= orig_budget)
-                       done = 0;
-       }
+       /* Clear DA filter unicast table (Ex_dFUT) */
+       for (table_index = 0; table_index <= 0xC; table_index += 4)
+               wrl(mp, UNICAST_TABLE(port_num) + table_index, 0);
 
-       if (done) {
-               netif_rx_complete(dev);
-               mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
-               mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-               mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
-                                               ETH_INT_UNMASK_ALL);
+       for (table_index = 0; table_index <= 0xFC; table_index += 4) {
+               /* Clear DA filter special multicast table (Ex_dFSMT) */
+               wrl(mp, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
+               /* Clear DA filter other multicast table (Ex_dFOMT) */
+               wrl(mp, OTHER_MCAST_TABLE(port_num) + table_index, 0);
        }
-
-       return done ? 0 : 1;
 }
-#endif
 
-/**
- * has_tiny_unaligned_frags - check if skb has any small, unaligned fragments
- *
- * Hardware can't handle unaligned fragments smaller than 9 bytes.
- * This helper function detects that case.
+/*
+ * The entries in each table are indexed by a hash of a packet's MAC
+ * address.  One bit in each entry determines whether the packet is
+ * accepted.  There are 4 entries (each 8 bits wide) in each register
+ * of the table.  The bits in each entry are defined as follows:
+ *     0       Accept=1, Drop=0
+ *     3-1     Queue                   (ETH_Q0=0)
+ *     7-4     Reserved = 0;
  */
-
-static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
+static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
+                                           int table, unsigned char entry)
 {
-       unsigned int frag;
-       skb_frag_t *fragp;
+       unsigned int table_reg;
+       unsigned int tbl_offset;
+       unsigned int reg_offset;
 
-       for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
-               fragp = &skb_shinfo(skb)->frags[frag];
-               if (fragp->size <= 8 && fragp->page_offset & 0x7)
-                       return 1;
-       }
-       return 0;
+       tbl_offset = (entry / 4) * 4;   /* Register offset of DA table entry */
+       reg_offset = entry % 4;         /* Entry offset within the register */
+
+       /* Set "accepts frame bit" at specified table entry */
+       table_reg = rdl(mp, table + tbl_offset);
+       table_reg |= 0x01 << (8 * reg_offset);
+       wrl(mp, table + tbl_offset, table_reg);
 }
 
-/**
- * eth_alloc_tx_desc_index - return the index of the next available tx desc
+/*
+ * eth_port_uc_addr_set - Write a MAC address into the port's hw registers
  */
-static int eth_alloc_tx_desc_index(struct mv643xx_private *mp)
+static void eth_port_uc_addr_set(struct mv643xx_private *mp,
+                                unsigned char *p_addr)
 {
-       int tx_desc_curr;
+       unsigned int port_num = mp->port_num;
+       unsigned int mac_h;
+       unsigned int mac_l;
+       int table;
 
-       BUG_ON(mp->tx_desc_count >= mp->tx_ring_size);
+       mac_l = (p_addr[4] << 8) | (p_addr[5]);
+       mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
+                                                       (p_addr[3] << 0);
 
-       tx_desc_curr = mp->tx_curr_desc_q;
-       mp->tx_curr_desc_q = (tx_desc_curr + 1) % mp->tx_ring_size;
+       wrl(mp, MAC_ADDR_LOW(port_num), mac_l);
+       wrl(mp, MAC_ADDR_HIGH(port_num), mac_h);
 
-       BUG_ON(mp->tx_curr_desc_q == mp->tx_used_desc_q);
+       /* Accept frames with this address */
+       table = UNICAST_TABLE(port_num);
+       eth_port_set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
+}
 
-       return tx_desc_curr;
+/*
+ * mv643xx_eth_update_mac_address
+ *
+ * Update the MAC address of the port in the address table
+ *
+ * Input :     pointer to ethernet interface network device structure
+ * Output :    N/A
+ */
+static void mv643xx_eth_update_mac_address(struct net_device *dev)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
+
+       eth_port_init_mac_tables(mp);
+       eth_port_uc_addr_set(mp, dev->dev_addr);
 }
 
-/**
- * eth_tx_fill_frag_descs - fill tx hw descriptors for an skb's fragments.
+/*
+ * mv643xx_eth_set_mac_address
+ *
+ * Change the interface's mac address.
+ * No special hardware thing should be done because interface is always
+ * put in promiscuous mode.
  *
- * Ensure the data for each fragment to be transmitted is mapped properly,
- * then fill in descriptors in the tx hw queue.
+ * Input :     pointer to ethernet interface network device structure and
+ *             a pointer to the designated entry to be added to the cache.
+ * Output :    zero upon success, negative upon failure
  */
-static void eth_tx_fill_frag_descs(struct mv643xx_private *mp,
-                                  struct sk_buff *skb)
+static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
 {
-       int frag;
-       int tx_index;
-       struct eth_tx_desc *desc;
-
-       for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
-               skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
-
-               tx_index = eth_alloc_tx_desc_index(mp);
-               desc = &mp->p_tx_desc_area[tx_index];
-
-               desc->cmd_sts = ETH_BUFFER_OWNED_BY_DMA;
-               /* Last Frag enables interrupt and frees the skb */
-               if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
-                       desc->cmd_sts |= ETH_ZERO_PADDING |
-                                        ETH_TX_LAST_DESC |
-                                        ETH_TX_ENABLE_INTERRUPT;
-                       mp->tx_skb[tx_index] = skb;
-               } else
-                       mp->tx_skb[tx_index] = 0;
+       int i;
 
-               desc = &mp->p_tx_desc_area[tx_index];
-               desc->l4i_chk = 0;
-               desc->byte_cnt = this_frag->size;
-               desc->buf_ptr = dma_map_page(NULL, this_frag->page,
-                                               this_frag->page_offset,
-                                               this_frag->size,
-                                               DMA_TO_DEVICE);
-       }
+       for (i = 0; i < 6; i++)
+               /* +2 is for the offset of the HW addr type */
+               dev->dev_addr[i] = ((unsigned char *)addr)[i + 2];
+       mv643xx_eth_update_mac_address(dev);
+       return 0;
 }
 
-/**
- * eth_tx_submit_descs_for_skb - submit data from an skb to the tx hw
+/*
+ * eth_port_mc_addr - Multicast address settings.
  *
- * Ensure the data for an skb to be transmitted is mapped properly,
- * then fill in descriptors in the tx hw queue and start the hardware.
+ * The MV device supports multicast using two tables:
+ * 1) Special Multicast Table for MAC addresses of the form
+ *    0x01-00-5E-00-00-XX (where XX is between 0x00 and 0x_FF).
+ *    The MAC DA[7:0] bits are used as a pointer to the Special Multicast
+ *    Table entries in the DA-Filter table.
+ * 2) Other Multicast Table for multicast of another type. A CRC-8bit
+ *    is used as an index to the Other Multicast Table entries in the
+ *    DA-Filter table.  This function calculates the CRC-8bit value.
+ * In either case, eth_port_set_filter_table_entry() is then called
+ * to set to set the actual table entry.
  */
-static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
-                                       struct sk_buff *skb)
+static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
 {
-       int tx_index;
-       struct eth_tx_desc *desc;
-       u32 cmd_sts;
-       int length;
-       int nr_frags = skb_shinfo(skb)->nr_frags;
+       unsigned int port_num = mp->port_num;
+       unsigned int mac_h;
+       unsigned int mac_l;
+       unsigned char crc_result = 0;
+       int table;
+       int mac_array[48];
+       int crc[8];
+       int i;
 
-       cmd_sts = ETH_TX_FIRST_DESC | ETH_GEN_CRC | ETH_BUFFER_OWNED_BY_DMA;
+       if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
+           (p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
+               table = SPECIAL_MCAST_TABLE(port_num);
+               eth_port_set_filter_table_entry(mp, table, p_addr[5]);
+               return;
+       }
 
-       tx_index = eth_alloc_tx_desc_index(mp);
-       desc = &mp->p_tx_desc_area[tx_index];
+       /* Calculate CRC-8 out of the given address */
+       mac_h = (p_addr[0] << 8) | (p_addr[1]);
+       mac_l = (p_addr[2] << 24) | (p_addr[3] << 16) |
+                       (p_addr[4] << 8) | (p_addr[5] << 0);
 
-       if (nr_frags) {
-               eth_tx_fill_frag_descs(mp, skb);
+       for (i = 0; i < 32; i++)
+               mac_array[i] = (mac_l >> i) & 0x1;
+       for (i = 32; i < 48; i++)
+               mac_array[i] = (mac_h >> (i - 32)) & 0x1;
 
-               length = skb_headlen(skb);
-               mp->tx_skb[tx_index] = 0;
-       } else {
-               cmd_sts |= ETH_ZERO_PADDING |
-                          ETH_TX_LAST_DESC |
-                          ETH_TX_ENABLE_INTERRUPT;
-               length = skb->len;
-               mp->tx_skb[tx_index] = skb;
-       }
+       crc[0] = mac_array[45] ^ mac_array[43] ^ mac_array[40] ^ mac_array[39] ^
+                mac_array[35] ^ mac_array[34] ^ mac_array[31] ^ mac_array[30] ^
+                mac_array[28] ^ mac_array[23] ^ mac_array[21] ^ mac_array[19] ^
+                mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ mac_array[12] ^
+                mac_array[8]  ^ mac_array[7]  ^ mac_array[6]  ^ mac_array[0];
 
-       desc->byte_cnt = length;
-       desc->buf_ptr = dma_map_single(NULL, skb->data, length, DMA_TO_DEVICE);
+       crc[1] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
+                mac_array[41] ^ mac_array[39] ^ mac_array[36] ^ mac_array[34] ^
+                mac_array[32] ^ mac_array[30] ^ mac_array[29] ^ mac_array[28] ^
+                mac_array[24] ^ mac_array[23] ^ mac_array[22] ^ mac_array[21] ^
+                mac_array[20] ^ mac_array[18] ^ mac_array[17] ^ mac_array[16] ^
+                mac_array[15] ^ mac_array[14] ^ mac_array[13] ^ mac_array[12] ^
+                mac_array[9]  ^ mac_array[6]  ^ mac_array[1]  ^ mac_array[0];
 
-       if (skb->ip_summed == CHECKSUM_HW) {
-               BUG_ON(skb->protocol != ETH_P_IP);
+       crc[2] = mac_array[47] ^ mac_array[46] ^ mac_array[44] ^ mac_array[43] ^
+                mac_array[42] ^ mac_array[39] ^ mac_array[37] ^ mac_array[34] ^
+                mac_array[33] ^ mac_array[29] ^ mac_array[28] ^ mac_array[25] ^
+                mac_array[24] ^ mac_array[22] ^ mac_array[17] ^ mac_array[15] ^
+                mac_array[13] ^ mac_array[12] ^ mac_array[10] ^ mac_array[8]  ^
+                mac_array[6]  ^ mac_array[2]  ^ mac_array[1]  ^ mac_array[0];
 
-               cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
-                          ETH_GEN_IP_V_4_CHECKSUM  |
-                          skb->nh.iph->ihl << ETH_TX_IHL_SHIFT;
+       crc[3] = mac_array[47] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
+                mac_array[40] ^ mac_array[38] ^ mac_array[35] ^ mac_array[34] ^
+                mac_array[30] ^ mac_array[29] ^ mac_array[26] ^ mac_array[25] ^
+                mac_array[23] ^ mac_array[18] ^ mac_array[16] ^ mac_array[14] ^
+                mac_array[13] ^ mac_array[11] ^ mac_array[9]  ^ mac_array[7]  ^
+                mac_array[3]  ^ mac_array[2]  ^ mac_array[1];
 
-               switch (skb->nh.iph->protocol) {
-               case IPPROTO_UDP:
-                       cmd_sts |= ETH_UDP_FRAME;
-                       desc->l4i_chk = skb->h.uh->check;
-                       break;
-               case IPPROTO_TCP:
-                       desc->l4i_chk = skb->h.th->check;
-                       break;
-               default:
-                       BUG();
-               }
-       } else {
-               /* Errata BTS #50, IHL must be 5 if no HW checksum */
-               cmd_sts |= 5 << ETH_TX_IHL_SHIFT;
-               desc->l4i_chk = 0;
-       }
+       crc[4] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[41] ^
+                mac_array[39] ^ mac_array[36] ^ mac_array[35] ^ mac_array[31] ^
+                mac_array[30] ^ mac_array[27] ^ mac_array[26] ^ mac_array[24] ^
+                mac_array[19] ^ mac_array[17] ^ mac_array[15] ^ mac_array[14] ^
+                mac_array[12] ^ mac_array[10] ^ mac_array[8]  ^ mac_array[4]  ^
+                mac_array[3]  ^ mac_array[2];
 
-       /* ensure all other descriptors are written before first cmd_sts */
-       wmb();
-       desc->cmd_sts = cmd_sts;
+       crc[5] = mac_array[47] ^ mac_array[46] ^ mac_array[45] ^ mac_array[42] ^
+                mac_array[40] ^ mac_array[37] ^ mac_array[36] ^ mac_array[32] ^
+                mac_array[31] ^ mac_array[28] ^ mac_array[27] ^ mac_array[25] ^
+                mac_array[20] ^ mac_array[18] ^ mac_array[16] ^ mac_array[15] ^
+                mac_array[13] ^ mac_array[11] ^ mac_array[9]  ^ mac_array[5]  ^
+                mac_array[4]  ^ mac_array[3];
 
-       /* ensure all descriptors are written before poking hardware */
-       wmb();
-       mv643xx_eth_port_enable_tx(mp->port_num, ETH_TX_QUEUES_ENABLED);
+       crc[6] = mac_array[47] ^ mac_array[46] ^ mac_array[43] ^ mac_array[41] ^
+                mac_array[38] ^ mac_array[37] ^ mac_array[33] ^ mac_array[32] ^
+                mac_array[29] ^ mac_array[28] ^ mac_array[26] ^ mac_array[21] ^
+                mac_array[19] ^ mac_array[17] ^ mac_array[16] ^ mac_array[14] ^
+                mac_array[12] ^ mac_array[10] ^ mac_array[6]  ^ mac_array[5]  ^
+                mac_array[4];
 
-       mp->tx_desc_count += nr_frags + 1;
+       crc[7] = mac_array[47] ^ mac_array[44] ^ mac_array[42] ^ mac_array[39] ^
+                mac_array[38] ^ mac_array[34] ^ mac_array[33] ^ mac_array[30] ^
+                mac_array[29] ^ mac_array[27] ^ mac_array[22] ^ mac_array[20] ^
+                mac_array[18] ^ mac_array[17] ^ mac_array[15] ^ mac_array[13] ^
+                mac_array[11] ^ mac_array[7]  ^ mac_array[6]  ^ mac_array[5];
+
+       for (i = 0; i < 8; i++)
+               crc_result = crc_result | (crc[i] << i);
+
+       table = OTHER_MCAST_TABLE(port_num);
+       eth_port_set_filter_table_entry(mp, table, crc_result);
 }
 
-/**
- * mv643xx_eth_start_xmit - queue an skb to the hardware for transmission
- *
+/*
+ * Set the entire multicast list based on dev->mc_list.
  */
-static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static void eth_port_set_multicast_list(struct net_device *dev)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-       struct net_device_stats *stats = &mp->stats;
-       unsigned long flags;
 
-       BUG_ON(netif_queue_stopped(dev));
-       BUG_ON(skb == NULL);
+       struct dev_mc_list      *mc_list;
+       int                     i;
+       int                     table_index;
+       struct mv643xx_private  *mp = netdev_priv(dev);
+       unsigned int            eth_port_num = mp->port_num;
 
-       if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
-               printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
-               netif_stop_queue(dev);
-               return 1;
-       }
+       /* If the device is in promiscuous mode or in all multicast mode,
+        * we will fully populate both multicast tables with accept.
+        * This is guaranteed to yield a match on all multicast addresses...
+        */
+       if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI)) {
+               for (table_index = 0; table_index <= 0xFC; table_index += 4) {
+                       /* Set all entries in DA filter special multicast
+                        * table (Ex_dFSMT)
+                        * Set for ETH_Q0 for now
+                        * Bits
+                        * 0      Accept=1, Drop=0
+                        * 3-1  Queue    ETH_Q0=0
+                        * 7-4  Reserved = 0;
+                        */
+                       wrl(mp, SPECIAL_MCAST_TABLE(eth_port_num) + table_index, 0x01010101);
 
-       if (has_tiny_unaligned_frags(skb)) {
-               if (__skb_linearize(skb)) {
-                       stats->tx_dropped++;
-                       printk(KERN_DEBUG "%s: failed to linearize tiny "
-                                       "unaligned fragment\n", dev->name);
-                       return 1;
+                       /* Set all entries in DA filter other multicast
+                        * table (Ex_dFOMT)
+                        * Set for ETH_Q0 for now
+                        * Bits
+                        * 0      Accept=1, Drop=0
+                        * 3-1  Queue    ETH_Q0=0
+                        * 7-4  Reserved = 0;
+                        */
+                       wrl(mp, OTHER_MCAST_TABLE(eth_port_num) + table_index, 0x01010101);
                }
+               return;
        }
 
-       spin_lock_irqsave(&mp->lock, flags);
+       /* We will clear out multicast tables every time we get the list.
+        * Then add the entire new list...
+        */
+       for (table_index = 0; table_index <= 0xFC; table_index += 4) {
+               /* Clear DA filter special multicast table (Ex_dFSMT) */
+               wrl(mp, SPECIAL_MCAST_TABLE(eth_port_num) + table_index, 0);
 
-       eth_tx_submit_descs_for_skb(mp, skb);
-       stats->tx_bytes = skb->len;
-       stats->tx_packets++;
-       dev->trans_start = jiffies;
+               /* Clear DA filter other multicast table (Ex_dFOMT) */
+               wrl(mp, OTHER_MCAST_TABLE(eth_port_num) + table_index, 0);
+       }
 
-       if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB)
-               netif_stop_queue(dev);
+       /* Get pointer to net_device multicast list and add each one... */
+       for (i = 0, mc_list = dev->mc_list;
+                       (i < 256) && (mc_list != NULL) && (i < dev->mc_count);
+                       i++, mc_list = mc_list->next)
+               if (mc_list->dmi_addrlen == 6)
+                       eth_port_mc_addr(mp, mc_list->dmi_addr);
+}
 
-       spin_unlock_irqrestore(&mp->lock, flags);
+/*
+ * mv643xx_eth_set_rx_mode
+ *
+ * Change from promiscuos to regular rx mode
+ *
+ * Input :     pointer to ethernet interface network device structure
+ * Output :    N/A
+ */
+static void mv643xx_eth_set_rx_mode(struct net_device *dev)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
+       u32 config_reg;
+
+       config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
+       if (dev->flags & IFF_PROMISC)
+               config_reg |= UNICAST_PROMISCUOUS_MODE;
+       else
+               config_reg &= ~UNICAST_PROMISCUOUS_MODE;
+       wrl(mp, PORT_CONFIG(mp->port_num), config_reg);
 
-       return 0;               /* success */
+       eth_port_set_multicast_list(dev);
 }
 
+
+/* rx/tx queue initialisation ***********************************************/
 /*
- * mv643xx_eth_get_stats
+ * ether_init_rx_desc_ring - Curve a Rx chain desc list and buffer in memory.
+ *
+ * DESCRIPTION:
+ *     This function prepares a Rx chained list of descriptors and packet
+ *     buffers in a form of a ring. The routine must be called after port
+ *     initialization routine and before port start routine.
+ *     The Ethernet SDMA engine uses CPU bus addresses to access the various
+ *     devices in the system (i.e. DRAM). This function uses the ethernet
+ *     struct 'virtual to physical' routine (set by the user) to set the ring
+ *     with physical addresses.
  *
- * Returns a pointer to the interface statistics.
+ * INPUT:
+ *     struct mv643xx_private *mp      Ethernet Port Control srtuct.
  *
- * Input :     dev - a pointer to the required interface
+ * OUTPUT:
+ *     The routine updates the Ethernet port control struct with information
+ *     regarding the Rx descriptors and buffers.
  *
- * Output :    a pointer to the interface's statistics
+ * RETURN:
+ *     None.
  */
-
-static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
-
-       return &mp->stats;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void mv643xx_netpoll(struct net_device *netdev)
+static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
 {
-       struct mv643xx_private *mp = netdev_priv(netdev);
-       int port_num = mp->port_num;
+       volatile struct eth_rx_desc *p_rx_desc;
+       int rx_desc_num = mp->rx_ring_size;
+       int i;
 
-       mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
-       /* wait for previous write to complete */
-       mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
+       /* initialize the next_desc_ptr links in the Rx descriptors ring */
+       p_rx_desc = (struct eth_rx_desc *)mp->p_rx_desc_area;
+       for (i = 0; i < rx_desc_num; i++) {
+               p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
+                       ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
+       }
 
-       mv643xx_eth_int_handler(netdev->irq, netdev, NULL);
+       /* Save Rx desc pointer to driver struct. */
+       mp->rx_curr_desc_q = 0;
+       mp->rx_used_desc_q = 0;
 
-       mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+       mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
 }
-#endif
 
-static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
-                                    int speed, int duplex,
-                                    struct ethtool_cmd *cmd)
+static void mv643xx_eth_free_rx_rings(struct net_device *dev)
 {
        struct mv643xx_private *mp = netdev_priv(dev);
+       int curr;
 
-       memset(cmd, 0, sizeof(*cmd));
-
-       cmd->port = PORT_MII;
-       cmd->transceiver = XCVR_INTERNAL;
-       cmd->phy_address = phy_address;
+       /* Stop RX Queues */
+       mv643xx_eth_port_disable_rx(mp);
 
-       if (speed == 0) {
-               cmd->autoneg = AUTONEG_ENABLE;
-               /* mii lib checks, but doesn't use speed on AUTONEG_ENABLE */
-               cmd->speed = SPEED_100;
-               cmd->advertising = ADVERTISED_10baseT_Half  |
-                                  ADVERTISED_10baseT_Full  |
-                                  ADVERTISED_100baseT_Half |
-                                  ADVERTISED_100baseT_Full;
-               if (mp->mii.supports_gmii)
-                       cmd->advertising |= ADVERTISED_1000baseT_Full;
-       } else {
-               cmd->autoneg = AUTONEG_DISABLE;
-               cmd->speed = speed;
-               cmd->duplex = duplex;
+       /* Free preallocated skb's on RX rings */
+       for (curr = 0; mp->rx_desc_count && curr < mp->rx_ring_size; curr++) {
+               if (mp->rx_skb[curr]) {
+                       dev_kfree_skb(mp->rx_skb[curr]);
+                       mp->rx_desc_count--;
+               }
        }
+
+       if (mp->rx_desc_count)
+               printk(KERN_ERR
+                       "%s: Error in freeing Rx Ring. %d skb's still"
+                       " stuck in RX Ring - ignoring them\n", dev->name,
+                       mp->rx_desc_count);
+       /* Free RX ring */
+       if (mp->rx_sram_size)
+               iounmap(mp->p_rx_desc_area);
+       else
+               dma_free_coherent(NULL, mp->rx_desc_area_size,
+                               mp->p_rx_desc_area, mp->rx_desc_dma);
 }
 
-/*/
- * mv643xx_eth_probe
+/*
+ * ether_init_tx_desc_ring - Curve a Tx chain desc list and buffer in memory.
  *
- * First function called after registering the network device.
- * It's purpose is to initialize the device as an ethernet device,
- * fill the ethernet device structure with pointers * to functions,
- * and set the MAC address of the interface
+ * DESCRIPTION:
+ *     This function prepares a Tx chained list of descriptors and packet
+ *     buffers in a form of a ring. The routine must be called after port
+ *     initialization routine and before port start routine.
+ *     The Ethernet SDMA engine uses CPU bus addresses to access the various
+ *     devices in the system (i.e. DRAM). This function uses the ethernet
+ *     struct 'virtual to physical' routine (set by the user) to set the ring
+ *     with physical addresses.
  *
- * Input :     struct device *
- * Output :    -ENOMEM if failed , 0 if success
+ * INPUT:
+ *     struct mv643xx_private *mp      Ethernet Port Control srtuct.
+ *
+ * OUTPUT:
+ *     The routine updates the Ethernet port control struct with information
+ *     regarding the Tx descriptors and buffers.
+ *
+ * RETURN:
+ *     None.
  */
-static int mv643xx_eth_probe(struct platform_device *pdev)
+static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
 {
-       struct mv643xx_eth_platform_data *pd;
-       int port_num = pdev->id;
-       struct mv643xx_private *mp;
-       struct net_device *dev;
-       u8 *p;
-       struct resource *res;
-       int err;
-       struct ethtool_cmd cmd;
-       int duplex = DUPLEX_HALF;
-       int speed = 0;                  /* default to auto-negotiation */
-
-       dev = alloc_etherdev(sizeof(struct mv643xx_private));
-       if (!dev)
-               return -ENOMEM;
-
-       platform_set_drvdata(pdev, dev);
-
-       mp = netdev_priv(dev);
-
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       BUG_ON(!res);
-       dev->irq = res->start;
-
-       mp->port_num = port_num;
-
-       dev->open = mv643xx_eth_open;
-       dev->stop = mv643xx_eth_stop;
-       dev->hard_start_xmit = mv643xx_eth_start_xmit;
-       dev->get_stats = mv643xx_eth_get_stats;
-       dev->set_mac_address = mv643xx_eth_set_mac_address;
-       dev->set_multicast_list = mv643xx_eth_set_rx_mode;
-
-       /* No need to Tx Timeout */
-       dev->tx_timeout = mv643xx_eth_tx_timeout;
-#ifdef MV643XX_NAPI
-       dev->poll = mv643xx_poll;
-       dev->weight = 64;
-#endif
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = mv643xx_netpoll;
-#endif
-
-       dev->watchdog_timeo = 2 * HZ;
-       dev->tx_queue_len = mp->tx_ring_size;
-       dev->base_addr = 0;
-       dev->change_mtu = mv643xx_eth_change_mtu;
-       dev->do_ioctl = mv643xx_eth_do_ioctl;
-       SET_ETHTOOL_OPS(dev, &mv643xx_ethtool_ops);
-
-#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-#ifdef MAX_SKB_FRAGS
-       /*
-        * Zero copy can only work if we use Discovery II memory. Else, we will
-        * have to map the buffers to ISA memory which is only 16 MB
-        */
-       dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
-#endif
-#endif
-
-       /* Configure the timeout task */
-       INIT_WORK(&mp->tx_timeout_task,
-                       (void (*)(void *))mv643xx_eth_tx_timeout_task, dev);
-
-       spin_lock_init(&mp->lock);
-
-       /* set default config values */
-       eth_port_uc_addr_get(dev, dev->dev_addr);
-       mp->rx_ring_size = MV643XX_ETH_PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
-       mp->tx_ring_size = MV643XX_ETH_PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
+       int tx_desc_num = mp->tx_ring_size;
+       struct eth_tx_desc *p_tx_desc;
+       int i;
 
-       pd = pdev->dev.platform_data;
-       if (pd) {
-               if (pd->mac_addr)
-                       memcpy(dev->dev_addr, pd->mac_addr, 6);
+       /* Initialize the next_desc_ptr links in the Tx descriptors ring */
+       p_tx_desc = (struct eth_tx_desc *)mp->p_tx_desc_area;
+       for (i = 0; i < tx_desc_num; i++) {
+               p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
+                       ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
+       }
 
-               if (pd->phy_addr || pd->force_phy_addr)
-                       ethernet_phy_set(port_num, pd->phy_addr);
+       mp->tx_curr_desc_q = 0;
+       mp->tx_used_desc_q = 0;
 
-               if (pd->rx_queue_size)
-                       mp->rx_ring_size = pd->rx_queue_size;
+       mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
+}
 
-               if (pd->tx_queue_size)
-                       mp->tx_ring_size = pd->tx_queue_size;
+/**
+ * mv643xx_eth_free_tx_descs - Free the tx desc data for completed descriptors
+ *
+ * If force is non-zero, frees uncompleted descriptors as well
+ */
+static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
+       struct eth_tx_desc *desc;
+       u32 cmd_sts;
+       struct sk_buff *skb;
+       unsigned long flags;
+       int tx_index;
+       dma_addr_t addr;
+       int count;
+       int released = 0;
 
-               if (pd->tx_sram_size) {
-                       mp->tx_sram_size = pd->tx_sram_size;
-                       mp->tx_sram_addr = pd->tx_sram_addr;
-               }
+       while (mp->tx_desc_count > 0) {
+               spin_lock_irqsave(&mp->lock, flags);
 
-               if (pd->rx_sram_size) {
-                       mp->rx_sram_size = pd->rx_sram_size;
-                       mp->rx_sram_addr = pd->rx_sram_addr;
+               /* tx_desc_count might have changed before acquiring the lock */
+               if (mp->tx_desc_count <= 0) {
+                       spin_unlock_irqrestore(&mp->lock, flags);
+                       return released;
                }
 
-               duplex = pd->duplex;
-               speed = pd->speed;
-       }
-
-       /* Hook up MII support for ethtool */
-       mp->mii.dev = dev;
-       mp->mii.mdio_read = mv643xx_mdio_read;
-       mp->mii.mdio_write = mv643xx_mdio_write;
-       mp->mii.phy_id = ethernet_phy_get(port_num);
-       mp->mii.phy_id_mask = 0x3f;
-       mp->mii.reg_num_mask = 0x1f;
-
-       err = ethernet_phy_detect(port_num);
-       if (err) {
-               pr_debug("MV643xx ethernet port %d: "
-                                       "No PHY detected at addr %d\n",
-                                       port_num, ethernet_phy_get(port_num));
-               goto out;
-       }
-
-       ethernet_phy_reset(port_num);
-       mp->mii.supports_gmii = mii_check_gmii_support(&mp->mii);
-       mv643xx_init_ethtool_cmd(dev, mp->mii.phy_id, speed, duplex, &cmd);
-       mv643xx_eth_update_pscr(dev, &cmd);
-       mv643xx_set_settings(dev, &cmd);
-
-       SET_MODULE_OWNER(dev);
-       SET_NETDEV_DEV(dev, &pdev->dev);
-       err = register_netdev(dev);
-       if (err)
-               goto out;
-
-       p = dev->dev_addr;
-       printk(KERN_NOTICE
-               "%s: port %d with MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
-               dev->name, port_num, p[0], p[1], p[2], p[3], p[4], p[5]);
+               tx_index = mp->tx_used_desc_q;
+               desc = &mp->p_tx_desc_area[tx_index];
+               cmd_sts = desc->cmd_sts;
 
-       if (dev->features & NETIF_F_SG)
-               printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name);
+               if (!force && (cmd_sts & ETH_BUFFER_OWNED_BY_DMA)) {
+                       spin_unlock_irqrestore(&mp->lock, flags);
+                       return released;
+               }
 
-       if (dev->features & NETIF_F_IP_CSUM)
-               printk(KERN_NOTICE "%s: TX TCP/IP Checksumming Supported\n",
-                                                               dev->name);
+               mp->tx_used_desc_q = (tx_index + 1) % mp->tx_ring_size;
+               mp->tx_desc_count--;
 
-#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-       printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON \n", dev->name);
-#endif
+               addr = desc->buf_ptr;
+               count = desc->byte_cnt;
+               skb = mp->tx_skb[tx_index];
+               if (skb)
+                       mp->tx_skb[tx_index] = NULL;
 
-#ifdef MV643XX_COAL
-       printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON \n",
-                                                               dev->name);
-#endif
+               if (cmd_sts & ETH_ERROR_SUMMARY) {
+                       printk("%s: Error in TX\n", dev->name);
+                       dev->stats.tx_errors++;
+               }
 
-#ifdef MV643XX_NAPI
-       printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
-#endif
+               spin_unlock_irqrestore(&mp->lock, flags);
 
-       if (mp->tx_sram_size > 0)
-               printk(KERN_NOTICE "%s: Using SRAM\n", dev->name);
+               if (cmd_sts & ETH_TX_FIRST_DESC)
+                       dma_unmap_single(NULL, addr, count, DMA_TO_DEVICE);
+               else
+                       dma_unmap_page(NULL, addr, count, DMA_TO_DEVICE);
 
-       return 0;
+               if (skb)
+                       dev_kfree_skb_irq(skb);
 
-out:
-       free_netdev(dev);
+               released = 1;
+       }
 
-       return err;
+       return released;
 }
 
-static int mv643xx_eth_remove(struct platform_device *pdev)
+static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev)
 {
-       struct net_device *dev = platform_get_drvdata(pdev);
-
-       unregister_netdev(dev);
-       flush_scheduled_work();
+       struct mv643xx_private *mp = netdev_priv(dev);
 
-       free_netdev(dev);
-       platform_set_drvdata(pdev, NULL);
-       return 0;
+       if (mv643xx_eth_free_tx_descs(dev, 0) &&
+           mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
+               netif_wake_queue(dev);
 }
 
-static int mv643xx_eth_shared_probe(struct platform_device *pdev)
+static void mv643xx_eth_free_all_tx_descs(struct net_device *dev)
 {
-       struct resource *res;
+       mv643xx_eth_free_tx_descs(dev, 1);
+}
 
-       printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
+static void mv643xx_eth_free_tx_rings(struct net_device *dev)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL)
-               return -ENODEV;
+       /* Stop Tx Queues */
+       mv643xx_eth_port_disable_tx(mp);
 
-       mv643xx_eth_shared_base = ioremap(res->start,
-                                               MV643XX_ETH_SHARED_REGS_SIZE);
-       if (mv643xx_eth_shared_base == NULL)
-               return -ENOMEM;
+       /* Free outstanding skb's on TX ring */
+       mv643xx_eth_free_all_tx_descs(dev);
 
-       return 0;
+       BUG_ON(mp->tx_used_desc_q != mp->tx_curr_desc_q);
 
+       /* Free TX ring */
+       if (mp->tx_sram_size)
+               iounmap(mp->p_tx_desc_area);
+       else
+               dma_free_coherent(NULL, mp->tx_desc_area_size,
+                               mp->p_tx_desc_area, mp->tx_desc_dma);
 }
 
-static int mv643xx_eth_shared_remove(struct platform_device *pdev)
+
+/* netdev ops and related ***************************************************/
+static void eth_port_reset(struct mv643xx_private *mp);
+
+/* Set the mv643xx port configuration register for the speed/duplex mode. */
+static void mv643xx_eth_update_pscr(struct net_device *dev,
+                                   struct ethtool_cmd *ecmd)
 {
-       iounmap(mv643xx_eth_shared_base);
-       mv643xx_eth_shared_base = NULL;
+       struct mv643xx_private *mp = netdev_priv(dev);
+       int port_num = mp->port_num;
+       u32 o_pscr, n_pscr;
+       unsigned int queues;
 
-       return 0;
-}
+       o_pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));
+       n_pscr = o_pscr;
 
-static struct platform_driver mv643xx_eth_driver = {
-       .probe = mv643xx_eth_probe,
-       .remove = mv643xx_eth_remove,
-       .driver = {
-               .name = MV643XX_ETH_NAME,
-       },
-};
+       /* clear speed, duplex and rx buffer size fields */
+       n_pscr &= ~(SET_MII_SPEED_TO_100  |
+                  SET_GMII_SPEED_TO_1000 |
+                  SET_FULL_DUPLEX_MODE   |
+                  MAX_RX_PACKET_MASK);
 
-static struct platform_driver mv643xx_eth_shared_driver = {
-       .probe = mv643xx_eth_shared_probe,
-       .remove = mv643xx_eth_shared_remove,
-       .driver = {
-               .name = MV643XX_ETH_SHARED_NAME,
-       },
-};
+       if (ecmd->duplex == DUPLEX_FULL)
+               n_pscr |= SET_FULL_DUPLEX_MODE;
 
-/*
- * mv643xx_init_module
- *
- * Registers the network drivers into the Linux kernel
- *
- * Input :     N/A
- *
- * Output :    N/A
- */
-static int __init mv643xx_init_module(void)
-{
-       int rc;
+       if (ecmd->speed == SPEED_1000)
+               n_pscr |= SET_GMII_SPEED_TO_1000 |
+                         MAX_RX_PACKET_9700BYTE;
+       else {
+               if (ecmd->speed == SPEED_100)
+                       n_pscr |= SET_MII_SPEED_TO_100;
+               n_pscr |= MAX_RX_PACKET_1522BYTE;
+       }
 
-       rc = platform_driver_register(&mv643xx_eth_shared_driver);
-       if (!rc) {
-               rc = platform_driver_register(&mv643xx_eth_driver);
-               if (rc)
-                       platform_driver_unregister(&mv643xx_eth_shared_driver);
+       if (n_pscr != o_pscr) {
+               if ((o_pscr & SERIAL_PORT_ENABLE) == 0)
+                       wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
+               else {
+                       queues = mv643xx_eth_port_disable_tx(mp);
+
+                       o_pscr &= ~SERIAL_PORT_ENABLE;
+                       wrl(mp, PORT_SERIAL_CONTROL(port_num), o_pscr);
+                       wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
+                       wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
+                       if (queues)
+                               mv643xx_eth_port_enable_tx(mp, queues);
+               }
        }
-       return rc;
 }
 
 /*
- * mv643xx_cleanup_module
- *
- * Registers the network drivers into the Linux kernel
+ * mv643xx_eth_int_handler
  *
- * Input :     N/A
+ * Main interrupt handler for the gigbit ethernet ports
  *
+ * Input :     irq     - irq number (not used)
+ *             dev_id  - a pointer to the required interface's data structure
+ *             regs    - not used
  * Output :    N/A
  */
-static void __exit mv643xx_cleanup_module(void)
+
+static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
 {
-       platform_driver_unregister(&mv643xx_eth_driver);
-       platform_driver_unregister(&mv643xx_eth_shared_driver);
-}
+       struct net_device *dev = (struct net_device *)dev_id;
+       struct mv643xx_private *mp = netdev_priv(dev);
+       u32 eth_int_cause, eth_int_cause_ext = 0;
+       unsigned int port_num = mp->port_num;
 
-module_init(mv643xx_init_module);
-module_exit(mv643xx_cleanup_module);
+       /* Read interrupt cause registers */
+       eth_int_cause = rdl(mp, INT_CAUSE(port_num)) & (INT_RX | INT_EXT);
+       if (eth_int_cause & INT_EXT) {
+               eth_int_cause_ext = rdl(mp, INT_CAUSE_EXT(port_num))
+                               & (INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
+               wrl(mp, INT_CAUSE_EXT(port_num), ~eth_int_cause_ext);
+       }
 
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
-               " and Dale Farnsworth");
-MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
+       /* PHY status changed */
+       if (eth_int_cause_ext & (INT_EXT_LINK | INT_EXT_PHY)) {
+               struct ethtool_cmd cmd;
 
-/*
- * The second part is the low level driver of the gigE ethernet ports.
- */
+               if (mii_link_ok(&mp->mii)) {
+                       mii_ethtool_gset(&mp->mii, &cmd);
+                       mv643xx_eth_update_pscr(dev, &cmd);
+                       mv643xx_eth_port_enable_tx(mp, 1);
+                       if (!netif_carrier_ok(dev)) {
+                               netif_carrier_on(dev);
+                               if (mp->tx_ring_size - mp->tx_desc_count >=
+                                                       MAX_DESCS_PER_SKB)
+                                       netif_wake_queue(dev);
+                       }
+               } else if (netif_carrier_ok(dev)) {
+                       netif_stop_queue(dev);
+                       netif_carrier_off(dev);
+               }
+       }
 
-/*
- * Marvell's Gigabit Ethernet controller low level driver
- *
- * DESCRIPTION:
- *     This file introduce low level API to Marvell's Gigabit Ethernet
- *             controller. This Gigabit Ethernet Controller driver API controls
- *             1) Operations (i.e. port init, start, reset etc').
- *             2) Data flow (i.e. port send, receive etc').
- *             Each Gigabit Ethernet port is controlled via
- *             struct mv643xx_private.
- *             This struct includes user configuration information as well as
- *             driver internal data needed for its operations.
- *
- *             Supported Features:
- *             - This low level driver is OS independent. Allocating memory for
- *               the descriptor rings and buffers are not within the scope of
- *               this driver.
- *             - The user is free from Rx/Tx queue managing.
- *             - This low level driver introduce functionality API that enable
- *               the to operate Marvell's Gigabit Ethernet Controller in a
- *               convenient way.
- *             - Simple Gigabit Ethernet port operation API.
- *             - Simple Gigabit Ethernet port data flow API.
- *             - Data flow and operation API support per queue functionality.
- *             - Support cached descriptors for better performance.
- *             - Enable access to all four DRAM banks and internal SRAM memory
- *               spaces.
- *             - PHY access and control API.
- *             - Port control register configuration API.
- *             - Full control over Unicast and Multicast MAC configurations.
- *
- *             Operation flow:
- *
- *             Initialization phase
- *             This phase complete the initialization of the the
- *             mv643xx_private struct.
- *             User information regarding port configuration has to be set
- *             prior to calling the port initialization routine.
- *
- *             In this phase any port Tx/Rx activity is halted, MIB counters
- *             are cleared, PHY address is set according to user parameter and
- *             access to DRAM and internal SRAM memory spaces.
- *
- *             Driver ring initialization
- *             Allocating memory for the descriptor rings and buffers is not
- *             within the scope of this driver. Thus, the user is required to
- *             allocate memory for the descriptors ring and buffers. Those
- *             memory parameters are used by the Rx and Tx ring initialization
- *             routines in order to curve the descriptor linked list in a form
- *             of a ring.
- *             Note: Pay special attention to alignment issues when using
- *             cached descriptors/buffers. In this phase the driver store
- *             information in the mv643xx_private struct regarding each queue
- *             ring.
- *
- *             Driver start
- *             This phase prepares the Ethernet port for Rx and Tx activity.
- *             It uses the information stored in the mv643xx_private struct to
- *             initialize the various port registers.
- *
- *             Data flow:
- *             All packet references to/from the driver are done using
- *             struct pkt_info.
- *             This struct is a unified struct used with Rx and Tx operations.
- *             This way the user is not required to be familiar with neither
- *             Tx nor Rx descriptors structures.
- *             The driver's descriptors rings are management by indexes.
- *             Those indexes controls the ring resources and used to indicate
- *             a SW resource error:
- *             'current'
- *             This index points to the current available resource for use. For
- *             example in Rx process this index will point to the descriptor
- *             that will be passed to the user upon calling the receive
- *             routine.  In Tx process, this index will point to the descriptor
- *             that will be assigned with the user packet info and transmitted.
- *             'used'
- *             This index points to the descriptor that need to restore its
- *             resources. For example in Rx process, using the Rx buffer return
- *             API will attach the buffer returned in packet info to the
- *             descriptor pointed by 'used'. In Tx process, using the Tx
- *             descriptor return will merely return the user packet info with
- *             the command status of the transmitted buffer pointed by the
- *             'used' index. Nevertheless, it is essential to use this routine
- *             to update the 'used' index.
- *             'first'
- *             This index supports Tx Scatter-Gather. It points to the first
- *             descriptor of a packet assembled of multiple buffers. For
- *             example when in middle of Such packet we have a Tx resource
- *             error the 'curr' index get the value of 'first' to indicate
- *             that the ring returned to its state before trying to transmit
- *             this packet.
- *
- *             Receive operation:
- *             The eth_port_receive API set the packet information struct,
- *             passed by the caller, with received information from the
- *             'current' SDMA descriptor.
- *             It is the user responsibility to return this resource back
- *             to the Rx descriptor ring to enable the reuse of this source.
- *             Return Rx resource is done using the eth_rx_return_buff API.
- *
- *     Prior to calling the initialization routine eth_port_init() the user
- *     must set the following fields under mv643xx_private struct:
- *     port_num                User Ethernet port number.
- *     port_config             User port configuration value.
- *     port_config_extend      User port config extend value.
- *     port_sdma_config        User port SDMA config value.
- *     port_serial_control     User port serial control value.
- *
- *             This driver data flow is done using the struct pkt_info which
- *             is a unified struct for Rx and Tx operations:
- *
- *             byte_cnt        Tx/Rx descriptor buffer byte count.
- *             l4i_chk         CPU provided TCP Checksum. For Tx operation
- *                             only.
- *             cmd_sts         Tx/Rx descriptor command status.
- *             buf_ptr         Tx/Rx descriptor buffer pointer.
- *             return_info     Tx/Rx user resource return information.
- */
+#ifdef MV643XX_NAPI
+       if (eth_int_cause & INT_RX) {
+               /* schedule the NAPI poll routine to maintain port */
+               wrl(mp, INT_MASK(port_num), 0x00000000);
+
+               /* wait for previous write to complete */
+               rdl(mp, INT_MASK(port_num));
+
+               netif_rx_schedule(dev, &mp->napi);
+       }
+#else
+       if (eth_int_cause & INT_RX)
+               mv643xx_eth_receive_queue(dev, INT_MAX);
+#endif
+       if (eth_int_cause_ext & INT_EXT_TX)
+               mv643xx_eth_free_completed_tx_descs(dev);
 
-/* PHY routines */
-static int ethernet_phy_get(unsigned int eth_port_num);
-static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
+       /*
+        * If no real interrupt occured, exit.
+        * This can happen when using gigE interrupt coalescing mechanism.
+        */
+       if ((eth_int_cause == 0x0) && (eth_int_cause_ext == 0x0))
+               return IRQ_NONE;
 
-/* Ethernet Port routines */
-static void eth_port_set_filter_table_entry(int table, unsigned char entry);
+       return IRQ_HANDLED;
+}
 
 /*
- * eth_port_init - Initialize the Ethernet port driver
+ * ethernet_phy_reset - Reset Ethernet port PHY.
  *
  * DESCRIPTION:
- *     This function prepares the ethernet port to start its activity:
- *     1) Completes the ethernet port driver struct initialization toward port
- *             start routine.
- *     2) Resets the device to a quiescent state in case of warm reboot.
- *     3) Enable SDMA access to all four DRAM banks as well as internal SRAM.
- *     4) Clean MAC tables. The reset status of those tables is unknown.
- *     5) Set PHY address.
- *     Note: Call this routine prior to eth_port_start routine and after
- *     setting user values in the user fields of Ethernet port control
- *     struct.
+ *     This routine utilizes the SMI interface to reset the ethernet port PHY.
  *
  * INPUT:
- *     struct mv643xx_private *mp      Ethernet port control struct
+ *     struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
- *     See description.
+ *     The PHY is reset.
  *
  * RETURN:
  *     None.
+ *
  */
-static void eth_port_init(struct mv643xx_private *mp)
+static void ethernet_phy_reset(struct mv643xx_private *mp)
 {
-       mp->rx_resource_err = 0;
+       unsigned int phy_reg_data;
 
-       eth_port_reset(mp->port_num);
+       /* Reset the PHY */
+       eth_port_read_smi_reg(mp, 0, &phy_reg_data);
+       phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
+       eth_port_write_smi_reg(mp, 0, phy_reg_data);
 
-       eth_port_init_mac_tables(mp->port_num);
+       /* wait for PHY to come out of reset */
+       do {
+               udelay(1);
+               eth_port_read_smi_reg(mp, 0, &phy_reg_data);
+       } while (phy_reg_data & 0x8000);
 }
 
 /*
@@ -1763,1023 +2049,983 @@ static void eth_port_start(struct net_device *dev)
 
        /* Assignment of Tx CTRP of given queue */
        tx_curr_desc = mp->tx_curr_desc_q;
-       mv_write(MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+       wrl(mp, TXQ_CURRENT_DESC_PTR(port_num),
                (u32)((struct eth_tx_desc *)mp->tx_desc_dma + tx_curr_desc));
 
        /* Assignment of Rx CRDP of given queue */
        rx_curr_desc = mp->rx_curr_desc_q;
-       mv_write(MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+       wrl(mp, RXQ_CURRENT_DESC_PTR(port_num),
                (u32)((struct eth_rx_desc *)mp->rx_desc_dma + rx_curr_desc));
 
        /* Add the assigned Ethernet address to the port's address table */
-       eth_port_uc_addr_set(port_num, dev->dev_addr);
+       eth_port_uc_addr_set(mp, dev->dev_addr);
 
-       /* Assign port configuration and command. */
-       mv_write(MV643XX_ETH_PORT_CONFIG_REG(port_num),
-                         MV643XX_ETH_PORT_CONFIG_DEFAULT_VALUE);
+       /*
+        * Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
+        * frames to RX queue #0.
+        */
+       wrl(mp, PORT_CONFIG(port_num), 0x00000000);
 
-       mv_write(MV643XX_ETH_PORT_CONFIG_EXTEND_REG(port_num),
-                         MV643XX_ETH_PORT_CONFIG_EXTEND_DEFAULT_VALUE);
+       /*
+        * Treat BPDUs as normal multicasts, and disable partition mode.
+        */
+       wrl(mp, PORT_CONFIG_EXT(port_num), 0x00000000);
 
-       pscr = mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num));
+       pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));
 
-       pscr &= ~(MV643XX_ETH_SERIAL_PORT_ENABLE | MV643XX_ETH_FORCE_LINK_PASS);
-       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), pscr);
+       pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
+       wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
 
-       pscr |= MV643XX_ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
-               MV643XX_ETH_DISABLE_AUTO_NEG_SPEED_GMII    |
-               MV643XX_ETH_DISABLE_AUTO_NEG_FOR_DUPLX     |
-               MV643XX_ETH_DO_NOT_FORCE_LINK_FAIL         |
-               MV643XX_ETH_SERIAL_PORT_CONTROL_RESERVED;
+       pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
+               DISABLE_AUTO_NEG_SPEED_GMII    |
+               DISABLE_AUTO_NEG_FOR_DUPLEX    |
+               DO_NOT_FORCE_LINK_FAIL     |
+               SERIAL_PORT_CONTROL_RESERVED;
 
-       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), pscr);
+       wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
 
-       pscr |= MV643XX_ETH_SERIAL_PORT_ENABLE;
-       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), pscr);
+       pscr |= SERIAL_PORT_ENABLE;
+       wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
 
        /* Assign port SDMA configuration */
-       mv_write(MV643XX_ETH_SDMA_CONFIG_REG(port_num),
-                         MV643XX_ETH_PORT_SDMA_CONFIG_DEFAULT_VALUE);
+       wrl(mp, SDMA_CONFIG(port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
 
        /* Enable port Rx. */
-       mv643xx_eth_port_enable_rx(port_num, ETH_RX_QUEUES_ENABLED);
+       mv643xx_eth_port_enable_rx(mp, 1);
 
        /* Disable port bandwidth limits by clearing MTU register */
-       mv_write(MV643XX_ETH_MAXIMUM_TRANSMIT_UNIT(port_num), 0);
+       wrl(mp, TX_BW_MTU(port_num), 0);
 
        /* save phy settings across reset */
        mv643xx_get_settings(dev, &ethtool_cmd);
-       ethernet_phy_reset(mp->port_num);
+       ethernet_phy_reset(mp);
        mv643xx_set_settings(dev, &ethtool_cmd);
 }
 
+#ifdef MV643XX_COAL
+
 /*
- * eth_port_uc_addr_set - This function Set the port Unicast address.
+ * eth_port_set_rx_coal - Sets coalescing interrupt mechanism on RX path
  *
  * DESCRIPTION:
- *             This function Set the port Ethernet MAC address.
+ *     This routine sets the RX coalescing interrupt mechanism parameter.
+ *     This parameter is a timeout counter, that counts in 64 t_clk
+ *     chunks ; that when timeout event occurs a maskable interrupt
+ *     occurs.
+ *     The parameter is calculated using the tClk of the MV-643xx chip
+ *     , and the required delay of the interrupt in usec.
  *
  * INPUT:
- *     unsigned int    eth_port_num    Port number.
- *     char *          p_addr          Address to be set
+ *     struct mv643xx_private *mp      Ethernet port
+ *     unsigned int delay              Delay in usec
  *
  * OUTPUT:
- *     Set MAC address low and high registers. also calls
- *     eth_port_set_filter_table_entry() to set the unicast
- *     table with the proper information.
+ *     Interrupt coalescing mechanism value is set in MV-643xx chip.
  *
  * RETURN:
- *     N/A.
+ *     The interrupt coalescing value set in the gigE port.
  *
  */
-static void eth_port_uc_addr_set(unsigned int eth_port_num,
-                                                       unsigned char *p_addr)
+static unsigned int eth_port_set_rx_coal(struct mv643xx_private *mp,
+                                       unsigned int delay)
 {
-       unsigned int mac_h;
-       unsigned int mac_l;
-       int table;
+       unsigned int port_num = mp->port_num;
+       unsigned int coal = ((mp->shared->t_clk / 1000000) * delay) / 64;
 
-       mac_l = (p_addr[4] << 8) | (p_addr[5]);
-       mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
-                                                       (p_addr[3] << 0);
+       /* Set RX Coalescing mechanism */
+       wrl(mp, SDMA_CONFIG(port_num),
+               ((coal & 0x3fff) << 8) |
+               (rdl(mp, SDMA_CONFIG(port_num))
+                       & 0xffc000ff));
+
+       return coal;
+}
+#endif
+
+/*
+ * eth_port_set_tx_coal - Sets coalescing interrupt mechanism on TX path
+ *
+ * DESCRIPTION:
+ *     This routine sets the TX coalescing interrupt mechanism parameter.
+ *     This parameter is a timeout counter, that counts in 64 t_clk
+ *     chunks ; that when timeout event occurs a maskable interrupt
+ *     occurs.
+ *     The parameter is calculated using the t_cLK frequency of the
+ *     MV-643xx chip and the required delay in the interrupt in uSec
+ *
+ * INPUT:
+ *     struct mv643xx_private *mp      Ethernet port
+ *     unsigned int delay              Delay in uSeconds
+ *
+ * OUTPUT:
+ *     Interrupt coalescing mechanism value is set in MV-643xx chip.
+ *
+ * RETURN:
+ *     The interrupt coalescing value set in the gigE port.
+ *
+ */
+static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
+                                       unsigned int delay)
+{
+       unsigned int coal = ((mp->shared->t_clk / 1000000) * delay) / 64;
 
-       mv_write(MV643XX_ETH_MAC_ADDR_LOW(eth_port_num), mac_l);
-       mv_write(MV643XX_ETH_MAC_ADDR_HIGH(eth_port_num), mac_h);
+       /* Set TX Coalescing mechanism */
+       wrl(mp, TX_FIFO_URGENT_THRESHOLD(mp->port_num), coal << 4);
 
-       /* Accept frames of this address */
-       table = MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE(eth_port_num);
-       eth_port_set_filter_table_entry(table, p_addr[5] & 0x0f);
+       return coal;
 }
 
 /*
- * eth_port_uc_addr_get - This function retrieves the port Unicast address
- * (MAC address) from the ethernet hw registers.
+ * eth_port_init - Initialize the Ethernet port driver
  *
  * DESCRIPTION:
- *             This function retrieves the port Ethernet MAC address.
+ *     This function prepares the ethernet port to start its activity:
+ *     1) Completes the ethernet port driver struct initialization toward port
+ *             start routine.
+ *     2) Resets the device to a quiescent state in case of warm reboot.
+ *     3) Enable SDMA access to all four DRAM banks as well as internal SRAM.
+ *     4) Clean MAC tables. The reset status of those tables is unknown.
+ *     5) Set PHY address.
+ *     Note: Call this routine prior to eth_port_start routine and after
+ *     setting user values in the user fields of Ethernet port control
+ *     struct.
  *
  * INPUT:
- *     unsigned int    eth_port_num    Port number.
- *     char            *MacAddr        pointer where the MAC address is stored
+ *     struct mv643xx_private *mp      Ethernet port control struct
  *
  * OUTPUT:
- *     Copy the MAC address to the location pointed to by MacAddr
+ *     See description.
  *
  * RETURN:
- *     N/A.
- *
- */
-static void eth_port_uc_addr_get(struct net_device *dev, unsigned char *p_addr)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
-       unsigned int mac_h;
-       unsigned int mac_l;
-
-       mac_h = mv_read(MV643XX_ETH_MAC_ADDR_HIGH(mp->port_num));
-       mac_l = mv_read(MV643XX_ETH_MAC_ADDR_LOW(mp->port_num));
-
-       p_addr[0] = (mac_h >> 24) & 0xff;
-       p_addr[1] = (mac_h >> 16) & 0xff;
-       p_addr[2] = (mac_h >> 8) & 0xff;
-       p_addr[3] = mac_h & 0xff;
-       p_addr[4] = (mac_l >> 8) & 0xff;
-       p_addr[5] = mac_l & 0xff;
-}
-
-/*
- * The entries in each table are indexed by a hash of a packet's MAC
- * address.  One bit in each entry determines whether the packet is
- * accepted.  There are 4 entries (each 8 bits wide) in each register
- * of the table.  The bits in each entry are defined as follows:
- *     0       Accept=1, Drop=0
- *     3-1     Queue                   (ETH_Q0=0)
- *     7-4     Reserved = 0;
+ *     None.
  */
-static void eth_port_set_filter_table_entry(int table, unsigned char entry)
+static void eth_port_init(struct mv643xx_private *mp)
 {
-       unsigned int table_reg;
-       unsigned int tbl_offset;
-       unsigned int reg_offset;
+       mp->rx_resource_err = 0;
 
-       tbl_offset = (entry / 4) * 4;   /* Register offset of DA table entry */
-       reg_offset = entry % 4;         /* Entry offset within the register */
+       eth_port_reset(mp);
 
-       /* Set "accepts frame bit" at specified table entry */
-       table_reg = mv_read(table + tbl_offset);
-       table_reg |= 0x01 << (8 * reg_offset);
-       mv_write(table + tbl_offset, table_reg);
+       eth_port_init_mac_tables(mp);
 }
 
 /*
- * eth_port_mc_addr - Multicast address settings.
+ * mv643xx_eth_open
  *
- * The MV device supports multicast using two tables:
- * 1) Special Multicast Table for MAC addresses of the form
- *    0x01-00-5E-00-00-XX (where XX is between 0x00 and 0x_FF).
- *    The MAC DA[7:0] bits are used as a pointer to the Special Multicast
- *    Table entries in the DA-Filter table.
- * 2) Other Multicast Table for multicast of another type. A CRC-8bit
- *    is used as an index to the Other Multicast Table entries in the
- *    DA-Filter table.  This function calculates the CRC-8bit value.
- * In either case, eth_port_set_filter_table_entry() is then called
- * to set to set the actual table entry.
+ * This function is called when openning the network device. The function
+ * should initialize all the hardware, initialize cyclic Rx/Tx
+ * descriptors chain and buffers and allocate an IRQ to the network
+ * device.
+ *
+ * Input :     a pointer to the network device structure
+ *
+ * Output :    zero of success , nonzero if fails.
  */
-static void eth_port_mc_addr(unsigned int eth_port_num, unsigned char *p_addr)
-{
-       unsigned int mac_h;
-       unsigned int mac_l;
-       unsigned char crc_result = 0;
-       int table;
-       int mac_array[48];
-       int crc[8];
-       int i;
-
-       if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
-           (p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
-               table = MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
-                                       (eth_port_num);
-               eth_port_set_filter_table_entry(table, p_addr[5]);
-               return;
-       }
-
-       /* Calculate CRC-8 out of the given address */
-       mac_h = (p_addr[0] << 8) | (p_addr[1]);
-       mac_l = (p_addr[2] << 24) | (p_addr[3] << 16) |
-                       (p_addr[4] << 8) | (p_addr[5] << 0);
-
-       for (i = 0; i < 32; i++)
-               mac_array[i] = (mac_l >> i) & 0x1;
-       for (i = 32; i < 48; i++)
-               mac_array[i] = (mac_h >> (i - 32)) & 0x1;
-
-       crc[0] = mac_array[45] ^ mac_array[43] ^ mac_array[40] ^ mac_array[39] ^
-                mac_array[35] ^ mac_array[34] ^ mac_array[31] ^ mac_array[30] ^
-                mac_array[28] ^ mac_array[23] ^ mac_array[21] ^ mac_array[19] ^
-                mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ mac_array[12] ^
-                mac_array[8]  ^ mac_array[7]  ^ mac_array[6]  ^ mac_array[0];
 
-       crc[1] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
-                mac_array[41] ^ mac_array[39] ^ mac_array[36] ^ mac_array[34] ^
-                mac_array[32] ^ mac_array[30] ^ mac_array[29] ^ mac_array[28] ^
-                mac_array[24] ^ mac_array[23] ^ mac_array[22] ^ mac_array[21] ^
-                mac_array[20] ^ mac_array[18] ^ mac_array[17] ^ mac_array[16] ^
-                mac_array[15] ^ mac_array[14] ^ mac_array[13] ^ mac_array[12] ^
-                mac_array[9]  ^ mac_array[6]  ^ mac_array[1]  ^ mac_array[0];
+static int mv643xx_eth_open(struct net_device *dev)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
+       unsigned int port_num = mp->port_num;
+       unsigned int size;
+       int err;
 
-       crc[2] = mac_array[47] ^ mac_array[46] ^ mac_array[44] ^ mac_array[43] ^
-                mac_array[42] ^ mac_array[39] ^ mac_array[37] ^ mac_array[34] ^
-                mac_array[33] ^ mac_array[29] ^ mac_array[28] ^ mac_array[25] ^
-                mac_array[24] ^ mac_array[22] ^ mac_array[17] ^ mac_array[15] ^
-                mac_array[13] ^ mac_array[12] ^ mac_array[10] ^ mac_array[8]  ^
-                mac_array[6]  ^ mac_array[2]  ^ mac_array[1]  ^ mac_array[0];
+       /* Clear any pending ethernet port interrupts */
+       wrl(mp, INT_CAUSE(port_num), 0);
+       wrl(mp, INT_CAUSE_EXT(port_num), 0);
+       /* wait for previous write to complete */
+       rdl(mp, INT_CAUSE_EXT(port_num));
 
-       crc[3] = mac_array[47] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
-                mac_array[40] ^ mac_array[38] ^ mac_array[35] ^ mac_array[34] ^
-                mac_array[30] ^ mac_array[29] ^ mac_array[26] ^ mac_array[25] ^
-                mac_array[23] ^ mac_array[18] ^ mac_array[16] ^ mac_array[14] ^
-                mac_array[13] ^ mac_array[11] ^ mac_array[9]  ^ mac_array[7]  ^
-                mac_array[3]  ^ mac_array[2]  ^ mac_array[1];
+       err = request_irq(dev->irq, mv643xx_eth_int_handler,
+                       IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
+       if (err) {
+               printk(KERN_ERR "%s: Can not assign IRQ\n", dev->name);
+               return -EAGAIN;
+       }
 
-       crc[4] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[41] ^
-                mac_array[39] ^ mac_array[36] ^ mac_array[35] ^ mac_array[31] ^
-                mac_array[30] ^ mac_array[27] ^ mac_array[26] ^ mac_array[24] ^
-                mac_array[19] ^ mac_array[17] ^ mac_array[15] ^ mac_array[14] ^
-                mac_array[12] ^ mac_array[10] ^ mac_array[8]  ^ mac_array[4]  ^
-                mac_array[3]  ^ mac_array[2];
+       eth_port_init(mp);
 
-       crc[5] = mac_array[47] ^ mac_array[46] ^ mac_array[45] ^ mac_array[42] ^
-                mac_array[40] ^ mac_array[37] ^ mac_array[36] ^ mac_array[32] ^
-                mac_array[31] ^ mac_array[28] ^ mac_array[27] ^ mac_array[25] ^
-                mac_array[20] ^ mac_array[18] ^ mac_array[16] ^ mac_array[15] ^
-                mac_array[13] ^ mac_array[11] ^ mac_array[9]  ^ mac_array[5]  ^
-                mac_array[4]  ^ mac_array[3];
+       memset(&mp->timeout, 0, sizeof(struct timer_list));
+       mp->timeout.function = mv643xx_eth_rx_refill_descs_timer_wrapper;
+       mp->timeout.data = (unsigned long)dev;
 
-       crc[6] = mac_array[47] ^ mac_array[46] ^ mac_array[43] ^ mac_array[41] ^
-                mac_array[38] ^ mac_array[37] ^ mac_array[33] ^ mac_array[32] ^
-                mac_array[29] ^ mac_array[28] ^ mac_array[26] ^ mac_array[21] ^
-                mac_array[19] ^ mac_array[17] ^ mac_array[16] ^ mac_array[14] ^
-                mac_array[12] ^ mac_array[10] ^ mac_array[6]  ^ mac_array[5]  ^
-                mac_array[4];
+       /* Allocate RX and TX skb rings */
+       mp->rx_skb = kmalloc(sizeof(*mp->rx_skb) * mp->rx_ring_size,
+                                                               GFP_KERNEL);
+       if (!mp->rx_skb) {
+               printk(KERN_ERR "%s: Cannot allocate Rx skb ring\n", dev->name);
+               err = -ENOMEM;
+               goto out_free_irq;
+       }
+       mp->tx_skb = kmalloc(sizeof(*mp->tx_skb) * mp->tx_ring_size,
+                                                               GFP_KERNEL);
+       if (!mp->tx_skb) {
+               printk(KERN_ERR "%s: Cannot allocate Tx skb ring\n", dev->name);
+               err = -ENOMEM;
+               goto out_free_rx_skb;
+       }
 
-       crc[7] = mac_array[47] ^ mac_array[44] ^ mac_array[42] ^ mac_array[39] ^
-                mac_array[38] ^ mac_array[34] ^ mac_array[33] ^ mac_array[30] ^
-                mac_array[29] ^ mac_array[27] ^ mac_array[22] ^ mac_array[20] ^
-                mac_array[18] ^ mac_array[17] ^ mac_array[15] ^ mac_array[13] ^
-                mac_array[11] ^ mac_array[7]  ^ mac_array[6]  ^ mac_array[5];
+       /* Allocate TX ring */
+       mp->tx_desc_count = 0;
+       size = mp->tx_ring_size * sizeof(struct eth_tx_desc);
+       mp->tx_desc_area_size = size;
 
-       for (i = 0; i < 8; i++)
-               crc_result = crc_result | (crc[i] << i);
+       if (mp->tx_sram_size) {
+               mp->p_tx_desc_area = ioremap(mp->tx_sram_addr,
+                                                       mp->tx_sram_size);
+               mp->tx_desc_dma = mp->tx_sram_addr;
+       } else
+               mp->p_tx_desc_area = dma_alloc_coherent(NULL, size,
+                                                       &mp->tx_desc_dma,
+                                                       GFP_KERNEL);
 
-       table = MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num);
-       eth_port_set_filter_table_entry(table, crc_result);
-}
+       if (!mp->p_tx_desc_area) {
+               printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
+                                                       dev->name, size);
+               err = -ENOMEM;
+               goto out_free_tx_skb;
+       }
+       BUG_ON((u32) mp->p_tx_desc_area & 0xf); /* check 16-byte alignment */
+       memset((void *)mp->p_tx_desc_area, 0, mp->tx_desc_area_size);
 
-/*
- * Set the entire multicast list based on dev->mc_list.
- */
-static void eth_port_set_multicast_list(struct net_device *dev)
-{
+       ether_init_tx_desc_ring(mp);
 
-       struct dev_mc_list      *mc_list;
-       int                     i;
-       int                     table_index;
-       struct mv643xx_private  *mp = netdev_priv(dev);
-       unsigned int            eth_port_num = mp->port_num;
+       /* Allocate RX ring */
+       mp->rx_desc_count = 0;
+       size = mp->rx_ring_size * sizeof(struct eth_rx_desc);
+       mp->rx_desc_area_size = size;
 
-       /* If the device is in promiscuous mode or in all multicast mode,
-        * we will fully populate both multicast tables with accept.
-        * This is guaranteed to yield a match on all multicast addresses...
-        */
-       if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI)) {
-               for (table_index = 0; table_index <= 0xFC; table_index += 4) {
-                       /* Set all entries in DA filter special multicast
-                        * table (Ex_dFSMT)
-                        * Set for ETH_Q0 for now
-                        * Bits
-                        * 0      Accept=1, Drop=0
-                        * 3-1  Queue    ETH_Q0=0
-                        * 7-4  Reserved = 0;
-                        */
-                       mv_write(MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
+       if (mp->rx_sram_size) {
+               mp->p_rx_desc_area = ioremap(mp->rx_sram_addr,
+                                                       mp->rx_sram_size);
+               mp->rx_desc_dma = mp->rx_sram_addr;
+       } else
+               mp->p_rx_desc_area = dma_alloc_coherent(NULL, size,
+                                                       &mp->rx_desc_dma,
+                                                       GFP_KERNEL);
 
-                       /* Set all entries in DA filter other multicast
-                        * table (Ex_dFOMT)
-                        * Set for ETH_Q0 for now
-                        * Bits
-                        * 0      Accept=1, Drop=0
-                        * 3-1  Queue    ETH_Q0=0
-                        * 7-4  Reserved = 0;
-                        */
-                       mv_write(MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
-               }
-               return;
+       if (!mp->p_rx_desc_area) {
+               printk(KERN_ERR "%s: Cannot allocate Rx ring (size %d bytes)\n",
+                                                       dev->name, size);
+               printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
+                                                       dev->name);
+               if (mp->rx_sram_size)
+                       iounmap(mp->p_tx_desc_area);
+               else
+                       dma_free_coherent(NULL, mp->tx_desc_area_size,
+                                       mp->p_tx_desc_area, mp->tx_desc_dma);
+               err = -ENOMEM;
+               goto out_free_tx_skb;
        }
+       memset((void *)mp->p_rx_desc_area, 0, size);
 
-       /* We will clear out multicast tables every time we get the list.
-        * Then add the entire new list...
-        */
-       for (table_index = 0; table_index <= 0xFC; table_index += 4) {
-               /* Clear DA filter special multicast table (Ex_dFSMT) */
-               mv_write(MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
-                               (eth_port_num) + table_index, 0);
+       ether_init_rx_desc_ring(mp);
 
-               /* Clear DA filter other multicast table (Ex_dFOMT) */
-               mv_write(MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE
-                               (eth_port_num) + table_index, 0);
-       }
+       mv643xx_eth_rx_refill_descs(dev);       /* Fill RX ring with skb's */
 
-       /* Get pointer to net_device multicast list and add each one... */
-       for (i = 0, mc_list = dev->mc_list;
-                       (i < 256) && (mc_list != NULL) && (i < dev->mc_count);
-                       i++, mc_list = mc_list->next)
-               if (mc_list->dmi_addrlen == 6)
-                       eth_port_mc_addr(eth_port_num, mc_list->dmi_addr);
+#ifdef MV643XX_NAPI
+       napi_enable(&mp->napi);
+#endif
+
+       eth_port_start(dev);
+
+       /* Interrupt Coalescing */
+
+#ifdef MV643XX_COAL
+       mp->rx_int_coal =
+               eth_port_set_rx_coal(mp, MV643XX_RX_COAL);
+#endif
+
+       mp->tx_int_coal =
+               eth_port_set_tx_coal(mp, MV643XX_TX_COAL);
+
+       /* Unmask phy and link status changes interrupts */
+       wrl(mp, INT_MASK_EXT(port_num), INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
+
+       /* Unmask RX buffer and TX end interrupt */
+       wrl(mp, INT_MASK(port_num), INT_RX | INT_EXT);
+
+       return 0;
+
+out_free_tx_skb:
+       kfree(mp->tx_skb);
+out_free_rx_skb:
+       kfree(mp->rx_skb);
+out_free_irq:
+       free_irq(dev->irq, dev);
+
+       return err;
 }
 
 /*
- * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
+ * eth_port_reset - Reset Ethernet port
  *
  * DESCRIPTION:
- *     Go through all the DA filter tables (Unicast, Special Multicast &
- *     Other Multicast) and set each entry to 0.
+ *     This routine resets the chip by aborting any SDMA engine activity and
+ *     clearing the MIB counters. The Receiver and the Transmit unit are in
+ *     idle state after this command is performed and the port is disabled.
  *
  * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
+ *     struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
- *     Multicast and Unicast packets are rejected.
+ *     Channel activity is halted.
  *
  * RETURN:
  *     None.
+ *
  */
-static void eth_port_init_mac_tables(unsigned int eth_port_num)
+static void eth_port_reset(struct mv643xx_private *mp)
 {
-       int table_index;
+       unsigned int port_num = mp->port_num;
+       unsigned int reg_data;
 
-       /* Clear DA filter unicast table (Ex_dFUT) */
-       for (table_index = 0; table_index <= 0xC; table_index += 4)
-               mv_write(MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
-                                       (eth_port_num) + table_index, 0);
+       mv643xx_eth_port_disable_tx(mp);
+       mv643xx_eth_port_disable_rx(mp);
 
-       for (table_index = 0; table_index <= 0xFC; table_index += 4) {
-               /* Clear DA filter special multicast table (Ex_dFSMT) */
-               mv_write(MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
-                                       (eth_port_num) + table_index, 0);
-               /* Clear DA filter other multicast table (Ex_dFOMT) */
-               mv_write(MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE
-                                       (eth_port_num) + table_index, 0);
-       }
+       /* Clear all MIB counters */
+       eth_clear_mib_counters(mp);
+
+       /* Reset the Enable bit in the Configuration Register */
+       reg_data = rdl(mp, PORT_SERIAL_CONTROL(port_num));
+       reg_data &= ~(SERIAL_PORT_ENABLE                |
+                       DO_NOT_FORCE_LINK_FAIL  |
+                       FORCE_LINK_PASS);
+       wrl(mp, PORT_SERIAL_CONTROL(port_num), reg_data);
 }
 
 /*
- * eth_clear_mib_counters - Clear all MIB counters
- *
- * DESCRIPTION:
- *     This function clears all MIB counters of a specific ethernet port.
- *     A read from the MIB counter will reset the counter.
- *
- * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
- *
- * OUTPUT:
- *     After reading all MIB counters, the counters resets.
- *
- * RETURN:
- *     MIB counter value.
+ * mv643xx_eth_stop
  *
+ * This function is used when closing the network device.
+ * It updates the hardware,
+ * release all memory that holds buffers and descriptors and release the IRQ.
+ * Input :     a pointer to the device structure
+ * Output :    zero if success , nonzero if fails
  */
-static void eth_clear_mib_counters(unsigned int eth_port_num)
+
+static int mv643xx_eth_stop(struct net_device *dev)
 {
-       int i;
+       struct mv643xx_private *mp = netdev_priv(dev);
+       unsigned int port_num = mp->port_num;
 
-       /* Perform dummy reads from MIB counters */
-       for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION;
-                                                                       i += 4)
-               mv_read(MV643XX_ETH_MIB_COUNTERS_BASE(eth_port_num) + i);
-}
+       /* Mask all interrupts on ethernet port */
+       wrl(mp, INT_MASK(port_num), 0x00000000);
+       /* wait for previous write to complete */
+       rdl(mp, INT_MASK(port_num));
 
-static inline u32 read_mib(struct mv643xx_private *mp, int offset)
-{
-       return mv_read(MV643XX_ETH_MIB_COUNTERS_BASE(mp->port_num) + offset);
-}
+#ifdef MV643XX_NAPI
+       napi_disable(&mp->napi);
+#endif
+       netif_carrier_off(dev);
+       netif_stop_queue(dev);
 
-static void eth_update_mib_counters(struct mv643xx_private *mp)
-{
-       struct mv643xx_mib_counters *p = &mp->mib_counters;
-       int offset;
+       eth_port_reset(mp);
+
+       mv643xx_eth_free_tx_rings(dev);
+       mv643xx_eth_free_rx_rings(dev);
 
-       p->good_octets_received +=
-               read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_LOW);
-       p->good_octets_received +=
-               (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH) << 32;
+       free_irq(dev->irq, dev);
 
-       for (offset = ETH_MIB_BAD_OCTETS_RECEIVED;
-                       offset <= ETH_MIB_FRAMES_1024_TO_MAX_OCTETS;
-                       offset += 4)
-               *(u32 *)((char *)p + offset) = read_mib(mp, offset);
+       return 0;
+}
 
-       p->good_octets_sent += read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_LOW);
-       p->good_octets_sent +=
-               (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_HIGH) << 32;
+static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
 
-       for (offset = ETH_MIB_GOOD_FRAMES_SENT;
-                       offset <= ETH_MIB_LATE_COLLISION;
-                       offset += 4)
-               *(u32 *)((char *)p + offset) = read_mib(mp, offset);
+       return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL);
 }
 
 /*
- * ethernet_phy_detect - Detect whether a phy is present
- *
- * DESCRIPTION:
- *     This function tests whether there is a PHY present on
- *     the specified port.
- *
- * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
- *
- * OUTPUT:
- *     None
- *
- * RETURN:
- *     0 on success
- *     -ENODEV on failure
+ * Changes MTU (maximum transfer unit) of the gigabit ethenret port
  *
+ * Input :     pointer to ethernet interface network device structure
+ *             new mtu size
+ * Output :    0 upon success, -EINVAL upon failure
  */
-static int ethernet_phy_detect(unsigned int port_num)
+static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
 {
-       unsigned int phy_reg_data0;
-       int auto_neg;
+       if ((new_mtu > 9500) || (new_mtu < 64))
+               return -EINVAL;
 
-       eth_port_read_smi_reg(port_num, 0, &phy_reg_data0);
-       auto_neg = phy_reg_data0 & 0x1000;
-       phy_reg_data0 ^= 0x1000;        /* invert auto_neg */
-       eth_port_write_smi_reg(port_num, 0, phy_reg_data0);
+       dev->mtu = new_mtu;
+       if (!netif_running(dev))
+               return 0;
 
-       eth_port_read_smi_reg(port_num, 0, &phy_reg_data0);
-       if ((phy_reg_data0 & 0x1000) == auto_neg)
-               return -ENODEV;                         /* change didn't take */
+       /*
+        * Stop and then re-open the interface. This will allocate RX
+        * skbs of the new MTU.
+        * There is a possible danger that the open will not succeed,
+        * due to memory being full, which might fail the open function.
+        */
+       mv643xx_eth_stop(dev);
+       if (mv643xx_eth_open(dev)) {
+               printk(KERN_ERR "%s: Fatal error on opening device\n",
+                       dev->name);
+       }
 
-       phy_reg_data0 ^= 0x1000;
-       eth_port_write_smi_reg(port_num, 0, phy_reg_data0);
        return 0;
 }
 
 /*
- * ethernet_phy_get - Get the ethernet port PHY address.
- *
- * DESCRIPTION:
- *     This routine returns the given ethernet port PHY address.
- *
- * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
- *
- * OUTPUT:
- *     None.
- *
- * RETURN:
- *     PHY address.
+ * mv643xx_eth_tx_timeout_task
  *
+ * Actual routine to reset the adapter when a timeout on Tx has occurred
  */
-static int ethernet_phy_get(unsigned int eth_port_num)
+static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
 {
-       unsigned int reg_data;
+       struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private,
+                                                 tx_timeout_task);
+       struct net_device *dev = mp->dev;
 
-       reg_data = mv_read(MV643XX_ETH_PHY_ADDR_REG);
+       if (!netif_running(dev))
+               return;
+
+       netif_stop_queue(dev);
 
-       return ((reg_data >> (5 * eth_port_num)) & 0x1f);
+       eth_port_reset(mp);
+       eth_port_start(dev);
+
+       if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
+               netif_wake_queue(dev);
 }
 
 /*
- * ethernet_phy_set - Set the ethernet port PHY address.
- *
- * DESCRIPTION:
- *     This routine sets the given ethernet port PHY address.
- *
- * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
- *     int             phy_addr        PHY address.
- *
- * OUTPUT:
- *     None.
+ * mv643xx_eth_tx_timeout
  *
- * RETURN:
- *     None.
+ * Called upon a timeout on transmitting a packet
  *
+ * Input :     pointer to ethernet interface network device structure.
+ * Output :    N/A
  */
-static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr)
+static void mv643xx_eth_tx_timeout(struct net_device *dev)
 {
-       u32 reg_data;
-       int addr_shift = 5 * eth_port_num;
+       struct mv643xx_private *mp = netdev_priv(dev);
 
-       reg_data = mv_read(MV643XX_ETH_PHY_ADDR_REG);
-       reg_data &= ~(0x1f << addr_shift);
-       reg_data |= (phy_addr & 0x1f) << addr_shift;
-       mv_write(MV643XX_ETH_PHY_ADDR_REG, reg_data);
+       printk(KERN_INFO "%s: TX timeout  ", dev->name);
+
+       /* Do the reset outside of interrupt context */
+       schedule_work(&mp->tx_timeout_task);
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void mv643xx_netpoll(struct net_device *netdev)
+{
+       struct mv643xx_private *mp = netdev_priv(netdev);
+       int port_num = mp->port_num;
+
+       wrl(mp, INT_MASK(port_num), 0x00000000);
+       /* wait for previous write to complete */
+       rdl(mp, INT_MASK(port_num));
+
+       mv643xx_eth_int_handler(netdev->irq, netdev);
+
+       wrl(mp, INT_MASK(port_num), INT_RX | INT_CAUSE_EXT);
 }
+#endif
 
 /*
- * ethernet_phy_reset - Reset Ethernet port PHY.
- *
- * DESCRIPTION:
- *     This routine utilizes the SMI interface to reset the ethernet port PHY.
- *
- * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
- *
- * OUTPUT:
- *     The PHY is reset.
- *
- * RETURN:
- *     None.
- *
+ * Wrappers for MII support library.
  */
-static void ethernet_phy_reset(unsigned int eth_port_num)
+static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
 {
-       unsigned int phy_reg_data;
+       struct mv643xx_private *mp = netdev_priv(dev);
+       int val;
 
-       /* Reset the PHY */
-       eth_port_read_smi_reg(eth_port_num, 0, &phy_reg_data);
-       phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
-       eth_port_write_smi_reg(eth_port_num, 0, phy_reg_data);
+       eth_port_read_smi_reg(mp, location, &val);
+       return val;
+}
 
-       /* wait for PHY to come out of reset */
-       do {
-               udelay(1);
-               eth_port_read_smi_reg(eth_port_num, 0, &phy_reg_data);
-       } while (phy_reg_data & 0x8000);
+static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
+{
+       struct mv643xx_private *mp = netdev_priv(dev);
+       eth_port_write_smi_reg(mp, location, val);
 }
 
-static void mv643xx_eth_port_enable_tx(unsigned int port_num,
-                                       unsigned int queues)
+
+/* platform glue ************************************************************/
+static void mv643xx_eth_conf_mbus_windows(struct mv643xx_shared_private *msp,
+                                         struct mbus_dram_target_info *dram)
 {
-       mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num), queues);
+       void __iomem *base = msp->eth_base;
+       u32 win_enable;
+       u32 win_protect;
+       int i;
+
+       for (i = 0; i < 6; i++) {
+               writel(0, base + WINDOW_BASE(i));
+               writel(0, base + WINDOW_SIZE(i));
+               if (i < 4)
+                       writel(0, base + WINDOW_REMAP_HIGH(i));
+       }
+
+       win_enable = 0x3f;
+       win_protect = 0;
+
+       for (i = 0; i < dram->num_cs; i++) {
+               struct mbus_dram_window *cs = dram->cs + i;
+
+               writel((cs->base & 0xffff0000) |
+                       (cs->mbus_attr << 8) |
+                       dram->mbus_dram_target_id, base + WINDOW_BASE(i));
+               writel((cs->size - 1) & 0xffff0000, base + WINDOW_SIZE(i));
+
+               win_enable &= ~(1 << i);
+               win_protect |= 3 << (2 * i);
+       }
+
+       writel(win_enable, base + WINDOW_BAR_ENABLE);
+       msp->win_protect = win_protect;
 }
 
-static void mv643xx_eth_port_enable_rx(unsigned int port_num,
-                                       unsigned int queues)
-{
-       mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), queues);
-}
+static int mv643xx_eth_shared_probe(struct platform_device *pdev)
+{
+       static int mv643xx_version_printed = 0;
+       struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;
+       struct mv643xx_shared_private *msp;
+       struct resource *res;
+       int ret;
+
+       if (!mv643xx_version_printed++)
+               printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
+
+       ret = -EINVAL;
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (res == NULL)
+               goto out;
+
+       ret = -ENOMEM;
+       msp = kmalloc(sizeof(*msp), GFP_KERNEL);
+       if (msp == NULL)
+               goto out;
+       memset(msp, 0, sizeof(*msp));
+
+       msp->eth_base = ioremap(res->start, res->end - res->start + 1);
+       if (msp->eth_base == NULL)
+               goto out_free;
 
-static unsigned int mv643xx_eth_port_disable_tx(unsigned int port_num)
-{
-       u32 queues;
+       spin_lock_init(&msp->phy_lock);
+       msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
 
-       /* Stop Tx port activity. Check port Tx activity. */
-       queues = mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num))
-                                                       & 0xFF;
-       if (queues) {
-               /* Issue stop command for active queues only */
-               mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num),
-                                                       (queues << 8));
+       platform_set_drvdata(pdev, msp);
 
-               /* Wait for all Tx activity to terminate. */
-               /* Check port cause register that all Tx queues are stopped */
-               while (mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num))
-                                                       & 0xFF)
-                       udelay(PHY_WAIT_MICRO_SECONDS);
+       /*
+        * (Re-)program MBUS remapping windows if we are asked to.
+        */
+       if (pd != NULL && pd->dram != NULL)
+               mv643xx_eth_conf_mbus_windows(msp, pd->dram);
 
-               /* Wait for Tx FIFO to empty */
-               while (mv_read(MV643XX_ETH_PORT_STATUS_REG(port_num)) &
-                                                       ETH_PORT_TX_FIFO_EMPTY)
-                       udelay(PHY_WAIT_MICRO_SECONDS);
-       }
+       return 0;
 
-       return queues;
+out_free:
+       kfree(msp);
+out:
+       return ret;
 }
 
-static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num)
+static int mv643xx_eth_shared_remove(struct platform_device *pdev)
 {
-       u32 queues;
-
-       /* Stop Rx port activity. Check port Rx activity. */
-       queues = mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num))
-                                                       & 0xFF;
-       if (queues) {
-               /* Issue stop command for active queues only */
-               mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
-                                                       (queues << 8));
+       struct mv643xx_shared_private *msp = platform_get_drvdata(pdev);
 
-               /* Wait for all Rx activity to terminate. */
-               /* Check port cause register that all Rx queues are stopped */
-               while (mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num))
-                                                       & 0xFF)
-                       udelay(PHY_WAIT_MICRO_SECONDS);
-       }
+       iounmap(msp->eth_base);
+       kfree(msp);
 
-       return queues;
+       return 0;
 }
 
+static struct platform_driver mv643xx_eth_shared_driver = {
+       .probe = mv643xx_eth_shared_probe,
+       .remove = mv643xx_eth_shared_remove,
+       .driver = {
+               .name = MV643XX_ETH_SHARED_NAME,
+               .owner  = THIS_MODULE,
+       },
+};
+
 /*
- * eth_port_reset - Reset Ethernet port
+ * ethernet_phy_set - Set the ethernet port PHY address.
  *
  * DESCRIPTION:
- *     This routine resets the chip by aborting any SDMA engine activity and
- *     clearing the MIB counters. The Receiver and the Transmit unit are in
- *     idle state after this command is performed and the port is disabled.
+ *     This routine sets the given ethernet port PHY address.
  *
  * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
+ *     struct mv643xx_private *mp      Ethernet Port.
+ *     int             phy_addr        PHY address.
  *
  * OUTPUT:
- *     Channel activity is halted.
+ *     None.
  *
  * RETURN:
  *     None.
  *
  */
-static void eth_port_reset(unsigned int port_num)
+static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
 {
-       unsigned int reg_data;
-
-       mv643xx_eth_port_disable_tx(port_num);
-       mv643xx_eth_port_disable_rx(port_num);
-
-       /* Clear all MIB counters */
-       eth_clear_mib_counters(port_num);
+       u32 reg_data;
+       int addr_shift = 5 * mp->port_num;
 
-       /* Reset the Enable bit in the Configuration Register */
-       reg_data = mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num));
-       reg_data &= ~(MV643XX_ETH_SERIAL_PORT_ENABLE            |
-                       MV643XX_ETH_DO_NOT_FORCE_LINK_FAIL      |
-                       MV643XX_ETH_FORCE_LINK_PASS);
-       mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), reg_data);
+       reg_data = rdl(mp, PHY_ADDR);
+       reg_data &= ~(0x1f << addr_shift);
+       reg_data |= (phy_addr & 0x1f) << addr_shift;
+       wrl(mp, PHY_ADDR, reg_data);
 }
 
-
 /*
- * eth_port_read_smi_reg - Read PHY registers
+ * ethernet_phy_get - Get the ethernet port PHY address.
  *
  * DESCRIPTION:
- *     This routine utilize the SMI interface to interact with the PHY in
- *     order to perform PHY register read.
+ *     This routine returns the given ethernet port PHY address.
  *
  * INPUT:
- *     unsigned int    port_num        Ethernet Port number.
- *     unsigned int    phy_reg         PHY register address offset.
- *     unsigned int    *value          Register value buffer.
+ *     struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
- *     Write the value of a specified PHY register into given buffer.
+ *     None.
  *
  * RETURN:
- *     false if the PHY is busy or read data is not in valid state.
- *     true otherwise.
+ *     PHY address.
  *
  */
-static void eth_port_read_smi_reg(unsigned int port_num,
-                               unsigned int phy_reg, unsigned int *value)
+static int ethernet_phy_get(struct mv643xx_private *mp)
 {
-       int phy_addr = ethernet_phy_get(port_num);
-       unsigned long flags;
-       int i;
-
-       /* the SMI register is a shared resource */
-       spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
-
-       /* wait for the SMI register to become available */
-       for (i = 0; mv_read(MV643XX_ETH_SMI_REG) & ETH_SMI_BUSY; i++) {
-               if (i == PHY_WAIT_ITERATIONS) {
-                       printk("mv643xx PHY busy timeout, port %d\n", port_num);
-                       goto out;
-               }
-               udelay(PHY_WAIT_MICRO_SECONDS);
-       }
-
-       mv_write(MV643XX_ETH_SMI_REG,
-               (phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ);
+       unsigned int reg_data;
 
-       /* now wait for the data to be valid */
-       for (i = 0; !(mv_read(MV643XX_ETH_SMI_REG) & ETH_SMI_READ_VALID); i++) {
-               if (i == PHY_WAIT_ITERATIONS) {
-                       printk("mv643xx PHY read timeout, port %d\n", port_num);
-                       goto out;
-               }
-               udelay(PHY_WAIT_MICRO_SECONDS);
-       }
+       reg_data = rdl(mp, PHY_ADDR);
 
-       *value = mv_read(MV643XX_ETH_SMI_REG) & 0xffff;
-out:
-       spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);
+       return ((reg_data >> (5 * mp->port_num)) & 0x1f);
 }
 
 /*
- * eth_port_write_smi_reg - Write to PHY registers
+ * ethernet_phy_detect - Detect whether a phy is present
  *
  * DESCRIPTION:
- *     This routine utilize the SMI interface to interact with the PHY in
- *     order to perform writes to PHY registers.
+ *     This function tests whether there is a PHY present on
+ *     the specified port.
  *
  * INPUT:
- *     unsigned int    eth_port_num    Ethernet Port number.
- *     unsigned int    phy_reg         PHY register address offset.
- *     unsigned int    value           Register value.
+ *     struct mv643xx_private *mp      Ethernet Port.
  *
  * OUTPUT:
- *     Write the given value to the specified PHY register.
+ *     None
  *
  * RETURN:
- *     false if the PHY is busy.
- *     true otherwise.
+ *     0 on success
+ *     -ENODEV on failure
  *
  */
-static void eth_port_write_smi_reg(unsigned int eth_port_num,
-                                  unsigned int phy_reg, unsigned int value)
+static int ethernet_phy_detect(struct mv643xx_private *mp)
 {
-       int phy_addr;
-       int i;
-       unsigned long flags;
-
-       phy_addr = ethernet_phy_get(eth_port_num);
+       unsigned int phy_reg_data0;
+       int auto_neg;
 
-       /* the SMI register is a shared resource */
-       spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
+       eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
+       auto_neg = phy_reg_data0 & 0x1000;
+       phy_reg_data0 ^= 0x1000;        /* invert auto_neg */
+       eth_port_write_smi_reg(mp, 0, phy_reg_data0);
 
-       /* wait for the SMI register to become available */
-       for (i = 0; mv_read(MV643XX_ETH_SMI_REG) & ETH_SMI_BUSY; i++) {
-               if (i == PHY_WAIT_ITERATIONS) {
-                       printk("mv643xx PHY busy timeout, port %d\n",
-                                                               eth_port_num);
-                       goto out;
-               }
-               udelay(PHY_WAIT_MICRO_SECONDS);
-       }
+       eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
+       if ((phy_reg_data0 & 0x1000) == auto_neg)
+               return -ENODEV;                         /* change didn't take */
 
-       mv_write(MV643XX_ETH_SMI_REG, (phy_addr << 16) | (phy_reg << 21) |
-                               ETH_SMI_OPCODE_WRITE | (value & 0xffff));
-out:
-       spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);
+       phy_reg_data0 ^= 0x1000;
+       eth_port_write_smi_reg(mp, 0, phy_reg_data0);
+       return 0;
 }
 
-/*
- * Wrappers for MII support library.
- */
-static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
+static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
+                                    int speed, int duplex,
+                                    struct ethtool_cmd *cmd)
 {
-       int val;
        struct mv643xx_private *mp = netdev_priv(dev);
 
-       eth_port_read_smi_reg(mp->port_num, location, &val);
-       return val;
-}
+       memset(cmd, 0, sizeof(*cmd));
 
-static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
-{
-       struct mv643xx_private *mp = netdev_priv(dev);
-       eth_port_write_smi_reg(mp->port_num, location, val);
+       cmd->port = PORT_MII;
+       cmd->transceiver = XCVR_INTERNAL;
+       cmd->phy_address = phy_address;
+
+       if (speed == 0) {
+               cmd->autoneg = AUTONEG_ENABLE;
+               /* mii lib checks, but doesn't use speed on AUTONEG_ENABLE */
+               cmd->speed = SPEED_100;
+               cmd->advertising = ADVERTISED_10baseT_Half  |
+                                  ADVERTISED_10baseT_Full  |
+                                  ADVERTISED_100baseT_Half |
+                                  ADVERTISED_100baseT_Full;
+               if (mp->mii.supports_gmii)
+                       cmd->advertising |= ADVERTISED_1000baseT_Full;
+       } else {
+               cmd->autoneg = AUTONEG_DISABLE;
+               cmd->speed = speed;
+               cmd->duplex = duplex;
+       }
 }
 
-/*
- * eth_port_receive - Get received information from Rx ring.
- *
- * DESCRIPTION:
- *     This routine returns the received data to the caller. There is no
- *     data copying during routine operation. All information is returned
- *     using pointer to packet information struct passed from the caller.
- *     If the routine exhausts Rx ring resources then the resource error flag
- *     is set.
- *
- * INPUT:
- *     struct mv643xx_private  *mp             Ethernet Port Control srtuct.
- *     struct pkt_info         *p_pkt_info     User packet buffer.
+/*/
+ * mv643xx_eth_probe
  *
- * OUTPUT:
- *     Rx ring current and used indexes are updated.
+ * First function called after registering the network device.
+ * It's purpose is to initialize the device as an ethernet device,
+ * fill the ethernet device structure with pointers * to functions,
+ * and set the MAC address of the interface
  *
- * RETURN:
- *     ETH_ERROR in case the routine can not access Rx desc ring.
- *     ETH_QUEUE_FULL if Rx ring resources are exhausted.
- *     ETH_END_OF_JOB if there is no received data.
- *     ETH_OK otherwise.
+ * Input :     struct device *
+ * Output :    -ENOMEM if failed , 0 if success
  */
-static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
-                                               struct pkt_info *p_pkt_info)
+static int mv643xx_eth_probe(struct platform_device *pdev)
 {
-       int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
-       volatile struct eth_rx_desc *p_rx_desc;
-       unsigned int command_status;
-       unsigned long flags;
+       struct mv643xx_eth_platform_data *pd;
+       int port_num;
+       struct mv643xx_private *mp;
+       struct net_device *dev;
+       u8 *p;
+       struct resource *res;
+       int err;
+       struct ethtool_cmd cmd;
+       int duplex = DUPLEX_HALF;
+       int speed = 0;                  /* default to auto-negotiation */
+       DECLARE_MAC_BUF(mac);
 
-       /* Do not process Rx ring in case of Rx ring resource error */
-       if (mp->rx_resource_err)
-               return ETH_QUEUE_FULL;
+       pd = pdev->dev.platform_data;
+       if (pd == NULL) {
+               printk(KERN_ERR "No mv643xx_eth_platform_data\n");
+               return -ENODEV;
+       }
 
-       spin_lock_irqsave(&mp->lock, flags);
+       if (pd->shared == NULL) {
+               printk(KERN_ERR "No mv643xx_eth_platform_data->shared\n");
+               return -ENODEV;
+       }
 
-       /* Get the Rx Desc ring 'curr and 'used' indexes */
-       rx_curr_desc = mp->rx_curr_desc_q;
-       rx_used_desc = mp->rx_used_desc_q;
+       dev = alloc_etherdev(sizeof(struct mv643xx_private));
+       if (!dev)
+               return -ENOMEM;
 
-       p_rx_desc = &mp->p_rx_desc_area[rx_curr_desc];
+       platform_set_drvdata(pdev, dev);
 
-       /* The following parameters are used to save readings from memory */
-       command_status = p_rx_desc->cmd_sts;
-       rmb();
+       mp = netdev_priv(dev);
+       mp->dev = dev;
+#ifdef MV643XX_NAPI
+       netif_napi_add(dev, &mp->napi, mv643xx_poll, 64);
+#endif
 
-       /* Nothing to receive... */
-       if (command_status & (ETH_BUFFER_OWNED_BY_DMA)) {
-               spin_unlock_irqrestore(&mp->lock, flags);
-               return ETH_END_OF_JOB;
-       }
+       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+       BUG_ON(!res);
+       dev->irq = res->start;
 
-       p_pkt_info->byte_cnt = (p_rx_desc->byte_cnt) - RX_BUF_OFFSET;
-       p_pkt_info->cmd_sts = command_status;
-       p_pkt_info->buf_ptr = (p_rx_desc->buf_ptr) + RX_BUF_OFFSET;
-       p_pkt_info->return_info = mp->rx_skb[rx_curr_desc];
-       p_pkt_info->l4i_chk = p_rx_desc->buf_size;
+       dev->open = mv643xx_eth_open;
+       dev->stop = mv643xx_eth_stop;
+       dev->hard_start_xmit = mv643xx_eth_start_xmit;
+       dev->set_mac_address = mv643xx_eth_set_mac_address;
+       dev->set_multicast_list = mv643xx_eth_set_rx_mode;
+
+       /* No need to Tx Timeout */
+       dev->tx_timeout = mv643xx_eth_tx_timeout;
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       dev->poll_controller = mv643xx_netpoll;
+#endif
+
+       dev->watchdog_timeo = 2 * HZ;
+       dev->base_addr = 0;
+       dev->change_mtu = mv643xx_eth_change_mtu;
+       dev->do_ioctl = mv643xx_eth_do_ioctl;
+       SET_ETHTOOL_OPS(dev, &mv643xx_ethtool_ops);
 
+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+#ifdef MAX_SKB_FRAGS
        /*
-        * Clean the return info field to indicate that the
-        * packet has been moved to the upper layers
+        * Zero copy can only work if we use Discovery II memory. Else, we will
+        * have to map the buffers to ISA memory which is only 16 MB
         */
-       mp->rx_skb[rx_curr_desc] = NULL;
+       dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
+#endif
+#endif
+
+       /* Configure the timeout task */
+       INIT_WORK(&mp->tx_timeout_task, mv643xx_eth_tx_timeout_task);
 
-       /* Update current index in data structure */
-       rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
-       mp->rx_curr_desc_q = rx_next_curr_desc;
+       spin_lock_init(&mp->lock);
 
-       /* Rx descriptors exhausted. Set the Rx ring resource error flag */
-       if (rx_next_curr_desc == rx_used_desc)
-               mp->rx_resource_err = 1;
+       mp->shared = platform_get_drvdata(pd->shared);
+       port_num = mp->port_num = pd->port_number;
 
-       spin_unlock_irqrestore(&mp->lock, flags);
+       if (mp->shared->win_protect)
+               wrl(mp, WINDOW_PROTECT(port_num), mp->shared->win_protect);
 
-       return ETH_OK;
-}
+       mp->shared_smi = mp->shared;
+       if (pd->shared_smi != NULL)
+               mp->shared_smi = platform_get_drvdata(pd->shared_smi);
 
-/*
- * eth_rx_return_buff - Returns a Rx buffer back to the Rx ring.
- *
- * DESCRIPTION:
- *     This routine returns a Rx buffer back to the Rx ring. It retrieves the
- *     next 'used' descriptor and attached the returned buffer to it.
- *     In case the Rx ring was in "resource error" condition, where there are
- *     no available Rx resources, the function resets the resource error flag.
- *
- * INPUT:
- *     struct mv643xx_private  *mp             Ethernet Port Control srtuct.
- *     struct pkt_info         *p_pkt_info     Information on returned buffer.
- *
- * OUTPUT:
- *     New available Rx resource in Rx descriptor ring.
- *
- * RETURN:
- *     ETH_ERROR in case the routine can not access Rx desc ring.
- *     ETH_OK otherwise.
- */
-static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
-                                               struct pkt_info *p_pkt_info)
-{
-       int used_rx_desc;       /* Where to return Rx resource */
-       volatile struct eth_rx_desc *p_used_rx_desc;
-       unsigned long flags;
+       /* set default config values */
+       eth_port_uc_addr_get(mp, dev->dev_addr);
+       mp->rx_ring_size = PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
+       mp->tx_ring_size = PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
 
-       spin_lock_irqsave(&mp->lock, flags);
+       if (is_valid_ether_addr(pd->mac_addr))
+               memcpy(dev->dev_addr, pd->mac_addr, 6);
 
-       /* Get 'used' Rx descriptor */
-       used_rx_desc = mp->rx_used_desc_q;
-       p_used_rx_desc = &mp->p_rx_desc_area[used_rx_desc];
+       if (pd->phy_addr || pd->force_phy_addr)
+               ethernet_phy_set(mp, pd->phy_addr);
 
-       p_used_rx_desc->buf_ptr = p_pkt_info->buf_ptr;
-       p_used_rx_desc->buf_size = p_pkt_info->byte_cnt;
-       mp->rx_skb[used_rx_desc] = p_pkt_info->return_info;
+       if (pd->rx_queue_size)
+               mp->rx_ring_size = pd->rx_queue_size;
 
-       /* Flush the write pipe */
+       if (pd->tx_queue_size)
+               mp->tx_ring_size = pd->tx_queue_size;
 
-       /* Return the descriptor to DMA ownership */
-       wmb();
-       p_used_rx_desc->cmd_sts =
-                       ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
-       wmb();
+       if (pd->tx_sram_size) {
+               mp->tx_sram_size = pd->tx_sram_size;
+               mp->tx_sram_addr = pd->tx_sram_addr;
+       }
 
-       /* Move the used descriptor pointer to the next descriptor */
-       mp->rx_used_desc_q = (used_rx_desc + 1) % mp->rx_ring_size;
+       if (pd->rx_sram_size) {
+               mp->rx_sram_size = pd->rx_sram_size;
+               mp->rx_sram_addr = pd->rx_sram_addr;
+       }
 
-       /* Any Rx return cancels the Rx resource error status */
-       mp->rx_resource_err = 0;
+       duplex = pd->duplex;
+       speed = pd->speed;
 
-       spin_unlock_irqrestore(&mp->lock, flags);
+       /* Hook up MII support for ethtool */
+       mp->mii.dev = dev;
+       mp->mii.mdio_read = mv643xx_mdio_read;
+       mp->mii.mdio_write = mv643xx_mdio_write;
+       mp->mii.phy_id = ethernet_phy_get(mp);
+       mp->mii.phy_id_mask = 0x3f;
+       mp->mii.reg_num_mask = 0x1f;
 
-       return ETH_OK;
-}
+       err = ethernet_phy_detect(mp);
+       if (err) {
+               pr_debug("%s: No PHY detected at addr %d\n",
+                               dev->name, ethernet_phy_get(mp));
+               goto out;
+       }
 
-/************* Begin ethtool support *************************/
+       ethernet_phy_reset(mp);
+       mp->mii.supports_gmii = mii_check_gmii_support(&mp->mii);
+       mv643xx_init_ethtool_cmd(dev, mp->mii.phy_id, speed, duplex, &cmd);
+       mv643xx_eth_update_pscr(dev, &cmd);
+       mv643xx_set_settings(dev, &cmd);
 
-struct mv643xx_stats {
-       char stat_string[ETH_GSTRING_LEN];
-       int sizeof_stat;
-       int stat_offset;
-};
+       SET_NETDEV_DEV(dev, &pdev->dev);
+       err = register_netdev(dev);
+       if (err)
+               goto out;
 
-#define MV643XX_STAT(m) sizeof(((struct mv643xx_private *)0)->m), \
-                                       offsetof(struct mv643xx_private, m)
+       p = dev->dev_addr;
+       printk(KERN_NOTICE
+               "%s: port %d with MAC address %s\n",
+               dev->name, port_num, print_mac(mac, p));
 
-static const struct mv643xx_stats mv643xx_gstrings_stats[] = {
-       { "rx_packets", MV643XX_STAT(stats.rx_packets) },
-       { "tx_packets", MV643XX_STAT(stats.tx_packets) },
-       { "rx_bytes", MV643XX_STAT(stats.rx_bytes) },
-       { "tx_bytes", MV643XX_STAT(stats.tx_bytes) },
-       { "rx_errors", MV643XX_STAT(stats.rx_errors) },
-       { "tx_errors", MV643XX_STAT(stats.tx_errors) },
-       { "rx_dropped", MV643XX_STAT(stats.rx_dropped) },
-       { "tx_dropped", MV643XX_STAT(stats.tx_dropped) },
-       { "good_octets_received", MV643XX_STAT(mib_counters.good_octets_received) },
-       { "bad_octets_received", MV643XX_STAT(mib_counters.bad_octets_received) },
-       { "internal_mac_transmit_err", MV643XX_STAT(mib_counters.internal_mac_transmit_err) },
-       { "good_frames_received", MV643XX_STAT(mib_counters.good_frames_received) },
-       { "bad_frames_received", MV643XX_STAT(mib_counters.bad_frames_received) },
-       { "broadcast_frames_received", MV643XX_STAT(mib_counters.broadcast_frames_received) },
-       { "multicast_frames_received", MV643XX_STAT(mib_counters.multicast_frames_received) },
-       { "frames_64_octets", MV643XX_STAT(mib_counters.frames_64_octets) },
-       { "frames_65_to_127_octets", MV643XX_STAT(mib_counters.frames_65_to_127_octets) },
-       { "frames_128_to_255_octets", MV643XX_STAT(mib_counters.frames_128_to_255_octets) },
-       { "frames_256_to_511_octets", MV643XX_STAT(mib_counters.frames_256_to_511_octets) },
-       { "frames_512_to_1023_octets", MV643XX_STAT(mib_counters.frames_512_to_1023_octets) },
-       { "frames_1024_to_max_octets", MV643XX_STAT(mib_counters.frames_1024_to_max_octets) },
-       { "good_octets_sent", MV643XX_STAT(mib_counters.good_octets_sent) },
-       { "good_frames_sent", MV643XX_STAT(mib_counters.good_frames_sent) },
-       { "excessive_collision", MV643XX_STAT(mib_counters.excessive_collision) },
-       { "multicast_frames_sent", MV643XX_STAT(mib_counters.multicast_frames_sent) },
-       { "broadcast_frames_sent", MV643XX_STAT(mib_counters.broadcast_frames_sent) },
-       { "unrec_mac_control_received", MV643XX_STAT(mib_counters.unrec_mac_control_received) },
-       { "fc_sent", MV643XX_STAT(mib_counters.fc_sent) },
-       { "good_fc_received", MV643XX_STAT(mib_counters.good_fc_received) },
-       { "bad_fc_received", MV643XX_STAT(mib_counters.bad_fc_received) },
-       { "undersize_received", MV643XX_STAT(mib_counters.undersize_received) },
-       { "fragments_received", MV643XX_STAT(mib_counters.fragments_received) },
-       { "oversize_received", MV643XX_STAT(mib_counters.oversize_received) },
-       { "jabber_received", MV643XX_STAT(mib_counters.jabber_received) },
-       { "mac_receive_error", MV643XX_STAT(mib_counters.mac_receive_error) },
-       { "bad_crc_event", MV643XX_STAT(mib_counters.bad_crc_event) },
-       { "collision", MV643XX_STAT(mib_counters.collision) },
-       { "late_collision", MV643XX_STAT(mib_counters.late_collision) },
-};
+       if (dev->features & NETIF_F_SG)
+               printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name);
+
+       if (dev->features & NETIF_F_IP_CSUM)
+               printk(KERN_NOTICE "%s: TX TCP/IP Checksumming Supported\n",
+                                                               dev->name);
 
-#define MV643XX_STATS_LEN      \
-       sizeof(mv643xx_gstrings_stats) / sizeof(struct mv643xx_stats)
+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+       printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON \n", dev->name);
+#endif
 
-static void mv643xx_get_drvinfo(struct net_device *netdev,
-                               struct ethtool_drvinfo *drvinfo)
-{
-       strncpy(drvinfo->driver,  mv643xx_driver_name, 32);
-       strncpy(drvinfo->version, mv643xx_driver_version, 32);
-       strncpy(drvinfo->fw_version, "N/A", 32);
-       strncpy(drvinfo->bus_info, "mv643xx", 32);
-       drvinfo->n_stats = MV643XX_STATS_LEN;
-}
+#ifdef MV643XX_COAL
+       printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON \n",
+                                                               dev->name);
+#endif
 
-static int mv643xx_get_stats_count(struct net_device *netdev)
-{
-       return MV643XX_STATS_LEN;
-}
+#ifdef MV643XX_NAPI
+       printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
+#endif
 
-static void mv643xx_get_ethtool_stats(struct net_device *netdev,
-                               struct ethtool_stats *stats, uint64_t *data)
-{
-       struct mv643xx_private *mp = netdev->priv;
-       int i;
+       if (mp->tx_sram_size > 0)
+               printk(KERN_NOTICE "%s: Using SRAM\n", dev->name);
 
-       eth_update_mib_counters(mp);
+       return 0;
 
-       for (i = 0; i < MV643XX_STATS_LEN; i++) {
-               char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;     
-               data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
-                       sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
-       }
+out:
+       free_netdev(dev);
+
+       return err;
 }
 
-static void mv643xx_get_strings(struct net_device *netdev, uint32_t stringset,
-                               uint8_t *data)
+static int mv643xx_eth_remove(struct platform_device *pdev)
 {
-       int i;
+       struct net_device *dev = platform_get_drvdata(pdev);
 
-       switch(stringset) {
-       case ETH_SS_STATS:
-               for (i=0; i < MV643XX_STATS_LEN; i++) {
-                       memcpy(data + i * ETH_GSTRING_LEN,
-                                       mv643xx_gstrings_stats[i].stat_string,
-                                       ETH_GSTRING_LEN);
-               }
-               break;
-       }
+       unregister_netdev(dev);
+       flush_scheduled_work();
+
+       free_netdev(dev);
+       platform_set_drvdata(pdev, NULL);
+       return 0;
 }
 
-static u32 mv643xx_eth_get_link(struct net_device *dev)
+static void mv643xx_eth_shutdown(struct platform_device *pdev)
 {
+       struct net_device *dev = platform_get_drvdata(pdev);
        struct mv643xx_private *mp = netdev_priv(dev);
+       unsigned int port_num = mp->port_num;
 
-       return mii_link_ok(&mp->mii);
+       /* Mask all interrupts on ethernet port */
+       wrl(mp, INT_MASK(port_num), 0);
+       rdl(mp, INT_MASK(port_num));
+
+       eth_port_reset(mp);
 }
 
-static int mv643xx_eth_nway_restart(struct net_device *dev)
+static struct platform_driver mv643xx_eth_driver = {
+       .probe = mv643xx_eth_probe,
+       .remove = mv643xx_eth_remove,
+       .shutdown = mv643xx_eth_shutdown,
+       .driver = {
+               .name = MV643XX_ETH_NAME,
+               .owner  = THIS_MODULE,
+       },
+};
+
+/*
+ * mv643xx_init_module
+ *
+ * Registers the network drivers into the Linux kernel
+ *
+ * Input :     N/A
+ *
+ * Output :    N/A
+ */
+static int __init mv643xx_init_module(void)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
+       int rc;
 
-       return mii_nway_restart(&mp->mii);
+       rc = platform_driver_register(&mv643xx_eth_shared_driver);
+       if (!rc) {
+               rc = platform_driver_register(&mv643xx_eth_driver);
+               if (rc)
+                       platform_driver_unregister(&mv643xx_eth_shared_driver);
+       }
+       return rc;
 }
 
-static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+/*
+ * mv643xx_cleanup_module
+ *
+ * Registers the network drivers into the Linux kernel
+ *
+ * Input :     N/A
+ *
+ * Output :    N/A
+ */
+static void __exit mv643xx_cleanup_module(void)
 {
-       struct mv643xx_private *mp = netdev_priv(dev);
-
-       return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL);
+       platform_driver_unregister(&mv643xx_eth_driver);
+       platform_driver_unregister(&mv643xx_eth_shared_driver);
 }
 
-static struct ethtool_ops mv643xx_ethtool_ops = {
-       .get_settings           = mv643xx_get_settings,
-       .set_settings           = mv643xx_set_settings,
-       .get_drvinfo            = mv643xx_get_drvinfo,
-       .get_link               = mv643xx_eth_get_link,
-       .get_sg                 = ethtool_op_get_sg,
-       .set_sg                 = ethtool_op_set_sg,
-       .get_strings            = mv643xx_get_strings,
-       .get_stats_count        = mv643xx_get_stats_count,
-       .get_ethtool_stats      = mv643xx_get_ethtool_stats,
-       .get_strings            = mv643xx_get_strings,
-       .get_stats_count        = mv643xx_get_stats_count,
-       .get_ethtool_stats      = mv643xx_get_ethtool_stats,
-       .nway_reset             = mv643xx_eth_nway_restart,
-};
+module_init(mv643xx_init_module);
+module_exit(mv643xx_cleanup_module);
 
-/************* End ethtool support *************************/
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
+               " and Dale Farnsworth");
+MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
+MODULE_ALIAS("platform:" MV643XX_ETH_NAME);
+MODULE_ALIAS("platform:" MV643XX_ETH_SHARED_NAME);