Browse Source

[infiniband] Use "%#lx" as format specifier for queue pair numbers

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 8 years ago
parent
commit
7aef4d4c94

+ 2
- 2
src/net/infiniband/ib_cm.c View File

280
 		qp->send.psn = ( ntohl ( rep->starting_psn ) >> 8 );
280
 		qp->send.psn = ( ntohl ( rep->starting_psn ) >> 8 );
281
 		private_data = &rep->private_data;
281
 		private_data = &rep->private_data;
282
 		private_data_len = sizeof ( rep->private_data );
282
 		private_data_len = sizeof ( rep->private_data );
283
-		DBGC ( conn, "CM %p connected to QPN %lx PSN %x\n",
283
+		DBGC ( conn, "CM %p connected to QPN %#lx PSN %#x\n",
284
 		       conn, qp->av.qpn, qp->send.psn );
284
 		       conn, qp->av.qpn, qp->send.psn );
285
 
285
 
286
 		/* Modify queue pair */
286
 		/* Modify queue pair */
466
 	/* Add to list of connections */
466
 	/* Add to list of connections */
467
 	list_add ( &conn->list, &ib_cm_conns );
467
 	list_add ( &conn->list, &ib_cm_conns );
468
 
468
 
469
-	DBGC ( conn, "CM %p created for IBDEV %s QPN %lx\n",
469
+	DBGC ( conn, "CM %p created for IBDEV %s QPN %#lx\n",
470
 	       conn, ibdev->name, qp->qpn );
470
 	       conn, ibdev->name, qp->qpn );
471
 	DBGC ( conn, "CM %p connecting to " IB_GID_FMT " " IB_GUID_FMT "\n",
471
 	DBGC ( conn, "CM %p connecting to " IB_GID_FMT " " IB_GUID_FMT "\n",
472
 	       conn, IB_GID_ARGS ( dgid ), IB_GUID_ARGS ( service_id ) );
472
 	       conn, IB_GID_ARGS ( dgid ), IB_GUID_ARGS ( service_id ) );

+ 1
- 1
src/net/infiniband/ib_cmrc.c View File

428
 		goto err_create_qp;
428
 		goto err_create_qp;
429
 	}
429
 	}
430
 	ib_qp_set_ownerdata ( cmrc->qp, cmrc );
430
 	ib_qp_set_ownerdata ( cmrc->qp, cmrc );
431
-	DBGC ( cmrc, "CMRC %p using QPN %lx\n", cmrc, cmrc->qp->qpn );
431
+	DBGC ( cmrc, "CMRC %p using QPN %#lx\n", cmrc, cmrc->qp->qpn );
432
 
432
 
433
 	/* Attach to parent interface, transfer reference (implicitly)
433
 	/* Attach to parent interface, transfer reference (implicitly)
434
 	 * to our shutdown process, and return.
434
 	 * to our shutdown process, and return.

+ 8
- 8
src/net/infiniband/ib_mcast.c View File

94
 	if ( ( rc == 0 ) && ( mad->hdr.status != htons ( IB_MGMT_STATUS_OK ) ))
94
 	if ( ( rc == 0 ) && ( mad->hdr.status != htons ( IB_MGMT_STATUS_OK ) ))
95
 		rc = -ENOTCONN;
95
 		rc = -ENOTCONN;
96
 	if ( rc != 0 ) {
96
 	if ( rc != 0 ) {
97
-		DBGC ( ibdev, "IBDEV %s QPN %lx join failed: %s\n",
97
+		DBGC ( ibdev, "IBDEV %s QPN %#lx join failed: %s\n",
98
 		       ibdev->name, qp->qpn, strerror ( rc ) );
98
 		       ibdev->name, qp->qpn, strerror ( rc ) );
99
 		goto out;
99
 		goto out;
100
 	}
100
 	}
102
 	/* Extract values from MAD */
102
 	/* Extract values from MAD */
103
 	joined = ( mad->hdr.method == IB_MGMT_METHOD_GET_RESP );
103
 	joined = ( mad->hdr.method == IB_MGMT_METHOD_GET_RESP );
104
 	qkey = ntohl ( mc_member_record->qkey );
104
 	qkey = ntohl ( mc_member_record->qkey );
105
-	DBGC ( ibdev, "IBDEV %s QPN %lx %s " IB_GID_FMT " qkey %lx\n",
105
+	DBGC ( ibdev, "IBDEV %s QPN %#lx %s " IB_GID_FMT " qkey %lx\n",
106
 	       ibdev->name, qp->qpn, ( joined ? "joined" : "left" ),
106
 	       ibdev->name, qp->qpn, ( joined ? "joined" : "left" ),
107
 	       IB_GID_ARGS ( gid ), qkey );
107
 	       IB_GID_ARGS ( gid ), qkey );
108
 
108
 
109
 	/* Set queue key */
109
 	/* Set queue key */
110
 	qp->qkey = qkey;
110
 	qp->qkey = qkey;
111
 	if ( ( rc = ib_modify_qp ( ibdev, qp ) ) != 0 ) {
111
 	if ( ( rc = ib_modify_qp ( ibdev, qp ) ) != 0 ) {
112
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not modify qkey: %s\n",
112
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not modify qkey: %s\n",
113
 		       ibdev->name, qp->qpn, strerror ( rc ) );
113
 		       ibdev->name, qp->qpn, strerror ( rc ) );
114
 		goto out;
114
 		goto out;
115
 	}
115
 	}
147
 	union ib_mad mad;
147
 	union ib_mad mad;
148
 	int rc;
148
 	int rc;
149
 
149
 
150
-	DBGC ( ibdev, "IBDEV %s QPN %lx joining " IB_GID_FMT "\n",
150
+	DBGC ( ibdev, "IBDEV %s QPN %#lx joining " IB_GID_FMT "\n",
151
 	       ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) );
151
 	       ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) );
152
 
152
 
153
 	/* Sanity check */
153
 	/* Sanity check */
160
 
160
 
161
 	/* Attach queue pair to multicast GID */
161
 	/* Attach queue pair to multicast GID */
162
 	if ( ( rc = ib_mcast_attach ( ibdev, qp, gid ) ) != 0 ) {
162
 	if ( ( rc = ib_mcast_attach ( ibdev, qp, gid ) ) != 0 ) {
163
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not attach: %s\n",
163
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not attach: %s\n",
164
 		       ibdev->name, qp->qpn, strerror ( rc ) );
164
 		       ibdev->name, qp->qpn, strerror ( rc ) );
165
 		goto err_mcast_attach;
165
 		goto err_mcast_attach;
166
 	}
166
 	}
170
 	membership->madx = ib_create_madx ( ibdev, ibdev->gsi, &mad, NULL,
170
 	membership->madx = ib_create_madx ( ibdev, ibdev->gsi, &mad, NULL,
171
 					    &ib_mcast_op );
171
 					    &ib_mcast_op );
172
 	if ( ! membership->madx ) {
172
 	if ( ! membership->madx ) {
173
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not create join "
173
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not create join "
174
 		       "transaction\n", ibdev->name, qp->qpn );
174
 		       "transaction\n", ibdev->name, qp->qpn );
175
 		rc = -ENOMEM;
175
 		rc = -ENOMEM;
176
 		goto err_create_madx;
176
 		goto err_create_madx;
199
 	union ib_mad mad;
199
 	union ib_mad mad;
200
 	int rc;
200
 	int rc;
201
 
201
 
202
-	DBGC ( ibdev, "IBDEV %s QPN %lx leaving " IB_GID_FMT "\n",
202
+	DBGC ( ibdev, "IBDEV %s QPN %#lx leaving " IB_GID_FMT "\n",
203
 	       ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) );
203
 	       ibdev->name, qp->qpn, IB_GID_ARGS ( gid ) );
204
 
204
 
205
 	/* Sanity check */
205
 	/* Sanity check */
217
 	/* Send a single group leave MAD */
217
 	/* Send a single group leave MAD */
218
 	ib_mcast_mad ( ibdev, &membership->gid, 0, &mad );
218
 	ib_mcast_mad ( ibdev, &membership->gid, 0, &mad );
219
 	if ( ( rc = ib_mi_send ( ibdev, ibdev->gsi, &mad, NULL ) ) != 0 ) {
219
 	if ( ( rc = ib_mi_send ( ibdev, ibdev->gsi, &mad, NULL ) ) != 0 ) {
220
-		DBGC ( ibdev, "IBDEV %s QPN %lx could not send leave request: "
220
+		DBGC ( ibdev, "IBDEV %s QPN %#lx could not send leave request: "
221
 		       "%s\n", ibdev->name, qp->qpn, strerror ( rc ) );
221
 		       "%s\n", ibdev->name, qp->qpn, strerror ( rc ) );
222
 	}
222
 	}
223
 }
223
 }

+ 1
- 1
src/net/infiniband/ib_packet.c View File

234
 		} else {
234
 		} else {
235
 			if ( ! ( *qp = ib_find_qp_qpn ( ibdev, dest->qpn ) ) ) {
235
 			if ( ! ( *qp = ib_find_qp_qpn ( ibdev, dest->qpn ) ) ) {
236
 				DBGC ( ibdev, "IBDEV %s RX for nonexistent "
236
 				DBGC ( ibdev, "IBDEV %s RX for nonexistent "
237
-				       "QPN %lx\n", ibdev->name, dest->qpn );
237
+				       "QPN %#lx\n", ibdev->name, dest->qpn );
238
 				return -ENODEV;
238
 				return -ENODEV;
239
 			}
239
 			}
240
 		}
240
 		}

Loading…
Cancel
Save