mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-20 01:46:40 -05:00
Merge tag 'mlx5-updates-2021-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says: ==================== mlx5-updates-2021-10-25 Misc updates for mlx5 driver: 1) Misc updates and cleanups: - Don't write directly to netdev->dev_addr, From Jakub Kicinski - Remove unnecessary checks for slow path flag in tc module - Fix unused function warning of mlx5i_flow_type_mask - Bridge, support replacing existing FDB entry 2) Sub Functions, Reduction in memory usage: - Reduce flow counters bulk query buffer size - Implement max_macs devlink parameter - Add devlink vendor params to control Event Queue sizes - Added SF life cycle trace points by Parav/ 3) From Aya, Firmware health buffer reporting improvements - Print health buffer by log level and more missing information - Periodic update of host time to firmware ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -541,19 +541,21 @@ struct mlx5_cmd_layout {
|
||||
u8 status_own;
|
||||
};
|
||||
|
||||
enum mlx5_fatal_assert_bit_offsets {
|
||||
MLX5_RFR_OFFSET = 31,
|
||||
enum mlx5_rfr_severity_bit_offsets {
|
||||
MLX5_RFR_BIT_OFFSET = 0x7,
|
||||
};
|
||||
|
||||
struct health_buffer {
|
||||
__be32 assert_var[5];
|
||||
__be32 rsvd0[3];
|
||||
__be32 assert_var[6];
|
||||
__be32 rsvd0[2];
|
||||
__be32 assert_exit_ptr;
|
||||
__be32 assert_callra;
|
||||
__be32 rsvd1[2];
|
||||
__be32 rsvd1[1];
|
||||
__be32 time;
|
||||
__be32 fw_ver;
|
||||
__be32 hw_id;
|
||||
__be32 rfr;
|
||||
u8 rfr_severity;
|
||||
u8 rsvd2[3];
|
||||
u8 irisc_index;
|
||||
u8 synd;
|
||||
__be16 ext_synd;
|
||||
|
||||
@@ -134,6 +134,7 @@ enum {
|
||||
MLX5_REG_MCIA = 0x9014,
|
||||
MLX5_REG_MFRL = 0x9028,
|
||||
MLX5_REG_MLCR = 0x902b,
|
||||
MLX5_REG_MRTC = 0x902d,
|
||||
MLX5_REG_MTRC_CAP = 0x9040,
|
||||
MLX5_REG_MTRC_CONF = 0x9041,
|
||||
MLX5_REG_MTRC_STDB = 0x9042,
|
||||
@@ -440,6 +441,7 @@ struct mlx5_core_health {
|
||||
struct work_struct report_work;
|
||||
struct devlink_health_reporter *fw_reporter;
|
||||
struct devlink_health_reporter *fw_fatal_reporter;
|
||||
struct delayed_work update_fw_log_ts_work;
|
||||
};
|
||||
|
||||
struct mlx5_qp_table {
|
||||
@@ -795,10 +797,6 @@ struct mlx5_db {
|
||||
int index;
|
||||
};
|
||||
|
||||
enum {
|
||||
MLX5_COMP_EQ_SIZE = 1024,
|
||||
};
|
||||
|
||||
enum {
|
||||
MLX5_PTYS_IB = 1 << 0,
|
||||
MLX5_PTYS_EN = 1 << 2,
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#define MLX5_CORE_EQ_H
|
||||
|
||||
#define MLX5_NUM_CMD_EQE (32)
|
||||
#define MLX5_NUM_ASYNC_EQE (0x1000)
|
||||
#define MLX5_NUM_SPARE_EQE (0x80)
|
||||
|
||||
struct mlx5_eq;
|
||||
|
||||
@@ -1603,7 +1603,7 @@ struct mlx5_ifc_cmd_hca_cap_bits {
|
||||
|
||||
u8 ext_stride_num_range[0x1];
|
||||
u8 roce_rw_supported[0x1];
|
||||
u8 reserved_at_3a2[0x1];
|
||||
u8 log_max_current_uc_list_wr_supported[0x1];
|
||||
u8 log_max_stride_sz_rq[0x5];
|
||||
u8 reserved_at_3a8[0x3];
|
||||
u8 log_min_stride_sz_rq[0x5];
|
||||
@@ -4149,13 +4149,19 @@ struct mlx5_ifc_health_buffer_bits {
|
||||
|
||||
u8 assert_callra[0x20];
|
||||
|
||||
u8 reserved_at_140[0x40];
|
||||
u8 reserved_at_140[0x20];
|
||||
|
||||
u8 time[0x20];
|
||||
|
||||
u8 fw_version[0x20];
|
||||
|
||||
u8 hw_id[0x20];
|
||||
|
||||
u8 reserved_at_1c0[0x20];
|
||||
u8 rfr[0x1];
|
||||
u8 reserved_at_1c1[0x3];
|
||||
u8 valid[0x1];
|
||||
u8 severity[0x3];
|
||||
u8 reserved_at_1c8[0x18];
|
||||
|
||||
u8 irisc_index[0x8];
|
||||
u8 synd[0x8];
|
||||
@@ -10352,6 +10358,17 @@ struct mlx5_ifc_pddr_reg_bits {
|
||||
union mlx5_ifc_pddr_reg_page_data_auto_bits page_data;
|
||||
};
|
||||
|
||||
struct mlx5_ifc_mrtc_reg_bits {
|
||||
u8 time_synced[0x1];
|
||||
u8 reserved_at_1[0x1f];
|
||||
|
||||
u8 reserved_at_20[0x20];
|
||||
|
||||
u8 time_h[0x20];
|
||||
|
||||
u8 time_l[0x20];
|
||||
};
|
||||
|
||||
union mlx5_ifc_ports_control_registers_document_bits {
|
||||
struct mlx5_ifc_bufferx_reg_bits bufferx_reg;
|
||||
struct mlx5_ifc_eth_2819_cntrs_grp_data_layout_bits eth_2819_cntrs_grp_data_layout;
|
||||
@@ -10413,6 +10430,7 @@ union mlx5_ifc_ports_control_registers_document_bits {
|
||||
struct mlx5_ifc_mirc_reg_bits mirc_reg;
|
||||
struct mlx5_ifc_mfrl_reg_bits mfrl_reg;
|
||||
struct mlx5_ifc_mtutc_reg_bits mtutc_reg;
|
||||
struct mlx5_ifc_mrtc_reg_bits mrtc_reg;
|
||||
u8 reserved_at_0[0x60e0];
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user