ramips: add error handling to ramips_alloc_dma

[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 a4118ab..35c44cc 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -54,18 +54,28 @@ static void
 ramips_cleanup_dma(struct net_device *dev)
 {
        struct raeth_priv *priv = netdev_priv(dev);
 ramips_cleanup_dma(struct net_device *dev)
 {
        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]);

 
 

-       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;


@@ -73,6 +83,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));


@@ -80,19 +93,21 @@ ramips_alloc_dma(struct net_device *dev)
                priv->tx[i].txd4 &= (TX_DMA_QN_MASK | TX_DMA_PN_MASK);
                priv->tx[i].txd4 |= TX_DMA_QN(3) | TX_DMA_PN(1);
        }
                priv->tx[i].txd4 &= (TX_DMA_QN_MASK | TX_DMA_PN_MASK);
                priv->tx[i].txd4 |= TX_DMA_QN(3) | TX_DMA_PN(1);
        }

-       ramips_fe_wr(phys_to_bus(priv->phy_tx), 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);

 
        /* 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,


@@ -100,12 +115,28 @@ ramips_alloc_dma(struct net_device *dev)
                priv->rx[i].rxd2 |= RX_DMA_LSO;
                priv->rx_skb[i] = new_skb;
        }
                priv->rx[i].rxd2 |= RX_DMA_LSO;
                priv->rx_skb[i] = new_skb;
        }

+
+       return 0;
+
+ err_cleanup:
+       ramips_cleanup_dma(dev);
+       return err;
+}
+
+static void
+ramips_setup_dma(struct net_device *dev)
+{
+       struct raeth_priv *priv = netdev_priv(dev);
+
+       ramips_fe_wr(phys_to_bus(priv->phy_tx), 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(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);
        ramips_fe_wr(phys_to_bus(priv->phy_rx), 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);

-
-       return 0;

 }
 
 static int
 }
 
 static int


@@ -269,8 +300,13 @@ 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 = ramips_alloc_dma(dev);
+       if (err)
+               return err;

 
 

-       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_TX_DMA_EN | RAMIPS_PDMA_SIZE_4DWORDS),
        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),