r2632 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series
Sven Luther
luther at costa.debian.org
Fri Oct 19 10:59:26 UTC 2007
Author: luther
Date: 2005-03-07 14:57:28 +0100 (Mon, 07 Mar 2005)
New Revision: 2632
Added:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-pegasos-marvell.dpatch
Removed:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos-old.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
Added a new version of the powerpc/pegasos marvell gigabit ethernet driver.
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-03-07 05:30:22 UTC (rev 2631)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-03-07 13:57:28 UTC (rev 2632)
@@ -2,8 +2,13 @@
* Initial 2.6.11 kernel-source creation (Sven Luther)
- -- Sven Luther <luther at debian.org> Fri, 4 Mar 2005 10:39:06 +0100
+ * [powerpc] New pegasos/marvell gigabit ethernet patch with more chances
+ to go upstream (Sven Luther)
+ * [powerpc] 750Cxe and tau calibration patch from Nicolas Det (Sven Luther)
+
+ -- Sven Luther <luther at debian.org> Mon, 7 Mar 2005 14:56:32 +0100
+
kernel-source-2.6.10 (2.6.10-6) UNRELEASED; urgency=low
* Updated kernel-tree description from Martin F Krafft
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos-old.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos-old.dpatch 2005-03-07 05:30:22 UTC (rev 2631)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos-old.dpatch 2005-03-07 13:57:28 UTC (rev 2632)
@@ -1,2315 +0,0 @@
-#! /bin/sh -e
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Add Pegasos2 support in mv64340_eth
-## DP: Patch author: Nicolas DET, Christoph Hewllwig
-## DP: Upstream status: not submitted, needs more work
-
-. $(dirname $0)/DPATCH
-
- at DPATCH@
-diff -urN linux-2.6.9.orig/drivers/net/Kconfig linux-2.6.9/drivers/net/Kconfig
---- linux-2.6.9.orig/drivers/net/Kconfig 2004-10-18 23:55:06.000000000 +0200
-+++ linux-2.6.9/drivers/net/Kconfig 2004-10-27 10:31:59.608481264 +0200
-@@ -2162,10 +2162,10 @@
-
- config MV643XX_ETH
- tristate "MV-643XX Ethernet support"
-- depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX
-+ depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || PPC_CHRP
- help
- This driver supports the gigabit Ethernet on the Marvell MV643XX
-- chipset which is used in the Momenco Ocelot C and Jaguar ATX.
-+ chipset which is used in the Momenco Ocelot C, Jaguar ATX and Pegasos II.
-
- config MV643XX_ETH_0
- bool "MV-643XX Port 0"
-diff -urN linux-2.6.9.orig/drivers/net/mv643xx_eth.c linux-2.6.9/drivers/net/mv643xx_eth.c
---- linux-2.6.9.orig/drivers/net/mv643xx_eth.c 2004-10-18 23:53:50.000000000 +0200
-+++ linux-2.6.9/drivers/net/mv643xx_eth.c 2004-10-27 10:31:59.675471080 +0200
-@@ -54,15 +54,27 @@
- #include <asm/types.h>
- #include <asm/pgtable.h>
- #include <asm/system.h>
--#include "mv643xx_eth.h"
-
- /*
- * The first part is the high level driver of the gigE ethernet ports.
- */
-
- /* Definition for configuring driver */
-+#define MV64340_NAPI
-+
-+#define __MV64340_HARDWARE_STATS__
-+
-+//#define MV64340_CHECKSUM_OFFLOAD_TX
-+//#define __NICO_HARDWARE_CSUM__
-+
-+#define MV64340_COAL
-+
-+#undef __VERBOSE__
-+
- #undef MV64340_RX_QUEUE_FILL_ON_TASK
-
-+#include "mv643xx_eth.h"
-+
- /* Constants */
- #define EXTRA_BYTES 32
- #define WRAP ETH_HLEN + 2 + 4 + 16
-@@ -76,6 +88,8 @@
- #endif
-
- /* Static function declarations */
-+static void eth_port_uc_addr_get(unsigned int PortNum,
-+ unsigned char *MacAddr);
- static int mv64340_eth_real_open(struct net_device *);
- static int mv64340_eth_real_stop(struct net_device *);
- static int mv64340_eth_change_mtu(struct net_device *, int);
-@@ -85,9 +99,83 @@
- static int mv64340_poll(struct net_device *dev, int *budget);
- #endif
-
-+#ifdef __PPC__
-+// for PowerPC architecture (Pegasos II) we can for the moment put the chip base addr here
-+// this is the bus adress, it will be io_remap
-+unsigned long marvell_base = 0xf1000000;
-+#endif
-+
-+
- unsigned char prom_mac_addr_base[6];
- unsigned long mv64340_sram_base;
-
-+#ifdef __MV64340_HARDWARE_STATS__
-+static inline unsigned long ethReadMibCounter(int port_num, int offset)
-+{
-+ return MV_READ(MV64340_ETH_MIB_COUNTERS_BASE(port_num) + offset);
-+}
-+
-+static void mv64340_eth_update_stat (struct net_device *dev);
-+static void mv64340_eth_update_stat (struct net_device *dev)
-+{
-+ struct mv64340_private *mp = netdev_priv(dev);
-+ struct net_device_stats *stats = &mp->stats;
-+ unsigned int port_num = mp->port_num;
-+ volatile unsigned int dummy;
-+
-+ /* These are false updates */
-+ stats->rx_packets += (unsigned long)
-+ ethReadMibCounter (port_num,
-+ ETH_MIB_GOOD_FRAMES_RECEIVED);
-+ stats->tx_packets += (unsigned long)
-+ ethReadMibCounter (port_num,
-+ ETH_MIB_GOOD_FRAMES_SENT);
-+ stats->rx_bytes += (unsigned long)
-+ ethReadMibCounter (port_num,
-+ ETH_MIB_GOOD_OCTETS_RECEIVED_LOW);
-+ /*
-+ * Ideally this should be as follows -
-+ *
-+ * stats->rx_bytes += stats->rx_bytes +
-+ * ((unsigned long) ethReadMibCounter (ethernet_private->port_num ,
-+ * ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH) << 32);
-+ *
-+ * But the unsigned long in PowerPC and MIPS are 32bit. So the next read
-+ * is just a dummy read for proper work of the GigE port
-+ */
-+ dummy =ethReadMibCounter (port_num,
-+ ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH);
-+ stats->tx_bytes += (unsigned long)
-+ ethReadMibCounter (port_num,
-+ ETH_MIB_GOOD_OCTETS_SENT_LOW);
-+ dummy = ethReadMibCounter (port_num,
-+ ETH_MIB_GOOD_OCTETS_SENT_HIGH);
-+ stats->rx_errors += (unsigned long)
-+ ethReadMibCounter (port_num,
-+ ETH_MIB_MAC_RECEIVE_ERROR);
-+
-+ /* Rx dropped is for received packet with CRC error */
-+ stats->rx_dropped +=
-+ (unsigned long) ethReadMibCounter (port_num,
-+ ETH_MIB_BAD_CRC_EVENT);
-+ stats->multicast += (unsigned long)
-+ ethReadMibCounter (port_num,
-+ ETH_MIB_MULTICAST_FRAMES_RECEIVED);
-+ stats->collisions +=
-+ (unsigned long) ethReadMibCounter (port_num,
-+ ETH_MIB_COLLISION) +
-+ (unsigned long) ethReadMibCounter (port_num,
-+ ETH_MIB_LATE_COLLISION);
-+ /* detailed rx errors */
-+ stats->rx_length_errors +=
-+ (unsigned long) ethReadMibCounter (port_num,
-+ ETH_MIB_UNDERSIZE_RECEIVED) +
-+ (unsigned long) ethReadMibCounter (port_num,
-+ ETH_MIB_OVERSIZE_RECEIVED);
-+ /* detailed tx errors */
-+}
-+#endif // __HARDWARE_STATS__
-+
- /*
- * Changes MTU (maximum transfer unit) of the gigabit ethenret port
- *
-@@ -325,7 +413,9 @@
- unsigned int eth_int_cause_ext)
- {
- struct mv64340_private *mp = netdev_priv(dev);
-+#ifndef __MV64340_HARDWARE_STATS__
- struct net_device_stats *stats = &mp->stats;
-+#endif
- struct pkt_info pkt_info;
- int released = 1;
-
-@@ -338,7 +428,9 @@
- while (eth_tx_return_desc(mp, &pkt_info) == ETH_OK) {
- if (pkt_info.cmd_sts & BIT0) {
- printk("%s: Error in TX\n", dev->name);
-+#ifndef __MV64340_HARDWARE_STATS__
- stats->tx_errors++;
-+#endif
- }
-
- /*
-@@ -394,7 +486,9 @@
- #endif
- {
- struct mv64340_private *mp = netdev_priv(dev);
-+#ifndef __MV64340_HARDWARE_STATS__
- struct net_device_stats *stats = &mp->stats;
-+#endif
- unsigned int received_packets = 0;
- struct sk_buff *skb;
- struct pkt_info pkt_info;
-@@ -410,8 +504,10 @@
- budget--;
- #endif
- /* Update statistics. Note byte count includes 4 byte CRC count */
-+#ifndef __MV64340_HARDWARE_STATS__
- stats->rx_packets++;
- stats->rx_bytes += pkt_info.byte_cnt;
-+#endif
- skb = (struct sk_buff *) pkt_info.return_info;
- /*
- * In case received a packet without first / last bits on OR
-@@ -421,7 +517,9 @@
- & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
- || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
-+#ifndef __MV64340_HARDWARE_STATS__
- stats->rx_dropped++;
-+#endif
- if ((pkt_info.cmd_sts & (ETH_RX_FIRST_DESC |
- ETH_RX_LAST_DESC)) !=
- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
-@@ -431,11 +529,15 @@
- " descriptors\n",
- dev->name);
- }
-+
-+#ifndef __MV64340_HARDWARE_STATS__
- if (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)
- stats->rx_errors++;
-+#endif
-
- dev_kfree_skb_irq(skb);
- } else {
-+ struct ethhdr *EtherHeader = (struct ethhdr *) skb->data;
- /*
- * The -4 is for the CRC in the trailer of the
- * received packet
-@@ -443,11 +545,47 @@
- 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;
-- skb->csum = htons((pkt_info.cmd_sts
-- & 0x0007fff8) >> 3);
-+ if (
-+ (skb->len > ETH_FRAME_LEN)
-+ && (EtherHeader->h_proto != 0x8870)
-+ )
-+ {
-+ // Jumbo frame requiere a special EthernetType
-+ goto bad_frame;
-+ }
-+
-+ if (!(pkt_info.l4i_chk & BIT2)) // We only deal with non IP fragmented packet
-+ {
-+ u32 ALong = pkt_info.cmd_sts &
-+ (ETH_FRAME_TYPE_IP_V_4 // -> has to be 1
-+ | ETH_FRAME_HEADER_OK // -> has to be 1
-+ | ETH_LAYER_4_CHECKSUM_OK // -> has to be 1
-+ | ETH_LAYER_2_IS_ETH_V_2 // -> has to be 1
-+ | ETH_OTHER_FRAME_TYPE); // -> Has to be 0, 0-> TCP or UDP packet
-+
-+ if (ALong == (ETH_LAYER_4_CHECKSUM_OK
-+ | ETH_FRAME_HEADER_OK
-+ | ETH_LAYER_2_IS_ETH_V_2
-+ | ETH_FRAME_TYPE_IP_V_4 )
-+ )
-+ {
-+ {
-+ skb->ip_summed = CHECKSUM_UNNECESSARY;
-+
-+ // Nico:
-+ // The Linux stack should ignore csum if ip_summed == CHECKSUM_UNNECESSARY
-+ // then we could remove this line
-+ // Also, we should be able to use CHECKSUM_HW with the Marvell
-+ // However, I've been unable to discover what csum the Linux stack expected exacly
-+ //skb->csum = htons((pkt_info.cmd_sts & 0x0007fff8) >> 3);
-+ goto good_frame;
-+ }
-+ }
- }
-+bad_frame:
-+ skb->ip_summed = CHECKSUM_NONE;
-+
-+good_frame:
- skb->protocol = eth_type_trans(skb, dev);
- #ifdef MV64340_NAPI
- netif_receive_skb(skb);
-@@ -488,6 +626,13 @@
- MV_READ(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
- INT_CAUSE_UNMASK_ALL_EXT;
-
-+ /*
-+ * If no real interrupt occured, exit.
-+ * This can happen when using gigE interrupt coalescing mechanism or shared interrupt
-+ */
-+ if ((eth_int_cause == 0x0) && (eth_int_cause_ext == 0x0))
-+ return IRQ_NONE;
-+
- #ifdef MV64340_NAPI
- if (!(eth_int_cause & 0x0007fffd)) {
- /* Dont ack the Rx interrupt */
-@@ -560,13 +705,6 @@
- }
- }
-
-- /*
-- * 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;
--
- return IRQ_HANDLED;
- }
-
-@@ -608,7 +746,6 @@
-
- return coal;
- }
--#endif
-
- /*
- * eth_port_set_tx_coal - Sets coalescing interrupt mechanism on TX path
-@@ -644,6 +781,8 @@
- return coal;
- }
-
-+#endif
-+
- /*
- * mv64340_eth_open
- *
-@@ -663,10 +802,13 @@
- unsigned int port_num = mp->port_num;
- int err = err;
-
-- spin_lock_irq(&mp->lock);
--
-+#if 0
- err = request_irq(dev->irq, mv64340_eth_int_handler,
- SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
-+#else
-+ err = request_irq(dev->irq, &mv64340_eth_int_handler, SA_SHIRQ | SA_SAMPLE_RANDOM,
-+ dev->name, dev);
-+#endif
-
- if (err) {
- printk(KERN_ERR "Can not assign IRQ number to MV64340_eth%d\n",
-@@ -675,6 +817,8 @@
- goto out;
- }
-
-+ spin_lock_irq(&mp->lock);
-+
- if (mv64340_eth_real_open(dev)) {
- printk("%s: Error opening interface\n", dev->name);
- err = -EBUSY;
-@@ -686,11 +830,10 @@
- return 0;
-
- out_free:
-+ spin_unlock_irq(&mp->lock);
- free_irq(dev->irq, dev);
-
- out:
-- spin_unlock_irq(&mp->lock);
--
- return err;
- }
-
-@@ -826,7 +969,7 @@
- /* Set Tx desc pointer in driver struct. */
- mp->tx_curr_desc_q = 0;
- mp->tx_used_desc_q = 0;
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-+#if defined(MV64340_CHECKSUM_OFFLOAD_TX) && !defined(__NICO_HARDWARE_CSUM__)
- mp->tx_first_desc_q = 0;
- #endif
- /* Init Tx ring base and size parameters */
-@@ -915,7 +1058,7 @@
- mp->tx_desc_dma);
- return -ENOMEM;
- }
-- memset(mp->p_rx_desc_area, 0, size);
-+ memset( (void *) mp->p_rx_desc_area, 0, size);
-
- if (!(ether_init_rx_desc_ring(mp, 0)))
- panic("%s: Error initializing RX Ring", dev->name);
-@@ -929,10 +1072,10 @@
- #ifdef MV64340_COAL
- mp->rx_int_coal =
- eth_port_set_rx_coal(port_num, 133000000, MV64340_RX_COAL);
--#endif
-
- mp->tx_int_coal =
- eth_port_set_tx_coal (port_num, 133000000, MV64340_TX_COAL);
-+#endif
-
- /* Increase the Rx side buffer size */
-
-@@ -1136,6 +1279,277 @@
- }
- #endif
-
-+#ifdef __NICO_HARDWARE_CSUM__
-+// New style xmit
-+
-+// Will fill pkt_info->l4ick and cmd_sts with good value
-+static inline void mv64340_fill_pkt_info(struct sk_buff *skb, struct net_device *dev, struct pkt_info *pkt_info)
-+{
-+ struct iphdr *iph = skb->nh.iph;
-+ u16 ip_frag = ntohs(iph->frag_off);
-+
-+ // We will generate csum on any frame we can
-+ // even if ip_summed != CHECKSUM_HW
-+#if 0
-+ if (skb->ip_summed == CHECKSUM_HW)
-+#else
-+ static int count = 0;
-+ if ( ((skb->ip_summed == CHECKSUM_HW) )
-+ || ( (skb->protocol == ETH_P_IP)
-+ && ( iph->protocol == IPPROTO_TCP )
-+ && ( count )
-+ && ( (ip_frag & (BIT13|BIT14)) == BIT14 ) // last frag, do not frag
-+ )
-+ )
-+#endif
-+ {
-+ u32 ipheader_len = (iph->ihl << 11) & 0x00007800;
-+ ++count;
-+
-+ if ( (ip_frag & 0x1fff) == 0)
-+ {
-+ // Non fragmented/first IP packet
-+ pkt_info->l4i_chk = 0;
-+ pkt_info->cmd_sts = ETH_LAYER_4_CHECKSUM_FIRST_DESC
-+ | ( (iph->protocol == IPPROTO_TCP) ? ETH_TCP_FRAME : ETH_UDP_FRAME) ;
-+ }
-+ else if (skb->ip_summed == CHECKSUM_HW)
-+ {
-+ // Ok for non fragmented IP we provide the partial csum
-+ // The stack seems to CSUM this packet itself
-+ // then this feature is untested
-+ //printk("fragmented IP packet\n");
-+ if (iph->protocol == IPPROTO_TCP)
-+ {
-+ pkt_info->cmd_sts = ETH_TCP_FRAME;
-+ pkt_info->l4i_chk = skb->h.th->check;
-+ }
-+ else
-+ {
-+ pkt_info->cmd_sts = ETH_UDP_FRAME;
-+ pkt_info->l4i_chk = skb->h.uh->check;
-+
-+ }
-+ }
-+
-+#if 0
-+// If you can send LLC/SNAP frame, then please test this
-+ {
-+ struct ethhdr * EthHeader = (struct ethhdr *)skb->data;
-+ if ( (EthHeader->h_proto < 0x0600) // the common way to detect LLC frame is to check the type/length field
-+ || (EthHeader->h_proto == 0x8870) ) // special case for Jumbo frame
-+ {
-+ pkt_info->cmd_sts |= ETH_LLC_SNAP_FORMAT;
-+ }
-+ }
-+#endif
-+ // Finaly set all the flag in the cmd field
-+ pkt_info->cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM
-+ | ETH_GEN_IP_V_4_CHECKSUM
-+ | ( (skb->protocol == ETH_P_8021Q ) ? ETH_FRAME_SET_TO_VLAN : 0) // Need to be tested by someone with a VLAN network
-+ | ipheader_len;
-+ }
-+
-+ else pkt_info->cmd_sts = 0;
-+}
-+
-+static int mv64340_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+ struct mv64340_private *ethernet_private = netdev_priv(dev);
-+ //unsigned int port_num = ethernet_private->port_num;
-+ struct pkt_info pkt_info;
-+ unsigned long flags;
-+ ETH_FUNC_RET_STATUS status;
-+ #ifndef __MV64340_HARDWARE_STATS__
-+ struct net_device_stats *stats = ðernet_private->stats;
-+ #endif
-+
-+ if (netif_queue_stopped(dev)) {
-+ printk(KERN_ERR"%s: Tried sending packet when interface is stopped\n",dev->name);
-+ return 1;
-+ }
-+
-+ /* This is a hard error, log it. */
-+ if ((MV64340_TX_QUEUE_SIZE - ethernet_private->tx_ring_skbs) <= (skb_shinfo(skb)->nr_frags + 1)) {
-+ netif_stop_queue(dev);
-+ printk(KERN_ERR"%s: Bug in mv64340_eth - Trying to transmit when queue full !\n", dev->name);
-+ return 1;
-+ }
-+
-+ /* Paranoid check - this shouldn't happen */
-+ if (skb == NULL) {
-+#ifndef __MV64340_HARDWARE_STATS__
-+ stats->tx_dropped++;
-+#endif
-+ return 1;
-+ }
-+
-+ spin_lock_irqsave(ðernet_private->lock, flags);
-+#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-+// Ok here we will handle Scatter (or not) skb -> fragmented data
-+// - First if it's not framgented to as usual (FIRST/LAST, pci_map_single of the
-+// data, and eth_port_send
-+// - But if the data are fragmented( skb_is_nonlinear() ), then we have to send
-+// the first (part of data) with FIRST, and chained the next one. The last one will have
-+// ETH_TX_ENABLE_INTERRUPT and LAST
-+//
-+// By the way, the stack seems to never give us framgmented skb, but it seens that
-+// it's better to support because the stack would not have to linearize the packet
-+// if it's framented (which cost CPU power). Therefore, as the Marvell can handle
-+// that kind of skb, let's support it!
-+//
-+// Special warning about fragmented SKB
-+// As said above, the stack never gave me a such SKB, so it's untested.
-+// There can be a pb if the data to send are no cache align or if someone else
-+// own data in the same cache line that the beginnig of the data ptr and the end
-+// Usually, the kernel/stack should take care to always align that to L1 cache line
-+// size, so everything should be ok, but if not, then it's a kernel bug, will lead
-+// to pbs and it has to be fix
-+// This applies to the first packet as well as the others (page style ..).
-+
-+ if( skb_is_nonlinear(skb) )
-+ {
-+ // Skb fragmented
-+ struct skb_shared_info *SharedInfo = skb_shinfo(skb);
-+ int NumOfFrags = SharedInfo->nr_frags; // NumOfFrags = All the frags - the first one
-+ int i;
-+
-+ // Send the first frag
-+ mv64340_fill_pkt_info(skb, dev, &pkt_info); // For the first frame buffer we put all the needed (or not) flags
-+ pkt_info.cmd_sts |= ETH_TX_FIRST_DESC;
-+ pkt_info.byte_cnt = skb_headlen(skb); // Size of the first frag as decribe in (http://efault.net/npat/docs_and_postings/net_device-features/net_device-features.txt)
-+ pkt_info.buf_ptr = pci_map_single(0, skb->data, pkt_info.byte_cnt, PCI_DMA_TODEVICE);
-+ pkt_info.return_info = NULL;
-+
-+ flush_dcache_range( (unsigned long) skb->data, (unsigned long) ( (u32) skb->data + pkt_info.byte_cnt) );
-+ //printk("first frag %8.8x id=%8.8x len=%d, total len %d, cmd=%8.8x\n", pkt_info.buf_ptr, skb->nh.iph->id, skb_headlen(skb), skb->len, pkt_info.cmd_sts );
-+ status = eth_port_send(ethernet_private, &pkt_info);
-+ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
-+ printk(KERN_ERR "%s: Error on transmitting packet\n",dev->name);
-+
-+ // We have NumOfFrags left to send
-+ if (!NumOfFrags)
-+ {
-+#ifdef __VERBOSE__
-+ if (net_ratelimit() )printk(KERN_ERR "?? kernel bug ? fragmented SKB should at keast have 2 frags !\n");
-+#endif
-+ }
-+ else
-+ {
-+ struct skb_frag_struct *CurrentFrag;
-+ int FrameSize = CurrentFrag->size;
-+ for (i=0; i < (NumOfFrags-1) ; i++)
-+ {
-+ // This loop will send of the remaining frag (but no the last one)
-+ //
-+ // struct skb_frag_struct
-+ // {
-+ // struct page *page;
-+ // __u16 page_offset;
-+ // __u16 size;
-+ // };
-+ CurrentFrag = &SharedInfo->frags[i];
-+ FrameSize = CurrentFrag->size;
-+ pkt_info.cmd_sts = 0L;
-+ pkt_info.l4i_chk = 0x0000;
-+ pkt_info.byte_cnt = FrameSize;
-+ pkt_info.buf_ptr = pci_map_page(0,
-+ CurrentFrag->page,
-+ CurrentFrag->page_offset,
-+ FrameSize,
-+ PCI_DMA_TODEVICE);
-+
-+ pkt_info.return_info = NULL;
-+ flush_dcache_range(
-+ (unsigned long) ( (u32) page_address(CurrentFrag->page) + CurrentFrag->page_offset) ,
-+ (unsigned long) ( (u32) page_address(CurrentFrag->page) + CurrentFrag->page_offset + FrameSize ) );
-+ //printk("len %d cmd %8.8x\n", FrameSize, pkt_info.cmd_sts);
-+ status = eth_port_send(ethernet_private, &pkt_info);
-+ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
-+ printk(KERN_ERR "%s: Error on transmitting packet\n",dev->name);
-+ }
-+
-+ // Ok now we send the last frag
-+ CurrentFrag = &SharedInfo->frags[NumOfFrags-1];
-+ FrameSize = CurrentFrag->size;
-+
-+ pkt_info.cmd_sts = ETH_TX_LAST_DESC;
-+ pkt_info.l4i_chk = 0x0000;
-+ pkt_info.byte_cnt = FrameSize;
-+ pkt_info.buf_ptr = pci_map_page(0,
-+ CurrentFrag->page,
-+ CurrentFrag->page_offset,
-+ FrameSize,
-+ PCI_DMA_TODEVICE);
-+ pkt_info.return_info = skb;
-+ flush_dcache_range(
-+ (unsigned long) ( (u32) page_address(CurrentFrag->page) + CurrentFrag->page_offset) ,
-+ (unsigned long) ( (u32) page_address(CurrentFrag->page) + CurrentFrag->page_offset + FrameSize ) );
-+
-+ //printk("len last %d, cmd %8.8x\n", FrameSize, pkt_info.cmd_sts);
-+ status = eth_port_send(ethernet_private, &pkt_info);
-+ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
-+ printk(KERN_ERR "%s: Error on transmitting packet\n",dev->name);
-+ }
-+ ethernet_private->tx_ring_skbs++;
-+ }
-+ else
-+ {
-+ // Ok, skb->data are linear -> just send the frame
-+ mv64340_fill_pkt_info(skb, dev, &pkt_info);
-+
-+ pkt_info.cmd_sts |= ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC;
-+
-+ pkt_info.byte_cnt = skb->len;
-+ pkt_info.buf_ptr = pci_map_single(0, skb->data, skb->len, PCI_DMA_TODEVICE);
-+ pkt_info.return_info = skb;
-+ // skb_alloc and friend always align head and data to cache line size
-+ flush_dcache_range( (unsigned long) skb->head , (unsigned long) skb->end);
-+ status = eth_port_send(ethernet_private, &pkt_info);
-+
-+ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
-+ printk(KERN_ERR "%s: Error on transmitting packet\n",dev->name);
-+ ethernet_private->tx_ring_skbs++;
-+ }
-+#else // MV64340_CHECKSUM_OFFLOAD_TX
-+ /* Update packet info data structure -- DMA owned, first last */
-+ pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT | ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC;
-+
-+ pkt_info.byte_cnt = skb->len;
-+ pkt_info.buf_ptr = pci_map_single(0, skb->data, skb->len, PCI_DMA_TODEVICE);
-+
-+ flush_dcache_range( (unsigned long) skb->head, (unsigned long) skb->end );
-+ pkt_info.return_info = skb;
-+ status = eth_port_send(ethernet_private, &pkt_info);
-+ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
-+ printk(KERN_ERR "%s: Error on transmitting packet\n",dev->name);
-+ ethernet_private->tx_ring_skbs++;
-+#endif // MV64340_CHECKSUM_OFFLOAD_TX
-+ /* Check if TX queue can handle another skb. If not, then
-+ * signal higher layers to stop requesting TX
-+ */
-+ if (MV64340_TX_QUEUE_SIZE <= (ethernet_private->tx_ring_skbs + 1))
-+ /*
-+ * Stop getting skb's from upper layers.
-+ * Getting skb's from upper layers will be enabled again after
-+ * packets are released.
-+ */
-+ netif_stop_queue(dev);
-+
-+
-+ /* Update statistics and start of transmittion time */
-+#ifndef __MV64340_HARDWARE_STATS__
-+ stats->tx_bytes += skb->len;
-+ stats->tx_packets++;
-+#endif
-+ dev->trans_start = jiffies;
-+
-+ spin_unlock_irqrestore(ðernet_private->lock, flags);
-+ return 0; /* success */
-+}
-+
-+
-+#else //__NICO_HARDWARE_CSUM__
- /*
- * mv64340_eth_start_xmit
- *
-@@ -1150,7 +1564,9 @@
- static int mv64340_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
- {
- struct mv64340_private *mp = netdev_priv(dev);
-+#ifndef __MV64340_HARDWARE_STATS__
- struct net_device_stats *stats = &mp->stats;
-+#endif
- ETH_FUNC_RET_STATUS status;
- unsigned long flags;
- struct pkt_info pkt_info;
-@@ -1174,7 +1590,9 @@
-
- /* Paranoid check - this shouldn't happen */
- if (skb == NULL) {
-+#ifndef __MV64340_HARDWARE_STATS__
- stats->tx_dropped++;
-+#endif
- return 1;
- }
-
-@@ -1209,11 +1627,20 @@
- skb_headlen(skb), PCI_DMA_TODEVICE);
- pkt_info.return_info = 0;
- ipheader = skb->nh.iph->ihl << 11;
-+
-+ // Nico note:
-+ // Liunx always generate the IP checksum (I guess because it's very fast to do)
-+ // so we could remove ETH_GEN_IP_V_4_CHECKSUM here
- pkt_info.cmd_sts = ETH_TX_FIRST_DESC |
- ETH_GEN_TCP_UDP_CHECKSUM |
- ETH_GEN_IP_V_4_CHECKSUM |
- ipheader;
- /* CPU already calculated pseudo header checksum. So, use it */
-+ // Nico:
-+ // A little warning here:
-+ // for the first buffer of a packet, l4i_chk must be 0x0000
-+ // the behaviour of the chip could be unexpected if the Linux stack
-+ // gives us a non zero csum and we are in the first buffer
- pkt_info.l4i_chk = skb->h.th->check;
- status = eth_port_send(mp, &pkt_info);
- if (status != ETH_OK) {
-@@ -1277,14 +1704,17 @@
- netif_stop_queue(dev);
-
- /* Update statistics and start of transmittion time */
-+#ifndef __MV64340_HARDWARE_STATS__
- stats->tx_bytes += skb->len;
- stats->tx_packets++;
-+#endif
- dev->trans_start = jiffies;
-
- spin_unlock_irqrestore(&mp->lock, flags);
-
- return 0; /* success */
- }
-+#endif // new style xmit
-
- /*
- * mv64340_eth_get_stats
-@@ -1300,6 +1730,10 @@
- {
- struct mv64340_private *mp = netdev_priv(dev);
-
-+#ifdef __MV64340_HARDWARE_STATS__
-+ mv64340_eth_update_stat(dev);
-+#endif
-+
- return &mp->stats;
- }
-
-@@ -1326,7 +1760,11 @@
-
- mp = netdev_priv(dev);
-
-+#ifdef __PPC__
-+ dev->irq = 9;
-+#else
- dev->irq = ETH_PORT0_IRQ_NUM + port_num;
-+#endif
-
- dev->open = mv64340_eth_open;
- dev->stop = mv64340_eth_stop;
-@@ -1335,6 +1773,12 @@
- dev->set_mac_address = mv64340_eth_set_mac_address;
- dev->set_multicast_list = mv64340_eth_set_rx_mode;
-
-+#ifdef __MV64340_HARDWARE_STATS__
-+ // reset the stats to zero
-+ mv64340_eth_update_stat(dev);
-+ memset(&mp->stats, 0x00, sizeof(mp->stats) );
-+#endif
-+
- /* No need to Tx Timeout */
- dev->tx_timeout = mv64340_eth_tx_timeout;
- #ifdef MV64340_NAPI
-@@ -1367,9 +1811,13 @@
-
- spin_lock_init(&mp->lock);
-
-+#if defined(__powerpc__)
-+ eth_port_uc_addr_get(port_num, dev->dev_addr);
-+#else
- /* set MAC addresses */
- memcpy(dev->dev_addr, prom_mac_addr_base, 6);
- dev->dev_addr[5] += port_num;
-+#endif
-
- err = register_netdev(dev);
- if (err)
-@@ -1386,8 +1834,17 @@
- if (dev->features & NETIF_F_IP_CSUM)
- printk("TX TCP/IP Checksumming Supported \n");
-
-- printk("RX TCP/UDP Checksum Offload ON, \n");
-- printk("TX and RX Interrupt Coalescing ON \n");
-+#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-+ printk("RX TCP/UDP Checksum Offload ON\n");
-+#else
-+ printk("RX TCP/UDP Checksum Offload OFF\n");
-+#endif
-+
-+#ifdef MV64340_COAL
-+ printk("TX and RX Interrupt Coalescing ON\n");
-+#else
-+ printk("TX and RX Interrupt Coalescing OFF\n");
-+#endif
-
- #ifdef MV64340_NAPI
- printk("RX NAPI Enabled \n");
-@@ -1403,7 +1860,7 @@
-
- static void mv64340_eth_remove(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ //struct mv64340_private *mp = netdev_priv(dev);
-
- unregister_netdev(dev);
- flush_scheduled_work();
-@@ -1427,6 +1884,12 @@
- {
- printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
-
-+#ifdef __PPC__
-+ // First ioremap the Marvell base addr
-+ marvell_base = (unsigned long) ioremap( marvell_base, 64*1024);
-+ printk(KERN_NOTICE "MV-64340: Chip base remaped at 0x%8.8x\n", (int) marvell_base);
-+#endif
-+
- #ifdef CONFIG_MV643XX_ETH_0
- mv64340_dev0 = mv64340_eth_init(0);
- if (!mv64340_dev0) {
-@@ -1770,6 +2233,10 @@
- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(eth_port_num),
- mp->port_rx_queue_command);
-
-+ // Nico
-+ // Set the minimun RX frame to 40 in order to accept, short frame :-)
-+ MV_WRITE(MV64340_ETH_RX_MINIMAL_FRAME_SIZE_REG(eth_port_num), 40);
-+
- /* Check if link is up */
- eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data);
-
-@@ -1816,6 +2283,23 @@
- return;
- }
-
-+static void eth_port_uc_addr_get(unsigned int PortNum,
-+ unsigned char *MacAddr)
-+{
-+ u32 MacLow;
-+ u32 MacHigh;
-+
-+ MacLow = MV_READ(MV64340_ETH_MAC_ADDR_LOW(PortNum));
-+ MacHigh = MV_READ(MV64340_ETH_MAC_ADDR_HIGH(PortNum));
-+
-+ MacAddr[5] = (MacLow) & 0xff;
-+ MacAddr[4] = (MacLow >> 8) & 0xff;
-+ MacAddr[3] = (MacHigh) & 0xff;
-+ MacAddr[2] = (MacHigh >> 8) & 0xff;
-+ MacAddr[1] = (MacHigh >> 16) & 0xff;
-+ MacAddr[0] = (MacHigh >> 24) & 0xff;
-+}
-+
- /*
- * eth_port_uc_addr - This function Set the port unicast address table
- *
-@@ -1996,10 +2480,24 @@
- unsigned int time_out = 50;
- unsigned int phy_reg_data;
-
-- /* 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);
-+ /* change to combined led mode LINK=green 100/1000=dual led*/
-+ eth_port_read_smi_reg(eth_port_num, 24, &phy_reg_data);
-+ phy_reg_data&=~0x0018;
-+ phy_reg_data|= 0x0010;
-+ eth_port_write_smi_reg(eth_port_num,24, phy_reg_data);
-+
-+ /* enable autocrossover in all modes */
-+ eth_port_read_smi_reg(eth_port_num, 16, &phy_reg_data);
-+ phy_reg_data&=~0x0060;
-+ phy_reg_data|= 0x0060;
-+ eth_port_write_smi_reg(eth_port_num,16, phy_reg_data);
-+
-+ /* Reset the PHY and update reg0*/
-+ eth_port_read_smi_reg(eth_port_num, 0, &phy_reg_data);
-+ phy_reg_data &=~0x7fff; /* clear unwanted*/
-+ phy_reg_data |= 0x1000; /* enable auto negotiation*/
-+ phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
-+ eth_port_write_smi_reg(eth_port_num, 0, phy_reg_data);
-
- /* Poll on the PHY LINK */
- do {
-@@ -2273,6 +2771,165 @@
- *
- */
- #ifdef MV64340_CHECKSUM_OFFLOAD_TX
-+
-+#ifdef __NICO_HARDWARE_CSUM__
-+
-+/*
-+ * Modified to include the first descriptor pointer in case of SG
-+ */
-+static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * p_eth_port_ctrl, struct pkt_info * p_pkt_info)
-+{
-+ int tx_desc_curr;
-+ int tx_desc_used;
-+ int tx_next_desc;
-+ volatile struct eth_tx_desc *current_descriptor;
-+ volatile struct eth_tx_desc *first_descriptor;
-+ u32 command_status;
-+
-+ /* Do not process Tx ring in case of Tx ring resource error */
-+ if (p_eth_port_ctrl->tx_resource_err)
-+ return ETH_QUEUE_FULL;
-+
-+ /* Get the Tx Desc ring indexes */
-+ tx_desc_curr = p_eth_port_ctrl->tx_curr_desc_q;
-+ tx_desc_used = p_eth_port_ctrl->tx_used_desc_q;
-+
-+ current_descriptor = &(p_eth_port_ctrl->p_tx_desc_area[tx_desc_curr]);
-+ if (current_descriptor == NULL)
-+ return ETH_ERROR;
-+
-+ tx_next_desc = (tx_desc_curr + 1) % MV64340_TX_QUEUE_SIZE;
-+ command_status = p_pkt_info->cmd_sts;
-+
-+ if (p_pkt_info->byte_cnt == 0)
-+ {
-+ if (net_ratelimit() ) printk(KERN_ERR "MV6436x: Unable to a 0 byte buffer\n");
-+ return ETH_ERROR;
-+ }
-+
-+ if ( (command_status & ETH_TX_FIRST_DESC)
-+ && (command_status & ETH_TX_LAST_DESC) )
-+ {
-+ // We have a "normal" skb, act as usual
-+
-+ //printk("Send opaque frag len=%d, currrent_ptr=%8.8x, next ptr=%8.8x\n", p_pkt_info->byte_cnt, virt_to_bus(current_descriptor), current_descriptor->next_desc_ptr);
-+ //
-+
-+ if (p_pkt_info->byte_cnt < 32)
-+ {
-+ if (net_ratelimit() ) printk(KERN_ERR "MV6436x: Unable to send a such small packet (%d bytes)\n", p_pkt_info->byte_cnt);
-+ return ETH_ERROR;
-+ }
-+
-+ command_status |= ETH_ZERO_PADDING | ETH_GEN_CRC;
-+
-+ current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
-+ current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-+ current_descriptor->l4i_chk = p_pkt_info->l4i_chk;
-+ current_descriptor->cmd_sts = command_status | ETH_BUFFER_OWNED_BY_DMA | ETH_TX_ENABLE_INTERRUPT;
-+
-+
-+ p_eth_port_ctrl->tx_skb[tx_desc_curr] = (struct sk_buff*)p_pkt_info->return_info;
-+
-+ mb();
-+
-+ /* Apply send command */
-+ ETH_ENABLE_TX_QUEUE(p_eth_port_ctrl->port_num);
-+ }
-+
-+ // Ok, we have a "multi-descriptor" packet -> fragmented SKB
-+ else if (command_status & ETH_TX_FIRST_DESC)
-+ {
-+ // First fragment, we fill the first packet desc
-+ command_status |= ETH_GEN_CRC | ETH_BUFFER_OWNED_BY_DMA;
-+
-+ /* fill first descriptor */
-+ first_descriptor = &(p_eth_port_ctrl->p_tx_desc_area[tx_desc_curr]);
-+ first_descriptor->l4i_chk = p_pkt_info->l4i_chk;
-+ first_descriptor->cmd_sts = command_status;
-+ first_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-+ first_descriptor->buf_ptr = p_pkt_info->buf_ptr;
-+
-+ dma_cache_wback_inv((unsigned long)first_descriptor, sizeof(ETH_TX_DESC));
-+ wmb();
-+
-+ //printk("Send first frag len=%d cmd=%8.8x, pkt_ptr=%8.8x, next=%8.8x\n", p_pkt_info->byte_cnt, command_status, virt_to_bus(first_descriptor), first_descriptor->next_desc_ptr);
-+ // Our first frag is ready
-+ // So we return, we should receive the next (and maybe last) frag at the next call
-+ }
-+ else if (!(command_status & ETH_TX_LAST_DESC))
-+ {
-+ // We have just handle the first frag
-+ // here, we take care of the "intermediate frag" aka
-+ // non first and non last
-+ //
-+ // Note: if there are only 2 frags, then this case will not happen
-+
-+ command_status |= ETH_BUFFER_OWNED_BY_DMA;
-+
-+ current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
-+ current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-+ current_descriptor->l4i_chk = p_pkt_info->l4i_chk;
-+ current_descriptor->cmd_sts = command_status;
-+
-+ // For the Pegasos driver this is useless
-+ // because the desc are in SRAM which is non-cacheable
-+ // but it could be useful for other platfrom using the
-+ // MV64362 which has no SRAM
-+ dma_cache_wback_inv((unsigned long)current_descriptor, sizeof(ETH_TX_DESC));
-+ wmb();
-+
-+ //printk("Send inter frag len=%d cmd=%8.8x, pkt_ptr=%8.8x, next=%8.8x\n", p_pkt_info->byte_cnt, current_descriptor->cmd_sts, virt_to_bus(current_descriptor), current_descriptor->next_desc_ptr);
-+ // This intermediate frag done
-+ // at next call we will have either another frag like (unlikely) that
-+ // of the last one (likely)
-+ }
-+ else
-+ {
-+ // And finaly, last frag
-+ // set the usual stuff, the INTERRUPT flag and apply the command
-+#ifdef __VERBOSE__
-+ if ( (p_pkt_info->byte_cnt <= 8) && (p_pkt_info->buf_ptr & 0x7))
-+ {
-+ if (net_ratelimit() )printk("MV6436x: Warning, trying to send a small (%d) and unaligned (0x%8.8x) packet fragement\n", p_pkt_info->byte_cnt, p_pkt_info->buf_ptr );
-+ }
-+#endif
-+ command_status |= ETH_ZERO_PADDING
-+ | ETH_BUFFER_OWNED_BY_DMA
-+ | ETH_TX_ENABLE_INTERRUPT;
-+
-+ current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
-+ current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-+ current_descriptor->l4i_chk = p_pkt_info->l4i_chk;
-+ current_descriptor->cmd_sts = command_status;
-+
-+ dma_cache_wback_inv((unsigned long)current_descriptor, sizeof(ETH_TX_DESC));
-+ wmb();
-+
-+ /* Apply send command */
-+ ETH_ENABLE_TX_QUEUE(p_eth_port_ctrl->port_num);
-+
-+ p_eth_port_ctrl->tx_skb[tx_desc_curr] = (struct sk_buff*)p_pkt_info->return_info;
-+ // Done :-)
-+ }
-+
-+ // Usual ring update stuff
-+ /* Finish Tx packet. Update first desc in case of Tx resource error */
-+ tx_desc_curr = (tx_desc_curr + 1) % MV64340_TX_QUEUE_SIZE;
-+
-+ /* Update the current descriptor */
-+ p_eth_port_ctrl->tx_curr_desc_q = tx_desc_curr;
-+
-+ /* Check for ring index overlap in the Tx desc ring */
-+ if (tx_desc_curr == tx_desc_used)
-+ {
-+ p_eth_port_ctrl->tx_resource_err = 1;
-+ return ETH_QUEUE_LAST_RESOURCE;
-+ }
-+
-+ return ETH_OK;
-+}
-+#else // __NICO_HARDWARE_CSUM__
- /*
- * Modified to include the first descriptor pointer in case of SG
- */
-@@ -2297,6 +2954,9 @@
- return ETH_ERROR;
-
- tx_next_desc = (tx_desc_curr + 1) % MV64340_TX_QUEUE_SIZE;
-+
-+ // Nico: Warning ETH_ZERO_PADDING is only valid if the L flag is set
-+ // the behaviour of the chip could be unexpected in that case
- command_status = p_pkt_info->cmd_sts | ETH_ZERO_PADDING | ETH_GEN_CRC;
-
- if (command_status & ETH_TX_FIRST_DESC) {
-@@ -2340,8 +3000,6 @@
-
- mp->tx_skb[tx_desc_curr] = (struct sk_buff*) p_pkt_info->return_info;
-
-- wmb();
--
- /* Set last desc with DMA ownership and interrupt enable. */
- if (command_status & ETH_TX_LAST_DESC) {
- current_descriptor->cmd_sts = command_status |
-@@ -2350,14 +3008,14 @@
-
- if (!(command_status & ETH_TX_FIRST_DESC))
- first_descriptor->cmd_sts |= ETH_BUFFER_OWNED_BY_DMA;
-- wmb();
--
- first_chip_ptr = MV_READ(MV64340_ETH_CURRENT_SERVED_TX_DESC_PTR(mp->port_num));
-
- /* Apply send command */
- if (first_chip_ptr == 0x00000000)
- MV_WRITE(MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(mp->port_num), (struct eth_tx_desc *) mp->tx_desc_dma + tx_first_desc);
-
-+ mb();
-+
- ETH_ENABLE_TX_QUEUE(mp->port_num);
-
- /*
-@@ -2385,6 +3043,8 @@
-
- return ETH_OK;
- }
-+#endif //__NICO_HARDWARE_CSUM__
-+
- #else
- static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp,
- struct pkt_info * p_pkt_info)
-@@ -2413,6 +3073,7 @@
- * 64-bit boundary. We use the memory allocated for Tx descriptor.
- * This memory is located in TX_BUF_OFFSET_IN_DESC offset within the
- * Tx descriptor. */
-+
- if (p_pkt_info->byte_cnt <= 8) {
- printk(KERN_ERR
- "You have failed in the < 8 bytes errata - fixme\n");
-@@ -2422,12 +3083,12 @@
- current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
- mp->tx_skb[tx_desc_curr] = (struct sk_buff *) p_pkt_info->return_info;
-
-- mb();
--
- /* Set last desc with DMA ownership and interrupt enable. */
- current_descriptor->cmd_sts = command_status |
- ETH_BUFFER_OWNED_BY_DMA | ETH_TX_ENABLE_INTERRUPT;
-
-+ mb();
-+
- /* Apply send command */
- ETH_ENABLE_TX_QUEUE(mp->port_num);
-
-@@ -2566,6 +3227,8 @@
- /* 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))
- return ETH_END_OF_JOB;
-diff -urN linux-2.6.9.orig/drivers/net/mv643xx_eth.h linux-2.6.9/drivers/net/mv643xx_eth.h
---- linux-2.6.9.orig/drivers/net/mv643xx_eth.h 2004-10-18 23:54:08.000000000 +0200
-+++ linux-2.6.9/drivers/net/mv643xx_eth.h 2004-10-27 10:31:59.677470776 +0200
-@@ -51,7 +51,7 @@
- #define ETH_PORT2_IRQ_NUM ETH_PORT0_IRQ_NUM+2 /* main high register, bit1 */
-
- /* Checksum offload for Tx works */
--#define MV64340_CHECKSUM_OFFLOAD_TX
-+//#define MV64340_CHECKSUM_OFFLOAD_TX
- #define MV64340_NAPI
- #define MV64340_TX_FAST_REFILL
- #undef MV64340_COAL
-@@ -114,10 +114,18 @@
-
-
- /* Default sdma control value */
-+#ifdef __PPC__
-+#define PORT_SDMA_CONFIG_VALUE \
-+ ETH_RX_BURST_SIZE_4_64BIT | \
-+ GT_ETH_IPG_INT_RX(0) | \
-+ ETH_TX_BURST_SIZE_4_64BIT
-+#else
- #define PORT_SDMA_CONFIG_VALUE \
- ETH_RX_BURST_SIZE_16_64BIT | \
- GT_ETH_IPG_INT_RX(0) | \
- ETH_TX_BURST_SIZE_16_64BIT;
-+#endif
-+
-
- #define GT_ETH_IPG_INT_RX(value) \
- ((value & 0x3fff) << 8)
-@@ -417,6 +425,10 @@
- #define ETH_TX_ENABLE_INTERRUPT (BIT23)
- #define ETH_AUTO_MODE (BIT30)
-
-+
-+// Useful def
-+#define MV64340_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
-+
- /* typedefs */
-
- typedef enum _eth_func_ret_status {
-diff -urN linux-2.6.9.orig/include/asm-ppc/marvell.h linux-2.6.9/include/asm-ppc/marvell.h
---- linux-2.6.9.orig/include/asm-ppc/marvell.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.9/include/asm-ppc/marvell.h 2004-10-27 10:31:59.736461808 +0200
-@@ -0,0 +1,58 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2004 by Ralf Baechle
-+ */
-+#ifndef __ASM_PPC_MARVELL_H
-+#define __ASM_PPC_MARVELL_H
-+
-+#include <asm/byteorder.h>
-+#include <asm/system.h>
-+
-+extern unsigned long marvell_base;
-+
-+/*
-+ * Because of an error/peculiarity in the Galileo chip, we need to swap the
-+ * bytes when running bigendian.
-+ */
-+/*
-+ * Nicolas DET:
-+ * On PowerPC (especially for G4) we have to be careful about the re-ordering
-+ * as aresult I add some mb() in the MV_xxxx macros
-+*/
-+#define __MV_READ(ofs) \
-+ (*(volatile u32 *)(marvell_base+(ofs)))
-+
-+#define __MV_WRITE(ofs, data) \
-+ do { *(volatile u32 *)(marvell_base+(ofs)) = (data); } while (0)
-+
-+#if 1
-+extern inline u32 mv_read(u32 offset)
-+{
-+ u32 RegVal = le32_to_cpu(__MV_READ(offset));
-+ rmb();
-+ return RegVal;
-+}
-+
-+extern inline void mv_write(u32 offset, u32 RegVal)
-+{
-+ __MV_WRITE(offset, cpu_to_le32(RegVal));
-+ wmb();
-+}
-+
-+#define MV_READ(ofs) mv_read( (u32) ofs)
-+#define MV_WRITE(ofs, data) mv_write( (u32) ofs, (u32) data)
-+
-+#else
-+#define MV_READ(ofs) le32_to_cpu(__MV_READ(ofs))
-+#define MV_WRITE(ofs, data) __MV_WRITE(ofs, cpu_to_le32(data))
-+#endif
-+
-+#define MV_SET_REG_BITS(ofs, bits) \
-+ (*((volatile u32 *)(marvell_base + (ofs)))) |= ((u32)cpu_to_le32(bits))
-+#define MV_RESET_REG_BITS(ofs, bits) \
-+ (*((volatile u32 *)(marvell_base + (ofs)))) &= ~((u32)cpu_to_le32(bits))
-+
-+#endif /* __ASM_PPC_MARVELL_H */
-diff -urN linux-2.6.9.orig/include/asm-ppc/mv643xx.h linux-2.6.9/include/asm-ppc/mv643xx.h
---- linux-2.6.9.orig/include/asm-ppc/mv643xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.9/include/asm-ppc/mv643xx.h 2004-10-27 10:31:59.803451624 +0200
-@@ -0,0 +1,1070 @@
-+/*
-+ * mv64340.h - MV-64340 Internal registers definition file.
-+ *
-+ * Copyright 2002 Momentum Computer, Inc.
-+ * Author: Matthew Dharm <mdharm at momenco.com>
-+ * Copyright 2002 GALILEO TECHNOLOGY, LTD.
-+ *
-+ * 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 of the License, or (at your
-+ * option) any later version.
-+ */
-+#ifndef __ASM_MV64340_H
-+#define __ASM_MV64340_H
-+
-+#include <asm/byteorder.h>
-+
-+/****************************************/
-+/* Processor Address Space */
-+/****************************************/
-+
-+/* DDR SDRAM BAR and size registers */
-+
-+#define MV64340_CS_0_BASE_ADDR 0x008
-+#define MV64340_CS_0_SIZE 0x010
-+#define MV64340_CS_1_BASE_ADDR 0x208
-+#define MV64340_CS_1_SIZE 0x210
-+#define MV64340_CS_2_BASE_ADDR 0x018
-+#define MV64340_CS_2_SIZE 0x020
-+#define MV64340_CS_3_BASE_ADDR 0x218
-+#define MV64340_CS_3_SIZE 0x220
-+
-+/* Devices BAR and size registers */
-+
-+#define MV64340_DEV_CS0_BASE_ADDR 0x028
-+#define MV64340_DEV_CS0_SIZE 0x030
-+#define MV64340_DEV_CS1_BASE_ADDR 0x228
-+#define MV64340_DEV_CS1_SIZE 0x230
-+#define MV64340_DEV_CS2_BASE_ADDR 0x248
-+#define MV64340_DEV_CS2_SIZE 0x250
-+#define MV64340_DEV_CS3_BASE_ADDR 0x038
-+#define MV64340_DEV_CS3_SIZE 0x040
-+#define MV64340_BOOTCS_BASE_ADDR 0x238
-+#define MV64340_BOOTCS_SIZE 0x240
-+
-+/* PCI 0 BAR and size registers */
-+
-+#define MV64340_PCI_0_IO_BASE_ADDR 0x048
-+#define MV64340_PCI_0_IO_SIZE 0x050
-+#define MV64340_PCI_0_MEMORY0_BASE_ADDR 0x058
-+#define MV64340_PCI_0_MEMORY0_SIZE 0x060
-+#define MV64340_PCI_0_MEMORY1_BASE_ADDR 0x080
-+#define MV64340_PCI_0_MEMORY1_SIZE 0x088
-+#define MV64340_PCI_0_MEMORY2_BASE_ADDR 0x258
-+#define MV64340_PCI_0_MEMORY2_SIZE 0x260
-+#define MV64340_PCI_0_MEMORY3_BASE_ADDR 0x280
-+#define MV64340_PCI_0_MEMORY3_SIZE 0x288
-+
-+/* PCI 1 BAR and size registers */
-+#define MV64340_PCI_1_IO_BASE_ADDR 0x090
-+#define MV64340_PCI_1_IO_SIZE 0x098
-+#define MV64340_PCI_1_MEMORY0_BASE_ADDR 0x0a0
-+#define MV64340_PCI_1_MEMORY0_SIZE 0x0a8
-+#define MV64340_PCI_1_MEMORY1_BASE_ADDR 0x0b0
-+#define MV64340_PCI_1_MEMORY1_SIZE 0x0b8
-+#define MV64340_PCI_1_MEMORY2_BASE_ADDR 0x2a0
-+#define MV64340_PCI_1_MEMORY2_SIZE 0x2a8
-+#define MV64340_PCI_1_MEMORY3_BASE_ADDR 0x2b0
-+#define MV64340_PCI_1_MEMORY3_SIZE 0x2b8
-+
-+/* SRAM base address */
-+#define MV64340_INTEGRATED_SRAM_BASE_ADDR 0x268
-+
-+/* internal registers space base address */
-+#define MV64340_INTERNAL_SPACE_BASE_ADDR 0x068
-+
-+/* Enables the CS , DEV_CS , PCI 0 and PCI 1
-+ windows above */
-+#define MV64340_BASE_ADDR_ENABLE 0x278
-+
-+/****************************************/
-+/* PCI remap registers */
-+/****************************************/
-+ /* PCI 0 */
-+#define MV64340_PCI_0_IO_ADDR_REMAP 0x0f0
-+#define MV64340_PCI_0_MEMORY0_LOW_ADDR_REMAP 0x0f8
-+#define MV64340_PCI_0_MEMORY0_HIGH_ADDR_REMAP 0x320
-+#define MV64340_PCI_0_MEMORY1_LOW_ADDR_REMAP 0x100
-+#define MV64340_PCI_0_MEMORY1_HIGH_ADDR_REMAP 0x328
-+#define MV64340_PCI_0_MEMORY2_LOW_ADDR_REMAP 0x2f8
-+#define MV64340_PCI_0_MEMORY2_HIGH_ADDR_REMAP 0x330
-+#define MV64340_PCI_0_MEMORY3_LOW_ADDR_REMAP 0x300
-+#define MV64340_PCI_0_MEMORY3_HIGH_ADDR_REMAP 0x338
-+ /* PCI 1 */
-+#define MV64340_PCI_1_IO_ADDR_REMAP 0x108
-+#define MV64340_PCI_1_MEMORY0_LOW_ADDR_REMAP 0x110
-+#define MV64340_PCI_1_MEMORY0_HIGH_ADDR_REMAP 0x340
-+#define MV64340_PCI_1_MEMORY1_LOW_ADDR_REMAP 0x118
-+#define MV64340_PCI_1_MEMORY1_HIGH_ADDR_REMAP 0x348
-+#define MV64340_PCI_1_MEMORY2_LOW_ADDR_REMAP 0x310
-+#define MV64340_PCI_1_MEMORY2_HIGH_ADDR_REMAP 0x350
-+#define MV64340_PCI_1_MEMORY3_LOW_ADDR_REMAP 0x318
-+#define MV64340_PCI_1_MEMORY3_HIGH_ADDR_REMAP 0x358
-+
-+#define MV64340_CPU_PCI_0_HEADERS_RETARGET_CONTROL 0x3b0
-+#define MV64340_CPU_PCI_0_HEADERS_RETARGET_BASE 0x3b8
-+#define MV64340_CPU_PCI_1_HEADERS_RETARGET_CONTROL 0x3c0
-+#define MV64340_CPU_PCI_1_HEADERS_RETARGET_BASE 0x3c8
-+#define MV64340_CPU_GE_HEADERS_RETARGET_CONTROL 0x3d0
-+#define MV64340_CPU_GE_HEADERS_RETARGET_BASE 0x3d8
-+#define MV64340_CPU_IDMA_HEADERS_RETARGET_CONTROL 0x3e0
-+#define MV64340_CPU_IDMA_HEADERS_RETARGET_BASE 0x3e8
-+
-+/****************************************/
-+/* CPU Control Registers */
-+/****************************************/
-+
-+#define MV64340_CPU_CONFIG 0x000
-+#define MV64340_CPU_MODE 0x120
-+#define MV64340_CPU_MASTER_CONTROL 0x160
-+#define MV64340_CPU_CROSS_BAR_CONTROL_LOW 0x150
-+#define MV64340_CPU_CROSS_BAR_CONTROL_HIGH 0x158
-+#define MV64340_CPU_CROSS_BAR_TIMEOUT 0x168
-+
-+/****************************************/
-+/* SMP RegisterS */
-+/****************************************/
-+
-+#define MV64340_SMP_WHO_AM_I 0x200
-+#define MV64340_SMP_CPU0_DOORBELL 0x214
-+#define MV64340_SMP_CPU0_DOORBELL_CLEAR 0x21C
-+#define MV64340_SMP_CPU1_DOORBELL 0x224
-+#define MV64340_SMP_CPU1_DOORBELL_CLEAR 0x22C
-+#define MV64340_SMP_CPU0_DOORBELL_MASK 0x234
-+#define MV64340_SMP_CPU1_DOORBELL_MASK 0x23C
-+#define MV64340_SMP_SEMAPHOR0 0x244
-+#define MV64340_SMP_SEMAPHOR1 0x24c
-+#define MV64340_SMP_SEMAPHOR2 0x254
-+#define MV64340_SMP_SEMAPHOR3 0x25c
-+#define MV64340_SMP_SEMAPHOR4 0x264
-+#define MV64340_SMP_SEMAPHOR5 0x26c
-+#define MV64340_SMP_SEMAPHOR6 0x274
-+#define MV64340_SMP_SEMAPHOR7 0x27c
-+
-+/****************************************/
-+/* CPU Sync Barrier Register */
-+/****************************************/
-+
-+#define MV64340_CPU_0_SYNC_BARRIER_TRIGGER 0x0c0
-+#define MV64340_CPU_0_SYNC_BARRIER_VIRTUAL 0x0c8
-+#define MV64340_CPU_1_SYNC_BARRIER_TRIGGER 0x0d0
-+#define MV64340_CPU_1_SYNC_BARRIER_VIRTUAL 0x0d8
-+
-+/****************************************/
-+/* CPU Access Protect */
-+/****************************************/
-+
-+#define MV64340_CPU_PROTECT_WINDOW_0_BASE_ADDR 0x180
-+#define MV64340_CPU_PROTECT_WINDOW_0_SIZE 0x188
-+#define MV64340_CPU_PROTECT_WINDOW_1_BASE_ADDR 0x190
-+#define MV64340_CPU_PROTECT_WINDOW_1_SIZE 0x198
-+#define MV64340_CPU_PROTECT_WINDOW_2_BASE_ADDR 0x1a0
-+#define MV64340_CPU_PROTECT_WINDOW_2_SIZE 0x1a8
-+#define MV64340_CPU_PROTECT_WINDOW_3_BASE_ADDR 0x1b0
-+#define MV64340_CPU_PROTECT_WINDOW_3_SIZE 0x1b8
-+
-+
-+/****************************************/
-+/* CPU Error Report */
-+/****************************************/
-+
-+#define MV64340_CPU_ERROR_ADDR_LOW 0x070
-+#define MV64340_CPU_ERROR_ADDR_HIGH 0x078
-+#define MV64340_CPU_ERROR_DATA_LOW 0x128
-+#define MV64340_CPU_ERROR_DATA_HIGH 0x130
-+#define MV64340_CPU_ERROR_PARITY 0x138
-+#define MV64340_CPU_ERROR_CAUSE 0x140
-+#define MV64340_CPU_ERROR_MASK 0x148
-+
-+/****************************************/
-+/* CPU Interface Debug Registers */
-+/****************************************/
-+
-+#define MV64340_PUNIT_SLAVE_DEBUG_LOW 0x360
-+#define MV64340_PUNIT_SLAVE_DEBUG_HIGH 0x368
-+#define MV64340_PUNIT_MASTER_DEBUG_LOW 0x370
-+#define MV64340_PUNIT_MASTER_DEBUG_HIGH 0x378
-+#define MV64340_PUNIT_MMASK 0x3e4
-+
-+/****************************************/
-+/* Integrated SRAM Registers */
-+/****************************************/
-+
-+#define MV64340_SRAM_CONFIG 0x380
-+#define MV64340_SRAM_TEST_MODE 0X3F4
-+#define MV64340_SRAM_ERROR_CAUSE 0x388
-+#define MV64340_SRAM_ERROR_ADDR 0x390
-+#define MV64340_SRAM_ERROR_ADDR_HIGH 0X3F8
-+#define MV64340_SRAM_ERROR_DATA_LOW 0x398
-+#define MV64340_SRAM_ERROR_DATA_HIGH 0x3a0
-+#define MV64340_SRAM_ERROR_DATA_PARITY 0x3a8
-+
-+/****************************************/
-+/* SDRAM Configuration */
-+/****************************************/
-+
-+#define MV64340_SDRAM_CONFIG 0x1400
-+#define MV64340_D_UNIT_CONTROL_LOW 0x1404
-+#define MV64340_D_UNIT_CONTROL_HIGH 0x1424
-+#define MV64340_SDRAM_TIMING_CONTROL_LOW 0x1408
-+#define MV64340_SDRAM_TIMING_CONTROL_HIGH 0x140c
-+#define MV64340_SDRAM_ADDR_CONTROL 0x1410
-+#define MV64340_SDRAM_OPEN_PAGES_CONTROL 0x1414
-+#define MV64340_SDRAM_OPERATION 0x1418
-+#define MV64340_SDRAM_MODE 0x141c
-+#define MV64340_EXTENDED_DRAM_MODE 0x1420
-+#define MV64340_SDRAM_CROSS_BAR_CONTROL_LOW 0x1430
-+#define MV64340_SDRAM_CROSS_BAR_CONTROL_HIGH 0x1434
-+#define MV64340_SDRAM_CROSS_BAR_TIMEOUT 0x1438
-+#define MV64340_SDRAM_ADDR_CTRL_PADS_CALIBRATION 0x14c0
-+#define MV64340_SDRAM_DATA_PADS_CALIBRATION 0x14c4
-+
-+/****************************************/
-+/* SDRAM Error Report */
-+/****************************************/
-+
-+#define MV64340_SDRAM_ERROR_DATA_LOW 0x1444
-+#define MV64340_SDRAM_ERROR_DATA_HIGH 0x1440
-+#define MV64340_SDRAM_ERROR_ADDR 0x1450
-+#define MV64340_SDRAM_RECEIVED_ECC 0x1448
-+#define MV64340_SDRAM_CALCULATED_ECC 0x144c
-+#define MV64340_SDRAM_ECC_CONTROL 0x1454
-+#define MV64340_SDRAM_ECC_ERROR_COUNTER 0x1458
-+
-+/******************************************/
-+/* Controlled Delay Line (CDL) Registers */
-+/******************************************/
-+
-+#define MV64340_DFCDL_CONFIG0 0x1480
-+#define MV64340_DFCDL_CONFIG1 0x1484
-+#define MV64340_DLL_WRITE 0x1488
-+#define MV64340_DLL_READ 0x148c
-+#define MV64340_SRAM_ADDR 0x1490
-+#define MV64340_SRAM_DATA0 0x1494
-+#define MV64340_SRAM_DATA1 0x1498
-+#define MV64340_SRAM_DATA2 0x149c
-+#define MV64340_DFCL_PROBE 0x14a0
-+
-+/******************************************/
-+/* Debug Registers */
-+/******************************************/
-+
-+#define MV64340_DUNIT_DEBUG_LOW 0x1460
-+#define MV64340_DUNIT_DEBUG_HIGH 0x1464
-+#define MV64340_DUNIT_MMASK 0X1b40
-+
-+/****************************************/
-+/* Device Parameters */
-+/****************************************/
-+
-+#define MV64340_DEVICE_BANK0_PARAMETERS 0x45c
-+#define MV64340_DEVICE_BANK1_PARAMETERS 0x460
-+#define MV64340_DEVICE_BANK2_PARAMETERS 0x464
-+#define MV64340_DEVICE_BANK3_PARAMETERS 0x468
-+#define MV64340_DEVICE_BOOT_BANK_PARAMETERS 0x46c
-+#define MV64340_DEVICE_INTERFACE_CONTROL 0x4c0
-+#define MV64340_DEVICE_INTERFACE_CROSS_BAR_CONTROL_LOW 0x4c8
-+#define MV64340_DEVICE_INTERFACE_CROSS_BAR_CONTROL_HIGH 0x4cc
-+#define MV64340_DEVICE_INTERFACE_CROSS_BAR_TIMEOUT 0x4c4
-+
-+/****************************************/
-+/* Device interrupt registers */
-+/****************************************/
-+
-+#define MV64340_DEVICE_INTERRUPT_CAUSE 0x4d0
-+#define MV64340_DEVICE_INTERRUPT_MASK 0x4d4
-+#define MV64340_DEVICE_ERROR_ADDR 0x4d8
-+#define MV64340_DEVICE_ERROR_DATA 0x4dc
-+#define MV64340_DEVICE_ERROR_PARITY 0x4e0
-+
-+/****************************************/
-+/* Device debug registers */
-+/****************************************/
-+
-+#define MV64340_DEVICE_DEBUG_LOW 0x4e4
-+#define MV64340_DEVICE_DEBUG_HIGH 0x4e8
-+#define MV64340_RUNIT_MMASK 0x4f0
-+
-+/****************************************/
-+/* PCI Slave Address Decoding registers */
-+/****************************************/
-+
-+#define MV64340_PCI_0_CS_0_BANK_SIZE 0xc08
-+#define MV64340_PCI_1_CS_0_BANK_SIZE 0xc88
-+#define MV64340_PCI_0_CS_1_BANK_SIZE 0xd08
-+#define MV64340_PCI_1_CS_1_BANK_SIZE 0xd88
-+#define MV64340_PCI_0_CS_2_BANK_SIZE 0xc0c
-+#define MV64340_PCI_1_CS_2_BANK_SIZE 0xc8c
-+#define MV64340_PCI_0_CS_3_BANK_SIZE 0xd0c
-+#define MV64340_PCI_1_CS_3_BANK_SIZE 0xd8c
-+#define MV64340_PCI_0_DEVCS_0_BANK_SIZE 0xc10
-+#define MV64340_PCI_1_DEVCS_0_BANK_SIZE 0xc90
-+#define MV64340_PCI_0_DEVCS_1_BANK_SIZE 0xd10
-+#define MV64340_PCI_1_DEVCS_1_BANK_SIZE 0xd90
-+#define MV64340_PCI_0_DEVCS_2_BANK_SIZE 0xd18
-+#define MV64340_PCI_1_DEVCS_2_BANK_SIZE 0xd98
-+#define MV64340_PCI_0_DEVCS_3_BANK_SIZE 0xc14
-+#define MV64340_PCI_1_DEVCS_3_BANK_SIZE 0xc94
-+#define MV64340_PCI_0_DEVCS_BOOT_BANK_SIZE 0xd14
-+#define MV64340_PCI_1_DEVCS_BOOT_BANK_SIZE 0xd94
-+#define MV64340_PCI_0_P2P_MEM0_BAR_SIZE 0xd1c
-+#define MV64340_PCI_1_P2P_MEM0_BAR_SIZE 0xd9c
-+#define MV64340_PCI_0_P2P_MEM1_BAR_SIZE 0xd20
-+#define MV64340_PCI_1_P2P_MEM1_BAR_SIZE 0xda0
-+#define MV64340_PCI_0_P2P_I_O_BAR_SIZE 0xd24
-+#define MV64340_PCI_1_P2P_I_O_BAR_SIZE 0xda4
-+#define MV64340_PCI_0_CPU_BAR_SIZE 0xd28
-+#define MV64340_PCI_1_CPU_BAR_SIZE 0xda8
-+#define MV64340_PCI_0_INTERNAL_SRAM_BAR_SIZE 0xe00
-+#define MV64340_PCI_1_INTERNAL_SRAM_BAR_SIZE 0xe80
-+#define MV64340_PCI_0_EXPANSION_ROM_BAR_SIZE 0xd2c
-+#define MV64340_PCI_1_EXPANSION_ROM_BAR_SIZE 0xd9c
-+#define MV64340_PCI_0_BASE_ADDR_REG_ENABLE 0xc3c
-+#define MV64340_PCI_1_BASE_ADDR_REG_ENABLE 0xcbc
-+#define MV64340_PCI_0_CS_0_BASE_ADDR_REMAP 0xc48
-+#define MV64340_PCI_1_CS_0_BASE_ADDR_REMAP 0xcc8
-+#define MV64340_PCI_0_CS_1_BASE_ADDR_REMAP 0xd48
-+#define MV64340_PCI_1_CS_1_BASE_ADDR_REMAP 0xdc8
-+#define MV64340_PCI_0_CS_2_BASE_ADDR_REMAP 0xc4c
-+#define MV64340_PCI_1_CS_2_BASE_ADDR_REMAP 0xccc
-+#define MV64340_PCI_0_CS_3_BASE_ADDR_REMAP 0xd4c
-+#define MV64340_PCI_1_CS_3_BASE_ADDR_REMAP 0xdcc
-+#define MV64340_PCI_0_CS_0_BASE_HIGH_ADDR_REMAP 0xF04
-+#define MV64340_PCI_1_CS_0_BASE_HIGH_ADDR_REMAP 0xF84
-+#define MV64340_PCI_0_CS_1_BASE_HIGH_ADDR_REMAP 0xF08
-+#define MV64340_PCI_1_CS_1_BASE_HIGH_ADDR_REMAP 0xF88
-+#define MV64340_PCI_0_CS_2_BASE_HIGH_ADDR_REMAP 0xF0C
-+#define MV64340_PCI_1_CS_2_BASE_HIGH_ADDR_REMAP 0xF8C
-+#define MV64340_PCI_0_CS_3_BASE_HIGH_ADDR_REMAP 0xF10
-+#define MV64340_PCI_1_CS_3_BASE_HIGH_ADDR_REMAP 0xF90
-+#define MV64340_PCI_0_DEVCS_0_BASE_ADDR_REMAP 0xc50
-+#define MV64340_PCI_1_DEVCS_0_BASE_ADDR_REMAP 0xcd0
-+#define MV64340_PCI_0_DEVCS_1_BASE_ADDR_REMAP 0xd50
-+#define MV64340_PCI_1_DEVCS_1_BASE_ADDR_REMAP 0xdd0
-+#define MV64340_PCI_0_DEVCS_2_BASE_ADDR_REMAP 0xd58
-+#define MV64340_PCI_1_DEVCS_2_BASE_ADDR_REMAP 0xdd8
-+#define MV64340_PCI_0_DEVCS_3_BASE_ADDR_REMAP 0xc54
-+#define MV64340_PCI_1_DEVCS_3_BASE_ADDR_REMAP 0xcd4
-+#define MV64340_PCI_0_DEVCS_BOOTCS_BASE_ADDR_REMAP 0xd54
-+#define MV64340_PCI_1_DEVCS_BOOTCS_BASE_ADDR_REMAP 0xdd4
-+#define MV64340_PCI_0_P2P_MEM0_BASE_ADDR_REMAP_LOW 0xd5c
-+#define MV64340_PCI_1_P2P_MEM0_BASE_ADDR_REMAP_LOW 0xddc
-+#define MV64340_PCI_0_P2P_MEM0_BASE_ADDR_REMAP_HIGH 0xd60
-+#define MV64340_PCI_1_P2P_MEM0_BASE_ADDR_REMAP_HIGH 0xde0
-+#define MV64340_PCI_0_P2P_MEM1_BASE_ADDR_REMAP_LOW 0xd64
-+#define MV64340_PCI_1_P2P_MEM1_BASE_ADDR_REMAP_LOW 0xde4
-+#define MV64340_PCI_0_P2P_MEM1_BASE_ADDR_REMAP_HIGH 0xd68
-+#define MV64340_PCI_1_P2P_MEM1_BASE_ADDR_REMAP_HIGH 0xde8
-+#define MV64340_PCI_0_P2P_I_O_BASE_ADDR_REMAP 0xd6c
-+#define MV64340_PCI_1_P2P_I_O_BASE_ADDR_REMAP 0xdec
-+#define MV64340_PCI_0_CPU_BASE_ADDR_REMAP_LOW 0xd70
-+#define MV64340_PCI_1_CPU_BASE_ADDR_REMAP_LOW 0xdf0
-+#define MV64340_PCI_0_CPU_BASE_ADDR_REMAP_HIGH 0xd74
-+#define MV64340_PCI_1_CPU_BASE_ADDR_REMAP_HIGH 0xdf4
-+#define MV64340_PCI_0_INTEGRATED_SRAM_BASE_ADDR_REMAP 0xf00
-+#define MV64340_PCI_1_INTEGRATED_SRAM_BASE_ADDR_REMAP 0xf80
-+#define MV64340_PCI_0_EXPANSION_ROM_BASE_ADDR_REMAP 0xf38
-+#define MV64340_PCI_1_EXPANSION_ROM_BASE_ADDR_REMAP 0xfb8
-+#define MV64340_PCI_0_ADDR_DECODE_CONTROL 0xd3c
-+#define MV64340_PCI_1_ADDR_DECODE_CONTROL 0xdbc
-+#define MV64340_PCI_0_HEADERS_RETARGET_CONTROL 0xF40
-+#define MV64340_PCI_1_HEADERS_RETARGET_CONTROL 0xFc0
-+#define MV64340_PCI_0_HEADERS_RETARGET_BASE 0xF44
-+#define MV64340_PCI_1_HEADERS_RETARGET_BASE 0xFc4
-+#define MV64340_PCI_0_HEADERS_RETARGET_HIGH 0xF48
-+#define MV64340_PCI_1_HEADERS_RETARGET_HIGH 0xFc8
-+
-+/***********************************/
-+/* PCI Control Register Map */
-+/***********************************/
-+
-+#define MV64340_PCI_0_DLL_STATUS_AND_COMMAND 0x1d20
-+#define MV64340_PCI_1_DLL_STATUS_AND_COMMAND 0x1da0
-+#define MV64340_PCI_0_MPP_PADS_DRIVE_CONTROL 0x1d1C
-+#define MV64340_PCI_1_MPP_PADS_DRIVE_CONTROL 0x1d9C
-+#define MV64340_PCI_0_COMMAND 0xc00
-+#define MV64340_PCI_1_COMMAND 0xc80
-+#define MV64340_PCI_0_MODE 0xd00
-+#define MV64340_PCI_1_MODE 0xd80
-+#define MV64340_PCI_0_RETRY 0xc04
-+#define MV64340_PCI_1_RETRY 0xc84
-+#define MV64340_PCI_0_READ_BUFFER_DISCARD_TIMER 0xd04
-+#define MV64340_PCI_1_READ_BUFFER_DISCARD_TIMER 0xd84
-+#define MV64340_PCI_0_MSI_TRIGGER_TIMER 0xc38
-+#define MV64340_PCI_1_MSI_TRIGGER_TIMER 0xcb8
-+#define MV64340_PCI_0_ARBITER_CONTROL 0x1d00
-+#define MV64340_PCI_1_ARBITER_CONTROL 0x1d80
-+#define MV64340_PCI_0_CROSS_BAR_CONTROL_LOW 0x1d08
-+#define MV64340_PCI_1_CROSS_BAR_CONTROL_LOW 0x1d88
-+#define MV64340_PCI_0_CROSS_BAR_CONTROL_HIGH 0x1d0c
-+#define MV64340_PCI_1_CROSS_BAR_CONTROL_HIGH 0x1d8c
-+#define MV64340_PCI_0_CROSS_BAR_TIMEOUT 0x1d04
-+#define MV64340_PCI_1_CROSS_BAR_TIMEOUT 0x1d84
-+#define MV64340_PCI_0_SYNC_BARRIER_TRIGGER_REG 0x1D18
-+#define MV64340_PCI_1_SYNC_BARRIER_TRIGGER_REG 0x1D98
-+#define MV64340_PCI_0_SYNC_BARRIER_VIRTUAL_REG 0x1d10
-+#define MV64340_PCI_1_SYNC_BARRIER_VIRTUAL_REG 0x1d90
-+#define MV64340_PCI_0_P2P_CONFIG 0x1d14
-+#define MV64340_PCI_1_P2P_CONFIG 0x1d94
-+
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_0_LOW 0x1e00
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_0_HIGH 0x1e04
-+#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_0 0x1e08
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_1_LOW 0x1e10
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_1_HIGH 0x1e14
-+#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_1 0x1e18
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_2_LOW 0x1e20
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_2_HIGH 0x1e24
-+#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_2 0x1e28
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_3_LOW 0x1e30
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_3_HIGH 0x1e34
-+#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_3 0x1e38
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_4_LOW 0x1e40
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_4_HIGH 0x1e44
-+#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_4 0x1e48
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_5_LOW 0x1e50
-+#define MV64340_PCI_0_ACCESS_CONTROL_BASE_5_HIGH 0x1e54
-+#define MV64340_PCI_0_ACCESS_CONTROL_SIZE_5 0x1e58
-+
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_0_LOW 0x1e80
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_0_HIGH 0x1e84
-+#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_0 0x1e88
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_1_LOW 0x1e90
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_1_HIGH 0x1e94
-+#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_1 0x1e98
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_2_LOW 0x1ea0
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_2_HIGH 0x1ea4
-+#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_2 0x1ea8
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_3_LOW 0x1eb0
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_3_HIGH 0x1eb4
-+#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_3 0x1eb8
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_4_LOW 0x1ec0
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_4_HIGH 0x1ec4
-+#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_4 0x1ec8
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_5_LOW 0x1ed0
-+#define MV64340_PCI_1_ACCESS_CONTROL_BASE_5_HIGH 0x1ed4
-+#define MV64340_PCI_1_ACCESS_CONTROL_SIZE_5 0x1ed8
-+
-+/****************************************/
-+/* PCI Configuration Access Registers */
-+/****************************************/
-+
-+#define MV64340_PCI_0_CONFIG_ADDR 0xcf8
-+#define MV64340_PCI_0_CONFIG_DATA_VIRTUAL_REG 0xcfc
-+#define MV64340_PCI_1_CONFIG_ADDR 0xc78
-+#define MV64340_PCI_1_CONFIG_DATA_VIRTUAL_REG 0xc7c
-+#define MV64340_PCI_0_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG 0xc34
-+#define MV64340_PCI_1_INTERRUPT_ACKNOWLEDGE_VIRTUAL_REG 0xcb4
-+
-+/****************************************/
-+/* PCI Error Report Registers */
-+/****************************************/
-+
-+#define MV64340_PCI_0_SERR_MASK 0xc28
-+#define MV64340_PCI_1_SERR_MASK 0xca8
-+#define MV64340_PCI_0_ERROR_ADDR_LOW 0x1d40
-+#define MV64340_PCI_1_ERROR_ADDR_LOW 0x1dc0
-+#define MV64340_PCI_0_ERROR_ADDR_HIGH 0x1d44
-+#define MV64340_PCI_1_ERROR_ADDR_HIGH 0x1dc4
-+#define MV64340_PCI_0_ERROR_ATTRIBUTE 0x1d48
-+#define MV64340_PCI_1_ERROR_ATTRIBUTE 0x1dc8
-+#define MV64340_PCI_0_ERROR_COMMAND 0x1d50
-+#define MV64340_PCI_1_ERROR_COMMAND 0x1dd0
-+#define MV64340_PCI_0_ERROR_CAUSE 0x1d58
-+#define MV64340_PCI_1_ERROR_CAUSE 0x1dd8
-+#define MV64340_PCI_0_ERROR_MASK 0x1d5c
-+#define MV64340_PCI_1_ERROR_MASK 0x1ddc
-+
-+/****************************************/
-+/* PCI Debug Registers */
-+/****************************************/
-+
-+#define MV64340_PCI_0_MMASK 0X1D24
-+#define MV64340_PCI_1_MMASK 0X1DA4
-+
-+/*********************************************/
-+/* PCI Configuration, Function 0, Registers */
-+/*********************************************/
-+
-+#define MV64340_PCI_DEVICE_AND_VENDOR_ID 0x000
-+#define MV64340_PCI_STATUS_AND_COMMAND 0x004
-+#define MV64340_PCI_CLASS_CODE_AND_REVISION_ID 0x008
-+#define MV64340_PCI_BIST_HEADER_TYPE_LATENCY_TIMER_CACHE_LINE 0x00C
-+
-+#define MV64340_PCI_SCS_0_BASE_ADDR_LOW 0x010
-+#define MV64340_PCI_SCS_0_BASE_ADDR_HIGH 0x014
-+#define MV64340_PCI_SCS_1_BASE_ADDR_LOW 0x018
-+#define MV64340_PCI_SCS_1_BASE_ADDR_HIGH 0x01C
-+#define MV64340_PCI_INTERNAL_REG_MEM_MAPPED_BASE_ADDR_LOW 0x020
-+#define MV64340_PCI_INTERNAL_REG_MEM_MAPPED_BASE_ADDR_HIGH 0x024
-+#define MV64340_PCI_SUBSYSTEM_ID_AND_SUBSYSTEM_VENDOR_ID 0x02c
-+#define MV64340_PCI_EXPANSION_ROM_BASE_ADDR_REG 0x030
-+#define MV64340_PCI_CAPABILTY_LIST_POINTER 0x034
-+#define MV64340_PCI_INTERRUPT_PIN_AND_LINE 0x03C
-+ /* capability list */
-+#define MV64340_PCI_POWER_MANAGEMENT_CAPABILITY 0x040
-+#define MV64340_PCI_POWER_MANAGEMENT_STATUS_AND_CONTROL 0x044
-+#define MV64340_PCI_VPD_ADDR 0x048
-+#define MV64340_PCI_VPD_DATA 0x04c
-+#define MV64340_PCI_MSI_MESSAGE_CONTROL 0x050
-+#define MV64340_PCI_MSI_MESSAGE_ADDR 0x054
-+#define MV64340_PCI_MSI_MESSAGE_UPPER_ADDR 0x058
-+#define MV64340_PCI_MSI_MESSAGE_DATA 0x05c
-+#define MV64340_PCI_X_COMMAND 0x060
-+#define MV64340_PCI_X_STATUS 0x064
-+#define MV64340_PCI_COMPACT_PCI_HOT_SWAP 0x068
-+
-+/***********************************************/
-+/* PCI Configuration, Function 1, Registers */
-+/***********************************************/
-+
-+#define MV64340_PCI_SCS_2_BASE_ADDR_LOW 0x110
-+#define MV64340_PCI_SCS_2_BASE_ADDR_HIGH 0x114
-+#define MV64340_PCI_SCS_3_BASE_ADDR_LOW 0x118
-+#define MV64340_PCI_SCS_3_BASE_ADDR_HIGH 0x11c
-+#define MV64340_PCI_INTERNAL_SRAM_BASE_ADDR_LOW 0x120
-+#define MV64340_PCI_INTERNAL_SRAM_BASE_ADDR_HIGH 0x124
-+
-+/***********************************************/
-+/* PCI Configuration, Function 2, Registers */
-+/***********************************************/
-+
-+#define MV64340_PCI_DEVCS_0_BASE_ADDR_LOW 0x210
-+#define MV64340_PCI_DEVCS_0_BASE_ADDR_HIGH 0x214
-+#define MV64340_PCI_DEVCS_1_BASE_ADDR_LOW 0x218
-+#define MV64340_PCI_DEVCS_1_BASE_ADDR_HIGH 0x21c
-+#define MV64340_PCI_DEVCS_2_BASE_ADDR_LOW 0x220
-+#define MV64340_PCI_DEVCS_2_BASE_ADDR_HIGH 0x224
-+
-+/***********************************************/
-+/* PCI Configuration, Function 3, Registers */
-+/***********************************************/
-+
-+#define MV64340_PCI_DEVCS_3_BASE_ADDR_LOW 0x310
-+#define MV64340_PCI_DEVCS_3_BASE_ADDR_HIGH 0x314
-+#define MV64340_PCI_BOOT_CS_BASE_ADDR_LOW 0x318
-+#define MV64340_PCI_BOOT_CS_BASE_ADDR_HIGH 0x31c
-+#define MV64340_PCI_CPU_BASE_ADDR_LOW 0x220
-+#define MV64340_PCI_CPU_BASE_ADDR_HIGH 0x224
-+
-+/***********************************************/
-+/* PCI Configuration, Function 4, Registers */
-+/***********************************************/
-+
-+#define MV64340_PCI_P2P_MEM0_BASE_ADDR_LOW 0x410
-+#define MV64340_PCI_P2P_MEM0_BASE_ADDR_HIGH 0x414
-+#define MV64340_PCI_P2P_MEM1_BASE_ADDR_LOW 0x418
-+#define MV64340_PCI_P2P_MEM1_BASE_ADDR_HIGH 0x41c
-+#define MV64340_PCI_P2P_I_O_BASE_ADDR 0x420
-+#define MV64340_PCI_INTERNAL_REGS_I_O_MAPPED_BASE_ADDR 0x424
-+
-+/****************************************/
-+/* Messaging Unit Registers (I20) */
-+/****************************************/
-+
-+#define MV64340_I2O_INBOUND_MESSAGE_REG0_PCI_0_SIDE 0x010
-+#define MV64340_I2O_INBOUND_MESSAGE_REG1_PCI_0_SIDE 0x014
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_PCI_0_SIDE 0x018
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_PCI_0_SIDE 0x01C
-+#define MV64340_I2O_INBOUND_DOORBELL_REG_PCI_0_SIDE 0x020
-+#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_PCI_0_SIDE 0x024
-+#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_PCI_0_SIDE 0x028
-+#define MV64340_I2O_OUTBOUND_DOORBELL_REG_PCI_0_SIDE 0x02C
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_PCI_0_SIDE 0x030
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_PCI_0_SIDE 0x034
-+#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_0_SIDE 0x040
-+#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_0_SIDE 0x044
-+#define MV64340_I2O_QUEUE_CONTROL_REG_PCI_0_SIDE 0x050
-+#define MV64340_I2O_QUEUE_BASE_ADDR_REG_PCI_0_SIDE 0x054
-+#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_PCI_0_SIDE 0x060
-+#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_PCI_0_SIDE 0x064
-+#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_PCI_0_SIDE 0x068
-+#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_PCI_0_SIDE 0x06C
-+#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_PCI_0_SIDE 0x070
-+#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_PCI_0_SIDE 0x074
-+#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_PCI_0_SIDE 0x0F8
-+#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_PCI_0_SIDE 0x0FC
-+
-+#define MV64340_I2O_INBOUND_MESSAGE_REG0_PCI_1_SIDE 0x090
-+#define MV64340_I2O_INBOUND_MESSAGE_REG1_PCI_1_SIDE 0x094
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_PCI_1_SIDE 0x098
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_PCI_1_SIDE 0x09C
-+#define MV64340_I2O_INBOUND_DOORBELL_REG_PCI_1_SIDE 0x0A0
-+#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_PCI_1_SIDE 0x0A4
-+#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_PCI_1_SIDE 0x0A8
-+#define MV64340_I2O_OUTBOUND_DOORBELL_REG_PCI_1_SIDE 0x0AC
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_PCI_1_SIDE 0x0B0
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_PCI_1_SIDE 0x0B4
-+#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_1_SIDE 0x0C0
-+#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_PCI_1_SIDE 0x0C4
-+#define MV64340_I2O_QUEUE_CONTROL_REG_PCI_1_SIDE 0x0D0
-+#define MV64340_I2O_QUEUE_BASE_ADDR_REG_PCI_1_SIDE 0x0D4
-+#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_PCI_1_SIDE 0x0E0
-+#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_PCI_1_SIDE 0x0E4
-+#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_PCI_1_SIDE 0x0E8
-+#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_PCI_1_SIDE 0x0EC
-+#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_PCI_1_SIDE 0x0F0
-+#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_PCI_1_SIDE 0x0F4
-+#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_PCI_1_SIDE 0x078
-+#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_PCI_1_SIDE 0x07C
-+
-+#define MV64340_I2O_INBOUND_MESSAGE_REG0_CPU0_SIDE 0x1C10
-+#define MV64340_I2O_INBOUND_MESSAGE_REG1_CPU0_SIDE 0x1C14
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_CPU0_SIDE 0x1C18
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_CPU0_SIDE 0x1C1C
-+#define MV64340_I2O_INBOUND_DOORBELL_REG_CPU0_SIDE 0x1C20
-+#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_CPU0_SIDE 0x1C24
-+#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_CPU0_SIDE 0x1C28
-+#define MV64340_I2O_OUTBOUND_DOORBELL_REG_CPU0_SIDE 0x1C2C
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_CPU0_SIDE 0x1C30
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_CPU0_SIDE 0x1C34
-+#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_CPU0_SIDE 0x1C40
-+#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_CPU0_SIDE 0x1C44
-+#define MV64340_I2O_QUEUE_CONTROL_REG_CPU0_SIDE 0x1C50
-+#define MV64340_I2O_QUEUE_BASE_ADDR_REG_CPU0_SIDE 0x1C54
-+#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_CPU0_SIDE 0x1C60
-+#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_CPU0_SIDE 0x1C64
-+#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_CPU0_SIDE 0x1C68
-+#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_CPU0_SIDE 0x1C6C
-+#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_CPU0_SIDE 0x1C70
-+#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_CPU0_SIDE 0x1C74
-+#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_CPU0_SIDE 0x1CF8
-+#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_CPU0_SIDE 0x1CFC
-+#define MV64340_I2O_INBOUND_MESSAGE_REG0_CPU1_SIDE 0x1C90
-+#define MV64340_I2O_INBOUND_MESSAGE_REG1_CPU1_SIDE 0x1C94
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG0_CPU1_SIDE 0x1C98
-+#define MV64340_I2O_OUTBOUND_MESSAGE_REG1_CPU1_SIDE 0x1C9C
-+#define MV64340_I2O_INBOUND_DOORBELL_REG_CPU1_SIDE 0x1CA0
-+#define MV64340_I2O_INBOUND_INTERRUPT_CAUSE_REG_CPU1_SIDE 0x1CA4
-+#define MV64340_I2O_INBOUND_INTERRUPT_MASK_REG_CPU1_SIDE 0x1CA8
-+#define MV64340_I2O_OUTBOUND_DOORBELL_REG_CPU1_SIDE 0x1CAC
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_CAUSE_REG_CPU1_SIDE 0x1CB0
-+#define MV64340_I2O_OUTBOUND_INTERRUPT_MASK_REG_CPU1_SIDE 0x1CB4
-+#define MV64340_I2O_INBOUND_QUEUE_PORT_VIRTUAL_REG_CPU1_SIDE 0x1CC0
-+#define MV64340_I2O_OUTBOUND_QUEUE_PORT_VIRTUAL_REG_CPU1_SIDE 0x1CC4
-+#define MV64340_I2O_QUEUE_CONTROL_REG_CPU1_SIDE 0x1CD0
-+#define MV64340_I2O_QUEUE_BASE_ADDR_REG_CPU1_SIDE 0x1CD4
-+#define MV64340_I2O_INBOUND_FREE_HEAD_POINTER_REG_CPU1_SIDE 0x1CE0
-+#define MV64340_I2O_INBOUND_FREE_TAIL_POINTER_REG_CPU1_SIDE 0x1CE4
-+#define MV64340_I2O_INBOUND_POST_HEAD_POINTER_REG_CPU1_SIDE 0x1CE8
-+#define MV64340_I2O_INBOUND_POST_TAIL_POINTER_REG_CPU1_SIDE 0x1CEC
-+#define MV64340_I2O_OUTBOUND_FREE_HEAD_POINTER_REG_CPU1_SIDE 0x1CF0
-+#define MV64340_I2O_OUTBOUND_FREE_TAIL_POINTER_REG_CPU1_SIDE 0x1CF4
-+#define MV64340_I2O_OUTBOUND_POST_HEAD_POINTER_REG_CPU1_SIDE 0x1C78
-+#define MV64340_I2O_OUTBOUND_POST_TAIL_POINTER_REG_CPU1_SIDE 0x1C7C
-+
-+/****************************************/
-+/* Ethernet Unit Registers */
-+/****************************************/
-+
-+#define MV64340_ETH_PHY_ADDR_REG 0x2000
-+#define MV64340_ETH_SMI_REG 0x2004
-+#define MV64340_ETH_UNIT_DEFAULT_ADDR_REG 0x2008
-+#define MV64340_ETH_UNIT_DEFAULTID_REG 0x200c
-+#define MV64340_ETH_UNIT_INTERRUPT_CAUSE_REG 0x2080
-+#define MV64340_ETH_UNIT_INTERRUPT_MASK_REG 0x2084
-+#define MV64340_ETH_UNIT_INTERNAL_USE_REG 0x24fc
-+#define MV64340_ETH_UNIT_ERROR_ADDR_REG 0x2094
-+#define MV64340_ETH_BAR_0 0x2200
-+#define MV64340_ETH_BAR_1 0x2208
-+#define MV64340_ETH_BAR_2 0x2210
-+#define MV64340_ETH_BAR_3 0x2218
-+#define MV64340_ETH_BAR_4 0x2220
-+#define MV64340_ETH_BAR_5 0x2228
-+#define MV64340_ETH_SIZE_REG_0 0x2204
-+#define MV64340_ETH_SIZE_REG_1 0x220c
-+#define MV64340_ETH_SIZE_REG_2 0x2214
-+#define MV64340_ETH_SIZE_REG_3 0x221c
-+#define MV64340_ETH_SIZE_REG_4 0x2224
-+#define MV64340_ETH_SIZE_REG_5 0x222c
-+#define MV64340_ETH_HEADERS_RETARGET_BASE_REG 0x2230
-+#define MV64340_ETH_HEADERS_RETARGET_CONTROL_REG 0x2234
-+#define MV64340_ETH_HIGH_ADDR_REMAP_REG_0 0x2280
-+#define MV64340_ETH_HIGH_ADDR_REMAP_REG_1 0x2284
-+#define MV64340_ETH_HIGH_ADDR_REMAP_REG_2 0x2288
-+#define MV64340_ETH_HIGH_ADDR_REMAP_REG_3 0x228c
-+#define MV64340_ETH_BASE_ADDR_ENABLE_REG 0x2290
-+#define MV64340_ETH_ACCESS_PROTECTION_REG(port) (0x2294 + (port<<2))
-+#define MV64340_ETH_MIB_COUNTERS_BASE(port) (0x3000 + (port<<7))
-+#define MV64340_ETH_PORT_CONFIG_REG(port) (0x2400 + (port<<10))
-+#define MV64340_ETH_PORT_CONFIG_EXTEND_REG(port) (0x2404 + (port<<10))
-+#define MV64340_ETH_MII_SERIAL_PARAMETRS_REG(port) (0x2408 + (port<<10))
-+#define MV64340_ETH_GMII_SERIAL_PARAMETRS_REG(port) (0x240c + (port<<10))
-+#define MV64340_ETH_VLAN_ETHERTYPE_REG(port) (0x2410 + (port<<10))
-+#define MV64340_ETH_MAC_ADDR_LOW(port) (0x2414 + (port<<10))
-+#define MV64340_ETH_MAC_ADDR_HIGH(port) (0x2418 + (port<<10))
-+#define MV64340_ETH_SDMA_CONFIG_REG(port) (0x241c + (port<<10))
-+#define MV64340_ETH_DSCP_0(port) (0x2420 + (port<<10))
-+#define MV64340_ETH_DSCP_1(port) (0x2424 + (port<<10))
-+#define MV64340_ETH_DSCP_2(port) (0x2428 + (port<<10))
-+#define MV64340_ETH_DSCP_3(port) (0x242c + (port<<10))
-+#define MV64340_ETH_DSCP_4(port) (0x2430 + (port<<10))
-+#define MV64340_ETH_DSCP_5(port) (0x2434 + (port<<10))
-+#define MV64340_ETH_DSCP_6(port) (0x2438 + (port<<10))
-+#define MV64340_ETH_PORT_SERIAL_CONTROL_REG(port) (0x243c + (port<<10))
-+#define MV64340_ETH_VLAN_PRIORITY_TAG_TO_PRIORITY(port) (0x2440 + (port<<10))
-+#define MV64340_ETH_PORT_STATUS_REG(port) (0x2444 + (port<<10))
-+#define MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(port) (0x2448 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_FIXED_PRIORITY(port) (0x244c + (port<<10))
-+#define MV64340_ETH_PORT_TX_TOKEN_BUCKET_RATE_CONFIG(port) (0x2450 + (port<<10))
-+#define MV64340_ETH_MAXIMUM_TRANSMIT_UNIT(port) (0x2458 + (port<<10))
-+#define MV64340_ETH_PORT_MAXIMUM_TOKEN_BUCKET_SIZE(port) (0x245c + (port<<10))
-+#define MV64340_ETH_INTERRUPT_CAUSE_REG(port) (0x2460 + (port<<10))
-+#define MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port) (0x2464 + (port<<10))
-+#define MV64340_ETH_INTERRUPT_MASK_REG(port) (0x2468 + (port<<10))
-+#define MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port) (0x246c + (port<<10))
-+#define MV64340_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
-+#define MV64340_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
-+#define MV64340_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
-+#define MV64340_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
-+#define MV64340_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
-+#define MV64340_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
-+#define MV64340_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
-+#define MV64340_ETH_INTERNAL_USE_REG(port) (0x24fc + (port<<10))
-+#define MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(port) (0x2680 + (port<<10))
-+#define MV64340_ETH_CURRENT_SERVED_TX_DESC_PTR(port) (0x2684 + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port) (0x260c + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_1(port) (0x261c + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_2(port) (0x262c + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_3(port) (0x263c + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_4(port) (0x264c + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_5(port) (0x265c + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_6(port) (0x266c + (port<<10))
-+#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_7(port) (0x267c + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(port) (0x26c0 + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_1(port) (0x26c4 + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_2(port) (0x26c8 + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_3(port) (0x26cc + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_4(port) (0x26d0 + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_5(port) (0x26d4 + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_6(port) (0x26d8 + (port<<10))
-+#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_7(port) (0x26dc + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_0_TOKEN_BUCKET_COUNT(port) (0x2700 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_1_TOKEN_BUCKET_COUNT(port) (0x2710 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_2_TOKEN_BUCKET_COUNT(port) (0x2720 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_3_TOKEN_BUCKET_COUNT(port) (0x2730 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_4_TOKEN_BUCKET_COUNT(port) (0x2740 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_5_TOKEN_BUCKET_COUNT(port) (0x2750 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_6_TOKEN_BUCKET_COUNT(port) (0x2760 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_7_TOKEN_BUCKET_COUNT(port) (0x2770 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_0_TOKEN_BUCKET_CONFIG(port) (0x2704 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_1_TOKEN_BUCKET_CONFIG(port) (0x2714 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_2_TOKEN_BUCKET_CONFIG(port) (0x2724 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_3_TOKEN_BUCKET_CONFIG(port) (0x2734 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_4_TOKEN_BUCKET_CONFIG(port) (0x2744 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_5_TOKEN_BUCKET_CONFIG(port) (0x2754 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_6_TOKEN_BUCKET_CONFIG(port) (0x2764 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_7_TOKEN_BUCKET_CONFIG(port) (0x2774 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_0_ARBITER_CONFIG(port) (0x2708 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_1_ARBITER_CONFIG(port) (0x2718 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_2_ARBITER_CONFIG(port) (0x2728 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_3_ARBITER_CONFIG(port) (0x2738 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_4_ARBITER_CONFIG(port) (0x2748 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_5_ARBITER_CONFIG(port) (0x2758 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_6_ARBITER_CONFIG(port) (0x2768 + (port<<10))
-+#define MV64340_ETH_TX_QUEUE_7_ARBITER_CONFIG(port) (0x2778 + (port<<10))
-+#define MV64340_ETH_PORT_TX_TOKEN_BUCKET_COUNT(port) (0x2780 + (port<<10))
-+#define MV64340_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port) (0x3400 + (port<<10))
-+#define MV64340_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port) (0x3500 + (port<<10))
-+#define MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE(port) (0x3600 + (port<<10))
-+
-+/*******************************************/
-+/* CUNIT Registers */
-+/*******************************************/
-+
-+ /* Address Decoding Register Map */
-+
-+#define MV64340_CUNIT_BASE_ADDR_REG0 0xf200
-+#define MV64340_CUNIT_BASE_ADDR_REG1 0xf208
-+#define MV64340_CUNIT_BASE_ADDR_REG2 0xf210
-+#define MV64340_CUNIT_BASE_ADDR_REG3 0xf218
-+#define MV64340_CUNIT_SIZE0 0xf204
-+#define MV64340_CUNIT_SIZE1 0xf20c
-+#define MV64340_CUNIT_SIZE2 0xf214
-+#define MV64340_CUNIT_SIZE3 0xf21c
-+#define MV64340_CUNIT_HIGH_ADDR_REMAP_REG0 0xf240
-+#define MV64340_CUNIT_HIGH_ADDR_REMAP_REG1 0xf244
-+#define MV64340_CUNIT_BASE_ADDR_ENABLE_REG 0xf250
-+#define MV64340_MPSC0_ACCESS_PROTECTION_REG 0xf254
-+#define MV64340_MPSC1_ACCESS_PROTECTION_REG 0xf258
-+#define MV64340_CUNIT_INTERNAL_SPACE_BASE_ADDR_REG 0xf25C
-+
-+ /* Error Report Registers */
-+
-+#define MV64340_CUNIT_INTERRUPT_CAUSE_REG 0xf310
-+#define MV64340_CUNIT_INTERRUPT_MASK_REG 0xf314
-+#define MV64340_CUNIT_ERROR_ADDR 0xf318
-+
-+ /* Cunit Control Registers */
-+
-+#define MV64340_CUNIT_ARBITER_CONTROL_REG 0xf300
-+#define MV64340_CUNIT_CONFIG_REG 0xb40c
-+#define MV64340_CUNIT_CRROSBAR_TIMEOUT_REG 0xf304
-+
-+ /* Cunit Debug Registers */
-+
-+#define MV64340_CUNIT_DEBUG_LOW 0xf340
-+#define MV64340_CUNIT_DEBUG_HIGH 0xf344
-+#define MV64340_CUNIT_MMASK 0xf380
-+
-+ /* MPSCs Clocks Routing Registers */
-+
-+#define MV64340_MPSC_ROUTING_REG 0xb400
-+#define MV64340_MPSC_RX_CLOCK_ROUTING_REG 0xb404
-+#define MV64340_MPSC_TX_CLOCK_ROUTING_REG 0xb408
-+
-+ /* MPSCs Interrupts Registers */
-+
-+#define MV64340_MPSC_CAUSE_REG(port) (0xb804 + (port<<3))
-+#define MV64340_MPSC_MASK_REG(port) (0xb884 + (port<<3))
-+
-+#define MV64340_MPSC_MAIN_CONFIG_LOW(port) (0x8000 + (port<<12))
-+#define MV64340_MPSC_MAIN_CONFIG_HIGH(port) (0x8004 + (port<<12))
-+#define MV64340_MPSC_PROTOCOL_CONFIG(port) (0x8008 + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG1(port) (0x800c + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG2(port) (0x8010 + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG3(port) (0x8014 + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG4(port) (0x8018 + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG5(port) (0x801c + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG6(port) (0x8020 + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG7(port) (0x8024 + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG8(port) (0x8028 + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG9(port) (0x802c + (port<<12))
-+#define MV64340_MPSC_CHANNEL_REG10(port) (0x8030 + (port<<12))
-+
-+ /* MPSC0 Registers */
-+
-+
-+/***************************************/
-+/* SDMA Registers */
-+/***************************************/
-+
-+#define MV64340_SDMA_CONFIG_REG(channel) (0x4000 + (channel<<13))
-+#define MV64340_SDMA_COMMAND_REG(channel) (0x4008 + (channel<<13))
-+#define MV64340_SDMA_CURRENT_RX_DESCRIPTOR_POINTER(channel) (0x4810 + (channel<<13))
-+#define MV64340_SDMA_CURRENT_TX_DESCRIPTOR_POINTER(channel) (0x4c10 + (channel<<13))
-+#define MV64340_SDMA_FIRST_TX_DESCRIPTOR_POINTER(channel) (0x4c14 + (channel<<13))
-+
-+#define MV64340_SDMA_CAUSE_REG 0xb800
-+#define MV64340_SDMA_MASK_REG 0xb880
-+
-+/* BRG Interrupts */
-+
-+#define MV64340_BRG_CONFIG_REG(brg) (0xb200 + (brg<<3))
-+#define MV64340_BRG_BAUDE_TUNING_REG(brg) (0xb208 + (brg<<3))
-+#define MV64340_BRG_CAUSE_REG 0xb834
-+#define MV64340_BRG_MASK_REG 0xb8b4
-+
-+/****************************************/
-+/* DMA Channel Control */
-+/****************************************/
-+
-+#define MV64340_DMA_CHANNEL0_CONTROL 0x840
-+#define MV64340_DMA_CHANNEL0_CONTROL_HIGH 0x880
-+#define MV64340_DMA_CHANNEL1_CONTROL 0x844
-+#define MV64340_DMA_CHANNEL1_CONTROL_HIGH 0x884
-+#define MV64340_DMA_CHANNEL2_CONTROL 0x848
-+#define MV64340_DMA_CHANNEL2_CONTROL_HIGH 0x888
-+#define MV64340_DMA_CHANNEL3_CONTROL 0x84C
-+#define MV64340_DMA_CHANNEL3_CONTROL_HIGH 0x88C
-+
-+
-+/****************************************/
-+/* IDMA Registers */
-+/****************************************/
-+
-+#define MV64340_DMA_CHANNEL0_BYTE_COUNT 0x800
-+#define MV64340_DMA_CHANNEL1_BYTE_COUNT 0x804
-+#define MV64340_DMA_CHANNEL2_BYTE_COUNT 0x808
-+#define MV64340_DMA_CHANNEL3_BYTE_COUNT 0x80C
-+#define MV64340_DMA_CHANNEL0_SOURCE_ADDR 0x810
-+#define MV64340_DMA_CHANNEL1_SOURCE_ADDR 0x814
-+#define MV64340_DMA_CHANNEL2_SOURCE_ADDR 0x818
-+#define MV64340_DMA_CHANNEL3_SOURCE_ADDR 0x81c
-+#define MV64340_DMA_CHANNEL0_DESTINATION_ADDR 0x820
-+#define MV64340_DMA_CHANNEL1_DESTINATION_ADDR 0x824
-+#define MV64340_DMA_CHANNEL2_DESTINATION_ADDR 0x828
-+#define MV64340_DMA_CHANNEL3_DESTINATION_ADDR 0x82C
-+#define MV64340_DMA_CHANNEL0_NEXT_DESCRIPTOR_POINTER 0x830
-+#define MV64340_DMA_CHANNEL1_NEXT_DESCRIPTOR_POINTER 0x834
-+#define MV64340_DMA_CHANNEL2_NEXT_DESCRIPTOR_POINTER 0x838
-+#define MV64340_DMA_CHANNEL3_NEXT_DESCRIPTOR_POINTER 0x83C
-+#define MV64340_DMA_CHANNEL0_CURRENT_DESCRIPTOR_POINTER 0x870
-+#define MV64340_DMA_CHANNEL1_CURRENT_DESCRIPTOR_POINTER 0x874
-+#define MV64340_DMA_CHANNEL2_CURRENT_DESCRIPTOR_POINTER 0x878
-+#define MV64340_DMA_CHANNEL3_CURRENT_DESCRIPTOR_POINTER 0x87C
-+
-+ /* IDMA Address Decoding Base Address Registers */
-+
-+#define MV64340_DMA_BASE_ADDR_REG0 0xa00
-+#define MV64340_DMA_BASE_ADDR_REG1 0xa08
-+#define MV64340_DMA_BASE_ADDR_REG2 0xa10
-+#define MV64340_DMA_BASE_ADDR_REG3 0xa18
-+#define MV64340_DMA_BASE_ADDR_REG4 0xa20
-+#define MV64340_DMA_BASE_ADDR_REG5 0xa28
-+#define MV64340_DMA_BASE_ADDR_REG6 0xa30
-+#define MV64340_DMA_BASE_ADDR_REG7 0xa38
-+
-+ /* IDMA Address Decoding Size Address Register */
-+
-+#define MV64340_DMA_SIZE_REG0 0xa04
-+#define MV64340_DMA_SIZE_REG1 0xa0c
-+#define MV64340_DMA_SIZE_REG2 0xa14
-+#define MV64340_DMA_SIZE_REG3 0xa1c
-+#define MV64340_DMA_SIZE_REG4 0xa24
-+#define MV64340_DMA_SIZE_REG5 0xa2c
-+#define MV64340_DMA_SIZE_REG6 0xa34
-+#define MV64340_DMA_SIZE_REG7 0xa3C
-+
-+ /* IDMA Address Decoding High Address Remap and Access
-+ Protection Registers */
-+
-+#define MV64340_DMA_HIGH_ADDR_REMAP_REG0 0xa60
-+#define MV64340_DMA_HIGH_ADDR_REMAP_REG1 0xa64
-+#define MV64340_DMA_HIGH_ADDR_REMAP_REG2 0xa68
-+#define MV64340_DMA_HIGH_ADDR_REMAP_REG3 0xa6C
-+#define MV64340_DMA_BASE_ADDR_ENABLE_REG 0xa80
-+#define MV64340_DMA_CHANNEL0_ACCESS_PROTECTION_REG 0xa70
-+#define MV64340_DMA_CHANNEL1_ACCESS_PROTECTION_REG 0xa74
-+#define MV64340_DMA_CHANNEL2_ACCESS_PROTECTION_REG 0xa78
-+#define MV64340_DMA_CHANNEL3_ACCESS_PROTECTION_REG 0xa7c
-+#define MV64340_DMA_ARBITER_CONTROL 0x860
-+#define MV64340_DMA_CROSS_BAR_TIMEOUT 0x8d0
-+
-+ /* IDMA Headers Retarget Registers */
-+
-+#define MV64340_DMA_HEADERS_RETARGET_CONTROL 0xa84
-+#define MV64340_DMA_HEADERS_RETARGET_BASE 0xa88
-+
-+ /* IDMA Interrupt Register */
-+
-+#define MV64340_DMA_INTERRUPT_CAUSE_REG 0x8c0
-+#define MV64340_DMA_INTERRUPT_CAUSE_MASK 0x8c4
-+#define MV64340_DMA_ERROR_ADDR 0x8c8
-+#define MV64340_DMA_ERROR_SELECT 0x8cc
-+
-+ /* IDMA Debug Register ( for internal use ) */
-+
-+#define MV64340_DMA_DEBUG_LOW 0x8e0
-+#define MV64340_DMA_DEBUG_HIGH 0x8e4
-+#define MV64340_DMA_SPARE 0xA8C
-+
-+/****************************************/
-+/* Timer_Counter */
-+/****************************************/
-+
-+#define MV64340_TIMER_COUNTER0 0x850
-+#define MV64340_TIMER_COUNTER1 0x854
-+#define MV64340_TIMER_COUNTER2 0x858
-+#define MV64340_TIMER_COUNTER3 0x85C
-+#define MV64340_TIMER_COUNTER_0_3_CONTROL 0x864
-+#define MV64340_TIMER_COUNTER_0_3_INTERRUPT_CAUSE 0x868
-+#define MV64340_TIMER_COUNTER_0_3_INTERRUPT_MASK 0x86c
-+
-+/****************************************/
-+/* Watchdog registers */
-+/****************************************/
-+
-+#define MV64340_WATCHDOG_CONFIG_REG 0xb410
-+#define MV64340_WATCHDOG_VALUE_REG 0xb414
-+
-+/****************************************/
-+/* I2C Registers */
-+/****************************************/
-+
-+#define MV64340_I2C_SLAVE_ADDR 0xc000
-+#define MV64340_I2C_EXTENDED_SLAVE_ADDR 0xc010
-+#define MV64340_I2C_DATA 0xc004
-+#define MV64340_I2C_CONTROL 0xc008
-+#define MV64340_I2C_STATUS_BAUDE_RATE 0xc00C
-+#define MV64340_I2C_SOFT_RESET 0xc01c
-+
-+/****************************************/
-+/* GPP Interface Registers */
-+/****************************************/
-+
-+#define MV64340_GPP_IO_CONTROL 0xf100
-+#define MV64340_GPP_LEVEL_CONTROL 0xf110
-+#define MV64340_GPP_VALUE 0xf104
-+#define MV64340_GPP_INTERRUPT_CAUSE 0xf108
-+#define MV64340_GPP_INTERRUPT_MASK0 0xf10c
-+#define MV64340_GPP_INTERRUPT_MASK1 0xf114
-+#define MV64340_GPP_VALUE_SET 0xf118
-+#define MV64340_GPP_VALUE_CLEAR 0xf11c
-+
-+/****************************************/
-+/* Interrupt Controller Registers */
-+/****************************************/
-+
-+/****************************************/
-+/* Interrupts */
-+/****************************************/
-+
-+#define MV64340_MAIN_INTERRUPT_CAUSE_LOW 0x004
-+#define MV64340_MAIN_INTERRUPT_CAUSE_HIGH 0x00c
-+#define MV64340_CPU_INTERRUPT0_MASK_LOW 0x014
-+#define MV64340_CPU_INTERRUPT0_MASK_HIGH 0x01c
-+#define MV64340_CPU_INTERRUPT0_SELECT_CAUSE 0x024
-+#define MV64340_CPU_INTERRUPT1_MASK_LOW 0x034
-+#define MV64340_CPU_INTERRUPT1_MASK_HIGH 0x03c
-+#define MV64340_CPU_INTERRUPT1_SELECT_CAUSE 0x044
-+#define MV64340_INTERRUPT0_MASK_0_LOW 0x054
-+#define MV64340_INTERRUPT0_MASK_0_HIGH 0x05c
-+#define MV64340_INTERRUPT0_SELECT_CAUSE 0x064
-+#define MV64340_INTERRUPT1_MASK_0_LOW 0x074
-+#define MV64340_INTERRUPT1_MASK_0_HIGH 0x07c
-+#define MV64340_INTERRUPT1_SELECT_CAUSE 0x084
-+
-+/****************************************/
-+/* MPP Interface Registers */
-+/****************************************/
-+
-+#define MV64340_MPP_CONTROL0 0xf000
-+#define MV64340_MPP_CONTROL1 0xf004
-+#define MV64340_MPP_CONTROL2 0xf008
-+#define MV64340_MPP_CONTROL3 0xf00c
-+
-+/****************************************/
-+/* Serial Initialization registers */
-+/****************************************/
-+
-+#define MV64340_SERIAL_INIT_LAST_DATA 0xf324
-+#define MV64340_SERIAL_INIT_CONTROL 0xf328
-+#define MV64340_SERIAL_INIT_STATUS 0xf32c
-+
-+extern unsigned long mv64340_base;
-+
-+#define MV64340_BASE (mv64340_base)
-+
-+/*
-+ * Because of an error/peculiarity in the Galileo chip, we need to swap the
-+ * bytes when running bigendian.
-+ */
-+
-+#define MV_WRITE(ofs, data) \
-+ *(volatile u32 *)(MV64340_BASE + (ofs)) = cpu_to_le32((u32)data)
-+#define MV_READ(ofs) \
-+ (le32_to_cpu(*(volatile u32 *)(MV64340_BASE + (ofs))))
-+
-+#define MV_WRITE_16(ofs, data) \
-+ *(volatile u16 *)(MV64340_BASE + (ofs)) = cpu_to_le16((u16)data)
-+#define MV_READ_16(ofs) \
-+ le16_to_cpu(*(volatile u16 *)(MV64340_BASE + (ofs)))
-+
-+#define MV_WRITE_8(ofs, data) \
-+ *(volatile u8 *)(MV64340_BASE + (ofs)) = ((u16)data)
-+#define MV_READ_8(ofs) \
-+ (*(volatile u8 *)(MV64340_BASE + (ofs)))
-+
-+#define MV_SET_REG_BITS(ofs, bits) \
-+ (*((volatile u32 *)(MV64340_BASE + (ofs)))) |= ((u32)cpu_to_le32(bits))
-+#define MV_RESET_REG_BITS(ofs, bits) \
-+ (*((volatile u32 *)(MV64340_BASE + (ofs)))) &= ~((u32)cpu_to_le32(bits))
-+
-+extern void mv64340_irq_init(unsigned int base);
-+
-+extern struct pci_ops mv64340_bus0_pci_ops;
-+extern struct pci_ops mv64340_bus1_pci_ops;
-+
-+#endif /* __ASM_MV64340_H */
-diff -urN linux-2.6.9.orig/include/linux/mv643xx.h linux-2.6.9/include/linux/mv643xx.h
---- linux-2.6.9.orig/include/linux/mv643xx.h 2004-10-18 23:54:55.000000000 +0200
-+++ linux-2.6.9/include/linux/mv643xx.h 2004-10-27 10:31:59.863442504 +0200
-@@ -13,7 +13,14 @@
- #ifndef __ASM_MV64340_H
- #define __ASM_MV64340_H
-
-+#ifndef __PPC__
-+/*
-+ * PowerPC architecture (Pegasos II) does not requiere addrspace
-+ * and it even doesn't exist in asm-ppc
-+*/
- #include <asm/addrspace.h>
-+#endif
-+
- #include <asm/marvell.h>
-
- /****************************************/
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos.dpatch 2005-03-07 05:30:22 UTC (rev 2631)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos.dpatch 2005-03-07 13:57:28 UTC (rev 2632)
@@ -1,5296 +0,0 @@
-#! /bin/sh -e
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Add MV64xxx_eth powerpc support
-## DP: Patch author: Dale Farnsworth <dale at farnsworth.org>
-## DP: Upstream status: not submitted
-## DP: BK URL: bk://dfarnsworth.bkbits.net/linux-2.5-mv643xx-enet
-
-. $(dirname $0)/DPATCH
-
- at DPATCH@
---- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/include/linux/mv643xx.h 2005-03-05 19:42:47.000000000 +0100
-+++ include/linux/mv643xx.h 2005-03-05 21:23:35.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * mv64340.h - MV-64340 Internal registers definition file.
-+ * mv643xx.h - MV-643XX Internal registers definition file.
- *
- * Copyright 2002 Momentum Computer, Inc.
- * Author: Matthew Dharm <mdharm at momenco.com>
-@@ -10,8 +10,8 @@
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
--#ifndef __ASM_MV64340_H
--#define __ASM_MV64340_H
-+#ifndef __ASM_MV643XX_H
-+#define __ASM_MV643XX_H
-
- #ifdef __MIPS__
- #include <asm/addrspace.h>
-@@ -662,116 +662,119 @@
- /* Ethernet Unit Registers */
- /****************************************/
-
--#define MV64340_ETH_PHY_ADDR_REG 0x2000
--#define MV64340_ETH_SMI_REG 0x2004
--#define MV64340_ETH_UNIT_DEFAULT_ADDR_REG 0x2008
--#define MV64340_ETH_UNIT_DEFAULTID_REG 0x200c
--#define MV64340_ETH_UNIT_INTERRUPT_CAUSE_REG 0x2080
--#define MV64340_ETH_UNIT_INTERRUPT_MASK_REG 0x2084
--#define MV64340_ETH_UNIT_INTERNAL_USE_REG 0x24fc
--#define MV64340_ETH_UNIT_ERROR_ADDR_REG 0x2094
--#define MV64340_ETH_BAR_0 0x2200
--#define MV64340_ETH_BAR_1 0x2208
--#define MV64340_ETH_BAR_2 0x2210
--#define MV64340_ETH_BAR_3 0x2218
--#define MV64340_ETH_BAR_4 0x2220
--#define MV64340_ETH_BAR_5 0x2228
--#define MV64340_ETH_SIZE_REG_0 0x2204
--#define MV64340_ETH_SIZE_REG_1 0x220c
--#define MV64340_ETH_SIZE_REG_2 0x2214
--#define MV64340_ETH_SIZE_REG_3 0x221c
--#define MV64340_ETH_SIZE_REG_4 0x2224
--#define MV64340_ETH_SIZE_REG_5 0x222c
--#define MV64340_ETH_HEADERS_RETARGET_BASE_REG 0x2230
--#define MV64340_ETH_HEADERS_RETARGET_CONTROL_REG 0x2234
--#define MV64340_ETH_HIGH_ADDR_REMAP_REG_0 0x2280
--#define MV64340_ETH_HIGH_ADDR_REMAP_REG_1 0x2284
--#define MV64340_ETH_HIGH_ADDR_REMAP_REG_2 0x2288
--#define MV64340_ETH_HIGH_ADDR_REMAP_REG_3 0x228c
--#define MV64340_ETH_BASE_ADDR_ENABLE_REG 0x2290
--#define MV64340_ETH_ACCESS_PROTECTION_REG(port) (0x2294 + (port<<2))
--#define MV64340_ETH_MIB_COUNTERS_BASE(port) (0x3000 + (port<<7))
--#define MV64340_ETH_PORT_CONFIG_REG(port) (0x2400 + (port<<10))
--#define MV64340_ETH_PORT_CONFIG_EXTEND_REG(port) (0x2404 + (port<<10))
--#define MV64340_ETH_MII_SERIAL_PARAMETRS_REG(port) (0x2408 + (port<<10))
--#define MV64340_ETH_GMII_SERIAL_PARAMETRS_REG(port) (0x240c + (port<<10))
--#define MV64340_ETH_VLAN_ETHERTYPE_REG(port) (0x2410 + (port<<10))
--#define MV64340_ETH_MAC_ADDR_LOW(port) (0x2414 + (port<<10))
--#define MV64340_ETH_MAC_ADDR_HIGH(port) (0x2418 + (port<<10))
--#define MV64340_ETH_SDMA_CONFIG_REG(port) (0x241c + (port<<10))
--#define MV64340_ETH_DSCP_0(port) (0x2420 + (port<<10))
--#define MV64340_ETH_DSCP_1(port) (0x2424 + (port<<10))
--#define MV64340_ETH_DSCP_2(port) (0x2428 + (port<<10))
--#define MV64340_ETH_DSCP_3(port) (0x242c + (port<<10))
--#define MV64340_ETH_DSCP_4(port) (0x2430 + (port<<10))
--#define MV64340_ETH_DSCP_5(port) (0x2434 + (port<<10))
--#define MV64340_ETH_DSCP_6(port) (0x2438 + (port<<10))
--#define MV64340_ETH_PORT_SERIAL_CONTROL_REG(port) (0x243c + (port<<10))
--#define MV64340_ETH_VLAN_PRIORITY_TAG_TO_PRIORITY(port) (0x2440 + (port<<10))
--#define MV64340_ETH_PORT_STATUS_REG(port) (0x2444 + (port<<10))
--#define MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(port) (0x2448 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_FIXED_PRIORITY(port) (0x244c + (port<<10))
--#define MV64340_ETH_PORT_TX_TOKEN_BUCKET_RATE_CONFIG(port) (0x2450 + (port<<10))
--#define MV64340_ETH_MAXIMUM_TRANSMIT_UNIT(port) (0x2458 + (port<<10))
--#define MV64340_ETH_PORT_MAXIMUM_TOKEN_BUCKET_SIZE(port) (0x245c + (port<<10))
--#define MV64340_ETH_INTERRUPT_CAUSE_REG(port) (0x2460 + (port<<10))
--#define MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port) (0x2464 + (port<<10))
--#define MV64340_ETH_INTERRUPT_MASK_REG(port) (0x2468 + (port<<10))
--#define MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port) (0x246c + (port<<10))
--#define MV64340_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
--#define MV64340_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
--#define MV64340_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
--#define MV64340_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
--#define MV64340_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
--#define MV64340_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
--#define MV64340_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
--#define MV64340_ETH_INTERNAL_USE_REG(port) (0x24fc + (port<<10))
--#define MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(port) (0x2680 + (port<<10))
--#define MV64340_ETH_CURRENT_SERVED_TX_DESC_PTR(port) (0x2684 + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port) (0x260c + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_1(port) (0x261c + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_2(port) (0x262c + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_3(port) (0x263c + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_4(port) (0x264c + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_5(port) (0x265c + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_6(port) (0x266c + (port<<10))
--#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_7(port) (0x267c + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(port) (0x26c0 + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_1(port) (0x26c4 + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_2(port) (0x26c8 + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_3(port) (0x26cc + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_4(port) (0x26d0 + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_5(port) (0x26d4 + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_6(port) (0x26d8 + (port<<10))
--#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_7(port) (0x26dc + (port<<10))
--#define MV64340_ETH_TX_QUEUE_0_TOKEN_BUCKET_COUNT(port) (0x2700 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_1_TOKEN_BUCKET_COUNT(port) (0x2710 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_2_TOKEN_BUCKET_COUNT(port) (0x2720 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_3_TOKEN_BUCKET_COUNT(port) (0x2730 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_4_TOKEN_BUCKET_COUNT(port) (0x2740 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_5_TOKEN_BUCKET_COUNT(port) (0x2750 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_6_TOKEN_BUCKET_COUNT(port) (0x2760 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_7_TOKEN_BUCKET_COUNT(port) (0x2770 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_0_TOKEN_BUCKET_CONFIG(port) (0x2704 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_1_TOKEN_BUCKET_CONFIG(port) (0x2714 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_2_TOKEN_BUCKET_CONFIG(port) (0x2724 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_3_TOKEN_BUCKET_CONFIG(port) (0x2734 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_4_TOKEN_BUCKET_CONFIG(port) (0x2744 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_5_TOKEN_BUCKET_CONFIG(port) (0x2754 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_6_TOKEN_BUCKET_CONFIG(port) (0x2764 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_7_TOKEN_BUCKET_CONFIG(port) (0x2774 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_0_ARBITER_CONFIG(port) (0x2708 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_1_ARBITER_CONFIG(port) (0x2718 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_2_ARBITER_CONFIG(port) (0x2728 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_3_ARBITER_CONFIG(port) (0x2738 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_4_ARBITER_CONFIG(port) (0x2748 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_5_ARBITER_CONFIG(port) (0x2758 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_6_ARBITER_CONFIG(port) (0x2768 + (port<<10))
--#define MV64340_ETH_TX_QUEUE_7_ARBITER_CONFIG(port) (0x2778 + (port<<10))
--#define MV64340_ETH_PORT_TX_TOKEN_BUCKET_COUNT(port) (0x2780 + (port<<10))
--#define MV64340_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port) (0x3400 + (port<<10))
--#define MV64340_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port) (0x3500 + (port<<10))
--#define MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE(port) (0x3600 + (port<<10))
-+#define MV643XX_ETH_SHARED_REGS 0x2000
-+#define MV643XX_ETH_SHARED_REGS_SIZE 0x2000
-+
-+#define MV643XX_ETH_PHY_ADDR_REG 0x2000
-+#define MV643XX_ETH_SMI_REG 0x2004
-+#define MV643XX_ETH_UNIT_DEFAULT_ADDR_REG 0x2008
-+#define MV643XX_ETH_UNIT_DEFAULTID_REG 0x200c
-+#define MV643XX_ETH_UNIT_INTERRUPT_CAUSE_REG 0x2080
-+#define MV643XX_ETH_UNIT_INTERRUPT_MASK_REG 0x2084
-+#define MV643XX_ETH_UNIT_INTERNAL_USE_REG 0x24fc
-+#define MV643XX_ETH_UNIT_ERROR_ADDR_REG 0x2094
-+#define MV643XX_ETH_BAR_0 0x2200
-+#define MV643XX_ETH_BAR_1 0x2208
-+#define MV643XX_ETH_BAR_2 0x2210
-+#define MV643XX_ETH_BAR_3 0x2218
-+#define MV643XX_ETH_BAR_4 0x2220
-+#define MV643XX_ETH_BAR_5 0x2228
-+#define MV643XX_ETH_SIZE_REG_0 0x2204
-+#define MV643XX_ETH_SIZE_REG_1 0x220c
-+#define MV643XX_ETH_SIZE_REG_2 0x2214
-+#define MV643XX_ETH_SIZE_REG_3 0x221c
-+#define MV643XX_ETH_SIZE_REG_4 0x2224
-+#define MV643XX_ETH_SIZE_REG_5 0x222c
-+#define MV643XX_ETH_HEADERS_RETARGET_BASE_REG 0x2230
-+#define MV643XX_ETH_HEADERS_RETARGET_CONTROL_REG 0x2234
-+#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_0 0x2280
-+#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_1 0x2284
-+#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_2 0x2288
-+#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_3 0x228c
-+#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290
-+#define MV643XX_ETH_ACCESS_PROTECTION_REG(port) (0x2294 + (port<<2))
-+#define MV643XX_ETH_MIB_COUNTERS_BASE(port) (0x3000 + (port<<7))
-+#define MV643XX_ETH_PORT_CONFIG_REG(port) (0x2400 + (port<<10))
-+#define MV643XX_ETH_PORT_CONFIG_EXTEND_REG(port) (0x2404 + (port<<10))
-+#define MV643XX_ETH_MII_SERIAL_PARAMETRS_REG(port) (0x2408 + (port<<10))
-+#define MV643XX_ETH_GMII_SERIAL_PARAMETRS_REG(port) (0x240c + (port<<10))
-+#define MV643XX_ETH_VLAN_ETHERTYPE_REG(port) (0x2410 + (port<<10))
-+#define MV643XX_ETH_MAC_ADDR_LOW(port) (0x2414 + (port<<10))
-+#define MV643XX_ETH_MAC_ADDR_HIGH(port) (0x2418 + (port<<10))
-+#define MV643XX_ETH_SDMA_CONFIG_REG(port) (0x241c + (port<<10))
-+#define MV643XX_ETH_DSCP_0(port) (0x2420 + (port<<10))
-+#define MV643XX_ETH_DSCP_1(port) (0x2424 + (port<<10))
-+#define MV643XX_ETH_DSCP_2(port) (0x2428 + (port<<10))
-+#define MV643XX_ETH_DSCP_3(port) (0x242c + (port<<10))
-+#define MV643XX_ETH_DSCP_4(port) (0x2430 + (port<<10))
-+#define MV643XX_ETH_DSCP_5(port) (0x2434 + (port<<10))
-+#define MV643XX_ETH_DSCP_6(port) (0x2438 + (port<<10))
-+#define MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port) (0x243c + (port<<10))
-+#define MV643XX_ETH_VLAN_PRIORITY_TAG_TO_PRIORITY(port) (0x2440 + (port<<10))
-+#define MV643XX_ETH_PORT_STATUS_REG(port) (0x2444 + (port<<10))
-+#define MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port) (0x2448 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_FIXED_PRIORITY(port) (0x244c + (port<<10))
-+#define MV643XX_ETH_PORT_TX_TOKEN_BUCKET_RATE_CONFIG(port) (0x2450 + (port<<10))
-+#define MV643XX_ETH_MAXIMUM_TRANSMIT_UNIT(port) (0x2458 + (port<<10))
-+#define MV643XX_ETH_PORT_MAXIMUM_TOKEN_BUCKET_SIZE(port) (0x245c + (port<<10))
-+#define MV643XX_ETH_INTERRUPT_CAUSE_REG(port) (0x2460 + (port<<10))
-+#define MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port) (0x2464 + (port<<10))
-+#define MV643XX_ETH_INTERRUPT_MASK_REG(port) (0x2468 + (port<<10))
-+#define MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port) (0x246c + (port<<10))
-+#define MV643XX_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
-+#define MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
-+#define MV643XX_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
-+#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
-+#define MV643XX_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
-+#define MV643XX_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
-+#define MV643XX_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
-+#define MV643XX_ETH_INTERNAL_USE_REG(port) (0x24fc + (port<<10))
-+#define MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port) (0x2680 + (port<<10))
-+#define MV643XX_ETH_CURRENT_SERVED_TX_DESC_PTR(port) (0x2684 + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port) (0x260c + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_1(port) (0x261c + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_2(port) (0x262c + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_3(port) (0x263c + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_4(port) (0x264c + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_5(port) (0x265c + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_6(port) (0x266c + (port<<10))
-+#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_7(port) (0x267c + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(port) (0x26c0 + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_1(port) (0x26c4 + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_2(port) (0x26c8 + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_3(port) (0x26cc + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_4(port) (0x26d0 + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_5(port) (0x26d4 + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_6(port) (0x26d8 + (port<<10))
-+#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_7(port) (0x26dc + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_0_TOKEN_BUCKET_COUNT(port) (0x2700 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_1_TOKEN_BUCKET_COUNT(port) (0x2710 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_2_TOKEN_BUCKET_COUNT(port) (0x2720 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_3_TOKEN_BUCKET_COUNT(port) (0x2730 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_4_TOKEN_BUCKET_COUNT(port) (0x2740 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_5_TOKEN_BUCKET_COUNT(port) (0x2750 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_6_TOKEN_BUCKET_COUNT(port) (0x2760 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_7_TOKEN_BUCKET_COUNT(port) (0x2770 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_0_TOKEN_BUCKET_CONFIG(port) (0x2704 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_1_TOKEN_BUCKET_CONFIG(port) (0x2714 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_2_TOKEN_BUCKET_CONFIG(port) (0x2724 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_3_TOKEN_BUCKET_CONFIG(port) (0x2734 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_4_TOKEN_BUCKET_CONFIG(port) (0x2744 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_5_TOKEN_BUCKET_CONFIG(port) (0x2754 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_6_TOKEN_BUCKET_CONFIG(port) (0x2764 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_7_TOKEN_BUCKET_CONFIG(port) (0x2774 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_0_ARBITER_CONFIG(port) (0x2708 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_1_ARBITER_CONFIG(port) (0x2718 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_2_ARBITER_CONFIG(port) (0x2728 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_3_ARBITER_CONFIG(port) (0x2738 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_4_ARBITER_CONFIG(port) (0x2748 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_5_ARBITER_CONFIG(port) (0x2758 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_6_ARBITER_CONFIG(port) (0x2768 + (port<<10))
-+#define MV643XX_ETH_TX_QUEUE_7_ARBITER_CONFIG(port) (0x2778 + (port<<10))
-+#define MV643XX_ETH_PORT_TX_TOKEN_BUCKET_COUNT(port) (0x2780 + (port<<10))
-+#define MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port) (0x3400 + (port<<10))
-+#define MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port) (0x3500 + (port<<10))
-+#define MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE(port) (0x3600 + (port<<10))
-
- /*******************************************/
- /* CUNIT Registers */
-@@ -1085,4 +1088,221 @@
- u32 brg_clk_freq;
- };
-
--#endif /* __ASM_MV64340_H */
-+/* These macros describe Ethernet Port configuration reg (Px_cR) bits */
-+#define MV643XX_ETH_UNICAST_NORMAL_MODE 0
-+#define MV643XX_ETH_UNICAST_PROMISCUOUS_MODE (1<<0)
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_0 0
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_1 (1<<1)
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_2 (1<<2)
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_3 ((1<<2) | (1<<1))
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_4 (1<<3)
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_5 ((1<<3) | (1<<1))
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_6 ((1<<3) | (1<<2))
-+#define MV643XX_ETH_DEFAULT_RX_QUEUE_7 ((1<<3) | (1<<2) | (1<<1))
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_0 0
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_1 (1<<4)
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_2 (1<<5)
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_3 ((1<<5) | (1<<4))
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_4 (1<<6)
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_5 ((1<<6) | (1<<4))
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_6 ((1<<6) | (1<<5))
-+#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_7 ((1<<6) | (1<<5) | (1<<4))
-+#define MV643XX_ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP 0
-+#define MV643XX_ETH_REJECT_BC_IF_NOT_IP_OR_ARP (1<<7)
-+#define MV643XX_ETH_RECEIVE_BC_IF_IP 0
-+#define MV643XX_ETH_REJECT_BC_IF_IP (1<<8)
-+#define MV643XX_ETH_RECEIVE_BC_IF_ARP 0
-+#define MV643XX_ETH_REJECT_BC_IF_ARP (1<<9)
-+#define MV643XX_ETH_TX_AM_NO_UPDATE_ERROR_SUMMARY (1<<12)
-+#define MV643XX_ETH_CAPTURE_TCP_FRAMES_DIS 0
-+#define MV643XX_ETH_CAPTURE_TCP_FRAMES_EN (1<<14)
-+#define MV643XX_ETH_CAPTURE_UDP_FRAMES_DIS 0
-+#define MV643XX_ETH_CAPTURE_UDP_FRAMES_EN (1<<15)
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_0 0
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_1 (1<<16)
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_2 (1<<17)
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_3 ((1<<17) | (1<<16))
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_4 (1<<18)
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_5 ((1<<18) | (1<<16))
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_6 ((1<<18) | (1<<17))
-+#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_7 ((1<<18) | (1<<17) | (1<<16))
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_0 0
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_1 (1<<19)
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_2 (1<<20)
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_3 ((1<<20) | (1<<19))
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21)
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_5 ((1<<21) | (1<<19))
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_6 ((1<<21) | (1<<20))
-+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_7 ((1<<21) | (1<<20) | (1<<19))
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_0 0
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_1 (1<<22)
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_2 (1<<23)
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_3 ((1<<23) | (1<<22))
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_4 (1<<24)
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_5 ((1<<24) | (1<<22))
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_6 ((1<<24) | (1<<23))
-+#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_7 ((1<<24) | (1<<23) | (1<<22))
-+
-+#define MV643XX_ETH_PORT_CONFIG_DEFAULT_VALUE \
-+ MV643XX_ETH_UNICAST_NORMAL_MODE | \
-+ MV643XX_ETH_DEFAULT_RX_QUEUE_0 | \
-+ MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_0 | \
-+ MV643XX_ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP | \
-+ MV643XX_ETH_RECEIVE_BC_IF_IP | \
-+ MV643XX_ETH_RECEIVE_BC_IF_ARP | \
-+ MV643XX_ETH_CAPTURE_TCP_FRAMES_DIS | \
-+ MV643XX_ETH_CAPTURE_UDP_FRAMES_DIS | \
-+ MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_0 | \
-+ MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_0 | \
-+ MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_0
-+
-+/* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
-+#define MV643XX_ETH_CLASSIFY_EN (1<<0)
-+#define MV643XX_ETH_SPAN_BPDU_PACKETS_AS_NORMAL 0
-+#define MV643XX_ETH_SPAN_BPDU_PACKETS_TO_RX_QUEUE_7 (1<<1)
-+#define MV643XX_ETH_PARTITION_DISABLE 0
-+#define MV643XX_ETH_PARTITION_ENABLE (1<<2)
-+
-+#define MV643XX_ETH_PORT_CONFIG_EXTEND_DEFAULT_VALUE \
-+ MV643XX_ETH_SPAN_BPDU_PACKETS_AS_NORMAL | \
-+ MV643XX_ETH_PARTITION_DISABLE
-+
-+/* These macros describe Ethernet Port Sdma configuration reg (SDCR) bits */
-+#define MV643XX_ETH_RIFB (1<<0)
-+#define MV643XX_ETH_RX_BURST_SIZE_1_64BIT 0
-+#define MV643XX_ETH_RX_BURST_SIZE_2_64BIT (1<<1)
-+#define MV643XX_ETH_RX_BURST_SIZE_4_64BIT (1<<2)
-+#define MV643XX_ETH_RX_BURST_SIZE_8_64BIT ((1<<2) | (1<<1))
-+#define MV643XX_ETH_RX_BURST_SIZE_16_64BIT (1<<3)
-+#define MV643XX_ETH_BLM_RX_NO_SWAP (1<<4)
-+#define MV643XX_ETH_BLM_RX_BYTE_SWAP 0
-+#define MV643XX_ETH_BLM_TX_NO_SWAP (1<<5)
-+#define MV643XX_ETH_BLM_TX_BYTE_SWAP 0
-+#define MV643XX_ETH_DESCRIPTORS_BYTE_SWAP (1<<6)
-+#define MV643XX_ETH_DESCRIPTORS_NO_SWAP 0
-+#define MV643XX_ETH_TX_BURST_SIZE_1_64BIT 0
-+#define MV643XX_ETH_TX_BURST_SIZE_2_64BIT (1<<22)
-+#define MV643XX_ETH_TX_BURST_SIZE_4_64BIT (1<<23)
-+#define MV643XX_ETH_TX_BURST_SIZE_8_64BIT ((1<<23) | (1<<22))
-+#define MV643XX_ETH_TX_BURST_SIZE_16_64BIT (1<<24)
-+
-+#define MV643XX_ETH_IPG_INT_RX(value) ((value & 0x3fff) << 8)
-+
-+#define MV643XX_ETH_PORT_SDMA_CONFIG_DEFAULT_VALUE \
-+ MV643XX_ETH_RX_BURST_SIZE_4_64BIT | \
-+ MV643XX_ETH_IPG_INT_RX(0) | \
-+ MV643XX_ETH_TX_BURST_SIZE_4_64BIT
-+
-+/* These macros describe Ethernet Port serial control reg (PSCR) bits */
-+#define MV643XX_ETH_SERIAL_PORT_DISABLE 0
-+#define MV643XX_ETH_SERIAL_PORT_ENABLE (1<<0)
-+#define MV643XX_ETH_FORCE_LINK_PASS (1<<1)
-+#define MV643XX_ETH_DO_NOT_FORCE_LINK_PASS 0
-+#define MV643XX_ETH_ENABLE_AUTO_NEG_FOR_DUPLX 0
-+#define MV643XX_ETH_DISABLE_AUTO_NEG_FOR_DUPLX (1<<2)
-+#define MV643XX_ETH_ENABLE_AUTO_NEG_FOR_FLOW_CTRL 0
-+#define MV643XX_ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL (1<<3)
-+#define MV643XX_ETH_ADV_NO_FLOW_CTRL 0
-+#define MV643XX_ETH_ADV_SYMMETRIC_FLOW_CTRL (1<<4)
-+#define MV643XX_ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX 0
-+#define MV643XX_ETH_FORCE_FC_MODE_TX_PAUSE_DIS (1<<5)
-+#define MV643XX_ETH_FORCE_BP_MODE_NO_JAM 0
-+#define MV643XX_ETH_FORCE_BP_MODE_JAM_TX (1<<7)
-+#define MV643XX_ETH_FORCE_BP_MODE_JAM_TX_ON_RX_ERR (1<<8)
-+#define MV643XX_ETH_FORCE_LINK_FAIL 0
-+#define MV643XX_ETH_DO_NOT_FORCE_LINK_FAIL (1<<10)
-+#define MV643XX_ETH_RETRANSMIT_16_ATTEMPTS 0
-+#define MV643XX_ETH_RETRANSMIT_FOREVER (1<<11)
-+#define MV643XX_ETH_DISABLE_AUTO_NEG_SPEED_GMII (1<<13)
-+#define MV643XX_ETH_ENABLE_AUTO_NEG_SPEED_GMII 0
-+#define MV643XX_ETH_DTE_ADV_0 0
-+#define MV643XX_ETH_DTE_ADV_1 (1<<14)
-+#define MV643XX_ETH_DISABLE_AUTO_NEG_BYPASS 0
-+#define MV643XX_ETH_ENABLE_AUTO_NEG_BYPASS (1<<15)
-+#define MV643XX_ETH_AUTO_NEG_NO_CHANGE 0
-+#define MV643XX_ETH_RESTART_AUTO_NEG (1<<16)
-+#define MV643XX_ETH_MAX_RX_PACKET_1518BYTE 0
-+#define MV643XX_ETH_MAX_RX_PACKET_1522BYTE (1<<17)
-+#define MV643XX_ETH_MAX_RX_PACKET_1552BYTE (1<<18)
-+#define MV643XX_ETH_MAX_RX_PACKET_9022BYTE ((1<<18) | (1<<17))
-+#define MV643XX_ETH_MAX_RX_PACKET_9192BYTE (1<<19)
-+#define MV643XX_ETH_MAX_RX_PACKET_9700BYTE ((1<<19) | (1<<17))
-+#define MV643XX_ETH_SET_EXT_LOOPBACK (1<<20)
-+#define MV643XX_ETH_CLR_EXT_LOOPBACK 0
-+#define MV643XX_ETH_SET_FULL_DUPLEX_MODE (1<<21)
-+#define MV643XX_ETH_SET_HALF_DUPLEX_MODE 0
-+#define MV643XX_ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX (1<<22)
-+#define MV643XX_ETH_DISABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX 0
-+#define MV643XX_ETH_SET_GMII_SPEED_TO_10_100 0
-+#define MV643XX_ETH_SET_GMII_SPEED_TO_1000 (1<<23)
-+#define MV643XX_ETH_SET_MII_SPEED_TO_10 0
-+#define MV643XX_ETH_SET_MII_SPEED_TO_100 (1<<24)
-+
-+#define MV643XX_ETH_PORT_SERIAL_CONTROL_DEFAULT_VALUE \
-+ MV643XX_ETH_DO_NOT_FORCE_LINK_PASS | \
-+ MV643XX_ETH_ENABLE_AUTO_NEG_FOR_DUPLX | \
-+ MV643XX_ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL | \
-+ MV643XX_ETH_ADV_SYMMETRIC_FLOW_CTRL | \
-+ MV643XX_ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX | \
-+ MV643XX_ETH_FORCE_BP_MODE_NO_JAM | \
-+ (1<<9) /* reserved */ | \
-+ MV643XX_ETH_DO_NOT_FORCE_LINK_FAIL | \
-+ MV643XX_ETH_RETRANSMIT_16_ATTEMPTS | \
-+ MV643XX_ETH_ENABLE_AUTO_NEG_SPEED_GMII | \
-+ MV643XX_ETH_DTE_ADV_0 | \
-+ MV643XX_ETH_DISABLE_AUTO_NEG_BYPASS | \
-+ MV643XX_ETH_AUTO_NEG_NO_CHANGE | \
-+ MV643XX_ETH_MAX_RX_PACKET_9700BYTE | \
-+ MV643XX_ETH_CLR_EXT_LOOPBACK | \
-+ MV643XX_ETH_SET_FULL_DUPLEX_MODE | \
-+ MV643XX_ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX
-+
-+/* These macros describe Ethernet Serial Status reg (PSR) bits */
-+#define MV643XX_ETH_PORT_STATUS_MODE_10_BIT (1<<0)
-+#define MV643XX_ETH_PORT_STATUS_LINK_UP (1<<1)
-+#define MV643XX_ETH_PORT_STATUS_FULL_DUPLEX (1<<2)
-+#define MV643XX_ETH_PORT_STATUS_FLOW_CONTROL (1<<3)
-+#define MV643XX_ETH_PORT_STATUS_GMII_1000 (1<<4)
-+#define MV643XX_ETH_PORT_STATUS_MII_100 (1<<5)
-+/* PSR bit 6 is undocumented */
-+#define MV643XX_ETH_PORT_STATUS_TX_IN_PROGRESS (1<<7)
-+#define MV643XX_ETH_PORT_STATUS_AUTONEG_BYPASSED (1<<8)
-+#define MV643XX_ETH_PORT_STATUS_PARTITION (1<<9)
-+#define MV643XX_ETH_PORT_STATUS_TX_FIFO_EMPTY (1<<10)
-+/* PSR bits 11-31 are reserved */
-+
-+#define MV643XX_ETH_PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
-+#define MV643XX_ETH_PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
-+
-+#define MV643XX_ETH_DESC_SIZE 64
-+
-+#define MV643XX_ETH_SHARED_NAME "mv643xx_eth_shared"
-+#define MV643XX_ETH_NAME "mv643xx_eth"
-+
-+struct mv643xx_eth_platform_data {
-+ /*
-+ * Non-values for mac_addr, phy_addr, port_config, etc.
-+ * override the default value. Setting the corresponding
-+ * force_* field, causes the default value to be overridden
-+ * even when zero.
-+ */
-+ unsigned int force_phy_addr:1;
-+ unsigned int force_port_config:1;
-+ unsigned int force_port_config_extend:1;
-+ unsigned int force_port_sdma_config:1;
-+ unsigned int force_port_serial_control:1;
-+ int phy_addr;
-+ char *mac_addr; /* pointer to mac address */
-+ u32 port_config;
-+ u32 port_config_extend;
-+ u32 port_sdma_config;
-+ u32 port_serial_control;
-+ u32 tx_queue_size;
-+ u32 rx_queue_size;
-+ u32 tx_sram_addr;
-+ u32 tx_sram_size;
-+ u32 rx_sram_addr;
-+ u32 rx_sram_size;
-+};
-+
-+#endif /* __ASM_MV643XX_H */
---- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/drivers/net/mv643xx_eth.c 2005-03-02 08:38:01.000000000 +0100
-+++ drivers/net/mv643xx_eth.c 2005-03-05 21:23:35.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * drivers/net/mv64340_eth.c - Driver for MV64340X ethernet ports
-+ * drivers/net/mv643xx_eth.c - Driver for MV643XX ethernet ports
- * Copyright (C) 2002 Matthew Dharm <mdharm at momenco.com>
- *
- * Based on the 64360 driver from:
-@@ -10,6 +10,12 @@
- *
- * Copyright (C) 2003 Ralf Baechle <ralf at linux-mips.org>
- *
-+ * Copyright (C) 2004-2005 MontaVista Software, Inc.
-+ * Dale Farnsworth <dale at farnsworth.org>
-+ *
-+ * Copyright (C) 2004 Steven J. Hill <sjhill1 at rockwellcollins.com>
-+ * <sjhill at realitydiluted.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
-@@ -24,80 +30,100 @@
- * 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/config.h>
--#include <linux/version.h>
--#include <linux/module.h>
--#include <linux/kernel.h>
--#include <linux/config.h>
--#include <linux/sched.h>
--#include <linux/ptrace.h>
--#include <linux/fcntl.h>
--#include <linux/ioport.h>
--#include <linux/interrupt.h>
--#include <linux/slab.h>
--#include <linux/string.h>
--#include <linux/errno.h>
--#include <linux/ip.h>
- #include <linux/init.h>
--#include <linux/in.h>
--#include <linux/pci.h>
--#include <linux/workqueue.h>
--#include <asm/smp.h>
--#include <linux/skbuff.h>
-+#include <linux/dma-mapping.h>
- #include <linux/tcp.h>
--#include <linux/netdevice.h>
-+#include <linux/udp.h>
- #include <linux/etherdevice.h>
--#include <net/ip.h>
-
- #include <linux/bitops.h>
-+#include <linux/delay.h>
-+#include <linux/ethtool.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"
-
- /*
-- * The first part is the high level driver of the gigE ethernet ports.
-+ * The first part is the high level driver of the gigE ethernet ports.
- */
-
--/* Definition for configuring driver */
--#undef MV64340_RX_QUEUE_FILL_ON_TASK
--
- /* Constants */
--#define EXTRA_BYTES 32
--#define WRAP ETH_HLEN + 2 + 4 + 16
--#define BUFFER_MTU dev->mtu + WRAP
-+#define VLAN_HLEN 4
-+#define FCS_LEN 4
-+#define WRAP NET_IP_ALIGN + ETH_HLEN + VLAN_HLEN + FCS_LEN
-+#define RX_SKB_SIZE ((dev->mtu + WRAP + 7) & ~0x7)
-+
- #define INT_CAUSE_UNMASK_ALL 0x0007ffff
- #define INT_CAUSE_UNMASK_ALL_EXT 0x0011ffff
--#ifdef MV64340_RX_FILL_ON_TASK
-+#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
- #define INT_CAUSE_MASK_ALL 0x00000000
- #define INT_CAUSE_CHECK_BITS INT_CAUSE_UNMASK_ALL
- #define INT_CAUSE_CHECK_BITS_EXT INT_CAUSE_UNMASK_ALL_EXT
- #endif
-
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-+#define MAX_DESCS_PER_SKB (MAX_SKB_FRAGS + 1)
-+#else
-+#define MAX_DESCS_PER_SKB 1
-+#endif
-+
-+#define PHY_WAIT_ITERATIONS 1000 /* 1000 iterations * 10uS = 10mS max */
-+#define PHY_WAIT_MICRO_SECONDS 10
-+
- /* Static function declarations */
--static int mv64340_eth_real_open(struct net_device *);
--static int mv64340_eth_real_stop(struct net_device *);
--static int mv64340_eth_change_mtu(struct net_device *, int);
--static struct net_device_stats *mv64340_eth_get_stats(struct net_device *);
-+static int eth_port_link_is_up(unsigned int eth_port_num);
-+static void eth_port_uc_addr_get(struct net_device *dev,
-+ unsigned char *MacAddr);
-+static int mv643xx_eth_real_open(struct net_device *);
-+static int mv643xx_eth_real_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 MV64340_NAPI
--static int mv64340_poll(struct net_device *dev, int *budget);
-+#ifdef MV643XX_NAPI
-+static int mv643xx_poll(struct net_device *dev, int *budget);
- #endif
-+static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
-+static int ethernet_phy_detect(unsigned int eth_port_num);
-+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;
-+
-+/* used to protect MV643XX_ETH_SMI_REG, which is shared across ports */
-+static spinlock_t mv643xx_eth_phy_lock = SPIN_LOCK_UNLOCKED;
-+
-+static inline u32 mv_read(int offset)
-+{
-+ void *__iomem reg_base;
-+
-+ reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
-+
-+ return readl(reg_base + offset);
-+}
-+
-+static inline void mv_write(int offset, u32 data)
-+{
-+ void * __iomem reg_base;
-
--unsigned char prom_mac_addr_base[6];
--unsigned long mv64340_sram_base;
-+ reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
-+ writel(data, reg_base + offset);
-+}
-
- /*
- * 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
-+ * Input : pointer to ethernet interface network device structure
-+ * new mtu size
-+ * Output : 0 upon success, -EINVAL upon failure
- */
--static int mv64340_eth_change_mtu(struct net_device *dev, int new_mtu)
-+static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- unsigned long flags;
-
- spin_lock_irqsave(&mp->lock, flags);
-@@ -108,21 +134,21 @@
- }
-
- 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)) {
-- if (mv64340_eth_real_stop(dev))
-+ if (mv643xx_eth_real_stop(dev))
- printk(KERN_ERR
-- "%s: Fatal error on stopping device\n",
-- dev->name);
-- if (mv64340_eth_real_open(dev))
-+ "%s: Fatal error on stopping device\n",
-+ dev->name);
-+ if (mv643xx_eth_real_open(dev))
- printk(KERN_ERR
-- "%s: Fatal error on opening device\n",
-- dev->name);
-+ "%s: Fatal error on opening device\n",
-+ dev->name);
- }
-
- spin_unlock_irqrestore(&mp->lock, flags);
-@@ -130,17 +156,17 @@
- }
-
- /*
-- * mv64340_eth_rx_task
-- *
-+ * mv643xx_eth_rx_task
-+ *
- * Fills / refills RX queue on a certain gigabit ethernet port
- *
-- * Input : pointer to ethernet interface network device structure
-- * Output : N/A
-+ * Input : pointer to ethernet interface network device structure
-+ * Output : N/A
- */
--static void mv64340_eth_rx_task(void *data)
-+static void mv643xx_eth_rx_task(void *data)
- {
-- struct net_device *dev = (struct net_device *) data;
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct net_device *dev = (struct net_device *)data;
-+ struct mv643xx_private *mp = netdev_priv(dev);
- struct pkt_info pkt_info;
- struct sk_buff *skb;
-
-@@ -148,28 +174,18 @@
- panic("%s: Error in test_set_bit / clear_bit", dev->name);
-
- while (mp->rx_ring_skbs < (mp->rx_ring_size - 5)) {
-- /* The +8 for buffer allignment and another 32 byte extra */
--
-- skb = dev_alloc_skb(BUFFER_MTU + 8 + EXTRA_BYTES);
-+ skb = dev_alloc_skb(RX_SKB_SIZE);
- if (!skb)
-- /* Better luck next time */
- break;
- mp->rx_ring_skbs++;
- pkt_info.cmd_sts = ETH_RX_ENABLE_INTERRUPT;
-- pkt_info.byte_cnt = dev->mtu + ETH_HLEN + 4 + 2 + EXTRA_BYTES;
-- /* Allign buffer to 8 bytes */
-- if (pkt_info.byte_cnt & ~0x7) {
-- pkt_info.byte_cnt &= ~0x7;
-- pkt_info.byte_cnt += 8;
-- }
-- pkt_info.buf_ptr =
-- pci_map_single(0, skb->data,
-- dev->mtu + ETH_HLEN + 4 + 2 + EXTRA_BYTES,
-- PCI_DMA_FROMDEVICE);
-+ pkt_info.byte_cnt = RX_SKB_SIZE;
-+ pkt_info.buf_ptr = dma_map_single(NULL, skb->data, RX_SKB_SIZE,
-+ DMA_FROM_DEVICE);
- pkt_info.return_info = skb;
- if (eth_rx_return_buff(mp, &pkt_info) != ETH_OK) {
- printk(KERN_ERR
-- "%s: Error allocating RX Ring\n", dev->name);
-+ "%s: Error allocating RX Ring\n", dev->name);
- break;
- }
- skb_reserve(skb, 2);
-@@ -186,46 +202,45 @@
- add_timer(&mp->timeout);
- mp->rx_timer_flag = 1;
- }
--#if MV64340_RX_QUEUE_FILL_ON_TASK
-+#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
- else {
- /* Return interrupts */
-- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(mp->port_num),
-- INT_CAUSE_UNMASK_ALL);
-+ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(mp->port_num),
-+ INT_CAUSE_UNMASK_ALL);
- }
- #endif
- }
-
- /*
-- * mv64340_eth_rx_task_timer_wrapper
-- *
-+ * mv643xx_eth_rx_task_timer_wrapper
-+ *
- * Timer routine to wake up RX queue filling task. This function is
- * used only in case the RX queue is empty, and all alloc_skb has
- * failed (due to out of memory event).
- *
-- * Input : pointer to ethernet interface network device structure
-- * Output : N/A
-+ * Input : pointer to ethernet interface network device structure
-+ * Output : N/A
- */
--static void mv64340_eth_rx_task_timer_wrapper(unsigned long data)
-+static void mv643xx_eth_rx_task_timer_wrapper(unsigned long data)
- {
-- struct net_device *dev = (struct net_device *) data;
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct net_device *dev = (struct net_device *)data;
-+ struct mv643xx_private *mp = netdev_priv(dev);
-
- mp->rx_timer_flag = 0;
-- mv64340_eth_rx_task((void *) data);
-+ mv643xx_eth_rx_task((void *)data);
- }
-
--
- /*
-- * mv64340_eth_update_mac_address
-- *
-+ * 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
-+ * Input : pointer to ethernet interface network device structure
-+ * Output : N/A
- */
--static void mv64340_eth_update_mac_address(struct net_device *dev)
-+static void mv643xx_eth_update_mac_address(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
-
- eth_port_init_mac_tables(port_num);
-@@ -234,64 +249,59 @@
- }
-
- /*
-- * mv64340_eth_set_rx_mode
-- *
-+ * mv643xx_eth_set_rx_mode
-+ *
- * Change from promiscuos to regular rx mode
- *
-- * Input : pointer to ethernet interface network device structure
-- * Output : N/A
-+ * Input : pointer to ethernet interface network device structure
-+ * Output : N/A
- */
--static void mv64340_eth_set_rx_mode(struct net_device *dev)
-+static void mv643xx_eth_set_rx_mode(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
-+ u32 config_reg;
-
-- if (dev->flags & IFF_PROMISC) {
-- ethernet_set_config_reg
-- (mp->port_num,
-- ethernet_get_config_reg(mp->port_num) |
-- ETH_UNICAST_PROMISCUOUS_MODE);
-- } else {
-- ethernet_set_config_reg
-- (mp->port_num,
-- ethernet_get_config_reg(mp->port_num) &
-- ~(unsigned int) ETH_UNICAST_PROMISCUOUS_MODE);
-- }
-+ config_reg = ethernet_get_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;
-+ ethernet_set_config_reg(mp->port_num, config_reg);
- }
-
--
- /*
-- * mv64340_eth_set_mac_address
-- *
-+ * 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
-+ * 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 mv64340_eth_set_mac_address(struct net_device *dev, void *addr)
-+static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
- {
- int i;
-
- 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];
-- mv64340_eth_update_mac_address(dev);
-+ dev->dev_addr[i] = ((unsigned char *)addr)[i + 2];
-+ mv643xx_eth_update_mac_address(dev);
- return 0;
- }
-
- /*
-- * mv64340_eth_tx_timeout
-- *
-+ * mv643xx_eth_tx_timeout
-+ *
- * Called upon a timeout on transmitting a packet
- *
-- * Input : pointer to ethernet interface network device structure.
-- * Output : N/A
-+ * Input : pointer to ethernet interface network device structure.
-+ * Output : N/A
- */
--static void mv64340_eth_tx_timeout(struct net_device *dev)
-+static void mv643xx_eth_tx_timeout(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
-
- printk(KERN_INFO "%s: TX timeout ", dev->name);
-
-@@ -300,31 +310,31 @@
- }
-
- /*
-- * mv64340_eth_tx_timeout_task
-+ * mv643xx_eth_tx_timeout_task
- *
- * Actual routine to reset the adapter when a timeout on Tx has occurred
- */
--static void mv64340_eth_tx_timeout_task(struct net_device *dev)
-+static void mv643xx_eth_tx_timeout_task(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
-
-- netif_device_detach(dev);
-- eth_port_reset(mp->port_num);
-- eth_port_start(mp);
-- netif_device_attach(dev);
-+ netif_device_detach(dev);
-+ eth_port_reset(mp->port_num);
-+ eth_port_start(mp);
-+ netif_device_attach(dev);
- }
-
- /*
-- * mv64340_eth_free_tx_queue
-+ * mv643xx_eth_free_tx_queue
- *
-- * Input : dev - a pointer to the required interface
-+ * Input : dev - a pointer to the required interface
- *
-- * Output : 0 if was able to release skb , nonzero otherwise
-+ * Output : 0 if was able to release skb , nonzero otherwise
- */
--static int mv64340_eth_free_tx_queue(struct net_device *dev,
-- unsigned int eth_int_cause_ext)
-+static int mv643xx_eth_free_tx_queue(struct net_device *dev,
-+ unsigned int eth_int_cause_ext)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- struct net_device_stats *stats = &mp->stats;
- struct pkt_info pkt_info;
- int released = 1;
-@@ -341,33 +351,36 @@
- stats->tx_errors++;
- }
-
-- /*
-+ /*
- * If return_info is different than 0, release the skb.
- * The case where return_info is not 0 is only in case
- * when transmitted a scatter/gather packet, where only
- * last skb releases the whole chain.
- */
- if (pkt_info.return_info) {
-- dev_kfree_skb_irq((struct sk_buff *)
-- pkt_info.return_info);
-- released = 0;
- if (skb_shinfo(pkt_info.return_info)->nr_frags)
-- pci_unmap_page(NULL, pkt_info.buf_ptr,
-- pkt_info.byte_cnt, PCI_DMA_TODEVICE);
-+ dma_unmap_page(NULL, pkt_info.buf_ptr,
-+ pkt_info.byte_cnt,
-+ DMA_TO_DEVICE);
-+ else
-+ dma_unmap_single(NULL, pkt_info.buf_ptr,
-+ pkt_info.byte_cnt,
-+ DMA_TO_DEVICE);
-
-- if (mp->tx_ring_skbs != 1)
-- mp->tx_ring_skbs--;
-- } else
-- pci_unmap_page(NULL, pkt_info.buf_ptr,
-- pkt_info.byte_cnt, PCI_DMA_TODEVICE);
--
-- /*
-- * Decrement the number of outstanding skbs counter on
-- * the TX queue.
-- */
-- if (mp->tx_ring_skbs == 0)
-- panic("ERROR - TX outstanding SKBs counter is corrupted");
-+ dev_kfree_skb_irq(pkt_info.return_info);
-+ released = 0;
-
-+ /*
-+ * Decrement the number of outstanding skbs counter on
-+ * the TX queue.
-+ */
-+ if (mp->tx_ring_skbs == 0)
-+ panic("ERROR - TX outstanding SKBs"
-+ " counter is corrupted");
-+ mp->tx_ring_skbs--;
-+ } else
-+ dma_unmap_page(NULL, pkt_info.buf_ptr,
-+ pkt_info.byte_cnt, DMA_TO_DEVICE);
- }
-
- spin_unlock(&mp->lock);
-@@ -376,60 +389,59 @@
- }
-
- /*
-- * mv64340_eth_receive
-+ * mv643xx_eth_receive
- *
- * This function is forward packets that are received from the port's
- * queues toward kernel core or FastRoute them to another interface.
- *
-- * Input : dev - a pointer to the required interface
-- * max - maximum number to receive (0 means unlimted)
-+ * Input : dev - a pointer to the required interface
-+ * max - maximum number to receive (0 means unlimted)
- *
-- * Output : number of served packets
-+ * Output : number of served packets
- */
--#ifdef MV64340_NAPI
--static int mv64340_eth_receive_queue(struct net_device *dev, unsigned int max,
-- int budget)
-+#ifdef MV643XX_NAPI
-+static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
- #else
--static int mv64340_eth_receive_queue(struct net_device *dev, unsigned int max)
-+static int mv643xx_eth_receive_queue(struct net_device *dev)
- #endif
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- struct net_device_stats *stats = &mp->stats;
- unsigned int received_packets = 0;
- struct sk_buff *skb;
- struct pkt_info pkt_info;
-
--#ifdef MV64340_NAPI
-+#ifdef MV643XX_NAPI
- while (eth_port_receive(mp, &pkt_info) == ETH_OK && budget > 0) {
- #else
-- while ((--max) && eth_port_receive(mp, &pkt_info) == ETH_OK) {
-+ while (eth_port_receive(mp, &pkt_info) == ETH_OK) {
- #endif
- mp->rx_ring_skbs--;
- received_packets++;
--#ifdef MV64340_NAPI
-+#ifdef MV643XX_NAPI
- budget--;
- #endif
- /* Update statistics. Note byte count includes 4 byte CRC count */
- stats->rx_packets++;
- stats->rx_bytes += pkt_info.byte_cnt;
-- skb = (struct sk_buff *) pkt_info.return_info;
-+ skb = pkt_info.return_info;
- /*
- * In case received a packet without first / last bits on OR
- * the error summary bit is on, the packets needs to be dropeed.
- */
- if (((pkt_info.cmd_sts
-- & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
-- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
-- || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
-+ & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
-+ (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
-+ || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
- stats->rx_dropped++;
- if ((pkt_info.cmd_sts & (ETH_RX_FIRST_DESC |
-- ETH_RX_LAST_DESC)) !=
-- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
-+ ETH_RX_LAST_DESC)) !=
-+ (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
- if (net_ratelimit())
- printk(KERN_ERR
-- "%s: Received packet spread on multiple"
-- " descriptors\n",
-- dev->name);
-+ "%s: Received packet spread "
-+ "on multiple descriptors\n",
-+ dev->name);
- }
- if (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)
- stats->rx_errors++;
-@@ -445,11 +457,11 @@
-
- if (pkt_info.cmd_sts & ETH_LAYER_4_CHECKSUM_OK) {
- skb->ip_summed = CHECKSUM_UNNECESSARY;
-- skb->csum = htons((pkt_info.cmd_sts
-- & 0x0007fff8) >> 3);
-+ skb->csum = htons(
-+ (pkt_info.cmd_sts & 0x0007fff8) >> 3);
- }
- skb->protocol = eth_type_trans(skb, dev);
--#ifdef MV64340_NAPI
-+#ifdef MV643XX_NAPI
- netif_receive_skb(skb);
- #else
- netif_rx(skb);
-@@ -461,74 +473,74 @@
- }
-
- /*
-- * mv64340_eth_int_handler
-+ * mv643xx_eth_int_handler
- *
- * 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
-+ * Input : irq - irq number (not used)
-+ * dev_id - a pointer to the required interface's data structure
-+ * regs - not used
-+ * Output : N/A
- */
-
--static irqreturn_t mv64340_eth_int_handler(int irq, void *dev_id,
-- struct pt_regs *regs)
-+static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id,
-+ struct pt_regs *regs)
- {
-- struct net_device *dev = (struct net_device *) dev_id;
-- struct mv64340_private *mp = netdev_priv(dev);
-+ 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;
-
- /* Read interrupt cause registers */
-- eth_int_cause = MV_READ(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num)) &
-- INT_CAUSE_UNMASK_ALL;
-+ eth_int_cause = mv_read(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num)) &
-+ INT_CAUSE_UNMASK_ALL;
-
- if (eth_int_cause & BIT1)
-- eth_int_cause_ext =
-- MV_READ(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
-- INT_CAUSE_UNMASK_ALL_EXT;
-+ eth_int_cause_ext = mv_read(
-+ MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
-+ INT_CAUSE_UNMASK_ALL_EXT;
-
--#ifdef MV64340_NAPI
-+#ifdef MV643XX_NAPI
- if (!(eth_int_cause & 0x0007fffd)) {
-- /* Dont ack the Rx interrupt */
-+ /* Dont ack the Rx interrupt */
- #endif
- /*
-- * Clear specific ethernet port intrerrupt registers by
-+ * Clear specific ethernet port intrerrupt registers by
- * acknowleding relevant bits.
- */
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num),
-- ~eth_int_cause);
-+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num),
-+ ~eth_int_cause);
- if (eth_int_cause_ext != 0x0)
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num),
-- ~eth_int_cause_ext);
-+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG
-+ (port_num), ~eth_int_cause_ext);
-
- /* UDP change : We may need this */
- if ((eth_int_cause_ext & 0x0000ffff) &&
-- (mv64340_eth_free_tx_queue(dev, eth_int_cause_ext) == 0) &&
-- (MV64340_TX_QUEUE_SIZE > mp->tx_ring_skbs + 1))
-- netif_wake_queue(dev);
--#ifdef MV64340_NAPI
-+ (mv643xx_eth_free_tx_queue(dev, eth_int_cause_ext) == 0) &&
-+ (mp->tx_ring_size > mp->tx_ring_skbs + MAX_DESCS_PER_SKB))
-+ netif_wake_queue(dev);
-+#ifdef MV643XX_NAPI
- } else {
- if (netif_rx_schedule_prep(dev)) {
- /* Mask all the interrupts */
-- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),0);
-- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG
-+ (port_num), 0);
- __netif_rx_schedule(dev);
- }
- #else
-- {
- if (eth_int_cause & (BIT2 | BIT11))
-- mv64340_eth_receive_queue(dev, 0);
-+ mv643xx_eth_receive_queue(dev, 0);
-
- /*
-- * After forwarded received packets to upper layer, add a task
-+ * After forwarded received packets to upper layer, add a task
- * in an interrupts enabled context that refills the RX ring
- * with skb's.
- */
--#if MV64340_RX_QUEUE_FILL_ON_TASK
-+#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
- /* Unmask all interrupts on ethernet port */
-- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),
-- INT_CAUSE_MASK_ALL);
-+ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
-+ INT_CAUSE_MASK_ALL);
- queue_task(&mp->rx_task, &tq_immediate);
- mark_bh(IMMEDIATE_BH);
- #else
-@@ -538,25 +550,15 @@
- }
- /* PHY status changed */
- if (eth_int_cause_ext & (BIT16 | BIT20)) {
-- unsigned int phy_reg_data;
--
-- /* Check Link status on ethernet port */
-- eth_port_read_smi_reg(port_num, 1, &phy_reg_data);
-- if (!(phy_reg_data & 0x20)) {
-- netif_stop_queue(dev);
-- } else {
-+ if (eth_port_link_is_up(port_num)) {
-+ netif_carrier_on(dev);
- netif_wake_queue(dev);
--
-- /*
-- * Start all TX queues on ethernet port. This is good in
-- * case of previous packets where not transmitted, due
-- * to link down and this command re-enables all TX
-- * queues.
-- * Note that it is possible to get a TX resource error
-- * interrupt after issuing this, since not all TX queues
-- * are enabled, or has anything to send.
-- */
-- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num), 1);
-+ /* Start TX queue */
-+ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG
-+ (port_num), 1);
-+ } else {
-+ netif_carrier_off(dev);
-+ netif_stop_queue(dev);
- }
- }
-
-@@ -570,7 +572,7 @@
- return IRQ_HANDLED;
- }
-
--#ifdef MV64340_COAL
-+#ifdef MV643XX_COAL
-
- /*
- * eth_port_set_rx_coal - Sets coalescing interrupt mechanism on RX path
-@@ -584,9 +586,9 @@
- * , 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
-+ * 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.
-@@ -596,15 +598,15 @@
- *
- */
- static unsigned int eth_port_set_rx_coal(unsigned int eth_port_num,
-- unsigned int t_clk, unsigned int delay)
-+ unsigned int t_clk, unsigned int delay)
- {
- unsigned int coal = ((t_clk / 1000000) * delay) / 64;
-
- /* Set RX Coalescing mechanism */
-- MV_WRITE(MV64340_ETH_SDMA_CONFIG_REG(eth_port_num),
-- ((coal & 0x3fff) << 8) |
-- (MV_READ(MV64340_ETH_SDMA_CONFIG_REG(eth_port_num))
-- & 0xffc000ff));
-+ mv_write(MV643XX_ETH_SDMA_CONFIG_REG(eth_port_num),
-+ ((coal & 0x3fff) << 8) |
-+ (mv_read(MV643XX_ETH_SDMA_CONFIG_REG(eth_port_num))
-+ & 0xffc000ff));
-
- return coal;
- }
-@@ -618,13 +620,13 @@
- * 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
-+ * The parameter is calculated using the t_cLK frequency of the
- * MV-643xx chip and the required delay in 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 uSeconds
-+ * 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
- *
- * OUTPUT:
- * Interrupt coalescing mechanism value is set in MV-643xx chip.
-@@ -634,48 +636,48 @@
- *
- */
- static unsigned int eth_port_set_tx_coal(unsigned int eth_port_num,
-- unsigned int t_clk, unsigned int delay)
-+ unsigned int t_clk, unsigned int delay)
- {
- unsigned int coal;
- coal = ((t_clk / 1000000) * delay) / 64;
- /* Set TX Coalescing mechanism */
-- MV_WRITE(MV64340_ETH_TX_FIFO_URGENT_THRESHOLD_REG(eth_port_num),
-- coal << 4);
-+ mv_write(MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(eth_port_num),
-+ coal << 4);
- return coal;
- }
-
- /*
-- * mv64340_eth_open
-+ * 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
-+ * Input : a pointer to the network device structure
- *
-- * Output : zero of success , nonzero if fails.
-+ * Output : zero of success , nonzero if fails.
- */
-
--static int mv64340_eth_open(struct net_device *dev)
-+static int mv643xx_eth_open(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
-- int err = err;
-+ int err;
-
- spin_lock_irq(&mp->lock);
-
-- err = request_irq(dev->irq, mv64340_eth_int_handler,
-- SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
-+ err = request_irq(dev->irq, mv643xx_eth_int_handler,
-+ SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
-
- if (err) {
-- printk(KERN_ERR "Can not assign IRQ number to MV64340_eth%d\n",
-- port_num);
-+ printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
-+ port_num);
- err = -EAGAIN;
- goto out;
- }
-
-- if (mv64340_eth_real_open(dev)) {
-+ if (mv643xx_eth_real_open(dev)) {
- printk("%s: Error opening interface\n", dev->name);
- err = -EBUSY;
- goto out_free;
-@@ -698,66 +700,35 @@
- * 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.
-+ * 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.
- *
- * INPUT:
-- * struct mv64340_private *mp Ethernet Port Control srtuct.
-- * int rx_desc_num Number of Rx descriptors
-- * int rx_buff_size Size of Rx buffer
-- * unsigned int rx_desc_base_addr Rx descriptors memory area base addr.
-- * unsigned int rx_buff_base_addr Rx buffer memory area base addr.
-+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
- *
- * OUTPUT:
-- * The routine updates the Ethernet port control struct with information
-- * regarding the Rx descriptors and buffers.
-+ * The routine updates the Ethernet port control struct with information
-+ * regarding the Rx descriptors and buffers.
- *
- * RETURN:
-- * false if the given descriptors memory area is not aligned according to
-- * Ethernet SDMA specifications.
-- * true otherwise.
-+ * None.
- */
--static int ether_init_rx_desc_ring(struct mv64340_private * mp,
-- unsigned long rx_buff_base_addr)
-+static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
- {
-- unsigned long buffer_addr = rx_buff_base_addr;
- volatile struct eth_rx_desc *p_rx_desc;
- int rx_desc_num = mp->rx_ring_size;
-- unsigned long rx_desc_base_addr = (unsigned long) mp->p_rx_desc_area;
-- int rx_buff_size = 1536; /* Dummy, will be replaced later */
- int i;
-
-- p_rx_desc = (struct eth_rx_desc *) rx_desc_base_addr;
--
-- /* Rx desc Must be 4LW aligned (i.e. Descriptor_Address[3:0]=0000). */
-- if (rx_buff_base_addr & 0xf)
-- return 0;
--
-- /* Rx buffers are limited to 64K bytes and Minimum size is 8 bytes */
-- if ((rx_buff_size < 8) || (rx_buff_size > RX_BUFFER_MAX_SIZE))
-- return 0;
--
-- /* Rx buffers must be 64-bit aligned. */
-- if ((rx_buff_base_addr + rx_buff_size) & 0x7)
-- return 0;
--
-- /* initialize the Rx descriptors ring */
-+ /* 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].buf_size = rx_buff_size;
-- p_rx_desc[i].byte_cnt = 0x0000;
-- p_rx_desc[i].cmd_sts =
-- ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
- p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
- ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
-- p_rx_desc[i].buf_ptr = buffer_addr;
--
-- mp->rx_skb[i] = NULL;
-- buffer_addr += rx_buff_size;
- }
-
- /* Save Rx desc pointer to driver struct. */
-@@ -766,293 +737,288 @@
-
- mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
-
-+ /* Add the queue to the list of RX queues of this port */
- mp->port_rx_queue_command |= 1;
--
-- return 1;
- }
-
- /*
- * ether_init_tx_desc_ring - Curve a Tx chain desc list and buffer in memory.
- *
- * 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 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 mv64340_private *mp Ethernet Port Control srtuct.
-- * int tx_desc_num Number of Tx descriptors
-- * int tx_buff_size Size of Tx buffer
-- * unsigned int tx_desc_base_addr Tx descriptors memory area base addr.
-+ * 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.
-+ * The routine updates the Ethernet port control struct with information
-+ * regarding the Tx descriptors and buffers.
- *
- * RETURN:
-- * false if the given descriptors memory area is not aligned according to
-- * Ethernet SDMA specifications.
-- * true otherwise.
-+ * None.
- */
--static int ether_init_tx_desc_ring(struct mv64340_private *mp)
-+static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
- {
-- unsigned long tx_desc_base_addr = (unsigned long) mp->p_tx_desc_area;
- int tx_desc_num = mp->tx_ring_size;
- struct eth_tx_desc *p_tx_desc;
- int i;
-
-- /* Tx desc Must be 4LW aligned (i.e. Descriptor_Address[3:0]=0000). */
-- if (tx_desc_base_addr & 0xf)
-- return 0;
--
-- /* save the first desc pointer to link with the last descriptor */
-- p_tx_desc = (struct eth_tx_desc *) tx_desc_base_addr;
--
-- /* Initialize the Tx descriptors ring */
-+ /* 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].byte_cnt = 0x0000;
-- p_tx_desc[i].l4i_chk = 0x0000;
-- p_tx_desc[i].cmd_sts = 0x00000000;
- p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
- ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
-- p_tx_desc[i].buf_ptr = 0x00000000;
-- mp->tx_skb[i] = NULL;
- }
-
-- /* Set Tx desc pointer in driver struct. */
- mp->tx_curr_desc_q = 0;
- mp->tx_used_desc_q = 0;
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-- mp->tx_first_desc_q = 0;
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-+ mp->tx_first_desc_q = 0;
- #endif
-- /* Init Tx ring base and size parameters */
-- mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
-+
-+ mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
-
- /* Add the queue to the list of Tx queues of this port */
- mp->port_tx_queue_command |= 1;
--
-- return 1;
- }
-
--/* Helper function for mv64340_eth_open */
--static int mv64340_eth_real_open(struct net_device *dev)
-+/* Helper function for mv643xx_eth_open */
-+static int mv643xx_eth_real_open(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
-- u32 phy_reg_data;
- unsigned int size;
-
- /* Stop RX Queues */
-- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
-- 0x0000ff00);
-+ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
-
- /* Clear the ethernet port interrupts */
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-
- /* Unmask RX buffer and TX end interrupt */
-- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),
-- INT_CAUSE_UNMASK_ALL);
-+ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
-+ INT_CAUSE_UNMASK_ALL);
-
- /* Unmask phy and link status changes interrupts */
-- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
-- INT_CAUSE_UNMASK_ALL_EXT);
-+ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
-+ INT_CAUSE_UNMASK_ALL_EXT);
-
- /* Set the MAC Address */
- memcpy(mp->port_mac_addr, dev->dev_addr, 6);
-
- eth_port_init(mp);
-
-- INIT_WORK(&mp->rx_task, (void (*)(void *)) mv64340_eth_rx_task, dev);
-+ INIT_WORK(&mp->rx_task, (void (*)(void *))mv643xx_eth_rx_task, dev);
-
- memset(&mp->timeout, 0, sizeof(struct timer_list));
-- mp->timeout.function = mv64340_eth_rx_task_timer_wrapper;
-- mp->timeout.data = (unsigned long) dev;
-+ mp->timeout.function = mv643xx_eth_rx_task_timer_wrapper;
-+ mp->timeout.data = (unsigned long)dev;
-
- mp->rx_task_busy = 0;
- mp->rx_timer_flag = 0;
-
-+ /* 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);
-+ return -ENOMEM;
-+ }
-+ 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);
-+ kfree(mp->rx_skb);
-+ return -ENOMEM;
-+ }
-+
- /* Allocate TX ring */
- mp->tx_ring_skbs = 0;
-- mp->tx_ring_size = MV64340_TX_QUEUE_SIZE;
- size = mp->tx_ring_size * sizeof(struct eth_tx_desc);
- mp->tx_desc_area_size = size;
-
-- /* Assumes allocated ring is 16 bytes alligned */
-- mp->p_tx_desc_area = pci_alloc_consistent(NULL, size, &mp->tx_desc_dma);
-+ 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);
-+ dev->name, size);
-+ kfree(mp->rx_skb);
-+ kfree(mp->tx_skb);
- return -ENOMEM;
- }
-- memset((void *) mp->p_tx_desc_area, 0, mp->tx_desc_area_size);
-+ 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);
-
-- /* Dummy will be replaced upon real tx */
- ether_init_tx_desc_ring(mp);
-
- /* Allocate RX ring */
-- /* Meantime RX Ring are fixed - but must be configurable by user */
-- mp->rx_ring_size = MV64340_RX_QUEUE_SIZE;
- mp->rx_ring_skbs = 0;
- size = mp->rx_ring_size * sizeof(struct eth_rx_desc);
- mp->rx_desc_area_size = size;
-
-- /* Assumes allocated ring is 16 bytes aligned */
--
-- mp->p_rx_desc_area = pci_alloc_consistent(NULL, size, &mp->rx_desc_dma);
-+ 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);
-+ dev->name, size);
- printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
-- dev->name);
-- pci_free_consistent(0, mp->tx_desc_area_size,
-- (void *) mp->p_tx_desc_area,
-- mp->tx_desc_dma);
-+ dev->name);
-+ if (mp->rx_sram_size)
-+ iounmap(mp->p_rx_desc_area);
-+ else
-+ dma_free_coherent(NULL, mp->tx_desc_area_size,
-+ mp->p_tx_desc_area, mp->tx_desc_dma);
-+ kfree(mp->rx_skb);
-+ kfree(mp->tx_skb);
- return -ENOMEM;
- }
-- memset(mp->p_rx_desc_area, 0, size);
-+ memset((void *)mp->p_rx_desc_area, 0, size);
-
-- if (!(ether_init_rx_desc_ring(mp, 0)))
-- panic("%s: Error initializing RX Ring", dev->name);
-+ ether_init_rx_desc_ring(mp);
-
-- mv64340_eth_rx_task(dev); /* Fill RX ring with skb's */
-+ mv643xx_eth_rx_task(dev); /* Fill RX ring with skb's */
-
- eth_port_start(mp);
-
- /* Interrupt Coalescing */
-
--#ifdef MV64340_COAL
-+#ifdef MV643XX_COAL
- mp->rx_int_coal =
-- eth_port_set_rx_coal(port_num, 133000000, MV64340_RX_COAL);
-+ eth_port_set_rx_coal(port_num, 133000000, MV643XX_RX_COAL);
- #endif
-
- mp->tx_int_coal =
-- eth_port_set_tx_coal (port_num, 133000000, MV64340_TX_COAL);
-+ eth_port_set_tx_coal(port_num, 133000000, MV643XX_TX_COAL);
-
-- /* Increase the Rx side buffer size */
--
-- MV_WRITE (MV64340_ETH_PORT_SERIAL_CONTROL_REG(port_num), (0x5 << 17) |
-- (MV_READ(MV64340_ETH_PORT_SERIAL_CONTROL_REG(port_num))
-- & 0xfff1ffff));
--
-- /* Check Link status on phy */
-- eth_port_read_smi_reg(port_num, 1, &phy_reg_data);
-- if (!(phy_reg_data & 0x20))
-- netif_stop_queue(dev);
-- else
-- netif_start_queue(dev);
-+ netif_start_queue(dev);
-
- return 0;
- }
-
--static void mv64340_eth_free_tx_rings(struct net_device *dev)
-+static void mv643xx_eth_free_tx_rings(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
- unsigned int curr;
-
- /* Stop Tx Queues */
-- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num),
-- 0x0000ff00);
-+ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
-
-- /* Free TX rings */
- /* Free outstanding skb's on TX rings */
-- for (curr = 0;
-- (mp->tx_ring_skbs) && (curr < MV64340_TX_QUEUE_SIZE);
-- curr++) {
-+ for (curr = 0; mp->tx_ring_skbs && curr < mp->tx_ring_size; curr++) {
- if (mp->tx_skb[curr]) {
- dev_kfree_skb(mp->tx_skb[curr]);
- mp->tx_ring_skbs--;
- }
- }
-- if (mp->tx_ring_skbs != 0)
-+ if (mp->tx_ring_skbs)
- printk("%s: Error on Tx descriptor free - could not free %d"
-- " descriptors\n", dev->name,
-- mp->tx_ring_skbs);
-- pci_free_consistent(0, mp->tx_desc_area_size,
-- (void *) mp->p_tx_desc_area, mp->tx_desc_dma);
-+ " descriptors\n", dev->name, mp->tx_ring_skbs);
-+
-+ /* 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 void mv64340_eth_free_rx_rings(struct net_device *dev)
-+static void mv643xx_eth_free_rx_rings(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
- int curr;
-
- /* Stop RX Queues */
-- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
-- 0x0000ff00);
-+ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
-
-- /* Free RX rings */
- /* Free preallocated skb's on RX rings */
-- for (curr = 0;
-- mp->rx_ring_skbs && (curr < MV64340_RX_QUEUE_SIZE);
-- curr++) {
-+ for (curr = 0; mp->rx_ring_skbs && curr < mp->rx_ring_size; curr++) {
- if (mp->rx_skb[curr]) {
- dev_kfree_skb(mp->rx_skb[curr]);
- mp->rx_ring_skbs--;
- }
- }
-
-- if (mp->rx_ring_skbs != 0)
-+ if (mp->rx_ring_skbs)
- printk(KERN_ERR
-- "%s: Error in freeing Rx Ring. %d skb's still"
-- " stuck in RX Ring - ignoring them\n", dev->name,
-- mp->rx_ring_skbs);
-- pci_free_consistent(0, mp->rx_desc_area_size,
-- (void *) mp->p_rx_desc_area,
-- mp->rx_desc_dma);
-+ "%s: Error in freeing Rx Ring. %d skb's still"
-+ " stuck in RX Ring - ignoring them\n", dev->name,
-+ mp->rx_ring_skbs);
-+ /* 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);
- }
-
- /*
-- * mv64340_eth_stop
-+ * mv643xx_eth_stop
- *
-- * This function is used when closing the network device.
-- * It updates the hardware,
-+ * 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
-+ * Input : a pointer to the device structure
-+ * Output : zero if success , nonzero if fails
- */
-
--/* Helper function for mv64340_eth_stop */
-+/* Helper function for mv643xx_eth_stop */
-
--static int mv64340_eth_real_stop(struct net_device *dev)
-+static int mv643xx_eth_real_stop(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
-
-+ netif_carrier_off(dev);
- netif_stop_queue(dev);
-
-- mv64340_eth_free_tx_rings(dev);
-- mv64340_eth_free_rx_rings(dev);
-+ mv643xx_eth_free_tx_rings(dev);
-+ mv643xx_eth_free_rx_rings(dev);
-
- eth_port_reset(mp->port_num);
-
- /* Disable ethernet port interrupts */
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
-
- /* Mask RX buffer and TX end interrupt */
-- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), 0);
-
- /* Mask phy and link status changes interrupts */
-- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num), 0);
-+ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num), 0);
-
- return 0;
- }
-
--static int mv64340_eth_stop(struct net_device *dev)
-+static int mv643xx_eth_stop(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
-
- spin_lock_irq(&mp->lock);
-
-- mv64340_eth_real_stop(dev);
-+ mv643xx_eth_real_stop(dev);
-
- free_irq(dev->irq, dev);
- spin_unlock_irq(&mp->lock);
-@@ -1060,59 +1026,64 @@
- return 0;
- }
-
--#ifdef MV64340_NAPI
--static void mv64340_tx(struct net_device *dev)
-+#ifdef MV643XX_NAPI
-+static void mv643xx_tx(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-- struct pkt_info pkt_info;
-+ struct mv643xx_private *mp = netdev_priv(dev);
-+ struct pkt_info pkt_info;
-
- while (eth_tx_return_desc(mp, &pkt_info) == ETH_OK) {
- if (pkt_info.return_info) {
-- dev_kfree_skb_irq((struct sk_buff *)
-- pkt_info.return_info);
-- if (skb_shinfo(pkt_info.return_info)->nr_frags)
-- pci_unmap_page(NULL, pkt_info.buf_ptr,
-- pkt_info.byte_cnt,
-- PCI_DMA_TODEVICE);
--
-- if (mp->tx_ring_skbs != 1)
-- mp->tx_ring_skbs--;
-- } else
-- pci_unmap_page(NULL, pkt_info.buf_ptr, pkt_info.byte_cnt,
-- PCI_DMA_TODEVICE);
-+ if (skb_shinfo(pkt_info.return_info)->nr_frags)
-+ dma_unmap_page(NULL, pkt_info.buf_ptr,
-+ pkt_info.byte_cnt,
-+ DMA_TO_DEVICE);
-+ else
-+ dma_unmap_single(NULL, pkt_info.buf_ptr,
-+ pkt_info.byte_cnt,
-+ DMA_TO_DEVICE);
-+
-+ dev_kfree_skb_irq(pkt_info.return_info);
-+
-+ if (mp->tx_ring_skbs)
-+ mp->tx_ring_skbs--;
-+ } else
-+ dma_unmap_page(NULL, pkt_info.buf_ptr,
-+ pkt_info.byte_cnt, DMA_TO_DEVICE);
- }
-
- if (netif_queue_stopped(dev) &&
-- MV64340_TX_QUEUE_SIZE > mp->tx_ring_skbs + 1)
-- netif_wake_queue(dev);
-+ mp->tx_ring_size > mp->tx_ring_skbs + MAX_DESCS_PER_SKB)
-+ netif_wake_queue(dev);
- }
-
- /*
-- * mv64340_poll
-+ * mv643xx_poll
- *
- * This function is used in case of NAPI
- */
--static int mv64340_poll(struct net_device *dev, int *budget)
-+static int mv643xx_poll(struct net_device *dev, int *budget)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-- int done = 1, orig_budget, work_done;
-+ struct mv643xx_private *mp = netdev_priv(dev);
-+ int done = 1, orig_budget, work_done;
- unsigned int port_num = mp->port_num;
- unsigned long flags;
-
--#ifdef MV64340_TX_FAST_REFILL
-+#ifdef MV643XX_TX_FAST_REFILL
- if (++mp->tx_clean_threshold > 5) {
- spin_lock_irqsave(&mp->lock, flags);
-- mv64340_tx(dev);
-+ mv643xx_tx(dev);
- mp->tx_clean_threshold = 0;
- spin_unlock_irqrestore(&mp->lock, flags);
- }
- #endif
-
-- if ((u32)(MV_READ(MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port_num))) != (u32)mp->rx_used_desc_q) {
-+ 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 = mv64340_eth_receive_queue(dev, 0, orig_budget);
-+ work_done = mv643xx_eth_receive_queue(dev, orig_budget);
- mp->rx_task.func(dev);
- *budget -= work_done;
- dev->quota -= work_done;
-@@ -1123,12 +1094,12 @@
- if (done) {
- spin_lock_irqsave(&mp->lock, flags);
- __netif_rx_complete(dev);
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num),0);
-- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num),0);
-- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),
-+ 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),
- INT_CAUSE_UNMASK_ALL);
-- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
-- INT_CAUSE_UNMASK_ALL_EXT);
-+ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
-+ INT_CAUSE_UNMASK_ALL_EXT);
- spin_unlock_irqrestore(&mp->lock, flags);
- }
-
-@@ -1137,19 +1108,19 @@
- #endif
-
- /*
-- * mv64340_eth_start_xmit
-+ * mv643xx_eth_start_xmit
- *
-- * This function is queues a packet in the Tx descriptor for
-+ * This function is queues a packet in the Tx descriptor for
- * required port.
- *
-- * Input : skb - a pointer to socket buffer
-- * dev - a pointer to the required port
-+ * Input : skb - a pointer to socket buffer
-+ * dev - a pointer to the required port
- *
-- * Output : zero upon success
-+ * Output : zero upon success
- */
--static int mv64340_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
-+static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
- struct net_device_stats *stats = &mp->stats;
- ETH_FUNC_RET_STATUS status;
- unsigned long flags;
-@@ -1157,119 +1128,195 @@
-
- if (netif_queue_stopped(dev)) {
- printk(KERN_ERR
-- "%s: Tried sending packet when interface is stopped\n",
-- dev->name);
-+ "%s: Tried sending packet when interface is stopped\n",
-+ dev->name);
- return 1;
- }
-
- /* This is a hard error, log it. */
-- if ((MV64340_TX_QUEUE_SIZE - mp->tx_ring_skbs) <=
-- (skb_shinfo(skb)->nr_frags + 1)) {
-+ if ((mp->tx_ring_size - mp->tx_ring_skbs) <=
-+ (skb_shinfo(skb)->nr_frags + 1)) {
- netif_stop_queue(dev);
- printk(KERN_ERR
-- "%s: Bug in mv64340_eth - Trying to transmit when"
-- " queue full !\n", dev->name);
-+ "%s: Bug in mv643xx_eth - Trying to transmit when"
-+ " queue full !\n", dev->name);
- return 1;
- }
-
- /* Paranoid check - this shouldn't happen */
- if (skb == NULL) {
- stats->tx_dropped++;
-+ printk(KERN_ERR "mv64320_eth paranoid check failed\n");
- return 1;
- }
-
- spin_lock_irqsave(&mp->lock, flags);
-
- /* Update packet info data structure -- DMA owned, first last */
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-- if (!skb_shinfo(skb)->nr_frags || (skb_shinfo(skb)->nr_frags > 3)) {
--#endif
-- pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT |
-- ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC;
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-+ if (!skb_shinfo(skb)->nr_frags) {
-+linear:
-+ if (skb->ip_summed != CHECKSUM_HW) {
-+ pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT |
-+ ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC;
-+ pkt_info.l4i_chk = 0;
-+ } else {
-+ u32 ipheader = skb->nh.iph->ihl << 11;
-
-+ pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT |
-+ ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC |
-+ ETH_GEN_TCP_UDP_CHECKSUM |
-+ ETH_GEN_IP_V_4_CHECKSUM | ipheader;
-+ /* CPU already calculated pseudo header checksum. */
-+ if (skb->nh.iph->protocol == IPPROTO_UDP) {
-+ pkt_info.cmd_sts |= ETH_UDP_FRAME;
-+ pkt_info.l4i_chk = skb->h.uh->check;
-+ } else if (skb->nh.iph->protocol == IPPROTO_TCP)
-+ pkt_info.l4i_chk = skb->h.th->check;
-+ else {
-+ printk(KERN_ERR
-+ "%s: chksum proto != TCP or UDP\n",
-+ dev->name);
-+ spin_unlock_irqrestore(&mp->lock, flags);
-+ return 1;
-+ }
-+ }
- pkt_info.byte_cnt = skb->len;
-- pkt_info.buf_ptr = pci_map_single(0, skb->data, skb->len,
-- PCI_DMA_TODEVICE);
--
--
-+ pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
-+ DMA_TO_DEVICE);
- pkt_info.return_info = skb;
-+ mp->tx_ring_skbs++;
- status = eth_port_send(mp, &pkt_info);
- if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
- printk(KERN_ERR "%s: Error on transmitting packet\n",
-- dev->name);
-- mp->tx_ring_skbs++;
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-+ dev->name);
-+ stats->tx_bytes += pkt_info.byte_cnt;
- } else {
-- unsigned int frag;
-- u32 ipheader;
-+ unsigned int frag;
-+ u32 ipheader;
-
-- /* first frag which is skb header */
-- pkt_info.byte_cnt = skb_headlen(skb);
-- pkt_info.buf_ptr = pci_map_single(0, skb->data,
-- skb_headlen(skb), PCI_DMA_TODEVICE);
-- pkt_info.return_info = 0;
-- ipheader = skb->nh.iph->ihl << 11;
-- pkt_info.cmd_sts = ETH_TX_FIRST_DESC |
-- ETH_GEN_TCP_UDP_CHECKSUM |
-- ETH_GEN_IP_V_4_CHECKSUM |
-- ipheader;
-- /* CPU already calculated pseudo header checksum. So, use it */
-- pkt_info.l4i_chk = skb->h.th->check;
-- status = eth_port_send(mp, &pkt_info);
-+ /* Since hardware can't handle unaligned fragments smaller
-+ * than 9 bytes, if we find any, we linearize the skb
-+ * and start again. When I've seen it, it's always been
-+ * the first frag (probably near the end of the page),
-+ * but we check all frags to be safe.
-+ */
-+ for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
-+ skb_frag_t *fragp;
-+
-+ fragp = &skb_shinfo(skb)->frags[frag];
-+ if (fragp->size <= 8 && fragp->page_offset & 0x7) {
-+ skb_linearize(skb, GFP_ATOMIC);
-+ printk(KERN_DEBUG "%s: unaligned tiny fragment"
-+ "%d of %d, fixed\n",
-+ dev->name, frag,
-+ skb_shinfo(skb)->nr_frags);
-+ goto linear;
-+ }
-+ }
-+
-+ /* first frag which is skb header */
-+ pkt_info.byte_cnt = skb_headlen(skb);
-+ pkt_info.buf_ptr = dma_map_single(NULL, skb->data,
-+ skb_headlen(skb),
-+ DMA_TO_DEVICE);
-+ pkt_info.l4i_chk = 0;
-+ pkt_info.return_info = 0;
-+ pkt_info.cmd_sts = ETH_TX_FIRST_DESC;
-+
-+ if (skb->ip_summed == CHECKSUM_HW) {
-+ ipheader = skb->nh.iph->ihl << 11;
-+ pkt_info.cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
-+ ETH_GEN_IP_V_4_CHECKSUM | ipheader;
-+ /* CPU already calculated pseudo header checksum. */
-+ if (skb->nh.iph->protocol == IPPROTO_UDP) {
-+ pkt_info.cmd_sts |= ETH_UDP_FRAME;
-+ pkt_info.l4i_chk = skb->h.uh->check;
-+ } else if (skb->nh.iph->protocol == IPPROTO_TCP)
-+ pkt_info.l4i_chk = skb->h.th->check;
-+ else {
-+ printk(KERN_ERR
-+ "%s: chksum proto != TCP or UDP\n",
-+ dev->name);
-+ spin_unlock_irqrestore(&mp->lock, flags);
-+ return 1;
-+ }
-+ }
-+
-+ status = eth_port_send(mp, &pkt_info);
- if (status != ETH_OK) {
-- if ((status == ETH_ERROR))
-- printk(KERN_ERR "%s: Error on transmitting packet\n", dev->name);
-- if (status == ETH_QUEUE_FULL)
-- printk("Error on Queue Full \n");
-- if (status == ETH_QUEUE_LAST_RESOURCE)
-- printk("Tx resource error \n");
-+ if ((status == ETH_ERROR))
-+ printk(KERN_ERR
-+ "%s: Error on transmitting packet\n",
-+ dev->name);
-+ if (status == ETH_QUEUE_FULL)
-+ printk("Error on Queue Full \n");
-+ if (status == ETH_QUEUE_LAST_RESOURCE)
-+ printk("Tx resource error \n");
- }
-+ stats->tx_bytes += pkt_info.byte_cnt;
-+
-+ /* Check for the remaining frags */
-+ for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
-+ skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
-+ pkt_info.l4i_chk = 0x0000;
-+ pkt_info.cmd_sts = 0x00000000;
-+
-+ /* Last Frag enables interrupt and frees the skb */
-+ if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
-+ pkt_info.cmd_sts |= ETH_TX_ENABLE_INTERRUPT |
-+ ETH_TX_LAST_DESC;
-+ pkt_info.return_info = skb;
-+ mp->tx_ring_skbs++;
-+ } else {
-+ pkt_info.return_info = 0;
-+ }
-+ pkt_info.l4i_chk = 0;
-+ pkt_info.byte_cnt = this_frag->size;
-
-- /* Check for the remaining frags */
-- for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
-- skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
-- pkt_info.l4i_chk = 0x0000;
-- pkt_info.cmd_sts = 0x00000000;
--
-- /* Last Frag enables interrupt and frees the skb */
-- if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
-- pkt_info.cmd_sts |= ETH_TX_ENABLE_INTERRUPT |
-- ETH_TX_LAST_DESC;
-- pkt_info.return_info = skb;
-- mp->tx_ring_skbs++;
-- }
-- else {
-- pkt_info.return_info = 0;
-- }
-- pkt_info.byte_cnt = this_frag->size;
-- if (this_frag->size < 8)
-- printk("%d : \n", skb_shinfo(skb)->nr_frags);
--
-- pkt_info.buf_ptr = pci_map_page(NULL, this_frag->page,
-- this_frag->page_offset,
-- this_frag->size, PCI_DMA_TODEVICE);
-+ pkt_info.buf_ptr = dma_map_page(NULL, this_frag->page,
-+ this_frag->page_offset,
-+ this_frag->size,
-+ DMA_TO_DEVICE);
-
-- status = eth_port_send(mp, &pkt_info);
-+ status = eth_port_send(mp, &pkt_info);
-
- if (status != ETH_OK) {
-- if ((status == ETH_ERROR))
-- printk(KERN_ERR "%s: Error on transmitting packet\n", dev->name);
-+ if ((status == ETH_ERROR))
-+ printk(KERN_ERR "%s: Error on "
-+ "transmitting packet\n",
-+ dev->name);
-
-- if (status == ETH_QUEUE_LAST_RESOURCE)
-- printk("Tx resource error \n");
-+ if (status == ETH_QUEUE_LAST_RESOURCE)
-+ printk("Tx resource error \n");
-
-- if (status == ETH_QUEUE_FULL)
-- printk("Queue is full \n");
-+ if (status == ETH_QUEUE_FULL)
-+ printk("Queue is full \n");
- }
-- }
-- }
-+ stats->tx_bytes += pkt_info.byte_cnt;
-+ }
-+ }
-+#else
-+ pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT | ETH_TX_FIRST_DESC |
-+ ETH_TX_LAST_DESC;
-+ pkt_info.l4i_chk = 0;
-+ pkt_info.byte_cnt = skb->len;
-+ pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
-+ DMA_TO_DEVICE);
-+ pkt_info.return_info = skb;
-+ mp->tx_ring_skbs++;
-+ status = eth_port_send(mp, &pkt_info);
-+ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
-+ printk(KERN_ERR "%s: Error on transmitting packet\n",
-+ dev->name);
-+ stats->tx_bytes += pkt_info.byte_cnt;
- #endif
-
- /* Check if TX queue can handle another skb. If not, then
- * signal higher layers to stop requesting TX
- */
-- if (MV64340_TX_QUEUE_SIZE <= (mp->tx_ring_skbs + 1))
-- /*
-+ if (mp->tx_ring_size <= (mp->tx_ring_skbs + MAX_DESCS_PER_SKB))
-+ /*
- * Stop getting skb's from upper layers.
- * Getting skb's from upper layers will be enabled again after
- * packets are released.
-@@ -1277,7 +1324,6 @@
- netif_stop_queue(dev);
-
- /* Update statistics and start of transmittion time */
-- stats->tx_bytes += skb->len;
- stats->tx_packets++;
- dev->trans_start = jiffies;
-
-@@ -1287,214 +1333,304 @@
- }
-
- /*
-- * mv64340_eth_get_stats
-+ * mv643xx_eth_get_stats
- *
- * Returns a pointer to the interface statistics.
- *
-- * Input : dev - a pointer to the required interface
-+ * Input : dev - a pointer to the required interface
- *
-- * Output : a pointer to the interface's statistics
-+ * Output : a pointer to the interface's statistics
- */
-
--static struct net_device_stats *mv64340_eth_get_stats(struct net_device *dev)
-+static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct mv643xx_private *mp = netdev_priv(dev);
-
- return &mp->stats;
- }
-
- /*/
-- * mv64340_eth_init
-- *
-- * First function called after registering the network device.
-- * It's purpose is to initialize the device as an ethernet device,
-- * fill the structure that was given in registration with pointers
-- * to functions, and setting the MAC address of the interface
-+ * mv643xx_eth_probe
- *
-- * Input : number of port to initialize
-- * Output : -ENONMEM if failed , 0 if success
-- */
--static struct net_device *mv64340_eth_init(int port_num)
--{
-- struct mv64340_private *mp;
-+ * 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
-+ *
-+ * Input : struct device *
-+ * Output : -ENOMEM if failed , 0 if success
-+ */
-+static int mv643xx_eth_probe(struct device *ddev)
-+{
-+ struct platform_device *pdev = to_platform_device(ddev);
-+ 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;
-
-- dev = alloc_etherdev(sizeof(struct mv64340_private));
-+ dev = alloc_etherdev(sizeof(struct mv643xx_private));
- if (!dev)
-- return NULL;
-+ return -ENOMEM;
-+
-+ dev_set_drvdata(ddev, dev);
-
- mp = netdev_priv(dev);
-
-- dev->irq = ETH_PORT0_IRQ_NUM + port_num;
-+ res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+ BUG_ON(!res);
-+ dev->irq = res->start;
-
-- dev->open = mv64340_eth_open;
-- dev->stop = mv64340_eth_stop;
-- dev->hard_start_xmit = mv64340_eth_start_xmit;
-- dev->get_stats = mv64340_eth_get_stats;
-- dev->set_mac_address = mv64340_eth_set_mac_address;
-- dev->set_multicast_list = mv64340_eth_set_rx_mode;
-+ 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 = mv64340_eth_tx_timeout;
--#ifdef MV64340_NAPI
-- dev->poll = mv64340_poll;
-- dev->weight = 64;
-+ dev->tx_timeout = mv643xx_eth_tx_timeout;
-+#ifdef MV643XX_NAPI
-+ dev->poll = mv643xx_poll;
-+ dev->weight = 64;
- #endif
-
- dev->watchdog_timeo = 2 * HZ;
-- dev->tx_queue_len = MV64340_TX_QUEUE_SIZE;
-+ dev->tx_queue_len = mp->tx_ring_size;
- dev->base_addr = 0;
-- dev->change_mtu = mv64340_eth_change_mtu;
-+ dev->change_mtu = mv643xx_eth_change_mtu;
-+ SET_ETHTOOL_OPS(dev, &mv643xx_ethtool_ops);
-
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
- #ifdef MAX_SKB_FRAGS
- #ifndef CONFIG_JAGUAR_DMALOW
-- /*
-- * 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 | NETIF_F_HW_CSUM;
-+ /*
-+ * 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 | NETIF_F_HW_CSUM;
- #endif
- #endif
- #endif
-
-- mp->port_num = port_num;
--
- /* Configure the timeout task */
-- INIT_WORK(&mp->tx_timeout_task,
-- (void (*)(void *))mv64340_eth_tx_timeout_task, dev);
-+ INIT_WORK(&mp->tx_timeout_task,
-+ (void (*)(void *))mv643xx_eth_tx_timeout_task, dev);
-
- spin_lock_init(&mp->lock);
-
-- /* set MAC addresses */
-- memcpy(dev->dev_addr, prom_mac_addr_base, 6);
-- dev->dev_addr[5] += port_num;
-+ /* set default config values */
-+ eth_port_uc_addr_get(dev, dev->dev_addr);
-+ mp->port_config = MV643XX_ETH_PORT_CONFIG_DEFAULT_VALUE;
-+ mp->port_config_extend = MV643XX_ETH_PORT_CONFIG_EXTEND_DEFAULT_VALUE;
-+ mp->port_sdma_config = MV643XX_ETH_PORT_SDMA_CONFIG_DEFAULT_VALUE;
-+ mp->port_serial_control = MV643XX_ETH_PORT_SERIAL_CONTROL_DEFAULT_VALUE;
-+ mp->rx_ring_size = MV643XX_ETH_PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
-+ mp->tx_ring_size = MV643XX_ETH_PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
-+
-+ pd = pdev->dev.platform_data;
-+ if (pd) {
-+ if (pd->mac_addr != NULL)
-+ memcpy(dev->dev_addr, pd->mac_addr, 6);
-+
-+ if (pd->phy_addr || pd->force_phy_addr)
-+ ethernet_phy_set(port_num, pd->phy_addr);
-+
-+ if (pd->port_config || pd->force_port_config)
-+ mp->port_config = pd->port_config;
-+
-+ if (pd->port_config_extend || pd->force_port_config_extend)
-+ mp->port_config_extend = pd->port_config_extend;
-+
-+ if (pd->port_sdma_config || pd->force_port_sdma_config)
-+ mp->port_sdma_config = pd->port_sdma_config;
-+
-+ if (pd->port_serial_control || pd->force_port_serial_control)
-+ mp->port_serial_control = pd->port_serial_control;
-+
-+ if (pd->rx_queue_size)
-+ mp->rx_ring_size = pd->rx_queue_size;
-+
-+ if (pd->tx_queue_size)
-+ mp->tx_ring_size = pd->tx_queue_size;
-+
-+ if (pd->tx_sram_size) {
-+ mp->tx_sram_size = pd->tx_sram_size;
-+ mp->tx_sram_addr = pd->tx_sram_addr;
-+ }
-+
-+ if (pd->rx_sram_size) {
-+ mp->rx_sram_size = pd->rx_sram_size;
-+ mp->rx_sram_addr = pd->rx_sram_addr;
-+ }
-+ }
-+
-+ 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));
-+ return err;
-+ }
-
- err = register_netdev(dev);
- if (err)
-- goto out_free_dev;
-+ goto out;
-
-- printk(KERN_NOTICE "%s: port %d with MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
-- dev->name, port_num,
-- dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-- dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
-+ 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]);
-
- if (dev->features & NETIF_F_SG)
-- printk("Scatter Gather Enabled ");
-+ printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name);
-
- if (dev->features & NETIF_F_IP_CSUM)
-- printk("TX TCP/IP Checksumming Supported \n");
-+ printk(KERN_NOTICE "%s: TX TCP/IP Checksumming Supported\n",
-+ dev->name);
-+
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-+ printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON \n", dev->name);
-+#endif
-
-- printk("RX TCP/UDP Checksum Offload ON, \n");
-- printk("TX and RX Interrupt Coalescing ON \n");
-+#ifdef MV643XX_COAL
-+ printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON \n",
-+ dev->name);
-+#endif
-
--#ifdef MV64340_NAPI
-- printk("RX NAPI Enabled \n");
-+#ifdef MV643XX_NAPI
-+ printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
- #endif
-
-- return dev;
-+ return 0;
-
--out_free_dev:
-+out:
- free_netdev(dev);
-
-- return NULL;
-+ return err;
- }
-
--static void mv64340_eth_remove(struct net_device *dev)
-+static int mv643xx_eth_remove(struct device *ddev)
- {
-- struct mv64340_private *mp = netdev_priv(dev);
-+ struct net_device *dev = dev_get_drvdata(ddev);
-
- unregister_netdev(dev);
- flush_scheduled_work();
-+
- free_netdev(dev);
-+ dev_set_drvdata(ddev, NULL);
-+ return 0;
-+}
-+
-+static int mv643xx_eth_shared_probe(struct device *ddev)
-+{
-+ struct platform_device *pdev = to_platform_device(ddev);
-+ struct resource *res;
-+
-+ printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
-+
-+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+ if (res == NULL)
-+ return -ENODEV;
-+
-+ mv643xx_eth_shared_base = ioremap(res->start,
-+ MV643XX_ETH_SHARED_REGS_SIZE);
-+ if (mv643xx_eth_shared_base == NULL)
-+ return -ENOMEM;
-+
-+ return 0;
-+
-+}
-+
-+static int mv643xx_eth_shared_remove(struct device *ddev)
-+{
-+ iounmap(mv643xx_eth_shared_base);
-+ mv643xx_eth_shared_base = NULL;
-+
-+ return 0;
- }
-
--static struct net_device *mv64340_dev0;
--static struct net_device *mv64340_dev1;
--static struct net_device *mv64340_dev2;
-+static struct device_driver mv643xx_eth_driver = {
-+ .name = MV643XX_ETH_NAME,
-+ .bus = &platform_bus_type,
-+ .probe = mv643xx_eth_probe,
-+ .remove = mv643xx_eth_remove,
-+};
-+
-+static struct device_driver mv643xx_eth_shared_driver = {
-+ .name = MV643XX_ETH_SHARED_NAME,
-+ .bus = &platform_bus_type,
-+ .probe = mv643xx_eth_shared_probe,
-+ .remove = mv643xx_eth_shared_remove,
-+};
-
- /*
-- * mv64340_init_module
-+ * mv643xx_init_module
- *
- * Registers the network drivers into the Linux kernel
- *
-- * Input : N/A
-+ * Input : N/A
- *
-- * Output : N/A
-+ * Output : N/A
- */
--static int __init mv64340_init_module(void)
-+static int __init mv643xx_init_module(void)
- {
-- printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
-+ int rc;
-
--#ifdef CONFIG_MV643XX_ETH_0
-- mv64340_dev0 = mv64340_eth_init(0);
-- if (!mv64340_dev0) {
-- printk(KERN_ERR
-- "Error registering MV-64360 ethernet port 0\n");
-- }
--#endif
--#ifdef CONFIG_MV643XX_ETH_1
-- mv64340_dev1 = mv64340_eth_init(1);
-- if (!mv64340_dev1) {
-- printk(KERN_ERR
-- "Error registering MV-64360 ethernet port 1\n");
-- }
--#endif
--#ifdef CONFIG_MV643XX_ETH_2
-- mv64340_dev2 = mv64340_eth_init(2);
-- if (!mv64340_dev2) {
-- printk(KERN_ERR
-- "Error registering MV-64360 ethernet port 2\n");
-+ rc = driver_register(&mv643xx_eth_shared_driver);
-+ if (!rc) {
-+ rc = driver_register(&mv643xx_eth_driver);
-+ if (rc)
-+ driver_unregister(&mv643xx_eth_shared_driver);
- }
--#endif
-- return 0;
-+ return rc;
- }
-
- /*
-- * mv64340_cleanup_module
-+ * mv643xx_cleanup_module
- *
- * Registers the network drivers into the Linux kernel
- *
-- * Input : N/A
-+ * Input : N/A
- *
-- * Output : N/A
-+ * Output : N/A
- */
--static void __exit mv64340_cleanup_module(void)
-+static void __exit mv643xx_cleanup_module(void)
- {
-- if (mv64340_dev2)
-- mv64340_eth_remove(mv64340_dev2);
-- if (mv64340_dev1)
-- mv64340_eth_remove(mv64340_dev1);
-- if (mv64340_dev0)
-- mv64340_eth_remove(mv64340_dev0);
-+ driver_unregister(&mv643xx_eth_driver);
-+ driver_unregister(&mv643xx_eth_shared_driver);
- }
-
--module_init(mv64340_init_module);
--module_exit(mv64340_cleanup_module);
-+module_init(mv643xx_init_module);
-+module_exit(mv643xx_cleanup_module);
-
- MODULE_LICENSE("GPL");
--MODULE_AUTHOR("Rabeeh Khoury, Assaf Hoffman, Matthew Dharm and Manish Lachwani");
--MODULE_DESCRIPTION("Ethernet driver for Marvell MV64340");
-+MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
-+ " and Dale Farnsworth");
-+MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
-
- /*
-- * The second part is the low level driver of the gigE ethernet ports.
-+ * The second part is the low level driver of the gigE ethernet ports.
- */
-
- /*
- * Marvell's Gigabit Ethernet controller low level driver
- *
- * DESCRIPTION:
-- * This file introduce low level API to Marvell's Gigabit Ethernet
-+ * 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 mv64340_private.
-+ * struct mv643xx_private.
- * This struct includes user configuration information as well as
- * driver internal data needed for its operations.
- *
-- * Supported Features:
-+ * 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.
-@@ -1511,12 +1647,12 @@
- * - 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 mv64340_private
-- * struct.
-+ * 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.
- *
-@@ -1525,7 +1661,7 @@
- * access to DRAM and internal SRAM memory spaces.
- *
- * Driver ring initialization
-- * Allocating memory for the descriptor rings and buffers is not
-+ * 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
-@@ -1533,49 +1669,50 @@
- * of a ring.
- * Note: Pay special attention to alignment issues when using
- * cached descriptors/buffers. In this phase the driver store
-- * information in the mv64340_private struct regarding each queue
-+ * information in the mv643xx_private struct regarding each queue
- * ring.
- *
-- * Driver start
-+ * Driver start
- * This phase prepares the Ethernet port for Rx and Tx activity.
-- * It uses the information stored in the mv64340_private struct to
-+ * 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.
-+ * 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
-+ * '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
-+ * '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
-+ * 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.
-+ * 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.
-+ * 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.
-@@ -1596,27 +1733,21 @@
- *
- * EXTERNAL INTERFACE
- *
-- * Prior to calling the initialization routine eth_port_init() the user
-- * must set the following fields under mv64340_private struct:
-- * port_num User Ethernet port number.
-- * port_mac_addr[6] User defined port MAC address.
-- * 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 introduce a set of default values:
-- * PORT_CONFIG_VALUE Default port configuration value
-- * PORT_CONFIG_EXTEND_VALUE Default port extend configuration value
-- * PORT_SDMA_CONFIG_VALUE Default sdma control value
-- * PORT_SERIAL_CONTROL_VALUE Default port serial control value
-+ * 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_mac_addr[6] User defined port MAC address.
-+ * 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:
-+ * 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.
-+ * only.
- * cmd_sts Tx/Rx descriptor command status.
- * buf_ptr Tx/Rx descriptor buffer pointer.
- * return_info Tx/Rx user resource return information.
-@@ -1625,70 +1756,44 @@
- /* defines */
- /* SDMA command macros */
- #define ETH_ENABLE_TX_QUEUE(eth_port) \
-- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port), 1)
--
--#define ETH_DISABLE_TX_QUEUE(eth_port) \
-- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port), \
-- (1 << 8))
--
--#define ETH_ENABLE_RX_QUEUE(rx_queue, eth_port) \
-- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(eth_port), \
-- (1 << rx_queue))
--
--#define ETH_DISABLE_RX_QUEUE(rx_queue, eth_port) \
-- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(eth_port), \
-- (1 << (8 + rx_queue)))
--
--#define LINK_UP_TIMEOUT 100000
--#define PHY_BUSY_TIMEOUT 10000000
-+ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port), 1)
-
- /* locals */
-
- /* 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);
-
- /* Ethernet Port routines */
- static int eth_port_uc_addr(unsigned int eth_port_num, unsigned char uc_nibble,
-- int option);
-+ int option);
-
- /*
- * eth_port_init - Initialize the Ethernet port driver
- *
- * 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 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:
-- * struct mv64340_private *mp Ethernet port control struct
-+ * struct mv643xx_private *mp Ethernet port control struct
- *
- * OUTPUT:
-- * See description.
-+ * See description.
- *
- * RETURN:
-- * None.
-+ * None.
- */
--static void eth_port_init(struct mv64340_private * mp)
-+static void eth_port_init(struct mv643xx_private *mp)
- {
-- mp->port_config = PORT_CONFIG_VALUE;
-- mp->port_config_extend = PORT_CONFIG_EXTEND_VALUE;
--#if defined(__BIG_ENDIAN)
-- mp->port_sdma_config = PORT_SDMA_CONFIG_VALUE;
--#elif defined(__LITTLE_ENDIAN)
-- mp->port_sdma_config = PORT_SDMA_CONFIG_VALUE |
-- ETH_BLM_RX_NO_SWAP | ETH_BLM_TX_NO_SWAP;
--#else
--#error One of __LITTLE_ENDIAN or __BIG_ENDIAN must be defined!
--#endif
-- mp->port_serial_control = PORT_SERIAL_CONTROL_VALUE;
--
- mp->port_rx_queue_command = 0;
- mp->port_tx_queue_command = 0;
-
-@@ -1706,77 +1811,73 @@
- * eth_port_start - Start the Ethernet port activity.
- *
- * DESCRIPTION:
-- * This routine prepares the Ethernet port for Rx and Tx activity:
-- * 1. Initialize Tx and Rx Current Descriptor Pointer for each queue that
-- * has been initialized a descriptor's ring (using
-- * ether_init_tx_desc_ring for Tx and ether_init_rx_desc_ring for Rx)
-- * 2. Initialize and enable the Ethernet configuration port by writing to
-- * the port's configuration and command registers.
-- * 3. Initialize and enable the SDMA by writing to the SDMA's
-- * configuration and command registers. After completing these steps,
-- * the ethernet port SDMA can starts to perform Rx and Tx activities.
-+ * This routine prepares the Ethernet port for Rx and Tx activity:
-+ * 1. Initialize Tx and Rx Current Descriptor Pointer for each queue that
-+ * has been initialized a descriptor's ring (using
-+ * ether_init_tx_desc_ring for Tx and ether_init_rx_desc_ring for Rx)
-+ * 2. Initialize and enable the Ethernet configuration port by writing to
-+ * the port's configuration and command registers.
-+ * 3. Initialize and enable the SDMA by writing to the SDMA's
-+ * configuration and command registers. After completing these steps,
-+ * the ethernet port SDMA can starts to perform Rx and Tx activities.
- *
-- * Note: Each Rx and Tx queue descriptor's list must be initialized prior
-- * to calling this function (use ether_init_tx_desc_ring for Tx queues
-- * and ether_init_rx_desc_ring for Rx queues).
-+ * Note: Each Rx and Tx queue descriptor's list must be initialized prior
-+ * to calling this function (use ether_init_tx_desc_ring for Tx queues
-+ * and ether_init_rx_desc_ring for Rx queues).
- *
- * INPUT:
-- * struct mv64340_private *mp Ethernet port control struct
-+ * struct mv643xx_private *mp Ethernet port control struct
- *
- * OUTPUT:
-- * Ethernet port is ready to receive and transmit.
-+ * Ethernet port is ready to receive and transmit.
- *
- * RETURN:
-- * false if the port PHY is not up.
-- * true otherwise.
-+ * None.
- */
--static int eth_port_start(struct mv64340_private *mp)
-+static void eth_port_start(struct mv643xx_private *mp)
- {
-- unsigned int eth_port_num = mp->port_num;
-+ unsigned int port_num = mp->port_num;
- int tx_curr_desc, rx_curr_desc;
-- unsigned int phy_reg_data;
-
- /* Assignment of Tx CTRP of given queue */
- tx_curr_desc = mp->tx_curr_desc_q;
-- MV_WRITE(MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(eth_port_num),
-- (struct eth_tx_desc *) mp->tx_desc_dma + tx_curr_desc);
-+ mv_write(MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(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(MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(eth_port_num),
-- (struct eth_rx_desc *) mp->rx_desc_dma + rx_curr_desc);
-+ mv_write(MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(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(mp->port_num, mp->port_mac_addr);
-+ eth_port_uc_addr_set(port_num, mp->port_mac_addr);
-
- /* Assign port configuration and command. */
-- MV_WRITE(MV64340_ETH_PORT_CONFIG_REG(eth_port_num),
-- mp->port_config);
-+ mv_write(MV643XX_ETH_PORT_CONFIG_REG(port_num), mp->port_config);
-
-- MV_WRITE(MV64340_ETH_PORT_CONFIG_EXTEND_REG(eth_port_num),
-- mp->port_config_extend);
-+ mv_write(MV643XX_ETH_PORT_CONFIG_EXTEND_REG(port_num),
-+ mp->port_config_extend);
-
-- MV_WRITE(MV64340_ETH_PORT_SERIAL_CONTROL_REG(eth_port_num),
-- mp->port_serial_control);
-
-- MV_SET_REG_BITS(MV64340_ETH_PORT_SERIAL_CONTROL_REG(eth_port_num),
-- ETH_SERIAL_PORT_ENABLE);
-+ /* Increase the Rx side buffer size if supporting GigE */
-+ if (mp->port_serial_control & MV643XX_ETH_SET_GMII_SPEED_TO_1000)
-+ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
-+ (mp->port_serial_control & 0xfff1ffff) | (0x5 << 17));
-+ else
-+ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
-+ mp->port_serial_control);
-+
-+ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
-+ mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num)) |
-+ MV643XX_ETH_SERIAL_PORT_ENABLE);
-
- /* Assign port SDMA configuration */
-- MV_WRITE(MV64340_ETH_SDMA_CONFIG_REG(eth_port_num),
-- mp->port_sdma_config);
-+ mv_write(MV643XX_ETH_SDMA_CONFIG_REG(port_num),
-+ mp->port_sdma_config);
-
- /* Enable port Rx. */
-- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(eth_port_num),
-- mp->port_rx_queue_command);
--
-- /* Check if link is up */
-- eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data);
--
-- if (!(phy_reg_data & 0x20))
-- return 0;
--
-- return 1;
-+ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
-+ mp->port_rx_queue_command);
- }
-
- /*
-@@ -1786,29 +1887,29 @@
- * This function Set the port Ethernet MAC address.
- *
- * INPUT:
-- * unsigned int eth_port_num Port number.
-- * char * p_addr Address to be set
-+ * unsigned int eth_port_num Port number.
-+ * char * p_addr Address to be set
- *
- * OUTPUT:
-- * Set MAC address low and high registers. also calls eth_port_uc_addr()
-- * To set the unicast table with the proper information.
-+ * Set MAC address low and high registers. also calls eth_port_uc_addr()
-+ * To set the unicast table with the proper information.
- *
- * RETURN:
- * N/A.
- *
- */
- static void eth_port_uc_addr_set(unsigned int eth_port_num,
-- unsigned char *p_addr)
-+ unsigned char *p_addr)
- {
- unsigned int mac_h;
- unsigned int mac_l;
-
- 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);
-+ mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
-+ (p_addr[3] << 0);
-
-- MV_WRITE(MV64340_ETH_MAC_ADDR_LOW(eth_port_num), mac_l);
-- MV_WRITE(MV64340_ETH_MAC_ADDR_HIGH(eth_port_num), mac_h);
-+ mv_write(MV643XX_ETH_MAC_ADDR_LOW(eth_port_num), mac_l);
-+ mv_write(MV643XX_ETH_MAC_ADDR_HIGH(eth_port_num), mac_h);
-
- /* Accept frames of this address */
- eth_port_uc_addr(eth_port_num, p_addr[5], ACCEPT_MAC_ADDR);
-@@ -1817,29 +1918,64 @@
- }
-
- /*
-+ * eth_port_uc_addr_get - This function retrieves the port Unicast address
-+ * (MAC address) from the ethernet hw registers.
-+ *
-+ * DESCRIPTION:
-+ * This function retrieves the port Ethernet MAC address.
-+ *
-+ * INPUT:
-+ * unsigned int eth_port_num Port number.
-+ * char *MacAddr pointer where the MAC address is stored
-+ *
-+ * OUTPUT:
-+ * Copy the MAC address to the location pointed to by MacAddr
-+ *
-+ * 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;
-+}
-+
-+/*
- * eth_port_uc_addr - This function Set the port unicast address table
- *
- * DESCRIPTION:
-- * This function locates the proper entry in the Unicast table for the
-- * specified MAC nibble and sets its properties according to function
-+ * This function locates the proper entry in the Unicast table for the
-+ * specified MAC nibble and sets its properties according to function
- * parameters.
- *
- * INPUT:
-- * unsigned int eth_port_num Port number.
-- * unsigned char uc_nibble Unicast MAC Address last nibble.
-- * int option 0 = Add, 1 = remove address.
-+ * unsigned int eth_port_num Port number.
-+ * unsigned char uc_nibble Unicast MAC Address last nibble.
-+ * int option 0 = Add, 1 = remove address.
- *
- * OUTPUT:
- * This function add/removes MAC addresses from the port unicast address
-- * table.
-+ * table.
- *
- * RETURN:
- * true is output succeeded.
- * false if option parameter is invalid.
- *
- */
--static int eth_port_uc_addr(unsigned int eth_port_num,
-- unsigned char uc_nibble, int option)
-+static int eth_port_uc_addr(unsigned int eth_port_num, unsigned char uc_nibble,
-+ int option)
- {
- unsigned int unicast_reg;
- unsigned int tbl_offset;
-@@ -1852,29 +1988,26 @@
-
- switch (option) {
- case REJECT_MAC_ADDR:
-- /* Clear accepts frame bit at specified unicast DA table entry */
-- unicast_reg = MV_READ((MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
-- (eth_port_num) + tbl_offset));
-+ /* Clear accepts frame bit at given unicast DA table entry */
-+ unicast_reg = mv_read((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
-+ (eth_port_num) + tbl_offset));
-
- unicast_reg &= (0x0E << (8 * reg_offset));
-
-- MV_WRITE(
-- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
-- (eth_port_num) + tbl_offset), unicast_reg);
-+ mv_write((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
-+ (eth_port_num) + tbl_offset), unicast_reg);
- break;
-
- case ACCEPT_MAC_ADDR:
- /* Set accepts frame bit at unicast DA filter table entry */
- unicast_reg =
-- MV_READ(
-- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
-- (eth_port_num) + tbl_offset));
-+ mv_read((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
-+ (eth_port_num) + tbl_offset));
-
- unicast_reg |= (0x01 << (8 * reg_offset));
-
-- MV_WRITE(
-- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
-- (eth_port_num) + tbl_offset), unicast_reg);
-+ mv_write((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
-+ (eth_port_num) + tbl_offset), unicast_reg);
-
- break;
-
-@@ -1889,17 +2022,17 @@
- * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
- *
- * DESCRIPTION:
-- * Go through all the DA filter tables (Unicast, Special Multicast &
-- * Other Multicast) and set each entry to 0.
-+ * Go through all the DA filter tables (Unicast, Special Multicast &
-+ * Other Multicast) and set each entry to 0.
- *
- * INPUT:
-- * unsigned int eth_port_num Ethernet Port number.
-+ * unsigned int eth_port_num Ethernet Port number.
- *
- * OUTPUT:
-- * Multicast and Unicast packets are rejected.
-+ * Multicast and Unicast packets are rejected.
- *
- * RETURN:
-- * None.
-+ * None.
- */
- static void eth_port_init_mac_tables(unsigned int eth_port_num)
- {
-@@ -1907,18 +2040,16 @@
-
- /* Clear DA filter unicast table (Ex_dFUT) */
- for (table_index = 0; table_index <= 0xC; table_index += 4)
-- MV_WRITE(
-- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
-- (eth_port_num) + table_index), 0);
-+ mv_write((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
-+ (eth_port_num) + table_index), 0);
-
- for (table_index = 0; table_index <= 0xFC; table_index += 4) {
- /* Clear DA filter special multicast table (Ex_dFSMT) */
-- MV_WRITE(
-- (MV64340_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
-- (eth_port_num) + table_index), 0);
-+ 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((MV64340_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE
-- (eth_port_num) + table_index), 0);
-+ mv_write((MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE
-+ (eth_port_num) + table_index), 0);
- }
- }
-
-@@ -1926,17 +2057,17 @@
- * 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.
-+ * 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.
-+ * unsigned int eth_port_num Ethernet Port number.
- *
- * OUTPUT:
-- * After reading all MIB counters, the counters resets.
-+ * After reading all MIB counters, the counters resets.
- *
- * RETURN:
-- * MIB counter value.
-+ * MIB counter value.
- *
- */
- static void eth_clear_mib_counters(unsigned int eth_port_num)
-@@ -1944,72 +2075,155 @@
- int i;
-
- /* Perform dummy reads from MIB counters */
-- for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION; i += 4)
-- MV_READ(MV64340_ETH_MIB_COUNTERS_BASE(eth_port_num) + i);
-+ 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);
-+}
-+
-+static inline u32 read_mib(struct mv643xx_private *mp, int offset)
-+{
-+ return mv_read(MV643XX_ETH_MIB_COUNTERS_BASE(mp->port_num) + offset);
- }
-
-+static void eth_update_mib_counters(struct mv643xx_private *mp)
-+{
-+ struct mv643xx_mib_counters *p = &mp->mib_counters;
-+ int offset;
-+
-+ 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;
-+
-+ 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);
-+
-+ 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;
-+
-+ for (offset = ETH_MIB_GOOD_FRAMES_SENT;
-+ offset <= ETH_MIB_LATE_COLLISION;
-+ offset += 4)
-+ *(u32 *)((char *)p + offset) = read_mib(mp, offset);
-+}
-+
-+/*
-+ * 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
-+ *
-+ */
-+static int ethernet_phy_detect(unsigned int port_num)
-+{
-+ unsigned int phy_reg_data0;
-+ int auto_neg;
-+
-+ 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);
-+
-+ eth_port_read_smi_reg(port_num, 0, &phy_reg_data0);
-+ if ((phy_reg_data0 & 0x1000) == auto_neg)
-+ return -ENODEV; /* change didn't take */
-+
-+ 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.
-+ * This routine returns the given ethernet port PHY address.
- *
- * INPUT:
-- * unsigned int eth_port_num Ethernet Port number.
-+ * unsigned int eth_port_num Ethernet Port number.
- *
- * OUTPUT:
-- * None.
-+ * None.
- *
- * RETURN:
-- * PHY address.
-+ * PHY address.
- *
- */
- static int ethernet_phy_get(unsigned int eth_port_num)
- {
- unsigned int reg_data;
-
-- reg_data = MV_READ(MV64340_ETH_PHY_ADDR_REG);
-+ reg_data = mv_read(MV643XX_ETH_PHY_ADDR_REG);
-
- return ((reg_data >> (5 * eth_port_num)) & 0x1f);
- }
-
- /*
-+ * 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.
-+ *
-+ * RETURN:
-+ * None.
-+ *
-+ */
-+static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr)
-+{
-+ u32 reg_data;
-+ int addr_shift = 5 * eth_port_num;
-+
-+ 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);
-+}
-+
-+/*
- * ethernet_phy_reset - Reset Ethernet port PHY.
- *
- * DESCRIPTION:
-- * This routine utilize the SMI interface to reset the ethernet port PHY.
-- * The routine waits until the link is up again or link up is timeout.
-+ * This routine utilizes the SMI interface to reset the ethernet port PHY.
- *
- * INPUT:
-- * unsigned int eth_port_num Ethernet Port number.
-+ * unsigned int eth_port_num Ethernet Port number.
- *
- * OUTPUT:
-- * The ethernet port PHY renew its link.
-+ * The PHY is reset.
- *
- * RETURN:
-- * None.
-+ * None.
- *
- */
--static int ethernet_phy_reset(unsigned int eth_port_num)
-+static void ethernet_phy_reset(unsigned int eth_port_num)
- {
-- unsigned int time_out = 50;
- unsigned int phy_reg_data;
-
- /* 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);
--
-- /* Poll on the PHY LINK */
-- do {
-- eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data);
--
-- if (time_out-- == 0)
-- return 0;
-- } while (!(phy_reg_data & 0x20));
--
-- return 1;
- }
-
- /*
-@@ -2017,381 +2231,358 @@
- *
- * 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.
-+ * 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.
-+ * unsigned int eth_port_num Ethernet Port number.
- *
- * OUTPUT:
-- * Channel activity is halted.
-+ * Channel activity is halted.
- *
- * RETURN:
-- * None.
-+ * None.
- *
- */
--static void eth_port_reset(unsigned int eth_port_num)
-+static void eth_port_reset(unsigned int port_num)
- {
- unsigned int reg_data;
-
- /* Stop Tx port activity. Check port Tx activity. */
-- reg_data =
-- MV_READ(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port_num));
-+ reg_data = mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num));
-
- if (reg_data & 0xFF) {
- /* Issue stop command for active channels only */
-- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG
-- (eth_port_num), (reg_data << 8));
-+ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num),
-+ (reg_data << 8));
-
- /* Wait for all Tx activity to terminate. */
-- do {
-- /* Check port cause register that all Tx queues are stopped */
-- reg_data =
-- MV_READ
-- (MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG
-- (eth_port_num));
-- }
-- while (reg_data & 0xFF);
-+ /* Check port cause register that all Tx queues are stopped */
-+ while (mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num))
-+ & 0xFF)
-+ udelay(10);
- }
-
- /* Stop Rx port activity. Check port Rx activity. */
-- reg_data =
-- MV_READ(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG
-- (eth_port_num));
-+ reg_data = mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num));
-
- if (reg_data & 0xFF) {
- /* Issue stop command for active channels only */
-- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG
-- (eth_port_num), (reg_data << 8));
-+ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
-+ (reg_data << 8));
-
- /* Wait for all Rx activity to terminate. */
-- do {
-- /* Check port cause register that all Rx queues are stopped */
-- reg_data =
-- MV_READ
-- (MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG
-- (eth_port_num));
-- }
-- while (reg_data & 0xFF);
-+ /* Check port cause register that all Rx queues are stopped */
-+ while (mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num))
-+ & 0xFF)
-+ udelay(10);
- }
-
--
- /* Clear all MIB counters */
-- eth_clear_mib_counters(eth_port_num);
-+ eth_clear_mib_counters(port_num);
-
- /* Reset the Enable bit in the Configuration Register */
-- reg_data =
-- MV_READ(MV64340_ETH_PORT_SERIAL_CONTROL_REG (eth_port_num));
-- reg_data &= ~ETH_SERIAL_PORT_ENABLE;
-- MV_WRITE(MV64340_ETH_PORT_SERIAL_CONTROL_REG(eth_port_num), reg_data);
--
-- return;
-+ reg_data = mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num));
-+ reg_data &= ~MV643XX_ETH_SERIAL_PORT_ENABLE;
-+ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), reg_data);
- }
-
- /*
- * ethernet_set_config_reg - Set specified bits in configuration register.
- *
- * DESCRIPTION:
-- * This function sets specified bits in the given ethernet
-- * configuration register.
-+ * This function sets specified bits in the given ethernet
-+ * configuration register.
- *
- * INPUT:
-- * unsigned int eth_port_num Ethernet Port number.
-- * unsigned int value 32 bit value.
-+ * unsigned int eth_port_num Ethernet Port number.
-+ * unsigned int value 32 bit value.
- *
- * OUTPUT:
-- * The set bits in the value parameter are set in the configuration
-- * register.
-+ * The set bits in the value parameter are set in the configuration
-+ * register.
- *
- * RETURN:
-- * None.
-+ * None.
- *
- */
- static void ethernet_set_config_reg(unsigned int eth_port_num,
-- unsigned int value)
-+ unsigned int value)
- {
- unsigned int eth_config_reg;
-
-- eth_config_reg =
-- MV_READ(MV64340_ETH_PORT_CONFIG_REG(eth_port_num));
-+ eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num));
- eth_config_reg |= value;
-- MV_WRITE(MV64340_ETH_PORT_CONFIG_REG(eth_port_num),
-- eth_config_reg);
-+ mv_write(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num), eth_config_reg);
-+}
-+
-+static int eth_port_autoneg_supported(unsigned int eth_port_num)
-+{
-+ unsigned int phy_reg_data0;
-+
-+ eth_port_read_smi_reg(eth_port_num, 0, &phy_reg_data0);
-+
-+ return phy_reg_data0 & 0x1000;
-+}
-+
-+static int eth_port_link_is_up(unsigned int eth_port_num)
-+{
-+ unsigned int phy_reg_data1;
-+
-+ eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data1);
-+
-+ if (eth_port_autoneg_supported(eth_port_num)) {
-+ if (phy_reg_data1 & 0x20) /* auto-neg complete */
-+ return 1;
-+ } else if (phy_reg_data1 & 0x4) /* link up */
-+ return 1;
-+
-+ return 0;
- }
-
- /*
- * ethernet_get_config_reg - Get the port configuration register
- *
- * DESCRIPTION:
-- * This function returns the configuration register value of the given
-- * ethernet port.
-+ * This function returns the configuration register value of the given
-+ * ethernet port.
- *
- * INPUT:
-- * unsigned int eth_port_num Ethernet Port number.
-+ * unsigned int eth_port_num Ethernet Port number.
- *
- * OUTPUT:
-- * None.
-+ * None.
- *
- * RETURN:
-- * Port configuration register value.
-+ * Port configuration register value.
- */
- static unsigned int ethernet_get_config_reg(unsigned int eth_port_num)
- {
- unsigned int eth_config_reg;
-
-- eth_config_reg = MV_READ(MV64340_ETH_PORT_CONFIG_EXTEND_REG
-- (eth_port_num));
-+ eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_EXTEND_REG
-+ (eth_port_num));
- return eth_config_reg;
- }
-
--
- /*
- * eth_port_read_smi_reg - Read PHY registers
- *
- * DESCRIPTION:
-- * This routine utilize the SMI interface to interact with the PHY in
-- * order to perform PHY register read.
-+ * 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 phy_reg PHY register address offset.
-- * unsigned int *value Register value buffer.
-+ * unsigned int port_num Ethernet Port number.
-+ * unsigned int phy_reg PHY register address offset.
-+ * unsigned int *value Register value buffer.
- *
- * OUTPUT:
-- * Write the value of a specified PHY register into given buffer.
-+ * Write the value of a specified PHY register into given buffer.
- *
- * RETURN:
-- * false if the PHY is busy or read data is not in valid state.
-- * true otherwise.
-+ * false if the PHY is busy or read data is not in valid state.
-+ * true otherwise.
- *
- */
--static int eth_port_read_smi_reg(unsigned int eth_port_num,
-- unsigned int phy_reg, unsigned int *value)
-+static void eth_port_read_smi_reg(unsigned int port_num,
-+ unsigned int phy_reg, unsigned int *value)
- {
-- int phy_addr = ethernet_phy_get(eth_port_num);
-- unsigned int time_out = PHY_BUSY_TIMEOUT;
-- unsigned int reg_value;
--
-- /* first check that it is not busy */
-- do {
-- reg_value = MV_READ(MV64340_ETH_SMI_REG);
-- if (time_out-- == 0)
-- return 0;
-- } while (reg_value & ETH_SMI_BUSY);
--
-- /* not busy */
--
-- MV_WRITE(MV64340_ETH_SMI_REG,
-- (phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ);
--
-- time_out = PHY_BUSY_TIMEOUT; /* initialize the time out var again */
-+ int phy_addr = ethernet_phy_get(port_num);
-+ unsigned long flags;
-+ int i;
-
-- do {
-- reg_value = MV_READ(MV64340_ETH_SMI_REG);
-- if (time_out-- == 0)
-- return 0;
-- } while (reg_value & ETH_SMI_READ_VALID);
-+ /* the SMI register is a shared resource */
-+ spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
-
-- /* Wait for the data to update in the SMI register */
-- for (time_out = 0; time_out < PHY_BUSY_TIMEOUT; time_out++);
-+ /* 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);
-+ }
-
-- reg_value = MV_READ(MV64340_ETH_SMI_REG);
-+ mv_write(MV643XX_ETH_SMI_REG,
-+ (phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ);
-
-- *value = reg_value & 0xffff;
-+ /* 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);
-+ }
-
-- return 1;
-+ *value = mv_read(MV643XX_ETH_SMI_REG) & 0xffff;
-+out:
-+ spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);
- }
-
- /*
- * eth_port_write_smi_reg - Write to PHY registers
- *
- * DESCRIPTION:
-- * This routine utilize the SMI interface to interact with the PHY in
-- * order to perform writes to PHY registers.
-+ * This routine utilize the SMI interface to interact with the PHY in
-+ * order to perform writes to PHY registers.
- *
- * INPUT:
-- * unsigned int eth_port_num Ethernet Port number.
-- * unsigned int phy_reg PHY register address offset.
-- * unsigned int value Register value.
-+ * unsigned int eth_port_num Ethernet Port number.
-+ * unsigned int phy_reg PHY register address offset.
-+ * unsigned int value Register value.
- *
- * OUTPUT:
-- * Write the given value to the specified PHY register.
-+ * Write the given value to the specified PHY register.
- *
- * RETURN:
-- * false if the PHY is busy.
-- * true otherwise.
-+ * false if the PHY is busy.
-+ * true otherwise.
- *
- */
--static int eth_port_write_smi_reg(unsigned int eth_port_num,
-- unsigned int phy_reg, unsigned int value)
-+static void eth_port_write_smi_reg(unsigned int eth_port_num,
-+ unsigned int phy_reg, unsigned int value)
- {
-- unsigned int time_out = PHY_BUSY_TIMEOUT;
-- unsigned int reg_value;
- int phy_addr;
-+ int i;
-+ unsigned long flags;
-
- phy_addr = ethernet_phy_get(eth_port_num);
-
-- /* first check that it is not busy */
-- do {
-- reg_value = MV_READ(MV64340_ETH_SMI_REG);
-- if (time_out-- == 0)
-- return 0;
-- } while (reg_value & ETH_SMI_BUSY);
--
-- /* not busy */
-- MV_WRITE(MV64340_ETH_SMI_REG, (phy_addr << 16) | (phy_reg << 21) |
-- ETH_SMI_OPCODE_WRITE | (value & 0xffff));
-+ /* the SMI register is a shared resource */
-+ spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
-
-- return 1;
-+ /* 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);
-+ }
-+
-+ 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);
- }
-
- /*
- * eth_port_send - Send an Ethernet packet
- *
- * DESCRIPTION:
-- * This routine send a given packet described by p_pktinfo parameter. It
-- * supports transmitting of a packet spaned over multiple buffers. The
-- * routine updates 'curr' and 'first' indexes according to the packet
-- * segment passed to the routine. In case the packet segment is first,
-- * the 'first' index is update. In any case, the 'curr' index is updated.
-- * If the routine get into Tx resource error it assigns 'curr' index as
-- * 'first'. This way the function can abort Tx process of multiple
-- * descriptors per packet.
-+ * This routine send a given packet described by p_pktinfo parameter. It
-+ * supports transmitting of a packet spaned over multiple buffers. The
-+ * routine updates 'curr' and 'first' indexes according to the packet
-+ * segment passed to the routine. In case the packet segment is first,
-+ * the 'first' index is update. In any case, the 'curr' index is updated.
-+ * If the routine get into Tx resource error it assigns 'curr' index as
-+ * 'first'. This way the function can abort Tx process of multiple
-+ * descriptors per packet.
- *
- * INPUT:
-- * struct mv64340_private *mp Ethernet Port Control srtuct.
-- * struct pkt_info *p_pkt_info User packet buffer.
-+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
-+ * struct pkt_info *p_pkt_info User packet buffer.
- *
- * OUTPUT:
-- * Tx ring 'curr' and 'first' indexes are updated.
-+ * Tx ring 'curr' and 'first' indexes are updated.
- *
- * RETURN:
-- * ETH_QUEUE_FULL in case of Tx resource error.
-+ * ETH_QUEUE_FULL in case of Tx resource error.
- * ETH_ERROR in case the routine can not access Tx desc ring.
- * ETH_QUEUE_LAST_RESOURCE if the routine uses the last Tx resource.
-- * ETH_OK otherwise.
-+ * ETH_OK otherwise.
- *
- */
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
- /*
- * Modified to include the first descriptor pointer in case of SG
- */
--static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp,
-- struct pkt_info * p_pkt_info)
-+static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info)
- {
- int tx_desc_curr, tx_desc_used, tx_first_desc, tx_next_desc;
-- volatile struct eth_tx_desc *current_descriptor;
-- volatile struct eth_tx_desc *first_descriptor;
-- u32 command_status, first_chip_ptr;
-+ struct eth_tx_desc *current_descriptor;
-+ struct eth_tx_desc *first_descriptor;
-+ u32 command;
-
- /* Do not process Tx ring in case of Tx ring resource error */
- if (mp->tx_resource_err)
- return ETH_QUEUE_FULL;
-
-+ /*
-+ * The hardware requires that each buffer that is <= 8 bytes
-+ * in length must be aligned on an 8 byte boundary.
-+ */
-+ if (p_pkt_info->byte_cnt <= 8 && p_pkt_info->buf_ptr & 0x7) {
-+ printk(KERN_ERR
-+ "mv643xx_eth port %d: packet size <= 8 problem\n",
-+ mp->port_num);
-+ return ETH_ERROR;
-+ }
-+
- /* Get the Tx Desc ring indexes */
- tx_desc_curr = mp->tx_curr_desc_q;
- tx_desc_used = mp->tx_used_desc_q;
-
- current_descriptor = &mp->p_tx_desc_area[tx_desc_curr];
-- if (current_descriptor == NULL)
-- return ETH_ERROR;
-
-- tx_next_desc = (tx_desc_curr + 1) % MV64340_TX_QUEUE_SIZE;
-- command_status = p_pkt_info->cmd_sts | ETH_ZERO_PADDING | ETH_GEN_CRC;
-+ tx_next_desc = (tx_desc_curr + 1) % mp->tx_ring_size;
-+
-+ current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
-+ current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-+ current_descriptor->l4i_chk = p_pkt_info->l4i_chk;
-+ mp->tx_skb[tx_desc_curr] = p_pkt_info->return_info;
-
-- if (command_status & ETH_TX_FIRST_DESC) {
-+ command = p_pkt_info->cmd_sts | ETH_ZERO_PADDING | ETH_GEN_CRC |
-+ ETH_BUFFER_OWNED_BY_DMA;
-+ if (command & ETH_TX_FIRST_DESC) {
- tx_first_desc = tx_desc_curr;
- mp->tx_first_desc_q = tx_first_desc;
-+ first_descriptor = current_descriptor;
-+ mp->tx_first_command = command;
-+ } else {
-+ tx_first_desc = mp->tx_first_desc_q;
-+ first_descriptor = &mp->p_tx_desc_area[tx_first_desc];
-+ BUG_ON(first_descriptor == NULL);
-+ current_descriptor->cmd_sts = command;
-+ }
-
-- /* fill first descriptor */
-- first_descriptor = &mp->p_tx_desc_area[tx_desc_curr];
-- first_descriptor->l4i_chk = p_pkt_info->l4i_chk;
-- first_descriptor->cmd_sts = command_status;
-- first_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-- first_descriptor->buf_ptr = p_pkt_info->buf_ptr;
-- first_descriptor->next_desc_ptr = mp->tx_desc_dma +
-- tx_next_desc * sizeof(struct eth_tx_desc);
-+ if (command & ETH_TX_LAST_DESC) {
- wmb();
-- } else {
-- tx_first_desc = mp->tx_first_desc_q;
-- first_descriptor = &mp->p_tx_desc_area[tx_first_desc];
-- if (first_descriptor == NULL) {
-- printk("First desc is NULL !!\n");
-- return ETH_ERROR;
-- }
-- if (command_status & ETH_TX_LAST_DESC)
-- current_descriptor->next_desc_ptr = 0x00000000;
-- else {
-- command_status |= ETH_BUFFER_OWNED_BY_DMA;
-- current_descriptor->next_desc_ptr = mp->tx_desc_dma +
-- tx_next_desc * sizeof(struct eth_tx_desc);
-- }
-- }
--
-- if (p_pkt_info->byte_cnt < 8) {
-- printk(" < 8 problem \n");
-- return ETH_ERROR;
-- }
--
-- current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
-- current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-- current_descriptor->l4i_chk = p_pkt_info->l4i_chk;
-- current_descriptor->cmd_sts = command_status;
--
-- mp->tx_skb[tx_desc_curr] = (struct sk_buff*) p_pkt_info->return_info;
--
-- wmb();
--
-- /* Set last desc with DMA ownership and interrupt enable. */
-- if (command_status & ETH_TX_LAST_DESC) {
-- current_descriptor->cmd_sts = command_status |
-- ETH_TX_ENABLE_INTERRUPT |
-- ETH_BUFFER_OWNED_BY_DMA;
-+ first_descriptor->cmd_sts = mp->tx_first_command;
-
-- if (!(command_status & ETH_TX_FIRST_DESC))
-- first_descriptor->cmd_sts |= ETH_BUFFER_OWNED_BY_DMA;
- wmb();
--
-- first_chip_ptr = MV_READ(MV64340_ETH_CURRENT_SERVED_TX_DESC_PTR(mp->port_num));
--
-- /* Apply send command */
-- if (first_chip_ptr == 0x00000000)
-- MV_WRITE(MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(mp->port_num), (struct eth_tx_desc *) mp->tx_desc_dma + tx_first_desc);
--
-- ETH_ENABLE_TX_QUEUE(mp->port_num);
-+ ETH_ENABLE_TX_QUEUE(mp->port_num);
-
- /*
- * Finish Tx packet. Update first desc in case of Tx resource
- * error */
-- tx_first_desc = tx_next_desc;
-- mp->tx_first_desc_q = tx_first_desc;
-- } else {
-- if (! (command_status & ETH_TX_FIRST_DESC) ) {
-- current_descriptor->cmd_sts = command_status;
-- wmb();
-- }
-+ tx_first_desc = tx_next_desc;
-+ mp->tx_first_desc_q = tx_first_desc;
- }
-
-- /* Check for ring index overlap in the Tx desc ring */
-- if (tx_next_desc == tx_desc_used) {
-- mp->tx_resource_err = 1;
-- mp->tx_curr_desc_q = tx_first_desc;
-+ /* Check for ring index overlap in the Tx desc ring */
-+ if (tx_next_desc == tx_desc_used) {
-+ mp->tx_resource_err = 1;
-+ mp->tx_curr_desc_q = tx_first_desc;
-
-- return ETH_QUEUE_LAST_RESOURCE;
-+ return ETH_QUEUE_LAST_RESOURCE;
- }
-
-- mp->tx_curr_desc_q = tx_next_desc;
-- wmb();
-+ mp->tx_curr_desc_q = tx_next_desc;
-
-- return ETH_OK;
-+ return ETH_OK;
- }
- #else
--static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp,
-- struct pkt_info * p_pkt_info)
-+static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info)
- {
- int tx_desc_curr;
- int tx_desc_used;
-- volatile struct eth_tx_desc* current_descriptor;
-+ struct eth_tx_desc *current_descriptor;
- unsigned int command_status;
-
- /* Do not process Tx ring in case of Tx ring resource error */
-@@ -2403,39 +2594,24 @@
- tx_desc_used = mp->tx_used_desc_q;
- current_descriptor = &mp->p_tx_desc_area[tx_desc_curr];
-
-- if (current_descriptor == NULL)
-- return ETH_ERROR;
--
- command_status = p_pkt_info->cmd_sts | ETH_ZERO_PADDING | ETH_GEN_CRC;
--
--/* XXX Is this for real ?!?!? */
-- /* Buffers with a payload smaller than 8 bytes must be aligned to a
-- * 64-bit boundary. We use the memory allocated for Tx descriptor.
-- * This memory is located in TX_BUF_OFFSET_IN_DESC offset within the
-- * Tx descriptor. */
-- if (p_pkt_info->byte_cnt <= 8) {
-- printk(KERN_ERR
-- "You have failed in the < 8 bytes errata - fixme\n");
-- return ETH_ERROR;
-- }
- current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
- current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
-- mp->tx_skb[tx_desc_curr] = (struct sk_buff *) p_pkt_info->return_info;
--
-- mb();
-+ mp->tx_skb[tx_desc_curr] = p_pkt_info->return_info;
-
- /* Set last desc with DMA ownership and interrupt enable. */
-+ wmb();
- current_descriptor->cmd_sts = command_status |
- ETH_BUFFER_OWNED_BY_DMA | ETH_TX_ENABLE_INTERRUPT;
-
-- /* Apply send command */
-+ wmb();
- ETH_ENABLE_TX_QUEUE(mp->port_num);
-
- /* Finish Tx packet. Update first desc in case of Tx resource error */
-- tx_desc_curr = (tx_desc_curr + 1) % MV64340_TX_QUEUE_SIZE;
-+ tx_desc_curr = (tx_desc_curr + 1) % mp->tx_ring_size;
-
- /* Update the current descriptor */
-- mp->tx_curr_desc_q = tx_desc_curr;
-+ mp->tx_curr_desc_q = tx_desc_curr;
-
- /* Check for ring index overlap in the Tx desc ring */
- if (tx_desc_curr == tx_desc_used) {
-@@ -2452,62 +2628,55 @@
- *
- * DESCRIPTION:
- * This routine returns the transmitted packet information to the caller.
-- * It uses the 'first' index to support Tx desc return in case a transmit
-- * of a packet spanned over multiple buffer still in process.
-- * In case the Tx queue was in "resource error" condition, where there are
-- * no available Tx resources, the function resets the resource error flag.
-+ * It uses the 'first' index to support Tx desc return in case a transmit
-+ * of a packet spanned over multiple buffer still in process.
-+ * In case the Tx queue was in "resource error" condition, where there are
-+ * no available Tx resources, the function resets the resource error flag.
- *
- * INPUT:
-- * struct mv64340_private *mp Ethernet Port Control srtuct.
-- * struct pkt_info *p_pkt_info User packet buffer.
-+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
-+ * struct pkt_info *p_pkt_info User packet buffer.
- *
- * OUTPUT:
-- * Tx ring 'first' and 'used' indexes are updated.
-+ * Tx ring 'first' and 'used' indexes are updated.
- *
- * RETURN:
- * ETH_ERROR in case the routine can not access Tx desc ring.
-- * ETH_RETRY in case there is transmission in process.
-+ * ETH_RETRY in case there is transmission in process.
- * ETH_END_OF_JOB if the routine has nothing to release.
-- * ETH_OK otherwise.
-+ * ETH_OK otherwise.
- *
- */
--static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv64340_private * mp,
-- struct pkt_info * p_pkt_info)
-+static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info)
- {
-- int tx_desc_used, tx_desc_curr;
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-- int tx_first_desc;
-+ int tx_desc_used;
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-+ int tx_busy_desc = mp->tx_first_desc_q;
-+#else
-+ int tx_busy_desc = mp->tx_curr_desc_q;
- #endif
-- volatile struct eth_tx_desc *p_tx_desc_used;
-+ struct eth_tx_desc *p_tx_desc_used;
- unsigned int command_status;
-
- /* Get the Tx Desc ring indexes */
-- tx_desc_curr = mp->tx_curr_desc_q;
- tx_desc_used = mp->tx_used_desc_q;
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-- tx_first_desc = mp->tx_first_desc_q;
--#endif
-+
- p_tx_desc_used = &mp->p_tx_desc_area[tx_desc_used];
-
-- /* XXX Sanity check */
-+ /* Sanity check */
- if (p_tx_desc_used == NULL)
- return ETH_ERROR;
-
-+ /* Stop release. About to overlap the current available Tx descriptor */
-+ if (tx_desc_used == tx_busy_desc && !mp->tx_resource_err)
-+ return ETH_END_OF_JOB;
-+
- command_status = p_tx_desc_used->cmd_sts;
-
- /* Still transmitting... */
--#ifndef MV64340_CHECKSUM_OFFLOAD_TX
- if (command_status & (ETH_BUFFER_OWNED_BY_DMA))
- return ETH_RETRY;
--#endif
-- /* Stop release. About to overlap the current available Tx descriptor */
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-- if (tx_desc_used == tx_first_desc && !mp->tx_resource_err)
-- return ETH_END_OF_JOB;
--#else
-- if (tx_desc_used == tx_desc_curr && !mp->tx_resource_err)
-- return ETH_END_OF_JOB;
--#endif
-
- /* Pass the packet information to the caller */
- p_pkt_info->cmd_sts = command_status;
-@@ -2515,7 +2684,7 @@
- mp->tx_skb[tx_desc_used] = NULL;
-
- /* Update the next descriptor to release. */
-- mp->tx_used_desc_q = (tx_desc_used + 1) % MV64340_TX_QUEUE_SIZE;
-+ mp->tx_used_desc_q = (tx_desc_used + 1) % mp->tx_ring_size;
-
- /* Any Tx return cancels the Tx resource error status */
- mp->tx_resource_err = 0;
-@@ -2527,30 +2696,30 @@
- * 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.
-+ * 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 mv64340_private *mp Ethernet Port Control srtuct.
-- * struct pkt_info *p_pkt_info User packet buffer.
-+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
-+ * struct pkt_info *p_pkt_info User packet buffer.
- *
- * OUTPUT:
-- * Rx ring current and used indexes are updated.
-+ * Rx ring current and used indexes are updated.
- *
- * 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.
-+ * ETH_OK otherwise.
- */
--static ETH_FUNC_RET_STATUS eth_port_receive(struct mv64340_private * mp,
-- struct pkt_info * p_pkt_info)
-+static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info)
- {
- int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
-- volatile struct eth_rx_desc * p_rx_desc;
-+ volatile struct eth_rx_desc *p_rx_desc;
- unsigned int command_status;
-
- /* Do not process Rx ring in case of Rx ring resource error */
-@@ -2565,6 +2734,7 @@
-
- /* 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))
-@@ -2577,18 +2747,17 @@
- p_pkt_info->l4i_chk = p_rx_desc->buf_size;
-
- /* Clean the return info field to indicate that the packet has been */
-- /* moved to the upper layers */
-+ /* moved to the upper layers */
- mp->rx_skb[rx_curr_desc] = NULL;
-
- /* Update current index in data structure */
-- rx_next_curr_desc = (rx_curr_desc + 1) % MV64340_RX_QUEUE_SIZE;
-+ rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
- mp->rx_curr_desc_q = rx_next_curr_desc;
-
- /* Rx descriptors exhausted. Set the Rx ring resource error flag */
- if (rx_next_curr_desc == rx_used_desc)
- mp->rx_resource_err = 1;
-
-- mb();
- return ETH_OK;
- }
-
-@@ -2596,27 +2765,27 @@
- * 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.
-+ * 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 mv64340_private *mp Ethernet Port Control srtuct.
-- * struct pkt_info *p_pkt_info Information on the returned buffer.
-+ * 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.
-+ * ETH_OK otherwise.
- */
--static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv64340_private * mp,
-- struct pkt_info * p_pkt_info)
-+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;
-+ volatile struct eth_rx_desc *p_used_rx_desc;
-
- /* Get 'used' Rx descriptor */
- used_rx_desc = mp->rx_used_desc_q;
-@@ -2627,20 +2796,240 @@
- mp->rx_skb[used_rx_desc] = p_pkt_info->return_info;
-
- /* Flush the write pipe */
-- mb();
-
- /* Return the descriptor to DMA ownership */
-+ wmb();
- p_used_rx_desc->cmd_sts =
-- ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
--
-- /* Flush descriptor and CPU pipe */
-- mb();
-+ 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) % MV64340_RX_QUEUE_SIZE;
-+ 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;
-
- return ETH_OK;
- }
-+
-+/************* Begin ethtool support *************************/
-+
-+struct mv643xx_stats {
-+ char stat_string[ETH_GSTRING_LEN];
-+ int sizeof_stat;
-+ int stat_offset;
-+};
-+
-+#define MV643XX_STAT(m) sizeof(((struct mv643xx_private *)0)->m), \
-+ offsetof(struct mv643xx_private, m)
-+
-+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) },
-+};
-+
-+#define MV643XX_STATS_LEN \
-+ sizeof(mv643xx_gstrings_stats) / sizeof(struct mv643xx_stats)
-+
-+static int
-+mv643xx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
-+{
-+ struct mv643xx_private *mp = netdev->priv;
-+ int port_num = mp->port_num;
-+ int autoneg = eth_port_autoneg_supported(port_num);
-+ int mode_10_bit;
-+ int auto_duplex;
-+ int half_duplex = 0;
-+ int full_duplex = 0;
-+ int auto_speed;
-+ int speed_10 = 0;
-+ int speed_100 = 0;
-+ int speed_1000 = 0;
-+
-+ u32 pcs = mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num));
-+ u32 psr = mv_read(MV643XX_ETH_PORT_STATUS_REG(port_num));
-+
-+ mode_10_bit = psr & MV643XX_ETH_PORT_STATUS_MODE_10_BIT;
-+
-+ if (mode_10_bit) {
-+ ecmd->supported = SUPPORTED_10baseT_Half;
-+ } else {
-+ ecmd->supported = (SUPPORTED_10baseT_Half |
-+ SUPPORTED_10baseT_Full |
-+ SUPPORTED_100baseT_Half |
-+ SUPPORTED_100baseT_Full |
-+ SUPPORTED_1000baseT_Full |
-+ (autoneg ? SUPPORTED_Autoneg : 0) |
-+ SUPPORTED_TP);
-+
-+ auto_duplex = !(pcs & MV643XX_ETH_DISABLE_AUTO_NEG_FOR_DUPLX);
-+ auto_speed = !(pcs & MV643XX_ETH_DISABLE_AUTO_NEG_SPEED_GMII);
-+
-+ ecmd->advertising = ADVERTISED_TP;
-+
-+ if (autoneg) {
-+ ecmd->advertising |= ADVERTISED_Autoneg;
-+
-+ if (auto_duplex) {
-+ half_duplex = 1;
-+ full_duplex = 1;
-+ } else {
-+ if (pcs & MV643XX_ETH_SET_FULL_DUPLEX_MODE)
-+ full_duplex = 1;
-+ else
-+ half_duplex = 1;
-+ }
-+
-+ if (auto_speed) {
-+ speed_10 = 1;
-+ speed_100 = 1;
-+ speed_1000 = 1;
-+ } else {
-+ if (pcs & MV643XX_ETH_SET_GMII_SPEED_TO_1000)
-+ speed_1000 = 1;
-+ else if (pcs & MV643XX_ETH_SET_MII_SPEED_TO_100)
-+ speed_100 = 1;
-+ else
-+ speed_10 = 1;
-+ }
-+
-+ if (speed_10 & half_duplex)
-+ ecmd->advertising |= ADVERTISED_10baseT_Half;
-+ if (speed_10 & full_duplex)
-+ ecmd->advertising |= ADVERTISED_10baseT_Full;
-+ if (speed_100 & half_duplex)
-+ ecmd->advertising |= ADVERTISED_100baseT_Half;
-+ if (speed_100 & full_duplex)
-+ ecmd->advertising |= ADVERTISED_100baseT_Full;
-+ if (speed_1000)
-+ ecmd->advertising |= ADVERTISED_1000baseT_Full;
-+ }
-+ }
-+
-+ ecmd->port = PORT_TP;
-+ ecmd->phy_address = ethernet_phy_get(port_num);
-+
-+ ecmd->transceiver = XCVR_EXTERNAL;
-+
-+ if (netif_carrier_ok(netdev)) {
-+ if (mode_10_bit)
-+ ecmd->speed = SPEED_10;
-+ else {
-+ if (psr & MV643XX_ETH_PORT_STATUS_GMII_1000)
-+ ecmd->speed = SPEED_1000;
-+ else if (psr & MV643XX_ETH_PORT_STATUS_MII_100)
-+ ecmd->speed = SPEED_100;
-+ else
-+ ecmd->speed = SPEED_10;
-+ }
-+
-+ if (psr & MV643XX_ETH_PORT_STATUS_FULL_DUPLEX)
-+ ecmd->duplex = DUPLEX_FULL;
-+ else
-+ ecmd->duplex = DUPLEX_HALF;
-+ } else {
-+ ecmd->speed = -1;
-+ ecmd->duplex = -1;
-+ }
-+
-+ ecmd->autoneg = autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;
-+ 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;
-+}
-+
-+static int
-+mv643xx_get_stats_count(struct net_device *netdev)
-+{
-+ return MV643XX_STATS_LEN;
-+}
-+
-+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;
-+
-+ eth_update_mib_counters(mp);
-+
-+ 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;
-+ }
-+}
-+
-+static void
-+mv643xx_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
-+{
-+ int i;
-+
-+ 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 struct ethtool_ops mv643xx_ethtool_ops = {
-+ .get_settings = mv643xx_get_settings,
-+ .get_drvinfo = mv643xx_get_drvinfo,
-+ .get_link = ethtool_op_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,
-+};
-+
-+/************* End ethtool support *************************/
---- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/drivers/net/mv643xx_eth.h 2005-03-02 08:38:09.000000000 +0100
-+++ drivers/net/mv643xx_eth.h 2005-03-05 21:23:35.000000000 +0100
-@@ -1,5 +1,5 @@
--#ifndef __MV64340_ETH_H__
--#define __MV64340_ETH_H__
-+#ifndef __MV643XX_ETH_H__
-+#define __MV643XX_ETH_H__
-
- #include <linux/version.h>
- #include <linux/module.h>
-@@ -46,17 +46,16 @@
- * The first part is the high level driver of the gigE ethernet ports.
- */
-
--#define ETH_PORT0_IRQ_NUM 48 /* main high register, bit0 */
--#define ETH_PORT1_IRQ_NUM ETH_PORT0_IRQ_NUM+1 /* main high register, bit1 */
--#define ETH_PORT2_IRQ_NUM ETH_PORT0_IRQ_NUM+2 /* main high register, bit1 */
--
--/* Checksum offload for Tx works */
--#define MV64340_CHECKSUM_OFFLOAD_TX
--#define MV64340_NAPI
--#define MV64340_TX_FAST_REFILL
--#undef MV64340_COAL
-+/* Checksum offload for Tx works for most packets, but
-+ * fails if previous packet sent did not use hw csum
-+ */
-+#undef MV643XX_CHECKSUM_OFFLOAD_TX
-+#define MV643XX_NAPI
-+#define MV643XX_TX_FAST_REFILL
-+#undef MV643XX_RX_QUEUE_FILL_ON_TASK /* Does not work, yet */
-+#undef MV643XX_COAL
-
--/*
-+/*
- * Number of RX / TX descriptors on RX / TX rings.
- * Note that allocating RX descriptors is done by allocating the RX
- * ring AND a preallocated RX buffers (skb's) for each descriptor.
-@@ -65,89 +64,35 @@
- */
-
- /* Default TX ring size is 1000 descriptors */
--#define MV64340_TX_QUEUE_SIZE 1000
-+#define MV643XX_DEFAULT_TX_QUEUE_SIZE 1000
-
- /* Default RX ring size is 400 descriptors */
--#define MV64340_RX_QUEUE_SIZE 400
-+#define MV643XX_DEFAULT_RX_QUEUE_SIZE 400
-
--#define MV64340_TX_COAL 100
--#ifdef MV64340_COAL
--#define MV64340_RX_COAL 100
-+#define MV643XX_TX_COAL 100
-+#ifdef MV643XX_COAL
-+#define MV643XX_RX_COAL 100
- #endif
-
--
- /*
-- * The second part is the low level driver of the gigE ethernet ports. *
-+ * The second part is the low level driver of the gigE ethernet ports.
- */
-
--
- /*
-- * Header File for : MV-643xx network interface header
-+ * Header File for : MV-643xx network interface header
- *
- * DESCRIPTION:
-- * This header file contains macros typedefs and function declaration for
-- * the Marvell Gig Bit Ethernet Controller.
-+ * This header file contains macros typedefs and function declaration for
-+ * the Marvell Gig Bit Ethernet Controller.
- *
- * DEPENDENCIES:
-- * None.
-+ * None.
- *
- */
-
--/* Default port configuration value */
--#define PORT_CONFIG_VALUE \
-- ETH_UNICAST_NORMAL_MODE | \
-- ETH_DEFAULT_RX_QUEUE_0 | \
-- ETH_DEFAULT_RX_ARP_QUEUE_0 | \
-- ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP | \
-- ETH_RECEIVE_BC_IF_IP | \
-- ETH_RECEIVE_BC_IF_ARP | \
-- ETH_CAPTURE_TCP_FRAMES_DIS | \
-- ETH_CAPTURE_UDP_FRAMES_DIS | \
-- ETH_DEFAULT_RX_TCP_QUEUE_0 | \
-- ETH_DEFAULT_RX_UDP_QUEUE_0 | \
-- ETH_DEFAULT_RX_BPDU_QUEUE_0
--
--/* Default port extend configuration value */
--#define PORT_CONFIG_EXTEND_VALUE \
-- ETH_SPAN_BPDU_PACKETS_AS_NORMAL | \
-- ETH_PARTITION_DISABLE
--
--
--/* Default sdma control value */
--#define PORT_SDMA_CONFIG_VALUE \
-- ETH_RX_BURST_SIZE_16_64BIT | \
-- GT_ETH_IPG_INT_RX(0) | \
-- ETH_TX_BURST_SIZE_16_64BIT;
--
--#define GT_ETH_IPG_INT_RX(value) \
-- ((value & 0x3fff) << 8)
--
--/* Default port serial control value */
--#define PORT_SERIAL_CONTROL_VALUE \
-- ETH_FORCE_LINK_PASS | \
-- ETH_ENABLE_AUTO_NEG_FOR_DUPLX | \
-- ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL | \
-- ETH_ADV_SYMMETRIC_FLOW_CTRL | \
-- ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX | \
-- ETH_FORCE_BP_MODE_NO_JAM | \
-- BIT9 | \
-- ETH_DO_NOT_FORCE_LINK_FAIL | \
-- ETH_RETRANSMIT_16_ATTEMPTS | \
-- ETH_ENABLE_AUTO_NEG_SPEED_GMII | \
-- ETH_DTE_ADV_0 | \
-- ETH_DISABLE_AUTO_NEG_BYPASS | \
-- ETH_AUTO_NEG_NO_CHANGE | \
-- ETH_MAX_RX_PACKET_9700BYTE | \
-- ETH_CLR_EXT_LOOPBACK | \
-- ETH_SET_FULL_DUPLEX_MODE | \
-- ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX
--
--#define RX_BUFFER_MAX_SIZE 0x4000000
--#define TX_BUFFER_MAX_SIZE 0x4000000
--
- /* MAC accepet/reject macros */
--#define ACCEPT_MAC_ADDR 0
--#define REJECT_MAC_ADDR 1
-+#define ACCEPT_MAC_ADDR 0
-+#define REJECT_MAC_ADDR 1
-
- /* Buffer offset from buffer pointer */
- #define RX_BUF_OFFSET 0x2
-@@ -155,277 +100,132 @@
- /* Gigabit Ethernet Unit Global Registers */
-
- /* MIB Counters register definitions */
--#define ETH_MIB_GOOD_OCTETS_RECEIVED_LOW 0x0
--#define ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH 0x4
--#define ETH_MIB_BAD_OCTETS_RECEIVED 0x8
--#define ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR 0xc
--#define ETH_MIB_GOOD_FRAMES_RECEIVED 0x10
--#define ETH_MIB_BAD_FRAMES_RECEIVED 0x14
--#define ETH_MIB_BROADCAST_FRAMES_RECEIVED 0x18
--#define ETH_MIB_MULTICAST_FRAMES_RECEIVED 0x1c
--#define ETH_MIB_FRAMES_64_OCTETS 0x20
--#define ETH_MIB_FRAMES_65_TO_127_OCTETS 0x24
--#define ETH_MIB_FRAMES_128_TO_255_OCTETS 0x28
--#define ETH_MIB_FRAMES_256_TO_511_OCTETS 0x2c
--#define ETH_MIB_FRAMES_512_TO_1023_OCTETS 0x30
--#define ETH_MIB_FRAMES_1024_TO_MAX_OCTETS 0x34
--#define ETH_MIB_GOOD_OCTETS_SENT_LOW 0x38
--#define ETH_MIB_GOOD_OCTETS_SENT_HIGH 0x3c
--#define ETH_MIB_GOOD_FRAMES_SENT 0x40
--#define ETH_MIB_EXCESSIVE_COLLISION 0x44
--#define ETH_MIB_MULTICAST_FRAMES_SENT 0x48
--#define ETH_MIB_BROADCAST_FRAMES_SENT 0x4c
--#define ETH_MIB_UNREC_MAC_CONTROL_RECEIVED 0x50
--#define ETH_MIB_FC_SENT 0x54
--#define ETH_MIB_GOOD_FC_RECEIVED 0x58
--#define ETH_MIB_BAD_FC_RECEIVED 0x5c
--#define ETH_MIB_UNDERSIZE_RECEIVED 0x60
--#define ETH_MIB_FRAGMENTS_RECEIVED 0x64
--#define ETH_MIB_OVERSIZE_RECEIVED 0x68
--#define ETH_MIB_JABBER_RECEIVED 0x6c
--#define ETH_MIB_MAC_RECEIVE_ERROR 0x70
--#define ETH_MIB_BAD_CRC_EVENT 0x74
--#define ETH_MIB_COLLISION 0x78
--#define ETH_MIB_LATE_COLLISION 0x7c
-+#define ETH_MIB_GOOD_OCTETS_RECEIVED_LOW 0x0
-+#define ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH 0x4
-+#define ETH_MIB_BAD_OCTETS_RECEIVED 0x8
-+#define ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR 0xc
-+#define ETH_MIB_GOOD_FRAMES_RECEIVED 0x10
-+#define ETH_MIB_BAD_FRAMES_RECEIVED 0x14
-+#define ETH_MIB_BROADCAST_FRAMES_RECEIVED 0x18
-+#define ETH_MIB_MULTICAST_FRAMES_RECEIVED 0x1c
-+#define ETH_MIB_FRAMES_64_OCTETS 0x20
-+#define ETH_MIB_FRAMES_65_TO_127_OCTETS 0x24
-+#define ETH_MIB_FRAMES_128_TO_255_OCTETS 0x28
-+#define ETH_MIB_FRAMES_256_TO_511_OCTETS 0x2c
-+#define ETH_MIB_FRAMES_512_TO_1023_OCTETS 0x30
-+#define ETH_MIB_FRAMES_1024_TO_MAX_OCTETS 0x34
-+#define ETH_MIB_GOOD_OCTETS_SENT_LOW 0x38
-+#define ETH_MIB_GOOD_OCTETS_SENT_HIGH 0x3c
-+#define ETH_MIB_GOOD_FRAMES_SENT 0x40
-+#define ETH_MIB_EXCESSIVE_COLLISION 0x44
-+#define ETH_MIB_MULTICAST_FRAMES_SENT 0x48
-+#define ETH_MIB_BROADCAST_FRAMES_SENT 0x4c
-+#define ETH_MIB_UNREC_MAC_CONTROL_RECEIVED 0x50
-+#define ETH_MIB_FC_SENT 0x54
-+#define ETH_MIB_GOOD_FC_RECEIVED 0x58
-+#define ETH_MIB_BAD_FC_RECEIVED 0x5c
-+#define ETH_MIB_UNDERSIZE_RECEIVED 0x60
-+#define ETH_MIB_FRAGMENTS_RECEIVED 0x64
-+#define ETH_MIB_OVERSIZE_RECEIVED 0x68
-+#define ETH_MIB_JABBER_RECEIVED 0x6c
-+#define ETH_MIB_MAC_RECEIVE_ERROR 0x70
-+#define ETH_MIB_BAD_CRC_EVENT 0x74
-+#define ETH_MIB_COLLISION 0x78
-+#define ETH_MIB_LATE_COLLISION 0x7c
-
- /* Port serial status reg (PSR) */
--#define ETH_INTERFACE_GMII_MII 0
--#define ETH_INTERFACE_PCM BIT0
--#define ETH_LINK_IS_DOWN 0
--#define ETH_LINK_IS_UP BIT1
--#define ETH_PORT_AT_HALF_DUPLEX 0
--#define ETH_PORT_AT_FULL_DUPLEX BIT2
--#define ETH_RX_FLOW_CTRL_DISABLED 0
--#define ETH_RX_FLOW_CTRL_ENBALED BIT3
--#define ETH_GMII_SPEED_100_10 0
--#define ETH_GMII_SPEED_1000 BIT4
--#define ETH_MII_SPEED_10 0
--#define ETH_MII_SPEED_100 BIT5
--#define ETH_NO_TX 0
--#define ETH_TX_IN_PROGRESS BIT7
--#define ETH_BYPASS_NO_ACTIVE 0
--#define ETH_BYPASS_ACTIVE BIT8
--#define ETH_PORT_NOT_AT_PARTITION_STATE 0
--#define ETH_PORT_AT_PARTITION_STATE BIT9
--#define ETH_PORT_TX_FIFO_NOT_EMPTY 0
--#define ETH_PORT_TX_FIFO_EMPTY BIT10
--
--
--/* These macros describes the Port configuration reg (Px_cR) bits */
--#define ETH_UNICAST_NORMAL_MODE 0
--#define ETH_UNICAST_PROMISCUOUS_MODE BIT0
--#define ETH_DEFAULT_RX_QUEUE_0 0
--#define ETH_DEFAULT_RX_QUEUE_1 BIT1
--#define ETH_DEFAULT_RX_QUEUE_2 BIT2
--#define ETH_DEFAULT_RX_QUEUE_3 (BIT2 | BIT1)
--#define ETH_DEFAULT_RX_QUEUE_4 BIT3
--#define ETH_DEFAULT_RX_QUEUE_5 (BIT3 | BIT1)
--#define ETH_DEFAULT_RX_QUEUE_6 (BIT3 | BIT2)
--#define ETH_DEFAULT_RX_QUEUE_7 (BIT3 | BIT2 | BIT1)
--#define ETH_DEFAULT_RX_ARP_QUEUE_0 0
--#define ETH_DEFAULT_RX_ARP_QUEUE_1 BIT4
--#define ETH_DEFAULT_RX_ARP_QUEUE_2 BIT5
--#define ETH_DEFAULT_RX_ARP_QUEUE_3 (BIT5 | BIT4)
--#define ETH_DEFAULT_RX_ARP_QUEUE_4 BIT6
--#define ETH_DEFAULT_RX_ARP_QUEUE_5 (BIT6 | BIT4)
--#define ETH_DEFAULT_RX_ARP_QUEUE_6 (BIT6 | BIT5)
--#define ETH_DEFAULT_RX_ARP_QUEUE_7 (BIT6 | BIT5 | BIT4)
--#define ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP 0
--#define ETH_REJECT_BC_IF_NOT_IP_OR_ARP BIT7
--#define ETH_RECEIVE_BC_IF_IP 0
--#define ETH_REJECT_BC_IF_IP BIT8
--#define ETH_RECEIVE_BC_IF_ARP 0
--#define ETH_REJECT_BC_IF_ARP BIT9
--#define ETH_TX_AM_NO_UPDATE_ERROR_SUMMARY BIT12
--#define ETH_CAPTURE_TCP_FRAMES_DIS 0
--#define ETH_CAPTURE_TCP_FRAMES_EN BIT14
--#define ETH_CAPTURE_UDP_FRAMES_DIS 0
--#define ETH_CAPTURE_UDP_FRAMES_EN BIT15
--#define ETH_DEFAULT_RX_TCP_QUEUE_0 0
--#define ETH_DEFAULT_RX_TCP_QUEUE_1 BIT16
--#define ETH_DEFAULT_RX_TCP_QUEUE_2 BIT17
--#define ETH_DEFAULT_RX_TCP_QUEUE_3 (BIT17 | BIT16)
--#define ETH_DEFAULT_RX_TCP_QUEUE_4 BIT18
--#define ETH_DEFAULT_RX_TCP_QUEUE_5 (BIT18 | BIT16)
--#define ETH_DEFAULT_RX_TCP_QUEUE_6 (BIT18 | BIT17)
--#define ETH_DEFAULT_RX_TCP_QUEUE_7 (BIT18 | BIT17 | BIT16)
--#define ETH_DEFAULT_RX_UDP_QUEUE_0 0
--#define ETH_DEFAULT_RX_UDP_QUEUE_1 BIT19
--#define ETH_DEFAULT_RX_UDP_QUEUE_2 BIT20
--#define ETH_DEFAULT_RX_UDP_QUEUE_3 (BIT20 | BIT19)
--#define ETH_DEFAULT_RX_UDP_QUEUE_4 (BIT21
--#define ETH_DEFAULT_RX_UDP_QUEUE_5 (BIT21 | BIT19)
--#define ETH_DEFAULT_RX_UDP_QUEUE_6 (BIT21 | BIT20)
--#define ETH_DEFAULT_RX_UDP_QUEUE_7 (BIT21 | BIT20 | BIT19)
--#define ETH_DEFAULT_RX_BPDU_QUEUE_0 0
--#define ETH_DEFAULT_RX_BPDU_QUEUE_1 BIT22
--#define ETH_DEFAULT_RX_BPDU_QUEUE_2 BIT23
--#define ETH_DEFAULT_RX_BPDU_QUEUE_3 (BIT23 | BIT22)
--#define ETH_DEFAULT_RX_BPDU_QUEUE_4 BIT24
--#define ETH_DEFAULT_RX_BPDU_QUEUE_5 (BIT24 | BIT22)
--#define ETH_DEFAULT_RX_BPDU_QUEUE_6 (BIT24 | BIT23)
--#define ETH_DEFAULT_RX_BPDU_QUEUE_7 (BIT24 | BIT23 | BIT22)
--
--
--/* These macros describes the Port configuration extend reg (Px_cXR) bits*/
--#define ETH_CLASSIFY_EN BIT0
--#define ETH_SPAN_BPDU_PACKETS_AS_NORMAL 0
--#define ETH_SPAN_BPDU_PACKETS_TO_RX_QUEUE_7 BIT1
--#define ETH_PARTITION_DISABLE 0
--#define ETH_PARTITION_ENABLE BIT2
--
--
--/* Tx/Rx queue command reg (RQCR/TQCR)*/
--#define ETH_QUEUE_0_ENABLE BIT0
--#define ETH_QUEUE_1_ENABLE BIT1
--#define ETH_QUEUE_2_ENABLE BIT2
--#define ETH_QUEUE_3_ENABLE BIT3
--#define ETH_QUEUE_4_ENABLE BIT4
--#define ETH_QUEUE_5_ENABLE BIT5
--#define ETH_QUEUE_6_ENABLE BIT6
--#define ETH_QUEUE_7_ENABLE BIT7
--#define ETH_QUEUE_0_DISABLE BIT8
--#define ETH_QUEUE_1_DISABLE BIT9
--#define ETH_QUEUE_2_DISABLE BIT10
--#define ETH_QUEUE_3_DISABLE BIT11
--#define ETH_QUEUE_4_DISABLE BIT12
--#define ETH_QUEUE_5_DISABLE BIT13
--#define ETH_QUEUE_6_DISABLE BIT14
--#define ETH_QUEUE_7_DISABLE BIT15
--
--
--/* These macros describes the Port Sdma configuration reg (SDCR) bits */
--#define ETH_RIFB BIT0
--#define ETH_RX_BURST_SIZE_1_64BIT 0
--#define ETH_RX_BURST_SIZE_2_64BIT BIT1
--#define ETH_RX_BURST_SIZE_4_64BIT BIT2
--#define ETH_RX_BURST_SIZE_8_64BIT (BIT2 | BIT1)
--#define ETH_RX_BURST_SIZE_16_64BIT BIT3
--#define ETH_BLM_RX_NO_SWAP BIT4
--#define ETH_BLM_RX_BYTE_SWAP 0
--#define ETH_BLM_TX_NO_SWAP BIT5
--#define ETH_BLM_TX_BYTE_SWAP 0
--#define ETH_DESCRIPTORS_BYTE_SWAP BIT6
--#define ETH_DESCRIPTORS_NO_SWAP 0
--#define ETH_TX_BURST_SIZE_1_64BIT 0
--#define ETH_TX_BURST_SIZE_2_64BIT BIT22
--#define ETH_TX_BURST_SIZE_4_64BIT BIT23
--#define ETH_TX_BURST_SIZE_8_64BIT (BIT23 | BIT22)
--#define ETH_TX_BURST_SIZE_16_64BIT BIT24
--
--
--
--/* These macros describes the Port serial control reg (PSCR) bits */
--#define ETH_SERIAL_PORT_DISABLE 0
--#define ETH_SERIAL_PORT_ENABLE BIT0
--#define ETH_FORCE_LINK_PASS BIT1
--#define ETH_DO_NOT_FORCE_LINK_PASS 0
--#define ETH_ENABLE_AUTO_NEG_FOR_DUPLX 0
--#define ETH_DISABLE_AUTO_NEG_FOR_DUPLX BIT2
--#define ETH_ENABLE_AUTO_NEG_FOR_FLOW_CTRL 0
--#define ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL BIT3
--#define ETH_ADV_NO_FLOW_CTRL 0
--#define ETH_ADV_SYMMETRIC_FLOW_CTRL BIT4
--#define ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX 0
--#define ETH_FORCE_FC_MODE_TX_PAUSE_DIS BIT5
--#define ETH_FORCE_BP_MODE_NO_JAM 0
--#define ETH_FORCE_BP_MODE_JAM_TX BIT7
--#define ETH_FORCE_BP_MODE_JAM_TX_ON_RX_ERR BIT8
--#define ETH_FORCE_LINK_FAIL 0
--#define ETH_DO_NOT_FORCE_LINK_FAIL BIT10
--#define ETH_RETRANSMIT_16_ATTEMPTS 0
--#define ETH_RETRANSMIT_FOREVER BIT11
--#define ETH_DISABLE_AUTO_NEG_SPEED_GMII BIT13
--#define ETH_ENABLE_AUTO_NEG_SPEED_GMII 0
--#define ETH_DTE_ADV_0 0
--#define ETH_DTE_ADV_1 BIT14
--#define ETH_DISABLE_AUTO_NEG_BYPASS 0
--#define ETH_ENABLE_AUTO_NEG_BYPASS BIT15
--#define ETH_AUTO_NEG_NO_CHANGE 0
--#define ETH_RESTART_AUTO_NEG BIT16
--#define ETH_MAX_RX_PACKET_1518BYTE 0
--#define ETH_MAX_RX_PACKET_1522BYTE BIT17
--#define ETH_MAX_RX_PACKET_1552BYTE BIT18
--#define ETH_MAX_RX_PACKET_9022BYTE (BIT18 | BIT17)
--#define ETH_MAX_RX_PACKET_9192BYTE BIT19
--#define ETH_MAX_RX_PACKET_9700BYTE (BIT19 | BIT17)
--#define ETH_SET_EXT_LOOPBACK BIT20
--#define ETH_CLR_EXT_LOOPBACK 0
--#define ETH_SET_FULL_DUPLEX_MODE BIT21
--#define ETH_SET_HALF_DUPLEX_MODE 0
--#define ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX BIT22
--#define ETH_DISABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX 0
--#define ETH_SET_GMII_SPEED_TO_10_100 0
--#define ETH_SET_GMII_SPEED_TO_1000 BIT23
--#define ETH_SET_MII_SPEED_TO_10 0
--#define ETH_SET_MII_SPEED_TO_100 BIT24
--
-+#define ETH_INTERFACE_GMII_MII 0
-+#define ETH_INTERFACE_PCM BIT0
-+#define ETH_LINK_IS_DOWN 0
-+#define ETH_LINK_IS_UP BIT1
-+#define ETH_PORT_AT_HALF_DUPLEX 0
-+#define ETH_PORT_AT_FULL_DUPLEX BIT2
-+#define ETH_RX_FLOW_CTRL_DISABLED 0
-+#define ETH_RX_FLOW_CTRL_ENBALED BIT3
-+#define ETH_GMII_SPEED_100_10 0
-+#define ETH_GMII_SPEED_1000 BIT4
-+#define ETH_MII_SPEED_10 0
-+#define ETH_MII_SPEED_100 BIT5
-+#define ETH_NO_TX 0
-+#define ETH_TX_IN_PROGRESS BIT7
-+#define ETH_BYPASS_NO_ACTIVE 0
-+#define ETH_BYPASS_ACTIVE BIT8
-+#define ETH_PORT_NOT_AT_PARTITION_STATE 0
-+#define ETH_PORT_AT_PARTITION_STATE BIT9
-+#define ETH_PORT_TX_FIFO_NOT_EMPTY 0
-+#define ETH_PORT_TX_FIFO_EMPTY BIT10
-+
-+#define ETH_DEFAULT_RX_BPDU_QUEUE_3 (BIT23 | BIT22)
-+#define ETH_DEFAULT_RX_BPDU_QUEUE_4 BIT24
-+#define ETH_DEFAULT_RX_BPDU_QUEUE_5 (BIT24 | BIT22)
-+#define ETH_DEFAULT_RX_BPDU_QUEUE_6 (BIT24 | BIT23)
-+#define ETH_DEFAULT_RX_BPDU_QUEUE_7 (BIT24 | BIT23 | BIT22)
-
- /* SMI reg */
--#define ETH_SMI_BUSY BIT28 /* 0 - Write, 1 - Read */
--#define ETH_SMI_READ_VALID BIT27 /* 0 - Write, 1 - Read */
-+#define ETH_SMI_BUSY BIT28 /* 0 - Write, 1 - Read */
-+#define ETH_SMI_READ_VALID BIT27 /* 0 - Write, 1 - Read */
- #define ETH_SMI_OPCODE_WRITE 0 /* Completion of Read operation */
--#define ETH_SMI_OPCODE_READ BIT26 /* Operation is in progress */
-+#define ETH_SMI_OPCODE_READ BIT26 /* Operation is in progress */
-
- /* SDMA command status fields macros */
-
- /* Tx & Rx descriptors status */
--#define ETH_ERROR_SUMMARY (BIT0)
-+#define ETH_ERROR_SUMMARY (BIT0)
-
- /* Tx & Rx descriptors command */
--#define ETH_BUFFER_OWNED_BY_DMA (BIT31)
-+#define ETH_BUFFER_OWNED_BY_DMA (BIT31)
-
- /* Tx descriptors status */
--#define ETH_LC_ERROR (0 )
--#define ETH_UR_ERROR (BIT1 )
--#define ETH_RL_ERROR (BIT2 )
--#define ETH_LLC_SNAP_FORMAT (BIT9 )
-+#define ETH_LC_ERROR (0 )
-+#define ETH_UR_ERROR (BIT1 )
-+#define ETH_RL_ERROR (BIT2 )
-+#define ETH_LLC_SNAP_FORMAT (BIT9 )
-
- /* Rx descriptors status */
--#define ETH_CRC_ERROR (0 )
--#define ETH_OVERRUN_ERROR (BIT1 )
--#define ETH_MAX_FRAME_LENGTH_ERROR (BIT2 )
--#define ETH_RESOURCE_ERROR ((BIT2 | BIT1))
--#define ETH_VLAN_TAGGED (BIT19)
--#define ETH_BPDU_FRAME (BIT20)
--#define ETH_TCP_FRAME_OVER_IP_V_4 (0 )
--#define ETH_UDP_FRAME_OVER_IP_V_4 (BIT21)
--#define ETH_OTHER_FRAME_TYPE (BIT22)
--#define ETH_LAYER_2_IS_ETH_V_2 (BIT23)
--#define ETH_FRAME_TYPE_IP_V_4 (BIT24)
--#define ETH_FRAME_HEADER_OK (BIT25)
--#define ETH_RX_LAST_DESC (BIT26)
--#define ETH_RX_FIRST_DESC (BIT27)
--#define ETH_UNKNOWN_DESTINATION_ADDR (BIT28)
--#define ETH_RX_ENABLE_INTERRUPT (BIT29)
--#define ETH_LAYER_4_CHECKSUM_OK (BIT30)
-+#define ETH_CRC_ERROR (0 )
-+#define ETH_OVERRUN_ERROR (BIT1 )
-+#define ETH_MAX_FRAME_LENGTH_ERROR (BIT2 )
-+#define ETH_RESOURCE_ERROR ((BIT2 | BIT1))
-+#define ETH_VLAN_TAGGED (BIT19)
-+#define ETH_BPDU_FRAME (BIT20)
-+#define ETH_TCP_FRAME_OVER_IP_V_4 (0 )
-+#define ETH_UDP_FRAME_OVER_IP_V_4 (BIT21)
-+#define ETH_OTHER_FRAME_TYPE (BIT22)
-+#define ETH_LAYER_2_IS_ETH_V_2 (BIT23)
-+#define ETH_FRAME_TYPE_IP_V_4 (BIT24)
-+#define ETH_FRAME_HEADER_OK (BIT25)
-+#define ETH_RX_LAST_DESC (BIT26)
-+#define ETH_RX_FIRST_DESC (BIT27)
-+#define ETH_UNKNOWN_DESTINATION_ADDR (BIT28)
-+#define ETH_RX_ENABLE_INTERRUPT (BIT29)
-+#define ETH_LAYER_4_CHECKSUM_OK (BIT30)
-
- /* Rx descriptors byte count */
--#define ETH_FRAME_FRAGMENTED (BIT2)
-+#define ETH_FRAME_FRAGMENTED (BIT2)
-
- /* Tx descriptors command */
- #define ETH_LAYER_4_CHECKSUM_FIRST_DESC (BIT10)
--#define ETH_FRAME_SET_TO_VLAN (BIT15)
--#define ETH_TCP_FRAME (0 )
--#define ETH_UDP_FRAME (BIT16)
--#define ETH_GEN_TCP_UDP_CHECKSUM (BIT17)
--#define ETH_GEN_IP_V_4_CHECKSUM (BIT18)
--#define ETH_ZERO_PADDING (BIT19)
--#define ETH_TX_LAST_DESC (BIT20)
--#define ETH_TX_FIRST_DESC (BIT21)
--#define ETH_GEN_CRC (BIT22)
--#define ETH_TX_ENABLE_INTERRUPT (BIT23)
--#define ETH_AUTO_MODE (BIT30)
-+#define ETH_FRAME_SET_TO_VLAN (BIT15)
-+#define ETH_TCP_FRAME (0 )
-+#define ETH_UDP_FRAME (BIT16)
-+#define ETH_GEN_TCP_UDP_CHECKSUM (BIT17)
-+#define ETH_GEN_IP_V_4_CHECKSUM (BIT18)
-+#define ETH_ZERO_PADDING (BIT19)
-+#define ETH_TX_LAST_DESC (BIT20)
-+#define ETH_TX_FIRST_DESC (BIT21)
-+#define ETH_GEN_CRC (BIT22)
-+#define ETH_TX_ENABLE_INTERRUPT (BIT23)
-+#define ETH_AUTO_MODE (BIT30)
-
- /* 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_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;
-
- typedef enum _eth_target {
-@@ -441,66 +241,103 @@
- */
- #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 */
-+ 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 */
-+ 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 */
-+ 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 */
-+ 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. */
-+/* 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 */
-+ 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 */
- };
-
--
- /* Ethernet port specific infomation */
-
--struct mv64340_private {
-- int port_num; /* User Ethernet port number */
-- u8 port_mac_addr[6]; /* User defined port MAC address. */
-- u32 port_config; /* User port configuration value */
-- u32 port_config_extend; /* User port config extend value */
-- u32 port_sdma_config; /* User port SDMA config value */
-- u32 port_serial_control; /* User port serial control value */
-- u32 port_tx_queue_command; /* Port active Tx queues summary */
-- u32 port_rx_queue_command; /* Port active Rx queues summary */
-+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 {
-+ int port_num; /* User Ethernet port number */
-+ u8 port_mac_addr[6]; /* User defined port MAC address.*/
-+ u32 port_config; /* User port configuration value*/
-+ u32 port_config_extend; /* User port config extend value*/
-+ u32 port_sdma_config; /* User port SDMA config value */
-+ u32 port_serial_control; /* User port serial control value */
-+ u32 port_tx_queue_command; /* Port active Tx queues summary*/
-+ u32 port_rx_queue_command; /* Port active Rx queues summary*/
-+
-+ 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 */
-- int tx_resource_err; /* Tx ring resource error flag */
-+ int rx_resource_err; /* Rx ring resource error flag */
-+ int tx_resource_err; /* Tx ring resource error flag */
-
- /* Tx/Rx rings managment indexes fields. For driver use */
-
-@@ -509,30 +346,32 @@
-
- /* Next available and first returning Tx resource */
- int tx_curr_desc_q, tx_used_desc_q;
--#ifdef MV64340_CHECKSUM_OFFLOAD_TX
-- int tx_first_desc_q;
-+#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-+ int tx_first_desc_q;
-+ u32 tx_first_command;
- #endif
-
--#ifdef MV64340_TX_FAST_REFILL
-- u32 tx_clean_threshold;
-+#ifdef MV643XX_TX_FAST_REFILL
-+ u32 tx_clean_threshold;
- #endif
-
-- volatile struct eth_rx_desc * p_rx_desc_area;
-- dma_addr_t rx_desc_dma;
-- unsigned int rx_desc_area_size;
-- struct sk_buff * rx_skb[MV64340_RX_QUEUE_SIZE];
--
-- volatile struct eth_tx_desc * p_tx_desc_area;
-- dma_addr_t tx_desc_dma;
-- unsigned int tx_desc_area_size;
-- struct sk_buff * tx_skb[MV64340_TX_QUEUE_SIZE];
-+ struct eth_rx_desc *p_rx_desc_area;
-+ dma_addr_t rx_desc_dma;
-+ unsigned int rx_desc_area_size;
-+ struct sk_buff **rx_skb;
-+
-+ struct eth_tx_desc *p_tx_desc_area;
-+ dma_addr_t tx_desc_dma;
-+ unsigned int tx_desc_area_size;
-+ struct sk_buff **tx_skb;
-
-- struct work_struct tx_timeout_task;
-+ struct work_struct tx_timeout_task;
-
- /*
-- * Former struct mv64340_eth_priv members start here
-+ * Former struct mv643xx_eth_priv members start here
- */
- struct net_device_stats stats;
-+ struct mv643xx_mib_counters mib_counters;
- spinlock_t lock;
- /* Size of Tx Ring per queue */
- unsigned int tx_ring_size;
-@@ -544,13 +383,13 @@
- unsigned int rx_ring_skbs;
-
- /*
-- * rx_task used to fill RX ring out of bottom half context
-+ * rx_task used to fill RX ring out of bottom half context
- */
- struct work_struct rx_task;
-
-- /*
-- * Used in case RX Ring is empty, which can be caused when
-- * system does not have resources (skb's)
-+ /*
-+ * Used in case RX Ring is empty, which can be caused when
-+ * system does not have resources (skb's)
- */
- struct timer_list timeout;
- long rx_task_busy __attribute__ ((aligned(SMP_CACHE_BYTES)));
-@@ -563,9 +402,9 @@
- /* ethernet.h API list */
-
- /* Port operation control routines */
--static void eth_port_init(struct mv64340_private *mp);
-+static void eth_port_init(struct mv643xx_private *mp);
- static void eth_port_reset(unsigned int eth_port_num);
--static int eth_port_start(struct mv64340_private *mp);
-+static void eth_port_start(struct mv643xx_private *mp);
-
- static void ethernet_set_config_reg(unsigned int eth_port_num,
- unsigned int value);
-@@ -576,26 +415,24 @@
- unsigned char *p_addr);
-
- /* PHY and MIB routines */
--static int ethernet_phy_reset(unsigned int eth_port_num);
-+static void ethernet_phy_reset(unsigned int eth_port_num);
-+
-+static void eth_port_write_smi_reg(unsigned int eth_port_num,
-+ unsigned int phy_reg, unsigned int value);
-
--static int eth_port_write_smi_reg(unsigned int eth_port_num,
-- unsigned int phy_reg,
-- unsigned int value);
--
--static int eth_port_read_smi_reg(unsigned int eth_port_num,
-- unsigned int phy_reg,
-- unsigned int *value);
-+static void eth_port_read_smi_reg(unsigned int eth_port_num,
-+ unsigned int phy_reg, unsigned int *value);
-
- static void eth_clear_mib_counters(unsigned int eth_port_num);
-
- /* Port data flow control routines */
--static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private *mp,
-- struct pkt_info * p_pkt_info);
--static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv64340_private *mp,
-- struct pkt_info * p_pkt_info);
--static ETH_FUNC_RET_STATUS eth_port_receive(struct mv64340_private *mp,
-- struct pkt_info * p_pkt_info);
--static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv64340_private *mp,
-- struct pkt_info * p_pkt_info);
-+static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info);
-+static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info);
-+static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info);
-+static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
-+ struct pkt_info *p_pkt_info);
-
--#endif /* __MV64340_ETH_H__ */
-+#endif /* __MV643XX_ETH_H__ */
---- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/drivers/net/Kconfig 2005-03-02 08:38:25.000000000 +0100
-+++ drivers/net/Kconfig 2005-03-05 20:57:01.000000000 +0100
-@@ -2094,10 +2094,11 @@
-
- config MV643XX_ETH
- tristate "MV-643XX Ethernet support"
-- depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX
-+ depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || PPC_CHRP
- help
- This driver supports the gigabit Ethernet on the Marvell MV643XX
-- chipset which is used in the Momenco Ocelot C and Jaguar ATX.
-+ chipset which is used in the Momenco Ocelot C and Jaguar ATX and
-+ Pegasos II, amongst other PPC and MIPS boards.
-
- config MV643XX_ETH_0
- bool "MV-643XX Port 0"
Copied: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-pegasos-marvell.dpatch (from rev 2631, trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos.dpatch)
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/marvell-pegasos.dpatch 2005-03-07 05:30:22 UTC (rev 2631)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-pegasos-marvell.dpatch 2005-03-07 13:57:28 UTC (rev 2632)
@@ -0,0 +1,5296 @@
+#! /bin/sh -e
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Add MV64xxx_eth powerpc support
+## DP: Patch authors: Dale Farnsworth <dale at farnsworth.org>, Nicolas DET <nd at bplan-gmbh.de>
+## DP: Upstream status: being submitted in the next few days.
+## DP: BK URL: bk://dfarnsworth.bkbits.net/linux-2.5-mv643xx-enet
+
+. $(dirname $0)/DPATCH
+
+ at DPATCH@
+--- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/include/linux/mv643xx.h 2005-03-05 19:42:47.000000000 +0100
++++ include/linux/mv643xx.h 2005-03-05 21:23:35.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * mv64340.h - MV-64340 Internal registers definition file.
++ * mv643xx.h - MV-643XX Internal registers definition file.
+ *
+ * Copyright 2002 Momentum Computer, Inc.
+ * Author: Matthew Dharm <mdharm at momenco.com>
+@@ -10,8 +10,8 @@
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+-#ifndef __ASM_MV64340_H
+-#define __ASM_MV64340_H
++#ifndef __ASM_MV643XX_H
++#define __ASM_MV643XX_H
+
+ #ifdef __MIPS__
+ #include <asm/addrspace.h>
+@@ -662,116 +662,119 @@
+ /* Ethernet Unit Registers */
+ /****************************************/
+
+-#define MV64340_ETH_PHY_ADDR_REG 0x2000
+-#define MV64340_ETH_SMI_REG 0x2004
+-#define MV64340_ETH_UNIT_DEFAULT_ADDR_REG 0x2008
+-#define MV64340_ETH_UNIT_DEFAULTID_REG 0x200c
+-#define MV64340_ETH_UNIT_INTERRUPT_CAUSE_REG 0x2080
+-#define MV64340_ETH_UNIT_INTERRUPT_MASK_REG 0x2084
+-#define MV64340_ETH_UNIT_INTERNAL_USE_REG 0x24fc
+-#define MV64340_ETH_UNIT_ERROR_ADDR_REG 0x2094
+-#define MV64340_ETH_BAR_0 0x2200
+-#define MV64340_ETH_BAR_1 0x2208
+-#define MV64340_ETH_BAR_2 0x2210
+-#define MV64340_ETH_BAR_3 0x2218
+-#define MV64340_ETH_BAR_4 0x2220
+-#define MV64340_ETH_BAR_5 0x2228
+-#define MV64340_ETH_SIZE_REG_0 0x2204
+-#define MV64340_ETH_SIZE_REG_1 0x220c
+-#define MV64340_ETH_SIZE_REG_2 0x2214
+-#define MV64340_ETH_SIZE_REG_3 0x221c
+-#define MV64340_ETH_SIZE_REG_4 0x2224
+-#define MV64340_ETH_SIZE_REG_5 0x222c
+-#define MV64340_ETH_HEADERS_RETARGET_BASE_REG 0x2230
+-#define MV64340_ETH_HEADERS_RETARGET_CONTROL_REG 0x2234
+-#define MV64340_ETH_HIGH_ADDR_REMAP_REG_0 0x2280
+-#define MV64340_ETH_HIGH_ADDR_REMAP_REG_1 0x2284
+-#define MV64340_ETH_HIGH_ADDR_REMAP_REG_2 0x2288
+-#define MV64340_ETH_HIGH_ADDR_REMAP_REG_3 0x228c
+-#define MV64340_ETH_BASE_ADDR_ENABLE_REG 0x2290
+-#define MV64340_ETH_ACCESS_PROTECTION_REG(port) (0x2294 + (port<<2))
+-#define MV64340_ETH_MIB_COUNTERS_BASE(port) (0x3000 + (port<<7))
+-#define MV64340_ETH_PORT_CONFIG_REG(port) (0x2400 + (port<<10))
+-#define MV64340_ETH_PORT_CONFIG_EXTEND_REG(port) (0x2404 + (port<<10))
+-#define MV64340_ETH_MII_SERIAL_PARAMETRS_REG(port) (0x2408 + (port<<10))
+-#define MV64340_ETH_GMII_SERIAL_PARAMETRS_REG(port) (0x240c + (port<<10))
+-#define MV64340_ETH_VLAN_ETHERTYPE_REG(port) (0x2410 + (port<<10))
+-#define MV64340_ETH_MAC_ADDR_LOW(port) (0x2414 + (port<<10))
+-#define MV64340_ETH_MAC_ADDR_HIGH(port) (0x2418 + (port<<10))
+-#define MV64340_ETH_SDMA_CONFIG_REG(port) (0x241c + (port<<10))
+-#define MV64340_ETH_DSCP_0(port) (0x2420 + (port<<10))
+-#define MV64340_ETH_DSCP_1(port) (0x2424 + (port<<10))
+-#define MV64340_ETH_DSCP_2(port) (0x2428 + (port<<10))
+-#define MV64340_ETH_DSCP_3(port) (0x242c + (port<<10))
+-#define MV64340_ETH_DSCP_4(port) (0x2430 + (port<<10))
+-#define MV64340_ETH_DSCP_5(port) (0x2434 + (port<<10))
+-#define MV64340_ETH_DSCP_6(port) (0x2438 + (port<<10))
+-#define MV64340_ETH_PORT_SERIAL_CONTROL_REG(port) (0x243c + (port<<10))
+-#define MV64340_ETH_VLAN_PRIORITY_TAG_TO_PRIORITY(port) (0x2440 + (port<<10))
+-#define MV64340_ETH_PORT_STATUS_REG(port) (0x2444 + (port<<10))
+-#define MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(port) (0x2448 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_FIXED_PRIORITY(port) (0x244c + (port<<10))
+-#define MV64340_ETH_PORT_TX_TOKEN_BUCKET_RATE_CONFIG(port) (0x2450 + (port<<10))
+-#define MV64340_ETH_MAXIMUM_TRANSMIT_UNIT(port) (0x2458 + (port<<10))
+-#define MV64340_ETH_PORT_MAXIMUM_TOKEN_BUCKET_SIZE(port) (0x245c + (port<<10))
+-#define MV64340_ETH_INTERRUPT_CAUSE_REG(port) (0x2460 + (port<<10))
+-#define MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port) (0x2464 + (port<<10))
+-#define MV64340_ETH_INTERRUPT_MASK_REG(port) (0x2468 + (port<<10))
+-#define MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port) (0x246c + (port<<10))
+-#define MV64340_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
+-#define MV64340_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
+-#define MV64340_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
+-#define MV64340_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
+-#define MV64340_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
+-#define MV64340_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
+-#define MV64340_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
+-#define MV64340_ETH_INTERNAL_USE_REG(port) (0x24fc + (port<<10))
+-#define MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(port) (0x2680 + (port<<10))
+-#define MV64340_ETH_CURRENT_SERVED_TX_DESC_PTR(port) (0x2684 + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port) (0x260c + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_1(port) (0x261c + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_2(port) (0x262c + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_3(port) (0x263c + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_4(port) (0x264c + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_5(port) (0x265c + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_6(port) (0x266c + (port<<10))
+-#define MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_7(port) (0x267c + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(port) (0x26c0 + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_1(port) (0x26c4 + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_2(port) (0x26c8 + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_3(port) (0x26cc + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_4(port) (0x26d0 + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_5(port) (0x26d4 + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_6(port) (0x26d8 + (port<<10))
+-#define MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_7(port) (0x26dc + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_0_TOKEN_BUCKET_COUNT(port) (0x2700 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_1_TOKEN_BUCKET_COUNT(port) (0x2710 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_2_TOKEN_BUCKET_COUNT(port) (0x2720 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_3_TOKEN_BUCKET_COUNT(port) (0x2730 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_4_TOKEN_BUCKET_COUNT(port) (0x2740 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_5_TOKEN_BUCKET_COUNT(port) (0x2750 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_6_TOKEN_BUCKET_COUNT(port) (0x2760 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_7_TOKEN_BUCKET_COUNT(port) (0x2770 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_0_TOKEN_BUCKET_CONFIG(port) (0x2704 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_1_TOKEN_BUCKET_CONFIG(port) (0x2714 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_2_TOKEN_BUCKET_CONFIG(port) (0x2724 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_3_TOKEN_BUCKET_CONFIG(port) (0x2734 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_4_TOKEN_BUCKET_CONFIG(port) (0x2744 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_5_TOKEN_BUCKET_CONFIG(port) (0x2754 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_6_TOKEN_BUCKET_CONFIG(port) (0x2764 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_7_TOKEN_BUCKET_CONFIG(port) (0x2774 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_0_ARBITER_CONFIG(port) (0x2708 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_1_ARBITER_CONFIG(port) (0x2718 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_2_ARBITER_CONFIG(port) (0x2728 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_3_ARBITER_CONFIG(port) (0x2738 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_4_ARBITER_CONFIG(port) (0x2748 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_5_ARBITER_CONFIG(port) (0x2758 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_6_ARBITER_CONFIG(port) (0x2768 + (port<<10))
+-#define MV64340_ETH_TX_QUEUE_7_ARBITER_CONFIG(port) (0x2778 + (port<<10))
+-#define MV64340_ETH_PORT_TX_TOKEN_BUCKET_COUNT(port) (0x2780 + (port<<10))
+-#define MV64340_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port) (0x3400 + (port<<10))
+-#define MV64340_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port) (0x3500 + (port<<10))
+-#define MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE(port) (0x3600 + (port<<10))
++#define MV643XX_ETH_SHARED_REGS 0x2000
++#define MV643XX_ETH_SHARED_REGS_SIZE 0x2000
++
++#define MV643XX_ETH_PHY_ADDR_REG 0x2000
++#define MV643XX_ETH_SMI_REG 0x2004
++#define MV643XX_ETH_UNIT_DEFAULT_ADDR_REG 0x2008
++#define MV643XX_ETH_UNIT_DEFAULTID_REG 0x200c
++#define MV643XX_ETH_UNIT_INTERRUPT_CAUSE_REG 0x2080
++#define MV643XX_ETH_UNIT_INTERRUPT_MASK_REG 0x2084
++#define MV643XX_ETH_UNIT_INTERNAL_USE_REG 0x24fc
++#define MV643XX_ETH_UNIT_ERROR_ADDR_REG 0x2094
++#define MV643XX_ETH_BAR_0 0x2200
++#define MV643XX_ETH_BAR_1 0x2208
++#define MV643XX_ETH_BAR_2 0x2210
++#define MV643XX_ETH_BAR_3 0x2218
++#define MV643XX_ETH_BAR_4 0x2220
++#define MV643XX_ETH_BAR_5 0x2228
++#define MV643XX_ETH_SIZE_REG_0 0x2204
++#define MV643XX_ETH_SIZE_REG_1 0x220c
++#define MV643XX_ETH_SIZE_REG_2 0x2214
++#define MV643XX_ETH_SIZE_REG_3 0x221c
++#define MV643XX_ETH_SIZE_REG_4 0x2224
++#define MV643XX_ETH_SIZE_REG_5 0x222c
++#define MV643XX_ETH_HEADERS_RETARGET_BASE_REG 0x2230
++#define MV643XX_ETH_HEADERS_RETARGET_CONTROL_REG 0x2234
++#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_0 0x2280
++#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_1 0x2284
++#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_2 0x2288
++#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_3 0x228c
++#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290
++#define MV643XX_ETH_ACCESS_PROTECTION_REG(port) (0x2294 + (port<<2))
++#define MV643XX_ETH_MIB_COUNTERS_BASE(port) (0x3000 + (port<<7))
++#define MV643XX_ETH_PORT_CONFIG_REG(port) (0x2400 + (port<<10))
++#define MV643XX_ETH_PORT_CONFIG_EXTEND_REG(port) (0x2404 + (port<<10))
++#define MV643XX_ETH_MII_SERIAL_PARAMETRS_REG(port) (0x2408 + (port<<10))
++#define MV643XX_ETH_GMII_SERIAL_PARAMETRS_REG(port) (0x240c + (port<<10))
++#define MV643XX_ETH_VLAN_ETHERTYPE_REG(port) (0x2410 + (port<<10))
++#define MV643XX_ETH_MAC_ADDR_LOW(port) (0x2414 + (port<<10))
++#define MV643XX_ETH_MAC_ADDR_HIGH(port) (0x2418 + (port<<10))
++#define MV643XX_ETH_SDMA_CONFIG_REG(port) (0x241c + (port<<10))
++#define MV643XX_ETH_DSCP_0(port) (0x2420 + (port<<10))
++#define MV643XX_ETH_DSCP_1(port) (0x2424 + (port<<10))
++#define MV643XX_ETH_DSCP_2(port) (0x2428 + (port<<10))
++#define MV643XX_ETH_DSCP_3(port) (0x242c + (port<<10))
++#define MV643XX_ETH_DSCP_4(port) (0x2430 + (port<<10))
++#define MV643XX_ETH_DSCP_5(port) (0x2434 + (port<<10))
++#define MV643XX_ETH_DSCP_6(port) (0x2438 + (port<<10))
++#define MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port) (0x243c + (port<<10))
++#define MV643XX_ETH_VLAN_PRIORITY_TAG_TO_PRIORITY(port) (0x2440 + (port<<10))
++#define MV643XX_ETH_PORT_STATUS_REG(port) (0x2444 + (port<<10))
++#define MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port) (0x2448 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_FIXED_PRIORITY(port) (0x244c + (port<<10))
++#define MV643XX_ETH_PORT_TX_TOKEN_BUCKET_RATE_CONFIG(port) (0x2450 + (port<<10))
++#define MV643XX_ETH_MAXIMUM_TRANSMIT_UNIT(port) (0x2458 + (port<<10))
++#define MV643XX_ETH_PORT_MAXIMUM_TOKEN_BUCKET_SIZE(port) (0x245c + (port<<10))
++#define MV643XX_ETH_INTERRUPT_CAUSE_REG(port) (0x2460 + (port<<10))
++#define MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port) (0x2464 + (port<<10))
++#define MV643XX_ETH_INTERRUPT_MASK_REG(port) (0x2468 + (port<<10))
++#define MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port) (0x246c + (port<<10))
++#define MV643XX_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port) (0x2470 + (port<<10))
++#define MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port) (0x2474 + (port<<10))
++#define MV643XX_ETH_RX_MINIMAL_FRAME_SIZE_REG(port) (0x247c + (port<<10))
++#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port) (0x2484 + (port<<10)
++#define MV643XX_ETH_PORT_DEBUG_0_REG(port) (0x248c + (port<<10))
++#define MV643XX_ETH_PORT_DEBUG_1_REG(port) (0x2490 + (port<<10))
++#define MV643XX_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port) (0x2494 + (port<<10))
++#define MV643XX_ETH_INTERNAL_USE_REG(port) (0x24fc + (port<<10))
++#define MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port) (0x2680 + (port<<10))
++#define MV643XX_ETH_CURRENT_SERVED_TX_DESC_PTR(port) (0x2684 + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port) (0x260c + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_1(port) (0x261c + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_2(port) (0x262c + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_3(port) (0x263c + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_4(port) (0x264c + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_5(port) (0x265c + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_6(port) (0x266c + (port<<10))
++#define MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_7(port) (0x267c + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(port) (0x26c0 + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_1(port) (0x26c4 + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_2(port) (0x26c8 + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_3(port) (0x26cc + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_4(port) (0x26d0 + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_5(port) (0x26d4 + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_6(port) (0x26d8 + (port<<10))
++#define MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_7(port) (0x26dc + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_0_TOKEN_BUCKET_COUNT(port) (0x2700 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_1_TOKEN_BUCKET_COUNT(port) (0x2710 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_2_TOKEN_BUCKET_COUNT(port) (0x2720 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_3_TOKEN_BUCKET_COUNT(port) (0x2730 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_4_TOKEN_BUCKET_COUNT(port) (0x2740 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_5_TOKEN_BUCKET_COUNT(port) (0x2750 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_6_TOKEN_BUCKET_COUNT(port) (0x2760 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_7_TOKEN_BUCKET_COUNT(port) (0x2770 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_0_TOKEN_BUCKET_CONFIG(port) (0x2704 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_1_TOKEN_BUCKET_CONFIG(port) (0x2714 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_2_TOKEN_BUCKET_CONFIG(port) (0x2724 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_3_TOKEN_BUCKET_CONFIG(port) (0x2734 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_4_TOKEN_BUCKET_CONFIG(port) (0x2744 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_5_TOKEN_BUCKET_CONFIG(port) (0x2754 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_6_TOKEN_BUCKET_CONFIG(port) (0x2764 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_7_TOKEN_BUCKET_CONFIG(port) (0x2774 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_0_ARBITER_CONFIG(port) (0x2708 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_1_ARBITER_CONFIG(port) (0x2718 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_2_ARBITER_CONFIG(port) (0x2728 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_3_ARBITER_CONFIG(port) (0x2738 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_4_ARBITER_CONFIG(port) (0x2748 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_5_ARBITER_CONFIG(port) (0x2758 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_6_ARBITER_CONFIG(port) (0x2768 + (port<<10))
++#define MV643XX_ETH_TX_QUEUE_7_ARBITER_CONFIG(port) (0x2778 + (port<<10))
++#define MV643XX_ETH_PORT_TX_TOKEN_BUCKET_COUNT(port) (0x2780 + (port<<10))
++#define MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port) (0x3400 + (port<<10))
++#define MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port) (0x3500 + (port<<10))
++#define MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE(port) (0x3600 + (port<<10))
+
+ /*******************************************/
+ /* CUNIT Registers */
+@@ -1085,4 +1088,221 @@
+ u32 brg_clk_freq;
+ };
+
+-#endif /* __ASM_MV64340_H */
++/* These macros describe Ethernet Port configuration reg (Px_cR) bits */
++#define MV643XX_ETH_UNICAST_NORMAL_MODE 0
++#define MV643XX_ETH_UNICAST_PROMISCUOUS_MODE (1<<0)
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_0 0
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_1 (1<<1)
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_2 (1<<2)
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_3 ((1<<2) | (1<<1))
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_4 (1<<3)
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_5 ((1<<3) | (1<<1))
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_6 ((1<<3) | (1<<2))
++#define MV643XX_ETH_DEFAULT_RX_QUEUE_7 ((1<<3) | (1<<2) | (1<<1))
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_0 0
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_1 (1<<4)
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_2 (1<<5)
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_3 ((1<<5) | (1<<4))
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_4 (1<<6)
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_5 ((1<<6) | (1<<4))
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_6 ((1<<6) | (1<<5))
++#define MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_7 ((1<<6) | (1<<5) | (1<<4))
++#define MV643XX_ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP 0
++#define MV643XX_ETH_REJECT_BC_IF_NOT_IP_OR_ARP (1<<7)
++#define MV643XX_ETH_RECEIVE_BC_IF_IP 0
++#define MV643XX_ETH_REJECT_BC_IF_IP (1<<8)
++#define MV643XX_ETH_RECEIVE_BC_IF_ARP 0
++#define MV643XX_ETH_REJECT_BC_IF_ARP (1<<9)
++#define MV643XX_ETH_TX_AM_NO_UPDATE_ERROR_SUMMARY (1<<12)
++#define MV643XX_ETH_CAPTURE_TCP_FRAMES_DIS 0
++#define MV643XX_ETH_CAPTURE_TCP_FRAMES_EN (1<<14)
++#define MV643XX_ETH_CAPTURE_UDP_FRAMES_DIS 0
++#define MV643XX_ETH_CAPTURE_UDP_FRAMES_EN (1<<15)
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_0 0
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_1 (1<<16)
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_2 (1<<17)
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_3 ((1<<17) | (1<<16))
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_4 (1<<18)
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_5 ((1<<18) | (1<<16))
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_6 ((1<<18) | (1<<17))
++#define MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_7 ((1<<18) | (1<<17) | (1<<16))
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_0 0
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_1 (1<<19)
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_2 (1<<20)
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_3 ((1<<20) | (1<<19))
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4 ((1<<21)
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_5 ((1<<21) | (1<<19))
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_6 ((1<<21) | (1<<20))
++#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_7 ((1<<21) | (1<<20) | (1<<19))
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_0 0
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_1 (1<<22)
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_2 (1<<23)
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_3 ((1<<23) | (1<<22))
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_4 (1<<24)
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_5 ((1<<24) | (1<<22))
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_6 ((1<<24) | (1<<23))
++#define MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_7 ((1<<24) | (1<<23) | (1<<22))
++
++#define MV643XX_ETH_PORT_CONFIG_DEFAULT_VALUE \
++ MV643XX_ETH_UNICAST_NORMAL_MODE | \
++ MV643XX_ETH_DEFAULT_RX_QUEUE_0 | \
++ MV643XX_ETH_DEFAULT_RX_ARP_QUEUE_0 | \
++ MV643XX_ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP | \
++ MV643XX_ETH_RECEIVE_BC_IF_IP | \
++ MV643XX_ETH_RECEIVE_BC_IF_ARP | \
++ MV643XX_ETH_CAPTURE_TCP_FRAMES_DIS | \
++ MV643XX_ETH_CAPTURE_UDP_FRAMES_DIS | \
++ MV643XX_ETH_DEFAULT_RX_TCP_QUEUE_0 | \
++ MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_0 | \
++ MV643XX_ETH_DEFAULT_RX_BPDU_QUEUE_0
++
++/* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
++#define MV643XX_ETH_CLASSIFY_EN (1<<0)
++#define MV643XX_ETH_SPAN_BPDU_PACKETS_AS_NORMAL 0
++#define MV643XX_ETH_SPAN_BPDU_PACKETS_TO_RX_QUEUE_7 (1<<1)
++#define MV643XX_ETH_PARTITION_DISABLE 0
++#define MV643XX_ETH_PARTITION_ENABLE (1<<2)
++
++#define MV643XX_ETH_PORT_CONFIG_EXTEND_DEFAULT_VALUE \
++ MV643XX_ETH_SPAN_BPDU_PACKETS_AS_NORMAL | \
++ MV643XX_ETH_PARTITION_DISABLE
++
++/* These macros describe Ethernet Port Sdma configuration reg (SDCR) bits */
++#define MV643XX_ETH_RIFB (1<<0)
++#define MV643XX_ETH_RX_BURST_SIZE_1_64BIT 0
++#define MV643XX_ETH_RX_BURST_SIZE_2_64BIT (1<<1)
++#define MV643XX_ETH_RX_BURST_SIZE_4_64BIT (1<<2)
++#define MV643XX_ETH_RX_BURST_SIZE_8_64BIT ((1<<2) | (1<<1))
++#define MV643XX_ETH_RX_BURST_SIZE_16_64BIT (1<<3)
++#define MV643XX_ETH_BLM_RX_NO_SWAP (1<<4)
++#define MV643XX_ETH_BLM_RX_BYTE_SWAP 0
++#define MV643XX_ETH_BLM_TX_NO_SWAP (1<<5)
++#define MV643XX_ETH_BLM_TX_BYTE_SWAP 0
++#define MV643XX_ETH_DESCRIPTORS_BYTE_SWAP (1<<6)
++#define MV643XX_ETH_DESCRIPTORS_NO_SWAP 0
++#define MV643XX_ETH_TX_BURST_SIZE_1_64BIT 0
++#define MV643XX_ETH_TX_BURST_SIZE_2_64BIT (1<<22)
++#define MV643XX_ETH_TX_BURST_SIZE_4_64BIT (1<<23)
++#define MV643XX_ETH_TX_BURST_SIZE_8_64BIT ((1<<23) | (1<<22))
++#define MV643XX_ETH_TX_BURST_SIZE_16_64BIT (1<<24)
++
++#define MV643XX_ETH_IPG_INT_RX(value) ((value & 0x3fff) << 8)
++
++#define MV643XX_ETH_PORT_SDMA_CONFIG_DEFAULT_VALUE \
++ MV643XX_ETH_RX_BURST_SIZE_4_64BIT | \
++ MV643XX_ETH_IPG_INT_RX(0) | \
++ MV643XX_ETH_TX_BURST_SIZE_4_64BIT
++
++/* These macros describe Ethernet Port serial control reg (PSCR) bits */
++#define MV643XX_ETH_SERIAL_PORT_DISABLE 0
++#define MV643XX_ETH_SERIAL_PORT_ENABLE (1<<0)
++#define MV643XX_ETH_FORCE_LINK_PASS (1<<1)
++#define MV643XX_ETH_DO_NOT_FORCE_LINK_PASS 0
++#define MV643XX_ETH_ENABLE_AUTO_NEG_FOR_DUPLX 0
++#define MV643XX_ETH_DISABLE_AUTO_NEG_FOR_DUPLX (1<<2)
++#define MV643XX_ETH_ENABLE_AUTO_NEG_FOR_FLOW_CTRL 0
++#define MV643XX_ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL (1<<3)
++#define MV643XX_ETH_ADV_NO_FLOW_CTRL 0
++#define MV643XX_ETH_ADV_SYMMETRIC_FLOW_CTRL (1<<4)
++#define MV643XX_ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX 0
++#define MV643XX_ETH_FORCE_FC_MODE_TX_PAUSE_DIS (1<<5)
++#define MV643XX_ETH_FORCE_BP_MODE_NO_JAM 0
++#define MV643XX_ETH_FORCE_BP_MODE_JAM_TX (1<<7)
++#define MV643XX_ETH_FORCE_BP_MODE_JAM_TX_ON_RX_ERR (1<<8)
++#define MV643XX_ETH_FORCE_LINK_FAIL 0
++#define MV643XX_ETH_DO_NOT_FORCE_LINK_FAIL (1<<10)
++#define MV643XX_ETH_RETRANSMIT_16_ATTEMPTS 0
++#define MV643XX_ETH_RETRANSMIT_FOREVER (1<<11)
++#define MV643XX_ETH_DISABLE_AUTO_NEG_SPEED_GMII (1<<13)
++#define MV643XX_ETH_ENABLE_AUTO_NEG_SPEED_GMII 0
++#define MV643XX_ETH_DTE_ADV_0 0
++#define MV643XX_ETH_DTE_ADV_1 (1<<14)
++#define MV643XX_ETH_DISABLE_AUTO_NEG_BYPASS 0
++#define MV643XX_ETH_ENABLE_AUTO_NEG_BYPASS (1<<15)
++#define MV643XX_ETH_AUTO_NEG_NO_CHANGE 0
++#define MV643XX_ETH_RESTART_AUTO_NEG (1<<16)
++#define MV643XX_ETH_MAX_RX_PACKET_1518BYTE 0
++#define MV643XX_ETH_MAX_RX_PACKET_1522BYTE (1<<17)
++#define MV643XX_ETH_MAX_RX_PACKET_1552BYTE (1<<18)
++#define MV643XX_ETH_MAX_RX_PACKET_9022BYTE ((1<<18) | (1<<17))
++#define MV643XX_ETH_MAX_RX_PACKET_9192BYTE (1<<19)
++#define MV643XX_ETH_MAX_RX_PACKET_9700BYTE ((1<<19) | (1<<17))
++#define MV643XX_ETH_SET_EXT_LOOPBACK (1<<20)
++#define MV643XX_ETH_CLR_EXT_LOOPBACK 0
++#define MV643XX_ETH_SET_FULL_DUPLEX_MODE (1<<21)
++#define MV643XX_ETH_SET_HALF_DUPLEX_MODE 0
++#define MV643XX_ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX (1<<22)
++#define MV643XX_ETH_DISABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX 0
++#define MV643XX_ETH_SET_GMII_SPEED_TO_10_100 0
++#define MV643XX_ETH_SET_GMII_SPEED_TO_1000 (1<<23)
++#define MV643XX_ETH_SET_MII_SPEED_TO_10 0
++#define MV643XX_ETH_SET_MII_SPEED_TO_100 (1<<24)
++
++#define MV643XX_ETH_PORT_SERIAL_CONTROL_DEFAULT_VALUE \
++ MV643XX_ETH_DO_NOT_FORCE_LINK_PASS | \
++ MV643XX_ETH_ENABLE_AUTO_NEG_FOR_DUPLX | \
++ MV643XX_ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL | \
++ MV643XX_ETH_ADV_SYMMETRIC_FLOW_CTRL | \
++ MV643XX_ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX | \
++ MV643XX_ETH_FORCE_BP_MODE_NO_JAM | \
++ (1<<9) /* reserved */ | \
++ MV643XX_ETH_DO_NOT_FORCE_LINK_FAIL | \
++ MV643XX_ETH_RETRANSMIT_16_ATTEMPTS | \
++ MV643XX_ETH_ENABLE_AUTO_NEG_SPEED_GMII | \
++ MV643XX_ETH_DTE_ADV_0 | \
++ MV643XX_ETH_DISABLE_AUTO_NEG_BYPASS | \
++ MV643XX_ETH_AUTO_NEG_NO_CHANGE | \
++ MV643XX_ETH_MAX_RX_PACKET_9700BYTE | \
++ MV643XX_ETH_CLR_EXT_LOOPBACK | \
++ MV643XX_ETH_SET_FULL_DUPLEX_MODE | \
++ MV643XX_ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX
++
++/* These macros describe Ethernet Serial Status reg (PSR) bits */
++#define MV643XX_ETH_PORT_STATUS_MODE_10_BIT (1<<0)
++#define MV643XX_ETH_PORT_STATUS_LINK_UP (1<<1)
++#define MV643XX_ETH_PORT_STATUS_FULL_DUPLEX (1<<2)
++#define MV643XX_ETH_PORT_STATUS_FLOW_CONTROL (1<<3)
++#define MV643XX_ETH_PORT_STATUS_GMII_1000 (1<<4)
++#define MV643XX_ETH_PORT_STATUS_MII_100 (1<<5)
++/* PSR bit 6 is undocumented */
++#define MV643XX_ETH_PORT_STATUS_TX_IN_PROGRESS (1<<7)
++#define MV643XX_ETH_PORT_STATUS_AUTONEG_BYPASSED (1<<8)
++#define MV643XX_ETH_PORT_STATUS_PARTITION (1<<9)
++#define MV643XX_ETH_PORT_STATUS_TX_FIFO_EMPTY (1<<10)
++/* PSR bits 11-31 are reserved */
++
++#define MV643XX_ETH_PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
++#define MV643XX_ETH_PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
++
++#define MV643XX_ETH_DESC_SIZE 64
++
++#define MV643XX_ETH_SHARED_NAME "mv643xx_eth_shared"
++#define MV643XX_ETH_NAME "mv643xx_eth"
++
++struct mv643xx_eth_platform_data {
++ /*
++ * Non-values for mac_addr, phy_addr, port_config, etc.
++ * override the default value. Setting the corresponding
++ * force_* field, causes the default value to be overridden
++ * even when zero.
++ */
++ unsigned int force_phy_addr:1;
++ unsigned int force_port_config:1;
++ unsigned int force_port_config_extend:1;
++ unsigned int force_port_sdma_config:1;
++ unsigned int force_port_serial_control:1;
++ int phy_addr;
++ char *mac_addr; /* pointer to mac address */
++ u32 port_config;
++ u32 port_config_extend;
++ u32 port_sdma_config;
++ u32 port_serial_control;
++ u32 tx_queue_size;
++ u32 rx_queue_size;
++ u32 tx_sram_addr;
++ u32 tx_sram_size;
++ u32 rx_sram_addr;
++ u32 rx_sram_size;
++};
++
++#endif /* __ASM_MV643XX_H */
+--- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/drivers/net/mv643xx_eth.c 2005-03-02 08:38:01.000000000 +0100
++++ drivers/net/mv643xx_eth.c 2005-03-05 21:23:35.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * drivers/net/mv64340_eth.c - Driver for MV64340X ethernet ports
++ * drivers/net/mv643xx_eth.c - Driver for MV643XX ethernet ports
+ * Copyright (C) 2002 Matthew Dharm <mdharm at momenco.com>
+ *
+ * Based on the 64360 driver from:
+@@ -10,6 +10,12 @@
+ *
+ * Copyright (C) 2003 Ralf Baechle <ralf at linux-mips.org>
+ *
++ * Copyright (C) 2004-2005 MontaVista Software, Inc.
++ * Dale Farnsworth <dale at farnsworth.org>
++ *
++ * Copyright (C) 2004 Steven J. Hill <sjhill1 at rockwellcollins.com>
++ * <sjhill at realitydiluted.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
+@@ -24,80 +30,100 @@
+ * 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/config.h>
+-#include <linux/version.h>
+-#include <linux/module.h>
+-#include <linux/kernel.h>
+-#include <linux/config.h>
+-#include <linux/sched.h>
+-#include <linux/ptrace.h>
+-#include <linux/fcntl.h>
+-#include <linux/ioport.h>
+-#include <linux/interrupt.h>
+-#include <linux/slab.h>
+-#include <linux/string.h>
+-#include <linux/errno.h>
+-#include <linux/ip.h>
+ #include <linux/init.h>
+-#include <linux/in.h>
+-#include <linux/pci.h>
+-#include <linux/workqueue.h>
+-#include <asm/smp.h>
+-#include <linux/skbuff.h>
++#include <linux/dma-mapping.h>
+ #include <linux/tcp.h>
+-#include <linux/netdevice.h>
++#include <linux/udp.h>
+ #include <linux/etherdevice.h>
+-#include <net/ip.h>
+
+ #include <linux/bitops.h>
++#include <linux/delay.h>
++#include <linux/ethtool.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"
+
+ /*
+- * The first part is the high level driver of the gigE ethernet ports.
++ * The first part is the high level driver of the gigE ethernet ports.
+ */
+
+-/* Definition for configuring driver */
+-#undef MV64340_RX_QUEUE_FILL_ON_TASK
+-
+ /* Constants */
+-#define EXTRA_BYTES 32
+-#define WRAP ETH_HLEN + 2 + 4 + 16
+-#define BUFFER_MTU dev->mtu + WRAP
++#define VLAN_HLEN 4
++#define FCS_LEN 4
++#define WRAP NET_IP_ALIGN + ETH_HLEN + VLAN_HLEN + FCS_LEN
++#define RX_SKB_SIZE ((dev->mtu + WRAP + 7) & ~0x7)
++
+ #define INT_CAUSE_UNMASK_ALL 0x0007ffff
+ #define INT_CAUSE_UNMASK_ALL_EXT 0x0011ffff
+-#ifdef MV64340_RX_FILL_ON_TASK
++#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
+ #define INT_CAUSE_MASK_ALL 0x00000000
+ #define INT_CAUSE_CHECK_BITS INT_CAUSE_UNMASK_ALL
+ #define INT_CAUSE_CHECK_BITS_EXT INT_CAUSE_UNMASK_ALL_EXT
+ #endif
+
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
++#define MAX_DESCS_PER_SKB (MAX_SKB_FRAGS + 1)
++#else
++#define MAX_DESCS_PER_SKB 1
++#endif
++
++#define PHY_WAIT_ITERATIONS 1000 /* 1000 iterations * 10uS = 10mS max */
++#define PHY_WAIT_MICRO_SECONDS 10
++
+ /* Static function declarations */
+-static int mv64340_eth_real_open(struct net_device *);
+-static int mv64340_eth_real_stop(struct net_device *);
+-static int mv64340_eth_change_mtu(struct net_device *, int);
+-static struct net_device_stats *mv64340_eth_get_stats(struct net_device *);
++static int eth_port_link_is_up(unsigned int eth_port_num);
++static void eth_port_uc_addr_get(struct net_device *dev,
++ unsigned char *MacAddr);
++static int mv643xx_eth_real_open(struct net_device *);
++static int mv643xx_eth_real_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 MV64340_NAPI
+-static int mv64340_poll(struct net_device *dev, int *budget);
++#ifdef MV643XX_NAPI
++static int mv643xx_poll(struct net_device *dev, int *budget);
+ #endif
++static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
++static int ethernet_phy_detect(unsigned int eth_port_num);
++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;
++
++/* used to protect MV643XX_ETH_SMI_REG, which is shared across ports */
++static spinlock_t mv643xx_eth_phy_lock = SPIN_LOCK_UNLOCKED;
++
++static inline u32 mv_read(int offset)
++{
++ void *__iomem reg_base;
++
++ reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
++
++ return readl(reg_base + offset);
++}
++
++static inline void mv_write(int offset, u32 data)
++{
++ void * __iomem reg_base;
+
+-unsigned char prom_mac_addr_base[6];
+-unsigned long mv64340_sram_base;
++ reg_base = mv643xx_eth_shared_base - MV643XX_ETH_SHARED_REGS;
++ writel(data, reg_base + offset);
++}
+
+ /*
+ * 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
++ * Input : pointer to ethernet interface network device structure
++ * new mtu size
++ * Output : 0 upon success, -EINVAL upon failure
+ */
+-static int mv64340_eth_change_mtu(struct net_device *dev, int new_mtu)
++static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned long flags;
+
+ spin_lock_irqsave(&mp->lock, flags);
+@@ -108,21 +134,21 @@
+ }
+
+ 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)) {
+- if (mv64340_eth_real_stop(dev))
++ if (mv643xx_eth_real_stop(dev))
+ printk(KERN_ERR
+- "%s: Fatal error on stopping device\n",
+- dev->name);
+- if (mv64340_eth_real_open(dev))
++ "%s: Fatal error on stopping device\n",
++ dev->name);
++ if (mv643xx_eth_real_open(dev))
+ printk(KERN_ERR
+- "%s: Fatal error on opening device\n",
+- dev->name);
++ "%s: Fatal error on opening device\n",
++ dev->name);
+ }
+
+ spin_unlock_irqrestore(&mp->lock, flags);
+@@ -130,17 +156,17 @@
+ }
+
+ /*
+- * mv64340_eth_rx_task
+- *
++ * mv643xx_eth_rx_task
++ *
+ * Fills / refills RX queue on a certain gigabit ethernet port
+ *
+- * Input : pointer to ethernet interface network device structure
+- * Output : N/A
++ * Input : pointer to ethernet interface network device structure
++ * Output : N/A
+ */
+-static void mv64340_eth_rx_task(void *data)
++static void mv643xx_eth_rx_task(void *data)
+ {
+- struct net_device *dev = (struct net_device *) data;
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct net_device *dev = (struct net_device *)data;
++ struct mv643xx_private *mp = netdev_priv(dev);
+ struct pkt_info pkt_info;
+ struct sk_buff *skb;
+
+@@ -148,28 +174,18 @@
+ panic("%s: Error in test_set_bit / clear_bit", dev->name);
+
+ while (mp->rx_ring_skbs < (mp->rx_ring_size - 5)) {
+- /* The +8 for buffer allignment and another 32 byte extra */
+-
+- skb = dev_alloc_skb(BUFFER_MTU + 8 + EXTRA_BYTES);
++ skb = dev_alloc_skb(RX_SKB_SIZE);
+ if (!skb)
+- /* Better luck next time */
+ break;
+ mp->rx_ring_skbs++;
+ pkt_info.cmd_sts = ETH_RX_ENABLE_INTERRUPT;
+- pkt_info.byte_cnt = dev->mtu + ETH_HLEN + 4 + 2 + EXTRA_BYTES;
+- /* Allign buffer to 8 bytes */
+- if (pkt_info.byte_cnt & ~0x7) {
+- pkt_info.byte_cnt &= ~0x7;
+- pkt_info.byte_cnt += 8;
+- }
+- pkt_info.buf_ptr =
+- pci_map_single(0, skb->data,
+- dev->mtu + ETH_HLEN + 4 + 2 + EXTRA_BYTES,
+- PCI_DMA_FROMDEVICE);
++ pkt_info.byte_cnt = RX_SKB_SIZE;
++ pkt_info.buf_ptr = dma_map_single(NULL, skb->data, RX_SKB_SIZE,
++ DMA_FROM_DEVICE);
+ pkt_info.return_info = skb;
+ if (eth_rx_return_buff(mp, &pkt_info) != ETH_OK) {
+ printk(KERN_ERR
+- "%s: Error allocating RX Ring\n", dev->name);
++ "%s: Error allocating RX Ring\n", dev->name);
+ break;
+ }
+ skb_reserve(skb, 2);
+@@ -186,46 +202,45 @@
+ add_timer(&mp->timeout);
+ mp->rx_timer_flag = 1;
+ }
+-#if MV64340_RX_QUEUE_FILL_ON_TASK
++#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
+ else {
+ /* Return interrupts */
+- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(mp->port_num),
+- INT_CAUSE_UNMASK_ALL);
++ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(mp->port_num),
++ INT_CAUSE_UNMASK_ALL);
+ }
+ #endif
+ }
+
+ /*
+- * mv64340_eth_rx_task_timer_wrapper
+- *
++ * mv643xx_eth_rx_task_timer_wrapper
++ *
+ * Timer routine to wake up RX queue filling task. This function is
+ * used only in case the RX queue is empty, and all alloc_skb has
+ * failed (due to out of memory event).
+ *
+- * Input : pointer to ethernet interface network device structure
+- * Output : N/A
++ * Input : pointer to ethernet interface network device structure
++ * Output : N/A
+ */
+-static void mv64340_eth_rx_task_timer_wrapper(unsigned long data)
++static void mv643xx_eth_rx_task_timer_wrapper(unsigned long data)
+ {
+- struct net_device *dev = (struct net_device *) data;
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct net_device *dev = (struct net_device *)data;
++ struct mv643xx_private *mp = netdev_priv(dev);
+
+ mp->rx_timer_flag = 0;
+- mv64340_eth_rx_task((void *) data);
++ mv643xx_eth_rx_task((void *)data);
+ }
+
+-
+ /*
+- * mv64340_eth_update_mac_address
+- *
++ * 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
++ * Input : pointer to ethernet interface network device structure
++ * Output : N/A
+ */
+-static void mv64340_eth_update_mac_address(struct net_device *dev)
++static void mv643xx_eth_update_mac_address(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+
+ eth_port_init_mac_tables(port_num);
+@@ -234,64 +249,59 @@
+ }
+
+ /*
+- * mv64340_eth_set_rx_mode
+- *
++ * mv643xx_eth_set_rx_mode
++ *
+ * Change from promiscuos to regular rx mode
+ *
+- * Input : pointer to ethernet interface network device structure
+- * Output : N/A
++ * Input : pointer to ethernet interface network device structure
++ * Output : N/A
+ */
+-static void mv64340_eth_set_rx_mode(struct net_device *dev)
++static void mv643xx_eth_set_rx_mode(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
++ u32 config_reg;
+
+- if (dev->flags & IFF_PROMISC) {
+- ethernet_set_config_reg
+- (mp->port_num,
+- ethernet_get_config_reg(mp->port_num) |
+- ETH_UNICAST_PROMISCUOUS_MODE);
+- } else {
+- ethernet_set_config_reg
+- (mp->port_num,
+- ethernet_get_config_reg(mp->port_num) &
+- ~(unsigned int) ETH_UNICAST_PROMISCUOUS_MODE);
+- }
++ config_reg = ethernet_get_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;
++ ethernet_set_config_reg(mp->port_num, config_reg);
+ }
+
+-
+ /*
+- * mv64340_eth_set_mac_address
+- *
++ * 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
++ * 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 mv64340_eth_set_mac_address(struct net_device *dev, void *addr)
++static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
+ {
+ int i;
+
+ 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];
+- mv64340_eth_update_mac_address(dev);
++ dev->dev_addr[i] = ((unsigned char *)addr)[i + 2];
++ mv643xx_eth_update_mac_address(dev);
+ return 0;
+ }
+
+ /*
+- * mv64340_eth_tx_timeout
+- *
++ * mv643xx_eth_tx_timeout
++ *
+ * Called upon a timeout on transmitting a packet
+ *
+- * Input : pointer to ethernet interface network device structure.
+- * Output : N/A
++ * Input : pointer to ethernet interface network device structure.
++ * Output : N/A
+ */
+-static void mv64340_eth_tx_timeout(struct net_device *dev)
++static void mv643xx_eth_tx_timeout(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+
+ printk(KERN_INFO "%s: TX timeout ", dev->name);
+
+@@ -300,31 +310,31 @@
+ }
+
+ /*
+- * mv64340_eth_tx_timeout_task
++ * mv643xx_eth_tx_timeout_task
+ *
+ * Actual routine to reset the adapter when a timeout on Tx has occurred
+ */
+-static void mv64340_eth_tx_timeout_task(struct net_device *dev)
++static void mv643xx_eth_tx_timeout_task(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+
+- netif_device_detach(dev);
+- eth_port_reset(mp->port_num);
+- eth_port_start(mp);
+- netif_device_attach(dev);
++ netif_device_detach(dev);
++ eth_port_reset(mp->port_num);
++ eth_port_start(mp);
++ netif_device_attach(dev);
+ }
+
+ /*
+- * mv64340_eth_free_tx_queue
++ * mv643xx_eth_free_tx_queue
+ *
+- * Input : dev - a pointer to the required interface
++ * Input : dev - a pointer to the required interface
+ *
+- * Output : 0 if was able to release skb , nonzero otherwise
++ * Output : 0 if was able to release skb , nonzero otherwise
+ */
+-static int mv64340_eth_free_tx_queue(struct net_device *dev,
+- unsigned int eth_int_cause_ext)
++static int mv643xx_eth_free_tx_queue(struct net_device *dev,
++ unsigned int eth_int_cause_ext)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ struct net_device_stats *stats = &mp->stats;
+ struct pkt_info pkt_info;
+ int released = 1;
+@@ -341,33 +351,36 @@
+ stats->tx_errors++;
+ }
+
+- /*
++ /*
+ * If return_info is different than 0, release the skb.
+ * The case where return_info is not 0 is only in case
+ * when transmitted a scatter/gather packet, where only
+ * last skb releases the whole chain.
+ */
+ if (pkt_info.return_info) {
+- dev_kfree_skb_irq((struct sk_buff *)
+- pkt_info.return_info);
+- released = 0;
+ if (skb_shinfo(pkt_info.return_info)->nr_frags)
+- pci_unmap_page(NULL, pkt_info.buf_ptr,
+- pkt_info.byte_cnt, PCI_DMA_TODEVICE);
++ dma_unmap_page(NULL, pkt_info.buf_ptr,
++ pkt_info.byte_cnt,
++ DMA_TO_DEVICE);
++ else
++ dma_unmap_single(NULL, pkt_info.buf_ptr,
++ pkt_info.byte_cnt,
++ DMA_TO_DEVICE);
+
+- if (mp->tx_ring_skbs != 1)
+- mp->tx_ring_skbs--;
+- } else
+- pci_unmap_page(NULL, pkt_info.buf_ptr,
+- pkt_info.byte_cnt, PCI_DMA_TODEVICE);
+-
+- /*
+- * Decrement the number of outstanding skbs counter on
+- * the TX queue.
+- */
+- if (mp->tx_ring_skbs == 0)
+- panic("ERROR - TX outstanding SKBs counter is corrupted");
++ dev_kfree_skb_irq(pkt_info.return_info);
++ released = 0;
+
++ /*
++ * Decrement the number of outstanding skbs counter on
++ * the TX queue.
++ */
++ if (mp->tx_ring_skbs == 0)
++ panic("ERROR - TX outstanding SKBs"
++ " counter is corrupted");
++ mp->tx_ring_skbs--;
++ } else
++ dma_unmap_page(NULL, pkt_info.buf_ptr,
++ pkt_info.byte_cnt, DMA_TO_DEVICE);
+ }
+
+ spin_unlock(&mp->lock);
+@@ -376,60 +389,59 @@
+ }
+
+ /*
+- * mv64340_eth_receive
++ * mv643xx_eth_receive
+ *
+ * This function is forward packets that are received from the port's
+ * queues toward kernel core or FastRoute them to another interface.
+ *
+- * Input : dev - a pointer to the required interface
+- * max - maximum number to receive (0 means unlimted)
++ * Input : dev - a pointer to the required interface
++ * max - maximum number to receive (0 means unlimted)
+ *
+- * Output : number of served packets
++ * Output : number of served packets
+ */
+-#ifdef MV64340_NAPI
+-static int mv64340_eth_receive_queue(struct net_device *dev, unsigned int max,
+- int budget)
++#ifdef MV643XX_NAPI
++static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
+ #else
+-static int mv64340_eth_receive_queue(struct net_device *dev, unsigned int max)
++static int mv643xx_eth_receive_queue(struct net_device *dev)
+ #endif
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ struct net_device_stats *stats = &mp->stats;
+ unsigned int received_packets = 0;
+ struct sk_buff *skb;
+ struct pkt_info pkt_info;
+
+-#ifdef MV64340_NAPI
++#ifdef MV643XX_NAPI
+ while (eth_port_receive(mp, &pkt_info) == ETH_OK && budget > 0) {
+ #else
+- while ((--max) && eth_port_receive(mp, &pkt_info) == ETH_OK) {
++ while (eth_port_receive(mp, &pkt_info) == ETH_OK) {
+ #endif
+ mp->rx_ring_skbs--;
+ received_packets++;
+-#ifdef MV64340_NAPI
++#ifdef MV643XX_NAPI
+ budget--;
+ #endif
+ /* Update statistics. Note byte count includes 4 byte CRC count */
+ stats->rx_packets++;
+ stats->rx_bytes += pkt_info.byte_cnt;
+- skb = (struct sk_buff *) pkt_info.return_info;
++ skb = pkt_info.return_info;
+ /*
+ * In case received a packet without first / last bits on OR
+ * the error summary bit is on, the packets needs to be dropeed.
+ */
+ if (((pkt_info.cmd_sts
+- & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
+- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
+- || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
++ & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
++ (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
++ || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
+ stats->rx_dropped++;
+ if ((pkt_info.cmd_sts & (ETH_RX_FIRST_DESC |
+- ETH_RX_LAST_DESC)) !=
+- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
++ ETH_RX_LAST_DESC)) !=
++ (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
+ if (net_ratelimit())
+ printk(KERN_ERR
+- "%s: Received packet spread on multiple"
+- " descriptors\n",
+- dev->name);
++ "%s: Received packet spread "
++ "on multiple descriptors\n",
++ dev->name);
+ }
+ if (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)
+ stats->rx_errors++;
+@@ -445,11 +457,11 @@
+
+ if (pkt_info.cmd_sts & ETH_LAYER_4_CHECKSUM_OK) {
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+- skb->csum = htons((pkt_info.cmd_sts
+- & 0x0007fff8) >> 3);
++ skb->csum = htons(
++ (pkt_info.cmd_sts & 0x0007fff8) >> 3);
+ }
+ skb->protocol = eth_type_trans(skb, dev);
+-#ifdef MV64340_NAPI
++#ifdef MV643XX_NAPI
+ netif_receive_skb(skb);
+ #else
+ netif_rx(skb);
+@@ -461,74 +473,74 @@
+ }
+
+ /*
+- * mv64340_eth_int_handler
++ * mv643xx_eth_int_handler
+ *
+ * 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
++ * Input : irq - irq number (not used)
++ * dev_id - a pointer to the required interface's data structure
++ * regs - not used
++ * Output : N/A
+ */
+
+-static irqreturn_t mv64340_eth_int_handler(int irq, void *dev_id,
+- struct pt_regs *regs)
++static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id,
++ struct pt_regs *regs)
+ {
+- struct net_device *dev = (struct net_device *) dev_id;
+- struct mv64340_private *mp = netdev_priv(dev);
++ 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;
+
+ /* Read interrupt cause registers */
+- eth_int_cause = MV_READ(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num)) &
+- INT_CAUSE_UNMASK_ALL;
++ eth_int_cause = mv_read(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num)) &
++ INT_CAUSE_UNMASK_ALL;
+
+ if (eth_int_cause & BIT1)
+- eth_int_cause_ext =
+- MV_READ(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
+- INT_CAUSE_UNMASK_ALL_EXT;
++ eth_int_cause_ext = mv_read(
++ MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
++ INT_CAUSE_UNMASK_ALL_EXT;
+
+-#ifdef MV64340_NAPI
++#ifdef MV643XX_NAPI
+ if (!(eth_int_cause & 0x0007fffd)) {
+- /* Dont ack the Rx interrupt */
++ /* Dont ack the Rx interrupt */
+ #endif
+ /*
+- * Clear specific ethernet port intrerrupt registers by
++ * Clear specific ethernet port intrerrupt registers by
+ * acknowleding relevant bits.
+ */
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num),
+- ~eth_int_cause);
++ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num),
++ ~eth_int_cause);
+ if (eth_int_cause_ext != 0x0)
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num),
+- ~eth_int_cause_ext);
++ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG
++ (port_num), ~eth_int_cause_ext);
+
+ /* UDP change : We may need this */
+ if ((eth_int_cause_ext & 0x0000ffff) &&
+- (mv64340_eth_free_tx_queue(dev, eth_int_cause_ext) == 0) &&
+- (MV64340_TX_QUEUE_SIZE > mp->tx_ring_skbs + 1))
+- netif_wake_queue(dev);
+-#ifdef MV64340_NAPI
++ (mv643xx_eth_free_tx_queue(dev, eth_int_cause_ext) == 0) &&
++ (mp->tx_ring_size > mp->tx_ring_skbs + MAX_DESCS_PER_SKB))
++ netif_wake_queue(dev);
++#ifdef MV643XX_NAPI
+ } else {
+ if (netif_rx_schedule_prep(dev)) {
+ /* Mask all the interrupts */
+- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),0);
+- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG
++ (port_num), 0);
+ __netif_rx_schedule(dev);
+ }
+ #else
+- {
+ if (eth_int_cause & (BIT2 | BIT11))
+- mv64340_eth_receive_queue(dev, 0);
++ mv643xx_eth_receive_queue(dev, 0);
+
+ /*
+- * After forwarded received packets to upper layer, add a task
++ * After forwarded received packets to upper layer, add a task
+ * in an interrupts enabled context that refills the RX ring
+ * with skb's.
+ */
+-#if MV64340_RX_QUEUE_FILL_ON_TASK
++#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
+ /* Unmask all interrupts on ethernet port */
+- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),
+- INT_CAUSE_MASK_ALL);
++ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
++ INT_CAUSE_MASK_ALL);
+ queue_task(&mp->rx_task, &tq_immediate);
+ mark_bh(IMMEDIATE_BH);
+ #else
+@@ -538,25 +550,15 @@
+ }
+ /* PHY status changed */
+ if (eth_int_cause_ext & (BIT16 | BIT20)) {
+- unsigned int phy_reg_data;
+-
+- /* Check Link status on ethernet port */
+- eth_port_read_smi_reg(port_num, 1, &phy_reg_data);
+- if (!(phy_reg_data & 0x20)) {
+- netif_stop_queue(dev);
+- } else {
++ if (eth_port_link_is_up(port_num)) {
++ netif_carrier_on(dev);
+ netif_wake_queue(dev);
+-
+- /*
+- * Start all TX queues on ethernet port. This is good in
+- * case of previous packets where not transmitted, due
+- * to link down and this command re-enables all TX
+- * queues.
+- * Note that it is possible to get a TX resource error
+- * interrupt after issuing this, since not all TX queues
+- * are enabled, or has anything to send.
+- */
+- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num), 1);
++ /* Start TX queue */
++ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG
++ (port_num), 1);
++ } else {
++ netif_carrier_off(dev);
++ netif_stop_queue(dev);
+ }
+ }
+
+@@ -570,7 +572,7 @@
+ return IRQ_HANDLED;
+ }
+
+-#ifdef MV64340_COAL
++#ifdef MV643XX_COAL
+
+ /*
+ * eth_port_set_rx_coal - Sets coalescing interrupt mechanism on RX path
+@@ -584,9 +586,9 @@
+ * , 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
++ * 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.
+@@ -596,15 +598,15 @@
+ *
+ */
+ static unsigned int eth_port_set_rx_coal(unsigned int eth_port_num,
+- unsigned int t_clk, unsigned int delay)
++ unsigned int t_clk, unsigned int delay)
+ {
+ unsigned int coal = ((t_clk / 1000000) * delay) / 64;
+
+ /* Set RX Coalescing mechanism */
+- MV_WRITE(MV64340_ETH_SDMA_CONFIG_REG(eth_port_num),
+- ((coal & 0x3fff) << 8) |
+- (MV_READ(MV64340_ETH_SDMA_CONFIG_REG(eth_port_num))
+- & 0xffc000ff));
++ mv_write(MV643XX_ETH_SDMA_CONFIG_REG(eth_port_num),
++ ((coal & 0x3fff) << 8) |
++ (mv_read(MV643XX_ETH_SDMA_CONFIG_REG(eth_port_num))
++ & 0xffc000ff));
+
+ return coal;
+ }
+@@ -618,13 +620,13 @@
+ * 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
++ * The parameter is calculated using the t_cLK frequency of the
+ * MV-643xx chip and the required delay in 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 uSeconds
++ * 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
+ *
+ * OUTPUT:
+ * Interrupt coalescing mechanism value is set in MV-643xx chip.
+@@ -634,48 +636,48 @@
+ *
+ */
+ static unsigned int eth_port_set_tx_coal(unsigned int eth_port_num,
+- unsigned int t_clk, unsigned int delay)
++ unsigned int t_clk, unsigned int delay)
+ {
+ unsigned int coal;
+ coal = ((t_clk / 1000000) * delay) / 64;
+ /* Set TX Coalescing mechanism */
+- MV_WRITE(MV64340_ETH_TX_FIFO_URGENT_THRESHOLD_REG(eth_port_num),
+- coal << 4);
++ mv_write(MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(eth_port_num),
++ coal << 4);
+ return coal;
+ }
+
+ /*
+- * mv64340_eth_open
++ * 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
++ * Input : a pointer to the network device structure
+ *
+- * Output : zero of success , nonzero if fails.
++ * Output : zero of success , nonzero if fails.
+ */
+
+-static int mv64340_eth_open(struct net_device *dev)
++static int mv643xx_eth_open(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+- int err = err;
++ int err;
+
+ spin_lock_irq(&mp->lock);
+
+- err = request_irq(dev->irq, mv64340_eth_int_handler,
+- SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
++ err = request_irq(dev->irq, mv643xx_eth_int_handler,
++ SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
+
+ if (err) {
+- printk(KERN_ERR "Can not assign IRQ number to MV64340_eth%d\n",
+- port_num);
++ printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
++ port_num);
+ err = -EAGAIN;
+ goto out;
+ }
+
+- if (mv64340_eth_real_open(dev)) {
++ if (mv643xx_eth_real_open(dev)) {
+ printk("%s: Error opening interface\n", dev->name);
+ err = -EBUSY;
+ goto out_free;
+@@ -698,66 +700,35 @@
+ * 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.
++ * 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.
+ *
+ * INPUT:
+- * struct mv64340_private *mp Ethernet Port Control srtuct.
+- * int rx_desc_num Number of Rx descriptors
+- * int rx_buff_size Size of Rx buffer
+- * unsigned int rx_desc_base_addr Rx descriptors memory area base addr.
+- * unsigned int rx_buff_base_addr Rx buffer memory area base addr.
++ * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ *
+ * OUTPUT:
+- * The routine updates the Ethernet port control struct with information
+- * regarding the Rx descriptors and buffers.
++ * The routine updates the Ethernet port control struct with information
++ * regarding the Rx descriptors and buffers.
+ *
+ * RETURN:
+- * false if the given descriptors memory area is not aligned according to
+- * Ethernet SDMA specifications.
+- * true otherwise.
++ * None.
+ */
+-static int ether_init_rx_desc_ring(struct mv64340_private * mp,
+- unsigned long rx_buff_base_addr)
++static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
+ {
+- unsigned long buffer_addr = rx_buff_base_addr;
+ volatile struct eth_rx_desc *p_rx_desc;
+ int rx_desc_num = mp->rx_ring_size;
+- unsigned long rx_desc_base_addr = (unsigned long) mp->p_rx_desc_area;
+- int rx_buff_size = 1536; /* Dummy, will be replaced later */
+ int i;
+
+- p_rx_desc = (struct eth_rx_desc *) rx_desc_base_addr;
+-
+- /* Rx desc Must be 4LW aligned (i.e. Descriptor_Address[3:0]=0000). */
+- if (rx_buff_base_addr & 0xf)
+- return 0;
+-
+- /* Rx buffers are limited to 64K bytes and Minimum size is 8 bytes */
+- if ((rx_buff_size < 8) || (rx_buff_size > RX_BUFFER_MAX_SIZE))
+- return 0;
+-
+- /* Rx buffers must be 64-bit aligned. */
+- if ((rx_buff_base_addr + rx_buff_size) & 0x7)
+- return 0;
+-
+- /* initialize the Rx descriptors ring */
++ /* 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].buf_size = rx_buff_size;
+- p_rx_desc[i].byte_cnt = 0x0000;
+- p_rx_desc[i].cmd_sts =
+- ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
+ p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
+ ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
+- p_rx_desc[i].buf_ptr = buffer_addr;
+-
+- mp->rx_skb[i] = NULL;
+- buffer_addr += rx_buff_size;
+ }
+
+ /* Save Rx desc pointer to driver struct. */
+@@ -766,293 +737,288 @@
+
+ mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
+
++ /* Add the queue to the list of RX queues of this port */
+ mp->port_rx_queue_command |= 1;
+-
+- return 1;
+ }
+
+ /*
+ * ether_init_tx_desc_ring - Curve a Tx chain desc list and buffer in memory.
+ *
+ * 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 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 mv64340_private *mp Ethernet Port Control srtuct.
+- * int tx_desc_num Number of Tx descriptors
+- * int tx_buff_size Size of Tx buffer
+- * unsigned int tx_desc_base_addr Tx descriptors memory area base addr.
++ * 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.
++ * The routine updates the Ethernet port control struct with information
++ * regarding the Tx descriptors and buffers.
+ *
+ * RETURN:
+- * false if the given descriptors memory area is not aligned according to
+- * Ethernet SDMA specifications.
+- * true otherwise.
++ * None.
+ */
+-static int ether_init_tx_desc_ring(struct mv64340_private *mp)
++static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
+ {
+- unsigned long tx_desc_base_addr = (unsigned long) mp->p_tx_desc_area;
+ int tx_desc_num = mp->tx_ring_size;
+ struct eth_tx_desc *p_tx_desc;
+ int i;
+
+- /* Tx desc Must be 4LW aligned (i.e. Descriptor_Address[3:0]=0000). */
+- if (tx_desc_base_addr & 0xf)
+- return 0;
+-
+- /* save the first desc pointer to link with the last descriptor */
+- p_tx_desc = (struct eth_tx_desc *) tx_desc_base_addr;
+-
+- /* Initialize the Tx descriptors ring */
++ /* 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].byte_cnt = 0x0000;
+- p_tx_desc[i].l4i_chk = 0x0000;
+- p_tx_desc[i].cmd_sts = 0x00000000;
+ p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
+ ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
+- p_tx_desc[i].buf_ptr = 0x00000000;
+- mp->tx_skb[i] = NULL;
+ }
+
+- /* Set Tx desc pointer in driver struct. */
+ mp->tx_curr_desc_q = 0;
+ mp->tx_used_desc_q = 0;
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
+- mp->tx_first_desc_q = 0;
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
++ mp->tx_first_desc_q = 0;
+ #endif
+- /* Init Tx ring base and size parameters */
+- mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
++
++ mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
+
+ /* Add the queue to the list of Tx queues of this port */
+ mp->port_tx_queue_command |= 1;
+-
+- return 1;
+ }
+
+-/* Helper function for mv64340_eth_open */
+-static int mv64340_eth_real_open(struct net_device *dev)
++/* Helper function for mv643xx_eth_open */
++static int mv643xx_eth_real_open(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+- u32 phy_reg_data;
+ unsigned int size;
+
+ /* Stop RX Queues */
+- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
+- 0x0000ff00);
++ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
+
+ /* Clear the ethernet port interrupts */
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
+
+ /* Unmask RX buffer and TX end interrupt */
+- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),
+- INT_CAUSE_UNMASK_ALL);
++ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
++ INT_CAUSE_UNMASK_ALL);
+
+ /* Unmask phy and link status changes interrupts */
+- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
+- INT_CAUSE_UNMASK_ALL_EXT);
++ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
++ INT_CAUSE_UNMASK_ALL_EXT);
+
+ /* Set the MAC Address */
+ memcpy(mp->port_mac_addr, dev->dev_addr, 6);
+
+ eth_port_init(mp);
+
+- INIT_WORK(&mp->rx_task, (void (*)(void *)) mv64340_eth_rx_task, dev);
++ INIT_WORK(&mp->rx_task, (void (*)(void *))mv643xx_eth_rx_task, dev);
+
+ memset(&mp->timeout, 0, sizeof(struct timer_list));
+- mp->timeout.function = mv64340_eth_rx_task_timer_wrapper;
+- mp->timeout.data = (unsigned long) dev;
++ mp->timeout.function = mv643xx_eth_rx_task_timer_wrapper;
++ mp->timeout.data = (unsigned long)dev;
+
+ mp->rx_task_busy = 0;
+ mp->rx_timer_flag = 0;
+
++ /* 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);
++ return -ENOMEM;
++ }
++ 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);
++ kfree(mp->rx_skb);
++ return -ENOMEM;
++ }
++
+ /* Allocate TX ring */
+ mp->tx_ring_skbs = 0;
+- mp->tx_ring_size = MV64340_TX_QUEUE_SIZE;
+ size = mp->tx_ring_size * sizeof(struct eth_tx_desc);
+ mp->tx_desc_area_size = size;
+
+- /* Assumes allocated ring is 16 bytes alligned */
+- mp->p_tx_desc_area = pci_alloc_consistent(NULL, size, &mp->tx_desc_dma);
++ 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);
++ dev->name, size);
++ kfree(mp->rx_skb);
++ kfree(mp->tx_skb);
+ return -ENOMEM;
+ }
+- memset((void *) mp->p_tx_desc_area, 0, mp->tx_desc_area_size);
++ 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);
+
+- /* Dummy will be replaced upon real tx */
+ ether_init_tx_desc_ring(mp);
+
+ /* Allocate RX ring */
+- /* Meantime RX Ring are fixed - but must be configurable by user */
+- mp->rx_ring_size = MV64340_RX_QUEUE_SIZE;
+ mp->rx_ring_skbs = 0;
+ size = mp->rx_ring_size * sizeof(struct eth_rx_desc);
+ mp->rx_desc_area_size = size;
+
+- /* Assumes allocated ring is 16 bytes aligned */
+-
+- mp->p_rx_desc_area = pci_alloc_consistent(NULL, size, &mp->rx_desc_dma);
++ 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);
++ dev->name, size);
+ printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
+- dev->name);
+- pci_free_consistent(0, mp->tx_desc_area_size,
+- (void *) mp->p_tx_desc_area,
+- mp->tx_desc_dma);
++ dev->name);
++ if (mp->rx_sram_size)
++ iounmap(mp->p_rx_desc_area);
++ else
++ dma_free_coherent(NULL, mp->tx_desc_area_size,
++ mp->p_tx_desc_area, mp->tx_desc_dma);
++ kfree(mp->rx_skb);
++ kfree(mp->tx_skb);
+ return -ENOMEM;
+ }
+- memset(mp->p_rx_desc_area, 0, size);
++ memset((void *)mp->p_rx_desc_area, 0, size);
+
+- if (!(ether_init_rx_desc_ring(mp, 0)))
+- panic("%s: Error initializing RX Ring", dev->name);
++ ether_init_rx_desc_ring(mp);
+
+- mv64340_eth_rx_task(dev); /* Fill RX ring with skb's */
++ mv643xx_eth_rx_task(dev); /* Fill RX ring with skb's */
+
+ eth_port_start(mp);
+
+ /* Interrupt Coalescing */
+
+-#ifdef MV64340_COAL
++#ifdef MV643XX_COAL
+ mp->rx_int_coal =
+- eth_port_set_rx_coal(port_num, 133000000, MV64340_RX_COAL);
++ eth_port_set_rx_coal(port_num, 133000000, MV643XX_RX_COAL);
+ #endif
+
+ mp->tx_int_coal =
+- eth_port_set_tx_coal (port_num, 133000000, MV64340_TX_COAL);
++ eth_port_set_tx_coal(port_num, 133000000, MV643XX_TX_COAL);
+
+- /* Increase the Rx side buffer size */
+-
+- MV_WRITE (MV64340_ETH_PORT_SERIAL_CONTROL_REG(port_num), (0x5 << 17) |
+- (MV_READ(MV64340_ETH_PORT_SERIAL_CONTROL_REG(port_num))
+- & 0xfff1ffff));
+-
+- /* Check Link status on phy */
+- eth_port_read_smi_reg(port_num, 1, &phy_reg_data);
+- if (!(phy_reg_data & 0x20))
+- netif_stop_queue(dev);
+- else
+- netif_start_queue(dev);
++ netif_start_queue(dev);
+
+ return 0;
+ }
+
+-static void mv64340_eth_free_tx_rings(struct net_device *dev)
++static void mv643xx_eth_free_tx_rings(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+ unsigned int curr;
+
+ /* Stop Tx Queues */
+- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num),
+- 0x0000ff00);
++ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
+
+- /* Free TX rings */
+ /* Free outstanding skb's on TX rings */
+- for (curr = 0;
+- (mp->tx_ring_skbs) && (curr < MV64340_TX_QUEUE_SIZE);
+- curr++) {
++ for (curr = 0; mp->tx_ring_skbs && curr < mp->tx_ring_size; curr++) {
+ if (mp->tx_skb[curr]) {
+ dev_kfree_skb(mp->tx_skb[curr]);
+ mp->tx_ring_skbs--;
+ }
+ }
+- if (mp->tx_ring_skbs != 0)
++ if (mp->tx_ring_skbs)
+ printk("%s: Error on Tx descriptor free - could not free %d"
+- " descriptors\n", dev->name,
+- mp->tx_ring_skbs);
+- pci_free_consistent(0, mp->tx_desc_area_size,
+- (void *) mp->p_tx_desc_area, mp->tx_desc_dma);
++ " descriptors\n", dev->name, mp->tx_ring_skbs);
++
++ /* 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 void mv64340_eth_free_rx_rings(struct net_device *dev)
++static void mv643xx_eth_free_rx_rings(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+ int curr;
+
+ /* Stop RX Queues */
+- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
+- 0x0000ff00);
++ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
+
+- /* Free RX rings */
+ /* Free preallocated skb's on RX rings */
+- for (curr = 0;
+- mp->rx_ring_skbs && (curr < MV64340_RX_QUEUE_SIZE);
+- curr++) {
++ for (curr = 0; mp->rx_ring_skbs && curr < mp->rx_ring_size; curr++) {
+ if (mp->rx_skb[curr]) {
+ dev_kfree_skb(mp->rx_skb[curr]);
+ mp->rx_ring_skbs--;
+ }
+ }
+
+- if (mp->rx_ring_skbs != 0)
++ if (mp->rx_ring_skbs)
+ printk(KERN_ERR
+- "%s: Error in freeing Rx Ring. %d skb's still"
+- " stuck in RX Ring - ignoring them\n", dev->name,
+- mp->rx_ring_skbs);
+- pci_free_consistent(0, mp->rx_desc_area_size,
+- (void *) mp->p_rx_desc_area,
+- mp->rx_desc_dma);
++ "%s: Error in freeing Rx Ring. %d skb's still"
++ " stuck in RX Ring - ignoring them\n", dev->name,
++ mp->rx_ring_skbs);
++ /* 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);
+ }
+
+ /*
+- * mv64340_eth_stop
++ * mv643xx_eth_stop
+ *
+- * This function is used when closing the network device.
+- * It updates the hardware,
++ * 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
++ * Input : a pointer to the device structure
++ * Output : zero if success , nonzero if fails
+ */
+
+-/* Helper function for mv64340_eth_stop */
++/* Helper function for mv643xx_eth_stop */
+
+-static int mv64340_eth_real_stop(struct net_device *dev)
++static int mv643xx_eth_real_stop(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+
++ netif_carrier_off(dev);
+ netif_stop_queue(dev);
+
+- mv64340_eth_free_tx_rings(dev);
+- mv64340_eth_free_rx_rings(dev);
++ mv643xx_eth_free_tx_rings(dev);
++ mv643xx_eth_free_rx_rings(dev);
+
+ eth_port_reset(mp->port_num);
+
+ /* Disable ethernet port interrupts */
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
+
+ /* Mask RX buffer and TX end interrupt */
+- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), 0);
+
+ /* Mask phy and link status changes interrupts */
+- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num), 0);
++ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num), 0);
+
+ return 0;
+ }
+
+-static int mv64340_eth_stop(struct net_device *dev)
++static int mv643xx_eth_stop(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+
+ spin_lock_irq(&mp->lock);
+
+- mv64340_eth_real_stop(dev);
++ mv643xx_eth_real_stop(dev);
+
+ free_irq(dev->irq, dev);
+ spin_unlock_irq(&mp->lock);
+@@ -1060,59 +1026,64 @@
+ return 0;
+ }
+
+-#ifdef MV64340_NAPI
+-static void mv64340_tx(struct net_device *dev)
++#ifdef MV643XX_NAPI
++static void mv643xx_tx(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
+- struct pkt_info pkt_info;
++ struct mv643xx_private *mp = netdev_priv(dev);
++ struct pkt_info pkt_info;
+
+ while (eth_tx_return_desc(mp, &pkt_info) == ETH_OK) {
+ if (pkt_info.return_info) {
+- dev_kfree_skb_irq((struct sk_buff *)
+- pkt_info.return_info);
+- if (skb_shinfo(pkt_info.return_info)->nr_frags)
+- pci_unmap_page(NULL, pkt_info.buf_ptr,
+- pkt_info.byte_cnt,
+- PCI_DMA_TODEVICE);
+-
+- if (mp->tx_ring_skbs != 1)
+- mp->tx_ring_skbs--;
+- } else
+- pci_unmap_page(NULL, pkt_info.buf_ptr, pkt_info.byte_cnt,
+- PCI_DMA_TODEVICE);
++ if (skb_shinfo(pkt_info.return_info)->nr_frags)
++ dma_unmap_page(NULL, pkt_info.buf_ptr,
++ pkt_info.byte_cnt,
++ DMA_TO_DEVICE);
++ else
++ dma_unmap_single(NULL, pkt_info.buf_ptr,
++ pkt_info.byte_cnt,
++ DMA_TO_DEVICE);
++
++ dev_kfree_skb_irq(pkt_info.return_info);
++
++ if (mp->tx_ring_skbs)
++ mp->tx_ring_skbs--;
++ } else
++ dma_unmap_page(NULL, pkt_info.buf_ptr,
++ pkt_info.byte_cnt, DMA_TO_DEVICE);
+ }
+
+ if (netif_queue_stopped(dev) &&
+- MV64340_TX_QUEUE_SIZE > mp->tx_ring_skbs + 1)
+- netif_wake_queue(dev);
++ mp->tx_ring_size > mp->tx_ring_skbs + MAX_DESCS_PER_SKB)
++ netif_wake_queue(dev);
+ }
+
+ /*
+- * mv64340_poll
++ * mv643xx_poll
+ *
+ * This function is used in case of NAPI
+ */
+-static int mv64340_poll(struct net_device *dev, int *budget)
++static int mv643xx_poll(struct net_device *dev, int *budget)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
+- int done = 1, orig_budget, work_done;
++ struct mv643xx_private *mp = netdev_priv(dev);
++ int done = 1, orig_budget, work_done;
+ unsigned int port_num = mp->port_num;
+ unsigned long flags;
+
+-#ifdef MV64340_TX_FAST_REFILL
++#ifdef MV643XX_TX_FAST_REFILL
+ if (++mp->tx_clean_threshold > 5) {
+ spin_lock_irqsave(&mp->lock, flags);
+- mv64340_tx(dev);
++ mv643xx_tx(dev);
+ mp->tx_clean_threshold = 0;
+ spin_unlock_irqrestore(&mp->lock, flags);
+ }
+ #endif
+
+- if ((u32)(MV_READ(MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(port_num))) != (u32)mp->rx_used_desc_q) {
++ 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 = mv64340_eth_receive_queue(dev, 0, orig_budget);
++ work_done = mv643xx_eth_receive_queue(dev, orig_budget);
+ mp->rx_task.func(dev);
+ *budget -= work_done;
+ dev->quota -= work_done;
+@@ -1123,12 +1094,12 @@
+ if (done) {
+ spin_lock_irqsave(&mp->lock, flags);
+ __netif_rx_complete(dev);
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_REG(port_num),0);
+- MV_WRITE(MV64340_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num),0);
+- MV_WRITE(MV64340_ETH_INTERRUPT_MASK_REG(port_num),
++ 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),
+ INT_CAUSE_UNMASK_ALL);
+- MV_WRITE(MV64340_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
+- INT_CAUSE_UNMASK_ALL_EXT);
++ mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
++ INT_CAUSE_UNMASK_ALL_EXT);
+ spin_unlock_irqrestore(&mp->lock, flags);
+ }
+
+@@ -1137,19 +1108,19 @@
+ #endif
+
+ /*
+- * mv64340_eth_start_xmit
++ * mv643xx_eth_start_xmit
+ *
+- * This function is queues a packet in the Tx descriptor for
++ * This function is queues a packet in the Tx descriptor for
+ * required port.
+ *
+- * Input : skb - a pointer to socket buffer
+- * dev - a pointer to the required port
++ * Input : skb - a pointer to socket buffer
++ * dev - a pointer to the required port
+ *
+- * Output : zero upon success
++ * Output : zero upon success
+ */
+-static int mv64340_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
++static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+ struct net_device_stats *stats = &mp->stats;
+ ETH_FUNC_RET_STATUS status;
+ unsigned long flags;
+@@ -1157,119 +1128,195 @@
+
+ if (netif_queue_stopped(dev)) {
+ printk(KERN_ERR
+- "%s: Tried sending packet when interface is stopped\n",
+- dev->name);
++ "%s: Tried sending packet when interface is stopped\n",
++ dev->name);
+ return 1;
+ }
+
+ /* This is a hard error, log it. */
+- if ((MV64340_TX_QUEUE_SIZE - mp->tx_ring_skbs) <=
+- (skb_shinfo(skb)->nr_frags + 1)) {
++ if ((mp->tx_ring_size - mp->tx_ring_skbs) <=
++ (skb_shinfo(skb)->nr_frags + 1)) {
+ netif_stop_queue(dev);
+ printk(KERN_ERR
+- "%s: Bug in mv64340_eth - Trying to transmit when"
+- " queue full !\n", dev->name);
++ "%s: Bug in mv643xx_eth - Trying to transmit when"
++ " queue full !\n", dev->name);
+ return 1;
+ }
+
+ /* Paranoid check - this shouldn't happen */
+ if (skb == NULL) {
+ stats->tx_dropped++;
++ printk(KERN_ERR "mv64320_eth paranoid check failed\n");
+ return 1;
+ }
+
+ spin_lock_irqsave(&mp->lock, flags);
+
+ /* Update packet info data structure -- DMA owned, first last */
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
+- if (!skb_shinfo(skb)->nr_frags || (skb_shinfo(skb)->nr_frags > 3)) {
+-#endif
+- pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT |
+- ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC;
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
++ if (!skb_shinfo(skb)->nr_frags) {
++linear:
++ if (skb->ip_summed != CHECKSUM_HW) {
++ pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT |
++ ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC;
++ pkt_info.l4i_chk = 0;
++ } else {
++ u32 ipheader = skb->nh.iph->ihl << 11;
+
++ pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT |
++ ETH_TX_FIRST_DESC | ETH_TX_LAST_DESC |
++ ETH_GEN_TCP_UDP_CHECKSUM |
++ ETH_GEN_IP_V_4_CHECKSUM | ipheader;
++ /* CPU already calculated pseudo header checksum. */
++ if (skb->nh.iph->protocol == IPPROTO_UDP) {
++ pkt_info.cmd_sts |= ETH_UDP_FRAME;
++ pkt_info.l4i_chk = skb->h.uh->check;
++ } else if (skb->nh.iph->protocol == IPPROTO_TCP)
++ pkt_info.l4i_chk = skb->h.th->check;
++ else {
++ printk(KERN_ERR
++ "%s: chksum proto != TCP or UDP\n",
++ dev->name);
++ spin_unlock_irqrestore(&mp->lock, flags);
++ return 1;
++ }
++ }
+ pkt_info.byte_cnt = skb->len;
+- pkt_info.buf_ptr = pci_map_single(0, skb->data, skb->len,
+- PCI_DMA_TODEVICE);
+-
+-
++ pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
++ DMA_TO_DEVICE);
+ pkt_info.return_info = skb;
++ mp->tx_ring_skbs++;
+ status = eth_port_send(mp, &pkt_info);
+ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
+ printk(KERN_ERR "%s: Error on transmitting packet\n",
+- dev->name);
+- mp->tx_ring_skbs++;
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
++ dev->name);
++ stats->tx_bytes += pkt_info.byte_cnt;
+ } else {
+- unsigned int frag;
+- u32 ipheader;
++ unsigned int frag;
++ u32 ipheader;
+
+- /* first frag which is skb header */
+- pkt_info.byte_cnt = skb_headlen(skb);
+- pkt_info.buf_ptr = pci_map_single(0, skb->data,
+- skb_headlen(skb), PCI_DMA_TODEVICE);
+- pkt_info.return_info = 0;
+- ipheader = skb->nh.iph->ihl << 11;
+- pkt_info.cmd_sts = ETH_TX_FIRST_DESC |
+- ETH_GEN_TCP_UDP_CHECKSUM |
+- ETH_GEN_IP_V_4_CHECKSUM |
+- ipheader;
+- /* CPU already calculated pseudo header checksum. So, use it */
+- pkt_info.l4i_chk = skb->h.th->check;
+- status = eth_port_send(mp, &pkt_info);
++ /* Since hardware can't handle unaligned fragments smaller
++ * than 9 bytes, if we find any, we linearize the skb
++ * and start again. When I've seen it, it's always been
++ * the first frag (probably near the end of the page),
++ * but we check all frags to be safe.
++ */
++ for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
++ skb_frag_t *fragp;
++
++ fragp = &skb_shinfo(skb)->frags[frag];
++ if (fragp->size <= 8 && fragp->page_offset & 0x7) {
++ skb_linearize(skb, GFP_ATOMIC);
++ printk(KERN_DEBUG "%s: unaligned tiny fragment"
++ "%d of %d, fixed\n",
++ dev->name, frag,
++ skb_shinfo(skb)->nr_frags);
++ goto linear;
++ }
++ }
++
++ /* first frag which is skb header */
++ pkt_info.byte_cnt = skb_headlen(skb);
++ pkt_info.buf_ptr = dma_map_single(NULL, skb->data,
++ skb_headlen(skb),
++ DMA_TO_DEVICE);
++ pkt_info.l4i_chk = 0;
++ pkt_info.return_info = 0;
++ pkt_info.cmd_sts = ETH_TX_FIRST_DESC;
++
++ if (skb->ip_summed == CHECKSUM_HW) {
++ ipheader = skb->nh.iph->ihl << 11;
++ pkt_info.cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
++ ETH_GEN_IP_V_4_CHECKSUM | ipheader;
++ /* CPU already calculated pseudo header checksum. */
++ if (skb->nh.iph->protocol == IPPROTO_UDP) {
++ pkt_info.cmd_sts |= ETH_UDP_FRAME;
++ pkt_info.l4i_chk = skb->h.uh->check;
++ } else if (skb->nh.iph->protocol == IPPROTO_TCP)
++ pkt_info.l4i_chk = skb->h.th->check;
++ else {
++ printk(KERN_ERR
++ "%s: chksum proto != TCP or UDP\n",
++ dev->name);
++ spin_unlock_irqrestore(&mp->lock, flags);
++ return 1;
++ }
++ }
++
++ status = eth_port_send(mp, &pkt_info);
+ if (status != ETH_OK) {
+- if ((status == ETH_ERROR))
+- printk(KERN_ERR "%s: Error on transmitting packet\n", dev->name);
+- if (status == ETH_QUEUE_FULL)
+- printk("Error on Queue Full \n");
+- if (status == ETH_QUEUE_LAST_RESOURCE)
+- printk("Tx resource error \n");
++ if ((status == ETH_ERROR))
++ printk(KERN_ERR
++ "%s: Error on transmitting packet\n",
++ dev->name);
++ if (status == ETH_QUEUE_FULL)
++ printk("Error on Queue Full \n");
++ if (status == ETH_QUEUE_LAST_RESOURCE)
++ printk("Tx resource error \n");
+ }
++ stats->tx_bytes += pkt_info.byte_cnt;
++
++ /* Check for the remaining frags */
++ for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
++ skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
++ pkt_info.l4i_chk = 0x0000;
++ pkt_info.cmd_sts = 0x00000000;
++
++ /* Last Frag enables interrupt and frees the skb */
++ if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
++ pkt_info.cmd_sts |= ETH_TX_ENABLE_INTERRUPT |
++ ETH_TX_LAST_DESC;
++ pkt_info.return_info = skb;
++ mp->tx_ring_skbs++;
++ } else {
++ pkt_info.return_info = 0;
++ }
++ pkt_info.l4i_chk = 0;
++ pkt_info.byte_cnt = this_frag->size;
+
+- /* Check for the remaining frags */
+- for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
+- skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
+- pkt_info.l4i_chk = 0x0000;
+- pkt_info.cmd_sts = 0x00000000;
+-
+- /* Last Frag enables interrupt and frees the skb */
+- if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
+- pkt_info.cmd_sts |= ETH_TX_ENABLE_INTERRUPT |
+- ETH_TX_LAST_DESC;
+- pkt_info.return_info = skb;
+- mp->tx_ring_skbs++;
+- }
+- else {
+- pkt_info.return_info = 0;
+- }
+- pkt_info.byte_cnt = this_frag->size;
+- if (this_frag->size < 8)
+- printk("%d : \n", skb_shinfo(skb)->nr_frags);
+-
+- pkt_info.buf_ptr = pci_map_page(NULL, this_frag->page,
+- this_frag->page_offset,
+- this_frag->size, PCI_DMA_TODEVICE);
++ pkt_info.buf_ptr = dma_map_page(NULL, this_frag->page,
++ this_frag->page_offset,
++ this_frag->size,
++ DMA_TO_DEVICE);
+
+- status = eth_port_send(mp, &pkt_info);
++ status = eth_port_send(mp, &pkt_info);
+
+ if (status != ETH_OK) {
+- if ((status == ETH_ERROR))
+- printk(KERN_ERR "%s: Error on transmitting packet\n", dev->name);
++ if ((status == ETH_ERROR))
++ printk(KERN_ERR "%s: Error on "
++ "transmitting packet\n",
++ dev->name);
+
+- if (status == ETH_QUEUE_LAST_RESOURCE)
+- printk("Tx resource error \n");
++ if (status == ETH_QUEUE_LAST_RESOURCE)
++ printk("Tx resource error \n");
+
+- if (status == ETH_QUEUE_FULL)
+- printk("Queue is full \n");
++ if (status == ETH_QUEUE_FULL)
++ printk("Queue is full \n");
+ }
+- }
+- }
++ stats->tx_bytes += pkt_info.byte_cnt;
++ }
++ }
++#else
++ pkt_info.cmd_sts = ETH_TX_ENABLE_INTERRUPT | ETH_TX_FIRST_DESC |
++ ETH_TX_LAST_DESC;
++ pkt_info.l4i_chk = 0;
++ pkt_info.byte_cnt = skb->len;
++ pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
++ DMA_TO_DEVICE);
++ pkt_info.return_info = skb;
++ mp->tx_ring_skbs++;
++ status = eth_port_send(mp, &pkt_info);
++ if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
++ printk(KERN_ERR "%s: Error on transmitting packet\n",
++ dev->name);
++ stats->tx_bytes += pkt_info.byte_cnt;
+ #endif
+
+ /* Check if TX queue can handle another skb. If not, then
+ * signal higher layers to stop requesting TX
+ */
+- if (MV64340_TX_QUEUE_SIZE <= (mp->tx_ring_skbs + 1))
+- /*
++ if (mp->tx_ring_size <= (mp->tx_ring_skbs + MAX_DESCS_PER_SKB))
++ /*
+ * Stop getting skb's from upper layers.
+ * Getting skb's from upper layers will be enabled again after
+ * packets are released.
+@@ -1277,7 +1324,6 @@
+ netif_stop_queue(dev);
+
+ /* Update statistics and start of transmittion time */
+- stats->tx_bytes += skb->len;
+ stats->tx_packets++;
+ dev->trans_start = jiffies;
+
+@@ -1287,214 +1333,304 @@
+ }
+
+ /*
+- * mv64340_eth_get_stats
++ * mv643xx_eth_get_stats
+ *
+ * Returns a pointer to the interface statistics.
+ *
+- * Input : dev - a pointer to the required interface
++ * Input : dev - a pointer to the required interface
+ *
+- * Output : a pointer to the interface's statistics
++ * Output : a pointer to the interface's statistics
+ */
+
+-static struct net_device_stats *mv64340_eth_get_stats(struct net_device *dev)
++static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct mv643xx_private *mp = netdev_priv(dev);
+
+ return &mp->stats;
+ }
+
+ /*/
+- * mv64340_eth_init
+- *
+- * First function called after registering the network device.
+- * It's purpose is to initialize the device as an ethernet device,
+- * fill the structure that was given in registration with pointers
+- * to functions, and setting the MAC address of the interface
++ * mv643xx_eth_probe
+ *
+- * Input : number of port to initialize
+- * Output : -ENONMEM if failed , 0 if success
+- */
+-static struct net_device *mv64340_eth_init(int port_num)
+-{
+- struct mv64340_private *mp;
++ * 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
++ *
++ * Input : struct device *
++ * Output : -ENOMEM if failed , 0 if success
++ */
++static int mv643xx_eth_probe(struct device *ddev)
++{
++ struct platform_device *pdev = to_platform_device(ddev);
++ 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;
+
+- dev = alloc_etherdev(sizeof(struct mv64340_private));
++ dev = alloc_etherdev(sizeof(struct mv643xx_private));
+ if (!dev)
+- return NULL;
++ return -ENOMEM;
++
++ dev_set_drvdata(ddev, dev);
+
+ mp = netdev_priv(dev);
+
+- dev->irq = ETH_PORT0_IRQ_NUM + port_num;
++ res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
++ BUG_ON(!res);
++ dev->irq = res->start;
+
+- dev->open = mv64340_eth_open;
+- dev->stop = mv64340_eth_stop;
+- dev->hard_start_xmit = mv64340_eth_start_xmit;
+- dev->get_stats = mv64340_eth_get_stats;
+- dev->set_mac_address = mv64340_eth_set_mac_address;
+- dev->set_multicast_list = mv64340_eth_set_rx_mode;
++ 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 = mv64340_eth_tx_timeout;
+-#ifdef MV64340_NAPI
+- dev->poll = mv64340_poll;
+- dev->weight = 64;
++ dev->tx_timeout = mv643xx_eth_tx_timeout;
++#ifdef MV643XX_NAPI
++ dev->poll = mv643xx_poll;
++ dev->weight = 64;
+ #endif
+
+ dev->watchdog_timeo = 2 * HZ;
+- dev->tx_queue_len = MV64340_TX_QUEUE_SIZE;
++ dev->tx_queue_len = mp->tx_ring_size;
+ dev->base_addr = 0;
+- dev->change_mtu = mv64340_eth_change_mtu;
++ dev->change_mtu = mv643xx_eth_change_mtu;
++ SET_ETHTOOL_OPS(dev, &mv643xx_ethtool_ops);
+
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+ #ifdef MAX_SKB_FRAGS
+ #ifndef CONFIG_JAGUAR_DMALOW
+- /*
+- * 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 | NETIF_F_HW_CSUM;
++ /*
++ * 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 | NETIF_F_HW_CSUM;
+ #endif
+ #endif
+ #endif
+
+- mp->port_num = port_num;
+-
+ /* Configure the timeout task */
+- INIT_WORK(&mp->tx_timeout_task,
+- (void (*)(void *))mv64340_eth_tx_timeout_task, dev);
++ INIT_WORK(&mp->tx_timeout_task,
++ (void (*)(void *))mv643xx_eth_tx_timeout_task, dev);
+
+ spin_lock_init(&mp->lock);
+
+- /* set MAC addresses */
+- memcpy(dev->dev_addr, prom_mac_addr_base, 6);
+- dev->dev_addr[5] += port_num;
++ /* set default config values */
++ eth_port_uc_addr_get(dev, dev->dev_addr);
++ mp->port_config = MV643XX_ETH_PORT_CONFIG_DEFAULT_VALUE;
++ mp->port_config_extend = MV643XX_ETH_PORT_CONFIG_EXTEND_DEFAULT_VALUE;
++ mp->port_sdma_config = MV643XX_ETH_PORT_SDMA_CONFIG_DEFAULT_VALUE;
++ mp->port_serial_control = MV643XX_ETH_PORT_SERIAL_CONTROL_DEFAULT_VALUE;
++ mp->rx_ring_size = MV643XX_ETH_PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
++ mp->tx_ring_size = MV643XX_ETH_PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
++
++ pd = pdev->dev.platform_data;
++ if (pd) {
++ if (pd->mac_addr != NULL)
++ memcpy(dev->dev_addr, pd->mac_addr, 6);
++
++ if (pd->phy_addr || pd->force_phy_addr)
++ ethernet_phy_set(port_num, pd->phy_addr);
++
++ if (pd->port_config || pd->force_port_config)
++ mp->port_config = pd->port_config;
++
++ if (pd->port_config_extend || pd->force_port_config_extend)
++ mp->port_config_extend = pd->port_config_extend;
++
++ if (pd->port_sdma_config || pd->force_port_sdma_config)
++ mp->port_sdma_config = pd->port_sdma_config;
++
++ if (pd->port_serial_control || pd->force_port_serial_control)
++ mp->port_serial_control = pd->port_serial_control;
++
++ if (pd->rx_queue_size)
++ mp->rx_ring_size = pd->rx_queue_size;
++
++ if (pd->tx_queue_size)
++ mp->tx_ring_size = pd->tx_queue_size;
++
++ if (pd->tx_sram_size) {
++ mp->tx_sram_size = pd->tx_sram_size;
++ mp->tx_sram_addr = pd->tx_sram_addr;
++ }
++
++ if (pd->rx_sram_size) {
++ mp->rx_sram_size = pd->rx_sram_size;
++ mp->rx_sram_addr = pd->rx_sram_addr;
++ }
++ }
++
++ 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));
++ return err;
++ }
+
+ err = register_netdev(dev);
+ if (err)
+- goto out_free_dev;
++ goto out;
+
+- printk(KERN_NOTICE "%s: port %d with MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
+- dev->name, port_num,
+- dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+- dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
++ 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]);
+
+ if (dev->features & NETIF_F_SG)
+- printk("Scatter Gather Enabled ");
++ printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name);
+
+ if (dev->features & NETIF_F_IP_CSUM)
+- printk("TX TCP/IP Checksumming Supported \n");
++ printk(KERN_NOTICE "%s: TX TCP/IP Checksumming Supported\n",
++ dev->name);
++
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
++ printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON \n", dev->name);
++#endif
+
+- printk("RX TCP/UDP Checksum Offload ON, \n");
+- printk("TX and RX Interrupt Coalescing ON \n");
++#ifdef MV643XX_COAL
++ printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON \n",
++ dev->name);
++#endif
+
+-#ifdef MV64340_NAPI
+- printk("RX NAPI Enabled \n");
++#ifdef MV643XX_NAPI
++ printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
+ #endif
+
+- return dev;
++ return 0;
+
+-out_free_dev:
++out:
+ free_netdev(dev);
+
+- return NULL;
++ return err;
+ }
+
+-static void mv64340_eth_remove(struct net_device *dev)
++static int mv643xx_eth_remove(struct device *ddev)
+ {
+- struct mv64340_private *mp = netdev_priv(dev);
++ struct net_device *dev = dev_get_drvdata(ddev);
+
+ unregister_netdev(dev);
+ flush_scheduled_work();
++
+ free_netdev(dev);
++ dev_set_drvdata(ddev, NULL);
++ return 0;
++}
++
++static int mv643xx_eth_shared_probe(struct device *ddev)
++{
++ struct platform_device *pdev = to_platform_device(ddev);
++ struct resource *res;
++
++ printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
++
++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (res == NULL)
++ return -ENODEV;
++
++ mv643xx_eth_shared_base = ioremap(res->start,
++ MV643XX_ETH_SHARED_REGS_SIZE);
++ if (mv643xx_eth_shared_base == NULL)
++ return -ENOMEM;
++
++ return 0;
++
++}
++
++static int mv643xx_eth_shared_remove(struct device *ddev)
++{
++ iounmap(mv643xx_eth_shared_base);
++ mv643xx_eth_shared_base = NULL;
++
++ return 0;
+ }
+
+-static struct net_device *mv64340_dev0;
+-static struct net_device *mv64340_dev1;
+-static struct net_device *mv64340_dev2;
++static struct device_driver mv643xx_eth_driver = {
++ .name = MV643XX_ETH_NAME,
++ .bus = &platform_bus_type,
++ .probe = mv643xx_eth_probe,
++ .remove = mv643xx_eth_remove,
++};
++
++static struct device_driver mv643xx_eth_shared_driver = {
++ .name = MV643XX_ETH_SHARED_NAME,
++ .bus = &platform_bus_type,
++ .probe = mv643xx_eth_shared_probe,
++ .remove = mv643xx_eth_shared_remove,
++};
+
+ /*
+- * mv64340_init_module
++ * mv643xx_init_module
+ *
+ * Registers the network drivers into the Linux kernel
+ *
+- * Input : N/A
++ * Input : N/A
+ *
+- * Output : N/A
++ * Output : N/A
+ */
+-static int __init mv64340_init_module(void)
++static int __init mv643xx_init_module(void)
+ {
+- printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
++ int rc;
+
+-#ifdef CONFIG_MV643XX_ETH_0
+- mv64340_dev0 = mv64340_eth_init(0);
+- if (!mv64340_dev0) {
+- printk(KERN_ERR
+- "Error registering MV-64360 ethernet port 0\n");
+- }
+-#endif
+-#ifdef CONFIG_MV643XX_ETH_1
+- mv64340_dev1 = mv64340_eth_init(1);
+- if (!mv64340_dev1) {
+- printk(KERN_ERR
+- "Error registering MV-64360 ethernet port 1\n");
+- }
+-#endif
+-#ifdef CONFIG_MV643XX_ETH_2
+- mv64340_dev2 = mv64340_eth_init(2);
+- if (!mv64340_dev2) {
+- printk(KERN_ERR
+- "Error registering MV-64360 ethernet port 2\n");
++ rc = driver_register(&mv643xx_eth_shared_driver);
++ if (!rc) {
++ rc = driver_register(&mv643xx_eth_driver);
++ if (rc)
++ driver_unregister(&mv643xx_eth_shared_driver);
+ }
+-#endif
+- return 0;
++ return rc;
+ }
+
+ /*
+- * mv64340_cleanup_module
++ * mv643xx_cleanup_module
+ *
+ * Registers the network drivers into the Linux kernel
+ *
+- * Input : N/A
++ * Input : N/A
+ *
+- * Output : N/A
++ * Output : N/A
+ */
+-static void __exit mv64340_cleanup_module(void)
++static void __exit mv643xx_cleanup_module(void)
+ {
+- if (mv64340_dev2)
+- mv64340_eth_remove(mv64340_dev2);
+- if (mv64340_dev1)
+- mv64340_eth_remove(mv64340_dev1);
+- if (mv64340_dev0)
+- mv64340_eth_remove(mv64340_dev0);
++ driver_unregister(&mv643xx_eth_driver);
++ driver_unregister(&mv643xx_eth_shared_driver);
+ }
+
+-module_init(mv64340_init_module);
+-module_exit(mv64340_cleanup_module);
++module_init(mv643xx_init_module);
++module_exit(mv643xx_cleanup_module);
+
+ MODULE_LICENSE("GPL");
+-MODULE_AUTHOR("Rabeeh Khoury, Assaf Hoffman, Matthew Dharm and Manish Lachwani");
+-MODULE_DESCRIPTION("Ethernet driver for Marvell MV64340");
++MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
++ " and Dale Farnsworth");
++MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
+
+ /*
+- * The second part is the low level driver of the gigE ethernet ports.
++ * The second part is the low level driver of the gigE ethernet ports.
+ */
+
+ /*
+ * Marvell's Gigabit Ethernet controller low level driver
+ *
+ * DESCRIPTION:
+- * This file introduce low level API to Marvell's Gigabit Ethernet
++ * 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 mv64340_private.
++ * struct mv643xx_private.
+ * This struct includes user configuration information as well as
+ * driver internal data needed for its operations.
+ *
+- * Supported Features:
++ * 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.
+@@ -1511,12 +1647,12 @@
+ * - 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 mv64340_private
+- * struct.
++ * 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.
+ *
+@@ -1525,7 +1661,7 @@
+ * access to DRAM and internal SRAM memory spaces.
+ *
+ * Driver ring initialization
+- * Allocating memory for the descriptor rings and buffers is not
++ * 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
+@@ -1533,49 +1669,50 @@
+ * of a ring.
+ * Note: Pay special attention to alignment issues when using
+ * cached descriptors/buffers. In this phase the driver store
+- * information in the mv64340_private struct regarding each queue
++ * information in the mv643xx_private struct regarding each queue
+ * ring.
+ *
+- * Driver start
++ * Driver start
+ * This phase prepares the Ethernet port for Rx and Tx activity.
+- * It uses the information stored in the mv64340_private struct to
++ * 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.
++ * 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
++ * '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
++ * '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
++ * 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.
++ * 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.
++ * 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.
+@@ -1596,27 +1733,21 @@
+ *
+ * EXTERNAL INTERFACE
+ *
+- * Prior to calling the initialization routine eth_port_init() the user
+- * must set the following fields under mv64340_private struct:
+- * port_num User Ethernet port number.
+- * port_mac_addr[6] User defined port MAC address.
+- * 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 introduce a set of default values:
+- * PORT_CONFIG_VALUE Default port configuration value
+- * PORT_CONFIG_EXTEND_VALUE Default port extend configuration value
+- * PORT_SDMA_CONFIG_VALUE Default sdma control value
+- * PORT_SERIAL_CONTROL_VALUE Default port serial control value
++ * 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_mac_addr[6] User defined port MAC address.
++ * 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:
++ * 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.
++ * only.
+ * cmd_sts Tx/Rx descriptor command status.
+ * buf_ptr Tx/Rx descriptor buffer pointer.
+ * return_info Tx/Rx user resource return information.
+@@ -1625,70 +1756,44 @@
+ /* defines */
+ /* SDMA command macros */
+ #define ETH_ENABLE_TX_QUEUE(eth_port) \
+- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port), 1)
+-
+-#define ETH_DISABLE_TX_QUEUE(eth_port) \
+- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port), \
+- (1 << 8))
+-
+-#define ETH_ENABLE_RX_QUEUE(rx_queue, eth_port) \
+- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(eth_port), \
+- (1 << rx_queue))
+-
+-#define ETH_DISABLE_RX_QUEUE(rx_queue, eth_port) \
+- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(eth_port), \
+- (1 << (8 + rx_queue)))
+-
+-#define LINK_UP_TIMEOUT 100000
+-#define PHY_BUSY_TIMEOUT 10000000
++ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port), 1)
+
+ /* locals */
+
+ /* 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);
+
+ /* Ethernet Port routines */
+ static int eth_port_uc_addr(unsigned int eth_port_num, unsigned char uc_nibble,
+- int option);
++ int option);
+
+ /*
+ * eth_port_init - Initialize the Ethernet port driver
+ *
+ * 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 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:
+- * struct mv64340_private *mp Ethernet port control struct
++ * struct mv643xx_private *mp Ethernet port control struct
+ *
+ * OUTPUT:
+- * See description.
++ * See description.
+ *
+ * RETURN:
+- * None.
++ * None.
+ */
+-static void eth_port_init(struct mv64340_private * mp)
++static void eth_port_init(struct mv643xx_private *mp)
+ {
+- mp->port_config = PORT_CONFIG_VALUE;
+- mp->port_config_extend = PORT_CONFIG_EXTEND_VALUE;
+-#if defined(__BIG_ENDIAN)
+- mp->port_sdma_config = PORT_SDMA_CONFIG_VALUE;
+-#elif defined(__LITTLE_ENDIAN)
+- mp->port_sdma_config = PORT_SDMA_CONFIG_VALUE |
+- ETH_BLM_RX_NO_SWAP | ETH_BLM_TX_NO_SWAP;
+-#else
+-#error One of __LITTLE_ENDIAN or __BIG_ENDIAN must be defined!
+-#endif
+- mp->port_serial_control = PORT_SERIAL_CONTROL_VALUE;
+-
+ mp->port_rx_queue_command = 0;
+ mp->port_tx_queue_command = 0;
+
+@@ -1706,77 +1811,73 @@
+ * eth_port_start - Start the Ethernet port activity.
+ *
+ * DESCRIPTION:
+- * This routine prepares the Ethernet port for Rx and Tx activity:
+- * 1. Initialize Tx and Rx Current Descriptor Pointer for each queue that
+- * has been initialized a descriptor's ring (using
+- * ether_init_tx_desc_ring for Tx and ether_init_rx_desc_ring for Rx)
+- * 2. Initialize and enable the Ethernet configuration port by writing to
+- * the port's configuration and command registers.
+- * 3. Initialize and enable the SDMA by writing to the SDMA's
+- * configuration and command registers. After completing these steps,
+- * the ethernet port SDMA can starts to perform Rx and Tx activities.
++ * This routine prepares the Ethernet port for Rx and Tx activity:
++ * 1. Initialize Tx and Rx Current Descriptor Pointer for each queue that
++ * has been initialized a descriptor's ring (using
++ * ether_init_tx_desc_ring for Tx and ether_init_rx_desc_ring for Rx)
++ * 2. Initialize and enable the Ethernet configuration port by writing to
++ * the port's configuration and command registers.
++ * 3. Initialize and enable the SDMA by writing to the SDMA's
++ * configuration and command registers. After completing these steps,
++ * the ethernet port SDMA can starts to perform Rx and Tx activities.
+ *
+- * Note: Each Rx and Tx queue descriptor's list must be initialized prior
+- * to calling this function (use ether_init_tx_desc_ring for Tx queues
+- * and ether_init_rx_desc_ring for Rx queues).
++ * Note: Each Rx and Tx queue descriptor's list must be initialized prior
++ * to calling this function (use ether_init_tx_desc_ring for Tx queues
++ * and ether_init_rx_desc_ring for Rx queues).
+ *
+ * INPUT:
+- * struct mv64340_private *mp Ethernet port control struct
++ * struct mv643xx_private *mp Ethernet port control struct
+ *
+ * OUTPUT:
+- * Ethernet port is ready to receive and transmit.
++ * Ethernet port is ready to receive and transmit.
+ *
+ * RETURN:
+- * false if the port PHY is not up.
+- * true otherwise.
++ * None.
+ */
+-static int eth_port_start(struct mv64340_private *mp)
++static void eth_port_start(struct mv643xx_private *mp)
+ {
+- unsigned int eth_port_num = mp->port_num;
++ unsigned int port_num = mp->port_num;
+ int tx_curr_desc, rx_curr_desc;
+- unsigned int phy_reg_data;
+
+ /* Assignment of Tx CTRP of given queue */
+ tx_curr_desc = mp->tx_curr_desc_q;
+- MV_WRITE(MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(eth_port_num),
+- (struct eth_tx_desc *) mp->tx_desc_dma + tx_curr_desc);
++ mv_write(MV643XX_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(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(MV64340_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(eth_port_num),
+- (struct eth_rx_desc *) mp->rx_desc_dma + rx_curr_desc);
++ mv_write(MV643XX_ETH_RX_CURRENT_QUEUE_DESC_PTR_0(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(mp->port_num, mp->port_mac_addr);
++ eth_port_uc_addr_set(port_num, mp->port_mac_addr);
+
+ /* Assign port configuration and command. */
+- MV_WRITE(MV64340_ETH_PORT_CONFIG_REG(eth_port_num),
+- mp->port_config);
++ mv_write(MV643XX_ETH_PORT_CONFIG_REG(port_num), mp->port_config);
+
+- MV_WRITE(MV64340_ETH_PORT_CONFIG_EXTEND_REG(eth_port_num),
+- mp->port_config_extend);
++ mv_write(MV643XX_ETH_PORT_CONFIG_EXTEND_REG(port_num),
++ mp->port_config_extend);
+
+- MV_WRITE(MV64340_ETH_PORT_SERIAL_CONTROL_REG(eth_port_num),
+- mp->port_serial_control);
+
+- MV_SET_REG_BITS(MV64340_ETH_PORT_SERIAL_CONTROL_REG(eth_port_num),
+- ETH_SERIAL_PORT_ENABLE);
++ /* Increase the Rx side buffer size if supporting GigE */
++ if (mp->port_serial_control & MV643XX_ETH_SET_GMII_SPEED_TO_1000)
++ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
++ (mp->port_serial_control & 0xfff1ffff) | (0x5 << 17));
++ else
++ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
++ mp->port_serial_control);
++
++ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num),
++ mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num)) |
++ MV643XX_ETH_SERIAL_PORT_ENABLE);
+
+ /* Assign port SDMA configuration */
+- MV_WRITE(MV64340_ETH_SDMA_CONFIG_REG(eth_port_num),
+- mp->port_sdma_config);
++ mv_write(MV643XX_ETH_SDMA_CONFIG_REG(port_num),
++ mp->port_sdma_config);
+
+ /* Enable port Rx. */
+- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG(eth_port_num),
+- mp->port_rx_queue_command);
+-
+- /* Check if link is up */
+- eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data);
+-
+- if (!(phy_reg_data & 0x20))
+- return 0;
+-
+- return 1;
++ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
++ mp->port_rx_queue_command);
+ }
+
+ /*
+@@ -1786,29 +1887,29 @@
+ * This function Set the port Ethernet MAC address.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Port number.
+- * char * p_addr Address to be set
++ * unsigned int eth_port_num Port number.
++ * char * p_addr Address to be set
+ *
+ * OUTPUT:
+- * Set MAC address low and high registers. also calls eth_port_uc_addr()
+- * To set the unicast table with the proper information.
++ * Set MAC address low and high registers. also calls eth_port_uc_addr()
++ * To set the unicast table with the proper information.
+ *
+ * RETURN:
+ * N/A.
+ *
+ */
+ static void eth_port_uc_addr_set(unsigned int eth_port_num,
+- unsigned char *p_addr)
++ unsigned char *p_addr)
+ {
+ unsigned int mac_h;
+ unsigned int mac_l;
+
+ 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);
++ mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
++ (p_addr[3] << 0);
+
+- MV_WRITE(MV64340_ETH_MAC_ADDR_LOW(eth_port_num), mac_l);
+- MV_WRITE(MV64340_ETH_MAC_ADDR_HIGH(eth_port_num), mac_h);
++ mv_write(MV643XX_ETH_MAC_ADDR_LOW(eth_port_num), mac_l);
++ mv_write(MV643XX_ETH_MAC_ADDR_HIGH(eth_port_num), mac_h);
+
+ /* Accept frames of this address */
+ eth_port_uc_addr(eth_port_num, p_addr[5], ACCEPT_MAC_ADDR);
+@@ -1817,29 +1918,64 @@
+ }
+
+ /*
++ * eth_port_uc_addr_get - This function retrieves the port Unicast address
++ * (MAC address) from the ethernet hw registers.
++ *
++ * DESCRIPTION:
++ * This function retrieves the port Ethernet MAC address.
++ *
++ * INPUT:
++ * unsigned int eth_port_num Port number.
++ * char *MacAddr pointer where the MAC address is stored
++ *
++ * OUTPUT:
++ * Copy the MAC address to the location pointed to by MacAddr
++ *
++ * 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;
++}
++
++/*
+ * eth_port_uc_addr - This function Set the port unicast address table
+ *
+ * DESCRIPTION:
+- * This function locates the proper entry in the Unicast table for the
+- * specified MAC nibble and sets its properties according to function
++ * This function locates the proper entry in the Unicast table for the
++ * specified MAC nibble and sets its properties according to function
+ * parameters.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Port number.
+- * unsigned char uc_nibble Unicast MAC Address last nibble.
+- * int option 0 = Add, 1 = remove address.
++ * unsigned int eth_port_num Port number.
++ * unsigned char uc_nibble Unicast MAC Address last nibble.
++ * int option 0 = Add, 1 = remove address.
+ *
+ * OUTPUT:
+ * This function add/removes MAC addresses from the port unicast address
+- * table.
++ * table.
+ *
+ * RETURN:
+ * true is output succeeded.
+ * false if option parameter is invalid.
+ *
+ */
+-static int eth_port_uc_addr(unsigned int eth_port_num,
+- unsigned char uc_nibble, int option)
++static int eth_port_uc_addr(unsigned int eth_port_num, unsigned char uc_nibble,
++ int option)
+ {
+ unsigned int unicast_reg;
+ unsigned int tbl_offset;
+@@ -1852,29 +1988,26 @@
+
+ switch (option) {
+ case REJECT_MAC_ADDR:
+- /* Clear accepts frame bit at specified unicast DA table entry */
+- unicast_reg = MV_READ((MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
+- (eth_port_num) + tbl_offset));
++ /* Clear accepts frame bit at given unicast DA table entry */
++ unicast_reg = mv_read((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
++ (eth_port_num) + tbl_offset));
+
+ unicast_reg &= (0x0E << (8 * reg_offset));
+
+- MV_WRITE(
+- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
+- (eth_port_num) + tbl_offset), unicast_reg);
++ mv_write((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
++ (eth_port_num) + tbl_offset), unicast_reg);
+ break;
+
+ case ACCEPT_MAC_ADDR:
+ /* Set accepts frame bit at unicast DA filter table entry */
+ unicast_reg =
+- MV_READ(
+- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
+- (eth_port_num) + tbl_offset));
++ mv_read((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
++ (eth_port_num) + tbl_offset));
+
+ unicast_reg |= (0x01 << (8 * reg_offset));
+
+- MV_WRITE(
+- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
+- (eth_port_num) + tbl_offset), unicast_reg);
++ mv_write((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
++ (eth_port_num) + tbl_offset), unicast_reg);
+
+ break;
+
+@@ -1889,17 +2022,17 @@
+ * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
+ *
+ * DESCRIPTION:
+- * Go through all the DA filter tables (Unicast, Special Multicast &
+- * Other Multicast) and set each entry to 0.
++ * Go through all the DA filter tables (Unicast, Special Multicast &
++ * Other Multicast) and set each entry to 0.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Ethernet Port number.
++ * unsigned int eth_port_num Ethernet Port number.
+ *
+ * OUTPUT:
+- * Multicast and Unicast packets are rejected.
++ * Multicast and Unicast packets are rejected.
+ *
+ * RETURN:
+- * None.
++ * None.
+ */
+ static void eth_port_init_mac_tables(unsigned int eth_port_num)
+ {
+@@ -1907,18 +2040,16 @@
+
+ /* Clear DA filter unicast table (Ex_dFUT) */
+ for (table_index = 0; table_index <= 0xC; table_index += 4)
+- MV_WRITE(
+- (MV64340_ETH_DA_FILTER_UNICAST_TABLE_BASE
+- (eth_port_num) + table_index), 0);
++ mv_write((MV643XX_ETH_DA_FILTER_UNICAST_TABLE_BASE
++ (eth_port_num) + table_index), 0);
+
+ for (table_index = 0; table_index <= 0xFC; table_index += 4) {
+ /* Clear DA filter special multicast table (Ex_dFSMT) */
+- MV_WRITE(
+- (MV64340_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
+- (eth_port_num) + table_index), 0);
++ 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((MV64340_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE
+- (eth_port_num) + table_index), 0);
++ mv_write((MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE
++ (eth_port_num) + table_index), 0);
+ }
+ }
+
+@@ -1926,17 +2057,17 @@
+ * 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.
++ * 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.
++ * unsigned int eth_port_num Ethernet Port number.
+ *
+ * OUTPUT:
+- * After reading all MIB counters, the counters resets.
++ * After reading all MIB counters, the counters resets.
+ *
+ * RETURN:
+- * MIB counter value.
++ * MIB counter value.
+ *
+ */
+ static void eth_clear_mib_counters(unsigned int eth_port_num)
+@@ -1944,72 +2075,155 @@
+ int i;
+
+ /* Perform dummy reads from MIB counters */
+- for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION; i += 4)
+- MV_READ(MV64340_ETH_MIB_COUNTERS_BASE(eth_port_num) + i);
++ 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);
++}
++
++static inline u32 read_mib(struct mv643xx_private *mp, int offset)
++{
++ return mv_read(MV643XX_ETH_MIB_COUNTERS_BASE(mp->port_num) + offset);
+ }
+
++static void eth_update_mib_counters(struct mv643xx_private *mp)
++{
++ struct mv643xx_mib_counters *p = &mp->mib_counters;
++ int offset;
++
++ 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;
++
++ 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);
++
++ 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;
++
++ for (offset = ETH_MIB_GOOD_FRAMES_SENT;
++ offset <= ETH_MIB_LATE_COLLISION;
++ offset += 4)
++ *(u32 *)((char *)p + offset) = read_mib(mp, offset);
++}
++
++/*
++ * 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
++ *
++ */
++static int ethernet_phy_detect(unsigned int port_num)
++{
++ unsigned int phy_reg_data0;
++ int auto_neg;
++
++ 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);
++
++ eth_port_read_smi_reg(port_num, 0, &phy_reg_data0);
++ if ((phy_reg_data0 & 0x1000) == auto_neg)
++ return -ENODEV; /* change didn't take */
++
++ 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.
++ * This routine returns the given ethernet port PHY address.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Ethernet Port number.
++ * unsigned int eth_port_num Ethernet Port number.
+ *
+ * OUTPUT:
+- * None.
++ * None.
+ *
+ * RETURN:
+- * PHY address.
++ * PHY address.
+ *
+ */
+ static int ethernet_phy_get(unsigned int eth_port_num)
+ {
+ unsigned int reg_data;
+
+- reg_data = MV_READ(MV64340_ETH_PHY_ADDR_REG);
++ reg_data = mv_read(MV643XX_ETH_PHY_ADDR_REG);
+
+ return ((reg_data >> (5 * eth_port_num)) & 0x1f);
+ }
+
+ /*
++ * 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.
++ *
++ * RETURN:
++ * None.
++ *
++ */
++static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr)
++{
++ u32 reg_data;
++ int addr_shift = 5 * eth_port_num;
++
++ 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);
++}
++
++/*
+ * ethernet_phy_reset - Reset Ethernet port PHY.
+ *
+ * DESCRIPTION:
+- * This routine utilize the SMI interface to reset the ethernet port PHY.
+- * The routine waits until the link is up again or link up is timeout.
++ * This routine utilizes the SMI interface to reset the ethernet port PHY.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Ethernet Port number.
++ * unsigned int eth_port_num Ethernet Port number.
+ *
+ * OUTPUT:
+- * The ethernet port PHY renew its link.
++ * The PHY is reset.
+ *
+ * RETURN:
+- * None.
++ * None.
+ *
+ */
+-static int ethernet_phy_reset(unsigned int eth_port_num)
++static void ethernet_phy_reset(unsigned int eth_port_num)
+ {
+- unsigned int time_out = 50;
+ unsigned int phy_reg_data;
+
+ /* 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);
+-
+- /* Poll on the PHY LINK */
+- do {
+- eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data);
+-
+- if (time_out-- == 0)
+- return 0;
+- } while (!(phy_reg_data & 0x20));
+-
+- return 1;
+ }
+
+ /*
+@@ -2017,381 +2231,358 @@
+ *
+ * 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.
++ * 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.
++ * unsigned int eth_port_num Ethernet Port number.
+ *
+ * OUTPUT:
+- * Channel activity is halted.
++ * Channel activity is halted.
+ *
+ * RETURN:
+- * None.
++ * None.
+ *
+ */
+-static void eth_port_reset(unsigned int eth_port_num)
++static void eth_port_reset(unsigned int port_num)
+ {
+ unsigned int reg_data;
+
+ /* Stop Tx port activity. Check port Tx activity. */
+- reg_data =
+- MV_READ(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port_num));
++ reg_data = mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num));
+
+ if (reg_data & 0xFF) {
+ /* Issue stop command for active channels only */
+- MV_WRITE(MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG
+- (eth_port_num), (reg_data << 8));
++ mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num),
++ (reg_data << 8));
+
+ /* Wait for all Tx activity to terminate. */
+- do {
+- /* Check port cause register that all Tx queues are stopped */
+- reg_data =
+- MV_READ
+- (MV64340_ETH_TRANSMIT_QUEUE_COMMAND_REG
+- (eth_port_num));
+- }
+- while (reg_data & 0xFF);
++ /* Check port cause register that all Tx queues are stopped */
++ while (mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num))
++ & 0xFF)
++ udelay(10);
+ }
+
+ /* Stop Rx port activity. Check port Rx activity. */
+- reg_data =
+- MV_READ(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG
+- (eth_port_num));
++ reg_data = mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num));
+
+ if (reg_data & 0xFF) {
+ /* Issue stop command for active channels only */
+- MV_WRITE(MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG
+- (eth_port_num), (reg_data << 8));
++ mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
++ (reg_data << 8));
+
+ /* Wait for all Rx activity to terminate. */
+- do {
+- /* Check port cause register that all Rx queues are stopped */
+- reg_data =
+- MV_READ
+- (MV64340_ETH_RECEIVE_QUEUE_COMMAND_REG
+- (eth_port_num));
+- }
+- while (reg_data & 0xFF);
++ /* Check port cause register that all Rx queues are stopped */
++ while (mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num))
++ & 0xFF)
++ udelay(10);
+ }
+
+-
+ /* Clear all MIB counters */
+- eth_clear_mib_counters(eth_port_num);
++ eth_clear_mib_counters(port_num);
+
+ /* Reset the Enable bit in the Configuration Register */
+- reg_data =
+- MV_READ(MV64340_ETH_PORT_SERIAL_CONTROL_REG (eth_port_num));
+- reg_data &= ~ETH_SERIAL_PORT_ENABLE;
+- MV_WRITE(MV64340_ETH_PORT_SERIAL_CONTROL_REG(eth_port_num), reg_data);
+-
+- return;
++ reg_data = mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num));
++ reg_data &= ~MV643XX_ETH_SERIAL_PORT_ENABLE;
++ mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), reg_data);
+ }
+
+ /*
+ * ethernet_set_config_reg - Set specified bits in configuration register.
+ *
+ * DESCRIPTION:
+- * This function sets specified bits in the given ethernet
+- * configuration register.
++ * This function sets specified bits in the given ethernet
++ * configuration register.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Ethernet Port number.
+- * unsigned int value 32 bit value.
++ * unsigned int eth_port_num Ethernet Port number.
++ * unsigned int value 32 bit value.
+ *
+ * OUTPUT:
+- * The set bits in the value parameter are set in the configuration
+- * register.
++ * The set bits in the value parameter are set in the configuration
++ * register.
+ *
+ * RETURN:
+- * None.
++ * None.
+ *
+ */
+ static void ethernet_set_config_reg(unsigned int eth_port_num,
+- unsigned int value)
++ unsigned int value)
+ {
+ unsigned int eth_config_reg;
+
+- eth_config_reg =
+- MV_READ(MV64340_ETH_PORT_CONFIG_REG(eth_port_num));
++ eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num));
+ eth_config_reg |= value;
+- MV_WRITE(MV64340_ETH_PORT_CONFIG_REG(eth_port_num),
+- eth_config_reg);
++ mv_write(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num), eth_config_reg);
++}
++
++static int eth_port_autoneg_supported(unsigned int eth_port_num)
++{
++ unsigned int phy_reg_data0;
++
++ eth_port_read_smi_reg(eth_port_num, 0, &phy_reg_data0);
++
++ return phy_reg_data0 & 0x1000;
++}
++
++static int eth_port_link_is_up(unsigned int eth_port_num)
++{
++ unsigned int phy_reg_data1;
++
++ eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data1);
++
++ if (eth_port_autoneg_supported(eth_port_num)) {
++ if (phy_reg_data1 & 0x20) /* auto-neg complete */
++ return 1;
++ } else if (phy_reg_data1 & 0x4) /* link up */
++ return 1;
++
++ return 0;
+ }
+
+ /*
+ * ethernet_get_config_reg - Get the port configuration register
+ *
+ * DESCRIPTION:
+- * This function returns the configuration register value of the given
+- * ethernet port.
++ * This function returns the configuration register value of the given
++ * ethernet port.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Ethernet Port number.
++ * unsigned int eth_port_num Ethernet Port number.
+ *
+ * OUTPUT:
+- * None.
++ * None.
+ *
+ * RETURN:
+- * Port configuration register value.
++ * Port configuration register value.
+ */
+ static unsigned int ethernet_get_config_reg(unsigned int eth_port_num)
+ {
+ unsigned int eth_config_reg;
+
+- eth_config_reg = MV_READ(MV64340_ETH_PORT_CONFIG_EXTEND_REG
+- (eth_port_num));
++ eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_EXTEND_REG
++ (eth_port_num));
+ return eth_config_reg;
+ }
+
+-
+ /*
+ * eth_port_read_smi_reg - Read PHY registers
+ *
+ * DESCRIPTION:
+- * This routine utilize the SMI interface to interact with the PHY in
+- * order to perform PHY register read.
++ * 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 phy_reg PHY register address offset.
+- * unsigned int *value Register value buffer.
++ * unsigned int port_num Ethernet Port number.
++ * unsigned int phy_reg PHY register address offset.
++ * unsigned int *value Register value buffer.
+ *
+ * OUTPUT:
+- * Write the value of a specified PHY register into given buffer.
++ * Write the value of a specified PHY register into given buffer.
+ *
+ * RETURN:
+- * false if the PHY is busy or read data is not in valid state.
+- * true otherwise.
++ * false if the PHY is busy or read data is not in valid state.
++ * true otherwise.
+ *
+ */
+-static int eth_port_read_smi_reg(unsigned int eth_port_num,
+- unsigned int phy_reg, unsigned int *value)
++static void eth_port_read_smi_reg(unsigned int port_num,
++ unsigned int phy_reg, unsigned int *value)
+ {
+- int phy_addr = ethernet_phy_get(eth_port_num);
+- unsigned int time_out = PHY_BUSY_TIMEOUT;
+- unsigned int reg_value;
+-
+- /* first check that it is not busy */
+- do {
+- reg_value = MV_READ(MV64340_ETH_SMI_REG);
+- if (time_out-- == 0)
+- return 0;
+- } while (reg_value & ETH_SMI_BUSY);
+-
+- /* not busy */
+-
+- MV_WRITE(MV64340_ETH_SMI_REG,
+- (phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ);
+-
+- time_out = PHY_BUSY_TIMEOUT; /* initialize the time out var again */
++ int phy_addr = ethernet_phy_get(port_num);
++ unsigned long flags;
++ int i;
+
+- do {
+- reg_value = MV_READ(MV64340_ETH_SMI_REG);
+- if (time_out-- == 0)
+- return 0;
+- } while (reg_value & ETH_SMI_READ_VALID);
++ /* the SMI register is a shared resource */
++ spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
+
+- /* Wait for the data to update in the SMI register */
+- for (time_out = 0; time_out < PHY_BUSY_TIMEOUT; time_out++);
++ /* 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);
++ }
+
+- reg_value = MV_READ(MV64340_ETH_SMI_REG);
++ mv_write(MV643XX_ETH_SMI_REG,
++ (phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ);
+
+- *value = reg_value & 0xffff;
++ /* 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);
++ }
+
+- return 1;
++ *value = mv_read(MV643XX_ETH_SMI_REG) & 0xffff;
++out:
++ spin_unlock_irqrestore(&mv643xx_eth_phy_lock, flags);
+ }
+
+ /*
+ * eth_port_write_smi_reg - Write to PHY registers
+ *
+ * DESCRIPTION:
+- * This routine utilize the SMI interface to interact with the PHY in
+- * order to perform writes to PHY registers.
++ * This routine utilize the SMI interface to interact with the PHY in
++ * order to perform writes to PHY registers.
+ *
+ * INPUT:
+- * unsigned int eth_port_num Ethernet Port number.
+- * unsigned int phy_reg PHY register address offset.
+- * unsigned int value Register value.
++ * unsigned int eth_port_num Ethernet Port number.
++ * unsigned int phy_reg PHY register address offset.
++ * unsigned int value Register value.
+ *
+ * OUTPUT:
+- * Write the given value to the specified PHY register.
++ * Write the given value to the specified PHY register.
+ *
+ * RETURN:
+- * false if the PHY is busy.
+- * true otherwise.
++ * false if the PHY is busy.
++ * true otherwise.
+ *
+ */
+-static int eth_port_write_smi_reg(unsigned int eth_port_num,
+- unsigned int phy_reg, unsigned int value)
++static void eth_port_write_smi_reg(unsigned int eth_port_num,
++ unsigned int phy_reg, unsigned int value)
+ {
+- unsigned int time_out = PHY_BUSY_TIMEOUT;
+- unsigned int reg_value;
+ int phy_addr;
++ int i;
++ unsigned long flags;
+
+ phy_addr = ethernet_phy_get(eth_port_num);
+
+- /* first check that it is not busy */
+- do {
+- reg_value = MV_READ(MV64340_ETH_SMI_REG);
+- if (time_out-- == 0)
+- return 0;
+- } while (reg_value & ETH_SMI_BUSY);
+-
+- /* not busy */
+- MV_WRITE(MV64340_ETH_SMI_REG, (phy_addr << 16) | (phy_reg << 21) |
+- ETH_SMI_OPCODE_WRITE | (value & 0xffff));
++ /* the SMI register is a shared resource */
++ spin_lock_irqsave(&mv643xx_eth_phy_lock, flags);
+
+- return 1;
++ /* 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);
++ }
++
++ 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);
+ }
+
+ /*
+ * eth_port_send - Send an Ethernet packet
+ *
+ * DESCRIPTION:
+- * This routine send a given packet described by p_pktinfo parameter. It
+- * supports transmitting of a packet spaned over multiple buffers. The
+- * routine updates 'curr' and 'first' indexes according to the packet
+- * segment passed to the routine. In case the packet segment is first,
+- * the 'first' index is update. In any case, the 'curr' index is updated.
+- * If the routine get into Tx resource error it assigns 'curr' index as
+- * 'first'. This way the function can abort Tx process of multiple
+- * descriptors per packet.
++ * This routine send a given packet described by p_pktinfo parameter. It
++ * supports transmitting of a packet spaned over multiple buffers. The
++ * routine updates 'curr' and 'first' indexes according to the packet
++ * segment passed to the routine. In case the packet segment is first,
++ * the 'first' index is update. In any case, the 'curr' index is updated.
++ * If the routine get into Tx resource error it assigns 'curr' index as
++ * 'first'. This way the function can abort Tx process of multiple
++ * descriptors per packet.
+ *
+ * INPUT:
+- * struct mv64340_private *mp Ethernet Port Control srtuct.
+- * struct pkt_info *p_pkt_info User packet buffer.
++ * struct mv643xx_private *mp Ethernet Port Control srtuct.
++ * struct pkt_info *p_pkt_info User packet buffer.
+ *
+ * OUTPUT:
+- * Tx ring 'curr' and 'first' indexes are updated.
++ * Tx ring 'curr' and 'first' indexes are updated.
+ *
+ * RETURN:
+- * ETH_QUEUE_FULL in case of Tx resource error.
++ * ETH_QUEUE_FULL in case of Tx resource error.
+ * ETH_ERROR in case the routine can not access Tx desc ring.
+ * ETH_QUEUE_LAST_RESOURCE if the routine uses the last Tx resource.
+- * ETH_OK otherwise.
++ * ETH_OK otherwise.
+ *
+ */
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+ /*
+ * Modified to include the first descriptor pointer in case of SG
+ */
+-static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp,
+- struct pkt_info * p_pkt_info)
++static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info)
+ {
+ int tx_desc_curr, tx_desc_used, tx_first_desc, tx_next_desc;
+- volatile struct eth_tx_desc *current_descriptor;
+- volatile struct eth_tx_desc *first_descriptor;
+- u32 command_status, first_chip_ptr;
++ struct eth_tx_desc *current_descriptor;
++ struct eth_tx_desc *first_descriptor;
++ u32 command;
+
+ /* Do not process Tx ring in case of Tx ring resource error */
+ if (mp->tx_resource_err)
+ return ETH_QUEUE_FULL;
+
++ /*
++ * The hardware requires that each buffer that is <= 8 bytes
++ * in length must be aligned on an 8 byte boundary.
++ */
++ if (p_pkt_info->byte_cnt <= 8 && p_pkt_info->buf_ptr & 0x7) {
++ printk(KERN_ERR
++ "mv643xx_eth port %d: packet size <= 8 problem\n",
++ mp->port_num);
++ return ETH_ERROR;
++ }
++
+ /* Get the Tx Desc ring indexes */
+ tx_desc_curr = mp->tx_curr_desc_q;
+ tx_desc_used = mp->tx_used_desc_q;
+
+ current_descriptor = &mp->p_tx_desc_area[tx_desc_curr];
+- if (current_descriptor == NULL)
+- return ETH_ERROR;
+
+- tx_next_desc = (tx_desc_curr + 1) % MV64340_TX_QUEUE_SIZE;
+- command_status = p_pkt_info->cmd_sts | ETH_ZERO_PADDING | ETH_GEN_CRC;
++ tx_next_desc = (tx_desc_curr + 1) % mp->tx_ring_size;
++
++ current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
++ current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
++ current_descriptor->l4i_chk = p_pkt_info->l4i_chk;
++ mp->tx_skb[tx_desc_curr] = p_pkt_info->return_info;
+
+- if (command_status & ETH_TX_FIRST_DESC) {
++ command = p_pkt_info->cmd_sts | ETH_ZERO_PADDING | ETH_GEN_CRC |
++ ETH_BUFFER_OWNED_BY_DMA;
++ if (command & ETH_TX_FIRST_DESC) {
+ tx_first_desc = tx_desc_curr;
+ mp->tx_first_desc_q = tx_first_desc;
++ first_descriptor = current_descriptor;
++ mp->tx_first_command = command;
++ } else {
++ tx_first_desc = mp->tx_first_desc_q;
++ first_descriptor = &mp->p_tx_desc_area[tx_first_desc];
++ BUG_ON(first_descriptor == NULL);
++ current_descriptor->cmd_sts = command;
++ }
+
+- /* fill first descriptor */
+- first_descriptor = &mp->p_tx_desc_area[tx_desc_curr];
+- first_descriptor->l4i_chk = p_pkt_info->l4i_chk;
+- first_descriptor->cmd_sts = command_status;
+- first_descriptor->byte_cnt = p_pkt_info->byte_cnt;
+- first_descriptor->buf_ptr = p_pkt_info->buf_ptr;
+- first_descriptor->next_desc_ptr = mp->tx_desc_dma +
+- tx_next_desc * sizeof(struct eth_tx_desc);
++ if (command & ETH_TX_LAST_DESC) {
+ wmb();
+- } else {
+- tx_first_desc = mp->tx_first_desc_q;
+- first_descriptor = &mp->p_tx_desc_area[tx_first_desc];
+- if (first_descriptor == NULL) {
+- printk("First desc is NULL !!\n");
+- return ETH_ERROR;
+- }
+- if (command_status & ETH_TX_LAST_DESC)
+- current_descriptor->next_desc_ptr = 0x00000000;
+- else {
+- command_status |= ETH_BUFFER_OWNED_BY_DMA;
+- current_descriptor->next_desc_ptr = mp->tx_desc_dma +
+- tx_next_desc * sizeof(struct eth_tx_desc);
+- }
+- }
+-
+- if (p_pkt_info->byte_cnt < 8) {
+- printk(" < 8 problem \n");
+- return ETH_ERROR;
+- }
+-
+- current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
+- current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
+- current_descriptor->l4i_chk = p_pkt_info->l4i_chk;
+- current_descriptor->cmd_sts = command_status;
+-
+- mp->tx_skb[tx_desc_curr] = (struct sk_buff*) p_pkt_info->return_info;
+-
+- wmb();
+-
+- /* Set last desc with DMA ownership and interrupt enable. */
+- if (command_status & ETH_TX_LAST_DESC) {
+- current_descriptor->cmd_sts = command_status |
+- ETH_TX_ENABLE_INTERRUPT |
+- ETH_BUFFER_OWNED_BY_DMA;
++ first_descriptor->cmd_sts = mp->tx_first_command;
+
+- if (!(command_status & ETH_TX_FIRST_DESC))
+- first_descriptor->cmd_sts |= ETH_BUFFER_OWNED_BY_DMA;
+ wmb();
+-
+- first_chip_ptr = MV_READ(MV64340_ETH_CURRENT_SERVED_TX_DESC_PTR(mp->port_num));
+-
+- /* Apply send command */
+- if (first_chip_ptr == 0x00000000)
+- MV_WRITE(MV64340_ETH_TX_CURRENT_QUEUE_DESC_PTR_0(mp->port_num), (struct eth_tx_desc *) mp->tx_desc_dma + tx_first_desc);
+-
+- ETH_ENABLE_TX_QUEUE(mp->port_num);
++ ETH_ENABLE_TX_QUEUE(mp->port_num);
+
+ /*
+ * Finish Tx packet. Update first desc in case of Tx resource
+ * error */
+- tx_first_desc = tx_next_desc;
+- mp->tx_first_desc_q = tx_first_desc;
+- } else {
+- if (! (command_status & ETH_TX_FIRST_DESC) ) {
+- current_descriptor->cmd_sts = command_status;
+- wmb();
+- }
++ tx_first_desc = tx_next_desc;
++ mp->tx_first_desc_q = tx_first_desc;
+ }
+
+- /* Check for ring index overlap in the Tx desc ring */
+- if (tx_next_desc == tx_desc_used) {
+- mp->tx_resource_err = 1;
+- mp->tx_curr_desc_q = tx_first_desc;
++ /* Check for ring index overlap in the Tx desc ring */
++ if (tx_next_desc == tx_desc_used) {
++ mp->tx_resource_err = 1;
++ mp->tx_curr_desc_q = tx_first_desc;
+
+- return ETH_QUEUE_LAST_RESOURCE;
++ return ETH_QUEUE_LAST_RESOURCE;
+ }
+
+- mp->tx_curr_desc_q = tx_next_desc;
+- wmb();
++ mp->tx_curr_desc_q = tx_next_desc;
+
+- return ETH_OK;
++ return ETH_OK;
+ }
+ #else
+-static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp,
+- struct pkt_info * p_pkt_info)
++static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info)
+ {
+ int tx_desc_curr;
+ int tx_desc_used;
+- volatile struct eth_tx_desc* current_descriptor;
++ struct eth_tx_desc *current_descriptor;
+ unsigned int command_status;
+
+ /* Do not process Tx ring in case of Tx ring resource error */
+@@ -2403,39 +2594,24 @@
+ tx_desc_used = mp->tx_used_desc_q;
+ current_descriptor = &mp->p_tx_desc_area[tx_desc_curr];
+
+- if (current_descriptor == NULL)
+- return ETH_ERROR;
+-
+ command_status = p_pkt_info->cmd_sts | ETH_ZERO_PADDING | ETH_GEN_CRC;
+-
+-/* XXX Is this for real ?!?!? */
+- /* Buffers with a payload smaller than 8 bytes must be aligned to a
+- * 64-bit boundary. We use the memory allocated for Tx descriptor.
+- * This memory is located in TX_BUF_OFFSET_IN_DESC offset within the
+- * Tx descriptor. */
+- if (p_pkt_info->byte_cnt <= 8) {
+- printk(KERN_ERR
+- "You have failed in the < 8 bytes errata - fixme\n");
+- return ETH_ERROR;
+- }
+ current_descriptor->buf_ptr = p_pkt_info->buf_ptr;
+ current_descriptor->byte_cnt = p_pkt_info->byte_cnt;
+- mp->tx_skb[tx_desc_curr] = (struct sk_buff *) p_pkt_info->return_info;
+-
+- mb();
++ mp->tx_skb[tx_desc_curr] = p_pkt_info->return_info;
+
+ /* Set last desc with DMA ownership and interrupt enable. */
++ wmb();
+ current_descriptor->cmd_sts = command_status |
+ ETH_BUFFER_OWNED_BY_DMA | ETH_TX_ENABLE_INTERRUPT;
+
+- /* Apply send command */
++ wmb();
+ ETH_ENABLE_TX_QUEUE(mp->port_num);
+
+ /* Finish Tx packet. Update first desc in case of Tx resource error */
+- tx_desc_curr = (tx_desc_curr + 1) % MV64340_TX_QUEUE_SIZE;
++ tx_desc_curr = (tx_desc_curr + 1) % mp->tx_ring_size;
+
+ /* Update the current descriptor */
+- mp->tx_curr_desc_q = tx_desc_curr;
++ mp->tx_curr_desc_q = tx_desc_curr;
+
+ /* Check for ring index overlap in the Tx desc ring */
+ if (tx_desc_curr == tx_desc_used) {
+@@ -2452,62 +2628,55 @@
+ *
+ * DESCRIPTION:
+ * This routine returns the transmitted packet information to the caller.
+- * It uses the 'first' index to support Tx desc return in case a transmit
+- * of a packet spanned over multiple buffer still in process.
+- * In case the Tx queue was in "resource error" condition, where there are
+- * no available Tx resources, the function resets the resource error flag.
++ * It uses the 'first' index to support Tx desc return in case a transmit
++ * of a packet spanned over multiple buffer still in process.
++ * In case the Tx queue was in "resource error" condition, where there are
++ * no available Tx resources, the function resets the resource error flag.
+ *
+ * INPUT:
+- * struct mv64340_private *mp Ethernet Port Control srtuct.
+- * struct pkt_info *p_pkt_info User packet buffer.
++ * struct mv643xx_private *mp Ethernet Port Control srtuct.
++ * struct pkt_info *p_pkt_info User packet buffer.
+ *
+ * OUTPUT:
+- * Tx ring 'first' and 'used' indexes are updated.
++ * Tx ring 'first' and 'used' indexes are updated.
+ *
+ * RETURN:
+ * ETH_ERROR in case the routine can not access Tx desc ring.
+- * ETH_RETRY in case there is transmission in process.
++ * ETH_RETRY in case there is transmission in process.
+ * ETH_END_OF_JOB if the routine has nothing to release.
+- * ETH_OK otherwise.
++ * ETH_OK otherwise.
+ *
+ */
+-static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv64340_private * mp,
+- struct pkt_info * p_pkt_info)
++static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info)
+ {
+- int tx_desc_used, tx_desc_curr;
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
+- int tx_first_desc;
++ int tx_desc_used;
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
++ int tx_busy_desc = mp->tx_first_desc_q;
++#else
++ int tx_busy_desc = mp->tx_curr_desc_q;
+ #endif
+- volatile struct eth_tx_desc *p_tx_desc_used;
++ struct eth_tx_desc *p_tx_desc_used;
+ unsigned int command_status;
+
+ /* Get the Tx Desc ring indexes */
+- tx_desc_curr = mp->tx_curr_desc_q;
+ tx_desc_used = mp->tx_used_desc_q;
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
+- tx_first_desc = mp->tx_first_desc_q;
+-#endif
++
+ p_tx_desc_used = &mp->p_tx_desc_area[tx_desc_used];
+
+- /* XXX Sanity check */
++ /* Sanity check */
+ if (p_tx_desc_used == NULL)
+ return ETH_ERROR;
+
++ /* Stop release. About to overlap the current available Tx descriptor */
++ if (tx_desc_used == tx_busy_desc && !mp->tx_resource_err)
++ return ETH_END_OF_JOB;
++
+ command_status = p_tx_desc_used->cmd_sts;
+
+ /* Still transmitting... */
+-#ifndef MV64340_CHECKSUM_OFFLOAD_TX
+ if (command_status & (ETH_BUFFER_OWNED_BY_DMA))
+ return ETH_RETRY;
+-#endif
+- /* Stop release. About to overlap the current available Tx descriptor */
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
+- if (tx_desc_used == tx_first_desc && !mp->tx_resource_err)
+- return ETH_END_OF_JOB;
+-#else
+- if (tx_desc_used == tx_desc_curr && !mp->tx_resource_err)
+- return ETH_END_OF_JOB;
+-#endif
+
+ /* Pass the packet information to the caller */
+ p_pkt_info->cmd_sts = command_status;
+@@ -2515,7 +2684,7 @@
+ mp->tx_skb[tx_desc_used] = NULL;
+
+ /* Update the next descriptor to release. */
+- mp->tx_used_desc_q = (tx_desc_used + 1) % MV64340_TX_QUEUE_SIZE;
++ mp->tx_used_desc_q = (tx_desc_used + 1) % mp->tx_ring_size;
+
+ /* Any Tx return cancels the Tx resource error status */
+ mp->tx_resource_err = 0;
+@@ -2527,30 +2696,30 @@
+ * 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.
++ * 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 mv64340_private *mp Ethernet Port Control srtuct.
+- * struct pkt_info *p_pkt_info User packet buffer.
++ * struct mv643xx_private *mp Ethernet Port Control srtuct.
++ * struct pkt_info *p_pkt_info User packet buffer.
+ *
+ * OUTPUT:
+- * Rx ring current and used indexes are updated.
++ * Rx ring current and used indexes are updated.
+ *
+ * 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.
++ * ETH_OK otherwise.
+ */
+-static ETH_FUNC_RET_STATUS eth_port_receive(struct mv64340_private * mp,
+- struct pkt_info * p_pkt_info)
++static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info)
+ {
+ int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
+- volatile struct eth_rx_desc * p_rx_desc;
++ volatile struct eth_rx_desc *p_rx_desc;
+ unsigned int command_status;
+
+ /* Do not process Rx ring in case of Rx ring resource error */
+@@ -2565,6 +2734,7 @@
+
+ /* 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))
+@@ -2577,18 +2747,17 @@
+ p_pkt_info->l4i_chk = p_rx_desc->buf_size;
+
+ /* Clean the return info field to indicate that the packet has been */
+- /* moved to the upper layers */
++ /* moved to the upper layers */
+ mp->rx_skb[rx_curr_desc] = NULL;
+
+ /* Update current index in data structure */
+- rx_next_curr_desc = (rx_curr_desc + 1) % MV64340_RX_QUEUE_SIZE;
++ rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
+ mp->rx_curr_desc_q = rx_next_curr_desc;
+
+ /* Rx descriptors exhausted. Set the Rx ring resource error flag */
+ if (rx_next_curr_desc == rx_used_desc)
+ mp->rx_resource_err = 1;
+
+- mb();
+ return ETH_OK;
+ }
+
+@@ -2596,27 +2765,27 @@
+ * 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.
++ * 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 mv64340_private *mp Ethernet Port Control srtuct.
+- * struct pkt_info *p_pkt_info Information on the returned buffer.
++ * 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.
++ * ETH_OK otherwise.
+ */
+-static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv64340_private * mp,
+- struct pkt_info * p_pkt_info)
++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;
++ volatile struct eth_rx_desc *p_used_rx_desc;
+
+ /* Get 'used' Rx descriptor */
+ used_rx_desc = mp->rx_used_desc_q;
+@@ -2627,20 +2796,240 @@
+ mp->rx_skb[used_rx_desc] = p_pkt_info->return_info;
+
+ /* Flush the write pipe */
+- mb();
+
+ /* Return the descriptor to DMA ownership */
++ wmb();
+ p_used_rx_desc->cmd_sts =
+- ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
+-
+- /* Flush descriptor and CPU pipe */
+- mb();
++ 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) % MV64340_RX_QUEUE_SIZE;
++ 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;
+
+ return ETH_OK;
+ }
++
++/************* Begin ethtool support *************************/
++
++struct mv643xx_stats {
++ char stat_string[ETH_GSTRING_LEN];
++ int sizeof_stat;
++ int stat_offset;
++};
++
++#define MV643XX_STAT(m) sizeof(((struct mv643xx_private *)0)->m), \
++ offsetof(struct mv643xx_private, m)
++
++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) },
++};
++
++#define MV643XX_STATS_LEN \
++ sizeof(mv643xx_gstrings_stats) / sizeof(struct mv643xx_stats)
++
++static int
++mv643xx_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
++{
++ struct mv643xx_private *mp = netdev->priv;
++ int port_num = mp->port_num;
++ int autoneg = eth_port_autoneg_supported(port_num);
++ int mode_10_bit;
++ int auto_duplex;
++ int half_duplex = 0;
++ int full_duplex = 0;
++ int auto_speed;
++ int speed_10 = 0;
++ int speed_100 = 0;
++ int speed_1000 = 0;
++
++ u32 pcs = mv_read(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num));
++ u32 psr = mv_read(MV643XX_ETH_PORT_STATUS_REG(port_num));
++
++ mode_10_bit = psr & MV643XX_ETH_PORT_STATUS_MODE_10_BIT;
++
++ if (mode_10_bit) {
++ ecmd->supported = SUPPORTED_10baseT_Half;
++ } else {
++ ecmd->supported = (SUPPORTED_10baseT_Half |
++ SUPPORTED_10baseT_Full |
++ SUPPORTED_100baseT_Half |
++ SUPPORTED_100baseT_Full |
++ SUPPORTED_1000baseT_Full |
++ (autoneg ? SUPPORTED_Autoneg : 0) |
++ SUPPORTED_TP);
++
++ auto_duplex = !(pcs & MV643XX_ETH_DISABLE_AUTO_NEG_FOR_DUPLX);
++ auto_speed = !(pcs & MV643XX_ETH_DISABLE_AUTO_NEG_SPEED_GMII);
++
++ ecmd->advertising = ADVERTISED_TP;
++
++ if (autoneg) {
++ ecmd->advertising |= ADVERTISED_Autoneg;
++
++ if (auto_duplex) {
++ half_duplex = 1;
++ full_duplex = 1;
++ } else {
++ if (pcs & MV643XX_ETH_SET_FULL_DUPLEX_MODE)
++ full_duplex = 1;
++ else
++ half_duplex = 1;
++ }
++
++ if (auto_speed) {
++ speed_10 = 1;
++ speed_100 = 1;
++ speed_1000 = 1;
++ } else {
++ if (pcs & MV643XX_ETH_SET_GMII_SPEED_TO_1000)
++ speed_1000 = 1;
++ else if (pcs & MV643XX_ETH_SET_MII_SPEED_TO_100)
++ speed_100 = 1;
++ else
++ speed_10 = 1;
++ }
++
++ if (speed_10 & half_duplex)
++ ecmd->advertising |= ADVERTISED_10baseT_Half;
++ if (speed_10 & full_duplex)
++ ecmd->advertising |= ADVERTISED_10baseT_Full;
++ if (speed_100 & half_duplex)
++ ecmd->advertising |= ADVERTISED_100baseT_Half;
++ if (speed_100 & full_duplex)
++ ecmd->advertising |= ADVERTISED_100baseT_Full;
++ if (speed_1000)
++ ecmd->advertising |= ADVERTISED_1000baseT_Full;
++ }
++ }
++
++ ecmd->port = PORT_TP;
++ ecmd->phy_address = ethernet_phy_get(port_num);
++
++ ecmd->transceiver = XCVR_EXTERNAL;
++
++ if (netif_carrier_ok(netdev)) {
++ if (mode_10_bit)
++ ecmd->speed = SPEED_10;
++ else {
++ if (psr & MV643XX_ETH_PORT_STATUS_GMII_1000)
++ ecmd->speed = SPEED_1000;
++ else if (psr & MV643XX_ETH_PORT_STATUS_MII_100)
++ ecmd->speed = SPEED_100;
++ else
++ ecmd->speed = SPEED_10;
++ }
++
++ if (psr & MV643XX_ETH_PORT_STATUS_FULL_DUPLEX)
++ ecmd->duplex = DUPLEX_FULL;
++ else
++ ecmd->duplex = DUPLEX_HALF;
++ } else {
++ ecmd->speed = -1;
++ ecmd->duplex = -1;
++ }
++
++ ecmd->autoneg = autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;
++ 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;
++}
++
++static int
++mv643xx_get_stats_count(struct net_device *netdev)
++{
++ return MV643XX_STATS_LEN;
++}
++
++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;
++
++ eth_update_mib_counters(mp);
++
++ 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;
++ }
++}
++
++static void
++mv643xx_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
++{
++ int i;
++
++ 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 struct ethtool_ops mv643xx_ethtool_ops = {
++ .get_settings = mv643xx_get_settings,
++ .get_drvinfo = mv643xx_get_drvinfo,
++ .get_link = ethtool_op_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,
++};
++
++/************* End ethtool support *************************/
+--- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/drivers/net/mv643xx_eth.h 2005-03-02 08:38:09.000000000 +0100
++++ drivers/net/mv643xx_eth.h 2005-03-05 21:23:35.000000000 +0100
+@@ -1,5 +1,5 @@
+-#ifndef __MV64340_ETH_H__
+-#define __MV64340_ETH_H__
++#ifndef __MV643XX_ETH_H__
++#define __MV643XX_ETH_H__
+
+ #include <linux/version.h>
+ #include <linux/module.h>
+@@ -46,17 +46,16 @@
+ * The first part is the high level driver of the gigE ethernet ports.
+ */
+
+-#define ETH_PORT0_IRQ_NUM 48 /* main high register, bit0 */
+-#define ETH_PORT1_IRQ_NUM ETH_PORT0_IRQ_NUM+1 /* main high register, bit1 */
+-#define ETH_PORT2_IRQ_NUM ETH_PORT0_IRQ_NUM+2 /* main high register, bit1 */
+-
+-/* Checksum offload for Tx works */
+-#define MV64340_CHECKSUM_OFFLOAD_TX
+-#define MV64340_NAPI
+-#define MV64340_TX_FAST_REFILL
+-#undef MV64340_COAL
++/* Checksum offload for Tx works for most packets, but
++ * fails if previous packet sent did not use hw csum
++ */
++#undef MV643XX_CHECKSUM_OFFLOAD_TX
++#define MV643XX_NAPI
++#define MV643XX_TX_FAST_REFILL
++#undef MV643XX_RX_QUEUE_FILL_ON_TASK /* Does not work, yet */
++#undef MV643XX_COAL
+
+-/*
++/*
+ * Number of RX / TX descriptors on RX / TX rings.
+ * Note that allocating RX descriptors is done by allocating the RX
+ * ring AND a preallocated RX buffers (skb's) for each descriptor.
+@@ -65,89 +64,35 @@
+ */
+
+ /* Default TX ring size is 1000 descriptors */
+-#define MV64340_TX_QUEUE_SIZE 1000
++#define MV643XX_DEFAULT_TX_QUEUE_SIZE 1000
+
+ /* Default RX ring size is 400 descriptors */
+-#define MV64340_RX_QUEUE_SIZE 400
++#define MV643XX_DEFAULT_RX_QUEUE_SIZE 400
+
+-#define MV64340_TX_COAL 100
+-#ifdef MV64340_COAL
+-#define MV64340_RX_COAL 100
++#define MV643XX_TX_COAL 100
++#ifdef MV643XX_COAL
++#define MV643XX_RX_COAL 100
+ #endif
+
+-
+ /*
+- * The second part is the low level driver of the gigE ethernet ports. *
++ * The second part is the low level driver of the gigE ethernet ports.
+ */
+
+-
+ /*
+- * Header File for : MV-643xx network interface header
++ * Header File for : MV-643xx network interface header
+ *
+ * DESCRIPTION:
+- * This header file contains macros typedefs and function declaration for
+- * the Marvell Gig Bit Ethernet Controller.
++ * This header file contains macros typedefs and function declaration for
++ * the Marvell Gig Bit Ethernet Controller.
+ *
+ * DEPENDENCIES:
+- * None.
++ * None.
+ *
+ */
+
+-/* Default port configuration value */
+-#define PORT_CONFIG_VALUE \
+- ETH_UNICAST_NORMAL_MODE | \
+- ETH_DEFAULT_RX_QUEUE_0 | \
+- ETH_DEFAULT_RX_ARP_QUEUE_0 | \
+- ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP | \
+- ETH_RECEIVE_BC_IF_IP | \
+- ETH_RECEIVE_BC_IF_ARP | \
+- ETH_CAPTURE_TCP_FRAMES_DIS | \
+- ETH_CAPTURE_UDP_FRAMES_DIS | \
+- ETH_DEFAULT_RX_TCP_QUEUE_0 | \
+- ETH_DEFAULT_RX_UDP_QUEUE_0 | \
+- ETH_DEFAULT_RX_BPDU_QUEUE_0
+-
+-/* Default port extend configuration value */
+-#define PORT_CONFIG_EXTEND_VALUE \
+- ETH_SPAN_BPDU_PACKETS_AS_NORMAL | \
+- ETH_PARTITION_DISABLE
+-
+-
+-/* Default sdma control value */
+-#define PORT_SDMA_CONFIG_VALUE \
+- ETH_RX_BURST_SIZE_16_64BIT | \
+- GT_ETH_IPG_INT_RX(0) | \
+- ETH_TX_BURST_SIZE_16_64BIT;
+-
+-#define GT_ETH_IPG_INT_RX(value) \
+- ((value & 0x3fff) << 8)
+-
+-/* Default port serial control value */
+-#define PORT_SERIAL_CONTROL_VALUE \
+- ETH_FORCE_LINK_PASS | \
+- ETH_ENABLE_AUTO_NEG_FOR_DUPLX | \
+- ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL | \
+- ETH_ADV_SYMMETRIC_FLOW_CTRL | \
+- ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX | \
+- ETH_FORCE_BP_MODE_NO_JAM | \
+- BIT9 | \
+- ETH_DO_NOT_FORCE_LINK_FAIL | \
+- ETH_RETRANSMIT_16_ATTEMPTS | \
+- ETH_ENABLE_AUTO_NEG_SPEED_GMII | \
+- ETH_DTE_ADV_0 | \
+- ETH_DISABLE_AUTO_NEG_BYPASS | \
+- ETH_AUTO_NEG_NO_CHANGE | \
+- ETH_MAX_RX_PACKET_9700BYTE | \
+- ETH_CLR_EXT_LOOPBACK | \
+- ETH_SET_FULL_DUPLEX_MODE | \
+- ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX
+-
+-#define RX_BUFFER_MAX_SIZE 0x4000000
+-#define TX_BUFFER_MAX_SIZE 0x4000000
+-
+ /* MAC accepet/reject macros */
+-#define ACCEPT_MAC_ADDR 0
+-#define REJECT_MAC_ADDR 1
++#define ACCEPT_MAC_ADDR 0
++#define REJECT_MAC_ADDR 1
+
+ /* Buffer offset from buffer pointer */
+ #define RX_BUF_OFFSET 0x2
+@@ -155,277 +100,132 @@
+ /* Gigabit Ethernet Unit Global Registers */
+
+ /* MIB Counters register definitions */
+-#define ETH_MIB_GOOD_OCTETS_RECEIVED_LOW 0x0
+-#define ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH 0x4
+-#define ETH_MIB_BAD_OCTETS_RECEIVED 0x8
+-#define ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR 0xc
+-#define ETH_MIB_GOOD_FRAMES_RECEIVED 0x10
+-#define ETH_MIB_BAD_FRAMES_RECEIVED 0x14
+-#define ETH_MIB_BROADCAST_FRAMES_RECEIVED 0x18
+-#define ETH_MIB_MULTICAST_FRAMES_RECEIVED 0x1c
+-#define ETH_MIB_FRAMES_64_OCTETS 0x20
+-#define ETH_MIB_FRAMES_65_TO_127_OCTETS 0x24
+-#define ETH_MIB_FRAMES_128_TO_255_OCTETS 0x28
+-#define ETH_MIB_FRAMES_256_TO_511_OCTETS 0x2c
+-#define ETH_MIB_FRAMES_512_TO_1023_OCTETS 0x30
+-#define ETH_MIB_FRAMES_1024_TO_MAX_OCTETS 0x34
+-#define ETH_MIB_GOOD_OCTETS_SENT_LOW 0x38
+-#define ETH_MIB_GOOD_OCTETS_SENT_HIGH 0x3c
+-#define ETH_MIB_GOOD_FRAMES_SENT 0x40
+-#define ETH_MIB_EXCESSIVE_COLLISION 0x44
+-#define ETH_MIB_MULTICAST_FRAMES_SENT 0x48
+-#define ETH_MIB_BROADCAST_FRAMES_SENT 0x4c
+-#define ETH_MIB_UNREC_MAC_CONTROL_RECEIVED 0x50
+-#define ETH_MIB_FC_SENT 0x54
+-#define ETH_MIB_GOOD_FC_RECEIVED 0x58
+-#define ETH_MIB_BAD_FC_RECEIVED 0x5c
+-#define ETH_MIB_UNDERSIZE_RECEIVED 0x60
+-#define ETH_MIB_FRAGMENTS_RECEIVED 0x64
+-#define ETH_MIB_OVERSIZE_RECEIVED 0x68
+-#define ETH_MIB_JABBER_RECEIVED 0x6c
+-#define ETH_MIB_MAC_RECEIVE_ERROR 0x70
+-#define ETH_MIB_BAD_CRC_EVENT 0x74
+-#define ETH_MIB_COLLISION 0x78
+-#define ETH_MIB_LATE_COLLISION 0x7c
++#define ETH_MIB_GOOD_OCTETS_RECEIVED_LOW 0x0
++#define ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH 0x4
++#define ETH_MIB_BAD_OCTETS_RECEIVED 0x8
++#define ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR 0xc
++#define ETH_MIB_GOOD_FRAMES_RECEIVED 0x10
++#define ETH_MIB_BAD_FRAMES_RECEIVED 0x14
++#define ETH_MIB_BROADCAST_FRAMES_RECEIVED 0x18
++#define ETH_MIB_MULTICAST_FRAMES_RECEIVED 0x1c
++#define ETH_MIB_FRAMES_64_OCTETS 0x20
++#define ETH_MIB_FRAMES_65_TO_127_OCTETS 0x24
++#define ETH_MIB_FRAMES_128_TO_255_OCTETS 0x28
++#define ETH_MIB_FRAMES_256_TO_511_OCTETS 0x2c
++#define ETH_MIB_FRAMES_512_TO_1023_OCTETS 0x30
++#define ETH_MIB_FRAMES_1024_TO_MAX_OCTETS 0x34
++#define ETH_MIB_GOOD_OCTETS_SENT_LOW 0x38
++#define ETH_MIB_GOOD_OCTETS_SENT_HIGH 0x3c
++#define ETH_MIB_GOOD_FRAMES_SENT 0x40
++#define ETH_MIB_EXCESSIVE_COLLISION 0x44
++#define ETH_MIB_MULTICAST_FRAMES_SENT 0x48
++#define ETH_MIB_BROADCAST_FRAMES_SENT 0x4c
++#define ETH_MIB_UNREC_MAC_CONTROL_RECEIVED 0x50
++#define ETH_MIB_FC_SENT 0x54
++#define ETH_MIB_GOOD_FC_RECEIVED 0x58
++#define ETH_MIB_BAD_FC_RECEIVED 0x5c
++#define ETH_MIB_UNDERSIZE_RECEIVED 0x60
++#define ETH_MIB_FRAGMENTS_RECEIVED 0x64
++#define ETH_MIB_OVERSIZE_RECEIVED 0x68
++#define ETH_MIB_JABBER_RECEIVED 0x6c
++#define ETH_MIB_MAC_RECEIVE_ERROR 0x70
++#define ETH_MIB_BAD_CRC_EVENT 0x74
++#define ETH_MIB_COLLISION 0x78
++#define ETH_MIB_LATE_COLLISION 0x7c
+
+ /* Port serial status reg (PSR) */
+-#define ETH_INTERFACE_GMII_MII 0
+-#define ETH_INTERFACE_PCM BIT0
+-#define ETH_LINK_IS_DOWN 0
+-#define ETH_LINK_IS_UP BIT1
+-#define ETH_PORT_AT_HALF_DUPLEX 0
+-#define ETH_PORT_AT_FULL_DUPLEX BIT2
+-#define ETH_RX_FLOW_CTRL_DISABLED 0
+-#define ETH_RX_FLOW_CTRL_ENBALED BIT3
+-#define ETH_GMII_SPEED_100_10 0
+-#define ETH_GMII_SPEED_1000 BIT4
+-#define ETH_MII_SPEED_10 0
+-#define ETH_MII_SPEED_100 BIT5
+-#define ETH_NO_TX 0
+-#define ETH_TX_IN_PROGRESS BIT7
+-#define ETH_BYPASS_NO_ACTIVE 0
+-#define ETH_BYPASS_ACTIVE BIT8
+-#define ETH_PORT_NOT_AT_PARTITION_STATE 0
+-#define ETH_PORT_AT_PARTITION_STATE BIT9
+-#define ETH_PORT_TX_FIFO_NOT_EMPTY 0
+-#define ETH_PORT_TX_FIFO_EMPTY BIT10
+-
+-
+-/* These macros describes the Port configuration reg (Px_cR) bits */
+-#define ETH_UNICAST_NORMAL_MODE 0
+-#define ETH_UNICAST_PROMISCUOUS_MODE BIT0
+-#define ETH_DEFAULT_RX_QUEUE_0 0
+-#define ETH_DEFAULT_RX_QUEUE_1 BIT1
+-#define ETH_DEFAULT_RX_QUEUE_2 BIT2
+-#define ETH_DEFAULT_RX_QUEUE_3 (BIT2 | BIT1)
+-#define ETH_DEFAULT_RX_QUEUE_4 BIT3
+-#define ETH_DEFAULT_RX_QUEUE_5 (BIT3 | BIT1)
+-#define ETH_DEFAULT_RX_QUEUE_6 (BIT3 | BIT2)
+-#define ETH_DEFAULT_RX_QUEUE_7 (BIT3 | BIT2 | BIT1)
+-#define ETH_DEFAULT_RX_ARP_QUEUE_0 0
+-#define ETH_DEFAULT_RX_ARP_QUEUE_1 BIT4
+-#define ETH_DEFAULT_RX_ARP_QUEUE_2 BIT5
+-#define ETH_DEFAULT_RX_ARP_QUEUE_3 (BIT5 | BIT4)
+-#define ETH_DEFAULT_RX_ARP_QUEUE_4 BIT6
+-#define ETH_DEFAULT_RX_ARP_QUEUE_5 (BIT6 | BIT4)
+-#define ETH_DEFAULT_RX_ARP_QUEUE_6 (BIT6 | BIT5)
+-#define ETH_DEFAULT_RX_ARP_QUEUE_7 (BIT6 | BIT5 | BIT4)
+-#define ETH_RECEIVE_BC_IF_NOT_IP_OR_ARP 0
+-#define ETH_REJECT_BC_IF_NOT_IP_OR_ARP BIT7
+-#define ETH_RECEIVE_BC_IF_IP 0
+-#define ETH_REJECT_BC_IF_IP BIT8
+-#define ETH_RECEIVE_BC_IF_ARP 0
+-#define ETH_REJECT_BC_IF_ARP BIT9
+-#define ETH_TX_AM_NO_UPDATE_ERROR_SUMMARY BIT12
+-#define ETH_CAPTURE_TCP_FRAMES_DIS 0
+-#define ETH_CAPTURE_TCP_FRAMES_EN BIT14
+-#define ETH_CAPTURE_UDP_FRAMES_DIS 0
+-#define ETH_CAPTURE_UDP_FRAMES_EN BIT15
+-#define ETH_DEFAULT_RX_TCP_QUEUE_0 0
+-#define ETH_DEFAULT_RX_TCP_QUEUE_1 BIT16
+-#define ETH_DEFAULT_RX_TCP_QUEUE_2 BIT17
+-#define ETH_DEFAULT_RX_TCP_QUEUE_3 (BIT17 | BIT16)
+-#define ETH_DEFAULT_RX_TCP_QUEUE_4 BIT18
+-#define ETH_DEFAULT_RX_TCP_QUEUE_5 (BIT18 | BIT16)
+-#define ETH_DEFAULT_RX_TCP_QUEUE_6 (BIT18 | BIT17)
+-#define ETH_DEFAULT_RX_TCP_QUEUE_7 (BIT18 | BIT17 | BIT16)
+-#define ETH_DEFAULT_RX_UDP_QUEUE_0 0
+-#define ETH_DEFAULT_RX_UDP_QUEUE_1 BIT19
+-#define ETH_DEFAULT_RX_UDP_QUEUE_2 BIT20
+-#define ETH_DEFAULT_RX_UDP_QUEUE_3 (BIT20 | BIT19)
+-#define ETH_DEFAULT_RX_UDP_QUEUE_4 (BIT21
+-#define ETH_DEFAULT_RX_UDP_QUEUE_5 (BIT21 | BIT19)
+-#define ETH_DEFAULT_RX_UDP_QUEUE_6 (BIT21 | BIT20)
+-#define ETH_DEFAULT_RX_UDP_QUEUE_7 (BIT21 | BIT20 | BIT19)
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_0 0
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_1 BIT22
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_2 BIT23
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_3 (BIT23 | BIT22)
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_4 BIT24
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_5 (BIT24 | BIT22)
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_6 (BIT24 | BIT23)
+-#define ETH_DEFAULT_RX_BPDU_QUEUE_7 (BIT24 | BIT23 | BIT22)
+-
+-
+-/* These macros describes the Port configuration extend reg (Px_cXR) bits*/
+-#define ETH_CLASSIFY_EN BIT0
+-#define ETH_SPAN_BPDU_PACKETS_AS_NORMAL 0
+-#define ETH_SPAN_BPDU_PACKETS_TO_RX_QUEUE_7 BIT1
+-#define ETH_PARTITION_DISABLE 0
+-#define ETH_PARTITION_ENABLE BIT2
+-
+-
+-/* Tx/Rx queue command reg (RQCR/TQCR)*/
+-#define ETH_QUEUE_0_ENABLE BIT0
+-#define ETH_QUEUE_1_ENABLE BIT1
+-#define ETH_QUEUE_2_ENABLE BIT2
+-#define ETH_QUEUE_3_ENABLE BIT3
+-#define ETH_QUEUE_4_ENABLE BIT4
+-#define ETH_QUEUE_5_ENABLE BIT5
+-#define ETH_QUEUE_6_ENABLE BIT6
+-#define ETH_QUEUE_7_ENABLE BIT7
+-#define ETH_QUEUE_0_DISABLE BIT8
+-#define ETH_QUEUE_1_DISABLE BIT9
+-#define ETH_QUEUE_2_DISABLE BIT10
+-#define ETH_QUEUE_3_DISABLE BIT11
+-#define ETH_QUEUE_4_DISABLE BIT12
+-#define ETH_QUEUE_5_DISABLE BIT13
+-#define ETH_QUEUE_6_DISABLE BIT14
+-#define ETH_QUEUE_7_DISABLE BIT15
+-
+-
+-/* These macros describes the Port Sdma configuration reg (SDCR) bits */
+-#define ETH_RIFB BIT0
+-#define ETH_RX_BURST_SIZE_1_64BIT 0
+-#define ETH_RX_BURST_SIZE_2_64BIT BIT1
+-#define ETH_RX_BURST_SIZE_4_64BIT BIT2
+-#define ETH_RX_BURST_SIZE_8_64BIT (BIT2 | BIT1)
+-#define ETH_RX_BURST_SIZE_16_64BIT BIT3
+-#define ETH_BLM_RX_NO_SWAP BIT4
+-#define ETH_BLM_RX_BYTE_SWAP 0
+-#define ETH_BLM_TX_NO_SWAP BIT5
+-#define ETH_BLM_TX_BYTE_SWAP 0
+-#define ETH_DESCRIPTORS_BYTE_SWAP BIT6
+-#define ETH_DESCRIPTORS_NO_SWAP 0
+-#define ETH_TX_BURST_SIZE_1_64BIT 0
+-#define ETH_TX_BURST_SIZE_2_64BIT BIT22
+-#define ETH_TX_BURST_SIZE_4_64BIT BIT23
+-#define ETH_TX_BURST_SIZE_8_64BIT (BIT23 | BIT22)
+-#define ETH_TX_BURST_SIZE_16_64BIT BIT24
+-
+-
+-
+-/* These macros describes the Port serial control reg (PSCR) bits */
+-#define ETH_SERIAL_PORT_DISABLE 0
+-#define ETH_SERIAL_PORT_ENABLE BIT0
+-#define ETH_FORCE_LINK_PASS BIT1
+-#define ETH_DO_NOT_FORCE_LINK_PASS 0
+-#define ETH_ENABLE_AUTO_NEG_FOR_DUPLX 0
+-#define ETH_DISABLE_AUTO_NEG_FOR_DUPLX BIT2
+-#define ETH_ENABLE_AUTO_NEG_FOR_FLOW_CTRL 0
+-#define ETH_DISABLE_AUTO_NEG_FOR_FLOW_CTRL BIT3
+-#define ETH_ADV_NO_FLOW_CTRL 0
+-#define ETH_ADV_SYMMETRIC_FLOW_CTRL BIT4
+-#define ETH_FORCE_FC_MODE_NO_PAUSE_DIS_TX 0
+-#define ETH_FORCE_FC_MODE_TX_PAUSE_DIS BIT5
+-#define ETH_FORCE_BP_MODE_NO_JAM 0
+-#define ETH_FORCE_BP_MODE_JAM_TX BIT7
+-#define ETH_FORCE_BP_MODE_JAM_TX_ON_RX_ERR BIT8
+-#define ETH_FORCE_LINK_FAIL 0
+-#define ETH_DO_NOT_FORCE_LINK_FAIL BIT10
+-#define ETH_RETRANSMIT_16_ATTEMPTS 0
+-#define ETH_RETRANSMIT_FOREVER BIT11
+-#define ETH_DISABLE_AUTO_NEG_SPEED_GMII BIT13
+-#define ETH_ENABLE_AUTO_NEG_SPEED_GMII 0
+-#define ETH_DTE_ADV_0 0
+-#define ETH_DTE_ADV_1 BIT14
+-#define ETH_DISABLE_AUTO_NEG_BYPASS 0
+-#define ETH_ENABLE_AUTO_NEG_BYPASS BIT15
+-#define ETH_AUTO_NEG_NO_CHANGE 0
+-#define ETH_RESTART_AUTO_NEG BIT16
+-#define ETH_MAX_RX_PACKET_1518BYTE 0
+-#define ETH_MAX_RX_PACKET_1522BYTE BIT17
+-#define ETH_MAX_RX_PACKET_1552BYTE BIT18
+-#define ETH_MAX_RX_PACKET_9022BYTE (BIT18 | BIT17)
+-#define ETH_MAX_RX_PACKET_9192BYTE BIT19
+-#define ETH_MAX_RX_PACKET_9700BYTE (BIT19 | BIT17)
+-#define ETH_SET_EXT_LOOPBACK BIT20
+-#define ETH_CLR_EXT_LOOPBACK 0
+-#define ETH_SET_FULL_DUPLEX_MODE BIT21
+-#define ETH_SET_HALF_DUPLEX_MODE 0
+-#define ETH_ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX BIT22
+-#define ETH_DISABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX 0
+-#define ETH_SET_GMII_SPEED_TO_10_100 0
+-#define ETH_SET_GMII_SPEED_TO_1000 BIT23
+-#define ETH_SET_MII_SPEED_TO_10 0
+-#define ETH_SET_MII_SPEED_TO_100 BIT24
+-
++#define ETH_INTERFACE_GMII_MII 0
++#define ETH_INTERFACE_PCM BIT0
++#define ETH_LINK_IS_DOWN 0
++#define ETH_LINK_IS_UP BIT1
++#define ETH_PORT_AT_HALF_DUPLEX 0
++#define ETH_PORT_AT_FULL_DUPLEX BIT2
++#define ETH_RX_FLOW_CTRL_DISABLED 0
++#define ETH_RX_FLOW_CTRL_ENBALED BIT3
++#define ETH_GMII_SPEED_100_10 0
++#define ETH_GMII_SPEED_1000 BIT4
++#define ETH_MII_SPEED_10 0
++#define ETH_MII_SPEED_100 BIT5
++#define ETH_NO_TX 0
++#define ETH_TX_IN_PROGRESS BIT7
++#define ETH_BYPASS_NO_ACTIVE 0
++#define ETH_BYPASS_ACTIVE BIT8
++#define ETH_PORT_NOT_AT_PARTITION_STATE 0
++#define ETH_PORT_AT_PARTITION_STATE BIT9
++#define ETH_PORT_TX_FIFO_NOT_EMPTY 0
++#define ETH_PORT_TX_FIFO_EMPTY BIT10
++
++#define ETH_DEFAULT_RX_BPDU_QUEUE_3 (BIT23 | BIT22)
++#define ETH_DEFAULT_RX_BPDU_QUEUE_4 BIT24
++#define ETH_DEFAULT_RX_BPDU_QUEUE_5 (BIT24 | BIT22)
++#define ETH_DEFAULT_RX_BPDU_QUEUE_6 (BIT24 | BIT23)
++#define ETH_DEFAULT_RX_BPDU_QUEUE_7 (BIT24 | BIT23 | BIT22)
+
+ /* SMI reg */
+-#define ETH_SMI_BUSY BIT28 /* 0 - Write, 1 - Read */
+-#define ETH_SMI_READ_VALID BIT27 /* 0 - Write, 1 - Read */
++#define ETH_SMI_BUSY BIT28 /* 0 - Write, 1 - Read */
++#define ETH_SMI_READ_VALID BIT27 /* 0 - Write, 1 - Read */
+ #define ETH_SMI_OPCODE_WRITE 0 /* Completion of Read operation */
+-#define ETH_SMI_OPCODE_READ BIT26 /* Operation is in progress */
++#define ETH_SMI_OPCODE_READ BIT26 /* Operation is in progress */
+
+ /* SDMA command status fields macros */
+
+ /* Tx & Rx descriptors status */
+-#define ETH_ERROR_SUMMARY (BIT0)
++#define ETH_ERROR_SUMMARY (BIT0)
+
+ /* Tx & Rx descriptors command */
+-#define ETH_BUFFER_OWNED_BY_DMA (BIT31)
++#define ETH_BUFFER_OWNED_BY_DMA (BIT31)
+
+ /* Tx descriptors status */
+-#define ETH_LC_ERROR (0 )
+-#define ETH_UR_ERROR (BIT1 )
+-#define ETH_RL_ERROR (BIT2 )
+-#define ETH_LLC_SNAP_FORMAT (BIT9 )
++#define ETH_LC_ERROR (0 )
++#define ETH_UR_ERROR (BIT1 )
++#define ETH_RL_ERROR (BIT2 )
++#define ETH_LLC_SNAP_FORMAT (BIT9 )
+
+ /* Rx descriptors status */
+-#define ETH_CRC_ERROR (0 )
+-#define ETH_OVERRUN_ERROR (BIT1 )
+-#define ETH_MAX_FRAME_LENGTH_ERROR (BIT2 )
+-#define ETH_RESOURCE_ERROR ((BIT2 | BIT1))
+-#define ETH_VLAN_TAGGED (BIT19)
+-#define ETH_BPDU_FRAME (BIT20)
+-#define ETH_TCP_FRAME_OVER_IP_V_4 (0 )
+-#define ETH_UDP_FRAME_OVER_IP_V_4 (BIT21)
+-#define ETH_OTHER_FRAME_TYPE (BIT22)
+-#define ETH_LAYER_2_IS_ETH_V_2 (BIT23)
+-#define ETH_FRAME_TYPE_IP_V_4 (BIT24)
+-#define ETH_FRAME_HEADER_OK (BIT25)
+-#define ETH_RX_LAST_DESC (BIT26)
+-#define ETH_RX_FIRST_DESC (BIT27)
+-#define ETH_UNKNOWN_DESTINATION_ADDR (BIT28)
+-#define ETH_RX_ENABLE_INTERRUPT (BIT29)
+-#define ETH_LAYER_4_CHECKSUM_OK (BIT30)
++#define ETH_CRC_ERROR (0 )
++#define ETH_OVERRUN_ERROR (BIT1 )
++#define ETH_MAX_FRAME_LENGTH_ERROR (BIT2 )
++#define ETH_RESOURCE_ERROR ((BIT2 | BIT1))
++#define ETH_VLAN_TAGGED (BIT19)
++#define ETH_BPDU_FRAME (BIT20)
++#define ETH_TCP_FRAME_OVER_IP_V_4 (0 )
++#define ETH_UDP_FRAME_OVER_IP_V_4 (BIT21)
++#define ETH_OTHER_FRAME_TYPE (BIT22)
++#define ETH_LAYER_2_IS_ETH_V_2 (BIT23)
++#define ETH_FRAME_TYPE_IP_V_4 (BIT24)
++#define ETH_FRAME_HEADER_OK (BIT25)
++#define ETH_RX_LAST_DESC (BIT26)
++#define ETH_RX_FIRST_DESC (BIT27)
++#define ETH_UNKNOWN_DESTINATION_ADDR (BIT28)
++#define ETH_RX_ENABLE_INTERRUPT (BIT29)
++#define ETH_LAYER_4_CHECKSUM_OK (BIT30)
+
+ /* Rx descriptors byte count */
+-#define ETH_FRAME_FRAGMENTED (BIT2)
++#define ETH_FRAME_FRAGMENTED (BIT2)
+
+ /* Tx descriptors command */
+ #define ETH_LAYER_4_CHECKSUM_FIRST_DESC (BIT10)
+-#define ETH_FRAME_SET_TO_VLAN (BIT15)
+-#define ETH_TCP_FRAME (0 )
+-#define ETH_UDP_FRAME (BIT16)
+-#define ETH_GEN_TCP_UDP_CHECKSUM (BIT17)
+-#define ETH_GEN_IP_V_4_CHECKSUM (BIT18)
+-#define ETH_ZERO_PADDING (BIT19)
+-#define ETH_TX_LAST_DESC (BIT20)
+-#define ETH_TX_FIRST_DESC (BIT21)
+-#define ETH_GEN_CRC (BIT22)
+-#define ETH_TX_ENABLE_INTERRUPT (BIT23)
+-#define ETH_AUTO_MODE (BIT30)
++#define ETH_FRAME_SET_TO_VLAN (BIT15)
++#define ETH_TCP_FRAME (0 )
++#define ETH_UDP_FRAME (BIT16)
++#define ETH_GEN_TCP_UDP_CHECKSUM (BIT17)
++#define ETH_GEN_IP_V_4_CHECKSUM (BIT18)
++#define ETH_ZERO_PADDING (BIT19)
++#define ETH_TX_LAST_DESC (BIT20)
++#define ETH_TX_FIRST_DESC (BIT21)
++#define ETH_GEN_CRC (BIT22)
++#define ETH_TX_ENABLE_INTERRUPT (BIT23)
++#define ETH_AUTO_MODE (BIT30)
+
+ /* 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_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;
+
+ typedef enum _eth_target {
+@@ -441,66 +241,103 @@
+ */
+ #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 */
++ 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 */
++ 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 */
++ 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 */
++ 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. */
++/* 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 */
++ 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 */
+ };
+
+-
+ /* Ethernet port specific infomation */
+
+-struct mv64340_private {
+- int port_num; /* User Ethernet port number */
+- u8 port_mac_addr[6]; /* User defined port MAC address. */
+- u32 port_config; /* User port configuration value */
+- u32 port_config_extend; /* User port config extend value */
+- u32 port_sdma_config; /* User port SDMA config value */
+- u32 port_serial_control; /* User port serial control value */
+- u32 port_tx_queue_command; /* Port active Tx queues summary */
+- u32 port_rx_queue_command; /* Port active Rx queues summary */
++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 {
++ int port_num; /* User Ethernet port number */
++ u8 port_mac_addr[6]; /* User defined port MAC address.*/
++ u32 port_config; /* User port configuration value*/
++ u32 port_config_extend; /* User port config extend value*/
++ u32 port_sdma_config; /* User port SDMA config value */
++ u32 port_serial_control; /* User port serial control value */
++ u32 port_tx_queue_command; /* Port active Tx queues summary*/
++ u32 port_rx_queue_command; /* Port active Rx queues summary*/
++
++ 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 */
+- int tx_resource_err; /* Tx ring resource error flag */
++ int rx_resource_err; /* Rx ring resource error flag */
++ int tx_resource_err; /* Tx ring resource error flag */
+
+ /* Tx/Rx rings managment indexes fields. For driver use */
+
+@@ -509,30 +346,32 @@
+
+ /* Next available and first returning Tx resource */
+ int tx_curr_desc_q, tx_used_desc_q;
+-#ifdef MV64340_CHECKSUM_OFFLOAD_TX
+- int tx_first_desc_q;
++#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
++ int tx_first_desc_q;
++ u32 tx_first_command;
+ #endif
+
+-#ifdef MV64340_TX_FAST_REFILL
+- u32 tx_clean_threshold;
++#ifdef MV643XX_TX_FAST_REFILL
++ u32 tx_clean_threshold;
+ #endif
+
+- volatile struct eth_rx_desc * p_rx_desc_area;
+- dma_addr_t rx_desc_dma;
+- unsigned int rx_desc_area_size;
+- struct sk_buff * rx_skb[MV64340_RX_QUEUE_SIZE];
+-
+- volatile struct eth_tx_desc * p_tx_desc_area;
+- dma_addr_t tx_desc_dma;
+- unsigned int tx_desc_area_size;
+- struct sk_buff * tx_skb[MV64340_TX_QUEUE_SIZE];
++ struct eth_rx_desc *p_rx_desc_area;
++ dma_addr_t rx_desc_dma;
++ unsigned int rx_desc_area_size;
++ struct sk_buff **rx_skb;
++
++ struct eth_tx_desc *p_tx_desc_area;
++ dma_addr_t tx_desc_dma;
++ unsigned int tx_desc_area_size;
++ struct sk_buff **tx_skb;
+
+- struct work_struct tx_timeout_task;
++ struct work_struct tx_timeout_task;
+
+ /*
+- * Former struct mv64340_eth_priv members start here
++ * Former struct mv643xx_eth_priv members start here
+ */
+ struct net_device_stats stats;
++ struct mv643xx_mib_counters mib_counters;
+ spinlock_t lock;
+ /* Size of Tx Ring per queue */
+ unsigned int tx_ring_size;
+@@ -544,13 +383,13 @@
+ unsigned int rx_ring_skbs;
+
+ /*
+- * rx_task used to fill RX ring out of bottom half context
++ * rx_task used to fill RX ring out of bottom half context
+ */
+ struct work_struct rx_task;
+
+- /*
+- * Used in case RX Ring is empty, which can be caused when
+- * system does not have resources (skb's)
++ /*
++ * Used in case RX Ring is empty, which can be caused when
++ * system does not have resources (skb's)
+ */
+ struct timer_list timeout;
+ long rx_task_busy __attribute__ ((aligned(SMP_CACHE_BYTES)));
+@@ -563,9 +402,9 @@
+ /* ethernet.h API list */
+
+ /* Port operation control routines */
+-static void eth_port_init(struct mv64340_private *mp);
++static void eth_port_init(struct mv643xx_private *mp);
+ static void eth_port_reset(unsigned int eth_port_num);
+-static int eth_port_start(struct mv64340_private *mp);
++static void eth_port_start(struct mv643xx_private *mp);
+
+ static void ethernet_set_config_reg(unsigned int eth_port_num,
+ unsigned int value);
+@@ -576,26 +415,24 @@
+ unsigned char *p_addr);
+
+ /* PHY and MIB routines */
+-static int ethernet_phy_reset(unsigned int eth_port_num);
++static void ethernet_phy_reset(unsigned int eth_port_num);
++
++static void eth_port_write_smi_reg(unsigned int eth_port_num,
++ unsigned int phy_reg, unsigned int value);
+
+-static int eth_port_write_smi_reg(unsigned int eth_port_num,
+- unsigned int phy_reg,
+- unsigned int value);
+-
+-static int eth_port_read_smi_reg(unsigned int eth_port_num,
+- unsigned int phy_reg,
+- unsigned int *value);
++static void eth_port_read_smi_reg(unsigned int eth_port_num,
++ unsigned int phy_reg, unsigned int *value);
+
+ static void eth_clear_mib_counters(unsigned int eth_port_num);
+
+ /* Port data flow control routines */
+-static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private *mp,
+- struct pkt_info * p_pkt_info);
+-static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv64340_private *mp,
+- struct pkt_info * p_pkt_info);
+-static ETH_FUNC_RET_STATUS eth_port_receive(struct mv64340_private *mp,
+- struct pkt_info * p_pkt_info);
+-static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv64340_private *mp,
+- struct pkt_info * p_pkt_info);
++static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info);
++static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info);
++static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info);
++static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
++ struct pkt_info *p_pkt_info);
+
+-#endif /* __MV64340_ETH_H__ */
++#endif /* __MV643XX_ETH_H__ */
+--- /home/sven/debian/kernel/test/kernel-patch-powerpc-2.6.11-2.6.11/tmp/kernel-source-2.6.11-powerpc/drivers/net/Kconfig 2005-03-02 08:38:25.000000000 +0100
++++ drivers/net/Kconfig 2005-03-05 20:57:01.000000000 +0100
+@@ -2094,10 +2094,11 @@
+
+ config MV643XX_ETH
+ tristate "MV-643XX Ethernet support"
+- depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX
++ depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || PPC_CHRP
+ help
+ This driver supports the gigabit Ethernet on the Marvell MV643XX
+- chipset which is used in the Momenco Ocelot C and Jaguar ATX.
++ chipset which is used in the Momenco Ocelot C and Jaguar ATX and
++ Pegasos II, amongst other PPC and MIPS boards.
+
+ config MV643XX_ETH_0
+ bool "MV-643XX Port 0"
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-07 05:30:22 UTC (rev 2631)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1 2005-03-07 13:57:28 UTC (rev 2632)
@@ -41,5 +41,5 @@
+ tty-locking-fixes9.dpatch
+ sparc64-hme-lockup.dpatch
+ amd64-int3-fix.dpatch
-+ marvell-pegasos.dpatch
++ powerpc-pegasos-marvell.dpatch
More information about the Kernel-svn-changes
mailing list