KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lantiq: fix some ethernet driver SMP issues

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-08-04 12:39:06 +02:00
parent d378a7c4f7
commit eae422eb94
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
target/linux/lantiq/patches-4.4/0025-NET-MIPS-lantiq-adds-xrx200-net.patch
View file

@ -209,7 +209,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net
+}; +};
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/lantiq_xrx200.c +++ b/drivers/net/ethernet/lantiq_xrx200.c
@@ -0,0 +1,1830 @@ @@ -0,0 +1,1836 @@
+/* +/*
+ * This program is free software; you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published + * under the terms of the GNU General Public License version 2 as published
@ -1090,7 +1090,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net
+ for (i = 0; i < priv->num_port; i++) + for (i = 0; i < priv->num_port; i++)
+ if (priv->port[i].phydev) + if (priv->port[i].phydev)
+ phy_start(priv->port[i].phydev); + phy_start(priv->port[i].phydev);
+ netif_start_queue(dev); + netif_wake_queue(dev);
+ +
+ return 0; + return 0;
+} +}
@ -1262,6 +1262,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net
+ struct xrx200_chan *ch = &priv->hw->chan[XRX200_DMA_TX]; + struct xrx200_chan *ch = &priv->hw->chan[XRX200_DMA_TX];
+ struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc]; + struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc];
+ u32 byte_offset; + u32 byte_offset;
+ int ret = NETDEV_TX_OK;
+ int len; + int len;
+#ifdef SW_ROUTING +#ifdef SW_ROUTING
+ u32 special_tag = (SPID_CPU_PORT << SPID_SHIFT) | DPID_ENABLE; + u32 special_tag = (SPID_CPU_PORT << SPID_SHIFT) | DPID_ENABLE;
@ -1270,11 +1271,6 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net
+ skb->dev = dev; + skb->dev = dev;
+ len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len; + len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
+ +
+ if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {
+ netdev_err(dev, "tx ring full\n");
+ netif_stop_queue(dev);
+ return NETDEV_TX_BUSY;
+ }
+#ifdef SW_ROUTING +#ifdef SW_ROUTING
+ if (is_multicast_ether_addr(eth_hdr(skb)->h_dest)) { + if (is_multicast_ether_addr(eth_hdr(skb)->h_dest)) {
+ u16 port_map = priv->port_map; + u16 port_map = priv->port_map;
@ -1309,11 +1305,19 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net
+ +
+ /* dma needs to start on a 16 byte aligned address */ + /* dma needs to start on a 16 byte aligned address */
+ byte_offset = CPHYSADDR(skb->data) % 16; + byte_offset = CPHYSADDR(skb->data) % 16;
+
+ spin_lock_bh(&priv->hw->lock);
+ if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {
+ netdev_err(dev, "tx ring full\n");
+ netif_stop_queue(dev);
+ ret = NETDEV_TX_BUSY;
+ goto out;
+ }
+
+ ch->skb[ch->dma.desc] = skb; + ch->skb[ch->dma.desc] = skb;
+ +
+ dev->trans_start = jiffies; + dev->trans_start = jiffies;
+ +
+ spin_lock_bh(&priv->hw->lock);
+ desc->addr = ((unsigned int) dma_map_single(NULL, skb->data, len, + desc->addr = ((unsigned int) dma_map_single(NULL, skb->data, len,
+ DMA_TO_DEVICE)) - byte_offset; + DMA_TO_DEVICE)) - byte_offset;
+ wmb(); + wmb();
@ -1324,12 +1328,14 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net
+ if (ch->dma.desc == ch->tx_free) + if (ch->dma.desc == ch->tx_free)
+ netif_stop_queue(dev); + netif_stop_queue(dev);
+ +
+ spin_unlock_bh(&priv->hw->lock);
+ +
+ priv->stats.tx_packets++; + priv->stats.tx_packets++;
+ priv->stats.tx_bytes+=len; + priv->stats.tx_bytes+=len;
+ +
+ return NETDEV_TX_OK; +out:
+ spin_unlock_bh(&priv->hw->lock);
+
+ return ret;
+} +}
+ +
+static irqreturn_t xrx200_dma_irq(int irq, void *priv) +static irqreturn_t xrx200_dma_irq(int irq, void *priv)