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

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

IB/hfi1: Convert the macro AHG_HEADER_SET into an inline function 



AHG_HEADER_SET macro doesn't conform to the coding standards as it can
affect the control flow. Convert the macro AHG_HEADER_SET into an inline
function ahg_header_set().

Cc: Leon Romanovsky <leon@kernel.org>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e870b4a1

drivers/infiniband/hw/hfi1/user_sdma.c

+39 −19
Original line number Diff line number Diff line
@@ -1254,20 +1254,25 @@ static int set_txreq_header_ahg(struct user_sdma_request *req, 
				struct user_sdma_txreq *tx, u32 datalen)

{

	u32 ahg[AHG_KDETH_ARRAY_SIZE];

	int diff = 0;

	int idx = 0;

	u8 omfactor; /* KDETH.OM */

	struct hfi1_user_sdma_pkt_q *pq = req->pq;

	struct hfi1_pkt_header *hdr = &req->hdr;

	u16 pbclen = le16_to_cpu(hdr->pbc[0]);

	u32 val32, tidval = 0, lrhlen = get_lrh_len(*hdr, pad_len(datalen));

	size_t array_size = ARRAY_SIZE(ahg);



	if (PBC2LRH(pbclen) != lrhlen) {

		/* PBC.PbcLengthDWs */

		AHG_HEADER_SET(ahg, diff, 0, 0, 12,

			       cpu_to_le16(LRH2PBC(lrhlen)));

		idx = ahg_header_set(ahg, idx, array_size, 0, 0, 12,

				     (__force u16)cpu_to_le16(LRH2PBC(lrhlen)));

		if (idx < 0)

			return idx;

		/* LRH.PktLen (we need the full 16 bits due to byte swap) */

		AHG_HEADER_SET(ahg, diff, 3, 0, 16,

			       cpu_to_be16(lrhlen >> 2));

		idx = ahg_header_set(ahg, idx, array_size, 3, 0, 16,

				     (__force u16)cpu_to_be16(lrhlen >> 2));

		if (idx < 0)

			return idx;

	}



	/*
@@ -1278,12 +1283,23 @@ static int set_txreq_header_ahg(struct user_sdma_request *req, 
		(HFI1_CAP_IS_KSET(EXTENDED_PSN) ? 0x7fffffff : 0xffffff);

	if (unlikely(tx->flags & TXREQ_FLAGS_REQ_ACK))

		val32 |= 1UL << 31;

	AHG_HEADER_SET(ahg, diff, 6, 0, 16, cpu_to_be16(val32 >> 16));

	AHG_HEADER_SET(ahg, diff, 6, 16, 16, cpu_to_be16(val32 & 0xffff));

	idx = ahg_header_set(ahg, idx, array_size, 6, 0, 16,

			     (__force u16)cpu_to_be16(val32 >> 16));

	if (idx < 0)

		return idx;

	idx = ahg_header_set(ahg, idx, array_size, 6, 16, 16,

			     (__force u16)cpu_to_be16(val32 & 0xffff));

	if (idx < 0)

		return idx;

	/* KDETH.Offset */

	AHG_HEADER_SET(ahg, diff, 15, 0, 16,

		       cpu_to_le16(req->koffset & 0xffff));

	AHG_HEADER_SET(ahg, diff, 15, 16, 16, cpu_to_le16(req->koffset >> 16));

	idx = ahg_header_set(ahg, idx, array_size, 15, 0, 16,

			     (__force u16)cpu_to_le16(req->koffset & 0xffff));

	if (idx < 0)

		return idx;

	idx = ahg_header_set(ahg, idx, array_size, 15, 16, 16,

			     (__force u16)cpu_to_le16(req->koffset >> 16));

	if (idx < 0)

		return idx;

	if (req_opcode(req->info.ctrl) == EXPECTED) {

		__le16 val;
@@ -1310,10 +1326,13 @@ static int set_txreq_header_ahg(struct user_sdma_request *req, 
				 KDETH_OM_MAX_SIZE) ? KDETH_OM_LARGE_SHIFT :

				 KDETH_OM_SMALL_SHIFT;

		/* KDETH.OM and KDETH.OFFSET (TID) */

		AHG_HEADER_SET(ahg, diff, 7, 0, 16,

		idx = ahg_header_set(

				ahg, idx, array_size, 7, 0, 16,

				((!!(omfactor - KDETH_OM_SMALL_SHIFT)) << 15 |

				((req->tidoffset >> omfactor)

				& 0x7fff)));

		if (idx < 0)

			return idx;

		/* KDETH.TIDCtrl, KDETH.TID, KDETH.Intr, KDETH.SH */

		val = cpu_to_le16(((EXP_TID_GET(tidval, CTRL) & 0x3) << 10) |

				   (EXP_TID_GET(tidval, IDX) & 0x3ff));
@@ -1330,21 +1349,22 @@ static int set_txreq_header_ahg(struct user_sdma_request *req, 
					     AHG_KDETH_INTR_SHIFT));

		}



		AHG_HEADER_SET(ahg, diff, 7, 16, 14, val);

		idx = ahg_header_set(ahg, idx, array_size,

				     7, 16, 14, (__force u16)val);

		if (idx < 0)

			return idx;

	}

	if (diff < 0)

		return diff;



	trace_hfi1_sdma_user_header_ahg(pq->dd, pq->ctxt, pq->subctxt,

					req->info.comp_idx, req->sde->this_idx,

					req->ahg_idx, ahg, diff, tidval);

					req->ahg_idx, ahg, idx, tidval);

	sdma_txinit_ahg(&tx->txreq,

			SDMA_TXREQ_F_USE_AHG,

			datalen, req->ahg_idx, diff,

			datalen, req->ahg_idx, idx,

			ahg, sizeof(req->hdr),

			user_sdma_txreq_cb);



	return diff;

	return idx;

}



/*

drivers/infiniband/hw/hfi1/user_sdma.h

+20 −9
Original line number Diff line number Diff line
@@ -80,15 +80,26 @@ 
#define PBC2LRH(x) ((((x) & 0xfff) << 2) - 4)

#define LRH2PBC(x) ((((x) >> 2) + 1) & 0xfff)



#define AHG_HEADER_SET(arr, idx, dw, bit, width, value)			\

	do {								\

		if ((idx) < ARRAY_SIZE((arr)))				\

			(arr)[(idx++)] = sdma_build_ahg_descriptor(	\

				(__force u16)(value), (dw), (bit),	\

							(width));	\

		else							\

			return -ERANGE;					\

	} while (0)

/**

 * Build an SDMA AHG header update descriptor and save it to an array.

 * @arr        - Array to save the descriptor to.

 * @idx        - Index of the array at which the descriptor will be saved.

 * @array_size - Size of the array arr.

 * @dw         - Update index into the header in DWs.

 * @bit        - Start bit.

 * @width      - Field width.

 * @value      - 16 bits of immediate data to write into the field.

 * Returns -ERANGE if idx is invalid. If successful, returns the next index

 * (idx + 1) of the array to be used for the next descriptor.

 */

static inline int ahg_header_set(u32 *arr, int idx, size_t array_size,

				 u8 dw, u8 bit, u8 width, u16 value)

{

	if ((size_t)idx >= array_size)

		return -ERANGE;

	arr[idx++] = sdma_build_ahg_descriptor(value, dw, bit, width);

	return idx;

}



/* Tx request flag bits */

#define TXREQ_FLAGS_REQ_ACK   BIT(0)      /* Set the ACK bit in the header */