History

Merge tag 'mlx5-fixes-2020-07-02' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

Saeed Mahameed says: ==================== mlx5 fixes 2020-07-02 This series introduces some fixes to mlx5 driver. V1->v2: - Drop "ip -s" patch and mirred device hold reference patch. - Will revise them in a later submission. Please pull and let me know if there is any problem. For -stable v5.2 ('net/mlx5: Fix eeprom support for SFP module') For -stable v5.4 ('net/mlx5e: Fix 50G per lane indication') For -stable v5.5 ('net/mlx5e: Fix CPU mapping after function reload to avoid aRFS RX crash') ('net/mlx5e: Fix VXLAN configuration restore after function reload') For -stable v5.7 ('net/mlx5e: CT: Fix memory leak in cleanup') ====================

David S. Miller committed 6 years ago

Commit ca68d562 parents 14b032b eb32b3f14 files · +196 −62Browse files

Showing the changes to include/linux (2 of 14 files). Show all

Unified · Split

2 files
  1. include/linux/mlx5/driver.h +1 −0
  2. include/linux/mlx5/mlx5_ifc.h +28 −0
include/linux/mlx5/driver.h+1−0
@@ -147,6 +147,7 @@ enum { · 146 unmodified lines
147147 MLX5_REG_MCDA = 0x9063,
148148 MLX5_REG_MCAM = 0x907f,
149149 MLX5_REG_MIRC = 0x9162,
150+ MLX5_REG_SBCAM = 0xB01F,
150151 MLX5_REG_RESOURCE_DUMP = 0xC000,
151152 };
152153
include/linux/mlx5/mlx5_ifc.h+28−0
@@ -9960,6 +9960,34 @@ struct mlx5_ifc_pptb_reg_bits { · 9959 unmodified lines
99609960 u8 untagged_buff[0x4];
99619961 };
99629962
9963+struct mlx5_ifc_sbcam_reg_bits {
9964+ u8 reserved_at_0[0x8];
9965+ u8 feature_group[0x8];
9966+ u8 reserved_at_10[0x8];
9967+ u8 access_reg_group[0x8];
9968+
9969+ u8 reserved_at_20[0x20];
9970+
9971+ u8 sb_access_reg_cap_mask[4][0x20];
9972+
9973+ u8 reserved_at_c0[0x80];
9974+
9975+ u8 sb_feature_cap_mask[4][0x20];
9976+
9977+ u8 reserved_at_1c0[0x40];
9978+
9979+ u8 cap_total_buffer_size[0x20];
9980+
9981+ u8 cap_cell_size[0x10];
9982+ u8 cap_max_pg_buffers[0x8];
9983+ u8 cap_num_pool_supported[0x8];
9984+
9985+ u8 reserved_at_240[0x8];
9986+ u8 cap_sbsr_stat_size[0x8];
9987+ u8 cap_max_tclass_data[0x8];
9988+ u8 cap_max_cpu_ingress_tclass_sb[0x8];
9989+};
9990+
99639991 struct mlx5_ifc_pbmc_reg_bits {
99649992 u8 reserved_at_0[0x8];
99659993 u8 local_port[0x8];