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

Commit e6f7622d authored by Michael J. Ruhl's avatar Michael J. Ruhl Committed by Doug Ledford
Browse files

IB/hfi1: Size rcd array index correctly and consistently 



The array index for the rcd array is sized several different ways
throughout the code.

Use the user interface size (u16) as the standard size and update the
necessary code to reflect this.

u16 is large enough for the largest amount of supported contexts.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 91d970ab

drivers/infiniband/hw/hfi1/aspm.h

+3 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static inline void aspm_disable_all(struct hfi1_devdata *dd) 
{

	struct hfi1_ctxtdata *rcd;

	unsigned long flags;

	unsigned i;

	u16 i;



	for (i = 0; i < dd->first_dyn_alloc_ctxt; i++) {

		rcd = dd->rcd[i];
@@ -256,7 +256,7 @@ static inline void aspm_enable_all(struct hfi1_devdata *dd) 
{

	struct hfi1_ctxtdata *rcd;

	unsigned long flags;

	unsigned i;

	u16 i;



	aspm_enable(dd);
@@ -284,7 +284,7 @@ static inline void aspm_ctx_init(struct hfi1_ctxtdata *rcd) 


static inline void aspm_init(struct hfi1_devdata *dd)

{

	unsigned i;

	u16 i;



	spin_lock_init(&dd->aspm_lock);

	dd->aspm_supported = aspm_hw_l1_supported(dd);

drivers/infiniband/hw/hfi1/chip.c

+5 −5
Original line number Diff line number Diff line
@@ -6802,7 +6802,7 @@ static void rxe_freeze(struct hfi1_devdata *dd) 
static void rxe_kernel_unfreeze(struct hfi1_devdata *dd)

{

	u32 rcvmask;

	int i;

	u16 i;



	/* enable all kernel contexts */

	for (i = 0; i < dd->num_rcv_contexts; i++) {
@@ -11722,7 +11722,7 @@ static u32 encoded_size(u32 size) 
	return 0x1;	/* if invalid, go with the minimum size */

}



void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, int ctxt)

void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, u16 ctxt)

{

	struct hfi1_ctxtdata *rcd;

	u64 rcvctrl, reg;
@@ -14542,7 +14542,7 @@ static void init_txe(struct hfi1_devdata *dd) 
		write_csr(dd, SEND_CM_TIMER_CTRL, HFI1_CREDIT_RETURN_RATE);

}



int hfi1_set_ctxt_jkey(struct hfi1_devdata *dd, unsigned ctxt, u16 jkey)

int hfi1_set_ctxt_jkey(struct hfi1_devdata *dd, u16 ctxt, u16 jkey)

{

	struct hfi1_ctxtdata *rcd = dd->rcd[ctxt];

	unsigned sctxt;
@@ -14579,7 +14579,7 @@ int hfi1_set_ctxt_jkey(struct hfi1_devdata *dd, unsigned ctxt, u16 jkey) 
	return ret;

}



int hfi1_clear_ctxt_jkey(struct hfi1_devdata *dd, unsigned ctxt)

int hfi1_clear_ctxt_jkey(struct hfi1_devdata *dd, u16 ctxt)

{

	struct hfi1_ctxtdata *rcd = dd->rcd[ctxt];

	unsigned sctxt;
@@ -14608,7 +14608,7 @@ int hfi1_clear_ctxt_jkey(struct hfi1_devdata *dd, unsigned ctxt) 
	return ret;

}



int hfi1_set_ctxt_pkey(struct hfi1_devdata *dd, unsigned ctxt, u16 pkey)

int hfi1_set_ctxt_pkey(struct hfi1_devdata *dd, u16 ctxt, u16 pkey)

{

	struct hfi1_ctxtdata *rcd;

	unsigned sctxt;

drivers/infiniband/hw/hfi1/chip.h

+4 −4
Original line number Diff line number Diff line
@@ -1352,14 +1352,14 @@ void hfi1_init_ctxt(struct send_context *sc); 
void hfi1_put_tid(struct hfi1_devdata *dd, u32 index,

		  u32 type, unsigned long pa, u16 order);

void hfi1_quiet_serdes(struct hfi1_pportdata *ppd);

void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, int ctxt);

void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, u16 ctxt);

u32 hfi1_read_cntrs(struct hfi1_devdata *dd, char **namep, u64 **cntrp);

u32 hfi1_read_portcntrs(struct hfi1_pportdata *ppd, char **namep, u64 **cntrp);

int hfi1_get_ib_cfg(struct hfi1_pportdata *ppd, int which);

int hfi1_set_ib_cfg(struct hfi1_pportdata *ppd, int which, u32 val);

int hfi1_set_ctxt_jkey(struct hfi1_devdata *dd, unsigned ctxt, u16 jkey);

int hfi1_clear_ctxt_jkey(struct hfi1_devdata *dd, unsigned ctxt);

int hfi1_set_ctxt_pkey(struct hfi1_devdata *dd, unsigned ctxt, u16 pkey);

int hfi1_set_ctxt_jkey(struct hfi1_devdata *dd, u16 ctxt, u16 jkey);

int hfi1_clear_ctxt_jkey(struct hfi1_devdata *dd, u16 ctxt);

int hfi1_set_ctxt_pkey(struct hfi1_devdata *dd, u16 ctxt, u16 pkey);

int hfi1_clear_ctxt_pkey(struct hfi1_devdata *dd, struct hfi1_ctxtdata *ctxt);

void hfi1_read_link_quality(struct hfi1_devdata *dd, u8 *link_quality);

void hfi1_init_vnic_rsm(struct hfi1_devdata *dd);

drivers/infiniband/hw/hfi1/driver.c

+8 −7
Original line number Diff line number Diff line
@@ -837,9 +837,9 @@ int handle_receive_interrupt_dma_rtail(struct hfi1_ctxtdata *rcd, int thread) 
	return last;

}



static inline void set_nodma_rtail(struct hfi1_devdata *dd, u8 ctxt)

static inline void set_nodma_rtail(struct hfi1_devdata *dd, u16 ctxt)

{

	int i;

	u16 i;



	/*

	 * For dynamically allocated kernel contexts (like vnic) switch
@@ -857,9 +857,9 @@ static inline void set_nodma_rtail(struct hfi1_devdata *dd, u8 ctxt) 
			&handle_receive_interrupt_nodma_rtail;

}



static inline void set_dma_rtail(struct hfi1_devdata *dd, u8 ctxt)

static inline void set_dma_rtail(struct hfi1_devdata *dd, u16 ctxt)

{

	int i;

	u16 i;



	/*

	 * For dynamically allocated kernel contexts (like vnic) switch
@@ -879,7 +879,7 @@ static inline void set_dma_rtail(struct hfi1_devdata *dd, u8 ctxt) 


void set_all_slowpath(struct hfi1_devdata *dd)

{

	int i;

	u16 i;



	/* HFI1_CTRL_CTXT must always use the slow path interrupt handler */

	for (i = HFI1_CTRL_CTXT + 1; i < dd->num_rcv_contexts; i++) {
@@ -1068,7 +1068,7 @@ void receive_interrupt_work(struct work_struct *work) 
	struct hfi1_pportdata *ppd = container_of(work, struct hfi1_pportdata,

						  linkstate_active_work);

	struct hfi1_devdata *dd = ppd->dd;

	int i;

	u16 i;



	/* Received non-SC15 packet implies neighbor_normal */

	ppd->neighbor_normal = 1;
@@ -1269,7 +1269,8 @@ void hfi1_start_led_override(struct hfi1_pportdata *ppd, unsigned int timeon, 
 */

int hfi1_reset_device(int unit)

{

	int ret, i;

	int ret;

	u16 i;

	struct hfi1_devdata *dd = hfi1_lookup(unit);

	struct hfi1_pportdata *ppd;

	unsigned long flags;

drivers/infiniband/hw/hfi1/file_ops.c

+3 −3
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static int assign_ctxt(struct hfi1_filedata *fd, struct hfi1_user_info *uinfo) 
static int find_sub_ctxt(struct hfi1_filedata *fd,

			 const struct hfi1_user_info *uinfo)

{

	int i;

	u16 i;

	struct hfi1_devdata *dd = fd->dd;

	u16 subctxt;
@@ -978,7 +978,7 @@ static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd, 
			 struct hfi1_user_info *uinfo)

{

	struct hfi1_ctxtdata *uctxt;

	unsigned int ctxt;

	u16 ctxt;

	int ret, numa;



	if (dd->flags & HFI1_FROZEN) {
@@ -1429,7 +1429,7 @@ int hfi1_set_uevent_bits(struct hfi1_pportdata *ppd, const int evtbit) 
{

	struct hfi1_ctxtdata *uctxt;

	struct hfi1_devdata *dd = ppd->dd;

	unsigned ctxt;

	u16 ctxt;

	int ret = 0;

	unsigned long flags;