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

Commit f24a6d48 authored by Harish Chegondi's avatar Harish Chegondi Committed by Doug Ledford
Browse files

IB/qib: Remove ibport and use rdmavt version 



Remove several ibport members from qib and use the rdmavt version. rc_acks,
rc_qacks, and rc_delayed_comp are defined as per CPU variables in rdmavt.
Add support for these rdmavt per CPU variables which were not per cpu
variables in qib ibport structure.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent d2b8d4da

drivers/infiniband/hw/qib/qib_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd, 
			/* Check for valid receive state. */

			if (!(ib_qib_state_ops[qp->state] &

			      QIB_PROCESS_RECV_OK)) {

				ibp->n_pkt_drops++;

				ibp->rvp.n_pkt_drops++;

				goto unlock;

			}
@@ -399,7 +399,7 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd, 
				    IB_OPCODE_RC_RDMA_READ_RESPONSE_FIRST) {

					diff = qib_cmp24(psn, qp->r_psn);

					if (!qp->r_nak_state && diff >= 0) {

						ibp->n_rc_seqnak++;

						ibp->rvp.n_rc_seqnak++;

						qp->r_nak_state =

							IB_NAK_PSN_ERROR;

						/* Use the expected PSN. */

drivers/infiniband/hw/qib/qib_iba6120.c

+4 −4
Original line number Diff line number Diff line
@@ -2956,13 +2956,13 @@ static void pma_6120_timer(unsigned long data) 
	struct qib_ibport *ibp = &ppd->ibport_data;

	unsigned long flags;



	spin_lock_irqsave(&ibp->lock, flags);

	spin_lock_irqsave(&ibp->rvp.lock, flags);

	if (cs->pma_sample_status == IB_PMA_SAMPLE_STATUS_STARTED) {

		cs->pma_sample_status = IB_PMA_SAMPLE_STATUS_RUNNING;

		qib_snapshot_counters(ppd, &cs->sword, &cs->rword,

				      &cs->spkts, &cs->rpkts, &cs->xmit_wait);

		mod_timer(&cs->pma_timer,

			  jiffies + usecs_to_jiffies(ibp->pma_sample_interval));

		      jiffies + usecs_to_jiffies(ibp->rvp.pma_sample_interval));

	} else if (cs->pma_sample_status == IB_PMA_SAMPLE_STATUS_RUNNING) {

		u64 ta, tb, tc, td, te;
@@ -2975,11 +2975,11 @@ static void pma_6120_timer(unsigned long data) 
		cs->rpkts = td - cs->rpkts;

		cs->xmit_wait = te - cs->xmit_wait;

	}

	spin_unlock_irqrestore(&ibp->lock, flags);

	spin_unlock_irqrestore(&ibp->rvp.lock, flags);

}



/*

 * Note that the caller has the ibp->lock held.

 * Note that the caller has the ibp->rvp.lock held.

 */

static void qib_set_cntr_6120_sample(struct qib_pportdata *ppd, u32 intv,

				     u32 start)

drivers/infiniband/hw/qib/qib_iba7322.c

+1 −1
Original line number Diff line number Diff line
@@ -5497,7 +5497,7 @@ static void try_7322_ipg(struct qib_pportdata *ppd) 
	unsigned delay;

	int ret;



	agent = ibp->send_agent;

	agent = ibp->rvp.send_agent;

	if (!agent)

		goto retry;

drivers/infiniband/hw/qib/qib_init.c

+10 −0
Original line number Diff line number Diff line
@@ -245,6 +245,13 @@ int qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd, 
		alloc_percpu(struct qib_pma_counters);

	if (!ppd->ibport_data.pmastats)

		return -ENOMEM;

	ppd->ibport_data.rvp.rc_acks = alloc_percpu(u64);

	ppd->ibport_data.rvp.rc_qacks = alloc_percpu(u64);

	ppd->ibport_data.rvp.rc_delayed_comp = alloc_percpu(u64);

	if (!(ppd->ibport_data.rvp.rc_acks) ||

	    !(ppd->ibport_data.rvp.rc_qacks) ||

	    !(ppd->ibport_data.rvp.rc_delayed_comp))

		return -ENOMEM;



	if (qib_cc_table_size < IB_CCT_MIN_ENTRIES)

		goto bail;
@@ -632,6 +639,9 @@ static int qib_create_workqueues(struct qib_devdata *dd) 
static void qib_free_pportdata(struct qib_pportdata *ppd)

{

	free_percpu(ppd->ibport_data.pmastats);

	free_percpu(ppd->ibport_data.rvp.rc_acks);

	free_percpu(ppd->ibport_data.rvp.rc_qacks);

	free_percpu(ppd->ibport_data.rvp.rc_delayed_comp);

	ppd->ibport_data.pmastats = NULL;

}

drivers/infiniband/hw/qib/qib_mad.c

+121 −119

File changed.

Preview size limit exceeded, changes collapsed.