IB/core: Introduce capabilitymask2 field in ClassPortInfo mad

Change struct ib_class_port_info to conform to IB Spec 1.3
That in order to get specific capability mask from ClassPortInfo mad.

>From the IB Spec, ClassPortInfo section:
        "CapabilityMask2 Bits 0-26: Additional class-specific capabilities...
         RespTimeValue the rest 5 bits"

The new struct now has one field for capabilitymask2 (previously was the
reserved field) and the resp_time field.

And it fixes up qib and srpt, use of the field repurposed to be used as
capabilitymask2:
IB/qib: Change pma_get_classportinfo
IB/srpt: Adjust the use of ib_class_port_info

Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Hal Rosenstock <hal@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c
index 0bd18375d7df..d2ac29861af5 100644
--- a/drivers/infiniband/hw/qib/qib_mad.c
+++ b/drivers/infiniband/hw/qib/qib_mad.c
@@ -1172,11 +1172,13 @@ static int pma_get_classportinfo(struct ib_pma_mad *pmp,
          * Set the most significant bit of CM2 to indicate support for
          * congestion statistics
          */
-        p->reserved[0] = dd->psxmitwait_supported << 7;
+        ib_set_cpi_capmask2(p,
+                            dd->psxmitwait_supported <<
+                            (31 - IB_CLASS_PORT_INFO_RESP_TIME_FIELD_SIZE));
         /*
          * Expected response time is 4.096 usec. * 2^18 == 1.073741824 sec.
          */
-        p->resp_time_value = 18;
+        ib_set_cpi_resp_time(p, 18);
 
         return reply((struct ib_smp *) pmp);
 }
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 2843f1ae75bd..887ebadd4774 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -254,8 +254,8 @@ static void srpt_get_class_port_info(struct ib_dm_mad *mad)
         memset(cif, 0, sizeof(*cif));
         cif->base_version = 1;
         cif->class_version = 1;
-        cif->resp_time_value = 20;
 
+        ib_set_cpi_resp_time(cif, 20);
         mad->mad_hdr.status = 0;
 }