Commit 02daffa9 authored by Brett Creeley's avatar Brett Creeley Committed by Paolo Abeni
Browse files

pds_core: Don't assign interrupt index/bound_intr to notifyq 



The notifyq rides on the adminq's interrupt, so there's
no need to setup and/or access the notifyq's interrupt
index or bound_intr. The driver sets the bound_intr
using  qcq->intx = -1 for the notifyq, but luckily
nothing accesses that field for notifyq. Instead of
expecting that remains the case, just clean up
the notifyq's interrupt index and bound_intr fields.

Signed-off-by: default avatarBrett Creeley <brett.creeley@amd.com>
Reviewed-by: default avatarShannon Nelson <shannon.nelson@amd.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 240fd405

drivers/net/ethernet/amd/pds_core/core.c

+1 −4
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static int pdsc_qcq_intr_alloc(struct pdsc *pdsc, struct pdsc_qcq *qcq) 
	if (index < 0)

		return index;

	qcq->intx = index;

	qcq->cq.bound_intr = &pdsc->intr_info[index];



	return 0;

}
@@ -222,7 +223,6 @@ int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index, 
		goto err_out_free_irq;

	}



	qcq->cq.bound_intr = &pdsc->intr_info[qcq->intx];

	qcq->cq.num_descs = num_descs;

	qcq->cq.desc_size = cq_desc_size;

	qcq->cq.tail_idx = 0;
@@ -430,9 +430,6 @@ int pdsc_setup(struct pdsc *pdsc, bool init) 
	if (err)

		goto err_out_teardown;



	/* NotifyQ rides on the AdminQ interrupt */

	pdsc->notifyqcq.intx = pdsc->adminqcq.intx;



	/* Set up the Core with the AdminQ and NotifyQ info */

	err = pdsc_core_init(pdsc);

	if (err)

drivers/net/ethernet/amd/pds_core/debugfs.c

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq) 
	struct dentry *qcq_dentry, *q_dentry, *cq_dentry;

	struct dentry *intr_dentry;

	struct debugfs_regset32 *intr_ctrl_regset;

	struct pdsc_intr_info *intr = &pdsc->intr_info[qcq->intx];

	struct pdsc_queue *q = &qcq->q;

	struct pdsc_cq *cq = &qcq->cq;
@@ -147,6 +146,8 @@ void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq) 
	debugfs_create_u16("tail", 0400, cq_dentry, &cq->tail_idx);



	if (qcq->flags & PDS_CORE_QCQ_F_INTR) {

		struct pdsc_intr_info *intr = &pdsc->intr_info[qcq->intx];



		intr_dentry = debugfs_create_dir("intr", qcq->dentry);

		if (IS_ERR_OR_NULL(intr_dentry))

			return;