Commit 2e7ad56a authored by Mathias Thore's avatar Mathias Thore Committed by David S. Miller

net/wan/fsl_ucc_hdlc: add BQL support

Add byte queue limits support in the fsl_ucc_hdlc driver.
Signed-off-by: default avatarMathias Thore <mathias.thore@infinera.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b73e842
...@@ -391,6 +391,7 @@ static netdev_tx_t ucc_hdlc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -391,6 +391,7 @@ static netdev_tx_t ucc_hdlc_tx(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb(skb); dev_kfree_skb(skb);
return -ENOMEM; return -ENOMEM;
} }
netdev_sent_queue(dev, skb->len);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
/* Start from the next BD that should be filled */ /* Start from the next BD that should be filled */
...@@ -447,6 +448,8 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv) ...@@ -447,6 +448,8 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
{ {
/* Start from the next BD that should be filled */ /* Start from the next BD that should be filled */
struct net_device *dev = priv->ndev; struct net_device *dev = priv->ndev;
unsigned int bytes_sent = 0;
int howmany = 0;
struct qe_bd *bd; /* BD pointer */ struct qe_bd *bd; /* BD pointer */
u16 bd_status; u16 bd_status;
int tx_restart = 0; int tx_restart = 0;
...@@ -474,6 +477,8 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv) ...@@ -474,6 +477,8 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
skb = priv->tx_skbuff[priv->skb_dirtytx]; skb = priv->tx_skbuff[priv->skb_dirtytx];
if (!skb) if (!skb)
break; break;
howmany++;
bytes_sent += skb->len;
dev->stats.tx_packets++; dev->stats.tx_packets++;
memset(priv->tx_buffer + memset(priv->tx_buffer +
(be32_to_cpu(bd->buf) - priv->dma_tx_addr), (be32_to_cpu(bd->buf) - priv->dma_tx_addr),
...@@ -501,6 +506,7 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv) ...@@ -501,6 +506,7 @@ static int hdlc_tx_done(struct ucc_hdlc_private *priv)
if (tx_restart) if (tx_restart)
hdlc_tx_restart(priv); hdlc_tx_restart(priv);
netdev_completed_queue(dev, howmany, bytes_sent);
return 0; return 0;
} }
...@@ -721,6 +727,7 @@ static int uhdlc_open(struct net_device *dev) ...@@ -721,6 +727,7 @@ static int uhdlc_open(struct net_device *dev)
priv->hdlc_busy = 1; priv->hdlc_busy = 1;
netif_device_attach(priv->ndev); netif_device_attach(priv->ndev);
napi_enable(&priv->napi); napi_enable(&priv->napi);
netdev_reset_queue(dev);
netif_start_queue(dev); netif_start_queue(dev);
hdlc_open(dev); hdlc_open(dev);
} }
...@@ -812,6 +819,7 @@ static int uhdlc_close(struct net_device *dev) ...@@ -812,6 +819,7 @@ static int uhdlc_close(struct net_device *dev)
free_irq(priv->ut_info->uf_info.irq, priv); free_irq(priv->ut_info->uf_info.irq, priv);
netif_stop_queue(dev); netif_stop_queue(dev);
netdev_reset_queue(dev);
priv->hdlc_busy = 0; priv->hdlc_busy = 0;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment