Commit d8f4ab01 authored by Dean Luick's avatar Dean Luick Committed by Leon Romanovsky
Browse files

IB/hfi1: Consolidate the creation of user TIDs 



The function rcventry2tidinfo() only creates part of
a TID and all calls to it are only used to make a user
TID.  Consolidate all usage into a single routine.

Signed-off-by: default avatarDean Luick <dean.luick@cornelisnetworks.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Link: https://lore.kernel.org/r/167329105402.1472990.9685946655723333660.stgit@awfm-02.cornelisnetworks.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent a479433a

drivers/infiniband/hw/hfi1/exp_rcv.h

+3 −2
Original line number Diff line number Diff line
@@ -133,12 +133,13 @@ static inline struct tid_group *tid_group_pop(struct exp_tid_set *set) 
	return grp;

}



static inline u32 rcventry2tidinfo(u32 rcventry)

static inline u32 create_tid(u32 rcventry, u32 npages)

{

	u32 pair = rcventry & ~0x1;



	return EXP_TID_SET(IDX, pair >> 1) |

		EXP_TID_SET(CTRL, 1 << (rcventry - pair));

		EXP_TID_SET(CTRL, 1 << (rcventry - pair)) |

		EXP_TID_SET(LEN, npages);

}



/**

drivers/infiniband/hw/hfi1/user_exp_rcv.c

+3 −5
Original line number Diff line number Diff line
@@ -652,8 +652,7 @@ static int program_rcvarray(struct hfi1_filedata *fd, struct tid_user_buf *tbuf, 
			return ret;

		mapped += npages;



		tidinfo = rcventry2tidinfo(rcventry - uctxt->expected_base) |

			EXP_TID_SET(LEN, npages);

		tidinfo = create_tid(rcventry - uctxt->expected_base, npages);

		tidlist[(*tididx)++] = tidinfo;

		grp->used++;

		grp->map |= 1 << useidx++;
@@ -853,9 +852,8 @@ static bool tid_rb_invalidate(struct mmu_interval_notifier *mni, 
	spin_lock(&fdata->invalid_lock);

	if (fdata->invalid_tid_idx < uctxt->expected_count) {

		fdata->invalid_tids[fdata->invalid_tid_idx] =

			rcventry2tidinfo(node->rcventry - uctxt->expected_base);

		fdata->invalid_tids[fdata->invalid_tid_idx] |=

			EXP_TID_SET(LEN, node->npages);

			create_tid(node->rcventry - uctxt->expected_base,

				   node->npages);

		if (!fdata->invalid_tid_idx) {

			unsigned long *ev;