Commit efd563ff authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ionic-small-driver-fixes' 

Shannon Nelson says:

====================
ionic: small driver fixes

This is a pair of fixes to address a DIM issue and a
kernel test robot complaint

v1: https://lore.kernel.org/netdev/20231201000519.13363-1-shannon.nelson@amd.com/
====================

Link: https://lore.kernel.org/r/20231204192234.21017-1-shannon.nelson@amd.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 58d3aade 4115ba67

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

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ struct ionic_desc_info { 
	void *cb_arg;

};



#define IONIC_QUEUE_NAME_MAX_SZ		32

#define IONIC_QUEUE_NAME_MAX_SZ		16



struct ionic_queue {

	struct device *dev;

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

+8 −8
Original line number Diff line number Diff line
@@ -49,24 +49,24 @@ static void ionic_lif_queue_identify(struct ionic_lif *lif); 
static void ionic_dim_work(struct work_struct *work)

{

	struct dim *dim = container_of(work, struct dim, work);

	struct ionic_intr_info *intr;

	struct dim_cq_moder cur_moder;

	struct ionic_qcq *qcq;

	struct ionic_lif *lif;

	u32 new_coal;



	cur_moder = net_dim_get_rx_moderation(dim->mode, dim->profile_ix);

	qcq = container_of(dim, struct ionic_qcq, dim);

	new_coal = ionic_coal_usec_to_hw(qcq->q.lif->ionic, cur_moder.usec);

	lif = qcq->q.lif;

	new_coal = ionic_coal_usec_to_hw(lif->ionic, cur_moder.usec);

	new_coal = new_coal ? new_coal : 1;



	if (qcq->intr.dim_coal_hw != new_coal) {

		unsigned int qi = qcq->cq.bound_q->index;

		struct ionic_lif *lif = qcq->q.lif;



		qcq->intr.dim_coal_hw = new_coal;

	intr = &qcq->intr;

	if (intr->dim_coal_hw != new_coal) {

		intr->dim_coal_hw = new_coal;



		ionic_intr_coal_init(lif->ionic->idev.intr_ctrl,

				     lif->rxqcqs[qi]->intr.index,

				     qcq->intr.dim_coal_hw);

				     intr->index, intr->dim_coal_hw);

	}



	dim->state = DIM_START_MEASURE;