IB/mlx5: Report CapabilityMask2 in ib_query_port

CapabilityMask2 exists when IB_PORT_CAP_MASK2_SUP is set in the original
capability mask. In such cases, query its value and report it in query
port.

Signed-off-by: Michael Guralnik <michaelgur@mellanox.com>
Reviewed-by: Majd Dibbiny <majd@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index 32a9e92..5806724 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -568,6 +568,10 @@ int mlx5_query_mad_ifc_port(struct ib_device *ibdev, u8 port,
        props->max_vl_num       = out_mad->data[37] >> 4;
        props->init_type_reply  = out_mad->data[41] >> 4;
 
+       if (props->port_cap_flags & IB_PORT_CAP_MASK2_SUP)
+               props->port_cap_flags2 =
+                       be16_to_cpup((__be16 *)(out_mad->data + 60));
+
        /* Check if extended speeds (EDR/FDR/...) are supported */
        if (props->port_cap_flags & IB_PORT_EXTENDED_SPEEDS_SUP) {
                ext_active_speed = out_mad->data[62] >> 4;

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 1b2e546..935de3d 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1228,6 +1228,9 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port,
        props->subnet_timeout   = rep->subnet_timeout;
        props->init_type_reply  = rep->init_type_reply;
 
+       if (props->port_cap_flags & IB_PORT_CAP_MASK2_SUP)
+               props->port_cap_flags2 = rep->cap_mask2;
+
        err = mlx5_query_port_link_width_oper(mdev, &ib_link_width_oper, port);
        if (err)
                goto out;

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 584d8a5..b090a96 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -749,8 +749,8 @@ struct mlx5_hca_vport_context {
        u64                     node_guid;
        u32                     cap_mask1;
        u32                     cap_mask1_perm;
-       u32                     cap_mask2;
-       u32                     cap_mask2_perm;
+       u16                     cap_mask2;
+       u16                     cap_mask2_perm;
        u16                     lid;
        u8                      init_type_reply; /* bitmask: see ib spec 14.2.5.6 InitTypeReply */
        u8                      lmc;