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

ar71xx: use global timestamp for hang check

Browse source 
Shrink the size of struct ag71xx_buf to 8 bytes, which improves cache
footprint

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2017-12-05 14:40:32 +01:00
parent 31e6016d2e
commit 798497c66e
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h
View file

@ -100,10 +100,9 @@ struct ag71xx_buf {
}; };
union { union {
dma_addr_t dma_addr; dma_addr_t dma_addr;
unsigned long timestamp;
};
unsigned int len; unsigned int len;
}; };
};
struct ag71xx_ring { struct ag71xx_ring {
struct ag71xx_buf *buf; struct ag71xx_buf *buf;
@ -170,6 +169,8 @@ struct ag71xx {
struct napi_struct napi; struct napi_struct napi;
u32 msg_enable; u32 msg_enable;
unsigned long timestamp;
/* /*
* From this point onwards we're not looking at per-packet fields. * From this point onwards we're not looking at per-packet fields.
*/ */

8
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View file

@ -816,7 +816,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
i = (ring->curr + n - 1) & ring_mask; i = (ring->curr + n - 1) & ring_mask;
ring->buf[i].len = skb->len; ring->buf[i].len = skb->len;
ring->buf[i].skb = skb; ring->buf[i].skb = skb;
ring->buf[i].timestamp = jiffies; ag->timestamp = jiffies;
netdev_sent_queue(dev, skb->len); netdev_sent_queue(dev, skb->len);
@ -926,11 +926,11 @@ static void ag71xx_restart_work_func(struct work_struct *work)
rtnl_unlock(); rtnl_unlock();
} }
static bool ag71xx_check_dma_stuck(struct ag71xx *ag, unsigned long timestamp) static bool ag71xx_check_dma_stuck(struct ag71xx *ag)
{ {
u32 rx_sm, tx_sm, rx_fd; u32 rx_sm, tx_sm, rx_fd;
if (likely(time_before(jiffies, timestamp + HZ/10))) if (likely(time_before(jiffies, ag->timestamp + HZ/10)))
return false; return false;
if (!netif_carrier_ok(ag->dev)) if (!netif_carrier_ok(ag->dev))
@ -969,7 +969,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
if (!flush && !ag71xx_desc_empty(desc)) { if (!flush && !ag71xx_desc_empty(desc)) {
if (pdata->is_ar724x && if (pdata->is_ar724x &&
ag71xx_check_dma_stuck(ag, ring->buf[i].timestamp)) { ag71xx_check_dma_stuck(ag)) {
schedule_delayed_work(&ag->restart_work, HZ / 2); schedule_delayed_work(&ag->restart_work, HZ / 2);
dma_stuck = true; dma_stuck = true;
} }