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

Commit 1ed88dd7 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Roland Dreier
Browse files

IB/qib: Add percpu counter replacing qib_devdata int_counter 



This patch replaces the dd->int_counter with a percpu counter.

The maintanance of qib_stats.sps_ints and int_counter are
combined into the new counter.

There are two new functions added to read the counter:
- qib_int_counter (for a particular qib_devdata)
- qib_sps_ints (for all HCAs)

A z_int_counter is added to allow the interrupt detection logic
to determine if interrupts have occured since z_int_counter
was "reset".

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent f8b6c47a

drivers/infiniband/hw/qib/qib.h

+8 −2
Original line number Diff line number Diff line
@@ -868,8 +868,10 @@ struct qib_devdata { 
	/* last buffer for user use */

	u32 lastctxt_piobuf;



	/* saturating counter of (non-port-specific) device interrupts */

	u32 int_counter;

	/* reset value */

	u64 z_int_counter;

	/* percpu intcounter */

	u64 __percpu *int_counter;



	/* pio bufs allocated per ctxt */

	u32 pbufsctxt;
@@ -1449,6 +1451,10 @@ void qib_nomsi(struct qib_devdata *); 
void qib_nomsix(struct qib_devdata *);

void qib_pcie_getcmd(struct qib_devdata *, u16 *, u8 *, u8 *);

void qib_pcie_reenable(struct qib_devdata *, u16, u8, u8);

/* interrupts for device */

u64 qib_int_counter(struct qib_devdata *);

/* interrupt for all devices */

u64 qib_sps_ints(void);



/*

 * dma_addr wrappers - all 0's invalid for hw

drivers/infiniband/hw/qib/qib_fs.c

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static int create_file(const char *name, umode_t mode, 
static ssize_t driver_stats_read(struct file *file, char __user *buf,

				 size_t count, loff_t *ppos)

{

	qib_stats.sps_ints = qib_sps_ints();

	return simple_read_from_buffer(buf, count, ppos, &qib_stats,

				       sizeof qib_stats);

}

drivers/infiniband/hw/qib/qib_iba6120.c

+3 −4
Original line number Diff line number Diff line
@@ -1634,9 +1634,7 @@ static irqreturn_t qib_6120intr(int irq, void *data) 
		goto bail;

	}



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	if (unlikely(istat & (~QLOGIC_IB_I_BITSEXTANT |

			      QLOGIC_IB_I_GPIO | QLOGIC_IB_I_ERROR)))
@@ -1808,7 +1806,8 @@ static int qib_6120_setup_reset(struct qib_devdata *dd) 
	 * isn't set.

	 */

	dd->flags &= ~(QIB_INITTED | QIB_PRESENT);

	dd->int_counter = 0; /* so we check interrupts work again */

	/* so we check interrupts work again */

	dd->z_int_counter = qib_int_counter(dd);

	val = dd->control | QLOGIC_IB_C_RESET;

	writeq(val, &dd->kregbase[kr_control]);

	mb(); /* prevent compiler re-ordering around actual reset */

drivers/infiniband/hw/qib/qib_iba7220.c

+3 −5
Original line number Diff line number Diff line
@@ -1962,10 +1962,7 @@ static irqreturn_t qib_7220intr(int irq, void *data) 
		goto bail;

	}



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;



	this_cpu_inc(*dd->int_counter);

	if (unlikely(istat & (~QLOGIC_IB_I_BITSEXTANT |

			      QLOGIC_IB_I_GPIO | QLOGIC_IB_I_ERROR)))

		unlikely_7220_intr(dd, istat);
@@ -2120,7 +2117,8 @@ static int qib_setup_7220_reset(struct qib_devdata *dd) 
	 * isn't set.

	 */

	dd->flags &= ~(QIB_INITTED | QIB_PRESENT);

	dd->int_counter = 0; /* so we check interrupts work again */

	/* so we check interrupts work again */

	dd->z_int_counter = qib_int_counter(dd);

	val = dd->control | QLOGIC_IB_C_RESET;

	writeq(val, &dd->kregbase[kr_control]);

	mb(); /* prevent compiler reordering around actual reset */

drivers/infiniband/hw/qib/qib_iba7322.c

+9 −22
Original line number Diff line number Diff line
@@ -3115,9 +3115,7 @@ static irqreturn_t qib_7322intr(int irq, void *data) 
		goto bail;

	}



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	/* handle "errors" of various kinds first, device ahead of port */

	if (unlikely(istat & (~QIB_I_BITSEXTANT | QIB_I_GPIO |
@@ -3186,9 +3184,7 @@ static irqreturn_t qib_7322pintr(int irq, void *data) 
		 */

		return IRQ_HANDLED;



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	/* Clear the interrupt bit we expect to be set. */

	qib_write_kreg(dd, kr_intclear, ((1ULL << QIB_I_RCVAVAIL_LSB) |
@@ -3215,9 +3211,7 @@ static irqreturn_t qib_7322bufavail(int irq, void *data) 
		 */

		return IRQ_HANDLED;



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	/* Clear the interrupt bit we expect to be set. */

	qib_write_kreg(dd, kr_intclear, QIB_I_SPIOBUFAVAIL);
@@ -3248,9 +3242,7 @@ static irqreturn_t sdma_intr(int irq, void *data) 
		 */

		return IRQ_HANDLED;



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	/* Clear the interrupt bit we expect to be set. */

	qib_write_kreg(dd, kr_intclear, ppd->hw_pidx ?
@@ -3277,9 +3269,7 @@ static irqreturn_t sdma_idle_intr(int irq, void *data) 
		 */

		return IRQ_HANDLED;



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	/* Clear the interrupt bit we expect to be set. */

	qib_write_kreg(dd, kr_intclear, ppd->hw_pidx ?
@@ -3306,9 +3296,7 @@ static irqreturn_t sdma_progress_intr(int irq, void *data) 
		 */

		return IRQ_HANDLED;



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	/* Clear the interrupt bit we expect to be set. */

	qib_write_kreg(dd, kr_intclear, ppd->hw_pidx ?
@@ -3336,9 +3324,7 @@ static irqreturn_t sdma_cleanup_intr(int irq, void *data) 
		 */

		return IRQ_HANDLED;



	qib_stats.sps_ints++;

	if (dd->int_counter != (u32) -1)

		dd->int_counter++;

	this_cpu_inc(*dd->int_counter);



	/* Clear the interrupt bit we expect to be set. */

	qib_write_kreg(dd, kr_intclear, ppd->hw_pidx ?
@@ -3723,7 +3709,8 @@ static int qib_do_7322_reset(struct qib_devdata *dd) 
	dd->pport->cpspec->ibsymdelta = 0;

	dd->pport->cpspec->iblnkerrdelta = 0;

	dd->pport->cpspec->ibmalfdelta = 0;

	dd->int_counter = 0; /* so we check interrupts work again */

	/* so we check interrupts work again */

	dd->z_int_counter = qib_int_counter(dd);



	/*

	 * Keep chip from being accessed until we are ready.  Use