History

net/mlx5e: Add missing capability check for uplink follow

Expose firmware indication that it supports setting eswitch uplink state to follow (follow the physical link). Condition setting the eswitch uplink admin-state with this capability bit. Older FW may not support the uplink state setting.

Aya Levin committed 5 years ago

Commit 9c9be851 parent abf8ef92 files · +4 −2Browse files

Unified · Split

2 files
  1. drivers/net/ethernet/mellanox/mlx5/core/en_main.c +2 −1
  2. include/linux/mlx5/mlx5_ifc.h +2 −1
drivers/net/ethernet/mellanox/mlx5/core/en_main.c+2−1
@@ -3161,7 +3161,8 @@ static void mlx5e_modify_admin_state(struct mlx5_core_dev *mdev, · 3160 unmodified lines
31613161
31623162 mlx5_set_port_admin_status(mdev, state);
31633163
3164− if (mlx5_eswitch_mode(mdev) != MLX5_ESWITCH_LEGACY)
3164+ if (mlx5_eswitch_mode(mdev) == MLX5_ESWITCH_OFFLOADS ||
3165+ !MLX5_CAP_GEN(mdev, uplink_follow))
31653166 return;
31663167
31673168 if (state == MLX5_PORT_UP)
include/linux/mlx5/mlx5_ifc.h+2−1
@@ -1280,7 +1280,8 @@ struct mlx5_ifc_cmd_hca_cap_bits { · 1279 unmodified lines
12801280 u8 ece_support[0x1];
12811281 u8 reserved_at_a4[0x7];
12821282 u8 log_max_srq[0x5];
1283− u8 reserved_at_b0[0x2];
1283+ u8 reserved_at_b0[0x1];
1284+ u8 uplink_follow[0x1];
12841285 u8 ts_cqe_to_dest_cqn[0x1];
12851286 u8 reserved_at_b3[0xd];
12861287

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t