Commit 47b344b2 authored by Ron Angeles's avatar Ron Angeles Committed by David S. Miller

net: atl1c: add BQL support

This BQL implementation is mostly derived from its related driver, alx.
Tested on AR8131 (rev c0) [1969:1063]. Saturated a 100mbps link with 5
concurrent runs of netperf. Ping latency dropped from 14ms to 3ms.
Signed-off-by: default avatarRon Angeles <ronangeles@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5960e6e
...@@ -874,6 +874,8 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter, ...@@ -874,6 +874,8 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,
atl1c_clean_buffer(pdev, buffer_info); atl1c_clean_buffer(pdev, buffer_info);
} }
netdev_reset_queue(adapter->netdev);
/* Zero out Tx-buffers */ /* Zero out Tx-buffers */
memset(tpd_ring->desc, 0, sizeof(struct atl1c_tpd_desc) * memset(tpd_ring->desc, 0, sizeof(struct atl1c_tpd_desc) *
ring_count); ring_count);
...@@ -1551,6 +1553,7 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter, ...@@ -1551,6 +1553,7 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,
u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean); u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean);
u16 hw_next_to_clean; u16 hw_next_to_clean;
u16 reg; u16 reg;
unsigned int total_bytes = 0, total_packets = 0;
reg = type == atl1c_trans_high ? REG_TPD_PRI1_CIDX : REG_TPD_PRI0_CIDX; reg = type == atl1c_trans_high ? REG_TPD_PRI1_CIDX : REG_TPD_PRI0_CIDX;
...@@ -1558,12 +1561,18 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter, ...@@ -1558,12 +1561,18 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,
while (next_to_clean != hw_next_to_clean) { while (next_to_clean != hw_next_to_clean) {
buffer_info = &tpd_ring->buffer_info[next_to_clean]; buffer_info = &tpd_ring->buffer_info[next_to_clean];
if (buffer_info->skb) {
total_bytes += buffer_info->skb->len;
total_packets++;
}
atl1c_clean_buffer(pdev, buffer_info); atl1c_clean_buffer(pdev, buffer_info);
if (++next_to_clean == tpd_ring->count) if (++next_to_clean == tpd_ring->count)
next_to_clean = 0; next_to_clean = 0;
atomic_set(&tpd_ring->next_to_clean, next_to_clean); atomic_set(&tpd_ring->next_to_clean, next_to_clean);
} }
netdev_completed_queue(adapter->netdev, total_packets, total_bytes);
if (netif_queue_stopped(adapter->netdev) && if (netif_queue_stopped(adapter->netdev) &&
netif_carrier_ok(adapter->netdev)) { netif_carrier_ok(adapter->netdev)) {
netif_wake_queue(adapter->netdev); netif_wake_queue(adapter->netdev);
...@@ -2256,6 +2265,7 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb, ...@@ -2256,6 +2265,7 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
spin_unlock_irqrestore(&adapter->tx_lock, flags); spin_unlock_irqrestore(&adapter->tx_lock, flags);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} else { } else {
netdev_sent_queue(adapter->netdev, skb->len);
atl1c_tx_queue(adapter, skb, tpd, type); atl1c_tx_queue(adapter, skb, tpd, type);
spin_unlock_irqrestore(&adapter->tx_lock, flags); spin_unlock_irqrestore(&adapter->tx_lock, flags);
} }
......
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