diff options
| author |   Intiyaz Basha <intiyaz.basha@cavium.com> | 2017-08-14 12:01:37 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-14 22:21:40 -0700 |
| commit | 25d43f182d42b40ba750e2e0516b693e62f8f723 (patch) | |
| tree | f139547484f3f40a2f4ba317fef44e2e68d6525c /drivers/net/ethernet/cavium/liquidio/lio_core.c | |
| parent | liquidio: moved wait_for_pending_requests to octeon_network.h (diff) | |
| download | linux-dev-25d43f182d42b40ba750e2e0516b693e62f8f723.tar.xz linux-dev-25d43f182d42b40ba750e2e0516b693e62f8f723.zip | |
liquidio: moved update_txq_status to lio_core.c
Moving common update_txq_status to lio_core.c
Signed-off-by: Intiyaz Basha <intiyaz.basha@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/lio_core.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_core.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c index adde7745d069..b55ab75a7d9c 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -364,3 +364,36 @@ void cleanup_rx_oom_poll_fn(struct net_device *netdev) destroy_workqueue(lio->rxq_status_wq.wq); } } + +/* Runs in interrupt context. */ +void lio_update_txq_status(struct octeon_device *oct, int iq_num) +{ + struct octeon_instr_queue *iq = oct->instr_queue[iq_num]; + struct net_device *netdev; + struct lio *lio; + + netdev = oct->props[iq->ifidx].netdev; + + /* This is needed because the first IQ does not have + * a netdev associated with it. + */ + if (!netdev) + return; + + lio = GET_LIO(netdev); + if (netif_is_multiqueue(netdev)) { + if (__netif_subqueue_stopped(netdev, iq->q_index) && + lio->linfo.link.s.link_up && + (!octnet_iq_is_full(oct, iq_num))) { + netif_wake_subqueue(netdev, iq->q_index); + INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq_num, + tx_restart, 1); + } + } else if (netif_queue_stopped(netdev) && + lio->linfo.link.s.link_up && + (!octnet_iq_is_full(oct, lio->txq))) { + INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq, + tx_restart, 1); + netif_wake_queue(netdev); + } +} |