APPLIED: [SRU][N:linux-bluefield][PATCH 0/2] Fix AMD64 mlx5 compilation issue

[Alessio Faina]

On Fri, Dec 12, 2025 at 03:16:43PM +0100, Alessio Faina wrote:
> https://bugs.launchpad.net/bugs/2135124
> 
> Link: https://lore.kernel.org/all/20250219085808.349923-1-tariqt@nvidia.com/
> 
> 
> 
> [ Impact ]
> 
> While compile on AMD64 platform, the following error happens:
> 
> drivers/net/ethernet/mellanox/mlx5/core/health.c: In function ‘mlx5_health_get_crr’:
> drivers/net/ethernet/mellanox/mlx5/core/health.c:101:33: error: ‘MLX5_CRR_BIT_OFFSET’ undeclared (first use in this function); did you mean ‘MLX5_RFR_BIT_OFFSET’?
>   101 | return (rfr_severity >> MLX5_CRR_BIT_OFFSET) & 0x01;
>       | ^~~~~~~~~~~~~~~~~~~
>       | MLX5_RFR_BIT_OFFSET
> drivers/net/ethernet/mellanox/mlx5/core/health.c:101:33: note: each undeclared identifier is reported only once for each function it appears in
> drivers/net/ethernet/mellanox/mlx5/core/health.c: In function ‘hsynd_str’:
> drivers/net/ethernet/mellanox/mlx5/core/health.c:383:14: error: ‘MLX5_INITIAL_SEG_HEALTH_SYNDROME_TRUST_LOCKDOWN_ERR’ undeclared (first use in this function); did you mean ‘MLX5_INITIAL_SEG_HEALTH_SYNDROME_EQ_IN_ERR’?
>   383 | case MLX5_INITIAL_SEG_HEALTH_SYNDROME_TRUST_LOCKDOWN_ERR:
>       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       | MLX5_INITIAL_SEG_HEALTH_SYNDROME_EQ_IN_ERR
> drivers/net/ethernet/mellanox/mlx5/core/health.c: In function ‘mlx5_health_get_crr’:
> drivers/net/ethernet/mellanox/mlx5/core/health.c:102:1: error: control reaches end of non-void function [-Werror=return-type]
>   102 | }
>       | ^
> 
> [ Fix ]
> 
> To fix this, the suggestion has been to import the following patchset
> 
> https://lore.kernel.org/all/20250219085808.349923-1-tariqt@nvidia.com/
> * cherry-picked 80df31f384b4146a62a01b3d4beb376cc7b9a89e from upstream
> * cherry-picked 531ca2b9a215d072ffb4b1ff760a73f5e80c9c46 from upstream
> 
> [ Test plan ]
> 
> Compile test only
> 
> [ Potential regressions ]
> 
> The patch introduces a new macro and the scope is quite small, no regressions are expected.
> 
> 
> Patrisious Haddad (1):
>   net/mlx5: Change POOL_NEXT_SIZE define value and make it global
> 
> Shahar Shitrit (1):
>   net/mlx5: Add new health syndrome error and crr bit offset
> 
>  drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c    | 2 +-
>  drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c    | 6 ++++--
>  drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h    | 2 --
>  drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 ++-
>  include/linux/mlx5/device.h                             | 1 +
>  include/linux/mlx5/fs.h                                 | 2 ++
>  include/linux/mlx5/mlx5_ifc.h                           | 1 +
>  7 files changed, 11 insertions(+), 6 deletions(-)
> 
> -- 
> 2.43.0
> 

Applied to N:linux-bluefield

Thanks!
- Alessio Faina