if_bnxt: update hsi_struct_def.h headers
Updates the drivers to Broadcom's latest: HWRM Version 1.10.2.34 using HSI definition version 1.8.4 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D36436
This commit is contained in:
parent
0e3b0045a8
commit
97315f68fe
@ -286,31 +286,31 @@ bnxt_hwrm_ver_get(struct bnxt_softc *softc)
|
|||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
snprintf(softc->ver_info->hwrm_if_ver, BNXT_VERSTR_SIZE, "%d.%d.%d",
|
snprintf(softc->ver_info->hwrm_if_ver, BNXT_VERSTR_SIZE, "%d.%d.%d",
|
||||||
resp->hwrm_intf_maj, resp->hwrm_intf_min, resp->hwrm_intf_upd);
|
resp->hwrm_intf_maj_8b, resp->hwrm_intf_min_8b, resp->hwrm_intf_upd_8b);
|
||||||
softc->ver_info->hwrm_if_major = resp->hwrm_intf_maj;
|
softc->ver_info->hwrm_if_major = resp->hwrm_intf_maj_8b;
|
||||||
softc->ver_info->hwrm_if_minor = resp->hwrm_intf_min;
|
softc->ver_info->hwrm_if_minor = resp->hwrm_intf_min_8b;
|
||||||
softc->ver_info->hwrm_if_update = resp->hwrm_intf_upd;
|
softc->ver_info->hwrm_if_update = resp->hwrm_intf_upd_8b;
|
||||||
snprintf(softc->ver_info->hwrm_fw_ver, BNXT_VERSTR_SIZE, "%d.%d.%d",
|
snprintf(softc->ver_info->hwrm_fw_ver, BNXT_VERSTR_SIZE, "%d.%d.%d",
|
||||||
resp->hwrm_fw_maj, resp->hwrm_fw_min, resp->hwrm_fw_bld);
|
resp->hwrm_fw_major, resp->hwrm_fw_minor, resp->hwrm_fw_build);
|
||||||
strlcpy(softc->ver_info->driver_hwrm_if_ver, HWRM_VERSION_STR,
|
strlcpy(softc->ver_info->driver_hwrm_if_ver, HWRM_VERSION_STR,
|
||||||
BNXT_VERSTR_SIZE);
|
BNXT_VERSTR_SIZE);
|
||||||
strlcpy(softc->ver_info->hwrm_fw_name, resp->hwrm_fw_name,
|
strlcpy(softc->ver_info->hwrm_fw_name, resp->hwrm_fw_name,
|
||||||
BNXT_NAME_SIZE);
|
BNXT_NAME_SIZE);
|
||||||
|
|
||||||
if (resp->mgmt_fw_maj == 0 && resp->mgmt_fw_min == 0 &&
|
if (resp->mgmt_fw_major == 0 && resp->mgmt_fw_minor == 0 &&
|
||||||
resp->mgmt_fw_bld == 0) {
|
resp->mgmt_fw_build == 0) {
|
||||||
strlcpy(softc->ver_info->mgmt_fw_ver, naver, BNXT_VERSTR_SIZE);
|
strlcpy(softc->ver_info->mgmt_fw_ver, naver, BNXT_VERSTR_SIZE);
|
||||||
strlcpy(softc->ver_info->mgmt_fw_name, nastr, BNXT_NAME_SIZE);
|
strlcpy(softc->ver_info->mgmt_fw_name, nastr, BNXT_NAME_SIZE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
snprintf(softc->ver_info->mgmt_fw_ver, BNXT_VERSTR_SIZE,
|
snprintf(softc->ver_info->mgmt_fw_ver, BNXT_VERSTR_SIZE,
|
||||||
"%d.%d.%d", resp->mgmt_fw_maj, resp->mgmt_fw_min,
|
"%d.%d.%d", resp->mgmt_fw_major, resp->mgmt_fw_minor,
|
||||||
resp->mgmt_fw_bld);
|
resp->mgmt_fw_build);
|
||||||
strlcpy(softc->ver_info->mgmt_fw_name, resp->mgmt_fw_name,
|
strlcpy(softc->ver_info->mgmt_fw_name, resp->mgmt_fw_name,
|
||||||
BNXT_NAME_SIZE);
|
BNXT_NAME_SIZE);
|
||||||
}
|
}
|
||||||
if (resp->netctrl_fw_maj == 0 && resp->netctrl_fw_min == 0 &&
|
if (resp->netctrl_fw_major == 0 && resp->netctrl_fw_minor == 0 &&
|
||||||
resp->netctrl_fw_bld == 0) {
|
resp->netctrl_fw_build == 0) {
|
||||||
strlcpy(softc->ver_info->netctrl_fw_ver, naver,
|
strlcpy(softc->ver_info->netctrl_fw_ver, naver,
|
||||||
BNXT_VERSTR_SIZE);
|
BNXT_VERSTR_SIZE);
|
||||||
strlcpy(softc->ver_info->netctrl_fw_name, nastr,
|
strlcpy(softc->ver_info->netctrl_fw_name, nastr,
|
||||||
@ -318,20 +318,20 @@ bnxt_hwrm_ver_get(struct bnxt_softc *softc)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
snprintf(softc->ver_info->netctrl_fw_ver, BNXT_VERSTR_SIZE,
|
snprintf(softc->ver_info->netctrl_fw_ver, BNXT_VERSTR_SIZE,
|
||||||
"%d.%d.%d", resp->netctrl_fw_maj, resp->netctrl_fw_min,
|
"%d.%d.%d", resp->netctrl_fw_major, resp->netctrl_fw_minor,
|
||||||
resp->netctrl_fw_bld);
|
resp->netctrl_fw_build);
|
||||||
strlcpy(softc->ver_info->netctrl_fw_name, resp->netctrl_fw_name,
|
strlcpy(softc->ver_info->netctrl_fw_name, resp->netctrl_fw_name,
|
||||||
BNXT_NAME_SIZE);
|
BNXT_NAME_SIZE);
|
||||||
}
|
}
|
||||||
if (resp->roce_fw_maj == 0 && resp->roce_fw_min == 0 &&
|
if (resp->roce_fw_major == 0 && resp->roce_fw_minor == 0 &&
|
||||||
resp->roce_fw_bld == 0) {
|
resp->roce_fw_build == 0) {
|
||||||
strlcpy(softc->ver_info->roce_fw_ver, naver, BNXT_VERSTR_SIZE);
|
strlcpy(softc->ver_info->roce_fw_ver, naver, BNXT_VERSTR_SIZE);
|
||||||
strlcpy(softc->ver_info->roce_fw_name, nastr, BNXT_NAME_SIZE);
|
strlcpy(softc->ver_info->roce_fw_name, nastr, BNXT_NAME_SIZE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
snprintf(softc->ver_info->roce_fw_ver, BNXT_VERSTR_SIZE,
|
snprintf(softc->ver_info->roce_fw_ver, BNXT_VERSTR_SIZE,
|
||||||
"%d.%d.%d", resp->roce_fw_maj, resp->roce_fw_min,
|
"%d.%d.%d", resp->roce_fw_major, resp->roce_fw_minor,
|
||||||
resp->roce_fw_bld);
|
resp->roce_fw_build);
|
||||||
strlcpy(softc->ver_info->roce_fw_name, resp->roce_fw_name,
|
strlcpy(softc->ver_info->roce_fw_name, resp->roce_fw_name,
|
||||||
BNXT_NAME_SIZE);
|
BNXT_NAME_SIZE);
|
||||||
}
|
}
|
||||||
|
@ -186,8 +186,8 @@ bnxt_create_tx_sysctls(struct bnxt_softc *softc, int txr)
|
|||||||
"discard_pkts", CTLFLAG_RD,
|
"discard_pkts", CTLFLAG_RD,
|
||||||
&tx_stats[txr].tx_discard_pkts, "discarded transmit packets");
|
&tx_stats[txr].tx_discard_pkts, "discarded transmit packets");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"drop_pkts", CTLFLAG_RD, &tx_stats[txr].tx_drop_pkts,
|
"error_pkts", CTLFLAG_RD, &tx_stats[txr].tx_error_pkts,
|
||||||
"dropped transmit packets");
|
"Error transmit packets");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"ucast_bytes", CTLFLAG_RD, &tx_stats[txr].tx_ucast_bytes,
|
"ucast_bytes", CTLFLAG_RD, &tx_stats[txr].tx_ucast_bytes,
|
||||||
"unicast bytes sent");
|
"unicast bytes sent");
|
||||||
@ -237,7 +237,7 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc)
|
|||||||
"Transmitted 512b 1023b frames");
|
"Transmitted 512b 1023b frames");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"tx_1024b_1518_frames", CTLFLAG_RD,
|
"tx_1024b_1518_frames", CTLFLAG_RD,
|
||||||
&softc->tx_port_stats->tx_1024b_1518_frames,
|
&softc->tx_port_stats->tx_1024b_1518b_frames,
|
||||||
"Transmitted 1024b 1518 frames");
|
"Transmitted 1024b 1518 frames");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"tx_good_vlan_frames", CTLFLAG_RD,
|
"tx_good_vlan_frames", CTLFLAG_RD,
|
||||||
@ -245,7 +245,7 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc)
|
|||||||
"Transmitted good vlan frames");
|
"Transmitted good vlan frames");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"tx_1519b_2047_frames", CTLFLAG_RD,
|
"tx_1519b_2047_frames", CTLFLAG_RD,
|
||||||
&softc->tx_port_stats->tx_1519b_2047_frames,
|
&softc->tx_port_stats->tx_1519b_2047b_frames,
|
||||||
"Transmitted 1519b 2047 frames");
|
"Transmitted 1519b 2047 frames");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"tx_2048b_4095b_frames", CTLFLAG_RD,
|
"tx_2048b_4095b_frames", CTLFLAG_RD,
|
||||||
@ -421,7 +421,7 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc)
|
|||||||
"Received 512b 1023b frames");
|
"Received 512b 1023b frames");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"rx_1024b_1518_frames", CTLFLAG_RD,
|
"rx_1024b_1518_frames", CTLFLAG_RD,
|
||||||
&softc->rx_port_stats->rx_1024b_1518_frames,
|
&softc->rx_port_stats->rx_1024b_1518b_frames,
|
||||||
"Received 1024b 1518 frames");
|
"Received 1024b 1518 frames");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"rx_good_vlan_frames", CTLFLAG_RD,
|
"rx_good_vlan_frames", CTLFLAG_RD,
|
||||||
@ -679,8 +679,8 @@ bnxt_create_rx_sysctls(struct bnxt_softc *softc, int rxr)
|
|||||||
"discard_pkts", CTLFLAG_RD,
|
"discard_pkts", CTLFLAG_RD,
|
||||||
&rx_stats[rxr].rx_discard_pkts, "discarded receive packets");
|
&rx_stats[rxr].rx_discard_pkts, "discarded receive packets");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"drop_pkts", CTLFLAG_RD, &rx_stats[rxr].rx_drop_pkts,
|
"error_pkts", CTLFLAG_RD, &rx_stats->rx_error_pkts,
|
||||||
"dropped receive packets");
|
"Error receive packets");
|
||||||
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||||
"ucast_bytes", CTLFLAG_RD, &rx_stats[rxr].rx_ucast_bytes,
|
"ucast_bytes", CTLFLAG_RD, &rx_stats[rxr].rx_ucast_bytes,
|
||||||
"unicast bytes received");
|
"unicast bytes received");
|
||||||
|
@ -128,8 +128,8 @@ bnxt_isc_txd_encap(void *sc, if_pkt_info_t pi)
|
|||||||
|
|
||||||
pi->ipi_new_pidx = RING_NEXT(txr, pi->ipi_new_pidx);
|
pi->ipi_new_pidx = RING_NEXT(txr, pi->ipi_new_pidx);
|
||||||
tbdh = &((struct tx_bd_long_hi *)txr->vaddr)[pi->ipi_new_pidx];
|
tbdh = &((struct tx_bd_long_hi *)txr->vaddr)[pi->ipi_new_pidx];
|
||||||
tbdh->mss = htole16(pi->ipi_tso_segsz);
|
tbdh->kid_or_ts_high_mss = htole16(pi->ipi_tso_segsz);
|
||||||
tbdh->hdr_size = htole16((pi->ipi_ehdrlen + pi->ipi_ip_hlen +
|
tbdh->kid_or_ts_low_hdr_size = htole16((pi->ipi_ehdrlen + pi->ipi_ip_hlen +
|
||||||
pi->ipi_tcp_hlen) >> 1);
|
pi->ipi_tcp_hlen) >> 1);
|
||||||
tbdh->cfa_action = 0;
|
tbdh->cfa_action = 0;
|
||||||
lflags = 0;
|
lflags = 0;
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user