From e7c27dadc6a624d2c69f9478e754984c0c755be3 Mon Sep 17 00:00:00 2001 From: sleybo Date: Tue, 24 Oct 2006 16:35:10 +0000 Subject: [PATCH] [AL\MTHCA\SRP] cosmetics (changing of prints) git-svn-id: svn://openib.tc.cornell.edu/gen1@529 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/core/al/kernel/al_smi.c | 55 ++++----- trunk/hw/mthca/kernel/mthca_cq.c | 2 +- trunk/hw/mthca/kernel/mthca_mad.c | 28 ++--- trunk/ulp/srp/kernel/srp_hba.c | 180 +++++++++++++++--------------- 4 files changed, 134 insertions(+), 131 deletions(-) diff --git a/trunk/core/al/kernel/al_smi.c b/trunk/core/al/kernel/al_smi.c index 0a32e4dd..94897371 100644 --- a/trunk/core/al/kernel/al_smi.c +++ b/trunk/core/al/kernel/al_smi.c @@ -425,11 +425,11 @@ spl_qp0_agent_pnp_cb( IN ib_pnp_rec_t* p_pnp_rec ) { ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); status = spl_qp_agent_pnp( p_pnp_rec, IB_QPT_QP0 ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); return status; } @@ -443,7 +443,7 @@ spl_qp1_agent_pnp_cb( IN ib_pnp_rec_t* p_pnp_rec ) { ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); status = spl_qp_agent_pnp( p_pnp_rec, IB_QPT_QP1 ); @@ -464,11 +464,14 @@ spl_qp_agent_pnp( ib_api_status_t status; al_obj_t* p_obj; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_pnp_rec ); p_obj = p_pnp_rec->context; + AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_SMI, + ("p_pnp_rec->pnp_event = 0x%x (%s)\n", + p_pnp_rec->pnp_event, ib_get_pnp_event_str( p_pnp_rec->pnp_event )) ); /* Dispatch based on the PnP event type. */ switch( p_pnp_rec->pnp_event ) { @@ -1859,7 +1862,7 @@ send_local_mad_cb( spl_qp_svc_t* p_spl_qp_svc; ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_item ); p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, send_async ); @@ -1905,7 +1908,7 @@ spl_qp_send_comp_cb( { spl_qp_svc_t* p_spl_qp_svc; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( cq_context ); p_spl_qp_svc = cq_context; @@ -1946,7 +1949,7 @@ spl_qp_send_async_cb( spl_qp_svc_t* p_spl_qp_svc; ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_item ); p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, send_async_cb ); @@ -2492,7 +2495,7 @@ forward_sm_trap( ib_av_attr_t av_attr; ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_spl_qp_svc ); CL_ASSERT( p_mad_element ); @@ -2505,7 +2508,7 @@ forward_sm_trap( * "C14-5: Only a SM shall originate a directed route SMP." * Therefore all traps should be LID routed; drop this one. */ - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); return IB_ERROR; } @@ -2527,7 +2530,7 @@ forward_sm_trap( if( status != IB_SUCCESS ) { - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); return status; } @@ -2550,7 +2553,7 @@ forward_sm_trap( if( status != IB_SUCCESS ) ib_destroy_av( p_mad_element->h_av ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); return status; } @@ -2566,7 +2569,7 @@ recv_local_mad( ib_mad_t* p_mad_hdr; ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_spl_qp_svc ); CL_ASSERT( p_mad_request ); @@ -2599,7 +2602,7 @@ recv_local_mad( /* Send the locally addressed MAD request to the CA for processing. */ status = ib_send_mad( p_spl_qp_svc->h_mad_svc, p_mad_request, NULL ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); return status; } @@ -2616,7 +2619,7 @@ spl_qp_alias_send_cb( { ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); UNUSED_PARAM( h_mad_svc ); UNUSED_PARAM( mad_svc_context ); @@ -2631,7 +2634,7 @@ spl_qp_alias_send_cb( status = ib_put_mad( p_mad_element ); CL_ASSERT( status == IB_SUCCESS ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); } @@ -2651,7 +2654,7 @@ spl_qp_alias_recv_cb( ib_av_attr_t av_attr; ib_api_status_t status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( mad_svc_context ); CL_ASSERT( p_mad_response ); @@ -2712,7 +2715,7 @@ spl_qp_alias_recv_cb( ib_put_mad( p_mad_response ); } - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); } @@ -2782,7 +2785,7 @@ spl_qp_svc_event_cb( { spl_qp_svc_t* p_spl_qp_svc; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_event_rec ); CL_ASSERT( p_event_rec->context ); @@ -2797,7 +2800,7 @@ spl_qp_svc_event_cb( spl_qp_svc_reset( p_spl_qp_svc ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); } @@ -2849,7 +2852,7 @@ spl_qp_svc_reset_cb( ib_api_status_t status; cl_qlist_t mad_wr_list; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_item ); p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, reset_async ); @@ -2934,7 +2937,7 @@ spl_qp_svc_reset_cb( /* No longer in use by the asynchronous processing thread. */ cl_atomic_dec( &p_spl_qp_svc->in_use_cnt ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); } @@ -3028,7 +3031,7 @@ void force_smi_poll( void ) { - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); /* * Stop the poll timer. Just invoke the timer callback directly to @@ -3036,7 +3039,7 @@ force_smi_poll( */ smi_poll_timer_cb( gp_spl_qp_mgr ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); } @@ -3050,7 +3053,7 @@ smi_poll_timer_cb( { cl_status_t cl_status; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( context ); CL_ASSERT( gp_spl_qp_mgr == context ); @@ -3085,7 +3088,7 @@ smi_poll_timer_cb( } cl_spinlock_release( &gp_spl_qp_mgr->obj.lock ); - AL_EXIT( AL_DBG_SMI_CB ); + AL_EXIT( AL_DBG_SMI ); } @@ -3101,7 +3104,7 @@ smi_post_recvs( al_obj_t* p_obj; spl_qp_svc_t* p_spl_qp_svc; - AL_ENTER( AL_DBG_SMI_CB ); + AL_ENTER( AL_DBG_SMI ); CL_ASSERT( p_list_item ); UNUSED_PARAM( context ); diff --git a/trunk/hw/mthca/kernel/mthca_cq.c b/trunk/hw/mthca/kernel/mthca_cq.c index 64eb0071..23192507 100644 --- a/trunk/hw/mthca/kernel/mthca_cq.c +++ b/trunk/hw/mthca/kernel/mthca_cq.c @@ -460,7 +460,7 @@ static inline int mthca_poll_one(struct mthca_dev *dev, rmb(); { // debug print - HCA_PRINT(TRACE_LEVEL_VERBOSE,HCA_DBG_CQ,("%x/%d: CQE -> QPN %06x, WQE @ %08x\n", + HCA_PRINT(TRACE_LEVEL_VERBOSE,HCA_DBG_CQ,("CQ: 0x%06x/%d: CQE -> QPN 0x%06x, WQE @ 0x%08x\n", cq->cqn, cq->cons_index, cl_ntoh32(cqe->my_qpn), cl_ntoh32(cqe->wqe))); dump_cqe(TRACE_LEVEL_VERBOSE, dev, cqe); diff --git a/trunk/hw/mthca/kernel/mthca_mad.c b/trunk/hw/mthca/kernel/mthca_mad.c index ceef10e7..87e6e3dc 100644 --- a/trunk/hw/mthca/kernel/mthca_mad.c +++ b/trunk/hw/mthca/kernel/mthca_mad.c @@ -163,9 +163,9 @@ static void forward_trap(struct mthca_dev *dev, * it's OK for our devices). */ spin_lock_irqsave(&dev->sm_lock, &lh); - wr.dgrm.ud.h_av = (ib_av_handle_t)dev->sm_ah[port_num - 1]; + wr.dgrm.ud.h_av = (ib_av_handle_t)dev->sm_ah[port_num - 1]; if (wr.dgrm.ud.h_av) { - HCA_PRINT( TRACE_LEVEL_ERROR ,HCA_DBG_MAD ,(" forward_trap: ib_post_send_mad not ported \n" )); + HCA_PRINT( TRACE_LEVEL_ERROR ,HCA_DBG_MAD ,(" ib_post_send_mad not ported \n" )); ret = -EINVAL; } else @@ -191,7 +191,7 @@ int mthca_process_mad(struct ib_device *ibdev, u8 status; u16 slid = in_wc ? in_wc->recv.ud.remote_lid : cl_ntoh16(IB_LID_PERMISSIVE); - HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("mthca_process_mad: in: Class %02x, Method %02x, AttrId %x, AttrMod %x, ClSpec %x, Tid %I64x\n", + HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("in: Class %02x, Method %02x, AttrId %x, AttrMod %x, ClSpec %x, Tid %I64x\n", (u32)in_mad->mad_hdr.mgmt_class, (u32)in_mad->mad_hdr.method, (u32)in_mad->mad_hdr.attr_id, in_mad->mad_hdr.attr_mod, (u32)in_mad->mad_hdr.class_specific, in_mad->mad_hdr.tid )); @@ -200,7 +200,7 @@ int mthca_process_mad(struct ib_device *ibdev, if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP && slid == 0) { forward_trap(to_mdev(ibdev), port_num, in_mad); - HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("mthca_process_mad: Not sent, but locally forwarded\n")); + HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("Not sent, but locally forwarded\n")); return IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED; } @@ -216,7 +216,7 @@ int mthca_process_mad(struct ib_device *ibdev, if (in_mad->mad_hdr.method != IB_MGMT_METHOD_GET && in_mad->mad_hdr.method != IB_MGMT_METHOD_SET && in_mad->mad_hdr.method != IB_MGMT_METHOD_TRAP_REPRESS) { - HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_LOW ,("mthca_process_mad: Skip some methods. Nothing done !\n")); + HCA_PRINT( TRACE_LEVEL_VERBOSE,HCA_DBG_MAD,(" Skip some methods. Nothing done !\n")); return IB_MAD_RESULT_SUCCESS; } @@ -227,7 +227,7 @@ int mthca_process_mad(struct ib_device *ibdev, if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO || ((in_mad->mad_hdr.attr_id & IB_SMP_ATTR_VENDOR_MASK) == IB_SMP_ATTR_VENDOR_MASK)) { - HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("mthca_process_mad: Skip SMInfo queries or vendor-specific MADs. Nothing done !\n")); + HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("Skip SMInfo queries or vendor-specific MADs. Nothing done !\n")); return IB_MAD_RESULT_SUCCESS; } } @@ -238,12 +238,12 @@ int mthca_process_mad(struct ib_device *ibdev, if (in_mad->mad_hdr.method != IB_MGMT_METHOD_GET && in_mad->mad_hdr.method != IB_MGMT_METHOD_SET) { - HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("mthca_process_mad: Skip some management methods. Nothing done !\n")); + HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("Skip some management methods. Nothing done !\n")); return IB_MAD_RESULT_SUCCESS; } } else { - HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("mthca_process_mad: Skip IB_MGMT_CLASS_PERF_MGMT et al. Nothing done !\n")); + HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD ,("Skip IB_MGMT_CLASS_PERF_MGMT et al. Nothing done !\n")); return IB_MAD_RESULT_SUCCESS; } } @@ -261,18 +261,18 @@ int mthca_process_mad(struct ib_device *ibdev, if (status == MTHCA_CMD_STAT_BAD_PKT) return IB_MAD_RESULT_SUCCESS; if (status) { - HCA_PRINT(TRACE_LEVEL_ERROR ,HCA_DBG_MAD ,("mthca_process_mad: MAD_IFC returned status %02x\n", status)); + HCA_PRINT(TRACE_LEVEL_ERROR ,HCA_DBG_MAD ,("MAD_IFC returned status %02x\n", status)); return IB_MAD_RESULT_FAILURE; } if (!out_mad->mad_hdr.status) smp_snoop(ibdev, port_num, in_mad); - HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD,("mthca_process_mad: out: Class %02x, Method %02x, AttrId %x, AttrMod %x, ClSpec %x, Tid %I64x, Status %x\n", - (u32)in_mad->mad_hdr.mgmt_class, (u32)in_mad->mad_hdr.method, - (u32)in_mad->mad_hdr.attr_id, in_mad->mad_hdr.attr_mod, - (u32)in_mad->mad_hdr.class_specific, in_mad->mad_hdr.tid, - (u32)in_mad->mad_hdr.status )); + HCA_PRINT( TRACE_LEVEL_VERBOSE ,HCA_DBG_MAD,("out: Class %02x, Method %02x, AttrId %x, AttrMod %x, ClSpec %x, Tid %I64x, Status %x\n", + (u32)out_mad->mad_hdr.mgmt_class, (u32)out_mad->mad_hdr.method, + (u32)out_mad->mad_hdr.attr_id, out_mad->mad_hdr.attr_mod, + (u32)out_mad->mad_hdr.class_specific, out_mad->mad_hdr.tid, + (u32)out_mad->mad_hdr.status )); if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP_REPRESS) { /* no response for trap repress */ diff --git a/trunk/ulp/srp/kernel/srp_hba.c b/trunk/ulp/srp/kernel/srp_hba.c index 31597e2b..affa246e 100644 --- a/trunk/ulp/srp/kernel/srp_hba.c +++ b/trunk/ulp/srp/kernel/srp_hba.c @@ -71,79 +71,79 @@ __srp_dump_ioc_info( const ib_ioc_info_t *p_ioc_info ) { UNUSED_PARAM( p_ioc_info ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Dumping IOC Info\n") ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" chassis_guid = 0x%I64x\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tchassis_guid\t= 0x%I64x\n", cl_ntoh64( p_ioc_info->chassis_guid )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" chassis_slot = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tchassis_slot\t= %d\n", p_ioc_info->chassis_slot) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" iou_guid = 0x%I64x\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tiou_guid\t= 0x%I64x\n", cl_ntoh64( p_ioc_info->iou_guid )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" iou_slot = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tiou_slot\t= %d\n", p_ioc_info->iou_slot) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, ("\n") ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("\n") ); + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Dumping IOC Info Profile\n") ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" ioc_guid = 0x%I64x\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tioc_guid\t= 0x%I64x\n", cl_ntoh64( p_ioc_info->profile.ioc_guid )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" vend_id = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tvend_id\t= 0x%x\n", cl_ntoh32( p_ioc_info->profile.vend_id )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" dev_id = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tdev_id\t= 0x%x\n", cl_ntoh32( p_ioc_info->profile.dev_id )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" dev_ver = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tdev_ver\t= 0x%x\n", cl_ntoh16( p_ioc_info->profile.dev_ver )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" subsys_vend_id = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tsubsys_vend_id\t= 0x%x\n", cl_ntoh32( p_ioc_info->profile.subsys_vend_id )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" subsys_id = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tsubsys_id\t= 0x%x\n", cl_ntoh32( p_ioc_info->profile.subsys_id )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" io_class = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tio_class\t= 0x%x\n", cl_ntoh16( p_ioc_info->profile.io_class )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" io_subclass = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tio_subclass\t= 0x%x\n", cl_ntoh16( p_ioc_info->profile.io_subclass )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" protocol = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tprotocol\t= 0x%x\n", cl_ntoh16( p_ioc_info->profile.protocol )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" protocol_ver = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tprotocol_ver\t= 0x%x\n", cl_ntoh16( p_ioc_info->profile.protocol_ver )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" send_msg_depth = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tsend_msg_depth\t= %d\n", cl_ntoh16( p_ioc_info->profile.send_msg_depth )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" rdma_read_depth = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\trdma_read_depth\t= %d\n", p_ioc_info->profile.rdma_read_depth) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" send_msg_size = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tsend_msg_size\t= %d\n", cl_ntoh32( p_ioc_info->profile.send_msg_size )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" rdma_size = %d\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\trdma_size\t = %d\n", cl_ntoh32( p_ioc_info->profile.rdma_size )) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" ctrl_ops_cap = 0x%X\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tctrl_ops_cap\t= 0x%X\n", p_ioc_info->profile.ctrl_ops_cap) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" num_svc_entries = 0x%X\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tnum_svc_entries\t= 0x%X\n", p_ioc_info->profile.num_svc_entries) ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - (" id_string = %s\n", + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("\tid_string\t= %s\n", p_ioc_info->profile.id_string) ); } @@ -579,10 +579,10 @@ __srp_find_path( SRP_ENTER( SRP_DBG_PNP ); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, - ("Finding path record (slid:%d dlid:%d) for %s.\n", - p_path_rec->slid, - p_path_rec->dlid, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, + ("Finding path record (slid:0x%x dlid:0x%x) for %s.\n", + cl_ntoh16(p_path_rec->slid), + cl_ntoh16(p_path_rec->dlid), p_hba->ioc_info.profile.id_string) ); cl_spinlock_acquire( &p_hba->path_record_list_lock ); @@ -596,7 +596,7 @@ __srp_find_path( check_num_path, check_preference ) == TRUE ) { - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Found path record (slid:%d dlid:%d) for %s.\n", p_path_rec->slid, p_path_rec->dlid, @@ -634,7 +634,7 @@ __srp_remove_path( { cl_spinlock_acquire( &p_hba->path_record_list_lock ); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Removing path record (slid:%d dlid:%d) for %s.\n", p_path_rec->slid, p_path_rec->dlid, @@ -645,7 +645,7 @@ __srp_remove_path( cl_spinlock_release( &p_hba->path_record_list_lock ); } - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Current Path count for %s = %d \n", p_hba->ioc_info.profile.id_string, (int)cl_qlist_count( &p_hba->path_record_list )) ); @@ -672,16 +672,16 @@ __srp_add_path( p_srp_path_record->path_rec = *p_path_rec; cl_spinlock_release( &p_hba->path_record_list_lock ); - SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG, - ("Discarding/Updating duplicate path record (slid:%d dlid:%d) for %s.\n", - p_path_rec->slid, - p_path_rec->dlid, + SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_PNP, + ("Discarding/Updating duplicate path record (slid:0x%x dlid:0x%x) for %s.\n", + cl_ntoh16(p_path_rec->slid), + cl_ntoh16(p_path_rec->dlid), p_hba->ioc_info.profile.id_string) ); goto exit; } - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Adding path record (slid:%d dlid:%d) for %s.\n", p_path_rec->slid, p_path_rec->dlid, @@ -703,7 +703,7 @@ __srp_add_path( cl_spinlock_release( &p_hba->path_record_list_lock ); } - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Current Path count for %s = %d \n", p_hba->ioc_info.profile.id_string, (int)cl_qlist_count( &p_hba->path_record_list )) ); @@ -730,7 +730,7 @@ __srp_connect_sessions( { int retry_count = 0; - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Creating New Session For Service Entry Index %d.\n", p_hba->ioc_info.profile.num_svc_entries)); @@ -742,7 +742,7 @@ __srp_connect_sessions( continue; } - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("New Session For Service Entry Index %d Created.\n", p_hba->ioc_info.profile.num_svc_entries)); @@ -750,11 +750,11 @@ __srp_connect_sessions( { retry_count++; - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Attempting to connect %s. Connection Attempt Count = %d.\n", p_hba->ioc_info.profile.id_string, retry_count) ); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Logging Into Session.\n")); status = srp_session_login( p_session ); if ( status == IB_SUCCESS ) @@ -781,19 +781,19 @@ __srp_connect_sessions( p_hba->session_list[i] = p_session; cl_obj_unlock( &p_hba->obj ); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Session Login Issued Successfully.\n")); } else { - SRP_PRINT( TRACE_LEVEL_ERROR, SRP_DBG_ERROR, + SRP_PRINT( TRACE_LEVEL_ERROR, SRP_DBG_PNP, ("Session Login Failure Status = %d.\n", status)); } } while ( (status != IB_SUCCESS) && (retry_count < 3) ); if( status != IB_SUCCESS ) { - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Session Object ref_cnt = %d\n", p_session->obj.ref_cnt) ); cl_obj_destroy( &p_session->obj ); } @@ -804,7 +804,7 @@ __srp_connect_sessions( status = IB_SUCCESS; if ( p_hba->adapter_paused == TRUE ) { - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Resuming Adapter for %s.\n", p_hba->ioc_info.profile.id_string) ); p_hba->adapter_paused = FALSE; @@ -842,13 +842,13 @@ __srp_disconnect_sessions( if ( i == p_hba->ioc_info.profile.num_svc_entries ) { - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("No current connections to %s.\n", p_hba->ioc_info.profile.id_string) ); goto exit; } - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Current path to %s has been lost.\n", p_hba->ioc_info.profile.id_string) ); @@ -865,14 +865,14 @@ __srp_disconnect_sessions( SP_UNTAGGED, SP_UNTAGGED, SRB_STATUS_BUSY ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Pausing Adapter for %s.\n", p_hba->ioc_info.profile.id_string) ); } } /* Destroy all the connections. */ - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Destroy all connections to %s.\n", p_hba->ioc_info.profile.id_string) ); @@ -885,14 +885,14 @@ __srp_disconnect_sessions( if ( p_session != NULL ) { - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Session Object ref_cnt = %d\n", p_session->obj.ref_cnt) ); __srp_cleanup_session ( &p_session->obj ); cl_obj_destroy( &p_session->obj ); } else { - SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_PNP, ("Session for Target ID %d on %s is NULL.\n", i, p_hba->ioc_info.profile.id_string) ); // <-- OK in a shutdown or target disconnect @@ -914,7 +914,7 @@ __srp_connect_path( while ( g_srp_system_shutdown == FALSE ) { - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Searching for path to %s.\n", p_hba->ioc_info.profile.id_string) ); @@ -923,13 +923,13 @@ __srp_connect_path( cl_spinlock_release( &p_hba->path_record_list_lock ); if ( p_srp_path_record == (srp_path_record_t *)cl_qlist_end( &p_hba->path_record_list ) ) { - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("No paths to %s found.\n", p_hba->ioc_info.profile.id_string) ); break; } - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Connecting path to %s.\n", p_hba->ioc_info.profile.id_string) ); @@ -937,7 +937,7 @@ __srp_connect_path( status = __srp_connect_sessions( p_hba ); if ( status == IB_SUCCESS ) { - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Path to %s has connected.\n", p_hba->ioc_info.profile.id_string) ); break; @@ -979,7 +979,7 @@ __srp_pnp_cb( switch( p_pnp_rec->pnp_event ) { case IB_PNP_IOC_ADD: - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("IB_PNP_IOC_ADD for %s.\n", p_ioc_rec->info.profile.id_string) ); @@ -991,7 +991,7 @@ __srp_pnp_cb( */ if( p_ioc_rec->ca_guid != p_hba->info.ca_guid ) { - SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG, + SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_PNP, ("Ignoring CA GUID.\n") ); status = IB_INVALID_GUID; break; @@ -1000,7 +1000,7 @@ __srp_pnp_cb( /* Trap our IOC GUID so we can get path notification events. */ if( p_ioc_rec->info.profile.ioc_guid != p_hba->info.guid ) { - SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG, + SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_PNP, ("Ignoring GUID.\n") ); status = IB_INVALID_GUID; break; @@ -1026,32 +1026,32 @@ __srp_pnp_cb( p_ioc_rec->svc_entry_array, sizeof(ib_svc_entry_t) * p_hba->ioc_info.profile.num_svc_entries); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Found %d Service Entries.\n", p_hba->ioc_info.profile.num_svc_entries)); break; case IB_PNP_IOC_REMOVE: - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("IB_PNP_IOC_REMOVE for %s.\n", p_hba->ioc_info.profile.id_string) ); CL_ASSERT( p_pnp_rec->guid == p_hba->info.guid ); - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("Hey!!! Our IOC went away.\n") ); __srp_disconnect_sessions( p_hba, FALSE ); __srp_remove_path_records( p_hba ); - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("HBA Object ref_cnt = %d\n", p_hba->obj.ref_cnt) ); break; case IB_PNP_IOC_PATH_ADD: - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, - ("IB_PNP_IOC_PATH_ADD (slid:%d dlid:%d) for %s.\n", - p_ioc_path->path.slid, - p_ioc_path->path.dlid, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, + ("IB_PNP_IOC_PATH_ADD (slid:0x%x dlid:0x%x) for %s.\n", + cl_ntoh16(p_ioc_path->path.slid), + cl_ntoh16(p_ioc_path->path.dlid), p_hba->ioc_info.profile.id_string)); p_srp_path_record = __srp_add_path( p_hba, &p_ioc_path->path ); @@ -1063,7 +1063,7 @@ __srp_pnp_cb( if ( p_hba->p_srp_path_record == NULL ) { - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Connecting new path to %s.\n", p_hba->ioc_info.profile.id_string) ); status = __srp_connect_path( p_hba ); @@ -1071,7 +1071,7 @@ __srp_pnp_cb( break; case IB_PNP_IOC_PATH_REMOVE: - SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("IB_PNP_IOC_PATH_REMOVE (slid:%d dlid:%d) for %s.\n", p_ioc_path->path.slid, p_ioc_path->path.dlid, @@ -1082,7 +1082,7 @@ __srp_pnp_cb( { if ( p_srp_path_record == p_hba->p_srp_path_record ) { - SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG, + SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP, ("Current path to %s has been lost.\n", p_hba->ioc_info.profile.id_string) ); -- 2.41.0