Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/mlx5: Remove health syndrome enum duplication

Health syndrome enum values were duplicated in mlx5_ifc and health.c,
the correct place for them is mlx5_ifc.

Signed-off-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

authored by

Gal Pressman and committed by
Saeed Mahameed
ab943e2e a15e472f

+11 -25
+11 -25
drivers/net/ethernet/mellanox/mlx5/core/health.c
··· 50 50 }; 51 51 52 52 enum { 53 - MLX5_HEALTH_SYNDR_FW_ERR = 0x1, 54 - MLX5_HEALTH_SYNDR_IRISC_ERR = 0x7, 55 - MLX5_HEALTH_SYNDR_HW_UNRECOVERABLE_ERR = 0x8, 56 - MLX5_HEALTH_SYNDR_CRC_ERR = 0x9, 57 - MLX5_HEALTH_SYNDR_FETCH_PCI_ERR = 0xa, 58 - MLX5_HEALTH_SYNDR_HW_FTL_ERR = 0xb, 59 - MLX5_HEALTH_SYNDR_ASYNC_EQ_OVERRUN_ERR = 0xc, 60 - MLX5_HEALTH_SYNDR_EQ_ERR = 0xd, 61 - MLX5_HEALTH_SYNDR_EQ_INV = 0xe, 62 - MLX5_HEALTH_SYNDR_FFSER_ERR = 0xf, 63 - MLX5_HEALTH_SYNDR_HIGH_TEMP = 0x10 64 - }; 65 - 66 - enum { 67 53 MLX5_DROP_HEALTH_WORK, 68 54 }; 69 55 ··· 343 357 static const char *hsynd_str(u8 synd) 344 358 { 345 359 switch (synd) { 346 - case MLX5_HEALTH_SYNDR_FW_ERR: 360 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_FW_INTERNAL_ERR: 347 361 return "firmware internal error"; 348 - case MLX5_HEALTH_SYNDR_IRISC_ERR: 362 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_DEAD_IRISC: 349 363 return "irisc not responding"; 350 - case MLX5_HEALTH_SYNDR_HW_UNRECOVERABLE_ERR: 364 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_HW_FATAL_ERR: 351 365 return "unrecoverable hardware error"; 352 - case MLX5_HEALTH_SYNDR_CRC_ERR: 366 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_FW_CRC_ERR: 353 367 return "firmware CRC error"; 354 - case MLX5_HEALTH_SYNDR_FETCH_PCI_ERR: 368 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_ICM_FETCH_PCI_ERR: 355 369 return "ICM fetch PCI error"; 356 - case MLX5_HEALTH_SYNDR_HW_FTL_ERR: 370 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_ICM_PAGE_ERR: 357 371 return "HW fatal error\n"; 358 - case MLX5_HEALTH_SYNDR_ASYNC_EQ_OVERRUN_ERR: 372 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_ASYNCHRONOUS_EQ_BUF_OVERRUN: 359 373 return "async EQ buffer overrun"; 360 - case MLX5_HEALTH_SYNDR_EQ_ERR: 374 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_EQ_IN_ERR: 361 375 return "EQ error"; 362 - case MLX5_HEALTH_SYNDR_EQ_INV: 376 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_EQ_INV: 363 377 return "Invalid EQ referenced"; 364 - case MLX5_HEALTH_SYNDR_FFSER_ERR: 378 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_FFSER_ERR: 365 379 return "FFSER error"; 366 - case MLX5_HEALTH_SYNDR_HIGH_TEMP: 380 + case MLX5_INITIAL_SEG_HEALTH_SYNDROME_HIGH_TEMP_ERR: 367 381 return "High temperature"; 368 382 default: 369 383 return "unrecognized error";