mlx4: make sure to always set the port type
Even tho mlx4_core registers the devlink ports, it's mlx4_en and mlx4_ib which set their type. In situations where one of the two is not built yet the machine has ports of given type we see the devlink warning from devlink_port_type_warn() trigger. Having ports of a type not supported by the kernel may seem surprising, but it does occur in practice - when the unsupported port is not plugged in to a switch anyway users are more than happy not to see it (and potentially allocate any resources to it). Set the type in mlx4_core if type-specific driver is not built. Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Tariq Toukan <tariqt@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3ea87ca772
commit
0313c7c2e4
|
@ -3031,6 +3031,17 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
/* Ethernet and IB drivers will normally set the port type,
|
||||
* but if they are not built set the type now to prevent
|
||||
* devlink_port_type_warn() from firing.
|
||||
*/
|
||||
if (!IS_ENABLED(CONFIG_MLX4_EN) &&
|
||||
dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
|
||||
devlink_port_type_eth_set(&info->devlink_port, NULL);
|
||||
else if (!IS_ENABLED(CONFIG_MLX4_INFINIBAND) &&
|
||||
dev->caps.port_type[port] == MLX4_PORT_TYPE_IB)
|
||||
devlink_port_type_ib_set(&info->devlink_port, NULL);
|
||||
|
||||
info->dev = dev;
|
||||
info->port = port;
|
||||
if (!mlx4_is_slave(dev)) {
|
||||
|
|
Loading…
Reference in a new issue