[AL\MTHCA\SRP] cosmetics (changing of prints)

git-svn-id: svn://openib.tc.cornell.edu/gen1@529 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/al/kernel/al_smi.c b/trunk/core/al/kernel/al_smi.c
index 0a32e4dde146be00c447ddd44861456e9a7cf8bd..94897371896fb4d24af893e5fb8a6edcb0c75962 100644 (file)
--- 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 )\r
 {\r
        ib_api_status_t status;\r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        status = spl_qp_agent_pnp( p_pnp_rec, IB_QPT_QP0 );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -443,7 +443,7 @@ spl_qp1_agent_pnp_cb(
        IN                              ib_pnp_rec_t*                           p_pnp_rec )\r
 {\r
        ib_api_status_t status;\r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        status = spl_qp_agent_pnp( p_pnp_rec, IB_QPT_QP1 );\r
 \r
@@ -464,11 +464,14 @@ spl_qp_agent_pnp(
        ib_api_status_t                 status;\r
        al_obj_t*                               p_obj;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_pnp_rec );\r
        p_obj = p_pnp_rec->context;\r
 \r
+       AL_PRINT( TRACE_LEVEL_INFORMATION, AL_DBG_SMI,\r
+               ("p_pnp_rec->pnp_event = 0x%x (%s)\n",\r
+               p_pnp_rec->pnp_event, ib_get_pnp_event_str( p_pnp_rec->pnp_event )) );\r
        /* Dispatch based on the PnP event type. */\r
        switch( p_pnp_rec->pnp_event )\r
        {\r
@@ -1859,7 +1862,7 @@ send_local_mad_cb(
        spl_qp_svc_t*                   p_spl_qp_svc;\r
        ib_api_status_t                 status;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_item );\r
        p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, send_async );\r
@@ -1905,7 +1908,7 @@ spl_qp_send_comp_cb(
 {\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( cq_context );\r
        p_spl_qp_svc = cq_context;\r
@@ -1946,7 +1949,7 @@ spl_qp_send_async_cb(
        spl_qp_svc_t*                   p_spl_qp_svc;\r
        ib_api_status_t                 status;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_item );\r
        p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, send_async_cb );\r
@@ -2492,7 +2495,7 @@ forward_sm_trap(
        ib_av_attr_t                    av_attr;\r
        ib_api_status_t                 status;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_mad_element );\r
@@ -2505,7 +2508,7 @@ forward_sm_trap(
                 * "C14-5: Only a SM shall originate a directed route SMP."\r
                 * Therefore all traps should be LID routed; drop this one.\r
                 */\r
-               AL_EXIT( AL_DBG_SMI_CB );\r
+               AL_EXIT( AL_DBG_SMI );\r
                return IB_ERROR;\r
        }\r
 \r
@@ -2527,7 +2530,7 @@ forward_sm_trap(
 \r
        if( status != IB_SUCCESS )\r
        {\r
-               AL_EXIT( AL_DBG_SMI_CB );\r
+               AL_EXIT( AL_DBG_SMI );\r
                return status;\r
        }\r
 \r
@@ -2550,7 +2553,7 @@ forward_sm_trap(
        if( status != IB_SUCCESS )\r
                ib_destroy_av( p_mad_element->h_av );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -2566,7 +2569,7 @@ recv_local_mad(
        ib_mad_t*                               p_mad_hdr;\r
        ib_api_status_t                 status;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_spl_qp_svc );\r
        CL_ASSERT( p_mad_request );\r
@@ -2599,7 +2602,7 @@ recv_local_mad(
        /* Send the locally addressed MAD request to the CA for processing. */\r
        status = ib_send_mad( p_spl_qp_svc->h_mad_svc, p_mad_request, NULL );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
        return status;\r
 }\r
 \r
@@ -2616,7 +2619,7 @@ spl_qp_alias_send_cb(
 {\r
        ib_api_status_t                 status;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        UNUSED_PARAM( h_mad_svc );\r
        UNUSED_PARAM( mad_svc_context );\r
@@ -2631,7 +2634,7 @@ spl_qp_alias_send_cb(
        status = ib_put_mad( p_mad_element );\r
        CL_ASSERT( status == IB_SUCCESS );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -2651,7 +2654,7 @@ spl_qp_alias_recv_cb(
        ib_av_attr_t                    av_attr;\r
        ib_api_status_t                 status;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( mad_svc_context );\r
        CL_ASSERT( p_mad_response );\r
@@ -2712,7 +2715,7 @@ spl_qp_alias_recv_cb(
                ib_put_mad( p_mad_response );\r
        }\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -2782,7 +2785,7 @@ spl_qp_svc_event_cb(
 {\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_event_rec );\r
        CL_ASSERT( p_event_rec->context );\r
@@ -2797,7 +2800,7 @@ spl_qp_svc_event_cb(
 \r
        spl_qp_svc_reset( p_spl_qp_svc );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -2849,7 +2852,7 @@ spl_qp_svc_reset_cb(
        ib_api_status_t                 status;\r
        cl_qlist_t                              mad_wr_list;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_item );\r
        p_spl_qp_svc = PARENT_STRUCT( p_item, spl_qp_svc_t, reset_async );\r
@@ -2934,7 +2937,7 @@ spl_qp_svc_reset_cb(
        /* No longer in use by the asynchronous processing thread. */\r
        cl_atomic_dec( &p_spl_qp_svc->in_use_cnt );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -3028,7 +3031,7 @@ void
 force_smi_poll(\r
        void )\r
 {\r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        /*\r
         * Stop the poll timer.  Just invoke the timer callback directly to\r
@@ -3036,7 +3039,7 @@ force_smi_poll(
         */\r
        smi_poll_timer_cb( gp_spl_qp_mgr );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -3050,7 +3053,7 @@ smi_poll_timer_cb(
 {\r
        cl_status_t                     cl_status;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( context );\r
        CL_ASSERT( gp_spl_qp_mgr == context );\r
@@ -3085,7 +3088,7 @@ smi_poll_timer_cb(
        }\r
        cl_spinlock_release( &gp_spl_qp_mgr->obj.lock );\r
 \r
-       AL_EXIT( AL_DBG_SMI_CB );\r
+       AL_EXIT( AL_DBG_SMI );\r
 }\r
 \r
 \r
@@ -3101,7 +3104,7 @@ smi_post_recvs(
        al_obj_t*                               p_obj;\r
        spl_qp_svc_t*                   p_spl_qp_svc;\r
 \r
-       AL_ENTER( AL_DBG_SMI_CB );\r
+       AL_ENTER( AL_DBG_SMI );\r
 \r
        CL_ASSERT( p_list_item );\r
        UNUSED_PARAM( context );\r

diff --git a/trunk/hw/mthca/kernel/mthca_cq.c b/trunk/hw/mthca/kernel/mthca_cq.c
index 64eb00718df8f2b1e18bd165b6ebc6103f584a17..2319250717dc875266c4207e83691f2246754ff5 100644 (file)
--- 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 ceef10e70eb383dfac4441eb17b9924b91f429aa..87e6e3dc7b8ee65ad378739b3b68bbe1bbd5d070 100644 (file)
--- 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 31597e2bb5d5f404c2e0fe026fb484f924b4c9d6..affa246eee9ee00d905f47e8e36000daefc21298 100644 (file)
--- 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 )
 {\r
        UNUSED_PARAM( p_ioc_info );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                ("Dumping IOC Info\n") );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   chassis_guid    = 0x%I64x\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tchassis_guid\t= 0x%I64x\n",\r
                cl_ntoh64( p_ioc_info->chassis_guid )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   chassis_slot    = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tchassis_slot\t= %d\n",\r
                p_ioc_info->chassis_slot) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   iou_guid        = 0x%I64x\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tiou_guid\t= 0x%I64x\n",\r
                cl_ntoh64( p_ioc_info->iou_guid )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   iou_slot        = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tiou_slot\t= %d\n",\r
                p_ioc_info->iou_slot) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG, ("\n") );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP, ("\n") );\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                ("Dumping IOC Info Profile\n") );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   ioc_guid        = 0x%I64x\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tioc_guid\t= 0x%I64x\n",\r
                cl_ntoh64( p_ioc_info->profile.ioc_guid )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   vend_id         = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tvend_id\t= 0x%x\n",\r
                cl_ntoh32( p_ioc_info->profile.vend_id )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   dev_id          = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tdev_id\t= 0x%x\n",\r
                cl_ntoh32( p_ioc_info->profile.dev_id )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   dev_ver         = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tdev_ver\t= 0x%x\n",\r
                cl_ntoh16( p_ioc_info->profile.dev_ver )) );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   subsys_vend_id  = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tsubsys_vend_id\t= 0x%x\n",\r
                cl_ntoh32( p_ioc_info->profile.subsys_vend_id )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   subsys_id       = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tsubsys_id\t= 0x%x\n",\r
                cl_ntoh32( p_ioc_info->profile.subsys_id )) );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   io_class        = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tio_class\t= 0x%x\n",\r
                cl_ntoh16( p_ioc_info->profile.io_class )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   io_subclass     = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tio_subclass\t= 0x%x\n",\r
                cl_ntoh16( p_ioc_info->profile.io_subclass )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   protocol        = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tprotocol\t= 0x%x\n",\r
                cl_ntoh16( p_ioc_info->profile.protocol )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   protocol_ver    = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tprotocol_ver\t= 0x%x\n",\r
                cl_ntoh16( p_ioc_info->profile.protocol_ver )) );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   send_msg_depth  = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tsend_msg_depth\t= %d\n",\r
                cl_ntoh16( p_ioc_info->profile.send_msg_depth )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   rdma_read_depth = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\trdma_read_depth\t= %d\n",\r
                p_ioc_info->profile.rdma_read_depth) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   send_msg_size   = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tsend_msg_size\t= %d\n",\r
                cl_ntoh32( p_ioc_info->profile.send_msg_size )) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   rdma_size       = %d\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\trdma_size\t = %d\n",\r
                cl_ntoh32( p_ioc_info->profile.rdma_size )) );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   ctrl_ops_cap    = 0x%X\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tctrl_ops_cap\t= 0x%X\n",\r
                p_ioc_info->profile.ctrl_ops_cap) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   num_svc_entries = 0x%X\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tnum_svc_entries\t= 0x%X\n",\r
                p_ioc_info->profile.num_svc_entries) );\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-               ("   id_string       = %s\n",\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+               ("\tid_string\t= %s\n",\r
                p_ioc_info->profile.id_string) );\r
 }\r
 \r
@@ -579,10 +579,10 @@ __srp_find_path(
 \r
        SRP_ENTER( SRP_DBG_PNP );\r
 \r
-       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
-               ("Finding path record (slid:%d dlid:%d) for %s.\n",\r
-               p_path_rec->slid,\r
-               p_path_rec->dlid,\r
+       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
+               ("Finding path record (slid:0x%x dlid:0x%x) for %s.\n",\r
+               cl_ntoh16(p_path_rec->slid),\r
+               cl_ntoh16(p_path_rec->dlid),\r
                p_hba->ioc_info.profile.id_string) );\r
 \r
        cl_spinlock_acquire( &p_hba->path_record_list_lock );\r
@@ -596,7 +596,7 @@ __srp_find_path(
                                                                        check_num_path,\r
                                                                        check_preference ) == TRUE )\r
                {\r
-                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                ("Found path record (slid:%d dlid:%d) for %s.\n",\r
                                p_path_rec->slid,\r
                                p_path_rec->dlid,\r
@@ -634,7 +634,7 @@ __srp_remove_path(
        {\r
                cl_spinlock_acquire( &p_hba->path_record_list_lock );\r
 \r
-               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                        ("Removing path record (slid:%d dlid:%d) for %s.\n",\r
                        p_path_rec->slid,\r
                        p_path_rec->dlid,\r
@@ -645,7 +645,7 @@ __srp_remove_path(
                cl_spinlock_release( &p_hba->path_record_list_lock );\r
        }\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                ("Current Path count for %s = %d \n",\r
                 p_hba->ioc_info.profile.id_string,\r
                 (int)cl_qlist_count( &p_hba->path_record_list )) );\r
@@ -672,16 +672,16 @@ __srp_add_path(
                p_srp_path_record->path_rec = *p_path_rec;\r
                cl_spinlock_release( &p_hba->path_record_list_lock );\r
 \r
-               SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG,\r
-                       ("Discarding/Updating duplicate path record (slid:%d dlid:%d) for %s.\n",\r
-                       p_path_rec->slid,\r
-                       p_path_rec->dlid,\r
+               SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_PNP,\r
+                       ("Discarding/Updating duplicate path record (slid:0x%x dlid:0x%x) for %s.\n",\r
+                       cl_ntoh16(p_path_rec->slid),\r
+                       cl_ntoh16(p_path_rec->dlid),\r
                        p_hba->ioc_info.profile.id_string) );\r
 \r
                goto exit;\r
        }\r
 \r
-       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                ("Adding path record (slid:%d dlid:%d) for %s.\n",\r
                p_path_rec->slid,\r
                p_path_rec->dlid,\r
@@ -703,7 +703,7 @@ __srp_add_path(
                cl_spinlock_release( &p_hba->path_record_list_lock );\r
        }\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                ("Current Path count for %s = %d \n",\r
                 p_hba->ioc_info.profile.id_string,\r
                 (int)cl_qlist_count( &p_hba->path_record_list )) );\r
@@ -730,7 +730,7 @@ __srp_connect_sessions(
        {\r
                int     retry_count = 0;\r
 \r
-               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                        ("Creating New Session For Service Entry Index %d.\n",\r
                        p_hba->ioc_info.profile.num_svc_entries));\r
 \r
@@ -742,7 +742,7 @@ __srp_connect_sessions(
                        continue;\r
                }\r
 \r
-               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                        ("New Session For Service Entry Index %d Created.\n",\r
                        p_hba->ioc_info.profile.num_svc_entries));\r
 \r
@@ -750,11 +750,11 @@ __srp_connect_sessions(
                {\r
                        retry_count++;\r
 \r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("Attempting to connect %s. Connection Attempt Count = %d.\n",\r
                                 p_hba->ioc_info.profile.id_string,\r
                                 retry_count) );\r
-                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                ("Logging Into Session.\n"));\r
                        status = srp_session_login( p_session );\r
                        if ( status == IB_SUCCESS )\r
@@ -781,19 +781,19 @@ __srp_connect_sessions(
                                p_hba->session_list[i] = p_session;\r
                                cl_obj_unlock( &p_hba->obj );\r
 \r
-                               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                        ("Session Login Issued Successfully.\n"));\r
                        }\r
                        else\r
                        {\r
-                               SRP_PRINT( TRACE_LEVEL_ERROR, SRP_DBG_ERROR,\r
+                               SRP_PRINT( TRACE_LEVEL_ERROR, SRP_DBG_PNP,\r
                                        ("Session Login Failure Status = %d.\n", status));\r
                        }\r
                } while ( (status != IB_SUCCESS) && (retry_count < 3) );\r
 \r
                if( status != IB_SUCCESS )\r
                {\r
-                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                ("Session Object ref_cnt = %d\n", p_session->obj.ref_cnt) );\r
                        cl_obj_destroy( &p_session->obj );\r
                }\r
@@ -804,7 +804,7 @@ __srp_connect_sessions(
                status = IB_SUCCESS;\r
                if ( p_hba->adapter_paused == TRUE )\r
                {\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("Resuming Adapter for %s.\n",\r
                                p_hba->ioc_info.profile.id_string) );\r
                        p_hba->adapter_paused = FALSE;\r
@@ -842,13 +842,13 @@ __srp_disconnect_sessions(
 \r
        if ( i == p_hba->ioc_info.profile.num_svc_entries )\r
        {\r
-               SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+               SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                        ("No current connections to %s.\n",\r
                        p_hba->ioc_info.profile.id_string) );\r
                goto exit;\r
        }\r
 \r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                ("Current path to %s has been lost.\n",\r
                p_hba->ioc_info.profile.id_string) );\r
 \r
@@ -865,14 +865,14 @@ __srp_disconnect_sessions(
                                                                         SP_UNTAGGED,\r
                                                                         SP_UNTAGGED,\r
                                                                         SRB_STATUS_BUSY );\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("Pausing Adapter for %s.\n",\r
                                p_hba->ioc_info.profile.id_string) );\r
                }\r
        }\r
 \r
        /* Destroy all the connections. */\r
-       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                ("Destroy all connections to %s.\n",\r
                p_hba->ioc_info.profile.id_string) );\r
 \r
@@ -885,14 +885,14 @@ __srp_disconnect_sessions(
 \r
                if ( p_session != NULL )\r
                {\r
-                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                ("Session Object ref_cnt = %d\n", p_session->obj.ref_cnt) );\r
                        __srp_cleanup_session ( &p_session->obj );\r
                        cl_obj_destroy( &p_session->obj );\r
                }\r
                else\r
                {\r
-                       SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_WARNING, SRP_DBG_PNP,\r
                                ("Session for Target ID %d on %s is NULL.\n",\r
                                 i,\r
                                 p_hba->ioc_info.profile.id_string) ); // <-- OK in a shutdown or target disconnect\r
@@ -914,7 +914,7 @@ __srp_connect_path(
 \r
        while ( g_srp_system_shutdown == FALSE )\r
        {\r
-               SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+               SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                        ("Searching for path to %s.\n",\r
                         p_hba->ioc_info.profile.id_string) );\r
 \r
@@ -923,13 +923,13 @@ __srp_connect_path(
                cl_spinlock_release( &p_hba->path_record_list_lock );\r
                if ( p_srp_path_record == (srp_path_record_t *)cl_qlist_end( &p_hba->path_record_list ) )\r
                {\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("No paths to %s found.\n",\r
                                p_hba->ioc_info.profile.id_string) );\r
                        break;\r
                }\r
 \r
-               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                        ("Connecting path to %s.\n",\r
                        p_hba->ioc_info.profile.id_string) );\r
 \r
@@ -937,7 +937,7 @@ __srp_connect_path(
                status = __srp_connect_sessions( p_hba );\r
                if ( status == IB_SUCCESS )\r
                {\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("Path to %s has connected.\n",\r
                                p_hba->ioc_info.profile.id_string) );\r
                        break;\r
@@ -979,7 +979,7 @@ __srp_pnp_cb(
        switch( p_pnp_rec->pnp_event )\r
        {\r
                case IB_PNP_IOC_ADD:\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("IB_PNP_IOC_ADD for %s.\n",\r
                                p_ioc_rec->info.profile.id_string) );\r
 \r
@@ -991,7 +991,7 @@ __srp_pnp_cb(
                         */\r
                        if( p_ioc_rec->ca_guid != p_hba->info.ca_guid )\r
                        {\r
-                               SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG,\r
+                               SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_PNP,\r
                                        ("Ignoring CA GUID.\n") );\r
                                status = IB_INVALID_GUID;\r
                                break;\r
@@ -1000,7 +1000,7 @@ __srp_pnp_cb(
                        /* Trap our IOC GUID so we can get path notification events. */\r
                        if( p_ioc_rec->info.profile.ioc_guid != p_hba->info.guid )\r
                        {\r
-                               SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_DEBUG,\r
+                               SRP_PRINT_EXIT( TRACE_LEVEL_WARNING, SRP_DBG_PNP,\r
                                        ("Ignoring GUID.\n") );\r
                                status = IB_INVALID_GUID;\r
                                break;\r
@@ -1026,32 +1026,32 @@ __srp_pnp_cb(
                                                p_ioc_rec->svc_entry_array,\r
                                                sizeof(ib_svc_entry_t) * p_hba->ioc_info.profile.num_svc_entries);\r
 \r
-                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                ("Found %d Service Entries.\n",\r
                                p_hba->ioc_info.profile.num_svc_entries));\r
                        break;\r
 \r
                case IB_PNP_IOC_REMOVE:\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("IB_PNP_IOC_REMOVE for %s.\n",\r
                                p_hba->ioc_info.profile.id_string) );\r
 \r
                        CL_ASSERT( p_pnp_rec->guid == p_hba->info.guid );\r
 \r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("Hey!!! Our IOC went away.\n") );\r
 \r
                        __srp_disconnect_sessions( p_hba, FALSE );\r
                        __srp_remove_path_records( p_hba );\r
-                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                ("HBA Object ref_cnt = %d\n", p_hba->obj.ref_cnt) );\r
                        break;\r
 \r
                case IB_PNP_IOC_PATH_ADD:\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
-                               ("IB_PNP_IOC_PATH_ADD (slid:%d dlid:%d) for %s.\n",\r
-                               p_ioc_path->path.slid,\r
-                               p_ioc_path->path.dlid,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
+                               ("IB_PNP_IOC_PATH_ADD (slid:0x%x dlid:0x%x) for %s.\n",\r
+                               cl_ntoh16(p_ioc_path->path.slid),\r
+                               cl_ntoh16(p_ioc_path->path.dlid),\r
                                p_hba->ioc_info.profile.id_string));\r
 \r
                        p_srp_path_record = __srp_add_path( p_hba, &p_ioc_path->path );\r
@@ -1063,7 +1063,7 @@ __srp_pnp_cb(
 \r
                        if ( p_hba->p_srp_path_record == NULL )\r
                        {\r
-                               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                               SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                        ("Connecting new path to %s.\n",\r
                                        p_hba->ioc_info.profile.id_string) );\r
                                status = __srp_connect_path( p_hba );\r
@@ -1071,7 +1071,7 @@ __srp_pnp_cb(
                        break;\r
 \r
                case IB_PNP_IOC_PATH_REMOVE:\r
-                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_DEBUG,\r
+                       SRP_PRINT( TRACE_LEVEL_INFORMATION, SRP_DBG_PNP,\r
                                ("IB_PNP_IOC_PATH_REMOVE (slid:%d dlid:%d) for %s.\n",\r
                                p_ioc_path->path.slid,\r
                                p_ioc_path->path.dlid,\r
@@ -1082,7 +1082,7 @@ __srp_pnp_cb(
                        {\r
                                if ( p_srp_path_record == p_hba->p_srp_path_record )\r
                                {\r
-                                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_DEBUG,\r
+                                       SRP_PRINT( TRACE_LEVEL_VERBOSE, SRP_DBG_PNP,\r
                                                ("Current path to %s has been lost.\n",\r
                                                 p_hba->ioc_info.profile.id_string) );\r
 \r