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

Commit 7d7632ad authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Roland Dreier
Browse files

IB/qib: Modify software pma counters to use percpu variables 



The counters, unicast_xmit, unicast_rcv, multicast_xmit, multicast_rcv
are now maintained as percpu variables.

The mad code is modified to add a z_ latch so that the percpu counters
monotonically increase with appropriate adjustments in the reset,
read logic to maintain the z_ latch.

This patch also corrects the fact the unitcast_xmit wasn't handled
at all for UC and RC QPs.

Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 1ed88dd7

drivers/infiniband/hw/qib/qib.h

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ int qib_setup_eagerbufs(struct qib_ctxtdata *); 
void qib_set_ctxtcnt(struct qib_devdata *);

int qib_create_ctxts(struct qib_devdata *dd);

struct qib_ctxtdata *qib_create_ctxtdata(struct qib_pportdata *, u32, int);

void qib_init_pportdata(struct qib_pportdata *, struct qib_devdata *, u8, u8);

int qib_init_pportdata(struct qib_pportdata *, struct qib_devdata *, u8, u8);

void qib_free_ctxtdata(struct qib_devdata *, struct qib_ctxtdata *);



u32 qib_kreceive(struct qib_ctxtdata *, u32 *, u32 *);

drivers/infiniband/hw/qib/qib_iba6120.c

+3 −1
Original line number Diff line number Diff line
@@ -3265,7 +3265,9 @@ static int init_6120_variables(struct qib_devdata *dd) 


	dd->eep_st_masks[2].errs_to_log = ERR_MASK(ResetNegated);



	qib_init_pportdata(ppd, dd, 0, 1);

	ret = qib_init_pportdata(ppd, dd, 0, 1);

	if (ret)

		goto bail;

	ppd->link_width_supported = IB_WIDTH_1X | IB_WIDTH_4X;

	ppd->link_speed_supported = QIB_IB_SDR;

	ppd->link_width_enabled = IB_WIDTH_4X;

drivers/infiniband/hw/qib/qib_iba7220.c

+3 −1
Original line number Diff line number Diff line
@@ -4059,7 +4059,9 @@ static int qib_init_7220_variables(struct qib_devdata *dd) 
	init_waitqueue_head(&cpspec->autoneg_wait);

	INIT_DELAYED_WORK(&cpspec->autoneg_work, autoneg_7220_work);



	qib_init_pportdata(ppd, dd, 0, 1);

	ret = qib_init_pportdata(ppd, dd, 0, 1);

	if (ret)

		goto bail;

	ppd->link_width_supported = IB_WIDTH_1X | IB_WIDTH_4X;

	ppd->link_speed_supported = QIB_IB_SDR | QIB_IB_DDR;

drivers/infiniband/hw/qib/qib_iba7322.c

+5 −1
Original line number Diff line number Diff line
@@ -6544,7 +6544,11 @@ static int qib_init_7322_variables(struct qib_devdata *dd) 
		}



		dd->num_pports++;

		qib_init_pportdata(ppd, dd, pidx, dd->num_pports);

		ret = qib_init_pportdata(ppd, dd, pidx, dd->num_pports);

		if (ret) {

			dd->num_pports--;

			goto bail;

		}



		ppd->link_width_supported = IB_WIDTH_1X | IB_WIDTH_4X;

		ppd->link_width_enabled = IB_WIDTH_4X;

drivers/infiniband/hw/qib/qib_init.c

+16 −6
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ struct qib_ctxtdata *qib_create_ctxtdata(struct qib_pportdata *ppd, u32 ctxt, 
/*

 * Common code for initializing the physical port structure.

 */

void qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd,

int qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd,

			u8 hw_pidx, u8 port)

{

	int size;
@@ -243,6 +243,7 @@ void qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd, 


	spin_lock_init(&ppd->sdma_lock);

	spin_lock_init(&ppd->lflags_lock);

	spin_lock_init(&ppd->cc_shadow_lock);

	init_waitqueue_head(&ppd->state_wait);



	init_timer(&ppd->symerr_clear_timer);
@@ -250,8 +251,10 @@ void qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd, 
	ppd->symerr_clear_timer.data = (unsigned long)ppd;



	ppd->qib_wq = NULL;



	spin_lock_init(&ppd->cc_shadow_lock);

	ppd->ibport_data.pmastats =

		alloc_percpu(struct qib_pma_counters);

	if (!ppd->ibport_data.pmastats)

		return -ENOMEM;



	if (qib_cc_table_size < IB_CCT_MIN_ENTRIES)

		goto bail;
@@ -299,7 +302,7 @@ void qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd, 
		goto bail_3;

	}



	return;

	return 0;



bail_3:

	kfree(ppd->ccti_entries_shadow);
@@ -313,7 +316,7 @@ void qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd, 
bail:

	/* User is intentionally disabling the congestion control agent */

	if (!qib_cc_table_size)

		return;

		return 0;



	if (qib_cc_table_size < IB_CCT_MIN_ENTRIES) {

		qib_cc_table_size = 0;
@@ -324,7 +327,7 @@ void qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd, 


	qib_dev_err(dd, "Congestion Control Agent disabled for port %d\n",

		port);

	return;

	return 0;

}



static int init_pioavailregs(struct qib_devdata *dd)
@@ -635,6 +638,12 @@ static int qib_create_workqueues(struct qib_devdata *dd) 
	return -ENOMEM;

}



static void qib_free_pportdata(struct qib_pportdata *ppd)

{

	free_percpu(ppd->ibport_data.pmastats);

	ppd->ibport_data.pmastats = NULL;

}



/**

 * qib_init - do the actual initialization sequence on the chip

 * @dd: the qlogic_ib device
@@ -922,6 +931,7 @@ static void qib_shutdown_device(struct qib_devdata *dd) 
			destroy_workqueue(ppd->qib_wq);

			ppd->qib_wq = NULL;

		}

		qib_free_pportdata(ppd);

	}



	qib_update_eeprom_log(dd);