diff options
author | Michael Brown | 2009-08-02 23:57:01 +0200 |
---|---|---|
committer | Michael Brown | 2009-08-06 02:24:18 +0200 |
commit | b0c563824b40240b223721ad0658e79946df27cc (patch) | |
tree | a375ff568ff3a6431ff1960faa9f67f7085440e2 /src/drivers | |
parent | [build] Mark __intel_new_proc_init with __libgcc rather than cdecl (diff) | |
download | ipxe-b0c563824b40240b223721ad0658e79946df27cc.tar.gz ipxe-b0c563824b40240b223721ad0658e79946df27cc.tar.xz ipxe-b0c563824b40240b223721ad0658e79946df27cc.zip |
[infiniband] Change IB_{QPN,QKEY,QPT} names from {SMA,GMA} to {SMI,GSI}
The IBA specification refers to management "interfaces" and "agents".
The interface is the component that connects to the queue pair and
sends and receives MADs; the agent is the component that constructs
the reply to the MAD.
Rename the IB_{QPN,QKEY,QPT} constants as a first step towards making
this separation in gPXE.
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/infiniband/hermon.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/drivers/infiniband/hermon.c b/src/drivers/infiniband/hermon.c index a8c7a8f8..f4e228e2 100644 --- a/src/drivers/infiniband/hermon.c +++ b/src/drivers/infiniband/hermon.c @@ -831,10 +831,10 @@ static int hermon_alloc_qpn ( struct ib_device *ibdev, port_offset = ( ibdev->port - HERMON_PORT_BASE ); switch ( qp->type ) { - case IB_QPT_SMA: + case IB_QPT_SMI: qp->qpn = ( hermon->special_qpn_base + port_offset ); return 0; - case IB_QPT_GMA: + case IB_QPT_GSI: qp->qpn = ( hermon->special_qpn_base + 2 + port_offset ); return 0; case IB_QPT_UD: @@ -892,15 +892,15 @@ static unsigned int hermon_rate ( struct ib_address_vector *av ) { */ static unsigned int hermon_sched_queue ( struct ib_device *ibdev, struct ib_queue_pair *qp ) { - return ( ( ( qp->type == IB_QPT_SMA ) ? + return ( ( ( qp->type == IB_QPT_SMI ) ? HERMON_SCHED_QP0 : HERMON_SCHED_DEFAULT ) | ( ( ibdev->port - 1 ) << 6 ) ); } /** Queue pair transport service type map */ static uint8_t hermon_qp_st[] = { - [IB_QPT_SMA] = HERMON_ST_MLX, - [IB_QPT_GMA] = HERMON_ST_MLX, + [IB_QPT_SMI] = HERMON_ST_MLX, + [IB_QPT_GSI] = HERMON_ST_MLX, [IB_QPT_UD] = HERMON_ST_UD, [IB_QPT_RC] = HERMON_ST_RC, }; @@ -1214,7 +1214,7 @@ hermon_fill_mlx_send_wqe ( struct ib_device *ibdev, icrc, 0 /* generate ICRC */, max_statrate, hermon_rate ( av ), slr, 0, - v15, ( ( qp->ext_qpn == IB_QPN_SMA ) ? 1 : 0 ) ); + v15, ( ( qp->ext_qpn == IB_QPN_SMI ) ? 1 : 0 ) ); MLX_FILL_1 ( &wqe->mlx.ctrl, 3, rlid, av->lid ); MLX_FILL_1 ( &wqe->mlx.data[0], 0, byte_count, iob_len ( &headers ) ); @@ -1264,8 +1264,8 @@ static unsigned int struct ib_address_vector *av, struct io_buffer *iobuf, union hermon_send_wqe *wqe ) = { - [IB_QPT_SMA] = hermon_fill_mlx_send_wqe, - [IB_QPT_GMA] = hermon_fill_mlx_send_wqe, + [IB_QPT_SMI] = hermon_fill_mlx_send_wqe, + [IB_QPT_GSI] = hermon_fill_mlx_send_wqe, [IB_QPT_UD] = hermon_fill_ud_send_wqe, [IB_QPT_RC] = hermon_fill_rc_send_wqe, }; @@ -1444,8 +1444,8 @@ static int hermon_complete ( struct ib_device *ibdev, assert ( len <= iob_tailroom ( iobuf ) ); iob_put ( iobuf, len ); switch ( qp->type ) { - case IB_QPT_SMA: - case IB_QPT_GMA: + case IB_QPT_SMI: + case IB_QPT_GSI: case IB_QPT_UD: assert ( iob_len ( iobuf ) >= sizeof ( *grh ) ); grh = iobuf->data; |