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

Commit 97381a18 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Move firmware related flags to a new fw_cap field in struct bnxt. 



The flags field is almost getting full.  Move firmware capability flags
to a new fw_cap field to better organize these firmware flags.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f1ca94de

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

+6 −6
Original line number Diff line number Diff line
@@ -3445,7 +3445,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len, 
	cp_ring_id = le16_to_cpu(req->cmpl_ring);

	intr_process = (cp_ring_id == INVALID_HW_RING_ID) ? 0 : 1;



	if (bp->flags & BNXT_FLAG_SHORT_CMD) {

	if (bp->fw_cap & BNXT_FW_CAP_SHORT_CMD) {

		void *short_cmd_req = bp->hwrm_short_cmd_req_addr;



		memcpy(short_cmd_req, req, msg_len);
@@ -5089,9 +5089,9 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp) 
	flags = le16_to_cpu(resp->flags);

	if (flags & (FUNC_QCFG_RESP_FLAGS_FW_DCBX_AGENT_ENABLED |

		     FUNC_QCFG_RESP_FLAGS_FW_LLDP_AGENT_ENABLED)) {

		bp->flags |= BNXT_FLAG_FW_LLDP_AGENT;

		bp->fw_cap |= BNXT_FW_CAP_LLDP_AGENT;

		if (flags & FUNC_QCFG_RESP_FLAGS_FW_DCBX_AGENT_ENABLED)

			bp->flags |= BNXT_FLAG_FW_DCBX_AGENT;

			bp->fw_cap |= BNXT_FW_CAP_DCBX_AGENT;

	}

	if (BNXT_PF(bp) && (flags & FUNC_QCFG_RESP_FLAGS_MULTI_HOST))

		bp->flags |= BNXT_FLAG_MULTI_HOST;
@@ -5249,7 +5249,7 @@ static int bnxt_hwrm_func_qcaps(struct bnxt *bp) 
	if (bp->hwrm_spec_code >= 0x10803) {

		rc = bnxt_hwrm_func_resc_qcaps(bp, true);

		if (!rc)

			bp->flags |= BNXT_FLAG_NEW_RM;

			bp->fw_cap |= BNXT_FW_CAP_NEW_RM;

	}

	return 0;

}
@@ -5352,7 +5352,7 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) 
	dev_caps_cfg = le32_to_cpu(resp->dev_caps_cfg);

	if ((dev_caps_cfg & VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_SUPPORTED) &&

	    (dev_caps_cfg & VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_REQUIRED))

		bp->flags |= BNXT_FLAG_SHORT_CMD;

		bp->fw_cap |= BNXT_FW_CAP_SHORT_CMD;



hwrm_ver_get_exit:

	mutex_unlock(&bp->hwrm_cmd_lock);
@@ -8760,7 +8760,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (rc)

		goto init_err_pci_clean;



	if (bp->flags & BNXT_FLAG_SHORT_CMD) {

	if (bp->fw_cap & BNXT_FW_CAP_SHORT_CMD) {

		rc = bnxt_alloc_hwrm_short_cmd_req(bp);

		if (rc)

			goto init_err_pci_clean;

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

+7 −6
Original line number Diff line number Diff line
@@ -1144,7 +1144,6 @@ struct bnxt { 
	atomic_t		intr_sem;



	u32			flags;

	#define BNXT_FLAG_DCB_ENABLED	0x1

	#define BNXT_FLAG_VF		0x2

	#define BNXT_FLAG_LRO		0x4

#ifdef CONFIG_INET
@@ -1173,15 +1172,11 @@ struct bnxt { 
					 BNXT_FLAG_ROCEV2_CAP)

	#define BNXT_FLAG_NO_AGG_RINGS	0x20000

	#define BNXT_FLAG_RX_PAGE_MODE	0x40000

	#define BNXT_FLAG_FW_LLDP_AGENT	0x80000

	#define BNXT_FLAG_MULTI_HOST	0x100000

	#define BNXT_FLAG_SHORT_CMD	0x200000

	#define BNXT_FLAG_DOUBLE_DB	0x400000

	#define BNXT_FLAG_FW_DCBX_AGENT	0x800000

	#define BNXT_FLAG_CHIP_NITRO_A0	0x1000000

	#define BNXT_FLAG_DIM		0x2000000

	#define BNXT_FLAG_ROCE_MIRROR_CAP	0x4000000

	#define BNXT_FLAG_NEW_RM	0x8000000

	#define BNXT_FLAG_PORT_STATS_EXT	0x10000000



	#define BNXT_FLAG_ALL_CONFIG_FEATS (BNXT_FLAG_TPA |		\
@@ -1195,7 +1190,6 @@ struct bnxt { 
#define BNXT_SINGLE_PF(bp)	(BNXT_PF(bp) && !BNXT_NPAR(bp) && !BNXT_MH(bp))

#define BNXT_CHIP_TYPE_NITRO_A0(bp) ((bp)->flags & BNXT_FLAG_CHIP_NITRO_A0)

#define BNXT_RX_PAGE_MODE(bp)	((bp)->flags & BNXT_FLAG_RX_PAGE_MODE)

#define BNXT_NEW_RM(bp)		((bp)->flags & BNXT_FLAG_NEW_RM)



/* Chip class phase 4 and later */

#define BNXT_CHIP_P4_PLUS(bp)			\
@@ -1291,6 +1285,13 @@ struct bnxt { 


	u32			msg_enable;



	u32			fw_cap;

	#define BNXT_FW_CAP_SHORT_CMD	0x00000001

	#define BNXT_FW_CAP_LLDP_AGENT	0x00000002

	#define BNXT_FW_CAP_DCBX_AGENT	0x00000004

	#define BNXT_FW_CAP_NEW_RM	0x00000008



#define BNXT_NEW_RM(bp)		((bp)->fw_cap & BNXT_FW_CAP_NEW_RM)

	u32			hwrm_spec_code;

	u16			hwrm_cmd_seq;

	u32			hwrm_intr_seq_id;

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

+3 −3
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static u8 bnxt_dcbnl_setdcbx(struct net_device *dev, u8 mode) 
		return 1;



	if (mode & DCB_CAP_DCBX_HOST) {

		if (BNXT_VF(bp) || (bp->flags & BNXT_FLAG_FW_LLDP_AGENT))

		if (BNXT_VF(bp) || (bp->fw_cap & BNXT_FW_CAP_LLDP_AGENT))

			return 1;



		/* only support IEEE */
@@ -643,9 +643,9 @@ void bnxt_dcb_init(struct bnxt *bp) 
		return;



	bp->dcbx_cap = DCB_CAP_DCBX_VER_IEEE;

	if (BNXT_PF(bp) && !(bp->flags & BNXT_FLAG_FW_LLDP_AGENT))

	if (BNXT_PF(bp) && !(bp->fw_cap & BNXT_FW_CAP_LLDP_AGENT))

		bp->dcbx_cap |= DCB_CAP_DCBX_HOST;

	else if (bp->flags & BNXT_FLAG_FW_DCBX_AGENT)

	else if (bp->fw_cap & BNXT_FW_CAP_DCBX_AGENT)

		bp->dcbx_cap |= DCB_CAP_DCBX_LLD_MANAGED;

	bp->dev->dcbnl_ops = &dcbnl_ops;

}