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

Commit 09f98baf authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc',... 

Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next
parents d1fbe04e 9c3da099 e5380527 71d98b46 1aedb772 4780c195 6b708b3d a6a47771 270b8b85 9d5ab133 6432f366

drivers/infiniband/core/cm.c

+7 −8
Original line number Diff line number Diff line
@@ -927,8 +927,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask, 
	unsigned long flags;

	int ret = 0;



	service_mask = service_mask ? service_mask :

		       __constant_cpu_to_be64(~0ULL);

	service_mask = service_mask ? service_mask : ~cpu_to_be64(0);

	service_id &= service_mask;

	if ((service_id & IB_SERVICE_ID_AGN_MASK) == IB_CM_ASSIGN_SERVICE_ID &&

	    (service_id != IB_CM_ASSIGN_SERVICE_ID))
@@ -954,7 +953,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask, 
	spin_lock_irqsave(&cm.lock, flags);

	if (service_id == IB_CM_ASSIGN_SERVICE_ID) {

		cm_id->service_id = cpu_to_be64(cm.listen_service_id++);

		cm_id->service_mask = __constant_cpu_to_be64(~0ULL);

		cm_id->service_mask = ~cpu_to_be64(0);

	} else {

		cm_id->service_id = service_id;

		cm_id->service_mask = service_mask;
@@ -1134,7 +1133,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, 
			goto error1;

	}

	cm_id->service_id = param->service_id;

	cm_id->service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id->service_mask = ~cpu_to_be64(0);

	cm_id_priv->timeout_ms = cm_convert_to_ms(

				    param->primary_path->packet_life_time) * 2 +

				 cm_convert_to_ms(
@@ -1545,7 +1544,7 @@ static int cm_req_handler(struct cm_work *work) 
	cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler;

	cm_id_priv->id.context = listen_cm_id_priv->id.context;

	cm_id_priv->id.service_id = req_msg->service_id;

	cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id_priv->id.service_mask = ~cpu_to_be64(0);



	cm_process_routed_req(req_msg, work->mad_recv_wc->wc);

	cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);
@@ -2898,7 +2897,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id, 
		goto out;



	cm_id->service_id = param->service_id;

	cm_id->service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id->service_mask = ~cpu_to_be64(0);

	cm_id_priv->timeout_ms = param->timeout_ms;

	cm_id_priv->max_cm_retries = param->max_cm_retries;

	ret = cm_alloc_msg(cm_id_priv, &msg);
@@ -2992,7 +2991,7 @@ static int cm_sidr_req_handler(struct cm_work *work) 
	cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler;

	cm_id_priv->id.context = cur_cm_id_priv->id.context;

	cm_id_priv->id.service_id = sidr_req_msg->service_id;

	cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);

	cm_id_priv->id.service_mask = ~cpu_to_be64(0);



	cm_format_sidr_req_event(work, &cur_cm_id_priv->id);

	cm_process_work(cm_id_priv, work);
@@ -3789,7 +3788,7 @@ static int __init ib_cm_init(void) 
	rwlock_init(&cm.device_lock);

	spin_lock_init(&cm.lock);

	cm.listen_service_table = RB_ROOT;

	cm.listen_service_id = __constant_be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);

	cm.listen_service_id = be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);

	cm.remote_id_table = RB_ROOT;

	cm.remote_qp_table = RB_ROOT;

	cm.remote_sidr_table = RB_ROOT;

drivers/infiniband/core/cm_msgs.h

+11 −11
Original line number Diff line number Diff line
@@ -44,17 +44,17 @@ 


#define IB_CM_CLASS_VERSION	2 /* IB specification 1.2 */



#define CM_REQ_ATTR_ID	    __constant_htons(0x0010)

#define CM_MRA_ATTR_ID	    __constant_htons(0x0011)

#define CM_REJ_ATTR_ID	    __constant_htons(0x0012)

#define CM_REP_ATTR_ID	    __constant_htons(0x0013)

#define CM_RTU_ATTR_ID	    __constant_htons(0x0014)

#define CM_DREQ_ATTR_ID	    __constant_htons(0x0015)

#define CM_DREP_ATTR_ID	    __constant_htons(0x0016)

#define CM_SIDR_REQ_ATTR_ID __constant_htons(0x0017)

#define CM_SIDR_REP_ATTR_ID __constant_htons(0x0018)

#define CM_LAP_ATTR_ID      __constant_htons(0x0019)

#define CM_APR_ATTR_ID      __constant_htons(0x001A)

#define CM_REQ_ATTR_ID		cpu_to_be16(0x0010)

#define CM_MRA_ATTR_ID		cpu_to_be16(0x0011)

#define CM_REJ_ATTR_ID		cpu_to_be16(0x0012)

#define CM_REP_ATTR_ID		cpu_to_be16(0x0013)

#define CM_RTU_ATTR_ID		cpu_to_be16(0x0014)

#define CM_DREQ_ATTR_ID		cpu_to_be16(0x0015)

#define CM_DREP_ATTR_ID		cpu_to_be16(0x0016)

#define CM_SIDR_REQ_ATTR_ID	cpu_to_be16(0x0017)

#define CM_SIDR_REP_ATTR_ID	cpu_to_be16(0x0018)

#define CM_LAP_ATTR_ID		cpu_to_be16(0x0019)

#define CM_APR_ATTR_ID		cpu_to_be16(0x001A)



enum cm_msg_sequence {

	CM_MSG_SEQUENCE_REQ,

drivers/infiniband/core/device.c

+3 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ void ib_dealloc_device(struct ib_device *device) 


	BUG_ON(device->reg_state != IB_DEV_UNREGISTERED);



	ib_device_unregister_sysfs(device);

	kobject_put(&device->dev.kobj);

}

EXPORT_SYMBOL(ib_dealloc_device);
@@ -348,6 +348,8 @@ void ib_unregister_device(struct ib_device *device) 


	mutex_unlock(&device_mutex);



	ib_device_unregister_sysfs(device);



	spin_lock_irqsave(&device->client_data_lock, flags);

	list_for_each_entry_safe(context, tmp, &device->client_data_list, list)

		kfree(context);

drivers/infiniband/core/mad.c

+20 −20
Original line number Diff line number Diff line
@@ -301,6 +301,16 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, 
	mad_agent_priv->agent.context = context;

	mad_agent_priv->agent.qp = port_priv->qp_info[qpn].qp;

	mad_agent_priv->agent.port_num = port_num;

	spin_lock_init(&mad_agent_priv->lock);

	INIT_LIST_HEAD(&mad_agent_priv->send_list);

	INIT_LIST_HEAD(&mad_agent_priv->wait_list);

	INIT_LIST_HEAD(&mad_agent_priv->done_list);

	INIT_LIST_HEAD(&mad_agent_priv->rmpp_list);

	INIT_DELAYED_WORK(&mad_agent_priv->timed_work, timeout_sends);

	INIT_LIST_HEAD(&mad_agent_priv->local_list);

	INIT_WORK(&mad_agent_priv->local_work, local_completions);

	atomic_set(&mad_agent_priv->refcount, 1);

	init_completion(&mad_agent_priv->comp);



	spin_lock_irqsave(&port_priv->reg_lock, flags);

	mad_agent_priv->agent.hi_tid = ++ib_mad_client_id;
@@ -350,17 +360,6 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, 
	list_add_tail(&mad_agent_priv->agent_list, &port_priv->agent_list);

	spin_unlock_irqrestore(&port_priv->reg_lock, flags);



	spin_lock_init(&mad_agent_priv->lock);

	INIT_LIST_HEAD(&mad_agent_priv->send_list);

	INIT_LIST_HEAD(&mad_agent_priv->wait_list);

	INIT_LIST_HEAD(&mad_agent_priv->done_list);

	INIT_LIST_HEAD(&mad_agent_priv->rmpp_list);

	INIT_DELAYED_WORK(&mad_agent_priv->timed_work, timeout_sends);

	INIT_LIST_HEAD(&mad_agent_priv->local_list);

	INIT_WORK(&mad_agent_priv->local_work, local_completions);

	atomic_set(&mad_agent_priv->refcount, 1);

	init_completion(&mad_agent_priv->comp);



	return &mad_agent_priv->agent;



error4:
@@ -743,9 +742,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 
		break;

	case IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED:

		kmem_cache_free(ib_mad_cache, mad_priv);

		kfree(local);

		ret = 1;

		goto out;

		break;

	case IB_MAD_RESULT_SUCCESS:

		/* Treat like an incoming receive MAD */

		port_priv = ib_get_mad_port(mad_agent_priv->agent.device,
@@ -756,10 +753,12 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 
						        &mad_priv->mad.mad);

		}

		if (!port_priv || !recv_mad_agent) {

			/*

			 * No receiving agent so drop packet and

			 * generate send completion.

			 */

			kmem_cache_free(ib_mad_cache, mad_priv);

			kfree(local);

			ret = 0;

			goto out;

			break;

		}

		local->mad_priv = mad_priv;

		local->recv_mad_agent = recv_mad_agent;
@@ -2356,7 +2355,7 @@ static void local_completions(struct work_struct *work) 
	struct ib_mad_local_private *local;

	struct ib_mad_agent_private *recv_mad_agent;

	unsigned long flags;

	int recv = 0;

	int free_mad;

	struct ib_wc wc;

	struct ib_mad_send_wc mad_send_wc;
@@ -2370,14 +2369,15 @@ static void local_completions(struct work_struct *work) 
				   completion_list);

		list_del(&local->completion_list);

		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);

		free_mad = 0;

		if (local->mad_priv) {

			recv_mad_agent = local->recv_mad_agent;

			if (!recv_mad_agent) {

				printk(KERN_ERR PFX "No receive MAD agent for local completion\n");

				free_mad = 1;

				goto local_send_completion;

			}



			recv = 1;

			/*

			 * Defined behavior is to complete response

			 * before request
@@ -2422,7 +2422,7 @@ local_send_completion: 


		spin_lock_irqsave(&mad_agent_priv->lock, flags);

		atomic_dec(&mad_agent_priv->refcount);

		if (!recv)

		if (free_mad)

			kmem_cache_free(ib_mad_cache, local->mad_priv);

		kfree(local);

	}

drivers/infiniband/core/mad_rmpp.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ process_rmpp_data(struct ib_mad_agent_private *agent, 
		goto bad;

	}



	if (rmpp_hdr->seg_num == __constant_htonl(1)) {

	if (rmpp_hdr->seg_num == cpu_to_be32(1)) {

		if (!(ib_get_rmpp_flags(rmpp_hdr) & IB_MGMT_RMPP_FLAG_FIRST)) {

			rmpp_status = IB_MGMT_RMPP_STATUS_BAD_SEG;

			goto bad;