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

bnxt_en: Update firmware interface to 1.10.1.54. 



Main changes are 200G support and fixing the definitions of discard and
error counters to match the hardware definitions.

Because the HWRM_PORT_PHY_QCFG message size has now exceeded the max.
encapsulated response message size of 96 bytes from the PF to the VF,
we now need to cap this message to 96 bytes for forwarding.  The forwarded
response only needs to contain the basic link status and speed information
and can be capped without adding the new information.

v2: Fix bnxt_re compile error.

Cc: Selvin Xavier <selvin.xavier@broadcom.com>
Reviewed-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
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 dfe64de9

drivers/infiniband/hw/bnxt_re/hw_counters.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, 
		stats->value[BNXT_RE_RECOVERABLE_ERRORS] =

			le64_to_cpu(bnxt_re_stats->tx_bcast_pkts);

		stats->value[BNXT_RE_RX_DROPS] =

			le64_to_cpu(bnxt_re_stats->rx_drop_pkts);

			le64_to_cpu(bnxt_re_stats->rx_error_pkts);

		stats->value[BNXT_RE_RX_DISCARDS] =

			le64_to_cpu(bnxt_re_stats->rx_discard_pkts);

		stats->value[BNXT_RE_RX_PKTS] =

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

+1 −1
Original line number Diff line number Diff line
@@ -9605,7 +9605,7 @@ static void bnxt_get_ring_stats(struct bnxt *bp, 


		stats->multicast += le64_to_cpu(hw_stats->rx_mcast_pkts);



		stats->tx_dropped += le64_to_cpu(hw_stats->tx_drop_pkts);

		stats->tx_dropped += le64_to_cpu(hw_stats->tx_error_pkts);

	}

}

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

+44 −0
Original line number Diff line number Diff line
@@ -1135,6 +1135,50 @@ struct bnxt_ntuple_filter { 
#define BNXT_FLTR_UPDATE	1

};



struct hwrm_port_phy_qcfg_output_compat {

	__le16	error_code;

	__le16	req_type;

	__le16	seq_id;

	__le16	resp_len;

	u8	link;

	u8	link_signal_mode;

	__le16	link_speed;

	u8	duplex_cfg;

	u8	pause;

	__le16	support_speeds;

	__le16	force_link_speed;

	u8	auto_mode;

	u8	auto_pause;

	__le16	auto_link_speed;

	__le16	auto_link_speed_mask;

	u8	wirespeed;

	u8	lpbk;

	u8	force_pause;

	u8	module_status;

	__le32	preemphasis;

	u8	phy_maj;

	u8	phy_min;

	u8	phy_bld;

	u8	phy_type;

	u8	media_type;

	u8	xcvr_pkg_type;

	u8	eee_config_phy_addr;

	u8	parallel_detect;

	__le16	link_partner_adv_speeds;

	u8	link_partner_adv_auto_mode;

	u8	link_partner_adv_pause;

	__le16	adv_eee_link_speed_mask;

	__le16	link_partner_adv_eee_link_speed_mask;

	__le32	xcvr_identifier_type_tx_lpi_timer;

	__le16	fec_cfg;

	u8	duplex_state;

	u8	option_flags;

	char	phy_vendor_name[16];

	char	phy_vendor_partnumber[16];

	u8	unused_0[7];

	u8	valid;

};



struct bnxt_link_info {

	u8			phy_type;

	u8			media_type;

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

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static const char * const bnxt_ring_rx_stats_str[] = { 
	"rx_mcast_packets",

	"rx_bcast_packets",

	"rx_discards",

	"rx_drops",

	"rx_errors",

	"rx_ucast_bytes",

	"rx_mcast_bytes",

	"rx_bcast_bytes",
@@ -152,8 +152,8 @@ static const char * const bnxt_ring_tx_stats_str[] = { 
	"tx_ucast_packets",

	"tx_mcast_packets",

	"tx_bcast_packets",

	"tx_errors",

	"tx_discards",

	"tx_drops",

	"tx_ucast_bytes",

	"tx_mcast_bytes",

	"tx_bcast_bytes",

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

+342 −126

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE