Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd99fdea authored by Yuval Shaia's avatar Yuval Shaia Committed by Doug Ledford
Browse files

IB/{core,hw}: Add constant for node_desc 



Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 32f7451d

drivers/infiniband/core/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static ssize_t set_node_desc(struct device *device, 
	if (!dev->modify_device)

		return -EIO;



	memcpy(desc.node_desc, buf, min_t(int, count, 64));

	memcpy(desc.node_desc, buf, min_t(int, count, IB_DEVICE_NODE_DESC_MAX));

	ret = ib_modify_device(dev, IB_DEVICE_MODIFY_NODE_DESC, &desc);

	if (ret)

		return ret;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −0
Original line number Diff line number Diff line
@@ -1396,6 +1396,7 @@ int iwch_register_device(struct iwch_dev *dev) 
	    (1ull << IB_USER_VERBS_CMD_POST_SEND) |

	    (1ull << IB_USER_VERBS_CMD_POST_RECV);

	dev->ibdev.node_type = RDMA_NODE_RNIC;

	BUILD_BUG_ON(sizeof(IWCH_NODE_DESC) > IB_DEVICE_NODE_DESC_MAX);

	memcpy(dev->ibdev.node_desc, IWCH_NODE_DESC, sizeof(IWCH_NODE_DESC));

	dev->ibdev.phys_port_cnt = dev->rdev.port_info.nports;

	dev->ibdev.num_comp_vectors = 1;

drivers/infiniband/hw/cxgb4/provider.c

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ int c4iw_register_device(struct c4iw_dev *dev) 
	    (1ull << IB_USER_VERBS_CMD_POST_SEND) |

	    (1ull << IB_USER_VERBS_CMD_POST_RECV);

	dev->ibdev.node_type = RDMA_NODE_RNIC;

	BUILD_BUG_ON(sizeof(C4IW_NODE_DESC) > IB_DEVICE_NODE_DESC_MAX);

	memcpy(dev->ibdev.node_desc, C4IW_NODE_DESC, sizeof(C4IW_NODE_DESC));

	dev->ibdev.phys_port_cnt = dev->rdev.lldi.nports;

	dev->ibdev.num_comp_vectors =  dev->rdev.lldi.nciq;

drivers/infiniband/hw/hfi1/verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -1423,7 +1423,8 @@ static int modify_device(struct ib_device *device, 
	}



	if (device_modify_mask & IB_DEVICE_MODIFY_NODE_DESC) {

		memcpy(device->node_desc, device_modify->node_desc, 64);

		memcpy(device->node_desc, device_modify->node_desc,

		       IB_DEVICE_NODE_DESC_MAX);

		for (i = 0; i < dd->num_pports; i++) {

			struct hfi1_ibport *ibp = &dd->pport[i].ibport_data;

drivers/infiniband/hw/mlx4/mad.c

+2 −1
Original line number Diff line number Diff line
@@ -345,7 +345,8 @@ static void node_desc_override(struct ib_device *dev, 
	    mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP &&

	    mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) {

		spin_lock_irqsave(&to_mdev(dev)->sm_lock, flags);

		memcpy(((struct ib_smp *) mad)->data, dev->node_desc, 64);

		memcpy(((struct ib_smp *) mad)->data, dev->node_desc,

		       IB_DEVICE_NODE_DESC_MAX);

		spin_unlock_irqrestore(&to_mdev(dev)->sm_lock, flags);

	}

}