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

Commit 6dfc3901 authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/mthca: Add modify_device method to set node description 



Add a modify_device method to mthca, which implements setting the node
description.  This makes the writable "node_desc" sysfs attribute work
for Mellanox HCAs.

Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent c5bcbbb9

drivers/infiniband/hw/mthca/mthca_mad.c

+16 −1
Original line number Diff line number Diff line
@@ -109,6 +109,19 @@ static void smp_snoop(struct ib_device *ibdev, 
	}

}



static void node_desc_override(struct ib_device *dev,

			       struct ib_mad *mad)

{

	if ((mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||

	     mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) &&

	    mad->mad_hdr.method == IB_MGMT_METHOD_GET_RESP &&

	    mad->mad_hdr.attr_id == IB_SMP_ATTR_NODE_DESC) {

		mutex_lock(&to_mdev(dev)->cap_mask_mutex);

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

		mutex_unlock(&to_mdev(dev)->cap_mask_mutex);

	}

}



static void forward_trap(struct mthca_dev *dev,

			 u8 port_num,

			 struct ib_mad *mad)
@@ -207,8 +220,10 @@ int mthca_process_mad(struct ib_device *ibdev, 
		return IB_MAD_RESULT_FAILURE;

	}



	if (!out_mad->mad_hdr.status)

	if (!out_mad->mad_hdr.status) {

		smp_snoop(ibdev, port_num, in_mad);

		node_desc_override(ibdev, out_mad);

	}



	/* set return bit in status of directed route responses */

	if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)

drivers/infiniband/hw/mthca/mthca_provider.c

+32 −0
Original line number Diff line number Diff line
@@ -176,6 +176,23 @@ static int mthca_query_port(struct ib_device *ibdev, 
	return err;

}



static int mthca_modify_device(struct ib_device *ibdev,

			       int mask,

			       struct ib_device_modify *props)

{

	if (mask & ~IB_DEVICE_MODIFY_NODE_DESC)

		return -EOPNOTSUPP;



	if (mask & IB_DEVICE_MODIFY_NODE_DESC) {

		if (mutex_lock_interruptible(&to_mdev(ibdev)->cap_mask_mutex))

			return -ERESTARTSYS;

		memcpy(ibdev->node_desc, props->node_desc, 64);

		mutex_unlock(&to_mdev(ibdev)->cap_mask_mutex);

	}



	return 0;

}



static int mthca_modify_port(struct ib_device *ibdev,

			     u8 port, int port_modify_mask,

			     struct ib_port_modify *props)
@@ -1187,6 +1204,20 @@ static int mthca_init_node_data(struct mthca_dev *dev) 
		goto out;



	init_query_mad(in_mad);

	in_mad->attr_id = IB_SMP_ATTR_NODE_DESC;



	err = mthca_MAD_IFC(dev, 1, 1,

			    1, NULL, NULL, in_mad, out_mad,

			    &status);

	if (err)

		goto out;

	if (status) {

		err = -EINVAL;

		goto out;

	}



	memcpy(dev->ib_dev.node_desc, out_mad->data, 64);



	in_mad->attr_id = IB_SMP_ATTR_NODE_INFO;



	err = mthca_MAD_IFC(dev, 1, 1,
@@ -1246,6 +1277,7 @@ int mthca_register_device(struct mthca_dev *dev) 
	dev->ib_dev.class_dev.dev        = &dev->pdev->dev;

	dev->ib_dev.query_device         = mthca_query_device;

	dev->ib_dev.query_port           = mthca_query_port;

	dev->ib_dev.modify_device        = mthca_modify_device;

	dev->ib_dev.modify_port          = mthca_modify_port;

	dev->ib_dev.query_pkey           = mthca_query_pkey;

	dev->ib_dev.query_gid            = mthca_query_gid;