Commit b4280948 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: clean adminq service routine 



The only thing calling ionic_napi any more is the adminq
processing, so combine and simplify.

Co-developed-by: default avatarNeel Patel <neel@pensando.io>
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 339dcf7f

drivers/net/ethernet/pensando/ionic/ionic.h

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ struct ionic_admin_ctx { 
	union ionic_adminq_comp comp;

};



int ionic_napi(struct napi_struct *napi, int budget, ionic_cq_cb cb,

	       ionic_cq_done_cb done_cb, void *done_arg);



int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx);

int ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_wait);

int ionic_set_dma_mask(struct ionic *ionic);

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+25 −19
Original line number Diff line number Diff line
@@ -800,21 +800,6 @@ static bool ionic_notifyq_service(struct ionic_cq *cq, 
	return true;

}



static int ionic_notifyq_clean(struct ionic_lif *lif, int budget)

{

	struct ionic_dev *idev = &lif->ionic->idev;

	struct ionic_cq *cq = &lif->notifyqcq->cq;

	u32 work_done;



	work_done = ionic_cq_service(cq, budget, ionic_notifyq_service,

				     NULL, NULL);

	if (work_done)

		ionic_intr_credits(idev->intr_ctrl, cq->bound_intr->index,

				   work_done, IONIC_INTR_CRED_RESET_COALESCE);



	return work_done;

}



static bool ionic_adminq_service(struct ionic_cq *cq,

				 struct ionic_cq_info *cq_info)

{
@@ -830,15 +815,36 @@ static bool ionic_adminq_service(struct ionic_cq *cq, 


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

{

	struct ionic_intr_info *intr = napi_to_cq(napi)->bound_intr;

	struct ionic_lif *lif = napi_to_cq(napi)->lif;

	struct ionic_dev *idev = &lif->ionic->idev;

	unsigned int flags = 0;

	int n_work = 0;

	int a_work = 0;

	int work_done;



	if (lif->notifyqcq && lif->notifyqcq->flags & IONIC_QCQ_F_INITED)

		n_work = ionic_cq_service(&lif->notifyqcq->cq, budget,

					  ionic_notifyq_service, NULL, NULL);



	if (likely(lif->notifyqcq && lif->notifyqcq->flags & IONIC_QCQ_F_INITED))

		n_work = ionic_notifyq_clean(lif, budget);

	a_work = ionic_napi(napi, budget, ionic_adminq_service, NULL, NULL);

	if (lif->adminqcq && lif->adminqcq->flags & IONIC_QCQ_F_INITED)

		a_work = ionic_cq_service(&lif->adminqcq->cq, budget,

					  ionic_adminq_service, NULL, NULL);



	work_done = max(n_work, a_work);

	if (work_done < budget && napi_complete_done(napi, work_done)) {

		flags |= IONIC_INTR_CRED_UNMASK;

		DEBUG_STATS_INTR_REARM(intr);

	}



	return max(n_work, a_work);

	if (work_done || flags) {

		flags |= IONIC_INTR_CRED_RESET_COALESCE;

		ionic_intr_credits(idev->intr_ctrl,

				   intr->index,

				   n_work + a_work, flags);

	}



	return work_done;

}



void ionic_get_stats64(struct net_device *netdev,

drivers/net/ethernet/pensando/ionic/ionic_main.c

+0 −26
Original line number Diff line number Diff line
@@ -305,32 +305,6 @@ int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) 
	return ionic_adminq_check_err(lif, ctx, (remaining == 0));

}



int ionic_napi(struct napi_struct *napi, int budget, ionic_cq_cb cb,

	       ionic_cq_done_cb done_cb, void *done_arg)

{

	struct ionic_qcq *qcq = napi_to_qcq(napi);

	struct ionic_cq *cq = &qcq->cq;

	u32 work_done, flags = 0;



	work_done = ionic_cq_service(cq, budget, cb, done_cb, done_arg);



	if (work_done < budget && napi_complete_done(napi, work_done)) {

		flags |= IONIC_INTR_CRED_UNMASK;

		DEBUG_STATS_INTR_REARM(cq->bound_intr);

	}



	if (work_done || flags) {

		flags |= IONIC_INTR_CRED_RESET_COALESCE;

		ionic_intr_credits(cq->lif->ionic->idev.intr_ctrl,

				   cq->bound_intr->index,

				   work_done, flags);

	}



	DEBUG_STATS_NAPI_POLL(qcq, work_done);



	return work_done;

}



static void ionic_dev_cmd_clean(struct ionic *ionic)

{

	union ionic_dev_cmd_regs *regs = ionic->idev.dev_cmd_regs;