| From 402bf4bc412b8a674186c822672b926c562c0a18 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 7 Jul 2020 14:06:11 +0300 |
| Subject: IB/mlx5: Fix 50G per lane indication |
| |
| From: Aya Levin <ayal@mellanox.com> |
| |
| [ Upstream commit 530c8632b547ff72f11ff83654b22462a73f1f7b ] |
| |
| Some released FW versions mistakenly don't set the capability that 50G per |
| lane link-modes are supported for VFs (ptys_extended_ethernet capability |
| bit). |
| |
| Use PTYS.ext_eth_proto_capability instead, as this indication is always |
| accurate. If PTYS.ext_eth_proto_capability is valid |
| (has a non-zero value) conclude that the HCA supports 50G per lane. |
| |
| Otherwise, conclude that the HCA doesn't support 50G per lane. |
| |
| Fixes: 08e8676f1607 ("IB/mlx5: Add support for 50Gbps per lane link modes") |
| Link: https://lore.kernel.org/r/20200707110612.882962-3-leon@kernel.org |
| Signed-off-by: Aya Levin <ayal@mellanox.com> |
| Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com> |
| Reviewed-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Leon Romanovsky <leonro@mellanox.com> |
| Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/infiniband/hw/mlx5/main.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c |
| index 4f44a731a48e1..b781ad74e6de4 100644 |
| --- a/drivers/infiniband/hw/mlx5/main.c |
| +++ b/drivers/infiniband/hw/mlx5/main.c |
| @@ -517,7 +517,7 @@ static int mlx5_query_port_roce(struct ib_device *device, u8 port_num, |
| mdev_port_num); |
| if (err) |
| goto out; |
| - ext = MLX5_CAP_PCAM_FEATURE(dev->mdev, ptys_extended_ethernet); |
| + ext = !!MLX5_GET_ETH_PROTO(ptys_reg, out, true, eth_proto_capability); |
| eth_prot_oper = MLX5_GET_ETH_PROTO(ptys_reg, out, ext, eth_proto_oper); |
| |
| props->active_width = IB_WIDTH_4X; |
| -- |
| 2.25.1 |
| |
