Commit 702279d2 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Fix context memory setup for 64K page size. 



There was a typo in the code that checks for 64K BNXT_PAGE_SHIFT in
bnxt_hwrm_set_pg_attr().  Fix it and make the code more understandable
with a new macro BNXT_SET_CTX_PAGE_ATTR().

Fixes: 1b9394e5 ("bnxt_en: Configure context memory on new devices.")
Reviewed-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab21494b

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −8
Original line number Diff line number Diff line
@@ -6933,17 +6933,10 @@ static int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp) 
static void bnxt_hwrm_set_pg_attr(struct bnxt_ring_mem_info *rmem, u8 *pg_attr,

				  __le64 *pg_dir)

{

	u8 pg_size = 0;



	if (!rmem->nr_pages)

		return;



	if (BNXT_PAGE_SHIFT == 13)

		pg_size = 1 << 4;

	else if (BNXT_PAGE_SIZE == 16)

		pg_size = 2 << 4;



	*pg_attr = pg_size;

	BNXT_SET_CTX_PAGE_ATTR(*pg_attr);

	if (rmem->depth >= 1) {

		if (rmem->depth == 2)

			*pg_attr |= 2;

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+10 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,16 @@ struct bnxt_ctx_pg_info { 


#define BNXT_BACKING_STORE_CFG_LEGACY_LEN	256



#define BNXT_SET_CTX_PAGE_ATTR(attr)					\

do {									\

	if (BNXT_PAGE_SIZE == 0x2000)					\

		attr = FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8K;	\

	else if (BNXT_PAGE_SIZE == 0x10000)				\

		attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_64K;	\

	else								\

		attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_4K;	\

} while (0)



struct bnxt_ctx_mem_info {

	u32	qp_max_entries;

	u16	qp_min_qp1_entries;