X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/90e4aa23860529f06083d0013f662f27ae006660..e1a6f94b649b044702dfeb7b98ebf6b009e663ae:/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 ae47230b7..0565692e5 100644 --- a/target/linux/ramips/files/drivers/net/ramips.c +++ b/target/linux/ramips/files/drivers/net/ramips.c @@ -16,20 +16,16 @@ */ #include -#include #include #include -#include +#include #include #include -#include -#include +#include #include -#include -#include -#include #include +#include #define TX_TIMEOUT (20 * HZ / 100) #define MAX_RX_LENGTH 1500 @@ -55,10 +51,32 @@ ramips_fe_rr(unsigned reg) return __raw_readl(ramips_fe_base + reg); } +static void +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]); + + if (priv->rx) + dma_free_coherent(NULL, + NUM_RX_DESC * sizeof(struct ramips_rx_dma), + priv->rx, priv->phy_rx); + + 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); + int err = -ENOMEM; int i; priv->skb_free_idx = 0; @@ -66,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); + if (!priv->tx) + goto err_cleanup; + for(i = 0; i < NUM_TX_DESC; i++) { memset(&priv->tx[i], 0, sizeof(struct ramips_tx_dma)); @@ -73,32 +94,50 @@ 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); } - 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); + 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); - 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, - PCI_DMA_FROMDEVICE); + DMA_FROM_DEVICE); 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); - - return 0; } static int @@ -123,8 +162,8 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev) } dev->trans_start = jiffies; mapped_addr = (unsigned int)dma_map_single(NULL, skb->data, skb->len, - PCI_DMA_TODEVICE); - dma_sync_single_for_device(NULL, mapped_addr, skb->len, PCI_DMA_TODEVICE); + DMA_TO_DEVICE); + dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE); tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0); if(tx == NUM_TX_DESC - 1) tx_next = 0; @@ -187,7 +226,7 @@ ramips_eth_rx_hw(unsigned long ptr) skb_reserve(new_skb, 2); priv->rx[rx].rxd1 = dma_map_single(NULL, new_skb->data, MAX_RX_LENGTH + 2, - PCI_DMA_FROMDEVICE); + DMA_FROM_DEVICE); priv->rx[rx].rxd2 &= ~RX_DMA_DONE; ramips_fe_wr(rx, RAMIPS_RX_CALC_IDX0); } @@ -262,8 +301,18 @@ static int 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; - ramips_alloc_dma(dev); + err = ramips_alloc_dma(dev); + if (err) + goto err_free_irq; + + 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), @@ -272,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); - 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); @@ -289,6 +337,10 @@ ramips_eth_open(struct net_device *dev) 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 @@ -302,10 +354,7 @@ ramips_eth_stop(struct net_device *dev) netif_stop_queue(dev); tasklet_kill(&priv->tx_housekeeping_tasklet); tasklet_kill(&priv->rx_tasklet); - pci_free_consistent(NULL, NUM_TX_DESC * sizeof(struct ramips_tx_dma), - priv->tx, priv->phy_tx); - pci_free_consistent(NULL, NUM_RX_DESC * sizeof(struct ramips_rx_dma), - priv->rx, priv->phy_rx); + ramips_cleanup_dma(dev); printk(KERN_DEBUG "ramips_eth: stopped\n"); return 0; } @@ -338,6 +387,7 @@ ramips_eth_plat_probe(struct platform_device *plat) { struct raeth_priv *priv; struct ramips_eth_platform_data *data = plat->dev.platform_data; + struct resource *res; int err; if (!data) { @@ -345,7 +395,13 @@ ramips_eth_plat_probe(struct platform_device *plat) return -EINVAL; } - ramips_fe_base = ioremap_nocache(data->base_addr, PAGE_SIZE); + res = platform_get_resource(plat, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&plat->dev, "no memory resource found\n"); + return -ENXIO; + } + + ramips_fe_base = ioremap_nocache(res->start, res->end - res->start + 1); if(!ramips_fe_base) return -ENOMEM; @@ -357,7 +413,12 @@ ramips_eth_plat_probe(struct platform_device *plat) } strcpy(ramips_dev->name, "eth%d"); - ramips_dev->irq = data->irq; + ramips_dev->irq = platform_get_irq(plat, 0); + if (ramips_dev->irq < 0) { + dev_err(&plat->dev, "no IRQ resource found\n"); + err = -ENXIO; + goto err_free_dev; + } ramips_dev->addr_len = ETH_ALEN; ramips_dev->base_addr = (unsigned long)ramips_fe_base; ramips_dev->init = ramips_eth_probe;