Merge branch 'bnxt_en-next' (00a636e7) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+44 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1499,6 +1499,7 @@ static int bnxt_async_event_process(struct bnxt *bp,
	netdev_warn(bp->dev, "Link speed %d no longer supported\n",		netdev_warn(bp->dev, "Link speed %d no longer supported\n",
	speed);		speed);
	}		}
			set_bit(BNXT_LINK_SPEED_CHNG_SP_EVENT, &bp->sp_event);
	/* fall thru */		/* fall thru */
	}		}
	case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE:		case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE:
	@@ -3424,13 +3425,7 @@ static int bnxt_hwrm_vnic_set_rss(struct bnxt *bp, u16 vnic_id, bool set_rss)

	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_VNIC_RSS_CFG, -1, -1);		bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_VNIC_RSS_CFG, -1, -1);
	if (set_rss) {		if (set_rss) {
	vnic->hash_type = VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 \|		req.hash_type = cpu_to_le32(bp->rss_hash_cfg);
	VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 \|
	VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 \|
	VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;

	req.hash_type = cpu_to_le32(vnic->hash_type);

	if (vnic->flags & BNXT_VNIC_RSS_FLAG) {		if (vnic->flags & BNXT_VNIC_RSS_FLAG) {
	if (BNXT_CHIP_TYPE_NITRO_A0(bp))		if (BNXT_CHIP_TYPE_NITRO_A0(bp))
	max_rings = bp->rx_nr_rings - 1;		max_rings = bp->rx_nr_rings - 1;
	@@ -5095,6 +5090,7 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
	struct hwrm_port_phy_qcfg_input req = {0};		struct hwrm_port_phy_qcfg_input req = {0};
	struct hwrm_port_phy_qcfg_output *resp = bp->hwrm_cmd_resp_addr;		struct hwrm_port_phy_qcfg_output *resp = bp->hwrm_cmd_resp_addr;
	u8 link_up = link_info->link_up;		u8 link_up = link_info->link_up;
			u16 diff;

	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_PHY_QCFG, -1, -1);		bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_PHY_QCFG, -1, -1);

	@@ -5182,6 +5178,23 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
	link_info->link_up = 0;		link_info->link_up = 0;
	}		}
	mutex_unlock(&bp->hwrm_cmd_lock);		mutex_unlock(&bp->hwrm_cmd_lock);

			diff = link_info->support_auto_speeds ^ link_info->advertising;
			if ((link_info->support_auto_speeds \| diff) !=
			link_info->support_auto_speeds) {
			/* An advertised speed is no longer supported, so we need to
			* update the advertisement settings. See bnxt_reset() for
			* comments about the rtnl_lock() sequence below.
			*/
			clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
			rtnl_lock();
			link_info->advertising = link_info->support_auto_speeds;
			if (test_bit(BNXT_STATE_OPEN, &bp->state) &&
			(link_info->autoneg & BNXT_AUTONEG_SPEED))
			bnxt_hwrm_set_link_setting(bp, true, false);
			set_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
			rtnl_unlock();
			}
	return 0;		return 0;
	}		}

	@@ -5346,7 +5359,7 @@ static int bnxt_hwrm_shutdown_link(struct bnxt *bp)
	return 0;		return 0;

	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_PHY_CFG, -1, -1);		bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_PHY_CFG, -1, -1);
	req.flags = cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DOWN);		req.flags = cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DWN);
	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);		return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
	}		}

	@@ -5409,6 +5422,12 @@ static int bnxt_update_phy_setting(struct bnxt *bp)
	update_link = true;		update_link = true;
	}		}

			/* The last close may have shutdown the link, so need to call
			* PHY_CFG to bring it back up.
			*/
			if (!netif_carrier_ok(bp->dev))
			update_link = true;

	if (!bnxt_eee_config_ok(bp))		if (!bnxt_eee_config_ok(bp))
	update_eee = true;		update_eee = true;

	@@ -6102,6 +6121,10 @@ static void bnxt_sp_task(struct work_struct *work)
	if (test_and_clear_bit(BNXT_RX_NTP_FLTR_SP_EVENT, &bp->sp_event))		if (test_and_clear_bit(BNXT_RX_NTP_FLTR_SP_EVENT, &bp->sp_event))
	bnxt_cfg_ntp_filters(bp);		bnxt_cfg_ntp_filters(bp);
	if (test_and_clear_bit(BNXT_LINK_CHNG_SP_EVENT, &bp->sp_event)) {		if (test_and_clear_bit(BNXT_LINK_CHNG_SP_EVENT, &bp->sp_event)) {
			if (test_and_clear_bit(BNXT_LINK_SPEED_CHNG_SP_EVENT,
			&bp->sp_event))
			bnxt_hwrm_phy_qcaps(bp);

	rc = bnxt_update_link(bp, true);		rc = bnxt_update_link(bp, true);
	if (rc)		if (rc)
	netdev_err(bp->dev, "SP task can't update link (rc: %x)\n",		netdev_err(bp->dev, "SP task can't update link (rc: %x)\n",
	@@ -6911,6 +6934,19 @@ static int bnxt_init_one(struct pci_dev pdev, const struct pci_device_id ent)
	#endif		#endif
	bnxt_set_dflt_rings(bp);		bnxt_set_dflt_rings(bp);

			/* Default RSS hash cfg. */
			bp->rss_hash_cfg = VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 \|
			VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 \|
			VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 \|
			VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;
			if (!BNXT_CHIP_NUM_57X0X(bp->chip_num) &&
			!BNXT_CHIP_TYPE_NITRO_A0(bp) &&
			bp->hwrm_spec_code >= 0x10501) {
			bp->flags \|= BNXT_FLAG_UDP_RSS_CAP;
			bp->rss_hash_cfg \|= VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4 \|
			VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;
			}

	if (BNXT_PF(bp) && !BNXT_CHIP_TYPE_NITRO_A0(bp)) {		if (BNXT_PF(bp) && !BNXT_CHIP_TYPE_NITRO_A0(bp)) {
	dev->hw_features \|= NETIF_F_NTUPLE;		dev->hw_features \|= NETIF_F_NTUPLE;
	if (bnxt_rfs_capable(bp)) {		if (bnxt_rfs_capable(bp)) {

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -700,7 +700,6 @@ struct bnxt_vnic_info {
	u8 *uc_list;		u8 *uc_list;

	u16 *fw_grp_ids;		u16 *fw_grp_ids;
	u16 hash_type;
	dma_addr_t rss_table_dma_addr;		dma_addr_t rss_table_dma_addr;
	__le16 *rss_table;		__le16 *rss_table;
	dma_addr_t rss_hash_key_dma_addr;		dma_addr_t rss_hash_key_dma_addr;
	@@ -952,6 +951,7 @@ struct bnxt {
	#define BNXT_FLAG_RFS 0x100		#define BNXT_FLAG_RFS 0x100
	#define BNXT_FLAG_SHARED_RINGS 0x200		#define BNXT_FLAG_SHARED_RINGS 0x200
	#define BNXT_FLAG_PORT_STATS 0x400		#define BNXT_FLAG_PORT_STATS 0x400
			#define BNXT_FLAG_UDP_RSS_CAP 0x800
	#define BNXT_FLAG_EEE_CAP 0x1000		#define BNXT_FLAG_EEE_CAP 0x1000
	#define BNXT_FLAG_CHIP_NITRO_A0 0x1000000		#define BNXT_FLAG_CHIP_NITRO_A0 0x1000000

	@@ -1007,6 +1007,7 @@ struct bnxt {
	struct bnxt_ring_grp_info *grp_info;		struct bnxt_ring_grp_info *grp_info;
	struct bnxt_vnic_info *vnic_info;		struct bnxt_vnic_info *vnic_info;
	int nr_vnics;		int nr_vnics;
			u32 rss_hash_cfg;

	u8 max_tc;		u8 max_tc;
	struct bnxt_queue_info q_info[BNXT_MAX_QUEUE];		struct bnxt_queue_info q_info[BNXT_MAX_QUEUE];
	@@ -1089,6 +1090,7 @@ struct bnxt {
	#define BNXT_RESET_TASK_SILENT_SP_EVENT 11		#define BNXT_RESET_TASK_SILENT_SP_EVENT 11
	#define BNXT_GENEVE_ADD_PORT_SP_EVENT 12		#define BNXT_GENEVE_ADD_PORT_SP_EVENT 12
	#define BNXT_GENEVE_DEL_PORT_SP_EVENT 13		#define BNXT_GENEVE_DEL_PORT_SP_EVENT 13
			#define BNXT_LINK_SPEED_CHNG_SP_EVENT 14

	struct bnxt_pf_info pf;		struct bnxt_pf_info pf;
	#ifdef CONFIG_BNXT_SRIOV		#ifdef CONFIG_BNXT_SRIOV

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

+164 −3

Original line number	Original line	Diff line number	Diff line
	@@ -542,6 +542,146 @@ static int bnxt_grxclsrule(struct bnxt bp, struct ethtool_rxnfc cmd)

	return rc;		return rc;
	}		}
			#endif

			static u64 get_ethtool_ipv4_rss(struct bnxt *bp)
			{
			if (bp->rss_hash_cfg & VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4)
			return RXH_IP_SRC \| RXH_IP_DST;
			return 0;
			}

			static u64 get_ethtool_ipv6_rss(struct bnxt *bp)
			{
			if (bp->rss_hash_cfg & VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6)
			return RXH_IP_SRC \| RXH_IP_DST;
			return 0;
			}

			static int bnxt_grxfh(struct bnxt bp, struct ethtool_rxnfc cmd)
			{
			cmd->data = 0;
			switch (cmd->flow_type) {
			case TCP_V4_FLOW:
			if (bp->rss_hash_cfg & VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4)
			cmd->data \|= RXH_IP_SRC \| RXH_IP_DST \|
			RXH_L4_B_0_1 \| RXH_L4_B_2_3;
			cmd->data \|= get_ethtool_ipv4_rss(bp);
			break;
			case UDP_V4_FLOW:
			if (bp->rss_hash_cfg & VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4)
			cmd->data \|= RXH_IP_SRC \| RXH_IP_DST \|
			RXH_L4_B_0_1 \| RXH_L4_B_2_3;
			/* fall through */
			case SCTP_V4_FLOW:
			case AH_ESP_V4_FLOW:
			case AH_V4_FLOW:
			case ESP_V4_FLOW:
			case IPV4_FLOW:
			cmd->data \|= get_ethtool_ipv4_rss(bp);
			break;

			case TCP_V6_FLOW:
			if (bp->rss_hash_cfg & VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6)
			cmd->data \|= RXH_IP_SRC \| RXH_IP_DST \|
			RXH_L4_B_0_1 \| RXH_L4_B_2_3;
			cmd->data \|= get_ethtool_ipv6_rss(bp);
			break;
			case UDP_V6_FLOW:
			if (bp->rss_hash_cfg & VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6)
			cmd->data \|= RXH_IP_SRC \| RXH_IP_DST \|
			RXH_L4_B_0_1 \| RXH_L4_B_2_3;
			/* fall through */
			case SCTP_V6_FLOW:
			case AH_ESP_V6_FLOW:
			case AH_V6_FLOW:
			case ESP_V6_FLOW:
			case IPV6_FLOW:
			cmd->data \|= get_ethtool_ipv6_rss(bp);
			break;
			}
			return 0;
			}

			#define RXH_4TUPLE (RXH_IP_SRC \| RXH_IP_DST \| RXH_L4_B_0_1 \| RXH_L4_B_2_3)
			#define RXH_2TUPLE (RXH_IP_SRC \| RXH_IP_DST)

			static int bnxt_srxfh(struct bnxt bp, struct ethtool_rxnfc cmd)
			{
			u32 rss_hash_cfg = bp->rss_hash_cfg;
			int tuple, rc = 0;

			if (cmd->data == RXH_4TUPLE)
			tuple = 4;
			else if (cmd->data == RXH_2TUPLE)
			tuple = 2;
			else if (!cmd->data)
			tuple = 0;
			else
			return -EINVAL;

			if (cmd->flow_type == TCP_V4_FLOW) {
			rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4;
			if (tuple == 4)
			rss_hash_cfg \|= VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4;
			} else if (cmd->flow_type == UDP_V4_FLOW) {
			if (tuple == 4 && !(bp->flags & BNXT_FLAG_UDP_RSS_CAP))
			return -EINVAL;
			rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4;
			if (tuple == 4)
			rss_hash_cfg \|= VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4;
			} else if (cmd->flow_type == TCP_V6_FLOW) {
			rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;
			if (tuple == 4)
			rss_hash_cfg \|= VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;
			} else if (cmd->flow_type == UDP_V6_FLOW) {
			if (tuple == 4 && !(bp->flags & BNXT_FLAG_UDP_RSS_CAP))
			return -EINVAL;
			rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;
			if (tuple == 4)
			rss_hash_cfg \|= VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;
			} else if (tuple == 4) {
			return -EINVAL;
			}

			switch (cmd->flow_type) {
			case TCP_V4_FLOW:
			case UDP_V4_FLOW:
			case SCTP_V4_FLOW:
			case AH_ESP_V4_FLOW:
			case AH_V4_FLOW:
			case ESP_V4_FLOW:
			case IPV4_FLOW:
			if (tuple == 2)
			rss_hash_cfg \|= VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4;
			else if (!tuple)
			rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4;
			break;

			case TCP_V6_FLOW:
			case UDP_V6_FLOW:
			case SCTP_V6_FLOW:
			case AH_ESP_V6_FLOW:
			case AH_V6_FLOW:
			case ESP_V6_FLOW:
			case IPV6_FLOW:
			if (tuple == 2)
			rss_hash_cfg \|= VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6;
			else if (!tuple)
			rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6;
			break;
			}

			if (bp->rss_hash_cfg == rss_hash_cfg)
			return 0;

			bp->rss_hash_cfg = rss_hash_cfg;
			if (netif_running(bp->dev)) {
			bnxt_close_nic(bp, false, false);
			rc = bnxt_open_nic(bp, false, false);
			}
			return rc;
			}

	static int bnxt_get_rxnfc(struct net_device dev, struct ethtool_rxnfc cmd,		static int bnxt_get_rxnfc(struct net_device dev, struct ethtool_rxnfc cmd,
	u32 *rule_locs)		u32 *rule_locs)
	@@ -550,6 +690,7 @@ static int bnxt_get_rxnfc(struct net_device dev, struct ethtool_rxnfc cmd,
	int rc = 0;		int rc = 0;

	switch (cmd->cmd) {		switch (cmd->cmd) {
			#ifdef CONFIG_RFS_ACCEL
	case ETHTOOL_GRXRINGS:		case ETHTOOL_GRXRINGS:
	cmd->data = bp->rx_nr_rings;		cmd->data = bp->rx_nr_rings;
	break;		break;
	@@ -566,6 +707,11 @@ static int bnxt_get_rxnfc(struct net_device dev, struct ethtool_rxnfc cmd,
	case ETHTOOL_GRXCLSRULE:		case ETHTOOL_GRXCLSRULE:
	rc = bnxt_grxclsrule(bp, cmd);		rc = bnxt_grxclsrule(bp, cmd);
	break;		break;
			#endif

			case ETHTOOL_GRXFH:
			rc = bnxt_grxfh(bp, cmd);
			break;

	default:		default:
	rc = -EOPNOTSUPP;		rc = -EOPNOTSUPP;
	@@ -574,7 +720,23 @@ static int bnxt_get_rxnfc(struct net_device dev, struct ethtool_rxnfc cmd,

	return rc;		return rc;
	}		}
	#endif
			static int bnxt_set_rxnfc(struct net_device dev, struct ethtool_rxnfc cmd)
			{
			struct bnxt *bp = netdev_priv(dev);
			int rc;

			switch (cmd->cmd) {
			case ETHTOOL_SRXFH:
			rc = bnxt_srxfh(bp, cmd);
			break;

			default:
			rc = -EOPNOTSUPP;
			break;
			}
			return rc;
			}

	static u32 bnxt_get_rxfh_indir_size(struct net_device *dev)		static u32 bnxt_get_rxfh_indir_size(struct net_device *dev)
	{		{
	@@ -1885,9 +2047,8 @@ const struct ethtool_ops bnxt_ethtool_ops = {
	.get_ringparam = bnxt_get_ringparam,		.get_ringparam = bnxt_get_ringparam,
	.get_channels = bnxt_get_channels,		.get_channels = bnxt_get_channels,
	.set_channels = bnxt_set_channels,		.set_channels = bnxt_set_channels,
	#ifdef CONFIG_RFS_ACCEL
	.get_rxnfc = bnxt_get_rxnfc,		.get_rxnfc = bnxt_get_rxnfc,
	#endif		.set_rxnfc = bnxt_set_rxnfc,
	.get_rxfh_indir_size = bnxt_get_rxfh_indir_size,		.get_rxfh_indir_size = bnxt_get_rxfh_indir_size,
	.get_rxfh_key_size = bnxt_get_rxfh_key_size,		.get_rxfh_key_size = bnxt_get_rxfh_key_size,
	.get_rxfh = bnxt_get_rxfh,		.get_rxfh = bnxt_get_rxfh,

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

+87 −4

Original line number	Original line	Diff line number	Diff line
	@@ -215,6 +215,9 @@ struct hwrm_async_event_cmpl_dcb_config_change {
	__le16 event_id;		__le16 event_id;
	#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_ID_DCB_CONFIG_CHANGE 0x3UL		#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_ID_DCB_CONFIG_CHANGE 0x3UL
	__le32 event_data2;		__le32 event_data2;
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA2_ETS 0x1UL
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA2_PFC 0x2UL
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA2_APP 0x4UL
	u8 opaque_v;		u8 opaque_v;
	#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_V 0x1UL		#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_V 0x1UL
	#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_OPAQUE_MASK 0xfeUL		#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_OPAQUE_MASK 0xfeUL
	@@ -224,6 +227,14 @@ struct hwrm_async_event_cmpl_dcb_config_change {
	__le32 event_data1;		__le32 event_data1;
	#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_PORT_ID_MASK 0xffffUL		#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_PORT_ID_MASK 0xffffUL
	#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_PORT_ID_SFT 0		#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_PORT_ID_SFT 0
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_ROCE_PRIORITY_MASK 0xff0000UL
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_ROCE_PRIORITY_SFT 16
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_ROCE_PRIORITY_NONE (0xffUL << 16)
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_ROCE_PRIORITY_LAST HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_ROCE_PRIORITY_NONE
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_L2_PRIORITY_MASK 0xff000000UL
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_L2_PRIORITY_SFT 24
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_L2_PRIORITY_NONE (0xffUL << 24)
			#define HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_L2_PRIORITY_LAST HWRM_ASYNC_EVENT_CMPL_DCB_CONFIG_CHANGE_EVENT_DATA1_RECOMMEND_L2_PRIORITY_NONE
	};		};

	/* HWRM Asynchronous Event Completion Record for port connection not allowed (16 bytes) */		/* HWRM Asynchronous Event Completion Record for port connection not allowed (16 bytes) */
	@@ -485,12 +496,12 @@ struct hwrm_async_event_cmpl_hwrm_error {
	#define HWRM_ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA1_TIMESTAMP 0x1UL		#define HWRM_ASYNC_EVENT_CMPL_HWRM_ERROR_EVENT_DATA1_TIMESTAMP 0x1UL
	};		};

	/* HW Resource Manager Specification 1.5.1 */		/* HW Resource Manager Specification 1.5.4 */
	#define HWRM_VERSION_MAJOR 1		#define HWRM_VERSION_MAJOR 1
	#define HWRM_VERSION_MINOR 5		#define HWRM_VERSION_MINOR 5
	#define HWRM_VERSION_UPDATE 1		#define HWRM_VERSION_UPDATE 4

	#define HWRM_VERSION_STR "1.5.1"		#define HWRM_VERSION_STR "1.5.4"
	/*		/*
	* Following is the signature for HWRM message field that indicates not		* Following is the signature for HWRM message field that indicates not
	* applicable (All F's). Need to cast it the size of the field if needed.		* applicable (All F's). Need to cast it the size of the field if needed.
	@@ -612,6 +623,9 @@ struct cmd_nums {
	#define HWRM_FW_QSTATUS (0xc1UL)		#define HWRM_FW_QSTATUS (0xc1UL)
	#define HWRM_FW_SET_TIME (0xc8UL)		#define HWRM_FW_SET_TIME (0xc8UL)
	#define HWRM_FW_GET_TIME (0xc9UL)		#define HWRM_FW_GET_TIME (0xc9UL)
			#define HWRM_FW_SET_STRUCTURED_DATA (0xcaUL)
			#define HWRM_FW_GET_STRUCTURED_DATA (0xcbUL)
			#define HWRM_FW_IPC_MAILBOX (0xccUL)
	#define HWRM_EXEC_FWD_RESP (0xd0UL)		#define HWRM_EXEC_FWD_RESP (0xd0UL)
	#define HWRM_REJECT_FWD_RESP (0xd1UL)		#define HWRM_REJECT_FWD_RESP (0xd1UL)
	#define HWRM_FWD_RESP (0xd2UL)		#define HWRM_FWD_RESP (0xd2UL)
	@@ -626,6 +640,8 @@ struct cmd_nums {
	#define HWRM_DBG_WRITE_DIRECT (0xff12UL)		#define HWRM_DBG_WRITE_DIRECT (0xff12UL)
	#define HWRM_DBG_WRITE_INDIRECT (0xff13UL)		#define HWRM_DBG_WRITE_INDIRECT (0xff13UL)
	#define HWRM_DBG_DUMP (0xff14UL)		#define HWRM_DBG_DUMP (0xff14UL)
			#define HWRM_NVM_GET_VARIABLE (0xfff1UL)
			#define HWRM_NVM_SET_VARIABLE (0xfff2UL)
	#define HWRM_NVM_INSTALL_UPDATE (0xfff3UL)		#define HWRM_NVM_INSTALL_UPDATE (0xfff3UL)
	#define HWRM_NVM_MODIFY (0xfff4UL)		#define HWRM_NVM_MODIFY (0xfff4UL)
	#define HWRM_NVM_VERIFY_UPDATE (0xfff5UL)		#define HWRM_NVM_VERIFY_UPDATE (0xfff5UL)
	@@ -1399,6 +1415,7 @@ struct hwrm_func_drv_rgtr_input {
	#define FUNC_DRV_RGTR_REQ_OS_TYPE_ESXI 0x68UL		#define FUNC_DRV_RGTR_REQ_OS_TYPE_ESXI 0x68UL
	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN864 0x73UL		#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN864 0x73UL
	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN2012R2 0x74UL		#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN2012R2 0x74UL
			#define FUNC_DRV_RGTR_REQ_OS_TYPE_UEFI 0x8000UL
	u8 ver_maj;		u8 ver_maj;
	u8 ver_min;		u8 ver_min;
	u8 ver_upd;		u8 ver_upd;
	@@ -1549,7 +1566,7 @@ struct hwrm_port_phy_cfg_input {
	__le64 resp_addr;		__le64 resp_addr;
	__le32 flags;		__le32 flags;
	#define PORT_PHY_CFG_REQ_FLAGS_RESET_PHY 0x1UL		#define PORT_PHY_CFG_REQ_FLAGS_RESET_PHY 0x1UL
	#define PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DOWN 0x2UL		#define PORT_PHY_CFG_REQ_FLAGS_DEPRECATED 0x2UL
	#define PORT_PHY_CFG_REQ_FLAGS_FORCE 0x4UL		#define PORT_PHY_CFG_REQ_FLAGS_FORCE 0x4UL
	#define PORT_PHY_CFG_REQ_FLAGS_RESTART_AUTONEG 0x8UL		#define PORT_PHY_CFG_REQ_FLAGS_RESTART_AUTONEG 0x8UL
	#define PORT_PHY_CFG_REQ_FLAGS_EEE_ENABLE 0x10UL		#define PORT_PHY_CFG_REQ_FLAGS_EEE_ENABLE 0x10UL
	@@ -1562,6 +1579,7 @@ struct hwrm_port_phy_cfg_input {
	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_DISABLE 0x800UL		#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_DISABLE 0x800UL
	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_ENABLE 0x1000UL		#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_ENABLE 0x1000UL
	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_DISABLE 0x2000UL		#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_DISABLE 0x2000UL
			#define PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DWN 0x4000UL
	__le32 enables;		__le32 enables;
	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_MODE 0x1UL		#define PORT_PHY_CFG_REQ_ENABLES_AUTO_MODE 0x1UL
	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_DUPLEX 0x2UL		#define PORT_PHY_CFG_REQ_ENABLES_AUTO_DUPLEX 0x2UL
	@@ -4023,6 +4041,71 @@ struct hwrm_fw_set_time_output {
	u8 valid;		u8 valid;
	};		};

			/* hwrm_fw_set_structured_data */
			/* Input (32 bytes) */
			struct hwrm_fw_set_structured_data_input {
			__le16 req_type;
			__le16 cmpl_ring;
			__le16 seq_id;
			__le16 target_id;
			__le64 resp_addr;
			__le64 src_data_addr;
			__le16 data_len;
			u8 hdr_cnt;
			u8 unused_0[5];
			};

			/* Output (16 bytes) */
			struct hwrm_fw_set_structured_data_output {
			__le16 error_code;
			__le16 req_type;
			__le16 seq_id;
			__le16 resp_len;
			__le32 unused_0;
			u8 unused_1;
			u8 unused_2;
			u8 unused_3;
			u8 valid;
			};

			/* hwrm_fw_get_structured_data */
			/* Input (32 bytes) */
			struct hwrm_fw_get_structured_data_input {
			__le16 req_type;
			__le16 cmpl_ring;
			__le16 seq_id;
			__le16 target_id;
			__le64 resp_addr;
			__le64 dest_data_addr;
			__le16 data_len;
			__le16 structure_id;
			__le16 subtype;
			#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_ALL 0xffffUL
			#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_ADMIN 0x100UL
			#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_PEER 0x101UL
			#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_OPERATIONAL 0x102UL
			#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_ADMIN 0x200UL
			#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_PEER 0x201UL
			#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_OPERATIONAL 0x202UL
			u8 count;
			u8 unused_0;
			};

			/* Output (16 bytes) */
			struct hwrm_fw_get_structured_data_output {
			__le16 error_code;
			__le16 req_type;
			__le16 seq_id;
			__le16 resp_len;
			u8 hdr_cnt;
			u8 unused_0;
			__le16 unused_1;
			u8 unused_2;
			u8 unused_3;
			u8 unused_4;
			u8 valid;
			};

	/* hwrm_exec_fwd_resp */		/* hwrm_exec_fwd_resp */
	/* Input (128 bytes) */		/* Input (128 bytes) */
	struct hwrm_exec_fwd_resp_input {		struct hwrm_exec_fwd_resp_input {