ramips: move ramips_eth_platform_data into a separate file

[openwrt.git] / 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 43ccdfc..0565692 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -25,6 +25,7 @@
 #include <linux/platform_device.h>
 
 #include <eth.h>
 #include <linux/platform_device.h>
 
 #include <eth.h>

+#include <ramips_eth_platform.h>

 
 #define TX_TIMEOUT (20 * HZ / 100)
 #define        MAX_RX_LENGTH   1500
 
 #define TX_TIMEOUT (20 * HZ / 100)
 #define        MAX_RX_LENGTH   1500


@@ -60,17 +61,22 @@ ramips_cleanup_dma(struct net_device *dev)
                if (priv->rx_skb[i])
                        dev_kfree_skb_any(priv->rx_skb[i]);
 
                if (priv->rx_skb[i])
                        dev_kfree_skb_any(priv->rx_skb[i]);
 

-       dma_free_coherent(NULL, NUM_RX_DESC * sizeof(struct ramips_rx_dma),
-               priv->rx, priv->phy_rx);
+       if (priv->rx)
+               dma_free_coherent(NULL,
+                                 NUM_RX_DESC * sizeof(struct ramips_rx_dma),
+                                 priv->rx, priv->phy_rx);

 
 

-       dma_free_coherent(NULL, NUM_TX_DESC * sizeof(struct ramips_tx_dma),
-               priv->tx, priv->phy_tx);
+       if (priv->tx)
+               dma_free_coherent(NULL,
+                                 NUM_TX_DESC * sizeof(struct ramips_tx_dma),
+                                 priv->tx, priv->phy_tx);

 }
 
 static int
 ramips_alloc_dma(struct net_device *dev)
 {
        struct raeth_priv *priv = netdev_priv(dev);
 }
 
 static int
 ramips_alloc_dma(struct net_device *dev)
 {
        struct raeth_priv *priv = netdev_priv(dev);

+       int err = -ENOMEM;

        int i;
 
        priv->skb_free_idx = 0;
        int i;
 
        priv->skb_free_idx = 0;


@@ -78,6 +84,9 @@ ramips_alloc_dma(struct net_device *dev)
        /* setup tx ring */
        priv->tx = dma_alloc_coherent(NULL,
                NUM_TX_DESC * sizeof(struct ramips_tx_dma), &priv->phy_tx, GFP_ATOMIC);
        /* 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)
+               goto err_cleanup;
+

        for(i = 0; i < NUM_TX_DESC; i++)
        {
                memset(&priv->tx[i], 0, sizeof(struct ramips_tx_dma));
        for(i = 0; i < NUM_TX_DESC; i++)
        {
                memset(&priv->tx[i], 0, sizeof(struct ramips_tx_dma));


@@ -89,11 +98,17 @@ ramips_alloc_dma(struct net_device *dev)
        /* setup rx ring */
        priv->rx = dma_alloc_coherent(NULL,
                NUM_RX_DESC * sizeof(struct ramips_rx_dma), &priv->phy_rx, GFP_ATOMIC);
        /* 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)
+               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(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);

-               BUG_ON(!new_skb);
+
+               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,
                skb_reserve(new_skb, 2);
                priv->rx[i].rxd1 =
                        dma_map_single(NULL, skb_put(new_skb, 2), MAX_RX_LENGTH + 2,


@@ -103,6 +118,10 @@ ramips_alloc_dma(struct net_device *dev)
        }
 
        return 0;
        }
 
        return 0;

+
+ err_cleanup:
+       ramips_cleanup_dma(dev);
+       return err;

 }
 
 static void
 }
 
 static void


@@ -282,8 +301,17 @@ static int
 ramips_eth_open(struct net_device *dev)
 {
        struct raeth_priv *priv = netdev_priv(dev);
 ramips_eth_open(struct net_device *dev)
 {
        struct raeth_priv *priv = netdev_priv(dev);

+       int err;
+
+       err = request_irq(dev->irq, ramips_eth_irq, IRQF_DISABLED,
+                         dev->name, dev);
+       if (err)
+               return err;
+
+       err = ramips_alloc_dma(dev);
+       if (err)
+               goto err_free_irq;

 
 

-       ramips_alloc_dma(dev);

        ramips_setup_dma(dev);
        ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
                (RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
        ramips_setup_dma(dev);
        ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
                (RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |


@@ -293,7 +321,6 @@ ramips_eth_open(struct net_device *dev)
                ~(RAMIPS_US_CYC_CNT_MASK << RAMIPS_US_CYC_CNT_SHIFT)) |
                ((rt305x_sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
                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),
                RAMIPS_FE_GLO_CFG);

-       request_irq(dev->irq, ramips_eth_irq, IRQF_DISABLED, dev->name, dev);

        tasklet_init(&priv->tx_housekeeping_tasklet, ramips_eth_tx_housekeeping,
                (unsigned long)dev);
        tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);
        tasklet_init(&priv->tx_housekeeping_tasklet, ramips_eth_tx_housekeeping,
                (unsigned long)dev);
        tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);


@@ -310,6 +337,10 @@ ramips_eth_open(struct net_device *dev)
        ramips_fe_wr(0, RAMIPS_FE_RST_GL);
        netif_start_queue(dev);
        return 0;
        ramips_fe_wr(0, RAMIPS_FE_RST_GL);
        netif_start_queue(dev);
        return 0;

+
+ err_free_irq:
+       free_irq(dev->irq, dev);
+       return err;

 }
 
 static int
 }
 
 static int