summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoa Osherovich <noaos@mellanox.com>2016-09-12 19:16:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-07 15:21:27 +0200
commitd02402496370a80d6fe0d72a73d9a3b6b297cd1e (patch)
treee6ae2efbbe3109ffd1a4eba213a16843b5608a0b
parent23c1162cd9186936648923e490dc3d5d30635e42 (diff)
downloadlwn-d02402496370a80d6fe0d72a73d9a3b6b297cd1e.tar.gz
lwn-d02402496370a80d6fe0d72a73d9a3b6b297cd1e.zip
IB/mlx5: Enable MAD_IFC commands for IB ports only
commit 7fae6655a0c897875bd34501ec092232b526d3e4 upstream. MAD_IFC command is supported only for physical functions (PF) and when physical port is IB. The proposed fix enforces it. Fixes: d603c809ef91 ("IB/mlx5: Fix decision on using MAD_IFC") Reported-by: David Chang <dchang@suse.com> Signed-off-by: Noa Osherovich <noaos@mellanox.com> Signed-off-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Doug Ledford <dledford@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/infiniband/hw/mlx5/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index b48ad85315dc..b8679e84b14f 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -287,7 +287,9 @@ __be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num,
static int mlx5_use_mad_ifc(struct mlx5_ib_dev *dev)
{
- return !MLX5_CAP_GEN(dev->mdev, ib_virt);
+ if (MLX5_CAP_GEN(dev->mdev, port_type) == MLX5_CAP_PORT_TYPE_IB)
+ return !MLX5_CAP_GEN(dev->mdev, ib_virt);
+ return 0;
}
enum {