From: sleybo Date: Wed, 7 Feb 2007 13:12:18 +0000 (+0000) Subject: [IBAL\IPOIB\INC\WSD\SDP\MTHCA] change 2 defines to match Linux ib_types. X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4bef617142d3dfb947c7b7cec2c7a2c965b8d238;p=~shefty%2Frdma-win.git [IBAL\IPOIB\INC\WSD\SDP\MTHCA] change 2 defines to match Linux ib_types. git-svn-id: svn://openib.tc.cornell.edu/gen1@584 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/trunk/core/al/al_cm_qp.c b/trunk/core/al/al_cm_qp.c index cf367e75..187a81da 100644 --- a/trunk/core/al/al_cm_qp.c +++ b/trunk/core/al/al_cm_qp.c @@ -690,7 +690,7 @@ __proc_lap( 1, IB_DEFAULT_PKEY, conn_lap_path_get_svc_lvl( &p_lap->alternate_path ), IB_PATH_SELECTOR_EXACTLY, - IB_MTU_2048, + IB_MTU_LEN_2048, IB_PATH_SELECTOR_EXACTLY, conn_lap_path_get_pkt_rate( p_path ), IB_PATH_SELECTOR_EXACTLY, diff --git a/trunk/core/al/al_dm.c b/trunk/core/al/al_dm.c index c858c762..75a2ef08 100644 --- a/trunk/core/al/al_dm.c +++ b/trunk/core/al/al_dm.c @@ -1500,7 +1500,7 @@ dm_agent_get( get_io_unit_info( p_iou, p_dm_mad ); break; - case IB_MAD_ATTR_IOC_PROFILE: + case IB_MAD_ATTR_IO_CONTROLLER_PROFILE: { uint8_t slot; diff --git a/trunk/core/al/kernel/al_ioc_pnp.c b/trunk/core/al/kernel/al_ioc_pnp.c index 6046923d..d45dc2d4 100644 --- a/trunk/core/al/kernel/al_ioc_pnp.c +++ b/trunk/core/al/kernel/al_ioc_pnp.c @@ -2069,7 +2069,7 @@ __ioc_pnp_recv_cb( (ib_dm_mad_t*)p_mad_response->p_mad_buf ); break; - case IB_MAD_ATTR_IOC_PROFILE: + case IB_MAD_ATTR_IO_CONTROLLER_PROFILE: p_iou = (iou_node_t* __ptr64)p_mad_response->send_context2; __ioc_profile_resp( p_iou, (ib_dm_mad_t*)p_mad_response->p_mad_buf ); @@ -2386,7 +2386,7 @@ __query_ioc_profiles( break; __format_dm_get( p_results, p_iou, p_iou->p_config_path, - IB_MAD_ATTR_IOC_PROFILE, cl_hton32( slot ), p_mad ); + IB_MAD_ATTR_IO_CONTROLLER_PROFILE, cl_hton32( slot ), p_mad ); /* Chain the MAD up. */ p_mad->p_next = p_mad_list; diff --git a/trunk/hw/mthca/kernel/ib_verbs.h b/trunk/hw/mthca/kernel/ib_verbs.h index 192c24ae..af98d422 100644 --- a/trunk/hw/mthca/kernel/ib_verbs.h +++ b/trunk/hw/mthca/kernel/ib_verbs.h @@ -121,11 +121,11 @@ struct ib_device_attr { static inline int ib_mtu_enum_to_int(int mtu) { switch (mtu) { - case IB_MTU_256: return 256; - case IB_MTU_512: return 512; - case IB_MTU_1024: return 1024; - case IB_MTU_2048: return 2048; - case IB_MTU_4096: return 4096; + case IB_MTU_LEN_256: return 256; + case IB_MTU_LEN_512: return 512; + case IB_MTU_LEN_1024: return 1024; + case IB_MTU_LEN_2048: return 2048; + case IB_MTU_LEN_4096: return 4096; default: return -1; } } diff --git a/trunk/hw/mthca/kernel/mthca_qp.c b/trunk/hw/mthca/kernel/mthca_qp.c index 8232bcc3..a07b4da6 100644 --- a/trunk/hw/mthca/kernel/mthca_qp.c +++ b/trunk/hw/mthca/kernel/mthca_qp.c @@ -635,9 +635,9 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask) /* leave tavor_sched_queue as 0 */ if (qp->transport == MLX || qp->transport == UD) - qp_context->mtu_msgmax = (IB_MTU_2048 << 5) | 11; + qp_context->mtu_msgmax = (IB_MTU_LEN_2048 << 5) | 11; else if (attr_mask & IB_QP_PATH_MTU) { - if (attr->path_mtu < IB_MTU_256 || attr->path_mtu > IB_MTU_2048) { + if (attr->path_mtu < IB_MTU_LEN_256 || attr->path_mtu > IB_MTU_LEN_2048) { HCA_PRINT(TRACE_LEVEL_ERROR ,HCA_DBG_QP, ("path MTU (%u) is invalid\n", attr->path_mtu)); goto out_mailbox; diff --git a/trunk/inc/iba/ib_types.h b/trunk/inc/iba/ib_types.h index abc02434..62ebb818 100644 --- a/trunk/inc/iba/ib_types.h +++ b/trunk/inc/iba/ib_types.h @@ -1,5 +1,7 @@ /* * Copyright (c) 2005 SilverStorm Technologies. All rights reserved. + * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved. + * Copyright (c) 2002-2006 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * * This software is available to you under the OpenIB.org BSD license @@ -1339,16 +1341,17 @@ ib_class_is_rmpp( */ #define IB_MAD_ATTR_IO_UNIT_INFO (CL_NTOH16(0x0010)) /**********/ -/****d* IBA Base: Constants/IB_MAD_ATTR_IOC_PROFILE + +/****d* IBA Base: Constants/IB_MAD_ATTR_IO_CONTROLLER_PROFILE * NAME -* IB_MAD_ATTR_IOC_PROFILE +* IB_MAD_ATTR_IO_CONTROLLER_PROFILE * * DESCRIPTION * IOControllerProfile attribute (16.3.3) * * SOURCE */ -#define IB_MAD_ATTR_IOC_PROFILE (CL_NTOH16(0x0011)) +#define IB_MAD_ATTR_IO_CONTROLLER_PROFILE (CL_NTOH16(0x0011)) /**********/ /****d* IBA Base: Constants/IB_MAD_ATTR_SERVICE_ENTRIES * NAME @@ -1509,9 +1512,9 @@ ib_class_is_rmpp( #define IB_NOTICE_NODE_TYPE_SUBN_MGMT (CL_NTOH32(0x000004)) /**********/ -/****d* IBA Base: Constants/IB_MTU_TYPE +/****d* IBA Base: Constants/IB_MTU_LEN_TYPE * NAME -* IB_MTU_TYPE +* IB_MTU_LEN_TYPE * * DESCRIPTION * Encoded path MTU. @@ -1524,11 +1527,15 @@ ib_class_is_rmpp( * * SOURCE */ -#define IB_MTU_256 1 -#define IB_MTU_512 2 -#define IB_MTU_1024 3 -#define IB_MTU_2048 4 -#define IB_MTU_4096 5 +#define IB_MTU_LEN_256 1 +#define IB_MTU_LEN_512 2 +#define IB_MTU_LEN_1024 3 +#define IB_MTU_LEN_2048 4 +#define IB_MTU_LEN_4096 5 + +#define IB_MIN_MTU IB_MTU_LEN_256 +#define IB_MAX_MTU IB_MTU_LEN_4096 + /**********/ /****d* IBA Base: Constants/IB_PATH_SELECTOR_TYPE diff --git a/trunk/tests/alts/cmtests.c b/trunk/tests/alts/cmtests.c index 235bdb0a..7e7661ac 100644 --- a/trunk/tests/alts/cmtests.c +++ b/trunk/tests/alts/cmtests.c @@ -2251,7 +2251,7 @@ alts_cm_client_server( p_path_client->dlid = p_ca_obj->dlid; p_path_client->num_path = 1; p_path_client->pkey = p_ca_obj->p_src_port_attr->p_pkey_table[0]; - p_path_client->mtu = IB_MTU_256; + p_path_client->mtu = IB_MTU_LEN_256; p_path_client->pkt_life = 10; cl_memclr( p_req_client, sizeof(ib_cm_req_t) ); diff --git a/trunk/tests/wsd/user/test2/ibwrap.c b/trunk/tests/wsd/user/test2/ibwrap.c index 2441b772..50a6cce4 100644 --- a/trunk/tests/wsd/user/test2/ibwrap.c +++ b/trunk/tests/wsd/user/test2/ibwrap.c @@ -292,7 +292,7 @@ int connect_qp(struct qp_pack *qp1, struct qp_pack *qp2) qp_mod.state.rtr.primary_av.port_num = qp1->hca_port->port_num; qp_mod.state.rtr.primary_av.conn.local_ack_timeout = 0; - qp_mod.state.rtr.primary_av.conn.path_mtu = IB_MTU_2048; + qp_mod.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_2048; qp_mod.state.rtr.primary_av.conn.rnr_retry_cnt = 6; qp_mod.state.rtr.primary_av.conn.seq_err_retry_cnt = 6; diff --git a/trunk/tests/wsd/user/test3/ibwrap.c b/trunk/tests/wsd/user/test3/ibwrap.c index 10223e0b..dd3e90d3 100644 --- a/trunk/tests/wsd/user/test3/ibwrap.c +++ b/trunk/tests/wsd/user/test3/ibwrap.c @@ -296,7 +296,7 @@ int connect_qp(struct qp_pack *qp1, struct qp_pack *qp2) qp_mod.state.rtr.primary_av.port_num = qp1->hca_port->port_num; qp_mod.state.rtr.primary_av.conn.local_ack_timeout = 0; - qp_mod.state.rtr.primary_av.conn.path_mtu = IB_MTU_2048; + qp_mod.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_2048; qp_mod.state.rtr.primary_av.conn.rnr_retry_cnt = 6; qp_mod.state.rtr.primary_av.conn.seq_err_retry_cnt = 6; diff --git a/trunk/tools/perftests/user/send_bw/send_bw.c b/trunk/tools/perftests/user/send_bw/send_bw.c index e52e1002..48f23b63 100644 --- a/trunk/tools/perftests/user/send_bw/send_bw.c +++ b/trunk/tools/perftests/user/send_bw/send_bw.c @@ -330,16 +330,16 @@ static int pp_connect_ctx(struct pingpong_context *ctx, int port, int my_psn, attr.req_state = IB_QPS_RTR; switch (user_parm->mtu) { case 256 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_256; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_256; break; case 512 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_512; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_512; break; case 1024 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_1024; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_1024; break; case 2048 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_2048; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_2048; break; } printf("Mtu : %d\n", user_parm->mtu); diff --git a/trunk/tools/perftests/user/send_lat/send_lat.c b/trunk/tools/perftests/user/send_lat/send_lat.c index 8f402407..9d04122e 100644 --- a/trunk/tools/perftests/user/send_lat/send_lat.c +++ b/trunk/tools/perftests/user/send_lat/send_lat.c @@ -360,16 +360,16 @@ static int pp_connect_ctx(struct pingpong_context *ctx, int port, int my_psn, attr.req_state = IB_QPS_RTR; switch (user_parm->mtu) { case 256 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_256; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_256; break; case 512 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_512; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_512; break; case 1024 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_1024; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_1024; break; case 2048 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_2048; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_2048; break; } printf("Mtu : %d\n", user_parm->mtu); diff --git a/trunk/tools/perftests/user/write_bw/write_bw.c b/trunk/tools/perftests/user/write_bw/write_bw.c index 9049683b..3bee9903 100644 --- a/trunk/tools/perftests/user/write_bw/write_bw.c +++ b/trunk/tools/perftests/user/write_bw/write_bw.c @@ -322,16 +322,16 @@ static int pp_connect_ctx(struct pingpong_context *ctx, int port, int my_psn, attr.req_state = IB_QPS_RTR; switch (user_parm->mtu) { case 256 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_256; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_256; break; case 512 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_512; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_512; break; case 1024 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_1024; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_1024; break; case 2048 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_2048; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_2048; break; } printf("Mtu : %d\n", user_parm->mtu); diff --git a/trunk/tools/perftests/user/write_lat/write_lat.c b/trunk/tools/perftests/user/write_lat/write_lat.c index 579198cb..85921e35 100644 --- a/trunk/tools/perftests/user/write_lat/write_lat.c +++ b/trunk/tools/perftests/user/write_lat/write_lat.c @@ -326,16 +326,16 @@ static int pp_connect_ctx(struct pingpong_context *ctx, int port, int my_psn, attr.req_state = IB_QPS_RTR; switch (user_parm->mtu) { case 256 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_256; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_256; break; case 512 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_512; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_512; break; case 1024 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_1024; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_1024; break; case 2048 : - attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_2048; + attr.state.rtr.primary_av.conn.path_mtu = IB_MTU_LEN_2048; break; } printf("Mtu : %d\n", user_parm->mtu); diff --git a/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c index cd180bdd..eacf3043 100644 --- a/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c +++ b/trunk/ulp/dapl/dapl/ibal/dapl_ibal_cm.c @@ -1224,11 +1224,11 @@ dapls_ib_connect ( * with 1K MTU. Cap the MTU based on device ID to compensate for this. */ if( (p_ca->p_ca_attr->dev_id == 0x5A44) && - (ib_path_rec_mtu( &path_rec ) > IB_MTU_1024) ) + (ib_path_rec_mtu( &path_rec ) > IB_MTU_LEN_1024) ) { /* Local endpoint is Tavor - cap MTU to 1K for extra bandwidth. */ path_rec.mtu &= IB_PATH_REC_SELECTOR_MASK; - path_rec.mtu |= IB_MTU_1024; + path_rec.mtu |= IB_MTU_LEN_1024; } /* diff --git a/trunk/ulp/ipoib/kernel/ipoib_port.c b/trunk/ulp/ipoib/kernel/ipoib_port.c index f1d1a618..70e80f26 100644 --- a/trunk/ulp/ipoib/kernel/ipoib_port.c +++ b/trunk/ulp/ipoib/kernel/ipoib_port.c @@ -5027,7 +5027,7 @@ __port_create_bcast( mcast_req.member_rec.qkey = (uint32_t)(uintn_t)p_port | IB_QP_PRIVILEGED_Q_KEY; mcast_req.member_rec.mtu = - (IB_PATH_SELECTOR_EXACTLY << 6) | IB_MTU_2048; + (IB_PATH_SELECTOR_EXACTLY << 6) | IB_MTU_LEN_2048; mcast_req.member_rec.pkey = IB_DEFAULT_PKEY; diff --git a/trunk/ulp/wsd/user/ibsp_ip.c b/trunk/ulp/wsd/user/ibsp_ip.c index b0a95720..b377bb1c 100644 --- a/trunk/ulp/wsd/user/ibsp_ip.c +++ b/trunk/ulp/wsd/user/ibsp_ip.c @@ -478,11 +478,11 @@ query_pr( } if( (port->hca->dev_id == 0x5A44) && - (ib_path_rec_mtu( path_rec ) > IB_MTU_1024) ) + (ib_path_rec_mtu( path_rec ) > IB_MTU_LEN_1024) ) { /* Local endpoint is Tavor - cap MTU to 1K for extra bandwidth. */ path_rec->mtu &= IB_PATH_REC_SELECTOR_MASK; - path_rec->mtu |= IB_MTU_1024; + path_rec->mtu |= IB_MTU_LEN_1024; } pkt_life = ib_path_rec_pkt_life( path_rec ) + g_pkt_life_modifier;