Skip to content

Commit 459e568

Browse files
gal-pressmangregkh
authored andcommitted
net/mlx5e: Remove overzealous validations in netlink EEPROM query
[ Upstream commit 970adfb ] Unlike the legacy EEPROM callbacks, when using the netlink EEPROM query (get_module_eeprom_by_page) the driver should not try to validate the query parameters, but just perform the read requested by the userspace. Recent discussion in the mailing list: https://lore.kernel.org/netdev/20220120093051.70845141@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net/ Signed-off-by: Gal Pressman <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Reviewed-by: Maxim Mikityanskiy <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 1c4561d commit 459e568

File tree

1 file changed

+0
-23
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+0
-23
lines changed

drivers/net/ethernet/mellanox/mlx5/core/port.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -433,35 +433,12 @@ int mlx5_query_module_eeprom_by_page(struct mlx5_core_dev *dev,
433433
struct mlx5_module_eeprom_query_params *params,
434434
u8 *data)
435435
{
436-
u8 module_id;
437436
int err;
438437

439438
err = mlx5_query_module_num(dev, &params->module_number);
440439
if (err)
441440
return err;
442441

443-
err = mlx5_query_module_id(dev, params->module_number, &module_id);
444-
if (err)
445-
return err;
446-
447-
switch (module_id) {
448-
case MLX5_MODULE_ID_SFP:
449-
if (params->page > 0)
450-
return -EINVAL;
451-
break;
452-
case MLX5_MODULE_ID_QSFP:
453-
case MLX5_MODULE_ID_QSFP28:
454-
case MLX5_MODULE_ID_QSFP_PLUS:
455-
if (params->page > 3)
456-
return -EINVAL;
457-
break;
458-
case MLX5_MODULE_ID_DSFP:
459-
break;
460-
default:
461-
mlx5_core_err(dev, "Module ID not recognized: 0x%x\n", module_id);
462-
return -EINVAL;
463-
}
464-
465442
if (params->i2c_address != MLX5_I2C_ADDR_HIGH &&
466443
params->i2c_address != MLX5_I2C_ADDR_LOW) {
467444
mlx5_core_err(dev, "I2C address not recognized: 0x%x\n", params->i2c_address);

0 commit comments

Comments
 (0)