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

Commit c774169d authored by Manish Chopra's avatar Manish Chopra Committed by David S. Miller
Browse files

qede: qede_poll refactoring 



This patch cleanups qede_poll() routine a bit
and allows qede_poll() to do single iteration to handle
TX completion [As under heavy TX load qede_poll() might
run for indefinite time in the while(1) loop for TX
completion processing and cause CPU stuck].

Signed-off-by: default avatarManish <manish.chopra@qlogic.com>
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c72a6125

drivers/net/ethernet/qlogic/qede/qede_main.c

+35 −42
Original line number Diff line number Diff line
@@ -1597,28 +1597,19 @@ static int qede_rx_int(struct qede_fastpath *fp, int budget) 


static int qede_poll(struct napi_struct *napi, int budget)

{

	int work_done = 0;

	struct qede_fastpath *fp = container_of(napi, struct qede_fastpath,

						napi);

	struct qede_dev *edev = fp->edev;



	while (1) {

	int rx_work_done = 0;

	u8 tc;



	for (tc = 0; tc < edev->num_tc; tc++)

		if (qede_txq_has_work(&fp->txqs[tc]))

			qede_tx_int(edev, &fp->txqs[tc]);



		if (qede_has_rx_work(fp->rxq)) {

			work_done += qede_rx_int(fp, budget - work_done);



			/* must not complete if we consumed full budget */

			if (work_done >= budget)

				break;

		}



		/* Fall out from the NAPI loop if needed */

		if (!(qede_has_rx_work(fp->rxq) || qede_has_tx_work(fp))) {

	rx_work_done = qede_has_rx_work(fp->rxq) ?

			qede_rx_int(fp, budget) : 0;

	if (rx_work_done < budget) {

		qed_sb_update_sb_idx(fp->sb_info);

		/* *_has_*_work() reads the status block,

		 * thus we need to ensure that status block indices
@@ -1635,18 +1626,20 @@ static int qede_poll(struct napi_struct *napi, int budget) 
		 */

		rmb();



		/* Fall out from the NAPI loop if needed */

		if (!(qede_has_rx_work(fp->rxq) ||

		      qede_has_tx_work(fp))) {

			napi_complete(napi);



			/* Update and reenable interrupts */

			qed_sb_ack(fp->sb_info, IGU_INT_ENABLE,

				   1 /*update*/);

				break;

			}

		} else {

			rx_work_done = budget;

		}

	}



	return work_done;

	return rx_work_done;

}



static irqreturn_t qede_msix_fp_int(int irq, void *fp_cookie)