X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7616e48d77eb9f484e064295f83cc5580496456e..c9a5f3f810670e923b32f90e9ca87496c42ae30c:/target/linux/ramips/files/drivers/net/ramips.c

diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
index b1cc5504d..302942a62 100644
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -22,20 +22,31 @@
 #include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
+#include <linux/ethtool.h>
 #include <linux/platform_device.h>
+#include <linux/phy.h>
 
 #include <ramips_eth_platform.h>
 #include "ramips_eth.h"
 
 #define TX_TIMEOUT (20 * HZ / 100)
-#define	MAX_RX_LENGTH	1500
+#define	MAX_RX_LENGTH	1600
 
 #ifdef CONFIG_RALINK_RT305X
 #include "ramips_esw.c"
+#else
+static inline int rt305x_esw_init(void) { return 0; }
+static inline void rt305x_esw_exit(void) { }
 #endif
 
 #define phys_to_bus(a)  (a & 0x1FFFFFFF)
 
+#ifdef CONFIG_RAMIPS_ETH_DEBUG
+#define RADEBUG(fmt, args...)	printk(KERN_DEBUG fmt, ## args)
+#else
+#define RADEBUG(fmt, args...)	do {} while (0)
+#endif
+
 static struct net_device * ramips_dev;
 static void __iomem *ramips_fe_base = 0;
 
@@ -51,195 +62,408 @@ ramips_fe_rr(unsigned reg)
 	return __raw_readl(ramips_fe_base + reg);
 }
 
+static inline void
+ramips_fe_int_disable(u32 mask)
+{
+	ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) & ~mask,
+		     RAMIPS_FE_INT_ENABLE);
+	/* flush write */
+	ramips_fe_rr(RAMIPS_FE_INT_ENABLE);
+}
+
+static inline void
+ramips_fe_int_enable(u32 mask)
+{
+	ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) | mask,
+		     RAMIPS_FE_INT_ENABLE);
+	/* flush write */
+	ramips_fe_rr(RAMIPS_FE_INT_ENABLE);
+}
+
+static inline void
+ramips_hw_set_macaddr(unsigned char *mac)
+{
+	ramips_fe_wr((mac[0] << 8) | mac[1], RAMIPS_GDMA1_MAC_ADRH);
+	ramips_fe_wr((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+		     RAMIPS_GDMA1_MAC_ADRL);
+}
+
+#ifdef CONFIG_RALINK_RT288X
+
+#define RAMIPS_MDIO_RETRY	1000
+
 static void
-ramips_cleanup_dma(struct net_device *dev)
+ramips_setup_mdio_cfg(struct raeth_priv *re)
+{
+	unsigned int mdio_cfg;
+
+	mdio_cfg = RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 |
+		   RAMIPS_MDIO_CFG_TX_CLK_SKEW_200 |
+		   RAMIPS_MDIO_CFG_GP1_FRC_EN;
+
+	if (re->duplex == DUPLEX_FULL)
+		mdio_cfg |= RAMIPS_MDIO_CFG_GP1_DUPLEX;
+
+	if (re->tx_fc)
+		mdio_cfg |= RAMIPS_MDIO_CFG_GP1_FC_TX;
+
+	if (re->rx_fc)
+		mdio_cfg |= RAMIPS_MDIO_CFG_GP1_FC_RX;
+
+	switch (re->speed) {
+	case SPEED_10:
+		mdio_cfg |= RAMIPS_MDIO_CFG_GP1_SPEED_10;
+		break;
+	case SPEED_100:
+		mdio_cfg |= RAMIPS_MDIO_CFG_GP1_SPEED_100;
+		break;
+	case SPEED_1000:
+		mdio_cfg |= RAMIPS_MDIO_CFG_GP1_SPEED_1000;
+		break;
+	default:
+		BUG();
+	}
+
+	ramips_fe_wr(mdio_cfg, RAMIPS_MDIO_CFG);
+}
+static int
+ramips_mdio_wait_ready(struct raeth_priv *re)
+{
+	int retries;
+
+	retries = RAMIPS_MDIO_RETRY;
+	while (1) {
+		u32 t;
+
+		t = ramips_fe_rr(RAMIPS_MDIO_ACCESS);
+		if ((t & (0x1 << 31)) == 0)
+			return 0;
+
+		if (retries-- == 0)
+			break;
+
+		udelay(1);
+	}
+
+	dev_err(re->parent, "MDIO operation timed out\n");
+	return -ETIMEDOUT;
+}
+
+static int
+ramips_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg)
+{
+	struct raeth_priv *re = bus->priv;
+	int err;
+	u32 t;
+
+	err = ramips_mdio_wait_ready(re);
+	if (err)
+		return 0xffff;
+
+	t = (phy_addr << 24) | (phy_reg << 16);
+	ramips_fe_wr(t, RAMIPS_MDIO_ACCESS);
+	t |= (1 << 31);
+	ramips_fe_wr(t, RAMIPS_MDIO_ACCESS);
+
+	err = ramips_mdio_wait_ready(re);
+	if (err)
+		return 0xffff;
+
+	RADEBUG("%s: addr=%04x, reg=%04x, value=%04x\n", __func__,
+		phy_addr, phy_reg, ramips_fe_rr(RAMIPS_MDIO_ACCESS) & 0xffff);
+
+	return ramips_fe_rr(RAMIPS_MDIO_ACCESS) & 0xffff;
+}
+
+static int
+ramips_mdio_write(struct mii_bus *bus, int phy_addr, int phy_reg, u16 val)
+{
+	struct raeth_priv *re = bus->priv;
+	int err;
+	u32 t;
+
+	RADEBUG("%s: addr=%04x, reg=%04x, value=%04x\n", __func__,
+		phy_addr, phy_reg, ramips_fe_rr(RAMIPS_MDIO_ACCESS) & 0xffff);
+
+	err = ramips_mdio_wait_ready(re);
+	if (err)
+		return err;
+
+	t = (1 << 30) | (phy_addr << 24) | (phy_reg << 16) | val;
+	ramips_fe_wr(t, RAMIPS_MDIO_ACCESS);
+	t |= (1 << 31);
+	ramips_fe_wr(t, RAMIPS_MDIO_ACCESS);
+
+	return ramips_mdio_wait_ready(re);
+}
+
+static int
+ramips_mdio_reset(struct mii_bus *bus)
+{
+	/* TODO */
+	return 0;
+}
+
+static int
+ramips_mdio_init(struct raeth_priv *re)
+{
+	int err;
+	int i;
+
+	re->mii_bus = mdiobus_alloc();
+	if (re->mii_bus == NULL)
+		return -ENOMEM;
+
+	re->mii_bus->name = "ramips_mdio";
+	re->mii_bus->read = ramips_mdio_read;
+	re->mii_bus->write = ramips_mdio_write;
+	re->mii_bus->reset = ramips_mdio_reset;
+	re->mii_bus->irq = re->mii_irq;
+	re->mii_bus->priv = re;
+	re->mii_bus->parent = re->parent;
+
+	snprintf(re->mii_bus->id, MII_BUS_ID_SIZE, "%s", "ramips_mdio");
+	re->mii_bus->phy_mask = 0;
+
+	for (i = 0; i < PHY_MAX_ADDR; i++)
+		re->mii_irq[i] = PHY_POLL;
+
+	err = mdiobus_register(re->mii_bus);
+	if (err)
+		goto err_free_bus;
+
+	return 0;
+
+err_free_bus:
+	kfree(re->mii_bus);
+	return err;
+}
+
+static void
+ramips_mdio_cleanup(struct raeth_priv *re)
+{
+	mdiobus_unregister(re->mii_bus);
+	kfree(re->mii_bus);
+}
+
+#else
+static inline void
+ramips_setup_mdio_cfg(struct raeth_priv *re)
+{
+}
+
+static inline int
+ramips_mdio_init(struct raeth_priv *re)
+{
+	return 0;
+}
+
+static inline void
+ramips_mdio_cleanup(struct raeth_priv *re)
+{
+}
+#endif /* CONFIG_RALINK_RT288X */
+
+static void
+ramips_cleanup_dma(struct raeth_priv *re)
 {
-	struct raeth_priv *priv = netdev_priv(dev);
 	int i;
 
 	for (i = 0; i < NUM_RX_DESC; i++)
-		if (priv->rx_skb[i])
-			dev_kfree_skb_any(priv->rx_skb[i]);
+		if (re->rx_skb[i]) {
+			dma_unmap_single(&re->netdev->dev, re->rx_dma[i],
+					 MAX_RX_LENGTH, DMA_FROM_DEVICE);
+			dev_kfree_skb_any(re->rx_skb[i]);
+		}
 
-	if (priv->rx)
-		dma_free_coherent(NULL,
+	if (re->rx)
+		dma_free_coherent(&re->netdev->dev,
 				  NUM_RX_DESC * sizeof(struct ramips_rx_dma),
-				  priv->rx, priv->phy_rx);
+				  re->rx, re->rx_desc_dma);
 
-	if (priv->tx)
-		dma_free_coherent(NULL,
+	if (re->tx)
+		dma_free_coherent(&re->netdev->dev,
 				  NUM_TX_DESC * sizeof(struct ramips_tx_dma),
-				  priv->tx, priv->phy_tx);
+				  re->tx, re->tx_desc_dma);
 }
 
 static int
-ramips_alloc_dma(struct net_device *dev)
+ramips_alloc_dma(struct raeth_priv *re)
 {
-	struct raeth_priv *priv = netdev_priv(dev);
 	int err = -ENOMEM;
 	int i;
 
-	priv->skb_free_idx = 0;
+	re->skb_free_idx = 0;
 
 	/* setup tx ring */
-	priv->tx = dma_alloc_coherent(NULL,
-		NUM_TX_DESC * sizeof(struct ramips_tx_dma), &priv->phy_tx, GFP_ATOMIC);
-	if (!priv->tx)
+	re->tx = dma_alloc_coherent(&re->netdev->dev,
+				    NUM_TX_DESC * sizeof(struct ramips_tx_dma),
+				    &re->tx_desc_dma, GFP_ATOMIC);
+	if (!re->tx)
 		goto err_cleanup;
 
-	for(i = 0; i < NUM_TX_DESC; i++)
-	{
-		memset(&priv->tx[i], 0, sizeof(struct ramips_tx_dma));
-		priv->tx[i].txd2 |= TX_DMA_LSO | TX_DMA_DONE;
-		priv->tx[i].txd4 &= (TX_DMA_QN_MASK | TX_DMA_PN_MASK);
-		priv->tx[i].txd4 |= TX_DMA_QN(3) | TX_DMA_PN(1);
+	memset(re->tx, 0, NUM_TX_DESC * sizeof(struct ramips_tx_dma));
+	for (i = 0; i < NUM_TX_DESC; i++) {
+		re->tx[i].txd2 = TX_DMA_LSO | TX_DMA_DONE;
+		re->tx[i].txd4 = TX_DMA_QN(3) | TX_DMA_PN(1);
 	}
 
 	/* setup rx ring */
-	priv->rx = dma_alloc_coherent(NULL,
-		NUM_RX_DESC * sizeof(struct ramips_rx_dma), &priv->phy_rx, GFP_ATOMIC);
-	if (!priv->rx)
+	re->rx = dma_alloc_coherent(&re->netdev->dev,
+				    NUM_RX_DESC * sizeof(struct ramips_rx_dma),
+				    &re->rx_desc_dma, GFP_ATOMIC);
+	if (!re->rx)
 		goto err_cleanup;
 
-	memset(priv->rx, 0, sizeof(struct ramips_rx_dma) * NUM_RX_DESC);
-	for(i = 0; i < NUM_RX_DESC; i++)
-	{
-		struct sk_buff *new_skb = dev_alloc_skb(MAX_RX_LENGTH + 2);
+	memset(re->rx, 0, sizeof(struct ramips_rx_dma) * NUM_RX_DESC);
+	for (i = 0; i < NUM_RX_DESC; i++) {
+		dma_addr_t dma_addr;
+		struct sk_buff *new_skb = dev_alloc_skb(MAX_RX_LENGTH +
+							NET_IP_ALIGN);
 
 		if (!new_skb)
 			goto err_cleanup;
 
-		skb_reserve(new_skb, 2);
-		priv->rx[i].rxd1 =
-			dma_map_single(NULL, skb_put(new_skb, 2), MAX_RX_LENGTH + 2,
-				DMA_FROM_DEVICE);
-		priv->rx[i].rxd2 |= RX_DMA_LSO;
-		priv->rx_skb[i] = new_skb;
+		skb_reserve(new_skb, NET_IP_ALIGN);
+
+		dma_addr = dma_map_single(&re->netdev->dev, new_skb->data,
+					  MAX_RX_LENGTH, DMA_FROM_DEVICE);
+		re->rx_dma[i] = dma_addr;
+		re->rx[i].rxd1 = (unsigned int) re->rx_dma[i];
+		re->rx[i].rxd2 |= RX_DMA_LSO;
+		re->rx_skb[i] = new_skb;
 	}
 
 	return 0;
 
  err_cleanup:
-	ramips_cleanup_dma(dev);
+	ramips_cleanup_dma(re);
 	return err;
 }
 
 static void
-ramips_setup_dma(struct net_device *dev)
+ramips_setup_dma(struct raeth_priv *re)
 {
-	struct raeth_priv *priv = netdev_priv(dev);
-
-	ramips_fe_wr(phys_to_bus(priv->phy_tx), RAMIPS_TX_BASE_PTR0);
+	ramips_fe_wr(re->tx_desc_dma, RAMIPS_TX_BASE_PTR0);
 	ramips_fe_wr(NUM_TX_DESC, RAMIPS_TX_MAX_CNT0);
 	ramips_fe_wr(0, RAMIPS_TX_CTX_IDX0);
 	ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG);
 
-	ramips_fe_wr(phys_to_bus(priv->phy_rx), RAMIPS_RX_BASE_PTR0);
+	ramips_fe_wr(re->rx_desc_dma, RAMIPS_RX_BASE_PTR0);
 	ramips_fe_wr(NUM_RX_DESC, RAMIPS_RX_MAX_CNT0);
 	ramips_fe_wr((NUM_RX_DESC - 1), RAMIPS_RX_CALC_IDX0);
 	ramips_fe_wr(RAMIPS_PST_DRX_IDX0, RAMIPS_PDMA_RST_CFG);
 }
 
 static int
-ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
+ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct raeth_priv *priv = netdev_priv(dev);
 	unsigned long tx;
 	unsigned int tx_next;
-	unsigned int mapped_addr;
-
-
-	if(priv->plat->min_pkt_len)
-	{
-		if(skb->len < priv->plat->min_pkt_len)
-		 {
-		     if(skb_padto(skb, priv->plat->min_pkt_len))
-			 {
-				 printk(KERN_ERR "ramips_eth: skb_padto failed\n");
-				 kfree_skb(skb);
-				 return 0;
-			 }
-		     skb_put(skb, priv->plat->min_pkt_len - skb->len);
-		 }
+	dma_addr_t mapped_addr;
+
+	if (priv->plat->min_pkt_len) {
+		if (skb->len < priv->plat->min_pkt_len) {
+			if (skb_padto(skb, priv->plat->min_pkt_len)) {
+				printk(KERN_ERR
+				       "ramips_eth: skb_padto failed\n");
+				kfree_skb(skb);
+				return 0;
+			}
+			skb_put(skb, priv->plat->min_pkt_len - skb->len);
+		}
 	}
+
 	dev->trans_start = jiffies;
-	mapped_addr = (unsigned int)dma_map_single(NULL, skb->data, skb->len,
-			DMA_TO_DEVICE);
-	dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE);
+	mapped_addr = dma_map_single(&priv->netdev->dev, skb->data, skb->len,
+				     DMA_TO_DEVICE);
+
+	spin_lock(&priv->page_lock);
 	tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
-	if(tx == NUM_TX_DESC - 1)
-		tx_next = 0;
-	else
-		tx_next = tx + 1;
-	if((priv->tx_skb[tx] == 0) && (priv->tx_skb[tx_next] == 0))
-	{
-		if(!(priv->tx[tx].txd2 & TX_DMA_DONE) || !(priv->tx[tx_next].txd2 & TX_DMA_DONE))
-		{
-			kfree_skb(skb);
-			dev->stats.tx_dropped++;
-			printk(KERN_ERR "%s: dropping\n", dev->name);
-			return 0;
-		}
-		priv->tx[tx].txd1 = virt_to_phys(skb->data);
-		priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
-		priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
-		wmb();
-		ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
-		dev->stats.tx_packets++;
-		dev->stats.tx_bytes += skb->len;
-		priv->tx_skb[tx] = skb;
-		wmb();
-		ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
-	} else {
-		dev->stats.tx_dropped++;
-		kfree_skb(skb);
-	}
-	return 0;
+	tx_next = (tx + 1) % NUM_TX_DESC;
+
+	if ((priv->tx_skb[tx]) || (priv->tx_skb[tx_next]) ||
+	    !(priv->tx[tx].txd2 & TX_DMA_DONE) ||
+	    !(priv->tx[tx_next].txd2 & TX_DMA_DONE))
+		goto out;
+
+	priv->tx[tx].txd1 = (unsigned int) mapped_addr;
+	priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
+	priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
+	dev->stats.tx_packets++;
+	dev->stats.tx_bytes += skb->len;
+	priv->tx_skb[tx] = skb;
+	wmb();
+	ramips_fe_wr(tx_next, RAMIPS_TX_CTX_IDX0);
+	spin_unlock(&priv->page_lock);
+	return NETDEV_TX_OK;
+
+ out:
+	spin_unlock(&priv->page_lock);
+	dev->stats.tx_dropped++;
+	kfree_skb(skb);
+	return NETDEV_TX_OK;
 }
 
 static void
 ramips_eth_rx_hw(unsigned long ptr)
 {
-	struct net_device *dev = (struct net_device*)ptr;
+	struct net_device *dev = (struct net_device *) ptr;
 	struct raeth_priv *priv = netdev_priv(dev);
 	int rx;
 	int max_rx = 16;
 
-	while(max_rx)
-	{
+	while (max_rx) {
 		struct sk_buff *rx_skb, *new_skb;
+		int pktlen;
 
 		rx = (ramips_fe_rr(RAMIPS_RX_CALC_IDX0) + 1) % NUM_RX_DESC;
-		if(!(priv->rx[rx].rxd2 & RX_DMA_DONE))
+		if (!(priv->rx[rx].rxd2 & RX_DMA_DONE))
 			break;
 		max_rx--;
 
 		rx_skb = priv->rx_skb[rx];
-		rx_skb->len = RX_DMA_PLEN0(priv->rx[rx].rxd2);
-		rx_skb->tail = rx_skb->data + rx_skb->len;
-		rx_skb->dev = dev;
-		rx_skb->protocol = eth_type_trans(rx_skb, dev);
-		rx_skb->ip_summed = CHECKSUM_NONE;
-		dev->stats.rx_packets++;
-		dev->stats.rx_bytes += rx_skb->len;
-		netif_rx(rx_skb);
-
-		new_skb = __dev_alloc_skb(MAX_RX_LENGTH + 2, GFP_DMA | GFP_ATOMIC);
-		priv->rx_skb[rx] = new_skb;
-		BUG_ON(!new_skb);
-		skb_reserve(new_skb, 2);
-		priv->rx[rx].rxd1 =
-			dma_map_single(NULL, new_skb->data, MAX_RX_LENGTH + 2,
-			DMA_FROM_DEVICE);
+		pktlen = RX_DMA_PLEN0(priv->rx[rx].rxd2);
+
+		new_skb = netdev_alloc_skb(dev, MAX_RX_LENGTH + NET_IP_ALIGN);
+		/* Reuse the buffer on allocation failures */
+		if (new_skb) {
+			dma_addr_t dma_addr;
+
+			dma_unmap_single(&priv->netdev->dev, priv->rx_dma[rx],
+					 MAX_RX_LENGTH, DMA_FROM_DEVICE);
+
+			skb_put(rx_skb, pktlen);
+			rx_skb->dev = dev;
+			rx_skb->protocol = eth_type_trans(rx_skb, dev);
+			rx_skb->ip_summed = CHECKSUM_NONE;
+			dev->stats.rx_packets++;
+			dev->stats.rx_bytes += pktlen;
+			netif_rx(rx_skb);
+
+			priv->rx_skb[rx] = new_skb;
+			skb_reserve(new_skb, NET_IP_ALIGN);
+
+			dma_addr = dma_map_single(&priv->netdev->dev,
+						  new_skb->data,
+						  MAX_RX_LENGTH,
+						  DMA_FROM_DEVICE);
+			priv->rx_dma[rx] = dma_addr;
+			priv->rx[rx].rxd1 = (unsigned int) dma_addr;
+		} else {
+			dev->stats.rx_dropped++;
+		}
+
 		priv->rx[rx].rxd2 &= ~RX_DMA_DONE;
 		wmb();
 		ramips_fe_wr(rx, RAMIPS_RX_CALC_IDX0);
 	}
-	if(max_rx == 0)
+
+	if (max_rx == 0)
 		tasklet_schedule(&priv->rx_tasklet);
 	else
-		ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) | RAMIPS_RX_DLY_INT,
-			RAMIPS_FE_INT_ENABLE);
+		ramips_fe_int_enable(RAMIPS_RX_DLY_INT);
 }
 
 static void
@@ -248,31 +472,18 @@ ramips_eth_tx_housekeeping(unsigned long ptr)
 	struct net_device *dev = (struct net_device*)ptr;
 	struct raeth_priv *priv = netdev_priv(dev);
 
-	while((priv->tx[priv->skb_free_idx].txd2 & TX_DMA_DONE) &&
-		(priv->tx_skb[priv->skb_free_idx]))
-	{
-		dev_kfree_skb_irq((struct sk_buff*)priv->tx_skb[priv->skb_free_idx]);
+	spin_lock(&priv->page_lock);
+	while ((priv->tx[priv->skb_free_idx].txd2 & TX_DMA_DONE) &&
+	       (priv->tx_skb[priv->skb_free_idx])) {
+		dev_kfree_skb_irq(priv->tx_skb[priv->skb_free_idx]);
 		priv->tx_skb[priv->skb_free_idx] = 0;
 		priv->skb_free_idx++;
-		if(priv->skb_free_idx >= NUM_TX_DESC)
+		if (priv->skb_free_idx >= NUM_TX_DESC)
 			priv->skb_free_idx = 0;
 	}
-	ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) | RAMIPS_TX_DLY_INT,
-		RAMIPS_FE_INT_ENABLE);
-}
-
-static int
-ramips_eth_set_mac_addr(struct net_device *dev, void *priv)
-{
-	unsigned char *mac = (unsigned char*)priv;
+	spin_unlock(&priv->page_lock);
 
-	if(netif_running(dev))
-		return -EBUSY;
-	memcpy(dev->dev_addr, ((struct sockaddr*)priv)->sa_data, dev->addr_len);
-	ramips_fe_wr((mac[0] << 8) | mac[1], RAMIPS_GDMA1_MAC_ADRH);
-	ramips_fe_wr(RAMIPS_GDMA1_MAC_ADRL,
-		(mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5]);
-	return 0;
+	ramips_fe_int_enable(RAMIPS_TX_DLY_INT);
 }
 
 static void
@@ -291,14 +502,16 @@ ramips_eth_irq(int irq, void *dev)
 
 	ramips_fe_wr(0xFFFFFFFF, RAMIPS_FE_INT_STATUS);
 
-	if(fe_int & RAMIPS_RX_DLY_INT)
-	{
-		ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) & ~(RAMIPS_RX_DLY_INT),
-			RAMIPS_FE_INT_ENABLE);
+	if (fe_int & RAMIPS_RX_DLY_INT) {
+		ramips_fe_int_disable(RAMIPS_RX_DLY_INT);
 		tasklet_schedule(&priv->rx_tasklet);
 	}
-	if(fe_int & RAMIPS_TX_DLY_INT)
-		ramips_eth_tx_housekeeping((unsigned long)dev);
+
+	if (fe_int & RAMIPS_TX_DLY_INT) {
+		ramips_fe_int_disable(RAMIPS_TX_DLY_INT);
+		tasklet_schedule(&priv->tx_housekeeping_tasklet);
+	}
+
 	return IRQ_HANDLED;
 }
 
@@ -313,22 +526,28 @@ ramips_eth_open(struct net_device *dev)
 	if (err)
 		return err;
 
-	err = ramips_alloc_dma(dev);
+	err = ramips_alloc_dma(priv);
 	if (err)
 		goto err_free_irq;
 
-	ramips_setup_dma(dev);
+	ramips_hw_set_macaddr(dev->dev_addr);
+
+	ramips_setup_dma(priv);
 	ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
 		(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
 		RAMIPS_TX_DMA_EN | RAMIPS_PDMA_SIZE_4DWORDS),
 		RAMIPS_PDMA_GLO_CFG);
 	ramips_fe_wr((ramips_fe_rr(RAMIPS_FE_GLO_CFG) &
 		~(RAMIPS_US_CYC_CNT_MASK << RAMIPS_US_CYC_CNT_SHIFT)) |
-		((rt305x_sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
+		((priv->plat->sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
 		RAMIPS_FE_GLO_CFG);
+
 	tasklet_init(&priv->tx_housekeeping_tasklet, ramips_eth_tx_housekeeping,
-		(unsigned long)dev);
+		     (unsigned long)dev);
 	tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);
+
+	ramips_setup_mdio_cfg(priv);
+
 	ramips_fe_wr(RAMIPS_DELAY_INIT, RAMIPS_DLY_INT_CFG);
 	ramips_fe_wr(RAMIPS_TX_DLY_INT | RAMIPS_RX_DLY_INT, RAMIPS_FE_INT_ENABLE);
 	ramips_fe_wr(ramips_fe_rr(RAMIPS_GDMA1_FWD_CFG) &
@@ -340,6 +559,7 @@ ramips_eth_open(struct net_device *dev)
 	ramips_fe_wr(RAMIPS_PSE_FQFC_CFG_INIT, RAMIPS_PSE_FQ_CFG);
 	ramips_fe_wr(1, RAMIPS_FE_RST_GL);
 	ramips_fe_wr(0, RAMIPS_FE_RST_GL);
+
 	netif_start_queue(dev);
 	return 0;
 
@@ -353,14 +573,19 @@ ramips_eth_stop(struct net_device *dev)
 {
 	struct raeth_priv *priv = netdev_priv(dev);
 
-	ramips_fe_wr(RAMIPS_PDMA_GLO_CFG, ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) &
-		~(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN | RAMIPS_TX_DMA_EN));
+	ramips_fe_wr(ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) &
+		     ~(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN | RAMIPS_TX_DMA_EN),
+		     RAMIPS_PDMA_GLO_CFG);
+
+	/* disable all interrupts in the hw */
+	ramips_fe_wr(0, RAMIPS_FE_INT_ENABLE);
+
 	free_irq(dev->irq, dev);
 	netif_stop_queue(dev);
 	tasklet_kill(&priv->tx_housekeeping_tasklet);
 	tasklet_kill(&priv->rx_tasklet);
-	ramips_cleanup_dma(dev);
-	printk(KERN_DEBUG "ramips_eth: stopped\n");
+	ramips_cleanup_dma(priv);
+	RADEBUG("ramips_eth: stopped\n");
 	return 0;
 }
 
@@ -368,25 +593,42 @@ static int __init
 ramips_eth_probe(struct net_device *dev)
 {
 	struct raeth_priv *priv = netdev_priv(dev);
-	struct sockaddr addr;
+	int err;
 
 	BUG_ON(!priv->plat->reset_fe);
 	priv->plat->reset_fe();
 	net_srandom(jiffies);
-	memcpy(addr.sa_data, priv->plat->mac, 6);
-	ramips_eth_set_mac_addr(dev, &addr);
+	memcpy(dev->dev_addr, priv->plat->mac, ETH_ALEN);
 
 	ether_setup(dev);
-	dev->open = ramips_eth_open;
-	dev->stop = ramips_eth_stop;
-	dev->hard_start_xmit = ramips_eth_hard_start_xmit;
-	dev->set_mac_address = ramips_eth_set_mac_addr;
-	dev->mtu = MAX_RX_LENGTH;
-	dev->tx_timeout = ramips_eth_timeout;
+	dev->mtu = 1500;
 	dev->watchdog_timeo = TX_TIMEOUT;
-	return 0;
+	spin_lock_init(&priv->page_lock);
+
+	err = ramips_mdio_init(priv);
+	return err;
+}
+
+static void
+ramips_eth_uninit(struct net_device *dev)
+{
+	struct raeth_priv *re = netdev_priv(dev);
+
+	ramips_mdio_cleanup(re);
 }
 
+static const struct net_device_ops ramips_eth_netdev_ops = {
+	.ndo_init		= ramips_eth_probe,
+	.ndo_uninit		= ramips_eth_uninit,
+	.ndo_open		= ramips_eth_open,
+	.ndo_stop		= ramips_eth_stop,
+	.ndo_start_xmit		= ramips_eth_hard_start_xmit,
+	.ndo_tx_timeout		= ramips_eth_timeout,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 static int
 ramips_eth_plat_probe(struct platform_device *plat)
 {
@@ -407,11 +649,11 @@ ramips_eth_plat_probe(struct platform_device *plat)
 	}
 
 	ramips_fe_base = ioremap_nocache(res->start, res->end - res->start + 1);
-	if(!ramips_fe_base)
+	if (!ramips_fe_base)
 		return -ENOMEM;
 
 	ramips_dev = alloc_etherdev(sizeof(struct raeth_priv));
-	if(!ramips_dev) {
+	if (!ramips_dev) {
 		dev_err(&plat->dev, "alloc_etherdev failed\n");
 		err = -ENOMEM;
 		goto err_unmap;
@@ -426,8 +668,16 @@ ramips_eth_plat_probe(struct platform_device *plat)
 	}
 	ramips_dev->addr_len = ETH_ALEN;
 	ramips_dev->base_addr = (unsigned long)ramips_fe_base;
-	ramips_dev->init = ramips_eth_probe;
-	priv = (struct raeth_priv*)netdev_priv(ramips_dev);
+	ramips_dev->netdev_ops = &ramips_eth_netdev_ops;
+
+	priv = netdev_priv(ramips_dev);
+
+	priv->netdev = ramips_dev;
+	priv->parent = &plat->dev;
+	priv->speed = data->speed;
+	priv->duplex = data->duplex;
+	priv->rx_fc = data->rx_fc;
+	priv->tx_fc = data->tx_fc;
 	priv->plat = data;
 
 	err = register_netdev(ramips_dev);
@@ -436,10 +686,7 @@ ramips_eth_plat_probe(struct platform_device *plat)
 		goto err_free_dev;
 	}
 
-#ifdef CONFIG_RALINK_RT305X
-	rt305x_esw_init();
-#endif
-	printk(KERN_DEBUG "ramips_eth: loaded\n");
+	RADEBUG("ramips_eth: loaded\n");
 	return 0;
 
  err_free_dev:
@@ -454,7 +701,7 @@ ramips_eth_plat_remove(struct platform_device *plat)
 {
 	unregister_netdev(ramips_dev);
 	free_netdev(ramips_dev);
-	printk(KERN_DEBUG "ramips_eth: unloaded\n");
+	RADEBUG("ramips_eth: unloaded\n");
 	return 0;
 }
 
@@ -470,10 +717,23 @@ static struct platform_driver ramips_eth_driver = {
 static int __init
 ramips_eth_init(void)
 {
-	int ret = platform_driver_register(&ramips_eth_driver);
+	int ret;
+
+	ret = rt305x_esw_init();
 	if (ret)
+		return ret;
+
+	ret = platform_driver_register(&ramips_eth_driver);
+	if (ret) {
 		printk(KERN_ERR
 		       "ramips_eth: Error registering platfom driver!\n");
+		goto esw_cleanup;
+	}
+
+	return 0;
+
+esw_cleanup:
+	rt305x_esw_exit();
 	return ret;
 }
 
@@ -481,6 +741,7 @@ static void __exit
 ramips_eth_cleanup(void)
 {
 	platform_driver_unregister(&ramips_eth_driver);
+	rt305x_esw_exit();
 }
 
 module_init(ramips_eth_init);