From: Dotan Barak Date: Tue, 21 Aug 2012 08:56:46 +0000 (+0300) Subject: net/mlx4_core: the number of MTTs should consider log_mtts_per_seg X-Git-Tag: v4.1.12-92~293^2~1^2~109 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b156fc35bfdfe622183a1b8fff7596cb09b3aa29;p=users%2Fjedix%2Flinux-maple.git net/mlx4_core: the number of MTTs should consider log_mtts_per_seg No matter how we decided how many MTTs will be used (calculation from system memory or using default value), we need to consider the number of MTTs per segment. This will allow the user to specify how many MTTs will be used (with log_num_mtt) and how many MTTs will be used per segment (using log_mtts_per_seg). Signed-off-by: Dotan Barak Reviewed-by: Yishai Hadas (Ported from Mellanox OFED 2.4) Signed-off-by: Mukesh Kacker --- diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 14eda84599a17..738dbb0696060 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -232,7 +232,8 @@ static void process_mod_param_profile(struct mlx4_profile *profile) si_meminfo(&si); profile->num_mtt = roundup_pow_of_two(max_t(unsigned, - 1 << MLX4_LOG_NUM_MTT, + 1 << (MLX4_LOG_NUM_MTT - + log_mtts_per_seg), min(1UL << (MLX4_MAX_LOG_NUM_MTT - log_mtts_per_seg),