Commit 84b3adc2 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/qib: Remove qpt_mask global 



There is no need to have a global qpt_mask as that does not support the
multiple chip model which qib has. Instead rely on the value which
exists already in the device data (dd).

Fixes: 898fa52b "IB/qib: Remove qpn, qp tables and related variables from qib"
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b374e060

drivers/infiniband/hw/qib/qib.h

+0 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,6 @@ extern spinlock_t qib_devs_lock; 
extern struct qib_devdata *qib_lookup(int unit);

extern u32 qib_cpulist_count;

extern unsigned long *qib_cpulist;

extern u16 qpt_mask;

extern unsigned qib_cc_table_size;



int qib_init(struct qib_devdata *, int);

drivers/infiniband/hw/qib/qib_qp.c

+3 −10
Original line number Diff line number Diff line
@@ -41,14 +41,6 @@ 


#include "qib.h"



/*

 * mask field which was present in now deleted qib_qpn_table

 * is not present in rvt_qpn_table. Defining the same field

 * as qpt_mask here instead of adding the mask field to

 * rvt_qpn_table.

 */

u16 qpt_mask;



static inline unsigned mk_qpn(struct rvt_qpn_table *qpt,

			      struct rvt_qpn_map *map, unsigned off)

{
@@ -57,7 +49,7 @@ static inline unsigned mk_qpn(struct rvt_qpn_table *qpt, 


static inline unsigned find_next_offset(struct rvt_qpn_table *qpt,

					struct rvt_qpn_map *map, unsigned off,

					unsigned n)

					unsigned n, u16 qpt_mask)

{

	if (qpt_mask) {

		off++;
@@ -179,6 +171,7 @@ int qib_alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt, 
	struct qib_ibdev *verbs_dev = container_of(rdi, struct qib_ibdev, rdi);

	struct qib_devdata *dd = container_of(verbs_dev, struct qib_devdata,

					      verbs_dev);

	u16 qpt_mask = dd->qpn_mask;



	if (type == IB_QPT_SMI || type == IB_QPT_GSI) {

		unsigned n;
@@ -215,7 +208,7 @@ int qib_alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt, 
				goto bail;

			}

			offset = find_next_offset(qpt, map, offset,

				dd->n_krcv_queues);

				dd->n_krcv_queues, qpt_mask);

			qpn = mk_qpn(qpt, map, offset);

			/*

			 * This test differs from alloc_pidmap().

drivers/infiniband/hw/qib/qib_verbs.c

+0 −2
Original line number Diff line number Diff line
@@ -1606,8 +1606,6 @@ int qib_register_ib_device(struct qib_devdata *dd) 
	/* Only need to initialize non-zero fields. */

	setup_timer(&dev->mem_timer, mem_timer, (unsigned long)dev);



	qpt_mask = dd->qpn_mask;



	INIT_LIST_HEAD(&dev->piowait);

	INIT_LIST_HEAD(&dev->dmawait);

	INIT_LIST_HEAD(&dev->txwait);

CRA Git | Maintained and supported by SUSTech CRA and CCSE