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

Commit 2f960bd0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-Bug-fixes-for-57500-chips' 



Michael Chan says:

====================
bnxt_en: Bug fixes for 57500 chips.

Two small bug fixes for ring checking and context memory allocation
that affect the new 57500 chips.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8d008e64 6ef982de

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

+8 −4
Original line number Diff line number Diff line
@@ -5601,7 +5601,8 @@ static int bnxt_hwrm_check_pf_rings(struct bnxt *bp, int tx_rings, int rx_rings, 
			 FUNC_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST |

			 FUNC_CFG_REQ_FLAGS_VNIC_ASSETS_TEST;

		if (bp->flags & BNXT_FLAG_CHIP_P5)

			flags |= FUNC_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST;

			flags |= FUNC_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST |

				 FUNC_CFG_REQ_FLAGS_NQ_ASSETS_TEST;

		else

			flags |= FUNC_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST;

	}
@@ -6221,9 +6222,12 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp, 
			rmem->pg_tbl_map = ctx_pg->ctx_dma_arr[i];

			rmem->depth = 1;

			rmem->nr_pages = MAX_CTX_PAGES;

			if (i == (nr_tbls - 1))

				rmem->nr_pages = ctx_pg->nr_pages %

						 MAX_CTX_PAGES;

			if (i == (nr_tbls - 1)) {

				int rem = ctx_pg->nr_pages % MAX_CTX_PAGES;



				if (rem)

					rmem->nr_pages = rem;

			}

			rc = bnxt_alloc_ctx_mem_blk(bp, pg_tbl);

			if (rc)

				break;

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

+3 −2
Original line number Diff line number Diff line
@@ -386,8 +386,8 @@ struct hwrm_err_output { 
#define HWRM_VERSION_MAJOR 1

#define HWRM_VERSION_MINOR 10

#define HWRM_VERSION_UPDATE 0

#define HWRM_VERSION_RSVD 33

#define HWRM_VERSION_STR "1.10.0.33"

#define HWRM_VERSION_RSVD 35

#define HWRM_VERSION_STR "1.10.0.35"



/* hwrm_ver_get_input (size:192b/24B) */

struct hwrm_ver_get_input {
@@ -1184,6 +1184,7 @@ struct hwrm_func_cfg_input { 
	#define FUNC_CFG_REQ_FLAGS_L2_CTX_ASSETS_TEST             0x100000UL

	#define FUNC_CFG_REQ_FLAGS_TRUSTED_VF_ENABLE              0x200000UL

	#define FUNC_CFG_REQ_FLAGS_DYNAMIC_TX_RING_ALLOC          0x400000UL

	#define FUNC_CFG_REQ_FLAGS_NQ_ASSETS_TEST                 0x800000UL

	__le32	enables;

	#define FUNC_CFG_REQ_ENABLES_MTU                     0x1UL

	#define FUNC_CFG_REQ_ENABLES_MRU                     0x2UL