Merge pull request #814 from hjelmn/2.x_mlx5_enable_atomics

hppritcha · hppritcha · commit 6389d8c399c0 · 2015-12-08T20:42:59.000-07:00
mlx5: need to set comp_mask to get experimental verbs attributes
diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c
@@ -1650,6 +1650,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
         goto error;
     }
 #if HAVE_DECL_IBV_EXP_QUERY_DEVICE
+    device->ib_exp_dev_attr.comp_mask = IBV_EXP_DEVICE_ATTR_RESERVED - 1;
     if(ibv_exp_query_device(device->ib_dev_context, &device->ib_exp_dev_attr)){
         BTL_ERROR(("error obtaining device attributes for %s errno says %s",
                     ibv_get_device_name(device->ib_dev), strerror(errno)));

Original file line number	Diff line number	Diff line change
`@@ -1650,6 +1650,7 @@ static int init_one_device(opal_list_t btl_list, struct ibv_device ib_dev)`
`1650`	`1650`	`goto error;`
`1651`	`1651`	`}`
`1652`	`1652`	`#if HAVE_DECL_IBV_EXP_QUERY_DEVICE`
	`1653`	`+ device->ib_exp_dev_attr.comp_mask = IBV_EXP_DEVICE_ATTR_RESERVED - 1;`
`1653`	`1654`	`if(ibv_exp_query_device(device->ib_dev_context, &device->ib_exp_dev_attr)){`
`1654`	`1655`	`BTL_ERROR(("error obtaining device attributes for %s errno says %s",`
`1655`	`1656`	`ibv_get_device_name(device->ib_dev), strerror(errno)));`