Skip to content

Commit 6d9c8d1

Browse files
ayalevinkuba-moo
authored andcommitted
net/mlx4_core: Fix init_hca fields offset
Slave function read the following capabilities from the wrong offset: 1. log_mc_entry_sz 2. fs_log_entry_sz 3. log_mc_hash_sz Fix that by adjusting these capabilities offset to match firmware layout. Due to the wrong offset read, the following issues might occur: 1+2. Negative value reported at max_mcast_qp_attach. 3. Driver to init FW with multicast hash size of zero. Fixes: a40ded6 ("net/mlx4_core: Add masking for a few queries on HCA caps") Signed-off-by: Aya Levin <ayal@nvidia.com> Reviewed-by: Moshe Shemesh <moshe@nvidia.com> Reviewed-by: Eran Ben Elisha <eranbe@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Link: https://lore.kernel.org/r/20201118081922.553-1-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent f93e849 commit 6d9c8d1

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

  • drivers/net/ethernet/mellanox/mlx4

drivers/net/ethernet/mellanox/mlx4/fw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,16 +1864,16 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
18641864
#define INIT_HCA_LOG_RD_OFFSET (INIT_HCA_QPC_OFFSET + 0x77)
18651865
#define INIT_HCA_MCAST_OFFSET 0x0c0
18661866
#define INIT_HCA_MC_BASE_OFFSET (INIT_HCA_MCAST_OFFSET + 0x00)
1867-
#define INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x12)
1868-
#define INIT_HCA_LOG_MC_HASH_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x16)
1867+
#define INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x13)
1868+
#define INIT_HCA_LOG_MC_HASH_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x17)
18691869
#define INIT_HCA_UC_STEERING_OFFSET (INIT_HCA_MCAST_OFFSET + 0x18)
18701870
#define INIT_HCA_LOG_MC_TABLE_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x1b)
18711871
#define INIT_HCA_DEVICE_MANAGED_FLOW_STEERING_EN 0x6
18721872
#define INIT_HCA_DRIVER_VERSION_OFFSET 0x140
18731873
#define INIT_HCA_DRIVER_VERSION_SZ 0x40
18741874
#define INIT_HCA_FS_PARAM_OFFSET 0x1d0
18751875
#define INIT_HCA_FS_BASE_OFFSET (INIT_HCA_FS_PARAM_OFFSET + 0x00)
1876-
#define INIT_HCA_FS_LOG_ENTRY_SZ_OFFSET (INIT_HCA_FS_PARAM_OFFSET + 0x12)
1876+
#define INIT_HCA_FS_LOG_ENTRY_SZ_OFFSET (INIT_HCA_FS_PARAM_OFFSET + 0x13)
18771877
#define INIT_HCA_FS_A0_OFFSET (INIT_HCA_FS_PARAM_OFFSET + 0x18)
18781878
#define INIT_HCA_FS_LOG_TABLE_SZ_OFFSET (INIT_HCA_FS_PARAM_OFFSET + 0x1b)
18791879
#define INIT_HCA_FS_ETH_BITS_OFFSET (INIT_HCA_FS_PARAM_OFFSET + 0x21)

drivers/net/ethernet/mellanox/mlx4/fw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ struct mlx4_init_hca_param {
182182
u64 cmpt_base;
183183
u64 mtt_base;
184184
u64 global_caps;
185-
u16 log_mc_entry_sz;
186-
u16 log_mc_hash_sz;
185+
u8 log_mc_entry_sz;
186+
u8 log_mc_hash_sz;
187187
u16 hca_core_clock; /* Internal Clock Frequency (in MHz) */
188188
u8 log_num_qps;
189189
u8 log_num_srqs;

0 commit comments

Comments
 (0)