Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6069f3fb authored by VSR Burru's avatar VSR Burru Committed by David S. Miller
Browse files

liquidio: fix tx completions in napi poll 



If there are no egress packets pending, then don't look for tx completions
in napi poll.  Also, fix broken tx queue wakeup logic.

Signed-off-by: default avatarVSR Burru <veerasenareddy.burru@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@cavium.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 031d4f12

drivers/net/ethernet/cavium/liquidio/lio_main.c

+11 −9
Original line number Diff line number Diff line
@@ -932,14 +932,13 @@ static void update_txq_status(struct octeon_device *oct, int iq_num) 
			INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq_num,

						  tx_restart, 1);

			netif_wake_subqueue(netdev, iq->q_index);

		} else {

			if (!octnet_iq_is_full(oct, lio->txq)) {

				INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev,

							  lio->txq,

							  tx_restart, 1);

				wake_q(netdev, lio->txq);

			}

		}

	} 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);

	}

}
@@ -2454,8 +2453,11 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget) 
	/* Flush the instruction queue */

	iq = oct->instr_queue[iq_no];

	if (iq) {

		if (atomic_read(&iq->instr_pending))

			/* Process iq buffers with in the budget limits */

			tx_done = octeon_flush_iq(oct, iq, budget);

		else

			tx_done = 1;

		/* Update iq read-index rather than waiting for next interrupt.

		 * Return back if tx_done is false.

		 */

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+11 −8
Original line number Diff line number Diff line
@@ -687,13 +687,12 @@ static void update_txq_status(struct octeon_device *oct, int iq_num) 
			netif_wake_subqueue(netdev, iq->q_index);

			INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq_num,

						  tx_restart, 1);

		} else {

			if (!octnet_iq_is_full(oct, lio->txq)) {

				INCR_INSTRQUEUE_PKT_COUNT(

				    lio->oct_dev, lio->txq, tx_restart, 1);

				wake_q(netdev, lio->txq);

			}

		}

	} 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);

	}

}
@@ -1636,8 +1635,12 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget) 
	/* Flush the instruction queue */

	iq = oct->instr_queue[iq_no];

	if (iq) {

		if (atomic_read(&iq->instr_pending))

			/* Process iq buffers with in the budget limits */

			tx_done = octeon_flush_iq(oct, iq, budget);

		else

			tx_done = 1;



		/* Update iq read-index rather than waiting for next interrupt.

		 * Return back if tx_done is false.

		 */