---

yaml
---
r: 316375
b: refs/heads/master
c: 9bbeb66
h: refs/heads/master
i:
  316373: 5cdf431
  316371: 75812de
  316367: d3bb684
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6634961c14d38ef64ec284c07aecb03d3dd03b4a
+refs/heads/master: 9bbeb6663ea2f069bd3bb6387fe7a824def21064

trunk/drivers/infiniband/core/cm_msgs.h

@@ -44,6 +44,18 @@
 
 #define IB_CM_CLASS_VERSION	2 /* IB specification 1.2 */
 
+#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,
 	CM_MSG_SEQUENCE_LAP,

trunk/drivers/infiniband/core/sa_query.c

@@ -94,12 +94,6 @@ struct ib_sa_path_query {
 	struct ib_sa_query sa_query;
 };
 
-struct ib_sa_guidinfo_query {
-	void (*callback)(int, struct ib_sa_guidinfo_rec *, void *);
-	void *context;
-	struct ib_sa_query sa_query;
-};
-
 struct ib_sa_mcmember_query {
 	void (*callback)(int, struct ib_sa_mcmember_rec *, void *);
 	void *context;
@@ -353,34 +347,6 @@ static const struct ib_field service_rec_table[] = {
 	  .size_bits    = 2*64 },
 };
 
-#define GUIDINFO_REC_FIELD(field) \
-	.struct_offset_bytes = offsetof(struct ib_sa_guidinfo_rec, field),	\
-	.struct_size_bytes   = sizeof((struct ib_sa_guidinfo_rec *) 0)->field,	\
-	.field_name          = "sa_guidinfo_rec:" #field
-
-static const struct ib_field guidinfo_rec_table[] = {
-	{ GUIDINFO_REC_FIELD(lid),
-	  .offset_words = 0,
-	  .offset_bits  = 0,
-	  .size_bits    = 16 },
-	{ GUIDINFO_REC_FIELD(block_num),
-	  .offset_words = 0,
-	  .offset_bits  = 16,
-	  .size_bits    = 8 },
-	{ GUIDINFO_REC_FIELD(res1),
-	  .offset_words = 0,
-	  .offset_bits  = 24,
-	  .size_bits    = 8 },
-	{ GUIDINFO_REC_FIELD(res2),
-	  .offset_words = 1,
-	  .offset_bits  = 0,
-	  .size_bits    = 32 },
-	{ GUIDINFO_REC_FIELD(guid_info_list),
-	  .offset_words = 2,
-	  .offset_bits  = 0,
-	  .size_bits    = 512 },
-};
-
 static void free_sm_ah(struct kref *kref)
 {
 	struct ib_sa_sm_ah *sm_ah = container_of(kref, struct ib_sa_sm_ah, ref);
@@ -979,105 +945,6 @@ int ib_sa_mcmember_rec_query(struct ib_sa_client *client,
 	return ret;
 }
 
-/* Support GuidInfoRecord */
-static void ib_sa_guidinfo_rec_callback(struct ib_sa_query *sa_query,
-					int status,
-					struct ib_sa_mad *mad)
-{
-	struct ib_sa_guidinfo_query *query =
-		container_of(sa_query, struct ib_sa_guidinfo_query, sa_query);
-
-	if (mad) {
-		struct ib_sa_guidinfo_rec rec;
-
-		ib_unpack(guidinfo_rec_table, ARRAY_SIZE(guidinfo_rec_table),
-			  mad->data, &rec);
-		query->callback(status, &rec, query->context);
-	} else
-		query->callback(status, NULL, query->context);
-}
-
-static void ib_sa_guidinfo_rec_release(struct ib_sa_query *sa_query)
-{
-	kfree(container_of(sa_query, struct ib_sa_guidinfo_query, sa_query));
-}
-
-int ib_sa_guid_info_rec_query(struct ib_sa_client *client,
-			      struct ib_device *device, u8 port_num,
-			      struct ib_sa_guidinfo_rec *rec,
-			      ib_sa_comp_mask comp_mask, u8 method,
-			      int timeout_ms, gfp_t gfp_mask,
-			      void (*callback)(int status,
-					       struct ib_sa_guidinfo_rec *resp,
-					       void *context),
-			      void *context,
-			      struct ib_sa_query **sa_query)
-{
-	struct ib_sa_guidinfo_query *query;
-	struct ib_sa_device *sa_dev = ib_get_client_data(device, &sa_client);
-	struct ib_sa_port *port;
-	struct ib_mad_agent *agent;
-	struct ib_sa_mad *mad;
-	int ret;
-
-	if (!sa_dev)
-		return -ENODEV;
-
-	if (method != IB_MGMT_METHOD_GET &&
-	    method != IB_MGMT_METHOD_SET &&
-	    method != IB_SA_METHOD_DELETE) {
-		return -EINVAL;
-	}
-
-	port  = &sa_dev->port[port_num - sa_dev->start_port];
-	agent = port->agent;
-
-	query = kmalloc(sizeof *query, gfp_mask);
-	if (!query)
-		return -ENOMEM;
-
-	query->sa_query.port = port;
-	ret = alloc_mad(&query->sa_query, gfp_mask);
-	if (ret)
-		goto err1;
-
-	ib_sa_client_get(client);
-	query->sa_query.client = client;
-	query->callback        = callback;
-	query->context         = context;
-
-	mad = query->sa_query.mad_buf->mad;
-	init_mad(mad, agent);
-
-	query->sa_query.callback = callback ? ib_sa_guidinfo_rec_callback : NULL;
-	query->sa_query.release  = ib_sa_guidinfo_rec_release;
-
-	mad->mad_hdr.method	 = method;
-	mad->mad_hdr.attr_id	 = cpu_to_be16(IB_SA_ATTR_GUID_INFO_REC);
-	mad->sa_hdr.comp_mask	 = comp_mask;
-
-	ib_pack(guidinfo_rec_table, ARRAY_SIZE(guidinfo_rec_table), rec,
-		mad->data);
-
-	*sa_query = &query->sa_query;
-
-	ret = send_mad(&query->sa_query, timeout_ms, gfp_mask);
-	if (ret < 0)
-		goto err2;
-
-	return ret;
-
-err2:
-	*sa_query = NULL;
-	ib_sa_client_put(query->sa_query.client);
-	free_mad(&query->sa_query);
-
-err1:
-	kfree(query);
-	return ret;
-}
-EXPORT_SYMBOL(ib_sa_guid_info_rec_query);
-
 static void send_handler(struct ib_mad_agent *agent,
 			 struct ib_mad_send_wc *mad_send_wc)
 {

trunk/drivers/infiniband/hw/mlx4/mad.c

@@ -147,51 +147,47 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)
 }
 
 /*
- * Snoop SM MADs for port info, GUID info, and  P_Key table sets, so we can
- * synthesize LID change, Client-Rereg, GID change, and P_Key change events.
+ * Snoop SM MADs for port info and P_Key table sets, so we can
+ * synthesize LID change and P_Key change events.
  */
 static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
-		      u16 prev_lid)
+				u16 prev_lid)
 {
-	struct ib_port_info *pinfo;
-	u16 lid;
+	struct ib_event event;
 
-	struct mlx4_ib_dev *dev = to_mdev(ibdev);
 	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_SET)
-		switch (mad->mad_hdr.attr_id) {
-		case IB_SMP_ATTR_PORT_INFO:
-			pinfo = (struct ib_port_info *) ((struct ib_smp *) mad)->data;
-			lid = be16_to_cpu(pinfo->lid);
+	    mad->mad_hdr.method == IB_MGMT_METHOD_SET) {
+		if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PORT_INFO) {
+			struct ib_port_info *pinfo =
+				(struct ib_port_info *) ((struct ib_smp *) mad)->data;
+			u16 lid = be16_to_cpu(pinfo->lid);
 
-			update_sm_ah(dev, port_num,
+			update_sm_ah(to_mdev(ibdev), port_num,
 				     be16_to_cpu(pinfo->sm_lid),
 				     pinfo->neighbormtu_mastersmsl & 0xf);
 
-			if (pinfo->clientrereg_resv_subnetto & 0x80)
-				mlx4_ib_dispatch_event(dev, port_num,
-						       IB_EVENT_CLIENT_REREGISTER);
+			event.device	       = ibdev;
+			event.element.port_num = port_num;
 
-			if (prev_lid != lid)
-				mlx4_ib_dispatch_event(dev, port_num,
-						       IB_EVENT_LID_CHANGE);
-			break;
+			if (pinfo->clientrereg_resv_subnetto & 0x80) {
+				event.event    = IB_EVENT_CLIENT_REREGISTER;
+				ib_dispatch_event(&event);
+			}
 
-		case IB_SMP_ATTR_PKEY_TABLE:
-			mlx4_ib_dispatch_event(dev, port_num,
-					       IB_EVENT_PKEY_CHANGE);
-			break;
+			if (prev_lid != lid) {
+				event.event    = IB_EVENT_LID_CHANGE;
+				ib_dispatch_event(&event);
+			}
+		}
 
-		case IB_SMP_ATTR_GUID_INFO:
-			/* paravirtualized master's guid is guid 0 -- does not change */
-			if (!mlx4_is_master(dev->dev))
-				mlx4_ib_dispatch_event(dev, port_num,
-						       IB_EVENT_GID_CHANGE);
-			break;
-		default:
-			break;
+		if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PKEY_TABLE) {
+			event.device	       = ibdev;
+			event.event	       = IB_EVENT_PKEY_CHANGE;
+			event.element.port_num = port_num;
+			ib_dispatch_event(&event);
 		}
+	}
 }
 
 static void node_desc_override(struct ib_device *dev,
@@ -246,25 +242,6 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
 	int err;
 	struct ib_port_attr pattr;
 
-	if (in_wc && in_wc->qp->qp_num) {
-		pr_debug("received MAD: slid:%d sqpn:%d "
-			"dlid_bits:%d dqpn:%d wc_flags:0x%x, cls %x, mtd %x, atr %x\n",
-			in_wc->slid, in_wc->src_qp,
-			in_wc->dlid_path_bits,
-			in_wc->qp->qp_num,
-			in_wc->wc_flags,
-			in_mad->mad_hdr.mgmt_class, in_mad->mad_hdr.method,
-			be16_to_cpu(in_mad->mad_hdr.attr_id));
-		if (in_wc->wc_flags & IB_WC_GRH) {
-			pr_debug("sgid_hi:0x%016llx sgid_lo:0x%016llx\n",
-				 be64_to_cpu(in_grh->sgid.global.subnet_prefix),
-				 be64_to_cpu(in_grh->sgid.global.interface_id));
-			pr_debug("dgid_hi:0x%016llx dgid_lo:0x%016llx\n",
-				 be64_to_cpu(in_grh->dgid.global.subnet_prefix),
-				 be64_to_cpu(in_grh->dgid.global.interface_id));
-		}
-	}
-
 	slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);
 
 	if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP && slid == 0) {
@@ -309,8 +286,7 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
 		return IB_MAD_RESULT_FAILURE;
 
 	if (!out_mad->mad_hdr.status) {
-		if (!(to_mdev(ibdev)->dev->caps.flags & MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV))
-			smp_snoop(ibdev, port_num, in_mad, prev_lid);
+		smp_snoop(ibdev, port_num, in_mad, prev_lid);
 		node_desc_override(ibdev, out_mad);
 	}
 
@@ -451,64 +427,3 @@ void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev)
 			ib_destroy_ah(dev->sm_ah[p]);
 	}
 }
-
-void handle_port_mgmt_change_event(struct work_struct *work)
-{
-	struct ib_event_work *ew = container_of(work, struct ib_event_work, work);
-	struct mlx4_ib_dev *dev = ew->ib_dev;
-	struct mlx4_eqe *eqe = &(ew->ib_eqe);
-	u8 port = eqe->event.port_mgmt_change.port;
-	u32 changed_attr;
-
-	switch (eqe->subtype) {
-	case MLX4_DEV_PMC_SUBTYPE_PORT_INFO:
-		changed_attr = be32_to_cpu(eqe->event.port_mgmt_change.params.port_info.changed_attr);
-
-		/* Update the SM ah - This should be done before handling
-		   the other changed attributes so that MADs can be sent to the SM */
-		if (changed_attr & MSTR_SM_CHANGE_MASK) {
-			u16 lid = be16_to_cpu(eqe->event.port_mgmt_change.params.port_info.mstr_sm_lid);
-			u8 sl = eqe->event.port_mgmt_change.params.port_info.mstr_sm_sl & 0xf;
-			update_sm_ah(dev, port, lid, sl);
-		}
-
-		/* Check if it is a lid change event */
-		if (changed_attr & MLX4_EQ_PORT_INFO_LID_CHANGE_MASK)
-			mlx4_ib_dispatch_event(dev, port, IB_EVENT_LID_CHANGE);
-
-		/* Generate GUID changed event */
-		if (changed_attr & MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK)
-			mlx4_ib_dispatch_event(dev, port, IB_EVENT_GID_CHANGE);
-
-		if (changed_attr & MLX4_EQ_PORT_INFO_CLIENT_REREG_MASK)
-			mlx4_ib_dispatch_event(dev, port,
-					       IB_EVENT_CLIENT_REREGISTER);
-		break;
-
-	case MLX4_DEV_PMC_SUBTYPE_PKEY_TABLE:
-		mlx4_ib_dispatch_event(dev, port, IB_EVENT_PKEY_CHANGE);
-		break;
-	case MLX4_DEV_PMC_SUBTYPE_GUID_INFO:
-		/* paravirtualized master's guid is guid 0 -- does not change */
-		if (!mlx4_is_master(dev->dev))
-			mlx4_ib_dispatch_event(dev, port, IB_EVENT_GID_CHANGE);
-		break;
-	default:
-		pr_warn("Unsupported subtype 0x%x for "
-			"Port Management Change event\n", eqe->subtype);
-	}
-
-	kfree(ew);
-}
-
-void mlx4_ib_dispatch_event(struct mlx4_ib_dev *dev, u8 port_num,
-			    enum ib_event_type type)
-{
-	struct ib_event event;
-
-	event.device		= &dev->ib_dev;
-	event.element.port_num	= port_num;
-	event.event		= type;
-
-	ib_dispatch_event(&event);
-}