bnxt_en: Updates for net-next
Michael Chan
maintainerv2 cover bnxt_en: Updates for net-next
The first patch is the FW interface update, followed by 3 patches to support the expanded pcie v2 structure for ethtool -d. The last patch adds a Hyper-V PCI ID for the 5760X chips (Thor2).
v2: Update Changelog for patch #2
v1: https://lore.kernel.org/netdev/[email protected]/
Michael Chan (1):
bnxt_en: hsi: Update FW interface to 1.10.3.133
Pavan Chebbi (1):
bnxt_en: Add Hyper-V VF ID
Shruti Parab (3):
bnxt_en: Refactor bnxt_get_regs()
bnxt_en: Add pcie_stat_len to struct bp
bnxt_en: Add pcie_ctx_v2 support for ethtool -d
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 + .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 84 +++-- include/linux/bnxt/hsi.h | 315 ++++++++++++++---- 4 files changed, 317 insertions(+), 89 deletions(-)
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH v2 1/5 bnxt_en: hsi: Update FW interface to 1.10.3.133
The major change is struct pcie_ctx_hw_stats_v2 which has new latency histograms added.
--- include/linux/bnxt/hsi.h | 315 +++++++++++++++++++++++++++++++-------- 1 file changed, 253 insertions(+), 62 deletions(-)
include/linux/bnxt/hsi.h +253 -62
@@ -276,6 +276,10 @@ struct cmd_nums {#define HWRM_REG_POWER_QUERY 0xe1UL#define HWRM_CORE_FREQUENCY_QUERY 0xe2UL#define HWRM_REG_POWER_HISTOGRAM 0xe3UL +#define HWRM_MONITOR_PAX_HISTOGRAM_START 0xe4UL +#define HWRM_MONITOR_PAX_HISTOGRAM_COLLECT 0xe5UL +#define HWRM_STAT_QUERY_ROCE_STATS 0xe6UL +#define HWRM_STAT_QUERY_ROCE_STATS_EXT 0xe7UL#define HWRM_WOL_FILTER_ALLOC 0xf0UL#define HWRM_WOL_FILTER_FREE 0xf1UL#define HWRM_WOL_FILTER_QCFG 0xf2UL
@@ -407,9 +411,8 @@ struct cmd_nums {#define HWRM_FUNC_LAG_UPDATE 0x1b1UL#define HWRM_FUNC_LAG_FREE 0x1b2UL#define HWRM_FUNC_LAG_QCFG 0x1b3UL -#define HWRM_FUNC_TIMEDTX_PACING_RATE_ADD 0x1c2UL -#define HWRM_FUNC_TIMEDTX_PACING_RATE_DELETE 0x1c3UL -#define HWRM_FUNC_TIMEDTX_PACING_RATE_QUERY 0x1c4UL +#define HWRM_FUNC_TTX_PACING_RATE_PROF_QUERY 0x1c3UL +#define HWRM_FUNC_TTX_PACING_RATE_QUERY 0x1c4UL#define HWRM_SELFTEST_QLIST 0x200UL#define HWRM_SELFTEST_EXEC 0x201UL#define HWRM_SELFTEST_IRQ 0x202UL
@@ -441,6 +444,7 @@ struct cmd_nums {#define HWRM_MFG_WRITE_CERT_NVM 0x21cUL#define HWRM_PORT_POE_CFG 0x230UL#define HWRM_PORT_POE_QCFG 0x231UL +#define HWRM_PORT_PHY_FDRSTAT 0x232UL#define HWRM_UDCC_QCAPS 0x258UL#define HWRM_UDCC_CFG 0x259UL#define HWRM_UDCC_QCFG 0x25aUL
@@ -453,6 +457,8 @@ struct cmd_nums {#define HWRM_QUEUE_PFCWD_TIMEOUT_QCAPS 0x261UL#define HWRM_QUEUE_PFCWD_TIMEOUT_CFG 0x262UL#define HWRM_QUEUE_PFCWD_TIMEOUT_QCFG 0x263UL +#define HWRM_QUEUE_ADPTV_QOS_RX_QCFG 0x264UL +#define HWRM_QUEUE_ADPTV_QOS_TX_QCFG 0x265UL#define HWRM_TF 0x2bcUL#define HWRM_TF_VERSION_GET 0x2bdUL#define HWRM_TF_SESSION_OPEN 0x2c6UL
@@ -551,6 +557,8 @@ struct cmd_nums {#define HWRM_DBG_COREDUMP_CAPTURE 0xff2cUL#define HWRM_DBG_PTRACE 0xff2dUL#define HWRM_DBG_SIM_CABLE_STATE 0xff2eUL +#define HWRM_DBG_TOKEN_QUERY_AUTH_IDS 0xff2fUL +#define HWRM_DBG_TOKEN_CFG 0xff30UL#define HWRM_NVM_GET_VPD_FIELD_INFO 0xffeaUL#define HWRM_NVM_SET_VPD_FIELD_INFO 0xffebUL#define HWRM_NVM_DEFRAG 0xffecUL
@@ -632,8 +640,8 @@ struct hwrm_err_output {#define HWRM_VERSION_MAJOR 1#define HWRM_VERSION_MINOR 10#define HWRM_VERSION_UPDATE 3 -#define HWRM_VERSION_RSVD 97 -#define HWRM_VERSION_STR "1.10.3.97" +#define HWRM_VERSION_RSVD 133 +#define HWRM_VERSION_STR "1.10.3.133"/* hwrm_ver_get_input (size:192b/24B) */ struct hwrm_ver_get_input {
@@ -688,6 +696,7 @@ struct hwrm_ver_get_output {#define VER_GET_RESP_DEV_CAPS_CFG_CFA_TRUFLOW_SUPPORTED 0x4000UL#define VER_GET_RESP_DEV_CAPS_CFG_SECURE_BOOT_CAPABLE 0x8000UL#define VER_GET_RESP_DEV_CAPS_CFG_SECURE_SOC_CAPABLE 0x10000UL +#define VER_GET_RESP_DEV_CAPS_CFG_DEBUG_TOKEN_SUPPORTED 0x20000ULu8 roce_fw_maj_8b;u8 roce_fw_min_8b;u8 roce_fw_bld_8b;
@@ -872,7 +881,8 @@ struct hwrm_async_event_cmpl {#define ASYNC_EVENT_CMPL_EVENT_ID_REPRESENTOR_PAIR_CHANGE 0x4eUL#define ASYNC_EVENT_CMPL_EVENT_ID_VF_STAT_CHANGE 0x4fUL#define ASYNC_EVENT_CMPL_EVENT_ID_HOST_COREDUMP 0x50UL -#define ASYNC_EVENT_CMPL_EVENT_ID_MAX_RGTR_EVENT_ID 0x51UL +#define ASYNC_EVENT_CMPL_EVENT_ID_ADPTV_QOS 0x51UL +#define ASYNC_EVENT_CMPL_EVENT_ID_MAX_RGTR_EVENT_ID 0x52UL#define ASYNC_EVENT_CMPL_EVENT_ID_FW_TRACE_MSG 0xfeUL#define ASYNC_EVENT_CMPL_EVENT_ID_HWRM_ERROR 0xffUL#define ASYNC_EVENT_CMPL_EVENT_ID_LAST ASYNC_EVENT_CMPL_EVENT_ID_HWRM_ERROR
@@ -1344,7 +1354,8 @@ struct hwrm_async_event_cmpl_dbg_buf_producer {#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_CA2_TRACE 0x9UL#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_RIGP1_TRACE 0xaUL#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_AFM_KONG_HWRM_TRACE 0xbUL -#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_LAST ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_AFM_KONG_HWRM_TRACE +#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_ERR_QPC_TRACE 0xcUL +#define ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_LAST ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_ERR_QPC_TRACE };/* hwrm_async_event_cmpl_hwrm_error (size:128b/16B) */
@@ -1401,7 +1412,11 @@ struct hwrm_async_event_cmpl_error_report_base {#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DOORBELL_DROP_THRESHOLD 0x4UL#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_THERMAL_THRESHOLD 0x5UL#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DUAL_DATA_RATE_NOT_SUPPORTED 0x6UL -#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_LAST ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DUAL_DATA_RATE_NOT_SUPPORTED +#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DUP_UDCC_SES 0x7UL +#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DB_DROP 0x8UL +#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_MD_TEMP 0x9UL +#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_VNIC_ERR 0xaUL +#define ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_LAST ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_VNIC_ERR };/* hwrm_async_event_cmpl_error_report_pause_storm (size:128b/16B) */
@@ -1914,6 +1929,12 @@ struct hwrm_func_qcaps_output {#define FUNC_QCAPS_RESP_FLAGS_EXT3_RX_RATE_PROFILE_SEL_SUPPORTED 0x8UL#define FUNC_QCAPS_RESP_FLAGS_EXT3_BIDI_OPT_SUPPORTED 0x10UL#define FUNC_QCAPS_RESP_FLAGS_EXT3_MIRROR_ON_ROCE_SUPPORTED 0x20UL +#define FUNC_QCAPS_RESP_FLAGS_EXT3_ROCE_VF_DYN_ALLOC_SUPPORT 0x40UL +#define FUNC_QCAPS_RESP_FLAGS_EXT3_CHANGE_UDP_SRCPORT_SUPPORT 0x80UL +#define FUNC_QCAPS_RESP_FLAGS_EXT3_PCIE_COMPLIANCE_SUPPORTED 0x100UL +#define FUNC_QCAPS_RESP_FLAGS_EXT3_MULTI_L2_DB_SUPPORTED 0x200UL +#define FUNC_QCAPS_RESP_FLAGS_EXT3_PCIE_SECURE_ATS_SUPPORTED 0x400UL +#define FUNC_QCAPS_RESP_FLAGS_EXT3_MBUF_STATS_SUPPORTED 0x800UL__le16 max_roce_vfs;__le16 max_crypto_rx_flow_filters;u8 unused_3[3 ];
@@ -1931,7 +1952,7 @@ struct hwrm_func_qcfg_input {u8 unused_0[6 ]; }; -/* hwrm_func_qcfg_output (size:1344b/168B) */ +/* hwrm_func_qcfg_output (size:1408b/176B) */ struct hwrm_func_qcfg_output {__le16 error_code;__le16 req_type;
@@ -2124,7 +2145,43 @@ struct hwrm_func_qcfg_output {#define FUNC_QCFG_RESP_XID_PARTITION_CFG_TX_CK 0x1UL#define FUNC_QCFG_RESP_XID_PARTITION_CFG_RX_CK 0x2UL__le16 mirror_vnic_id; -u8 unused_7[7 ]; +u8 max_link_width; +#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_UNKNOWN 0x0UL +#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X1 0x1UL +#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X2 0x2UL +#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X4 0x4UL +#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X8 0x8UL +#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_X16 0x10UL +#define FUNC_QCFG_RESP_MAX_LINK_WIDTH_LAST FUNC_QCFG_RESP_MAX_LINK_WIDTH_X16 +u8 max_link_speed; +#define FUNC_QCFG_RESP_MAX_LINK_SPEED_UNKNOWN 0x0UL +#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G1 0x1UL +#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G2 0x2UL +#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G3 0x3UL +#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G4 0x4UL +#define FUNC_QCFG_RESP_MAX_LINK_SPEED_G5 0x5UL +#define FUNC_QCFG_RESP_MAX_LINK_SPEED_LAST FUNC_QCFG_RESP_MAX_LINK_SPEED_G5 +u8 negotiated_link_width; +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_UNKNOWN 0x0UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X1 0x1UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X2 0x2UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X4 0x4UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X8 0x8UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X16 0x10UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_LAST FUNC_QCFG_RESP_NEGOTIATED_LINK_WIDTH_X16 +u8 negotiated_link_speed; +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_UNKNOWN 0x0UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G1 0x1UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G2 0x2UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G3 0x3UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G4 0x4UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G5 0x5UL +#define FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_LAST FUNC_QCFG_RESP_NEGOTIATED_LINK_SPEED_G5 +u8 unused_7[2 ]; +u8 pcie_compliance; +u8 unused_8; +__le16 l2_db_multi_page_size_kb; +u8 unused_9[5 ];u8 valid; };
@@ -2322,6 +2379,7 @@ struct hwrm_func_cfg_input {#define FUNC_CFG_REQ_ENABLES2_ROCE_MAX_GID_PER_VF 0x200UL#define FUNC_CFG_REQ_ENABLES2_XID_PARTITION_CFG 0x400UL#define FUNC_CFG_REQ_ENABLES2_PHYSICAL_SLOT_NUMBER 0x800UL +#define FUNC_CFG_REQ_ENABLES2_PCIE_COMPLIANCE 0x1000ULu8 port_kdnet_mode;#define FUNC_CFG_REQ_PORT_KDNET_MODE_DISABLED 0x0UL#define FUNC_CFG_REQ_PORT_KDNET_MODE_ENABLED 0x1UL
@@ -2353,7 +2411,8 @@ struct hwrm_func_cfg_input {__le16 xid_partition_cfg;#define FUNC_CFG_REQ_XID_PARTITION_CFG_TX_CK 0x1UL#define FUNC_CFG_REQ_XID_PARTITION_CFG_RX_CK 0x2UL -__le16 unused_2; +u8 pcie_compliance; +u8 unused_2; };/* hwrm_func_cfg_output (size:128b/16B) */
@@ -2370,11 +2429,41 @@ struct hwrm_func_cfg_output {struct hwrm_func_cfg_cmd_err {u8 code;#define FUNC_CFG_CMD_ERR_CODE_UNKNOWN 0x0UL -#define FUNC_CFG_CMD_ERR_CODE_PARTITION_MIN_BW_RANGE 0x1UL -#define FUNC_CFG_CMD_ERR_CODE_PARTITION_MIN_MORE_THAN_MAX 0x2UL -#define FUNC_CFG_CMD_ERR_CODE_PARTITION_MIN_BW_UNSUPPORTED 0x3UL -#define FUNC_CFG_CMD_ERR_CODE_PARTITION_BW_PERCENT 0x4UL -#define FUNC_CFG_CMD_ERR_CODE_LAST FUNC_CFG_CMD_ERR_CODE_PARTITION_BW_PERCENT +#define FUNC_CFG_CMD_ERR_CODE_PARTITION_BW_OUT_OF_RANGE 0x1UL +#define FUNC_CFG_CMD_ERR_CODE_NPAR_PARTITION_DOWN_FAILED 0x2UL +#define FUNC_CFG_CMD_ERR_CODE_TPID_SET_DFLT_VLAN_NOT_SET 0x3UL +#define FUNC_CFG_CMD_ERR_CODE_RES_ARRAY_ALLOC_FAILED 0x4UL +#define FUNC_CFG_CMD_ERR_CODE_TX_RING_ASSET_TEST_FAILED 0x5UL +#define FUNC_CFG_CMD_ERR_CODE_TX_RING_RES_UPDATE_FAILED 0x6UL +#define FUNC_CFG_CMD_ERR_CODE_APPLY_MAX_BW_FAILED 0x7UL +#define FUNC_CFG_CMD_ERR_CODE_ENABLE_EVB_FAILED 0x8UL +#define FUNC_CFG_CMD_ERR_CODE_RSS_CTXT_ASSET_TEST_FAILED 0x9UL +#define FUNC_CFG_CMD_ERR_CODE_RSS_CTXT_RES_UPDATE_FAILED 0xaUL +#define FUNC_CFG_CMD_ERR_CODE_CMPL_RING_ASSET_TEST_FAILED 0xbUL +#define FUNC_CFG_CMD_ERR_CODE_CMPL_RING_RES_UPDATE_FAILED 0xcUL +#define FUNC_CFG_CMD_ERR_CODE_NQ_ASSET_TEST_FAILED 0xdUL +#define FUNC_CFG_CMD_ERR_CODE_NQ_RES_UPDATE_FAILED 0xeUL +#define FUNC_CFG_CMD_ERR_CODE_RX_RING_ASSET_TEST_FAILED 0xfUL +#define FUNC_CFG_CMD_ERR_CODE_RX_RING_RES_UPDATE_FAILED 0x10UL +#define FUNC_CFG_CMD_ERR_CODE_VNIC_ASSET_TEST_FAILED 0x11UL +#define FUNC_CFG_CMD_ERR_CODE_VNIC_RES_UPDATE_FAILED 0x12UL +#define FUNC_CFG_CMD_ERR_CODE_FAILED_TO_START_STATS_THREAD 0x13UL +#define FUNC_CFG_CMD_ERR_CODE_RDMA_SRIOV_DISABLED 0x14UL +#define FUNC_CFG_CMD_ERR_CODE_TX_KTLS_DISABLED 0x15UL +#define FUNC_CFG_CMD_ERR_CODE_TX_KTLS_ASSET_TEST_FAILED 0x16UL +#define FUNC_CFG_CMD_ERR_CODE_TX_KTLS_RES_UPDATE_FAILED 0x17UL +#define FUNC_CFG_CMD_ERR_CODE_RX_KTLS_DISABLED 0x18UL +#define FUNC_CFG_CMD_ERR_CODE_RX_KTLS_ASSET_TEST_FAILED 0x19UL +#define FUNC_CFG_CMD_ERR_CODE_RX_KTLS_RES_UPDATE_FAILED 0x1aUL +#define FUNC_CFG_CMD_ERR_CODE_TX_QUIC_DISABLED 0x1bUL +#define FUNC_CFG_CMD_ERR_CODE_TX_QUIC_ASSET_TEST_FAILED 0x1cUL +#define FUNC_CFG_CMD_ERR_CODE_TX_QUIC_RES_UPDATE_FAILED 0x1dUL +#define FUNC_CFG_CMD_ERR_CODE_RX_QUIC_DISABLED 0x1eUL +#define FUNC_CFG_CMD_ERR_CODE_RX_QUIC_ASSET_TEST_FAILED 0x1fUL +#define FUNC_CFG_CMD_ERR_CODE_RX_QUIC_RES_UPDATE_FAILED 0x20UL +#define FUNC_CFG_CMD_ERR_CODE_INVALID_KDNET_MODE 0x21UL +#define FUNC_CFG_CMD_ERR_CODE_SCHQ_CFG_FAIL 0x22UL +#define FUNC_CFG_CMD_ERR_CODE_LAST FUNC_CFG_CMD_ERR_CODE_SCHQ_CFG_FAILu8 unused_0[7 ]; };
@@ -3780,6 +3869,7 @@ struct hwrm_func_backing_store_cfg_v2_input {#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_CA2_TRACE 0x28UL#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_RIGP1_TRACE 0x29UL#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL +#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_ERR_QPC_TRACE 0x2bUL#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_INVALID 0xffffUL#define FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_LAST FUNC_BACKING_STORE_CFG_V2_REQ_TYPE_INVALID__le16 instance;
@@ -3865,6 +3955,7 @@ struct hwrm_func_backing_store_qcfg_v2_input {#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_CA2_TRACE 0x28UL#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_RIGP1_TRACE 0x29UL#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL +#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_ERR_QPC_TRACE 0x2bUL#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_INVALID 0xffffUL#define FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_LAST FUNC_BACKING_STORE_QCFG_V2_REQ_TYPE_INVALID__le16 instance;
@@ -3904,6 +3995,7 @@ struct hwrm_func_backing_store_qcfg_v2_output {#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CA1_TRACE 0x27UL#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_CA2_TRACE 0x28UL#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_RIGP1_TRACE 0x29UL +#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_ERR_QPC_TRACE 0x2aUL#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_INVALID 0xffffUL#define FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_LAST FUNC_BACKING_STORE_QCFG_V2_RESP_TYPE_INVALID__le16 instance;
@@ -4027,6 +4119,7 @@ struct hwrm_func_backing_store_qcaps_v2_input {#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CA2_TRACE 0x28UL#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RIGP1_TRACE 0x29UL#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL +#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_ERR_QPC_TRACE 0x2bUL#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_INVALID 0xffffUL#define FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_LAST FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_INVALIDu8 rsvd[6 ];
@@ -4070,6 +4163,7 @@ struct hwrm_func_backing_store_qcaps_v2_output {#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_CA2_TRACE 0x28UL#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_RIGP1_TRACE 0x29UL#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_AFM_KONG_HWRM_TRACE 0x2aUL +#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_ERR_QPC_TRACE 0x2bUL#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_INVALID 0xffffUL#define FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_LAST FUNC_BACKING_STORE_QCAPS_V2_RESP_TYPE_INVALID__le16 entry_size;
@@ -4216,6 +4310,10 @@ struct hwrm_port_phy_cfg_input {#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_1XN_DISABLE 0x100000UL#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_IEEE_ENABLE 0x200000UL#define PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_IEEE_DISABLE 0x400000UL +#define PORT_PHY_CFG_REQ_FLAGS_LINK_TRAINING_ENABLE 0x800000UL +#define PORT_PHY_CFG_REQ_FLAGS_LINK_TRAINING_DISABLE 0x1000000UL +#define PORT_PHY_CFG_REQ_FLAGS_PRECODING_ENABLE 0x2000000UL +#define PORT_PHY_CFG_REQ_FLAGS_PRECODING_DISABLE 0x4000000UL__le32 enables;#define PORT_PHY_CFG_REQ_ENABLES_AUTO_MODE 0x1UL#define PORT_PHY_CFG_REQ_ENABLES_AUTO_DUPLEX 0x2UL
@@ -4703,6 +4801,8 @@ struct hwrm_port_phy_qcfg_output {#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_MEDIA_AUTO_DETECT 0x1UL#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_SIGNAL_MODE_KNOWN 0x2UL#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_SPEEDS2_SUPPORTED 0x4UL +#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_LINK_TRAINING 0x8UL +#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_PRECODING 0x10ULchar phy_vendor_name[16 ];char phy_vendor_partnumber[16 ];__le16 support_pam4_speeds;
@@ -4725,6 +4825,10 @@ struct hwrm_port_phy_qcfg_output {u8 link_down_reason;#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_RF 0x1UL#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_OTP_SPEED_VIOLATION 0x2UL +#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_CABLE_REMOVED 0x4UL +#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_MODULE_FAULT 0x8UL +#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_BMC_REQUEST 0x10UL +#define PORT_PHY_QCFG_RESP_LINK_DOWN_REASON_TX_LASER_DISABLED 0x20UL__le16 support_speeds2;#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_1GB 0x1UL#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_10GB 0x2UL
@@ -5882,9 +5986,10 @@ struct hwrm_port_led_qcaps_output {#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_BLINK_SUPPORTED 0x8UL#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_BLINK_ALT_SUPPORTED 0x10UL__le16 led0_color_caps; -#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_RSVD 0x1UL -#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_AMBER_SUPPORTED 0x2UL -#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_RSVD 0x1UL +#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_AMBER_SUPPORTED 0x2UL +#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_GRNAMB_SUPPORTED 0x8ULu8 led1_id;u8 led1_type;#define PORT_LED_QCAPS_RESP_LED1_TYPE_SPEED 0x0UL
@@ -5900,9 +6005,10 @@ struct hwrm_port_led_qcaps_output {#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_BLINK_SUPPORTED 0x8UL#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_BLINK_ALT_SUPPORTED 0x10UL__le16 led1_color_caps; -#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_RSVD 0x1UL -#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_AMBER_SUPPORTED 0x2UL -#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_RSVD 0x1UL +#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_AMBER_SUPPORTED 0x2UL +#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_GRNAMB_SUPPORTED 0x8ULu8 led2_id;u8 led2_type;#define PORT_LED_QCAPS_RESP_LED2_TYPE_SPEED 0x0UL
@@ -5918,9 +6024,10 @@ struct hwrm_port_led_qcaps_output {#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_BLINK_SUPPORTED 0x8UL#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_BLINK_ALT_SUPPORTED 0x10UL__le16 led2_color_caps; -#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_RSVD 0x1UL -#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_AMBER_SUPPORTED 0x2UL -#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_RSVD 0x1UL +#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_AMBER_SUPPORTED 0x2UL +#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_GRNAMB_SUPPORTED 0x8ULu8 led3_id;u8 led3_type;#define PORT_LED_QCAPS_RESP_LED3_TYPE_SPEED 0x0UL
@@ -5936,9 +6043,10 @@ struct hwrm_port_led_qcaps_output {#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_BLINK_SUPPORTED 0x8UL#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_BLINK_ALT_SUPPORTED 0x10UL__le16 led3_color_caps; -#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_RSVD 0x1UL -#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_AMBER_SUPPORTED 0x2UL -#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_RSVD 0x1UL +#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_AMBER_SUPPORTED 0x2UL +#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_GREEN_SUPPORTED 0x4UL +#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_GRNAMB_SUPPORTED 0x8ULu8 unused_4[3 ];u8 valid; };
@@ -7036,9 +7144,22 @@ struct hwrm_vnic_rss_cfg_output {/* hwrm_vnic_rss_cfg_cmd_err (size:64b/8B) */ struct hwrm_vnic_rss_cfg_cmd_err {u8 code; -#define VNIC_RSS_CFG_CMD_ERR_CODE_UNKNOWN 0x0UL -#define VNIC_RSS_CFG_CMD_ERR_CODE_INTERFACE_NOT_READY 0x1UL -#define VNIC_RSS_CFG_CMD_ERR_CODE_LAST VNIC_RSS_CFG_CMD_ERR_CODE_INTERFACE_NOT_READY +#define VNIC_RSS_CFG_CMD_ERR_CODE_UNKNOWN 0x0UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_INTERFACE_NOT_READY 0x1UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_UNABLE_TO_GET_RSS_CFG 0x2UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_TYPE_UNSUPPORTED 0x3UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_TYPE_ERR 0x4UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_MODE_FAIL 0x5UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_RING_GRP_TABLE_ALLOC_ERR 0x6UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_HASH_KEY_ALLOC_ERR 0x7UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_DMA_FAILED 0x8UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_RX_RING_ALLOC_ERR 0x9UL +#define VNIC_RSS_CFG_CMD_ERR_CODE_CMPL_RING_ALLOC_ERR 0xaUL +#define VNIC_RSS_CFG_CMD_ERR_CODE_HW_SET_RSS_FAILED 0xbUL +#define VNIC_RSS_CFG_CMD_ERR_CODE_CTX_INVALID 0xcUL +#define VNIC_RSS_CFG_CMD_ERR_CODE_VNIC_INVALID 0xdUL +#define VNIC_RSS_CFG_CMD_ERR_CODE_VNIC_RING_TABLE_PAIR_INVALID 0xeUL +#define VNIC_RSS_CFG_CMD_ERR_CODE_LAST VNIC_RSS_CFG_CMD_ERR_CODE_VNIC_RING_TABLE_PAIR_INVALIDu8 unused_0[7 ]; };
@@ -7177,7 +7298,7 @@ struct hwrm_vnic_rss_cos_lb_ctx_free_output {u8 valid; }; -/* hwrm_ring_alloc_input (size:704b/88B) */ +/* hwrm_ring_alloc_input (size:768b/96B) */ struct hwrm_ring_alloc_input {__le16 req_type;__le16 cmpl_ring;
@@ -7195,6 +7316,7 @@ struct hwrm_ring_alloc_input {#define RING_ALLOC_REQ_ENABLES_MPC_CHNLS_TYPE 0x400UL#define RING_ALLOC_REQ_ENABLES_STEERING_TAG_VALID 0x800UL#define RING_ALLOC_REQ_ENABLES_RX_RATE_PROFILE_VALID 0x1000UL +#define RING_ALLOC_REQ_ENABLES_DPI_VALID 0x2000ULu8 ring_type;#define RING_ALLOC_REQ_RING_TYPE_L2_CMPL 0x0UL#define RING_ALLOC_REQ_RING_TYPE_TX 0x1UL
@@ -7287,6 +7409,8 @@ struct hwrm_ring_alloc_input {#define RING_ALLOC_REQ_RX_RATE_PROFILE_SEL_LAST RING_ALLOC_REQ_RX_RATE_PROFILE_SEL_POLL_MODEu8 unused_4;__le64 cq_handle; +__le16 dpi; +__le16 unused_5[3 ]; };/* hwrm_ring_alloc_output (size:128b/16B) */
@@ -7776,7 +7900,10 @@ struct hwrm_cfa_l2_set_rx_mask_cmd_err {u8 code;#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_UNKNOWN 0x0UL#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_NTUPLE_FILTER_CONFLICT_ERR 0x1UL -#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_LAST CFA_L2_SET_RX_MASK_CMD_ERR_CODE_NTUPLE_FILTER_CONFLICT_ERR +#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_MAX_VLAN_TAGS 0x2UL +#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_INVALID_VNIC_ID 0x3UL +#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_INVALID_ACTION 0x4UL +#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_LAST CFA_L2_SET_RX_MASK_CMD_ERR_CODE_INVALID_ACTIONu8 unused_0[7 ]; };
@@ -8109,9 +8236,38 @@ struct hwrm_cfa_ntuple_filter_alloc_output {/* hwrm_cfa_ntuple_filter_alloc_cmd_err (size:64b/8B) */ struct hwrm_cfa_ntuple_filter_alloc_cmd_err {u8 code; -#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_UNKNOWN 0x0UL -#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_RX_MASK_VLAN_CONFLICT_ERR 0x1UL -#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_LAST CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_RX_MASK_VLAN_CONFLICT_ERR +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_UNKNOWN 0x0UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ZERO_MAC 0x65UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_BC_MC_MAC 0x66UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_VNIC 0x67UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_PF_FID 0x68UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_L2_CTXT_ID 0x69UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_NULL_L2_CTXT_CFG 0x6aUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_NULL_L2_DATA_FLD 0x6bUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_CFA_LAYOUT 0x6cUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L2_CTXT_ALLOC_FAIL 0x6dUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ROCE_FLOW_ERR 0x6eUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_OWNER_FID 0x6fUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ZERO_REF_CNT 0x70UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_FLOW_TYPE 0x71UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_IVLAN 0x72UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_MAX_VLAN_ID 0x73UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_TNL_REQ 0x74UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L2_ADDR 0x75UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L2_IVLAN 0x76UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L3_ADDR 0x77UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_L3_ADDR_TYPE 0x78UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_T_L3_ADDR_TYPE 0x79UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_DST_VNIC_ID 0x7aUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_VNI 0x7bUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_DST_ID 0x7cUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_FAIL_ROCE_L2_FLOW 0x7dUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_NPAR_VLAN 0x7eUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_ATSP_ADD 0x7fUL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_DFLT_VLAN_FAIL 0x80UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_INVALID_L3_TYPE 0x81UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_VAL_FAIL_TNL_FLOW 0x82UL +#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_LAST CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_VAL_FAIL_TNL_FLOWu8 unused_0[7 ]; };
@@ -9181,7 +9337,7 @@ struct pcie_ctx_hw_stats {__le64 pcie_recovery_histogram; }; -/* pcie_ctx_hw_stats_v2 (size:4096b/512B) */ +/* pcie_ctx_hw_stats_v2 (size:4544b/568B) */ struct pcie_ctx_hw_stats_v2 {__le64 pcie_pl_signal_integrity;__le64 pcie_dl_signal_integrity;
@@ -9212,6 +9368,9 @@ struct pcie_ctx_hw_stats_v2 {__le64 pcie_other_packet_count;__le64 pcie_blocked_packet_count;__le64 pcie_cmpl_packet_count; +__le32 pcie_rd_latency_histogram[12 ]; +__le32 pcie_rd_latency_all_normal_count; +__le32 unused_2; };/* hwrm_stat_generic_qstats_input (size:256b/32B) */
@@ -9406,7 +9565,8 @@ struct hwrm_struct_hdr {#define STRUCT_HDR_STRUCT_ID_MSIX_PER_VF 0xc8UL#define STRUCT_HDR_STRUCT_ID_UDCC_RTT_BUCKET_COUNT 0x12cUL#define STRUCT_HDR_STRUCT_ID_UDCC_RTT_BUCKET_BOUND 0x12dUL -#define STRUCT_HDR_STRUCT_ID_LAST STRUCT_HDR_STRUCT_ID_UDCC_RTT_BUCKET_BOUND +#define STRUCT_HDR_STRUCT_ID_DBG_TOKEN_CLAIMS 0x190UL +#define STRUCT_HDR_STRUCT_ID_LAST STRUCT_HDR_STRUCT_ID_DBG_TOKEN_CLAIMS__le16 len;u8 version;#define STRUCT_HDR_VERSION_0 0x0UL
@@ -9459,11 +9619,13 @@ struct hwrm_fw_set_structured_data_output {/* hwrm_fw_set_structured_data_cmd_err (size:64b/8B) */ struct hwrm_fw_set_structured_data_cmd_err {u8 code; -#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_UNKNOWN 0x0UL -#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_HDR_CNT 0x1UL -#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_FMT 0x2UL -#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID 0x3UL -#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_LAST FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID +#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_UNKNOWN 0x0UL +#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_HDR_CNT 0x1UL +#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_FMT 0x2UL +#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID 0x3UL +#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_ALREADY_ADDED 0x4UL +#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_INST_IN_PROG 0x5UL +#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_LAST FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_INST_IN_PROGu8 unused_0[7 ]; };
@@ -9487,7 +9649,9 @@ struct hwrm_fw_get_structured_data_input {#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_PEER 0x201UL#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_OPERATIONAL 0x202UL#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_HOST_OPERATIONAL 0x300UL -#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_LAST FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_HOST_OPERATIONAL +#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_CLAIMS_SUPPORTED 0x320UL +#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_CLAIMS_ACTIVE 0x321UL +#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_LAST FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_CLAIMS_ACTIVEu8 count;u8 unused_0; };
@@ -10172,7 +10336,8 @@ struct hwrm_dbg_log_buffer_flush_input {#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CA2_TRACE 0x9UL#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_RIGP1_TRACE 0xaUL#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_AFM_KONG_HWRM_TRACE 0xbUL -#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_LAST DBG_LOG_BUFFER_FLUSH_REQ_TYPE_AFM_KONG_HWRM_TRACE +#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_ERR_QPC_TRACE 0xcUL +#define DBG_LOG_BUFFER_FLUSH_REQ_TYPE_LAST DBG_LOG_BUFFER_FLUSH_REQ_TYPE_ERR_QPC_TRACEu8 unused_1[2 ];__le32 flags;#define DBG_LOG_BUFFER_FLUSH_REQ_FLAGS_FLUSH_ALL_BUFFERS 0x1UL
@@ -10295,10 +10460,15 @@ struct hwrm_nvm_write_output {/* hwrm_nvm_write_cmd_err (size:64b/8B) */ struct hwrm_nvm_write_cmd_err {u8 code; -#define NVM_WRITE_CMD_ERR_CODE_UNKNOWN 0x0UL -#define NVM_WRITE_CMD_ERR_CODE_FRAG_ERR 0x1UL -#define NVM_WRITE_CMD_ERR_CODE_NO_SPACE 0x2UL -#define NVM_WRITE_CMD_ERR_CODE_LAST NVM_WRITE_CMD_ERR_CODE_NO_SPACE +#define NVM_WRITE_CMD_ERR_CODE_UNKNOWN 0x0UL +#define NVM_WRITE_CMD_ERR_CODE_FRAG_ERR 0x1UL +#define NVM_WRITE_CMD_ERR_CODE_NO_SPACE 0x2UL +#define NVM_WRITE_CMD_ERR_CODE_WRITE_FAILED 0x3UL +#define NVM_WRITE_CMD_ERR_CODE_REQD_ERASE_FAILED 0x4UL +#define NVM_WRITE_CMD_ERR_CODE_VERIFY_FAILED 0x5UL +#define NVM_WRITE_CMD_ERR_CODE_INVALID_HEADER 0x6UL +#define NVM_WRITE_CMD_ERR_CODE_UPDATE_DIGEST_FAILED 0x7UL +#define NVM_WRITE_CMD_ERR_CODE_LAST NVM_WRITE_CMD_ERR_CODE_UPDATE_DIGEST_FAILEDu8 unused_0[7 ]; };
@@ -10438,7 +10608,11 @@ struct hwrm_nvm_get_dev_info_output {__le16 srt2_fw_minor;__le16 srt2_fw_build;__le16 srt2_fw_patch; -u8 unused_0[7 ]; +u8 security_soc_fw_major; +u8 security_soc_fw_minor; +u8 security_soc_fw_build; +u8 security_soc_fw_patch; +u8 unused_0[3 ];u8 valid; };
@@ -10568,7 +10742,9 @@ struct hwrm_nvm_install_update_cmd_err {#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_SPACE 0x2UL#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_ANTI_ROLLBACK 0x3UL#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_VOLTREG_SUPPORT 0x4UL -#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_LAST NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_VOLTREG_SUPPORT +#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_DEFRAG_FAILED 0x5UL +#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_UNKNOWN_DIR_ERR 0x6UL +#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_LAST NVM_INSTALL_UPDATE_CMD_ERR_CODE_UNKNOWN_DIR_ERRu8 unused_0[7 ]; };
@@ -10591,7 +10767,8 @@ struct hwrm_nvm_get_variable_input {__le16 index_2;__le16 index_3;u8 flags; -#define NVM_GET_VARIABLE_REQ_FLAGS_FACTORY_DFLT 0x1UL +#define NVM_GET_VARIABLE_REQ_FLAGS_FACTORY_DFLT 0x1UL +#define NVM_GET_VARIABLE_REQ_FLAGS_VALIDATE_OPT_VALUE 0x2ULu8 unused_0; };
@@ -10606,18 +10783,25 @@ struct hwrm_nvm_get_variable_output {#define NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_0 0x0UL#define NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_FFFF 0xffffUL#define NVM_GET_VARIABLE_RESP_OPTION_NUM_LAST NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_FFFF -u8 unused_0[3 ]; +u8 flags; +#define NVM_GET_VARIABLE_RESP_FLAGS_VALIDATE_OPT_VALUE 0x1UL +u8 unused_0[2 ];u8 valid; };/* hwrm_nvm_get_variable_cmd_err (size:64b/8B) */ struct hwrm_nvm_get_variable_cmd_err {u8 code; -#define NVM_GET_VARIABLE_CMD_ERR_CODE_UNKNOWN 0x0UL -#define NVM_GET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST 0x1UL -#define NVM_GET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR 0x2UL -#define NVM_GET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT 0x3UL -#define NVM_GET_VARIABLE_CMD_ERR_CODE_LAST NVM_GET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT +#define NVM_GET_VARIABLE_CMD_ERR_CODE_UNKNOWN 0x0UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST 0x1UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR 0x2UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT 0x3UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_INDEX_INVALID 0x4UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_ACCESS_DENIED 0x5UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_CB_FAILED 0x6UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_INVALID_DATA_LEN 0x7UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_NO_MEM 0x8UL +#define NVM_GET_VARIABLE_CMD_ERR_CODE_LAST NVM_GET_VARIABLE_CMD_ERR_CODE_NO_MEMu8 unused_0[7 ]; };
@@ -10667,10 +10851,17 @@ struct hwrm_nvm_set_variable_output {/* hwrm_nvm_set_variable_cmd_err (size:64b/8B) */ struct hwrm_nvm_set_variable_cmd_err {u8 code; -#define NVM_SET_VARIABLE_CMD_ERR_CODE_UNKNOWN 0x0UL -#define NVM_SET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST 0x1UL -#define NVM_SET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR 0x2UL -#define NVM_SET_VARIABLE_CMD_ERR_CODE_LAST NVM_SET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR +#define NVM_SET_VARIABLE_CMD_ERR_CODE_UNKNOWN 0x0UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST 0x1UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR 0x2UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT 0x3UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_ACTION_NOT_SUPPORTED 0x4UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_INDEX_INVALID 0x5UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_ACCESS_DENIED 0x6UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_CB_FAILED 0x7UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_INVALID_DATA_LEN 0x8UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_NO_MEM 0x9UL +#define NVM_SET_VARIABLE_CMD_ERR_CODE_LAST NVM_SET_VARIABLE_CMD_ERR_CODE_NO_MEMu8 unused_0[7 ]; };
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH v2 2/5 bnxt_en: Refactor bnxt_get_regs()
In reply to Michael ChanFrom: Shruti Parab <[email protected]>
Separate the code that sends the FW message to retrieve pcie stats into a new helper function. The caller of the helper will call hwrm_req_hold() beforehand and so the caller will call hwrm_req_drop() in all cases afterwards. This helper will be useful when adding the support for the larger struct pcie_ctx_hw_stats_v2.
---
v2: Update Changelog
v1: https://lore.kernel.org/netdev/[email protected]/
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +25 -18
@@ -2074,6 +2074,25 @@ static int bnxt_get_regs_len(struct net_device *dev)return reg_len; } +static void * +__bnxt_hwrm_pcie_qstats (struct bnxt *bp,struct hwrm_pcie_qstats_input *req) +{ +struct pcie_ctx_hw_stats_v2 *hw_pcie_stats; +dma_addr_t hw_pcie_stats_addr; +int rc; + + hw_pcie_stats =hwrm_req_dma_slice (bp, req,sizeof (*hw_pcie_stats), + &hw_pcie_stats_addr); +if (!hw_pcie_stats) +return NULL ; + + req->pcie_stat_size =cpu_to_le16 (sizeof (*hw_pcie_stats)); + req->pcie_stat_host_addr =cpu_to_le64 (hw_pcie_stats_addr); + rc =hwrm_req_send (bp, req); + +return rc ?NULL : hw_pcie_stats; +} +#define BNXT_PCIE_32B_ENTRY (start, end) \ { offsetof(struct pcie_ctx_hw_stats, start), \ offsetof(struct pcie_ctx_hw_stats, end) }
@@ -2088,11 +2107,9 @@ static const struct {static void bnxt_get_regs (struct net_device *dev,struct ethtool_regs *regs,void *_p) { -struct pcie_ctx_hw_stats *hw_pcie_stats;struct hwrm_pcie_qstats_input *req;struct bnxt *bp =netdev_priv (dev); -dma_addr_t hw_pcie_stats_addr; -int rc; +u8 *src; regs->version =0 ;if (!(bp->fw_dbg_cap &DBG_QCAPS_RESP_FLAGS_REG_ACCESS_RESTRICTED ))
@@ -2104,24 +2121,14 @@ static void bnxt_get_regs(struct net_device *dev, struct ethtool_regs *regs,if (hwrm_req_init (bp, req,HWRM_PCIE_QSTATS ))return ; - hw_pcie_stats =hwrm_req_dma_slice (bp, req,sizeof (*hw_pcie_stats), - &hw_pcie_stats_addr); -if (!hw_pcie_stats) { -hwrm_req_drop (bp, req); -return ; - } - - regs->version =1 ; -hwrm_req_hold (bp, req);/* hold on to slice */ - req->pcie_stat_size =cpu_to_le16 (sizeof (*hw_pcie_stats)); - req->pcie_stat_host_addr =cpu_to_le64 (hw_pcie_stats_addr); - rc =hwrm_req_send (bp, req); -if (!rc) { +hwrm_req_hold (bp, req); + src =__bnxt_hwrm_pcie_qstats (bp, req); +if (src) {u8 *dst = (u8 *)(_p +BNXT_PXP_REG_LEN ); -u8 *src = (u8 *)hw_pcie_stats;int i, j; -for (i =0 , j =0 ; i <sizeof (*hw_pcie_stats); ) { + regs->version =1 ; +for (i =0 , j =0 ; i <sizeof (struct pcie_ctx_hw_stats ); ) {if (i >= bnxt_pcie_32b_entries[j].start && i <= bnxt_pcie_32b_entries[j].end) {u32 *dst32 = (u32 *)(dst + i);
Signature · 1 line
2.30.1
Re: [PATCH net-next v2 2/5] bnxt_en: Refactor bnxt_get_regs()
Quoted 8 lines · Michael Chan
From: Shruti Parab <[email protected]>
Separate the code that sends the FW message to retrieve pcie stats into a new helper function. The caller of the helper will call
hwrm_req_hold()beforehand and so the caller will callhwrm_req_drop()in all cases afterwards. This helper will be useful when adding the support for the larger structpcie_ctx_hw_stats_v2.
Quoted 8 lines
Signed-off-by Shruti Parab <[email protected]>Signed-off-by Michael Chan <[email protected]>---
v2: Update Changelogv1: https://lore.kernel.org/netdev/[email protected]/
Cc Przemek Kitszel <[email protected]>
thanks, now it looks good
Quoted 77 lines
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-)drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +25
-18@@ -2074,6 +2074,25 @@ static int bnxt_get_regs_len(struct net_device *dev)return reg_len; } +static void * +__bnxt_hwrm_pcie_qstats (struct bnxt *bp,struct hwrm_pcie_qstats_input *req) +{ +struct pcie_ctx_hw_stats_v2 *hw_pcie_stats; +dma_addr_t hw_pcie_stats_addr; +int rc; + + hw_pcie_stats =hwrm_req_dma_slice (bp, req,sizeof (*hw_pcie_stats), + &hw_pcie_stats_addr); +if (!hw_pcie_stats) +return NULL ; + + req->pcie_stat_size =cpu_to_le16 (sizeof (*hw_pcie_stats)); + req->pcie_stat_host_addr =cpu_to_le64 (hw_pcie_stats_addr); + rc =hwrm_req_send (bp, req); + +return rc ?NULL : hw_pcie_stats; +} +#define BNXT_PCIE_32B_ENTRY (start, end) \ { offsetof(struct pcie_ctx_hw_stats, start), \ offsetof(struct pcie_ctx_hw_stats, end) }@@ -2088,11 +2107,9 @@ static const struct {static void bnxt_get_regs (struct net_device *dev,struct ethtool_regs *regs,void *_p) { -struct pcie_ctx_hw_stats *hw_pcie_stats;struct hwrm_pcie_qstats_input *req;struct bnxt *bp =netdev_priv (dev); -dma_addr_t hw_pcie_stats_addr; -int rc; +u8 *src; regs->version =0 ;if (!(bp->fw_dbg_cap &DBG_QCAPS_RESP_FLAGS_REG_ACCESS_RESTRICTED ))@@ -2104,24 +2121,14 @@ static void bnxt_get_regs(struct net_device *dev, struct ethtool_regs *regs,if (hwrm_req_init (bp, req,HWRM_PCIE_QSTATS ))return ; - hw_pcie_stats =hwrm_req_dma_slice (bp, req,sizeof (*hw_pcie_stats), - &hw_pcie_stats_addr); -if (!hw_pcie_stats) { -hwrm_req_drop (bp, req); -return ; - } - - regs->version =1 ; -hwrm_req_hold (bp, req);/* hold on to slice */ - req->pcie_stat_size =cpu_to_le16 (sizeof (*hw_pcie_stats)); - req->pcie_stat_host_addr =cpu_to_le64 (hw_pcie_stats_addr); - rc =hwrm_req_send (bp, req); -if (!rc) { +hwrm_req_hold (bp, req); + src =__bnxt_hwrm_pcie_qstats (bp, req); +if (src) {u8 *dst = (u8 *)(_p +BNXT_PXP_REG_LEN ); -u8 *src = (u8 *)hw_pcie_stats;int i, j; -for (i =0 , j =0 ; i <sizeof (*hw_pcie_stats); ) { + regs->version =1 ; +for (i =0 , j =0 ; i <sizeof (struct pcie_ctx_hw_stats ); ) {if (i >= bnxt_pcie_32b_entries[j].start && i <= bnxt_pcie_32b_entries[j].end) {u32 *dst32 = (u32 *)(dst + i);
Michael Chan
maintainerPATCH v2 3/5 bnxt_en: Add pcie_stat_len to struct bp
In reply to Michael ChanFrom: Shruti Parab <[email protected]>
Add this length field to capture the length of the pcie stats structure supported by the FW. This length will be determined in bnxt_ethtool_init(). The minimum of this FW length and the length known to the driver will determine the actual ethtool -d length.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 37 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -2543,6 +2543,7 @@ struct bnxt {u16 fw_rx_stats_ext_size;u16 fw_tx_stats_ext_size;u16 hw_ring_stats_size; +u16 pcie_stat_len;u8 pri2cos_idx[8 ];u8 pri2cos_valid;
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +27 -10
@@ -2061,17 +2061,11 @@ static void bnxt_get_drvinfo(struct net_device *dev,static int bnxt_get_regs_len (struct net_device *dev) {struct bnxt *bp =netdev_priv (dev); -int reg_len;if (!BNXT_PF (bp))return -EOPNOTSUPP ; - reg_len =BNXT_PXP_REG_LEN ; - -if (bp->fw_cap &BNXT_FW_CAP_PCIE_STATS_SUPPORTED ) - reg_len +=sizeof (struct pcie_ctx_hw_stats ); - -return reg_len; +return BNXT_PXP_REG_LEN + bp->pcie_stat_len; } static void *
@@ -2107,6 +2101,7 @@ static const struct {static void bnxt_get_regs (struct net_device *dev,struct ethtool_regs *regs,void *_p) { +struct hwrm_pcie_qstats_output *resp;struct hwrm_pcie_qstats_input *req;struct bnxt *bp =netdev_priv (dev);u8 *src;
@@ -2121,14 +2116,15 @@ static void bnxt_get_regs(struct net_device *dev, struct ethtool_regs *regs,if (hwrm_req_init (bp, req,HWRM_PCIE_QSTATS ))return ; -hwrm_req_hold (bp, req); + resp =hwrm_req_hold (bp, req); src =__bnxt_hwrm_pcie_qstats (bp, req);if (src) {u8 *dst = (u8 *)(_p +BNXT_PXP_REG_LEN ); -int i, j; +int i, j, len; + len =min (bp->pcie_stat_len,le16_to_cpu (resp->pcie_stat_size)); regs->version =1 ; -for (i =0 , j =0 ; i <sizeof (struct pcie_ctx_hw_stats ); ) { +for (i =0 , j =0 ; i < len; ) {if (i >= bnxt_pcie_32b_entries[j].start && i <= bnxt_pcie_32b_entries[j].end) {u32 *dst32 = (u32 *)(dst + i);
@@ -5273,6 +5269,26 @@ static int bnxt_get_ts_info(struct net_device *dev,return 0 ; } +static void bnxt_hwrm_pcie_qstats (struct bnxt *bp) +{ +struct hwrm_pcie_qstats_output *resp; +struct hwrm_pcie_qstats_input *req; + + bp->pcie_stat_len =0 ; +if (!(bp->fw_cap &BNXT_FW_CAP_PCIE_STATS_SUPPORTED )) +return ; + +if (hwrm_req_init (bp, req,HWRM_PCIE_QSTATS )) +return ; + + resp =hwrm_req_hold (bp, req); +if (__bnxt_hwrm_pcie_qstats (bp, req)) + bp->pcie_stat_len =min_t (u16, +le16_to_cpu (resp->pcie_stat_size), +sizeof (struct pcie_ctx_hw_stats_v2 )); +hwrm_req_drop (bp, req); +} +void bnxt_ethtool_init (struct bnxt *bp) {struct hwrm_selftest_qlist_output *resp;
@@ -5281,6 +5297,7 @@ void bnxt_ethtool_init(struct bnxt *bp)struct net_device *dev = bp->dev;int i, rc; +bnxt_hwrm_pcie_qstats (bp);if (!(bp->fw_cap &BNXT_FW_CAP_PKG_VER ))bnxt_get_pkgver (dev);
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH v2 4/5 bnxt_en: Add pcie_ctx_v2 support for ethtool -d
In reply to Michael ChanFrom: Shruti Parab <[email protected]>
Add support to dump the expanded v2 struct that contains PCIE read/write latency and credit histogram data.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +11 -3
@@ -2088,14 +2088,16 @@ __bnxt_hwrm_pcie_qstats(struct bnxt *bp, struct hwrm_pcie_qstats_input *req) }#define BNXT_PCIE_32B_ENTRY (start, end) \ - { offsetof(struct pcie_ctx_hw_stats, start), \ - offsetof(struct pcie_ctx_hw_stats, end) } + { offsetof(struct pcie_ctx_hw_stats_v2, start),\ + offsetof(struct pcie_ctx_hw_stats_v2, end) }static const struct {u16 start;u16 end; } bnxt_pcie_32b_entries[] = {BNXT_PCIE_32B_ENTRY (pcie_ltssm_histogram[0 ], pcie_ltssm_histogram[3 ]), +BNXT_PCIE_32B_ENTRY (pcie_tl_credit_nph_histogram[0 ], unused_1), +BNXT_PCIE_32B_ENTRY (pcie_rd_latency_histogram[0 ], unused_2), }; static void bnxt_get_regs(struct net_device *dev, struct ethtool_regs *regs,
@@ -2123,7 +2125,13 @@ static void bnxt_get_regs(struct net_device *dev, struct ethtool_regs *regs,int i, j, len; len =min (bp->pcie_stat_len,le16_to_cpu (resp->pcie_stat_size)); - regs->version =1 ; +if (len <=sizeof (struct pcie_ctx_hw_stats )) + regs->version =1 ; +else if (len <sizeof (struct pcie_ctx_hw_stats_v2 )) + regs->version =2 ; +else + regs->version =3 ; +for (i =0 , j =0 ; i < len; ) {if (i >= bnxt_pcie_32b_entries[j].start && i <= bnxt_pcie_32b_entries[j].end) {
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH v2 5/5 bnxt_en: Add Hyper-V VF ID
In reply to Michael ChanFrom: Pavan Chebbi <[email protected]>
VFs of the P7 chip family created by Hyper-V will have the device ID of 0x181b.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 ++++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -1
@@ -142,6 +142,7 @@ static const struct { [NETXTREME_E_P5_VF] = { "Broadcom BCM5750X NetXtreme-E Ethernet Virtual Function" }, [NETXTREME_E_P5_VF_HV] = { "Broadcom BCM5750X NetXtreme-E Virtual Function for Hyper-V" }, [NETXTREME_E_P7_VF] = { "Broadcom BCM5760X Virtual Function" }, + [NETXTREME_E_P7_VF_HV] = { "Broadcom BCM5760X Virtual Function for Hyper-V" }, };static const struct pci_device_id bnxt_pci_tbl[] = {
@@ -217,6 +218,7 @@ static const struct pci_device_id bnxt_pci_tbl[] = { { PCI_VDEVICE(BROADCOM, 0x1808), .driver_data = NETXTREME_E_P5_VF_HV }, { PCI_VDEVICE(BROADCOM, 0x1809), .driver_data = NETXTREME_E_P5_VF_HV }, { PCI_VDEVICE(BROADCOM, 0x1819), .driver_data = NETXTREME_E_P7_VF }, + { PCI_VDEVICE(BROADCOM, 0x181b), .driver_data = NETXTREME_E_P7_VF_HV }, { PCI_VDEVICE(BROADCOM, 0xd800), .driver_data = NETXTREME_S_VF }, #endif { 0 }
@@ -315,7 +317,8 @@ static bool bnxt_vf_pciid(enum board_idx idx)return (idx ==NETXTREME_C_VF || idx ==NETXTREME_E_VF || idx ==NETXTREME_S_VF || idx ==NETXTREME_C_VF_HV || idx ==NETXTREME_E_VF_HV || idx ==NETXTREME_E_P5_VF || - idx ==NETXTREME_E_P5_VF_HV || idx ==NETXTREME_E_P7_VF ); + idx ==NETXTREME_E_P5_VF_HV || idx ==NETXTREME_E_P7_VF || + idx ==NETXTREME_E_P7_VF_HV ); }#define DB_CP_REARM_FLAGS (DB_KEY_CP | DB_IDX_VALID)
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -2130,6 +2130,7 @@ enum board_idx {NETXTREME_E_P5_VF ,NETXTREME_E_P5_VF_HV ,NETXTREME_E_P7_VF , + NETXTREME_E_P7_VF_HV, };#define BNXT_TRACE_BUF_MAGIC_BYTE ((u8)0xbc)
Signature · 1 line
2.30.1
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Tue, 19 Aug 2025 09:39:14 -0700 you wrote:
The first patch is the FW interface update, followed by 3 patches to support the expanded pcie v2 structure for ethtool -d. The last patch adds a Hyper-V PCI ID for the 5760X chips (Thor2).
v2: Update Changelog for patch #2
v1: https://lore.kernel.org/netdev/[email protected]/
[...]
Here is the summary with links:
- [net-next,v2,1/5] bnxt_en: hsi: Update FW interface to 1.10.3.133
https://git.kernel.org/netdev/net-next/c/5f8a4f34f6dc - [net-next,v2,2/5] bnxt_en: Refactor bnxt_get_regs() https://git.kernel.org/netdev/net-next/c/1cc174d33a1f - [net-next,v2,3/5] bnxt_en: Add pcie_stat_len to struct bp https://git.kernel.org/netdev/net-next/c/b530173d3c8a - [net-next,v2,4/5] bnxt_en: Add pcie_ctx_v2 support for ethtool -d https://git.kernel.org/netdev/net-next/c/5a4cf42322a0 - [net-next,v2,5/5] bnxt_en: Add Hyper-V VF ID https://git.kernel.org/netdev/net-next/c/5be7cb805bd9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html