diff options
Diffstat (limited to 'usr/src/uts/common')
125 files changed, 81 insertions, 19521 deletions
diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files index 26e20efb9c..0c60127800 100644 --- a/usr/src/uts/common/Makefile.files +++ b/usr/src/uts/common/Makefile.files @@ -377,7 +377,6 @@ GENUNIX_OBJS += \ timers.o \ thread.o \ tlabel.o \ - tnf_res.o \ turnstile.o \ tty_common.o \ u8_textprep.o \ @@ -958,9 +957,6 @@ SYSMSG_OBJS += sysmsg.o SES_OBJS += ses.o ses_sen.o ses_safte.o ses_ses.o -TNF_OBJS += tnf_buf.o tnf_trace.o tnf_writer.o trace_init.o \ - trace_funcs.o tnf_probe.o tnf.o - LOGINDMUX_OBJS += logindmux.o DEVINFO_OBJS += devinfo.o diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules index 8ef8c5eb9d..705d794670 100644 --- a/usr/src/uts/common/Makefile.rules +++ b/usr/src/uts/common/Makefile.rules @@ -1684,10 +1684,6 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/common/syscall/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -$(OBJS_DIR)/%.o: $(UTSBASE)/common/tnf/%.c - $(COMPILE.c) -o $@ $< - $(CTFCONVERT_O) - $(OBJS_DIR)/%.o: $(COMMONBASE)/tsol/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) diff --git a/usr/src/uts/common/disp/disp.c b/usr/src/uts/common/disp/disp.c index 33921eecb0..f0e4aaecab 100644 --- a/usr/src/uts/common/disp/disp.c +++ b/usr/src/uts/common/disp/disp.c @@ -49,7 +49,6 @@ #include <sys/kmem.h> #include <sys/cpuvar.h> #include <sys/vtrace.h> -#include <sys/tnf.h> #include <sys/cpupart.h> #include <sys/lgrp.h> #include <sys/pg.h> @@ -1328,12 +1327,6 @@ setbackdq(kthread_t *tp) TRACE_3(TR_FAC_DISP, TR_BACKQ, "setbackdq:pri %d cpu %p tid %p", tpri, cp, tp); -#ifndef NPROBE - /* Kernel probe */ - if (tnf_tracing_active) - tnf_thread_queue(tp, cp, tpri); -#endif /* NPROBE */ - ASSERT(tpri >= 0 && tpri < dp->disp_npri); THREAD_RUN(tp, &dp->disp_lock); /* set t_state to TS_RUN */ @@ -1484,12 +1477,6 @@ setfrontdq(kthread_t *tp) TRACE_2(TR_FAC_DISP, TR_FRONTQ, "frontq:pri %d tid %p", tpri, tp); DTRACE_SCHED3(enqueue, kthread_t *, tp, disp_t *, dp, int, 1); -#ifndef NPROBE - /* Kernel probe */ - if (tnf_tracing_active) - tnf_thread_queue(tp, cp, tpri); -#endif /* NPROBE */ - ASSERT(tpri >= 0 && tpri < dp->disp_npri); THREAD_RUN(tp, &dp->disp_lock); /* set TS_RUN state and lock */ @@ -1601,12 +1588,6 @@ setkpdq(kthread_t *tp, int borf) disp_lock_enter_high(&cp->cpu_disp->disp_lock); ASSERT((cp->cpu_flags & CPU_QUIESCED) == 0); -#ifndef NPROBE - /* Kernel probe */ - if (tnf_tracing_active) - tnf_thread_queue(tp, cp, tpri); -#endif /* NPROBE */ - if (cp->cpu_chosen_level < tpri) cp->cpu_chosen_level = tpri; cpu_resched(cp, tpri); diff --git a/usr/src/uts/common/disp/fss.c b/usr/src/uts/common/disp/fss.c index 05f358e6d4..5ceeee6689 100644 --- a/usr/src/uts/common/disp/fss.c +++ b/usr/src/uts/common/disp/fss.c @@ -49,7 +49,6 @@ #include <sys/zone.h> #include <vm/rm.h> #include <vm/seg_kmem.h> -#include <sys/tnf_probe.h> #include <sys/policy.h> #include <sys/sdt.h> #include <sys/cpucaps.h> diff --git a/usr/src/uts/common/disp/fx.c b/usr/src/uts/common/disp/fx.c index 202f83b76e..191075e032 100644 --- a/usr/src/uts/common/disp/fx.c +++ b/usr/src/uts/common/disp/fx.c @@ -45,7 +45,6 @@ #include <sys/systm.h> #include <sys/vtrace.h> #include <sys/schedctl.h> -#include <sys/tnf_probe.h> #include <sys/sunddi.h> #include <sys/spl.h> #include <sys/modctl.h> @@ -1138,9 +1137,6 @@ fx_preempt(kthread_t *t) } else { schedctl_set_nopreempt(t, 0); DTRACE_SCHED1(schedctl__preempt, kthread_t *, t); - TNF_PROBE_2(schedctl_preempt, "schedctl FX fx_preempt", - /* CSTYLED */, tnf_pid, pid, ttoproc(t)->p_pid, - tnf_lwpid, lwpid, t->t_tid); /* * Fall through and be preempted below. */ @@ -1332,10 +1328,6 @@ fx_tick(kthread_t *t) } DTRACE_SCHED1(schedctl__failsafe, kthread_t *, t); - TNF_PROBE_2(schedctl_failsafe, - "schedctl FX fx_tick", /* CSTYLED */, - tnf_pid, pid, ttoproc(t)->p_pid, - tnf_lwpid, lwpid, t->t_tid); } new_pri = fx_dptbl[fxpp->fx_pri].fx_globpri; ASSERT(new_pri >= 0 && new_pri <= fx_maxglobpri); diff --git a/usr/src/uts/common/disp/thread.c b/usr/src/uts/common/disp/thread.c index 9f06df5b33..b2b28ec06f 100644 --- a/usr/src/uts/common/disp/thread.c +++ b/usr/src/uts/common/disp/thread.c @@ -54,7 +54,6 @@ #include <sys/vtrace.h> #include <sys/callb.h> #include <c2/audit.h> -#include <sys/tnf.h> #include <sys/sobject.h> #include <sys/cpupart.h> #include <sys/pset.h> @@ -438,10 +437,6 @@ thread_create( t->t_dtrace_vtime = 1; /* assure vtimestamp is always non-zero */ CPU_STATS_ADDQ(CPU, sys, nthreads, 1); -#ifndef NPROBE - /* Kernel probe */ - tnf_thread_create(t); -#endif /* NPROBE */ LOCK_INIT_CLEAR(&t->t_lock); /* @@ -597,12 +592,6 @@ thread_exit(void) if (t->t_door) door_slam(); /* in case thread did an upcall */ -#ifndef NPROBE - /* Kernel probe */ - if (t->t_tnf_tpdp) - tnf_thread_exit(); -#endif /* NPROBE */ - thread_rele(t); t->t_preempt++; @@ -742,10 +731,6 @@ thread_free(kthread_t *t) } if (audit_active) audit_thread_free(t); -#ifndef NPROBE - if (t->t_tnf_tpdp) - tnf_thread_free(t); -#endif /* NPROBE */ if (t->t_cldata) { CL_EXITCLASS(t->t_cid, (caddr_t *)t->t_cldata); } diff --git a/usr/src/uts/common/disp/ts.c b/usr/src/uts/common/disp/ts.c index 6a5edb59a3..e06673e6aa 100644 --- a/usr/src/uts/common/disp/ts.c +++ b/usr/src/uts/common/disp/ts.c @@ -51,7 +51,6 @@ #include <sys/vtrace.h> #include <sys/vmsystm.h> #include <sys/schedctl.h> -#include <sys/tnf_probe.h> #include <sys/atomic.h> #include <sys/policy.h> #include <sys/sdt.h> @@ -1425,9 +1424,6 @@ ts_preempt(kthread_t *t) } schedctl_set_nopreempt(t, 0); DTRACE_SCHED1(schedctl__preempt, kthread_t *, t); - TNF_PROBE_2(schedctl_preempt, "schedctl TS ts_preempt", - /* CSTYLED */, tnf_pid, pid, ttoproc(t)->p_pid, - tnf_lwpid, lwpid, t->t_tid); /* * Fall through and be preempted below. */ @@ -1689,10 +1685,6 @@ ts_tick(kthread_t *t) DTRACE_SCHED1(schedctl__failsafe, kthread_t *, t); - TNF_PROBE_2(schedctl_failsafe, - "schedctl TS ts_tick", /* CSTYLED */, - tnf_pid, pid, ttoproc(t)->p_pid, - tnf_lwpid, lwpid, t->t_tid); } tspp->ts_flags &= ~TSRESTORE; tspp->ts_cpupri = ts_dptbl[tspp->ts_cpupri].ts_tqexp; diff --git a/usr/src/uts/common/fs/ufs/lufs_thread.c b/usr/src/uts/common/fs/ufs/lufs_thread.c index da37db94df..e63d799ba9 100644 --- a/usr/src/uts/common/fs/ufs/lufs_thread.c +++ b/usr/src/uts/common/fs/ufs/lufs_thread.c @@ -40,7 +40,6 @@ #include <sys/fs/ufs_bio.h> #include <sys/inttypes.h> #include <sys/callb.h> -#include <sys/tnf_probe.h> /* * Kernel threads for logging @@ -160,8 +159,6 @@ log_roll_read(ml_unit_t *ul, rollbuf_t *rbs, int nmblk, caddr_t roll_bufs, for (i = 0, rbp = rbs; i < nbuf; ++i, ++rbp) { if (P2ALIGN(rbp->rb_bh.b_blkno, MAPBLOCKSIZE / DEV_BSIZE) == mblkno) { - TNF_PROBE_0(trans_roll_new_delta, "lufs", - /* CSTYLED */); trans_roll_new_delta++; /* Flush out the current set of buffers */ goto flush_bufs; diff --git a/usr/src/uts/common/io/1394/adapters/hci1394.c b/usr/src/uts/common/io/1394/adapters/hci1394.c index 6a6e9678cf..0486418200 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394.c @@ -95,62 +95,29 @@ static struct modlinkage hci1394_modlinkage = { NULL }; -#ifndef NPROBE -extern int tnf_mod_load(void); -extern int tnf_mod_unload(struct modlinkage *mlp); -#endif - int _init() { int status; - -#ifndef NPROBE - (void) tnf_mod_load(); -#endif - TNF_PROBE_0_DEBUG(hci1394_init_enter, HCI1394_TNF_HAL_STACK, ""); - status = ddi_soft_state_init(&hci1394_statep, sizeof (hci1394_state_t), (size_t)HCI1394_INITIAL_STATES); if (status != 0) { - TNF_PROBE_2(hci1394_init_ssi_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "failed in ddi_soft_state_init", - tnf_int, error, status); - TNF_PROBE_0_DEBUG(hci1394_init_exit, HCI1394_TNF_HAL_STACK, ""); -#ifndef NPROBE - (void) tnf_mod_unload(&hci1394_modlinkage); -#endif return (status); } /* Call into services layer to init bus-ops */ status = h1394_init(&hci1394_modlinkage); if (status != 0) { - TNF_PROBE_2(hci1394_init_h1394_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "failed in h1394_init", - tnf_int, error, status); - TNF_PROBE_0_DEBUG(hci1394_init_exit, HCI1394_TNF_HAL_STACK, ""); -#ifndef NPROBE - (void) tnf_mod_unload(&hci1394_modlinkage); -#endif return (status); } status = mod_install(&hci1394_modlinkage); if (status != 0) { - TNF_PROBE_2(hci1394_init_modi_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "failed in mod_install", - tnf_int, error, status); ddi_soft_state_fini(&hci1394_statep); -#ifndef NPROBE - (void) tnf_mod_unload(&hci1394_modlinkage); -#endif return (status); } - TNF_PROBE_0_DEBUG(hci1394_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (status); } @@ -160,9 +127,7 @@ _info(struct modinfo *modinfop) { int status; - TNF_PROBE_0_DEBUG(hci1394_info_enter, HCI1394_TNF_HAL_STACK, ""); status = mod_info(&hci1394_modlinkage, modinfop); - TNF_PROBE_0_DEBUG(hci1394_info_exit, HCI1394_TNF_HAL_STACK, ""); return (status); } @@ -173,14 +138,8 @@ _fini() { int status; - TNF_PROBE_0_DEBUG(hci1394_fini_enter, HCI1394_TNF_HAL_STACK, ""); - status = mod_remove(&hci1394_modlinkage); if (status != 0) { - TNF_PROBE_2(hci1394_fini_modr_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "failed in mod_remove", - tnf_int, error, status); - TNF_PROBE_0_DEBUG(hci1394_fini_exit, HCI1394_TNF_HAL_STACK, ""); return (status); } @@ -188,11 +147,5 @@ _fini() h1394_fini(&hci1394_modlinkage); ddi_soft_state_fini(&hci1394_statep); - TNF_PROBE_0_DEBUG(hci1394_fini_exit, HCI1394_TNF_HAL_STACK, ""); - -#ifndef NPROBE - (void) tnf_mod_unload(&hci1394_modlinkage); -#endif - return (status); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_async.c b/usr/src/uts/common/io/1394/adapters/hci1394_async.c index 7450dd5035..26c05c8b28 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_async.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_async.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_async.c * These routines manipulate the 1394 asynchronous dma engines. This @@ -157,7 +155,6 @@ hci1394_async_init(hci1394_drvinfo_t *drvinfo, ASSERT(ohci_handle != NULL); ASSERT(csr_handle != NULL); ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_init_enter, HCI1394_TNF_HAL_STACK, ""); /* alloc the space to keep track of the list */ async = kmem_alloc(sizeof (hci1394_async_t), KM_SLEEP); @@ -215,10 +212,6 @@ hci1394_async_init(hci1394_drvinfo_t *drvinfo, hci1394_tlabel_fini(&async->as_tlabel); kmem_free(async, sizeof (hci1394_async_t)); *async_handle = NULL; - TNF_PROBE_0(hci1394_async_q_init_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_async_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -238,10 +231,6 @@ hci1394_async_init(hci1394_drvinfo_t *drvinfo, hci1394_q_fini(&async->as_atreq_q); kmem_free(async, sizeof (hci1394_async_t)); *async_handle = NULL; - TNF_PROBE_0(hci1394_async_q_init_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_async_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -262,10 +251,6 @@ hci1394_async_init(hci1394_drvinfo_t *drvinfo, hci1394_q_fini(&async->as_arresp_q); kmem_free(async, sizeof (hci1394_async_t)); *async_handle = NULL; - TNF_PROBE_0(hci1394_async_q_init_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_async_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -287,17 +272,11 @@ hci1394_async_init(hci1394_drvinfo_t *drvinfo, hci1394_q_fini(&async->as_arreq_q); kmem_free(async, sizeof (hci1394_async_t)); *async_handle = NULL; - TNF_PROBE_0(hci1394_async_q_init_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_async_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } *async_handle = async; - TNF_PROBE_0_DEBUG(hci1394_async_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -315,7 +294,6 @@ hci1394_async_fini(hci1394_async_handle_t *async_handle) ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_fini_enter, HCI1394_TNF_HAL_STACK, ""); async = (hci1394_async_t *)*async_handle; @@ -331,8 +309,6 @@ hci1394_async_fini(hci1394_async_handle_t *async_handle) /* set handle to null. This helps catch bugs. */ *async_handle = NULL; - - TNF_PROBE_0_DEBUG(hci1394_async_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -346,17 +322,12 @@ void hci1394_async_suspend(hci1394_async_handle_t async_handle) { ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_suspend_enter, - HCI1394_TNF_HAL_STACK, ""); /* Flush out async DMA Q's */ hci1394_async_flush(async_handle); /* Cancel any scheduled pending timeouts */ hci1394_tlist_timeout_cancel(async_handle->as_pending_list); - - TNF_PROBE_0_DEBUG(hci1394_async_suspend_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -370,17 +341,12 @@ int hci1394_async_resume(hci1394_async_handle_t async_handle) { ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_resume_enter, - HCI1394_TNF_HAL_STACK, ""); hci1394_q_resume(async_handle->as_atreq_q); hci1394_q_resume(async_handle->as_atresp_q); hci1394_q_resume(async_handle->as_arreq_q); hci1394_q_resume(async_handle->as_arresp_q); - TNF_PROBE_0_DEBUG(hci1394_async_resume_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -408,7 +374,6 @@ void hci1394_async_flush(hci1394_async_handle_t async_handle) { ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_flush_enter, HCI1394_TNF_HAL_STACK, ""); hci1394_async_atreq_flush(async_handle); hci1394_async_arresp_flush(async_handle); @@ -416,8 +381,6 @@ hci1394_async_flush(hci1394_async_handle_t async_handle) hci1394_async_arreq_flush(async_handle); hci1394_async_atresp_flush(async_handle); hci1394_tlabel_reset(async_handle->as_tlabel); - - TNF_PROBE_0_DEBUG(hci1394_async_flush_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -433,12 +396,8 @@ hci1394_async_pending_timeout_update(hci1394_async_handle_t async_handle, hrtime_t timeout) { ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_pending_timeout_update_enter, - HCI1394_TNF_HAL_STACK, ""); hci1394_tlist_timeout_update(async_handle->as_pending_list, timeout); hci1394_tlabel_set_reclaim_time(async_handle->as_tlabel, timeout); - TNF_PROBE_0_DEBUG(hci1394_async_pending_timeout_update_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -500,9 +459,6 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, ASSERT(async_handle != NULL); ASSERT(request_available != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_process_enter, - HCI1394_TNF_HAL_STACK, ""); - /* * Get the next ATREQ that has completed (if one has). Space is free'd * up in atreq_q and atreq_data_q as part of this function call. @@ -515,8 +471,6 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, */ if (qcmd == NULL) { *request_available = B_FALSE; - TNF_PROBE_0_DEBUG(hci1394_async_atreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -524,9 +478,6 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, *request_available = B_TRUE; hcicmd = (hci1394_async_cmd_t *)qcmd->qc_arg; - TNF_PROBE_1_DEBUG(hci1394_atreq_ack, HCI1394_TNF_HAL, "", tnf_uint, - atreq_ack, qcmd->qc_status); - /* save away the command completed timestamp for the services layer */ hcicmd->ac_priv->ack_tstamp = qcmd->qc_timestamp; @@ -557,17 +508,11 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, async_handle->as_drvinfo->di_sl_private, hcicmd->ac_cmd, H1394_AT_REQ, hcicmd->ac_status); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); /* * This is a HW error. Process the ACK like we never saw the * response. We will do this below. */ - } else { - TNF_PROBE_1(hci1394_async_ack_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "response sent to non-pended ack"); } } @@ -582,8 +527,6 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, hcicmd->ac_plist_node.tln_addr = hcicmd; hci1394_tlist_add(async_handle->as_pending_list, &hcicmd->ac_plist_node); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -608,11 +551,6 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, case OHCI_EVT_MISSING_ACK: case OHCI_EVT_TIMEOUT: - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); cmd_status = H1394_CMD_ETIMEOUT; break; @@ -620,56 +558,26 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, case OHCI_ACK_BUSY_A: case OHCI_ACK_BUSY_B: cmd_status = H1394_CMD_EDEVICE_BUSY; - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); break; case OHCI_ACK_TARDY: cmd_status = H1394_CMD_EDEVICE_POWERUP; - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); break; case OHCI_ACK_DATA_ERROR: cmd_status = H1394_CMD_EDATA_ERROR; - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); break; case OHCI_ACK_TYPE_ERROR: cmd_status = H1394_CMD_ETYPE_ERROR; - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); break; case OHCI_ACK_CONFLICT_ERROR: cmd_status = H1394_CMD_ERSRC_CONFLICT; - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); break; case OHCI_ACK_ADDRESS_ERROR: cmd_status = H1394_CMD_EADDR_ERROR; - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); break; case OHCI_EVT_UNDERRUN: @@ -679,11 +587,6 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, case OHCI_EVT_UNKNOWN: default: cmd_status = H1394_CMD_EUNKNOWN_ERROR; - TNF_PROBE_3(hci1394_atreq_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(hcicmd->ac_tlabel.tbi_destination), - tnf_uint, tx_tlabel, hcicmd->ac_tlabel.tbi_tlabel, - tnf_uint, atreq_ack, qcmd->qc_status); break; } @@ -710,9 +613,6 @@ hci1394_async_atreq_process(hci1394_async_handle_t async_handle, h1394_cmd_is_complete(async_handle->as_drvinfo->di_sl_private, hcicmd->ac_cmd, H1394_AT_REQ, cmd_status); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -739,9 +639,6 @@ hci1394_async_arresp_process(hci1394_async_handle_t async_handle, ASSERT(async_handle != NULL); ASSERT(response_available != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_process_enter, - HCI1394_TNF_HAL_STACK, ""); - /* * See if there were any responses on ARRESP Q. A NULL means there * were no responses on the Q. This call does NOT free up space. We @@ -751,8 +648,6 @@ hci1394_async_arresp_process(hci1394_async_handle_t async_handle, hci1394_q_ar_next(async_handle->as_arresp_q, &addr); if (addr == NULL) { *response_available = B_FALSE; - TNF_PROBE_0_DEBUG(hci1394_async_arresp_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -780,10 +675,6 @@ hci1394_async_arresp_process(hci1394_async_handle_t async_handle, "unrecoverable error interrupt detected", async_handle->as_drvinfo->di_instance); hci1394_shutdown(async_handle->as_drvinfo->di_dip); - TNF_PROBE_0(hci1394_async_arresp_read_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -798,14 +689,9 @@ hci1394_async_arresp_process(hci1394_async_handle_t async_handle, */ if (hcicmd == NULL) { mutex_exit(&async_handle->as_atomic_lookup); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } - TNF_PROBE_1_DEBUG(hci1394_arresp_resp, HCI1394_TNF_HAL, "", tnf_uint, - atresp_resp, hcicmd->ac_status); - /* * Make sure this is in the pending list. There is a small chance that * we will see the response before we see the ACK PENDING. If it is the @@ -821,8 +707,6 @@ hci1394_async_arresp_process(hci1394_async_handle_t async_handle, &hcicmd->ac_plist_node); if (status != DDI_SUCCESS) { mutex_exit(&async_handle->as_atomic_lookup); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } } @@ -878,8 +762,6 @@ hci1394_async_arresp_process(hci1394_async_handle_t async_handle, break; default: cmd_status = H1394_CMD_EUNKNOWN_ERROR; - TNF_PROBE_1(hci1394_async_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, arresp_resp, hcicmd->ac_status); break; } @@ -909,9 +791,6 @@ hci1394_async_arresp_process(hci1394_async_handle_t async_handle, hcicmd->ac_status = cmd_status; } - TNF_PROBE_0_DEBUG(hci1394_async_arresp_process_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -937,9 +816,6 @@ hci1394_async_arreq_process(hci1394_async_handle_t async_handle, ASSERT(async_handle != NULL); ASSERT(request_available != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_process_enter, - HCI1394_TNF_HAL_STACK, ""); - /* * See if there were any requests on ARREQ Q. A NULL means there * were no requests on the Q. This call does NOT free up space. We @@ -949,8 +825,6 @@ hci1394_async_arreq_process(hci1394_async_handle_t async_handle, hci1394_q_ar_next(async_handle->as_arreq_q, &addr); if (addr == NULL) { *request_available = B_FALSE; - TNF_PROBE_0_DEBUG(hci1394_async_arreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -971,10 +845,6 @@ hci1394_async_arreq_process(hci1394_async_handle_t async_handle, "unrecoverable error interrupt detected", async_handle->as_drvinfo->di_instance); hci1394_shutdown(async_handle->as_drvinfo->di_dip); - TNF_PROBE_0(hci1394_async_arreq_read_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -988,8 +858,6 @@ hci1394_async_arreq_process(hci1394_async_handle_t async_handle, * still may have other requests on the Q. */ if (hcicmd == NULL) { - TNF_PROBE_0_DEBUG(hci1394_async_arreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1002,14 +870,9 @@ hci1394_async_arreq_process(hci1394_async_handle_t async_handle, if (async_handle->as_flushing_arreq == B_TRUE) { hci1394_async_response_complete(async_handle, hcicmd->ac_cmd, hcicmd->ac_priv); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } - TNF_PROBE_1_DEBUG(hci1394_arreq_ack, HCI1394_TNF_HAL, "", tnf_uint, - arreq_ack, hcicmd->ac_status); - /* * We got a valid request that we were able to read in. Call into the * services layer based on the type of request. @@ -1049,14 +912,9 @@ hci1394_async_arreq_process(hci1394_async_handle_t async_handle, /* free alloc'd command */ hci1394_async_response_complete(async_handle, hcicmd->ac_cmd, hcicmd->ac_priv); - TNF_PROBE_1(hci1394_async_arreq_tcode_err, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, arreq_tcode, tcode); break; } - TNF_PROBE_0_DEBUG(hci1394_async_arreq_process_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1083,9 +941,6 @@ hci1394_async_atresp_process(hci1394_async_handle_t async_handle, ASSERT(async_handle != NULL); ASSERT(response_available != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_process_enter, - HCI1394_TNF_HAL_STACK, ""); - /* * Get the next ATRESP that has completed (if one has). Space is free'd * up in atresp_q and atresp_data_q as part of this function call. @@ -1098,8 +953,6 @@ hci1394_async_atresp_process(hci1394_async_handle_t async_handle, */ if (qcmd == NULL) { *response_available = B_FALSE; - TNF_PROBE_0_DEBUG(hci1394_async_atresp_process_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1107,9 +960,6 @@ hci1394_async_atresp_process(hci1394_async_handle_t async_handle, *response_available = B_TRUE; hcicmd = (hci1394_async_cmd_t *)qcmd->qc_arg; - TNF_PROBE_1_DEBUG(hci1394_atresp_ack, HCI1394_TNF_HAL, "", tnf_uint, - atresp_ack, qcmd->qc_status); - /* save away the command completed timestamp for the services layer */ hcicmd->ac_priv->ack_tstamp = qcmd->qc_timestamp; @@ -1135,52 +985,36 @@ hci1394_async_atresp_process(hci1394_async_handle_t async_handle, case OHCI_EVT_MISSING_ACK: case OHCI_EVT_TIMEOUT: cmd_status = H1394_CMD_ETIMEOUT; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_ACK_BUSY_X: case OHCI_ACK_BUSY_A: case OHCI_ACK_BUSY_B: cmd_status = H1394_CMD_EDEVICE_BUSY; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_ACK_TARDY: cmd_status = H1394_CMD_EDEVICE_POWERUP; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_ACK_DATA_ERROR: cmd_status = H1394_CMD_EDATA_ERROR; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_ACK_TYPE_ERROR: cmd_status = H1394_CMD_ETYPE_ERROR; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_ACK_CONFLICT_ERROR: cmd_status = H1394_CMD_ERSRC_CONFLICT; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_ACK_ADDRESS_ERROR: cmd_status = H1394_CMD_EADDR_ERROR; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_EVT_UNKNOWN: cmd_status = H1394_CMD_EUNKNOWN_ERROR; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; case OHCI_EVT_UNDERRUN: @@ -1189,8 +1023,6 @@ hci1394_async_atresp_process(hci1394_async_handle_t async_handle, case OHCI_EVT_DESCRIPTOR_READ: default: cmd_status = H1394_CMD_EUNKNOWN_ERROR; - TNF_PROBE_1(hci1394_atresp_ack_err, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, atresp_ack, qcmd->qc_status); break; } @@ -1198,9 +1030,6 @@ hci1394_async_atresp_process(hci1394_async_handle_t async_handle, h1394_cmd_is_complete(async_handle->as_drvinfo->di_sl_private, hcicmd->ac_cmd, H1394_AT_RESP, cmd_status); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_process_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1243,9 +1072,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_enter, - HCI1394_TNF_HAL_STACK, ""); - /* read in the arresp tcode */ quadlet = hci1394_q_ar_get32(async_handle->as_arresp_q, &pkt->q1); *tcode = HCI1394_DESC_TCODE_GET(quadlet); @@ -1254,10 +1080,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, status = hci1394_async_arresp_size_get(*tcode, async_handle->as_arresp_q, &pkt->q1, size); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_arresp_read_size_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1280,12 +1102,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, */ *hcicmd = (hci1394_async_cmd_t *)command; if ((*hcicmd) == NULL) { - TNF_PROBE_2(hci1394_invalid_tlabel, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, nodeid, - IEEE1394_NODE_NUM(ac_tlabel.tbi_destination), tnf_uint, - rx_tlabel, ac_tlabel.tbi_tlabel); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1324,16 +1140,9 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, if (ack != OHCI_ACK_COMPLETE) { /* use the ack error instead of rcode for the command status */ (*hcicmd)->ac_status = ack | ASYNC_ARRESP_ACK_ERROR; - TNF_PROBE_1(hci1394_arresp_bad_ack, HCI1394_TNF_HAL_ERROR, - "", tnf_uint, arresp_ack, ack); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } - TNF_PROBE_1_DEBUG(hci1394_atrresp_resp, HCI1394_TNF_HAL, "", tnf_uint, - arresp_resp, rcode); - /* * If we get to this point we have gotten a valid ACK on the response * and have matched up the response with an ATREQ. Now we check the @@ -1341,8 +1150,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, * left to look at in the response. Return successfully. */ if (rcode != IEEE1394_RESP_COMPLETE) { - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1364,12 +1171,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, if ((cmd->cmd_type != CMD1394_ASYNCH_WR_QUAD) && (cmd->cmd_type != CMD1394_ASYNCH_WR_BLOCK)) { (*hcicmd)->ac_status = H1394_CMD_EDEVICE_ERROR; - TNF_PROBE_2(hci1394_async_arresp_lockresp_fail, - HCI1394_TNF_HAL_STACK, "", tnf_string, errmsg, - "Invalid response sent for write request", tnf_uint, - arresp_tcode, *tcode); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; @@ -1378,12 +1179,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, /* make sure the ATREQ was a quadlet read */ if (cmd->cmd_type != CMD1394_ASYNCH_RD_QUAD) { (*hcicmd)->ac_status = H1394_CMD_EDEVICE_ERROR; - TNF_PROBE_2(hci1394_async_arresp_lockresp_fail, - HCI1394_TNF_HAL_STACK, "", tnf_string, errmsg, - "Invalid response sent for qrd request", tnf_uint, - arresp_tcode, *tcode); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1400,12 +1195,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, /* make sure the ATREQ was a block read */ if (cmd->cmd_type != CMD1394_ASYNCH_RD_BLOCK) { (*hcicmd)->ac_status = H1394_CMD_EDEVICE_ERROR; - TNF_PROBE_2(hci1394_async_arresp_lockresp_fail, - HCI1394_TNF_HAL_STACK, "", tnf_string, errmsg, - "Invalid response sent for brd request", tnf_uint, - arresp_tcode, *tcode); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1418,13 +1207,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, data_length = HCI1394_DESC_DATALEN_GET(quadlet); if (data_length != cmd_priv->mblk.length) { (*hcicmd)->ac_status = H1394_CMD_EDEVICE_ERROR; - TNF_PROBE_3(hci1394_async_arresp_brdsz_fail, - HCI1394_TNF_HAL_STACK, "", tnf_string, - errmsg, "Block read response size is bad", - tnf_uint, requested_size, cmd_priv->mblk.length, - tnf_uint, response_size, data_length); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1446,13 +1228,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, */ if (data_length != IEEE1394_QUADLET) { (*hcicmd)->ac_status = H1394_CMD_EDEVICE_ERROR; - TNF_PROBE_2(hci1394_async_arresp_l32sz_fail, - HCI1394_TNF_HAL_STACK, "", tnf_string, - errmsg, "Invalid size for lock32 response", - tnf_uint, data_size, data_length); - TNF_PROBE_0_DEBUG( - hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1475,13 +1250,6 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, */ if (data_length != IEEE1394_OCTLET) { (*hcicmd)->ac_status = H1394_CMD_EDEVICE_ERROR; - TNF_PROBE_2(hci1394_async_arresp_l64sz_fail, - HCI1394_TNF_HAL_STACK, "", tnf_string, - errmsg, "Invalid size for lock64 response", - tnf_uint, data_size, data_length); - TNF_PROBE_0_DEBUG( - hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1503,29 +1271,15 @@ hci1394_async_arresp_read(hci1394_async_handle_t async_handle, */ } else { (*hcicmd)->ac_status = H1394_CMD_EDEVICE_ERROR; - TNF_PROBE_2(hci1394_async_arresp_lockresp_fail, - HCI1394_TNF_HAL_STACK, "", tnf_string, errmsg, - "Invalid response sent for lock request", tnf_uint, - arresp_tcode, *tcode); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; default: /* we got a tcode that we don't know about. Return error */ - TNF_PROBE_2(hci1394_async_arresp_tcode_err, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "unknown ARRESP received", tnf_uint, arresp_tcode, *tcode); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_async_arresp_read_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1559,9 +1313,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_enter, - HCI1394_TNF_HAL_STACK, ""); - /* read in the arresp tcode */ quadlet = hci1394_q_ar_get32(async_handle->as_arreq_q, &pkt->q1); *tcode = HCI1394_DESC_TCODE_GET(quadlet); @@ -1574,10 +1325,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, status = h1394_alloc_cmd(async_handle->as_drvinfo->di_sl_private, H1394_ALLOC_CMD_NOSLEEP, &cmd, &cmd_priv); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_arreq_read_cmdalloc_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1611,10 +1358,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0(hci1394_async_arreq_read_qrd_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; @@ -1633,10 +1376,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0(hci1394_async_arreq_read_qwr_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; @@ -1655,10 +1394,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0(hci1394_async_arreq_read_brd_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; @@ -1677,10 +1412,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0(hci1394_async_arreq_read_bwr_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; @@ -1699,10 +1430,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0(hci1394_async_arreq_read_lck_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; @@ -1721,10 +1448,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0(hci1394_async_arreq_read_phy_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -1737,19 +1460,12 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } break; default: /* we got a tcode that we don't know about. Return error */ - TNF_PROBE_2(hci1394_async_arreq_tcode_err, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "unknown ARREQ received", tnf_uint, arreq_tcode, *tcode); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1765,10 +1481,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, IEEE1394_TCODE_WRITE_BLOCK))) { hci1394_async_response_complete(async_handle, cmd, cmd_priv); *hcicmd = NULL; - TNF_PROBE_0(hci1394_async_arreq_read_bcast_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); /* @@ -1780,9 +1492,6 @@ hci1394_async_arreq_read(hci1394_async_handle_t async_handle, cmd->broadcast = 1; } - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1805,8 +1514,6 @@ hci1394_async_arreq_read_qrd(hci1394_async_handle_t async_handle, ASSERT(pkt != NULL); ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qrd_enter, - HCI1394_TNF_HAL_STACK, ""); /* Setup shortcuts, command type, and size of request */ cmd = hcicmd->ac_cmd; @@ -1831,11 +1538,6 @@ hci1394_async_arreq_read_qrd(hci1394_async_handle_t async_handle, */ if ((hcicmd->ac_status != OHCI_ACK_COMPLETE) && (hcicmd->ac_status != OHCI_ACK_PENDING)) { - TNF_PROBE_1(hci1394_async_arreq_qrd_ack_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, arreq_ack, - hcicmd->ac_status); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qrd_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1858,9 +1560,6 @@ hci1394_async_arreq_read_qrd(hci1394_async_handle_t async_handle, quadlet = hci1394_q_ar_get32(async_handle->as_arreq_q, &pkt->q3); cmd->cmd_addr |= HCI1394_TO_ADDR_LO(quadlet); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qrd_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1884,8 +1583,6 @@ hci1394_async_arreq_read_qwr(hci1394_async_handle_t async_handle, ASSERT(pkt != NULL); ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qwr_enter, - HCI1394_TNF_HAL_STACK, ""); /* Setup shortcuts, command type, and size of request */ cmd = hcicmd->ac_cmd; @@ -1910,11 +1607,6 @@ hci1394_async_arreq_read_qwr(hci1394_async_handle_t async_handle, */ if ((hcicmd->ac_status != OHCI_ACK_COMPLETE) && (hcicmd->ac_status != OHCI_ACK_PENDING)) { - TNF_PROBE_1(hci1394_async_arreq_qwr_ack_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, arreq_ack, - hcicmd->ac_status); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qwr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1941,9 +1633,6 @@ hci1394_async_arreq_read_qwr(hci1394_async_handle_t async_handle, (uint8_t *)&cmd->cmd_u.q.quadlet_data, (uint8_t *)&pkt->q4, IEEE1394_QUADLET); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qwr_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1966,8 +1655,6 @@ hci1394_async_arreq_read_brd(hci1394_async_handle_t async_handle, ASSERT(pkt != NULL); ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_brd_enter, - HCI1394_TNF_HAL_STACK, ""); /* Setup shortcuts, command type, and size of request */ cmd = hcicmd->ac_cmd; @@ -1992,11 +1679,6 @@ hci1394_async_arreq_read_brd(hci1394_async_handle_t async_handle, */ if ((hcicmd->ac_status != OHCI_ACK_COMPLETE) && (hcicmd->ac_status != OHCI_ACK_PENDING)) { - TNF_PROBE_1(hci1394_async_arreq_brd_ack_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, arreq_ack, - hcicmd->ac_status); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_brd_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2019,17 +1701,10 @@ hci1394_async_arreq_read_brd(hci1394_async_handle_t async_handle, cmd->cmd_u.b.blk_length = HCI1394_DESC_DATALEN_GET(quadlet); cmd->cmd_u.b.data_block = allocb(cmd->cmd_u.b.blk_length, 0); if (cmd->cmd_u.b.data_block == NULL) { - TNF_PROBE_0(hci1394_async_arreq_brd_mblk_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_brd_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hcicmd->ac_mblk_alloc = B_TRUE; - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_brd_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2053,8 +1728,6 @@ hci1394_async_arreq_read_bwr(hci1394_async_handle_t async_handle, ASSERT(pkt != NULL); ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_bwr_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Setup shortcuts, command type, and size of request. The size of the @@ -2090,11 +1763,6 @@ hci1394_async_arreq_read_bwr(hci1394_async_handle_t async_handle, */ if ((hcicmd->ac_status != OHCI_ACK_COMPLETE) && (hcicmd->ac_status != OHCI_ACK_PENDING)) { - TNF_PROBE_1(hci1394_async_arreq_bwr_ack_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, arreq_ack, - hcicmd->ac_status); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_bwr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2115,10 +1783,6 @@ hci1394_async_arreq_read_bwr(hci1394_async_handle_t async_handle, cmd->cmd_addr |= HCI1394_TO_ADDR_LO(quadlet); cmd->cmd_u.b.data_block = allocb(cmd->cmd_u.b.blk_length, 0); if (cmd->cmd_u.b.data_block == NULL) { - TNF_PROBE_0(hci1394_async_arreq_bwr_mblk_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_bwr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hcicmd->ac_mblk_alloc = B_TRUE; @@ -2131,9 +1795,6 @@ hci1394_async_arreq_read_bwr(hci1394_async_handle_t async_handle, /* Update mblk_t wptr */ cmd->cmd_u.b.data_block->b_wptr += cmd->cmd_u.b.blk_length; - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_bwr_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2159,8 +1820,6 @@ hci1394_async_arreq_read_lck(hci1394_async_handle_t async_handle, ASSERT(pkt != NULL); ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qrd_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Setup shortcuts, command type, and size of request. The size of the @@ -2182,11 +1841,6 @@ hci1394_async_arreq_read_lck(hci1394_async_handle_t async_handle, cmd->cmd_type = CMD1394_ASYNCH_LOCK_64; cmd->cmd_u.l64.lock_type = HCI1394_DESC_EXTTCODE_GET(quadlet); } else { - TNF_PROBE_2(hci1394_async_arreq_lck_sz_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "unexpected length received", tnf_uint, locklen, length); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2210,11 +1864,6 @@ hci1394_async_arreq_read_lck(hci1394_async_handle_t async_handle, */ if ((hcicmd->ac_status != OHCI_ACK_COMPLETE) && (hcicmd->ac_status != OHCI_ACK_PENDING)) { - TNF_PROBE_1(hci1394_async_arreq_read_ack_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, arreq_ack, - hcicmd->ac_status); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2274,9 +1923,6 @@ hci1394_async_arreq_read_lck(hci1394_async_handle_t async_handle, cmd->cmd_u.l64.lock_type, cmd->cmd_u.l64.data_value); } - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_qrd_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2301,8 +1947,6 @@ hci1394_async_arreq_read_phy(hci1394_async_handle_t async_handle, ASSERT(pkt != NULL); ASSERT(hcicmd != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_phy_enter, - HCI1394_TNF_HAL_STACK, ""); /* Setup shortcuts, command type, and size of request */ cmd = hcicmd->ac_cmd; @@ -2335,8 +1979,6 @@ hci1394_async_arreq_read_phy(hci1394_async_handle_t async_handle, async_handle->as_ohci)) { async_handle->as_flushing_arreq = B_FALSE; } - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -2344,20 +1986,12 @@ hci1394_async_arreq_read_phy(hci1394_async_handle_t async_handle, /* if there is a data error in the PHY packet, return failure */ if (data1 != ~data2) { - TNF_PROBE_2(hci1394_async_arreq_phy_xor_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_opaque, first_quadlet, - data1, tnf_opaque, second_quadlet, data2); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* Copy the PHY quadlet to the command */ cmd->cmd_u.q.quadlet_data = data1; - TNF_PROBE_0_DEBUG(hci1394_async_arreq_read_phy_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2380,8 +2014,6 @@ hci1394_async_phy(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, ASSERT(cmd_priv != NULL); ASSERT(result != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_phy_enter, HCI1394_TNF_HAL_STACK, ""); - /* * make sure this call is during the current bus generation (i.e. no * bus resets have occured since this request was made. @@ -2389,8 +2021,6 @@ hci1394_async_phy(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, if (cmd_priv->bus_generation != hci1394_ohci_current_busgen( async_handle->as_ohci)) { *result = H1394_STATUS_INVALID_BUSGEN; - TNF_PROBE_0_DEBUG(hci1394_async_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2412,15 +2042,9 @@ hci1394_async_phy(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, status = hci1394_q_at(async_handle->as_atreq_q, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_PHY, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_phy_q_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_async_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_async_phy_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2444,8 +2068,6 @@ hci1394_async_write(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, ASSERT(cmd_priv != NULL); ASSERT(result != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_write_enter, HCI1394_TNF_HAL_STACK, ""); - /* * make sure this call is during the current bus generation (i.e. no * bus resets have occured since this request was made. @@ -2453,8 +2075,6 @@ hci1394_async_write(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, if (cmd_priv->bus_generation != hci1394_ohci_current_busgen( async_handle->as_ohci)) { *result = H1394_STATUS_INVALID_BUSGEN; - TNF_PROBE_0_DEBUG(hci1394_async_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2467,10 +2087,6 @@ hci1394_async_write(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_tlabel); if (status != DDI_SUCCESS) { *result = H1394_STATUS_EMPTY_TLABEL; - TNF_PROBE_0(hci1394_async_write_tlb_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2512,10 +2128,6 @@ hci1394_async_write(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_WRITEQUAD, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_write_q_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2536,16 +2148,10 @@ hci1394_async_write(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_WRITEBLOCK, &cmd_priv->mblk, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_write_qmblk_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(hci1394_async_write_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2569,8 +2175,6 @@ hci1394_async_read(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, ASSERT(cmd_priv != NULL); ASSERT(result != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_read_enter, HCI1394_TNF_HAL_STACK, ""); - /* * make sure this call is during the current bus generation (i.e. no * bus resets have occured since this request was made. @@ -2578,8 +2182,6 @@ hci1394_async_read(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, if (cmd_priv->bus_generation != hci1394_ohci_current_busgen( async_handle->as_ohci)) { *result = H1394_STATUS_INVALID_BUSGEN; - TNF_PROBE_0_DEBUG(hci1394_async_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2592,10 +2194,6 @@ hci1394_async_read(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_tlabel); if (status != DDI_SUCCESS) { *result = H1394_STATUS_EMPTY_TLABEL; - TNF_PROBE_0(hci1394_async_read_tlb_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2633,10 +2231,6 @@ hci1394_async_read(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_READQUAD, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_read_q_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2653,16 +2247,10 @@ hci1394_async_read(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_READBLOCK, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_read_qb_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(hci1394_async_read_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2690,8 +2278,6 @@ hci1394_async_lock(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, ASSERT(cmd_priv != NULL); ASSERT(result != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_lock_enter, HCI1394_TNF_HAL_STACK, ""); - /* * make sure this call is during the current bus generation (i.e. no * bus resets have occured since this request was made. @@ -2699,8 +2285,6 @@ hci1394_async_lock(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, if (cmd_priv->bus_generation != hci1394_ohci_current_busgen( async_handle->as_ohci)) { *result = H1394_STATUS_INVALID_BUSGEN; - TNF_PROBE_0_DEBUG(hci1394_async_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2713,10 +2297,6 @@ hci1394_async_lock(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_tlabel); if (status != DDI_SUCCESS) { *result = H1394_STATUS_EMPTY_TLABEL; - TNF_PROBE_0(hci1394_async_lock_tlb_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2767,10 +2347,6 @@ hci1394_async_lock(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, datap = (uint8_t *)data64; } else { *result = H1394_STATUS_INTERNAL_ERROR; - TNF_PROBE_0(hci1394_lock_length_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2779,15 +2355,9 @@ hci1394_async_lock(hci1394_async_handle_t async_handle, cmd1394_cmd_t *cmd, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_LOCK, datap, size, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_lock_q_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_async_lock_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2812,9 +2382,6 @@ hci1394_async_write_response(hci1394_async_handle_t async_handle, ASSERT(cmd_priv != NULL); ASSERT(result != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_write_response_enter, - HCI1394_TNF_HAL_STACK, ""); - /* * make sure this call is during the current bus generation (i.e. no * bus resets have occured since this request was made. @@ -2822,8 +2389,6 @@ hci1394_async_write_response(hci1394_async_handle_t async_handle, if (cmd_priv->bus_generation != hci1394_ohci_current_busgen( async_handle->as_ohci)) { *result = H1394_STATUS_INVALID_BUSGEN; - TNF_PROBE_0_DEBUG(hci1394_async_write_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2855,16 +2420,9 @@ hci1394_async_write_response(hci1394_async_handle_t async_handle, status = hci1394_q_at(async_handle->as_atresp_q, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_WRITE_RESP, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_write_response_q_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_write_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_async_write_response_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2889,9 +2447,6 @@ hci1394_async_read_response(hci1394_async_handle_t async_handle, ASSERT(cmd_priv != NULL); ASSERT(result != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_read_response_enter, - HCI1394_TNF_HAL_STACK, ""); - /* * make sure this call is during the current bus generation (i.e. no * bus resets have occured since this request was made. @@ -2899,8 +2454,6 @@ hci1394_async_read_response(hci1394_async_handle_t async_handle, if (cmd_priv->bus_generation != hci1394_ohci_current_busgen( async_handle->as_ohci)) { *result = H1394_STATUS_INVALID_BUSGEN; - TNF_PROBE_0_DEBUG(hci1394_async_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2950,10 +2503,6 @@ hci1394_async_read_response(hci1394_async_handle_t async_handle, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_READQUAD_RESP, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_read_response_q_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2978,10 +2527,6 @@ hci1394_async_read_response(hci1394_async_handle_t async_handle, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_READBLOCK_RESP, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_read_response_qbf_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -3005,17 +2550,10 @@ hci1394_async_read_response(hci1394_async_handle_t async_handle, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_READBLOCK_RESP, &cmd_priv->mblk, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_read_response_qb_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(hci1394_async_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -3044,9 +2582,6 @@ hci1394_async_lock_response(hci1394_async_handle_t async_handle, ASSERT(cmd_priv != NULL); ASSERT(result != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_lock_response_enter, - HCI1394_TNF_HAL_STACK, ""); - /* * make sure this call is during the current bus generation (i.e. no * bus resets have occured since this request was made. @@ -3054,8 +2589,6 @@ hci1394_async_lock_response(hci1394_async_handle_t async_handle, if (cmd_priv->bus_generation != hci1394_ohci_current_busgen( async_handle->as_ohci)) { *result = H1394_STATUS_INVALID_BUSGEN; - TNF_PROBE_0_DEBUG(hci1394_async_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -3106,14 +2639,8 @@ hci1394_async_lock_response(hci1394_async_handle_t async_handle, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_LOCK_RESP, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_q_alloc_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_async_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -3141,9 +2668,6 @@ hci1394_async_lock_response(hci1394_async_handle_t async_handle, datap = (uint8_t *)&data64; } else { *result = H1394_STATUS_INTERNAL_ERROR; - TNF_PROBE_0(hci1394_lock_type_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -3155,15 +2679,9 @@ hci1394_async_lock_response(hci1394_async_handle_t async_handle, &hcicmd->ac_qcmd, &header, DESC_PKT_HDRLEN_AT_LOCK_RESP, datap, size, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_q_alloc_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_async_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_async_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -3190,9 +2708,6 @@ hci1394_async_response_complete(hci1394_async_handle_t async_handle, ASSERT(cmd != NULL); ASSERT(cmd_priv != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_response_complete_enter, - HCI1394_TNF_HAL_STACK, ""); - hcicmd = (hci1394_async_cmd_t *)cmd_priv->hal_overhead; /* If we allocated an mblk for this command */ @@ -3209,9 +2724,6 @@ hci1394_async_response_complete(hci1394_async_handle_t async_handle, /* free up the 1394 framework command */ (void) h1394_free_cmd((void *)async_handle->as_drvinfo->di_sl_private, &cmd); - - TNF_PROBE_0_DEBUG(hci1394_async_response_complete_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3236,8 +2748,6 @@ hci1394_async_pending_timeout(hci1394_tlist_node_t *node, void *arg) async_handle = (hci1394_async_handle_t)arg; ASSERT(async_handle != NULL); ASSERT(node != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_pending_timeout_enter, - HCI1394_TNF_HAL_STACK, ""); hcicmd = (hci1394_async_cmd_t *)node->tln_addr; @@ -3264,9 +2774,6 @@ hci1394_async_pending_timeout(hci1394_tlist_node_t *node, void *arg) /* Tell the Services Layer that the command has timed out */ h1394_cmd_is_complete(async_handle->as_drvinfo->di_sl_private, hcicmd->ac_cmd, H1394_AT_REQ, H1394_CMD_ETIMEOUT); - - TNF_PROBE_0_DEBUG(hci1394_async_pending_timeout_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3287,10 +2794,6 @@ hci1394_async_timeout_calc(hci1394_async_handle_t async_handle, uint_t carry; uint_t z; - - TNF_PROBE_0_DEBUG(hci1394_async_timeout_calc_enter, - HCI1394_TNF_HAL_STACK, ""); - /* Get the current split timeout */ split_timeout = hci1394_csr_split_timeout_get(async_handle->as_csr); @@ -3330,9 +2833,6 @@ hci1394_async_timeout_calc(hci1394_async_handle_t async_handle, OHCI_CYCLE_SEC_MASK) + (carry << OHCI_CYCLE_SEC_SHIFT) + temp; z = z & OHCI_TIMESTAMP_MASK; - TNF_PROBE_0_DEBUG(hci1394_async_timeout_calc_exit, - HCI1394_TNF_HAL_STACK, ""); - return (z); } @@ -3353,9 +2853,6 @@ hci1394_async_arresp_size_get(uint_t tcode, hci1394_q_handle_t q_handle, ASSERT(addr != NULL); ASSERT(size != NULL); - TNF_PROBE_0_DEBUG(hci1394_get_arresp_size_enter, - HCI1394_TNF_HAL_STACK, ""); - if (tcode == IEEE1394_TCODE_WRITE_RESP) { *size = DESC_PKT_HDRLEN_AT_WRITE_RESP + IEEE1394_QUADLET; } else if (tcode == IEEE1394_TCODE_READ_QUADLET_RESP) { @@ -3381,17 +2878,9 @@ hci1394_async_arresp_size_get(uint_t tcode, hci1394_q_handle_t q_handle, *size = DESC_PKT_HDRLEN_AT_LOCK_RESP + HCI1394_ALIGN_QUAD(data_length) + IEEE1394_QUADLET; } else { - TNF_PROBE_1(hci1394_async_arresp_size_tcode_err, - HCI1394_TNF_HAL_ERROR, - "unknown ARRESP received", tnf_uint, arresp_tcode, tcode); - TNF_PROBE_0_DEBUG(hci1394_get_arresp_size_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_get_arresp_size_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -3413,9 +2902,6 @@ hci1394_async_pending_list_flush(hci1394_async_handle_t async_handle) ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_pending_list_flush_enter, - HCI1394_TNF_HAL_STACK, ""); - do { /* * get the first node on the pending list. This routine also @@ -3437,9 +2923,6 @@ hci1394_async_pending_list_flush(hci1394_async_handle_t async_handle) H1394_CMD_EBUSRESET); } } while (node != NULL); - - TNF_PROBE_0_DEBUG(hci1394_async_pending_list_flush_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3454,12 +2937,8 @@ hci1394_async_atreq_start(void *async, uint32_t command_ptr) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_start_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_atreq_start(async_handle->as_ohci, command_ptr); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3473,12 +2952,8 @@ hci1394_async_atreq_wake(void *async) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_wake_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_atreq_wake(async_handle->as_ohci); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3493,12 +2968,8 @@ void hci1394_async_atreq_reset(hci1394_async_handle_t async_handle) { ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_reset_enter, - HCI1394_TNF_HAL_STACK, ""); hci1394_ohci_atreq_stop(async_handle->as_ohci); hci1394_q_stop(async_handle->as_atreq_q); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_reset_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3511,13 +2982,9 @@ static void hci1394_async_atreq_flush(hci1394_async_handle_t async_handle) { boolean_t request_available; - int status; ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atreq_flush_enter, - HCI1394_TNF_HAL_STACK, ""); - /* Clear reqTxComplete interrupt */ hci1394_ohci_intr_clear(async_handle->as_ohci, OHCI_INTR_REQ_TX_CMPLT); @@ -3529,16 +2996,9 @@ hci1394_async_atreq_flush(hci1394_async_handle_t async_handle) */ do { /* Flush the atreq Q. Process all Q'd commands */ - status = hci1394_async_atreq_process(async_handle, + (void) hci1394_async_atreq_process(async_handle, B_TRUE, &request_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_atreq_process_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while (request_available == B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_async_atreq_flush_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3553,12 +3013,8 @@ hci1394_async_arresp_start(void *async, uint32_t command_ptr) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_start_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_arresp_start(async_handle->as_ohci, command_ptr); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3572,12 +3028,8 @@ hci1394_async_arresp_wake(void *async) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_wake_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_arresp_wake(async_handle->as_ohci); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3593,29 +3045,17 @@ static void hci1394_async_arresp_flush(hci1394_async_handle_t async_handle) { boolean_t response_available; - int status; - ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arresp_flush_enter, - HCI1394_TNF_HAL_STACK, ""); - /* Clear reqTxComplete interrupt */ hci1394_ohci_intr_clear(async_handle->as_ohci, OHCI_INTR_RSPKT); do { /* Flush the arresp Q. Process all received commands */ - status = hci1394_async_arresp_process(async_handle, + (void) hci1394_async_arresp_process(async_handle, &response_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_arresp_process_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while (response_available == B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_async_arresp_flush_enter, - HCI1394_TNF_HAL_STACK, ""); } @@ -3630,12 +3070,8 @@ hci1394_async_arreq_start(void *async, uint32_t command_ptr) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_start_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_arreq_start(async_handle->as_ohci, command_ptr); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3649,12 +3085,8 @@ hci1394_async_arreq_wake(void *async) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_wake_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_arreq_wake(async_handle->as_ohci); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3668,12 +3100,8 @@ static void hci1394_async_arreq_flush(hci1394_async_handle_t async_handle) { boolean_t request_available; - int status; - ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_arreq_flush_enter, - HCI1394_TNF_HAL_STACK, ""); /* * If the last bus reset token we have seen in @@ -3685,8 +3113,6 @@ hci1394_async_arreq_flush(hci1394_async_handle_t async_handle) */ if (async_handle->as_phy_reset == hci1394_ohci_current_busgen( async_handle->as_ohci)) { - TNF_PROBE_0_DEBUG(hci1394_async_arreq_flush_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -3703,12 +3129,8 @@ hci1394_async_arreq_flush(hci1394_async_handle_t async_handle) * correct bus reset token. */ do { - status = hci1394_async_arreq_process(async_handle, + (void) hci1394_async_arreq_process(async_handle, &request_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_arreq_pr_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while ((request_available == B_TRUE) && (async_handle->as_flushing_arreq == B_TRUE)); @@ -3723,9 +3145,6 @@ hci1394_async_arreq_flush(hci1394_async_handle_t async_handle) if (request_available == B_FALSE) { hci1394_ohci_intr_clear(async_handle->as_ohci, OHCI_INTR_RQPKT); } - - TNF_PROBE_0_DEBUG(hci1394_async_arreq_flush_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3740,12 +3159,8 @@ hci1394_async_atresp_start(void *async, uint32_t command_ptr) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_start_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_atresp_start(async_handle->as_ohci, command_ptr); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3759,12 +3174,8 @@ hci1394_async_atresp_wake(void *async) { hci1394_async_handle_t async_handle; ASSERT(async != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_wake_enter, - HCI1394_TNF_HAL_STACK, ""); async_handle = (hci1394_async_handle_t)async; hci1394_ohci_atresp_wake(async_handle->as_ohci); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3779,12 +3190,8 @@ void hci1394_async_atresp_reset(hci1394_async_handle_t async_handle) { ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_reset_enter, - HCI1394_TNF_HAL_STACK, ""); hci1394_ohci_atresp_stop(async_handle->as_ohci); hci1394_q_stop(async_handle->as_atresp_q); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_reset_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3798,29 +3205,18 @@ static void hci1394_async_atresp_flush(hci1394_async_handle_t async_handle) { boolean_t response_available; - int status; ASSERT(async_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_async_atresp_flush_enter, - HCI1394_TNF_HAL_STACK, ""); - /* Clear respTxComplete interrupt */ hci1394_ohci_intr_clear(async_handle->as_ohci, OHCI_INTR_RESP_TX_CMPLT); /* Processes all AT responses */ do { /* Flush the atresp Q. Process all Q'd commands */ - status = hci1394_async_atresp_process(async_handle, + (void) hci1394_async_atresp_process(async_handle, B_TRUE, &response_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_atresp_process_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while (response_available == B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_async_atresp_flush_exit, - HCI1394_TNF_HAL_STACK, ""); } /* diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_attach.c b/usr/src/uts/common/io/1394/adapters/hci1394_attach.c index 64726a2498..061253cd98 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_attach.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_attach.c @@ -85,29 +85,16 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) int instance; int status; - - TNF_PROBE_0_DEBUG(hci1394_attach_enter, HCI1394_TNF_HAL_STACK, ""); - switch (cmd) { case DDI_ATTACH: instance = ddi_get_instance(dip); status = ddi_soft_state_zalloc(hci1394_statep, instance); if (status != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_attach_ssz_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "ddi_soft_state_zalloc() failed"); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } soft_state = ddi_get_soft_state(hci1394_statep, instance); if (soft_state == NULL) { ddi_soft_state_free(hci1394_statep, instance); - TNF_PROBE_1(hci1394_attach_gss_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "ddi_get_soft_state() failed"); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hci1394_statebit_set(&attach_state, STATE_ZALLOC); @@ -118,10 +105,6 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) status = hci1394_isr_init(soft_state); if (status != DDI_SUCCESS) { hci1394_cleanup(soft_state, attach_state); - TNF_PROBE_0(hci1394_attach_isr_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hci1394_statebit_set(&attach_state, STATE_ISR_INIT); @@ -130,10 +113,6 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) instance, DDI_NT_NEXUS, 0); if (status != DDI_SUCCESS) { hci1394_cleanup(soft_state, attach_state); - TNF_PROBE_0(hci1394_attach_cmn_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hci1394_statebit_set(&attach_state, STATE_MINOR_NODE); @@ -141,10 +120,6 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) status = hci1394_hardware_init(soft_state); if (status != DDI_SUCCESS) { hci1394_cleanup(soft_state, attach_state); - TNF_PROBE_0(hci1394_attach_hwi_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hci1394_statebit_set(&attach_state, STATE_HW_INIT); @@ -156,10 +131,6 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) status = hci1394_resmap_get(soft_state); if (status != DDI_SUCCESS) { hci1394_cleanup(soft_state, attach_state); - TNF_PROBE_0(hci1394_attach_rmg_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -169,10 +140,6 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) if (status != DDI_SUCCESS) { hci1394_resmap_free(soft_state); hci1394_cleanup(soft_state, attach_state); - TNF_PROBE_0(hci1394_attach_ha_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* free the reserved addresses map */ @@ -182,10 +149,6 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) status = hci1394_isr_handler_init(soft_state); if (status != DDI_SUCCESS) { hci1394_cleanup(soft_state, attach_state); - TNF_PROBE_0(hci1394_attach_ih_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hci1394_statebit_set(&attach_state, STATE_ISR_HANDLER); @@ -203,14 +166,8 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) status = hci1394_ohci_startup(soft_state->ohci); if (status != DDI_SUCCESS) { hci1394_cleanup(soft_state, attach_state); - TNF_PROBE_0(hci1394_attach_str_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_attach_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); @@ -218,21 +175,11 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) instance = ddi_get_instance(dip); soft_state = ddi_get_soft_state(hci1394_statep, instance); if (soft_state == NULL) { - TNF_PROBE_1(hci1394_attach_resgss_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "ddi_get_soft_state() failed"); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_hardware_resume(soft_state); if (status != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_attach_res_hwr_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "hardware failed to resume"); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -245,11 +192,6 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) /* turn on the link, enable interrupts, reset the bus */ status = hci1394_ohci_startup(soft_state->ohci); if (status != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_attach_res_str_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "hci1394_ohci_startup() failed"); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -257,25 +199,15 @@ hci1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) status = h1394_attach(&soft_state->halinfo, DDI_RESUME, &soft_state->drvinfo.di_sl_private); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_attach_res_ha_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_attach_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_attach_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); default: - TNF_PROBE_0(h1394_attach_default_fail, HCI1394_TNF_HAL_ERROR, - ""); break; } - TNF_PROBE_0_DEBUG(hci1394_attach_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_FAILURE); } @@ -292,8 +224,6 @@ hci1394_soft_state_phase1_init(hci1394_state_t *soft_state, dev_info_t *dip, int instance) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_soft_state_phase1_init_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state->drvinfo.di_dip = dip; soft_state->drvinfo.di_instance = instance; @@ -323,9 +253,6 @@ hci1394_soft_state_phase1_init(hci1394_state_t *soft_state, dev_info_t *dip, soft_state->halinfo.addr_map_num_entries = HCI1394_ADDR_MAP_SIZE; soft_state->halinfo.addr_map = hci1394_addr_map; hci1394_buf_attr_get(&soft_state->halinfo.dma_attr); - - TNF_PROBE_0_DEBUG(hci1394_soft_state_phase1_init_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -338,8 +265,6 @@ static void hci1394_soft_state_phase2_init(hci1394_state_t *soft_state) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_soft_state_phase2_init_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Setup our initial driver state. This requires the HW iblock @@ -388,9 +313,6 @@ hci1394_soft_state_phase2_init(hci1394_state_t *soft_state) * called hardware_init(). Therefore, this must be in phase2_init(). */ soft_state->halinfo.hal_overhead = hci1394_async_cmd_overhead(); - - TNF_PROBE_0_DEBUG(hci1394_soft_state_phase2_init_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -406,16 +328,10 @@ hci1394_hardware_init(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_hardware_init_enter, HCI1394_TNF_HAL_STACK, - ""); /* Initialize PCI config registers */ status = hci1394_pci_init(soft_state); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_hardware_init_pci_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_hardware_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -424,10 +340,6 @@ hci1394_hardware_init(hci1394_state_t *soft_state) &soft_state->ohci); if (status != DDI_SUCCESS) { hci1394_pci_fini(soft_state); - TNF_PROBE_0(hci1394_hardware_init_ohci_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_hardware_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -442,10 +354,6 @@ hci1394_hardware_init(hci1394_state_t *soft_state) hci1394_csr_fini(&soft_state->csr); hci1394_ohci_fini(&soft_state->ohci); hci1394_pci_fini(soft_state); - TNF_PROBE_0(hci1394_hardware_init_asyn_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_hardware_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -462,16 +370,9 @@ hci1394_hardware_init(hci1394_state_t *soft_state) hci1394_csr_fini(&soft_state->csr); hci1394_ohci_fini(&soft_state->ohci); hci1394_pci_fini(soft_state); - TNF_PROBE_0(hci1394_hardware_init_vend_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_hardware_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_hardware_init_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -489,8 +390,6 @@ hci1394_hardware_resume(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_hardware_resume_enter, HCI1394_TNF_HAL_STACK, - ""); /* re-enable global byte swap (if we using it) */ hci1394_pci_resume(soft_state); @@ -498,10 +397,6 @@ hci1394_hardware_resume(hci1394_state_t *soft_state) /* Re-init the OpenHCI HW */ status = hci1394_ohci_resume(soft_state->ohci); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_hardware_resume_ohci_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_hardware_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -511,26 +406,15 @@ hci1394_hardware_resume(hci1394_state_t *soft_state) /* Re-setup the Async Q's */ status = hci1394_async_resume(soft_state->async); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_hardware_resume_asyn_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_hardware_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* Re-setup any Vendor Specific Registers */ status = hci1394_vendor_resume(soft_state->vendor); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_hardware_resume_vend_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_hardware_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_hardware_resume_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -549,16 +433,11 @@ hci1394_pci_init(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_pci_init_enter, HCI1394_TNF_HAL_STACK, ""); /* Setup PCI configuration space */ status = pci_config_setup(soft_state->drvinfo.di_dip, &soft_state->pci_config); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_pci_init_cfg_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_pci_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -597,8 +476,6 @@ hci1394_pci_init(hci1394_state_t *soft_state) /* If PCI_Global_Swap bit is not set, it is unsupported */ if ((global_swap & OHCI_PCI_GLOBAL_SWAP) == 0) { - TNF_PROBE_0_DEBUG(hci1394_pci_gbs_npresent, - HCI1394_TNF_HAL_INFO, "global swap not present"); soft_state->drvinfo.di_reg_attr.devacc_attr_version = DDI_DEVICE_ATTR_V0; soft_state->drvinfo.di_reg_attr.devacc_attr_endian_flags = @@ -617,8 +494,6 @@ hci1394_pci_init(hci1394_state_t *soft_state) * for almost all of the adapters. */ } else { - TNF_PROBE_0_DEBUG(hci1394_pci_gbs_present, - HCI1394_TNF_HAL_INFO, "global swap present"); soft_state->drvinfo.di_reg_attr.devacc_attr_version = DDI_DEVICE_ATTR_V0; soft_state->drvinfo.di_reg_attr.devacc_attr_endian_flags = @@ -644,8 +519,6 @@ hci1394_pci_init(hci1394_state_t *soft_state) soft_state->vendor_info.revision_id = (uint_t)pci_config_get8(soft_state->pci_config, PCI_CONF_REVID); - TNF_PROBE_0_DEBUG(hci1394_pci_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -664,7 +537,6 @@ hci1394_pci_resume(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_pci_resume_enter, HCI1394_TNF_HAL_STACK, ""); #ifdef _LITTLE_ENDIAN /* Start of little endian specific code */ @@ -683,7 +555,6 @@ hci1394_pci_resume(hci1394_state_t *soft_state) } /* End of big endian specific code */ #endif - TNF_PROBE_0_DEBUG(hci1394_pci_resume_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -709,7 +580,6 @@ hci1394_resmap_get(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_resmap_get_enter, HCI1394_TNF_HAL_STACK, ""); /* * See if the "reserved-addresses" property is defined. The format @@ -729,8 +599,6 @@ hci1394_resmap_get(hci1394_state_t *soft_state) /* the property is not defined, 0 reserved addresses */ soft_state->halinfo.resv_map_num_entries = 0; soft_state->halinfo.resv_map = NULL; - TNF_PROBE_0_DEBUG(hci1394_resmap_get_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } else if ((reslen < 3) || ((reslen % 3) != 0)) { /* @@ -775,8 +643,6 @@ hci1394_resmap_get(hci1394_state_t *soft_state) soft_state->halinfo.resv_map_num_entries = resv_num; soft_state->halinfo.resv_map = resv_map; - TNF_PROBE_0_DEBUG(hci1394_resmap_get_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -792,7 +658,6 @@ static void hci1394_resmap_free(hci1394_state_t *soft_state) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_resmap_free_enter, HCI1394_TNF_HAL_STACK, ""); /* * if we have one or more reserved map entries, free up the space that @@ -804,8 +669,6 @@ hci1394_resmap_free(hci1394_state_t *soft_state) (sizeof (h1394_addr_map_t) * soft_state->halinfo.resv_map_num_entries)); } - - TNF_PROBE_0_DEBUG(hci1394_resmap_free_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -855,8 +718,6 @@ hci1394_cleanup(hci1394_state_t *soft_state, uint64_t attach_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_cleanup_enter, HCI1394_TNF_HAL_STACK, ""); - status = hci1394_statebit_tst(attach_state, STATE_STARTUP); if (status == B_TRUE) { @@ -910,6 +771,4 @@ hci1394_cleanup(hci1394_state_t *soft_state, uint64_t attach_state) ddi_soft_state_free(hci1394_statep, soft_state->drvinfo.di_instance); } - - TNF_PROBE_0_DEBUG(hci1394_cleanup_exit, HCI1394_TNF_HAL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_buf.c b/usr/src/uts/common/io/1394/adapters/hci1394_buf.c index 40db81791f..b9cdc2fc03 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_buf.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_buf.c @@ -92,7 +92,6 @@ hci1394_buf_alloc(hci1394_drvinfo_t *drvinfo, hci1394_buf_parms_t *parms, ASSERT(parms != NULL); ASSERT(info != NULL); ASSERT(handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_buf_alloc_enter, HCI1394_TNF_HAL_STACK, ""); /* alloc the space to keep track of the buffer */ buf = kmem_alloc(sizeof (hci1394_buf_t), KM_SLEEP); @@ -114,10 +113,6 @@ hci1394_buf_alloc(hci1394_drvinfo_t *drvinfo, hci1394_buf_parms_t *parms, DDI_DMA_SLEEP, NULL, &buf->bu_dma_handle); if (status != DDI_SUCCESS) { kmem_free(buf, sizeof (hci1394_buf_t)); - TNF_PROBE_0(hci1394_buf_alloc_dah_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_buf_alloc_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -127,10 +122,6 @@ hci1394_buf_alloc(hci1394_drvinfo_t *drvinfo, hci1394_buf_parms_t *parms, if (status != DDI_SUCCESS) { ddi_dma_free_handle(&buf->bu_dma_handle); kmem_free(buf, sizeof (hci1394_buf_t)); - TNF_PROBE_0(hci1394_buf_alloc_dam_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_buf_alloc_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -142,10 +133,6 @@ hci1394_buf_alloc(hci1394_drvinfo_t *drvinfo, hci1394_buf_parms_t *parms, ddi_dma_mem_free(&buf->bu_handle); ddi_dma_free_handle(&buf->bu_dma_handle); kmem_free(buf, sizeof (hci1394_buf_t)); - TNF_PROBE_0(hci1394_buf_alloc_dbh_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_buf_alloc_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -154,8 +141,6 @@ hci1394_buf_alloc(hci1394_drvinfo_t *drvinfo, hci1394_buf_parms_t *parms, info->bi_dma_handle = buf->bu_dma_handle; info->bi_length = parms->bp_length; - TNF_PROBE_0_DEBUG(hci1394_buf_alloc_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -171,7 +156,6 @@ hci1394_buf_free(hci1394_buf_handle_t *handle) hci1394_buf_t *buf; ASSERT(handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_buf_free_enter, HCI1394_TNF_HAL_STACK, ""); buf = *handle; (void) ddi_dma_unbind_handle(buf->bu_dma_handle); @@ -183,6 +167,4 @@ hci1394_buf_free(hci1394_buf_handle_t *handle) /* set the handle to NULL to help catch bugs */ *handle = NULL; - - TNF_PROBE_0_DEBUG(hci1394_buf_free_exit, HCI1394_TNF_HAL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_csr.c b/usr/src/uts/common/io/1394/adapters/hci1394_csr.c index 0bbc70f98a..0ca3a46f48 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_csr.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_csr.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_csr.c * This code contains the code for the CSR registers handled by the HAL in @@ -108,7 +106,6 @@ hci1394_csr_init(hci1394_drvinfo_t *drvinfo, hci1394_ohci_handle_t ohci, ASSERT(drvinfo != NULL); ASSERT(ohci != NULL); ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_init_enter, HCI1394_TNF_HAL_STACK, ""); /* alloc the space to keep track of the csr registers */ csr = kmem_alloc(sizeof (hci1394_csr_t), KM_SLEEP); @@ -122,8 +119,6 @@ hci1394_csr_init(hci1394_drvinfo_t *drvinfo, hci1394_ohci_handle_t ohci, mutex_init(&csr->csr_mutex, NULL, MUTEX_DRIVER, drvinfo->di_iblock_cookie); hci1394_csr_state_init(csr); - - TNF_PROBE_0_DEBUG(hci1394_csr_init_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -138,14 +133,11 @@ hci1394_csr_fini(hci1394_csr_handle_t *csr_handle) ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_fini_enter, HCI1394_TNF_HAL_STACK, ""); csr = (hci1394_csr_t *)*csr_handle; mutex_destroy(&csr->csr_mutex); kmem_free(csr, sizeof (hci1394_csr_t)); *csr_handle = NULL; - - TNF_PROBE_0_DEBUG(hci1394_csr_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -157,9 +149,7 @@ void hci1394_csr_resume(hci1394_csr_handle_t csr_handle) { ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_resume_enter, HCI1394_TNF_HAL_STACK, ""); hci1394_csr_state_init(csr_handle); - TNF_PROBE_0_DEBUG(hci1394_csr_resume_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -173,15 +163,10 @@ hci1394_csr_node_capabilities(hci1394_csr_handle_t csr_handle, { ASSERT(csr_handle != NULL); ASSERT(capabilities != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_node_capabilities_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&csr_handle->csr_mutex); *capabilities = csr_handle->csr_capabilities; mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_node_capabilities_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -196,15 +181,10 @@ hci1394_csr_state_get(hci1394_csr_handle_t csr_handle, uint32_t *state) { ASSERT(csr_handle != NULL); ASSERT(state != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_state_get_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&csr_handle->csr_mutex); *state = csr_handle->csr_state; mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_state_get_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -222,8 +202,6 @@ hci1394_csr_state_bset(hci1394_csr_handle_t csr_handle, uint32_t state) ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_state_bset_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&csr_handle->csr_mutex); @@ -244,9 +222,6 @@ hci1394_csr_state_bset(hci1394_csr_handle_t csr_handle, uint32_t state) csr_handle->csr_state |= supported_state; mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_state_bset_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -264,8 +239,6 @@ hci1394_csr_state_bclr(hci1394_csr_handle_t csr_handle, uint32_t state) ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_state_bclr_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&csr_handle->csr_mutex); @@ -286,9 +259,6 @@ hci1394_csr_state_bclr(hci1394_csr_handle_t csr_handle, uint32_t state) csr_handle->csr_state &= ~state; mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_state_bclr_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -302,16 +272,10 @@ hci1394_csr_split_timeout_hi_get(hci1394_csr_handle_t csr_handle, { ASSERT(csr_handle != NULL); ASSERT(split_timeout_hi != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_hi_get_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&csr_handle->csr_mutex); *split_timeout_hi = csr_handle->csr_split_timeout_hi; mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_hi_get_exit, - HCI1394_TNF_HAL_STACK, ""); - } @@ -325,8 +289,6 @@ hci1394_csr_split_timeout_lo_get(hci1394_csr_handle_t csr_handle, { ASSERT(csr_handle != NULL); ASSERT(split_timeout_lo != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_lo_get_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&csr_handle->csr_mutex); @@ -338,10 +300,6 @@ hci1394_csr_split_timeout_lo_get(hci1394_csr_handle_t csr_handle, CSR_SPLIT_TIMEOUT_LO_SHIFT; mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_lo_get_exit, - HCI1394_TNF_HAL_STACK, ""); - } @@ -358,8 +316,6 @@ hci1394_csr_split_timeout_hi_set(hci1394_csr_handle_t csr_handle, uint32_t split_timeout_hi) { ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_hi_set_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&csr_handle->csr_mutex); @@ -373,9 +329,6 @@ hci1394_csr_split_timeout_hi_set(hci1394_csr_handle_t csr_handle, csr_handle->csr_split_timeout_hi, csr_handle->csr_split_timeout_lo); mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_hi_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -392,8 +345,6 @@ hci1394_csr_split_timeout_lo_set(hci1394_csr_handle_t csr_handle, uint32_t split_timeout_lo) { ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_lo_set_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&csr_handle->csr_mutex); @@ -418,9 +369,6 @@ hci1394_csr_split_timeout_lo_set(hci1394_csr_handle_t csr_handle, csr_handle->csr_split_timeout_hi, csr_handle->csr_split_timeout_lo); mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_lo_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -437,8 +385,6 @@ hci1394_csr_split_timeout_get(hci1394_csr_handle_t csr_handle) ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_get_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&csr_handle->csr_mutex); @@ -447,9 +393,6 @@ hci1394_csr_split_timeout_get(hci1394_csr_handle_t csr_handle) mutex_exit(&csr_handle->csr_mutex); - TNF_PROBE_0_DEBUG(hci1394_csr_split_timeout_get_exit, - HCI1394_TNF_HAL_STACK, ""); - return (split_timeout); } @@ -466,8 +409,6 @@ void hci1394_csr_bus_reset(hci1394_csr_handle_t csr_handle) { ASSERT(csr_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_bus_reset_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&csr_handle->csr_mutex); @@ -524,9 +465,6 @@ hci1394_csr_bus_reset(hci1394_csr_handle_t csr_handle) */ mutex_exit(&csr_handle->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_bus_reset_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -537,8 +475,6 @@ hci1394_csr_bus_reset(hci1394_csr_handle_t csr_handle) static void hci1394_csr_state_init(hci1394_csr_t *csr) { ASSERT(csr != NULL); - TNF_PROBE_0_DEBUG(hci1394_csr_state_init_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&csr->csr_mutex); @@ -570,7 +506,4 @@ static void hci1394_csr_state_init(hci1394_csr_t *csr) csr->csr_capabilities = CSR_INITIAL_NODE_CAPABILITIES; mutex_exit(&csr->csr_mutex); - - TNF_PROBE_0_DEBUG(hci1394_csr_state_init_exit, HCI1394_TNF_HAL_STACK, - ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_detach.c b/usr/src/uts/common/io/1394/adapters/hci1394_detach.c index 2d6cfda0c8..37c9a4bfba 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_detach.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_detach.c @@ -48,15 +48,8 @@ hci1394_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) { hci1394_state_t *soft_state; - - TNF_PROBE_0_DEBUG(hci1394_detach_enter, HCI1394_TNF_HAL_STACK, ""); - soft_state = ddi_get_soft_state(hci1394_statep, ddi_get_instance(dip)); if (soft_state == NULL) { - TNF_PROBE_1(hci1394_detach_ssn_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "soft_state = NULL"); - TNF_PROBE_0_DEBUG(hci1394_detach_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -113,8 +106,6 @@ hci1394_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) ddi_soft_state_free(hci1394_statep, soft_state->drvinfo.di_instance); - TNF_PROBE_0_DEBUG(hci1394_detach_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); case DDI_SUSPEND: @@ -150,18 +141,12 @@ hci1394_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) (void) h1394_detach(&soft_state->drvinfo.di_sl_private, DDI_SUSPEND); - TNF_PROBE_0_DEBUG(hci1394_detach_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); default: - TNF_PROBE_1(hci1394_detach_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "in detach default"); break; } - TNF_PROBE_0_DEBUG(hci1394_detach_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_FAILURE); } @@ -214,8 +199,6 @@ void hci1394_detach_hardware(hci1394_state_t *soft_state) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_detach_hardware_enter, HCI1394_TNF_HAL_STACK, - ""); /* free up vendor specific registers */ hci1394_vendor_fini(&soft_state->vendor); @@ -234,9 +217,6 @@ hci1394_detach_hardware(hci1394_state_t *soft_state) /* free up PCI config space */ hci1394_pci_fini(soft_state); - - TNF_PROBE_0_DEBUG(hci1394_detach_hardware_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -248,9 +228,7 @@ void hci1394_pci_fini(hci1394_state_t *soft_state) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_pci_fini_enter, HCI1394_TNF_HAL_STACK, ""); pci_config_teardown(&soft_state->pci_config); - TNF_PROBE_0_DEBUG(hci1394_pci_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -262,9 +240,5 @@ void hci1394_soft_state_fini(hci1394_state_t *soft_state) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_soft_state_fini_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_destroy(&soft_state->drvinfo.di_drvstate.ds_mutex); - TNF_PROBE_0_DEBUG(hci1394_soft_state_fini_exit, HCI1394_TNF_HAL_STACK, - ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ioctl.c b/usr/src/uts/common/io/1394/adapters/hci1394_ioctl.c index 162a23a8e5..8a529680fb 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_ioctl.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_ioctl.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_ioctl.c * Test ioctl's to support test/debug of the 1394 HW. hci1394_ioctl_enum_t is @@ -91,22 +89,13 @@ hci1394_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, int instance; int status; - - TNF_PROBE_0_DEBUG(hci1394_ioctl_enter, HCI1394_TNF_HAL_STACK, ""); - instance = getminor(dev); if (instance == -1) { - TNF_PROBE_0(hci1394_ioctl_gm_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_exit, HCI1394_TNF_HAL_STACK, - ""); return (EBADF); } soft_state = ddi_get_soft_state(hci1394_statep, instance); if (soft_state == NULL) { - TNF_PROBE_0(hci1394_ioctl_gss_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_exit, HCI1394_TNF_HAL_STACK, - ""); return (EBADF); } @@ -161,8 +150,6 @@ hci1394_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, break; } - TNF_PROBE_0_DEBUG(hci1394_ioctl_exit, HCI1394_TNF_HAL_STACK, ""); - return (status); } @@ -176,21 +163,14 @@ hci1394_ioctl_wrreg(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrreg_enter, HCI1394_TNF_HAL_STACK, ""); status = ddi_copyin(arg, &wrreg, sizeof (hci1394_ioctl_wrreg_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_wrreg_ci_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } hci1394_ohci_reg_write(soft_state->ohci, wrreg.addr, wrreg.data); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrreg_exit, HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -204,14 +184,9 @@ hci1394_ioctl_rdreg(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdreg_enter, HCI1394_TNF_HAL_STACK, ""); status = ddi_copyin(arg, &rdreg, sizeof (hci1394_ioctl_rdreg_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_rdreg_ci_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } @@ -219,15 +194,9 @@ hci1394_ioctl_rdreg(hci1394_state_t *soft_state, void *arg, int mode) status = ddi_copyout(&rdreg, arg, sizeof (hci1394_ioctl_rdreg_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_rdreg_c0_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdreg_exit, HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -241,31 +210,19 @@ hci1394_ioctl_wrvreg(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrvreg_enter, HCI1394_TNF_HAL_STACK, - ""); status = ddi_copyin(arg, &wrvreg, sizeof (hci1394_ioctl_wrvreg_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_wrvreg_ci_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrvreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } status = hci1394_vendor_reg_write(soft_state->vendor, wrvreg.regset, wrvreg.addr, wrvreg.data); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ioctl_wrvreg_vrw_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrvreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EINVAL); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrvreg_exit, HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -279,41 +236,25 @@ hci1394_ioctl_rdvreg(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdvreg_enter, HCI1394_TNF_HAL_STACK, - ""); status = ddi_copyin(arg, &rdvreg, sizeof (hci1394_ioctl_rdvreg_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_rdvreg_ci_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdvreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } status = hci1394_vendor_reg_read(soft_state->vendor, rdvreg.regset, rdvreg.addr, &rdvreg.data); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ioctl_rdvreg_vrr_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdvreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EINVAL); } status = ddi_copyout(&rdvreg, arg, sizeof (hci1394_ioctl_rdvreg_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_rdvreg_co_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdvreg_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdvreg_exit, HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -327,24 +268,15 @@ hci1394_ioctl_selfid_cnt(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_selfid_cnt_enter, - HCI1394_TNF_HAL_STACK, ""); selfid_cnt.count = soft_state->drvinfo.di_stats.st_selfid_count; status = ddi_copyout(&selfid_cnt, arg, sizeof (hci1394_ioctl_selfid_cnt_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_selfid_cnt_co_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_selfid_cnt_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_selfid_cnt_exit, - HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -358,24 +290,15 @@ hci1394_ioctl_busgen_cnt(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_busgen_cnt_enter, - HCI1394_TNF_HAL_STACK, ""); busgen_cnt.count = hci1394_ohci_current_busgen(soft_state->ohci); status = ddi_copyout(&busgen_cnt, arg, sizeof (hci1394_ioctl_busgen_cnt_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_busgen_cnt_co_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_busgen_cnt_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_busgen_cnt_exit, - HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -389,29 +312,18 @@ hci1394_ioctl_wrphy(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrphy_enter, HCI1394_TNF_HAL_STACK, ""); status = ddi_copyin(arg, &wrphy, sizeof (hci1394_ioctl_wrphy_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_wrphy_ci_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrphy_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } status = hci1394_ohci_phy_write(soft_state->ohci, wrphy.addr, wrphy.data); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ioctl_wrphy_pw_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrphy_exit, - HCI1394_TNF_HAL_STACK, ""); return (EINVAL); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_wrphy_exit, HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -425,38 +337,23 @@ hci1394_ioctl_rdphy(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdphy_enter, HCI1394_TNF_HAL_STACK, ""); status = ddi_copyin(arg, &rdphy, sizeof (hci1394_ioctl_rdphy_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_rdphy_ci_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdphy_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } status = hci1394_ohci_phy_read(soft_state->ohci, rdphy.addr, &rdphy.data); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ioctl_rdphy_pr_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdphy_exit, - HCI1394_TNF_HAL_STACK, ""); return (EINVAL); } status = ddi_copyout(&rdphy, arg, sizeof (hci1394_ioctl_rdphy_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_rdphy_co_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdphy_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_rdphy_exit, HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -470,8 +367,6 @@ hci1394_ioctl_hbainfo(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_hbainfo_enter, - HCI1394_TNF_HAL_STACK, ""); hbainfo.pci_vendor_id = soft_state->vendor_info.vendor_id; hbainfo.pci_device_id = soft_state->vendor_info.device_id; @@ -483,16 +378,9 @@ hci1394_ioctl_hbainfo(hci1394_state_t *soft_state, void *arg, int mode) status = ddi_copyout(&hbainfo, arg, sizeof (hci1394_ioctl_hbainfo_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_hbainfo_co_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_hbainfo_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } - TNF_PROBE_0_DEBUG(hci1394_ioctl_hbainfo_exit, - HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -511,8 +399,6 @@ hci1394_ioctl_read_selfid(hci1394_state_t *soft_state, void *arg, int mode) ASSERT(soft_state != NULL); ASSERT(arg != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid_enter, - HCI1394_TNF_HAL_STACK, ""); #ifdef _MULTI_DATAMODEL switch (ddi_model_convert_from(mode & FMODELS)) { @@ -523,10 +409,6 @@ hci1394_ioctl_read_selfid(hci1394_state_t *soft_state, void *arg, int mode) status = ddi_copyin(arg, &read_selfid32, sizeof (hci1394_ioctl_readselfid32_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_read_selfid_ci_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } @@ -551,10 +433,6 @@ hci1394_ioctl_read_selfid(hci1394_state_t *soft_state, void *arg, int mode) status = ddi_copyin(arg, &read_selfid, sizeof (hci1394_ioctl_read_selfid_t), mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_read_selfid_ci_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } @@ -563,10 +441,6 @@ hci1394_ioctl_read_selfid(hci1394_state_t *soft_state, void *arg, int mode) * can hold. count is in quadlets and max_selfid_size is in bytes. */ if ((read_selfid.count * 4) > OHCI_MAX_SELFID_SIZE) { - TNF_PROBE_0(hci1394_ioctl_read_selfid_cnt_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_exit, - HCI1394_TNF_HAL_STACK, ""); return (EINVAL); } @@ -582,17 +456,10 @@ hci1394_ioctl_read_selfid(hci1394_state_t *soft_state, void *arg, int mode) /* copy the selfid word into the user buffer */ status = ddi_copyout(&data, &read_selfid.buf[offset], 4, mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_read_selfid_co_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } } - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid_exit, - HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -609,18 +476,12 @@ hci1394_ioctl_read_selfid32(hci1394_state_t *soft_state, ASSERT(soft_state != NULL); ASSERT(read_selfid != NULL); - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid32_enter, - HCI1394_TNF_HAL_STACK, ""); /* * make sure we are not trying to copy more data than the selfid buffer * can hold. count is in quadlets and max_selfid_size is in bytes. */ if ((read_selfid->count * 4) > OHCI_MAX_SELFID_SIZE) { - TNF_PROBE_0(hci1394_ioctl_read_selfid32_cnt_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid32_exit, - HCI1394_TNF_HAL_STACK, ""); return (EINVAL); } @@ -637,17 +498,10 @@ hci1394_ioctl_read_selfid32(hci1394_state_t *soft_state, (void *)(uintptr_t)(read_selfid->buf + (offset * 4)), 4, mode); if (status != 0) { - TNF_PROBE_0(hci1394_ioctl_read_selfid32_co_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid32_exit, - HCI1394_TNF_HAL_STACK, ""); return (EFAULT); } } - TNF_PROBE_0_DEBUG(hci1394_ioctl_read_selfid32_exit, - HCI1394_TNF_HAL_STACK, ""); - return (0); } #endif diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_isoch.c b/usr/src/uts/common/io/1394/adapters/hci1394_isoch.c index eea2e0b6c7..f262c029a4 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_isoch.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_isoch.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_isoch.c * HCI HAL isochronous interface routines. Contains routines used @@ -71,8 +69,6 @@ hci1394_isoch_init(hci1394_drvinfo_t *drvinfo, hci1394_ohci_handle_t ohci, ASSERT(drvinfo != NULL); ASSERT(isoch_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_isoch_init_enter, HCI1394_TNF_HAL_STACK_ISOCH, - ""); isochp = kmem_alloc(sizeof (hci1394_isoch_t), KM_SLEEP); @@ -120,9 +116,6 @@ hci1394_isoch_init(hci1394_drvinfo_t *drvinfo, hci1394_ohci_handle_t ohci, drvinfo->di_iblock_cookie); *isoch_hdl = isochp; - - TNF_PROBE_0_DEBUG(hci1394_isoch_init_exit, HCI1394_TNF_HAL_STACK_ISOCH, - ""); } /* @@ -136,8 +129,6 @@ hci1394_isoch_fini(hci1394_isoch_handle_t *isoch_hdl) int i; ASSERT(isoch_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_isoch_fini_enter, HCI1394_TNF_HAL_STACK_ISOCH, - ""); isochp = *isoch_hdl; @@ -151,9 +142,6 @@ hci1394_isoch_fini(hci1394_isoch_handle_t *isoch_hdl) mutex_destroy(&isochp->ctxt_list_mutex); kmem_free(isochp, sizeof (hci1394_isoch_t)); *isoch_hdl = NULL; - - TNF_PROBE_0_DEBUG(hci1394_isoch_fini_exit, HCI1394_TNF_HAL_STACK_ISOCH, - ""); } @@ -165,10 +153,6 @@ hci1394_isoch_fini(hci1394_isoch_handle_t *isoch_hdl) int hci1394_isoch_resume(hci1394_state_t *soft_state) { - TNF_PROBE_0_DEBUG(hci1394_isoch_resume_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - TNF_PROBE_0_DEBUG(hci1394_isoch_resume_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -192,8 +176,6 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, ASSERT(soft_statep != NULL); ASSERT(hal_idma_handlep != NULL); - TNF_PROBE_0_DEBUG(hci1394_alloc_isoch_dma_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); isochp = soft_statep->isoch; *hal_idma_handlep = NULL; @@ -205,10 +187,6 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, if ((idi->idma_options & ID1394_TALK) != 0) { /* TRANSMIT */ - TNF_PROBE_1_DEBUG(hci1394_alloc_isoch_dma_transmit, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_string, msg, - "Allocating isoch transmit context"); - /* * search through list of hardware supported contexts for * one that's not inuse @@ -222,20 +200,11 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, /* if there aren't any left, return an error */ if (i >= isochp->ctxt_xmit_count) { - TNF_PROBE_1(hci1394_alloc_isoch_dma_xmit_rsrc_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "Out of isoch transmit resources"); - TNF_PROBE_0_DEBUG(hci1394_alloc_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - mutex_exit(&isochp->ctxt_list_mutex); *resultp = IXL1394_ENO_DMA_RESRCS; return (DDI_FAILURE); } - TNF_PROBE_1_DEBUG(t1394_alloc_isoch_dma_it_ctxtnum, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_int, it_ctxt_num, i); - /* mark inuse and set up handle to context */ isochp->ctxt_xmit[i].ctxt_flags |= HCI1394_ISO_CTXT_INUSE; ctxtp = &isochp->ctxt_xmit[i]; @@ -244,10 +213,6 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, } else { /* RECEIVE */ - TNF_PROBE_1_DEBUG(hci1394_alloc_isoch_dma_receive, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_string, msg, - "Allocating isoch receive context"); - /* search thru implemented contexts for one that's available */ for (i = 0; i < isochp->ctxt_recv_count; i++) { if ((isochp->ctxt_recv[i].ctxt_flags & @@ -259,13 +224,6 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, /* if there aren't any left, return an error */ /* XXX support for multi-chan could go here */ if (i >= isochp->ctxt_recv_count) { - - TNF_PROBE_1(t1394_alloc_isoch_dma_ir_rsrc_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "Out of isoch receive resources"); - TNF_PROBE_0_DEBUG(hci1394_alloc_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - mutex_exit(&isochp->ctxt_list_mutex); *resultp = IXL1394_ENO_DMA_RESRCS; return (DDI_FAILURE); @@ -281,9 +239,6 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, HCI1394_ISO_CTXT_RHDRS; } - TNF_PROBE_1_DEBUG(hci1394_alloc_isoch_dma_recv_ctxtnum, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_int, recv_ctxt_num, i); - /* mark inuse and set up handle to context */ isochp->ctxt_recv[i].ctxt_flags |= HCI1394_ISO_CTXT_INUSE; ctxtp = &isochp->ctxt_recv[i]; @@ -325,11 +280,6 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, ctxtp->ctxt_flags &= ~HCI1394_ISO_CTXT_INUSE; mutex_exit(&isochp->ctxt_list_mutex); - TNF_PROBE_2(t1394_alloc_isoch_dma_compile_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL compilation error", tnf_int, ixl_error, *resultp); - TNF_PROBE_0_DEBUG(hci1394_alloc_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -350,9 +300,6 @@ hci1394_alloc_isoch_dma(void *hal_private, id1394_isoch_dmainfo_t *idi, /* No errors, so all set to go. initialize interrupt/execution flags */ ctxtp->intr_flags = 0; - TNF_PROBE_0_DEBUG(hci1394_alloc_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - *hal_idma_handlep = ctxtp; return (DDI_SUCCESS); } @@ -374,20 +321,12 @@ hci1394_start_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, hci1394_iso_ctxt_t *ctxtp; int tag0, tag1, tag2, tag3; - TNF_PROBE_0_DEBUG(hci1394_start_isoch_dma_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* pick up the context pointer from the private idma data */ ctxtp = (hci1394_iso_ctxt_t *)hal_isoch_dma_handle; ASSERT(hal_private != NULL); ASSERT(ctxtp != NULL); ASSERT(idma_ctrlinfop != NULL); - TNF_PROBE_4_DEBUG(hci1394_start_isoch_dma_ctxt_info, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_opaque, ctxt_ptr, ctxtp, - tnf_int, ctxt_index, ctxtp->ctxt_index, tnf_opaque, ctxt_flags, - ctxtp->ctxt_flags, tnf_opaque, first_ixl, ctxtp->ixl_firstp); - /* if the context is already running, just exit. else set running */ mutex_enter(&soft_statep->isoch->ctxt_list_mutex); @@ -395,9 +334,6 @@ hci1394_start_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, mutex_exit(&soft_statep->isoch->ctxt_list_mutex); - TNF_PROBE_1_DEBUG(hci1394_start_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "context already running"); return (DDI_SUCCESS); } ctxtp->ctxt_flags |= HCI1394_ISO_CTXT_RUNNING; @@ -425,10 +361,6 @@ hci1394_start_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, hci1394_ohci_ir_cmd_ptr_set(soft_statep->ohci, ctxtp->ctxt_index, ctxtp->dma_mem_execp); - TNF_PROBE_2_DEBUG(hci1394_start_isoch_dma_index_info, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_string, msg, - "starting IR ctxt", tnf_int, ctxt_num, ctxtp->ctxt_index); - /* * determine correct tag values. map target's requested 2-bit * tag into one of the 4 openHCI tag bits. @@ -486,10 +418,6 @@ hci1394_start_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, hci1394_ohci_it_cmd_ptr_set(soft_statep->ohci, ctxtp->ctxt_index, ctxtp->dma_mem_execp); - TNF_PROBE_2_DEBUG(hci1394_start_isoch_dma_index_info, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_string, msg, - "starting IT ctxt", tnf_int, ctxt_num, ctxtp->ctxt_index); - /* set desired values in context control register */ HCI1394_ITCTXT_CTRL_SET(soft_statep, ctxtp->ctxt_index, ((flags & ID1394_START_ON_CYCLE) != 0) /* match enable */, @@ -508,8 +436,6 @@ hci1394_start_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, (uint32_t)(0x1 << ctxtp->ctxt_index)); } - TNF_PROBE_0_DEBUG(hci1394_start_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -531,10 +457,6 @@ hci1394_update_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, int ii; int err = DDI_SUCCESS; - - TNF_PROBE_0_DEBUG(hci1394_update_isoch_dma_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* pick up the context pointer from the private idma data */ ctxtp = (hci1394_iso_ctxt_t *)hal_isoch_dma_handle; @@ -553,13 +475,6 @@ hci1394_update_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, ASSERT(cur_new_ixlp != NULL); ASSERT(cur_orig_ixlp != NULL); - /* lots of debug trace info */ - TNF_PROBE_4_DEBUG(hci1394_update_isoch_dma_ctxt_info, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_opaque, ctxt_ptr, ctxtp, - tnf_int, ixlcount, idma_updateinfop->ixl_count, - tnf_opaque, new_ixl, cur_new_ixlp, tnf_opaque, orig_ixl, - cur_orig_ixlp); - for (ii = 0; (ii < idma_updateinfop->ixl_count) && (err == DDI_SUCCESS); ii++) { @@ -568,10 +483,6 @@ hci1394_update_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, *resultp = IXL1394_ECOUNT_MISMATCH; err = DDI_FAILURE; - TNF_PROBE_3_DEBUG(hci1394_update_isoch_dma_mismatch, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_opaque, new, - cur_new_ixlp, tnf_opaque, orig, cur_orig_ixlp, - tnf_int, iteration, ii); break; } @@ -584,8 +495,6 @@ hci1394_update_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, cur_orig_ixlp = cur_orig_ixlp->next_ixlp; } - TNF_PROBE_0_DEBUG(hci1394_update_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (err); } @@ -604,9 +513,6 @@ hci1394_stop_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, hci1394_state_t *soft_statep = (hci1394_state_t *)hal_private; hci1394_iso_ctxt_t *ctxtp; - TNF_PROBE_0_DEBUG(hci1394_stop_isoch_dma_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* pick up the context pointer from the private idma data */ ctxtp = (hci1394_iso_ctxt_t *)hal_isoch_dma_handle; @@ -621,9 +527,6 @@ hci1394_stop_isoch_dma(void *hal_private, void *hal_isoch_dma_handle, * store_timestamps upto date. Don't care about errors. */ hci1394_ixl_interrupt(soft_statep, ctxtp, B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_stop_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -645,23 +548,10 @@ hci1394_do_stop(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, int count; clock_t upto; - TNF_PROBE_0_DEBUG(hci1394_do_stop_enter, HCI1394_TNF_HAL_STACK_ISOCH, - ""); - - TNF_PROBE_4_DEBUG(hci1394_do_stop_info, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_opaque, ctxt_ptr, ctxtp, - tnf_int, ctxt_index, ctxtp->ctxt_index, tnf_opaque, ctxt_flags, - ctxtp->ctxt_flags, tnf_string, reason, - (stop_args == ID1394_DONE) ? "DONE":"FAIL"); - /* already stopped? if yes, done, else set state to not-running */ mutex_enter(&soft_statep->isoch->ctxt_list_mutex); if ((ctxtp->ctxt_flags & HCI1394_ISO_CTXT_RUNNING) == 0) { mutex_exit(&soft_statep->isoch->ctxt_list_mutex); - - TNF_PROBE_1_DEBUG(hci1394_do_stop_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "context already stopped"); return; } ctxtp->ctxt_flags &= ~HCI1394_ISO_CTXT_RUNNING; @@ -706,12 +596,6 @@ hci1394_do_stop(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, break; } } - - if (ctxtp->intr_flags & HCI1394_ISO_CTXT_ININTR) { - TNF_PROBE_1(hci1394_do_stop_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", - tnf_string, msg, "intr completion timeout"); - } } mutex_exit(&ctxtp->intrprocmutex); @@ -739,9 +623,6 @@ hci1394_do_stop(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, soft_statep->drvinfo.di_instance); hci1394_shutdown(soft_statep->drvinfo.di_dip); - TNF_PROBE_1_DEBUG(hci1394_do_stop_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "context timed out trying to stop"); return; } @@ -757,8 +638,6 @@ hci1394_do_stop(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, ctxtp->idma_evt_arg, stop_args); } } - TNF_PROBE_0_DEBUG(hci1394_do_stop_exit, HCI1394_TNF_HAL_STACK_ISOCH, - ""); } /* @@ -775,9 +654,6 @@ hci1394_free_isoch_dma(void *hal_private, void *hal_isoch_dma_handle) hci1394_iso_ctxt_t *ctxtp; hci1394_isoch_t *isochp; - TNF_PROBE_0_DEBUG(hci1394_free_isoch_dma_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* pick up the context pointer from the private idma data */ ctxtp = (hci1394_iso_ctxt_t *)hal_isoch_dma_handle; @@ -786,12 +662,6 @@ hci1394_free_isoch_dma(void *hal_private, void *hal_isoch_dma_handle) isochp = soft_statep->isoch; - /* lots of debug trace info */ - TNF_PROBE_4_DEBUG(hci1394_free_isoch_dma_ctxt_info, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_opaque, ctxt_ptr, ctxtp, - tnf_int, ctxt_index, ctxtp->ctxt_index, tnf_opaque, ctxt_flags, - ctxtp->ctxt_flags, tnf_opaque, first_ixl, ctxtp->ixl_firstp); - mutex_enter(&soft_statep->isoch->ctxt_list_mutex); /* delete xfer_ctl structs and pages of allocated hci_desc memory */ @@ -816,9 +686,6 @@ hci1394_free_isoch_dma(void *hal_private, void *hal_isoch_dma_handle) } mutex_exit(&soft_statep->isoch->ctxt_list_mutex); - - TNF_PROBE_0_DEBUG(hci1394_free_isoch_dma_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -875,9 +742,6 @@ hci1394_isoch_error_ints_enable(hci1394_state_t *soft_statep) { ASSERT(soft_statep); - TNF_PROBE_0_DEBUG(hci1394_isoch_error_ints_enable_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - mutex_enter(&soft_statep->isoch->ctxt_list_mutex); if (soft_statep->isoch->isoch_dma_alloc_cnt != 0) { @@ -889,7 +753,4 @@ hci1394_isoch_error_ints_enable(hci1394_state_t *soft_statep) OHCI_INTR_CYC_LOST | OHCI_INTR_CYC_INCONSISTENT); } mutex_exit(&soft_statep->isoch->ctxt_list_mutex); - - TNF_PROBE_0_DEBUG(hci1394_isoch_error_ints_enable_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_isr.c b/usr/src/uts/common/io/1394/adapters/hci1394_isr.c index 42c8307447..07ff26d3d2 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_isr.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_isr.c @@ -62,18 +62,11 @@ hci1394_isr_init(hci1394_state_t *soft_state) { int status; - ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_init_enter, HCI1394_TNF_HAL_STACK, ""); /* This driver does not support running at a high level interrupt */ status = ddi_intr_hilevel(soft_state->drvinfo.di_dip, 0); if (status != 0) { - TNF_PROBE_1(hci1394_isr_init_hli_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "High Level interrupts not supported"); - TNF_PROBE_0_DEBUG(hci1394_isr_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -81,15 +74,9 @@ hci1394_isr_init(hci1394_state_t *soft_state) status = ddi_get_iblock_cookie(soft_state->drvinfo.di_dip, 0, &soft_state->drvinfo.di_iblock_cookie); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_init_gic_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_isr_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_isr_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -103,11 +90,8 @@ void hci1394_isr_fini(hci1394_state_t *soft_state) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_fini_enter, HCI1394_TNF_HAL_STACK, ""); /* nothing to do right now */ - - TNF_PROBE_0_DEBUG(hci1394_isr_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -125,13 +109,7 @@ hci1394_isr_handler_init(hci1394_state_t *soft_state) /* Initialize interrupt handler */ status = ddi_add_intr(soft_state->drvinfo.di_dip, 0, NULL, NULL, hci1394_isr, (caddr_t)soft_state); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_handler_init_fail, - HCI1394_TNF_HAL_ERROR, ""); - return (DDI_FAILURE); - } - - return (DDI_SUCCESS); + return (status); } @@ -159,8 +137,6 @@ void hci1394_isr_mask_setup(hci1394_state_t *soft_state) { ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_mask_setup_enter, HCI1394_TNF_HAL_STACK, - ""); /* start off with all interrupts cleared/disabled */ hci1394_ohci_ir_intr_disable(soft_state->ohci, 0xFFFFFFFF); @@ -178,9 +154,6 @@ hci1394_isr_mask_setup(hci1394_state_t *soft_state) OHCI_INTR_RQPKT | OHCI_INTR_RSPKT | OHCI_INTR_ISOCH_TX | OHCI_INTR_ISOCH_RX | OHCI_INTR_POST_WR_ERR | OHCI_INTR_PHY | OHCI_INTR_LOCK_RESP_ERR)); - - TNF_PROBE_0_DEBUG(hci1394_isr_mask_setup_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -205,7 +178,6 @@ hci1394_isr(caddr_t parm) soft_state = (hci1394_state_t *)parm; ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_enter, HCI1394_TNF_HAL_STACK, ""); if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) return (DDI_INTR_UNCLAIMED); @@ -317,8 +289,6 @@ hci1394_isr(caddr_t parm) HCI1394_BUS_RESET)) { if (soft_state->drvinfo.di_gencnt != hci1394_ohci_current_busgen(soft_state->ohci)) { - TNF_PROBE_0(hci1394_isr_busgen_claim, - HCI1394_TNF_HAL, ""); status = DDI_INTR_CLAIMED; } } @@ -331,8 +301,6 @@ hci1394_isr(caddr_t parm) soft_state->ohci); } while (interrupt_event != 0); - TNF_PROBE_0_DEBUG(hci1394_isr_exit, HCI1394_TNF_HAL_STACK, ""); - return (status); } @@ -350,8 +318,6 @@ hci1394_isr_bus_reset(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_bus_reset_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Set the driver state to reset. If we cannot, we have been shutdown. @@ -393,9 +359,6 @@ hci1394_isr_bus_reset(hci1394_state_t *soft_state) /* Inform Services Layer about Bus Reset */ h1394_bus_reset(soft_state->drvinfo.di_sl_private, (void **)&soft_state->sl_selfid_buf); - - TNF_PROBE_0_DEBUG(hci1394_isr_bus_reset_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -421,7 +384,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_self_id_enter, HCI1394_TNF_HAL_STACK, ""); soft_state->drvinfo.di_stats.st_selfid_count++; @@ -441,18 +403,12 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) * interrupt every bus reset. */ status = hci1394_ohci_phy_read(soft_state->ohci, 5, &phy_status); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_self_id_pr_fail, - HCI1394_TNF_HAL_ERROR, ""); - } else { + if (status == DDI_SUCCESS) { phy_status |= OHCI_PHY_LOOP_ERR | OHCI_PHY_PWRFAIL_ERR | OHCI_PHY_TIMEOUT_ERR | OHCI_PHY_PORTEVT_ERR; status = hci1394_ohci_phy_write(soft_state->ohci, 5, phy_status); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_self_id_pw_fail, - HCI1394_TNF_HAL_ERROR, ""); - } else { + if (status == DDI_SUCCESS) { /* * Re-enable PHY interrupt. We disable the PHY interrupt * when we get one so that we do not get stuck in the @@ -465,8 +421,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) /* See if either AT active bit is set */ if (hci1394_ohci_at_active(soft_state->ohci) == B_TRUE) { - TNF_PROBE_1(hci1394_isr_self_id_as_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "AT ACTIVE still set"); saw_error = B_TRUE; } @@ -477,8 +431,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) /* Read node info and test for Invalid Node ID */ hci1394_ohci_nodeid_info(soft_state->ohci, &node_id, &nodeid_error); if (nodeid_error == B_TRUE) { - TNF_PROBE_1(hci1394_isr_self_id_ni_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "saw invalid NodeID"); saw_error = B_TRUE; } @@ -491,8 +443,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) /* Test for selfid error */ if (selfid_error == B_TRUE) { - TNF_PROBE_1(hci1394_isr_self_id_si_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "saw invalid SelfID"); saw_error = B_TRUE; } @@ -501,8 +451,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) * we should have another selfid int coming later. */ if ((saw_error == B_FALSE) && (selfid_size == 0)) { - TNF_PROBE_0_DEBUG(hci1394_isr_self_id_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -511,8 +459,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) * count in register. */ if (hci1394_ohci_selfid_buf_current(soft_state->ohci) == B_FALSE) { - TNF_PROBE_0_DEBUG(hci1394_isr_self_id_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -544,8 +490,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) * If we fail reading from PHY, put invalid data into * the selfid buffer so the SL will reset the bus again. */ - TNF_PROBE_0(hci1394_isr_self_id_pi_fail, - HCI1394_TNF_HAL_ERROR, ""); selfid_buf_p[0] = 0xFFFFFFFF; selfid_buf_p[1] = 0xFFFFFFFF; } else { @@ -564,8 +508,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) */ if (soft_state->drvinfo.di_gencnt != hci1394_ohci_current_busgen(soft_state->ohci)) { - TNF_PROBE_0_DEBUG(hci1394_isr_self_id_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -642,8 +584,6 @@ hci1394_isr_self_id(hci1394_state_t *soft_state) /* enable bus reset interrupt */ hci1394_ohci_intr_enable(soft_state->ohci, OHCI_INTR_BUS_RESET); - - TNF_PROBE_0_DEBUG(hci1394_isr_self_id_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -664,8 +604,6 @@ hci1394_isr_isoch_ir(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_isoch_ir_enter, - HCI1394_TNF_HAL_STACK, ""); num_ir_contexts = hci1394_isoch_recv_count_get(soft_state->isoch); @@ -694,7 +632,6 @@ hci1394_isr_isoch_ir(hci1394_state_t *soft_state) mask <<= 1; } } - TNF_PROBE_0_DEBUG(hci1394_isr_isoch_ir_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -715,8 +652,6 @@ hci1394_isr_isoch_it(hci1394_state_t *soft_state) ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_isoch_it_enter, - HCI1394_TNF_HAL_STACK, ""); num_it_contexts = hci1394_isoch_xmit_count_get(soft_state->isoch); @@ -746,7 +681,6 @@ hci1394_isr_isoch_it(hci1394_state_t *soft_state) mask <<= 1; } } - TNF_PROBE_0_DEBUG(hci1394_isr_isoch_it_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -759,12 +693,8 @@ static void hci1394_isr_atreq_complete(hci1394_state_t *soft_state) { boolean_t request_available; - int status; - ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_atreq_complete_enter, - HCI1394_TNF_HAL_STACK, ""); hci1394_ohci_intr_clear(soft_state->ohci, OHCI_INTR_REQ_TX_CMPLT); @@ -778,16 +708,9 @@ hci1394_isr_atreq_complete(hci1394_state_t *soft_state) * Process a single request. Do not flush Q. That is only * done during bus reset processing. */ - status = hci1394_async_atreq_process(soft_state->async, B_FALSE, + (void) hci1394_async_atreq_process(soft_state->async, B_FALSE, &request_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_atreq_complete_pr_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while (request_available == B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_isr_atreq_complete_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -802,11 +725,8 @@ static void hci1394_isr_arresp(hci1394_state_t *soft_state) { boolean_t response_available; - int status; - ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_arresp_enter, HCI1394_TNF_HAL_STACK, ""); hci1394_ohci_intr_clear(soft_state->ohci, OHCI_INTR_RSPKT); @@ -820,15 +740,9 @@ hci1394_isr_arresp(hci1394_state_t *soft_state) * would still be pending. */ do { - status = hci1394_async_arresp_process(soft_state->async, + (void) hci1394_async_arresp_process(soft_state->async, &response_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_arresp_pr_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while (response_available == B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_isr_arresp_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -841,11 +755,8 @@ static void hci1394_isr_arreq(hci1394_state_t *soft_state) { boolean_t request_available; - int status; - ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_arreq_enter, HCI1394_TNF_HAL_STACK, ""); hci1394_ohci_intr_clear(soft_state->ohci, OHCI_INTR_RQPKT); @@ -857,15 +768,9 @@ hci1394_isr_arreq(hci1394_state_t *soft_state) * and processed it. The interrupt would still be pending. */ do { - status = hci1394_async_arreq_process(soft_state->async, + (void) hci1394_async_arreq_process(soft_state->async, &request_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_arreq_pr_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while (request_available == B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_isr_arreq_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -881,12 +786,8 @@ static void hci1394_isr_atresp_complete(hci1394_state_t *soft_state) { boolean_t response_available; - int status; - ASSERT(soft_state != NULL); - TNF_PROBE_0_DEBUG(hci1394_isr_atresp_complete_enter, - HCI1394_TNF_HAL_STACK, ""); hci1394_ohci_intr_clear(soft_state->ohci, OHCI_INTR_RESP_TX_CMPLT); @@ -902,14 +803,7 @@ hci1394_isr_atresp_complete(hci1394_state_t *soft_state) * Process a single response. Do not flush Q. That is only * done during bus reset processing. */ - status = hci1394_async_atresp_process(soft_state->async, + (void) hci1394_async_atresp_process(soft_state->async, B_FALSE, &response_available); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_isr_atresp_complete_pr_fail, - HCI1394_TNF_HAL_ERROR, ""); - } } while (response_available == B_TRUE); - - TNF_PROBE_0_DEBUG(hci1394_isr_atresp_complete_exit, - HCI1394_TNF_HAL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c index 31048d5a4d..5352e6ec03 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_comp.c @@ -36,9 +36,6 @@ #include <sys/conf.h> #include <sys/ddi.h> #include <sys/sunddi.h> - -#include <sys/tnf_probe.h> - #include <sys/1394/h1394.h> #include <sys/1394/ixl1394.h> #include <sys/1394/adapters/hci1394.h> @@ -119,8 +116,6 @@ hci1394_compile_ixl(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, ASSERT(soft_statep != NULL); ASSERT(ctxtp != NULL); - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); /* Initialize compiler working variables */ hci1394_compile_ixl_init(&wv, soft_statep, ctxtp, ixlp); @@ -148,15 +143,9 @@ hci1394_compile_ixl(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, hci1394_compile_ixl_endup(&wv); *resultp = wv.dma_bld_error; - if (*resultp != 0) { - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); + if (*resultp != 0) return (DDI_FAILURE); - } else { - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - return (DDI_SUCCESS); - } + return (DDI_SUCCESS); } /* @@ -169,9 +158,6 @@ hci1394_compile_ixl_init(hci1394_comp_ixl_vars_t *wvp, hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, ixl1394_command_t *ixlp) { - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_init_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* initialize common recv/xmit compile values */ wvp->soft_statep = soft_statep; wvp->ctxtp = ctxtp; @@ -231,9 +217,6 @@ hci1394_compile_ixl_init(hci1394_comp_ixl_vars_t *wvp, wvp->xmit_pkthdr1 = 0; wvp->xmit_pkthdr2 = 0; /* END XMIT ONLY SECTION */ - - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_init_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -249,15 +232,8 @@ hci1394_compile_ixl_endup(hci1394_comp_ixl_vars_t *wvp) hci1394_idma_desc_mem_t *dma_nextp; int err; - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_endup_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* error if no descriptor blocks found in ixl & created in dma memory */ if ((wvp->dma_bld_error == 0) && (wvp->ixl_xfer_st_cnt == 0)) { - TNF_PROBE_1(hci1394_compile_ixl_endup_nodata_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_ENO_DATA_PKTS: prog has no data packets"); - wvp->dma_bld_error = IXL1394_ENO_DATA_PKTS; } @@ -268,10 +244,6 @@ hci1394_compile_ixl_endup(hci1394_comp_ixl_vars_t *wvp) /* error if a label<->jump loop, or no xfer */ if ((err == DDI_FAILURE) || (ixl_exec_stp == NULL)) { - TNF_PROBE_1(hci1394_compile_ixl_endup_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_ENO_DATA_PKTS: loop or no xfer detected"); - wvp->dma_bld_error = IXL1394_ENO_DATA_PKTS; } } @@ -285,9 +257,6 @@ hci1394_compile_ixl_endup(hci1394_comp_ixl_vars_t *wvp) if (err != DDI_SUCCESS) { wvp->dma_bld_error = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_1(hci1394_compile_ixl_endup_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_INTERNAL_ERROR: dma_sync() failed"); break; } @@ -304,8 +273,6 @@ hci1394_compile_ixl_endup(hci1394_comp_ixl_vars_t *wvp) wvp->ctxtp->dma_firstp = wvp->dma_firstp; hci1394_ixl_cleanup(wvp->soft_statep, wvp->ctxtp); - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_endup_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } @@ -328,8 +295,6 @@ hci1394_compile_ixl_endup(hci1394_comp_ixl_vars_t *wvp) wvp->ctxtp->ixl_execp = NULL; /* compile done */ - TNF_PROBE_0_DEBUG(hci1394_compile_ixl_endup_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -352,9 +317,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) uint32_t pktsize; uint32_t pktcnt; - TNF_PROBE_0_DEBUG(hci1394_parse_ixl_enter, HCI1394_TNF_HAL_STACK_ISOCH, - ""); - /* follow ixl links until reach end or find error */ while ((ixlnextp != NULL) && (wvp->dma_bld_error == 0)) { @@ -376,21 +338,8 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) /* check if command op failed because it was invalid */ if (hci1394_is_opcode_valid(ixlopcode) != B_TRUE) { - TNF_PROBE_3(hci1394_parse_ixl_bad_opcode_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_BAD_IXL_OPCODE", - tnf_opaque, ixl_commandp, ixlcurp, - tnf_opaque, ixl_opcode, ixlopcode); - wvp->dma_bld_error = IXL1394_EBAD_IXL_OPCODE; } else { - TNF_PROBE_3(hci1394_parse_ixl_mode_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EWRONG_XR_CMD_MODE: " - "invalid ixlop in mode", tnf_uint, io_mode, - wvp->ixl_io_mode, tnf_opaque, ixl_opcode, - ixlopcode); - wvp->dma_bld_error = IXL1394_EWRONG_XR_CMD_MODE; } continue; @@ -455,14 +404,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) } if ((pktcnt == 0) || ((pktsize * pktcnt) != cur_xfer_buf_ixlp->size)) { - - TNF_PROBE_3(hci1394_parse_ixl_rat_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", - tnf_string, errmsg, - "IXL1394_EPKTSIZE_RATIO", tnf_int, - buf_size, cur_xfer_buf_ixlp->size, - tnf_int, pkt_size, pktsize); - wvp->dma_bld_error = IXL1394_EPKTSIZE_RATIO; continue; @@ -491,11 +432,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) /* error if in buffer fill mode */ if ((wvp->ixl_io_mode & HCI1394_ISO_CTXT_BFFILL) != 0) { - TNF_PROBE_1(hci1394_parse_ixl_mode_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EWRONG_XR_CMD_MODE: " - "RECV_PKT_ST used in BFFILL mode"); - wvp->dma_bld_error = IXL1394_EWRONG_XR_CMD_MODE; continue; } @@ -527,22 +463,12 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) /* error if in buffer fill mode */ if ((wvp->ixl_io_mode & HCI1394_ISO_CTXT_BFFILL) != 0) { - TNF_PROBE_1(hci1394_parse_ixl_mode_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EWRONG_XR_CMD_MODE: " - "RECV_PKT_ST used in BFFILL mode"); - wvp->dma_bld_error = IXL1394_EWRONG_XR_CMD_MODE; continue; } /* error if xfer_state not xfer pkt */ if (wvp->xfer_state != XFER_PKT) { - TNF_PROBE_1(hci1394_parse_ixl_misplacercv_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EMISPLACED_RECV: " - "RECV_PKT without RECV_PKT_ST"); - wvp->dma_bld_error = IXL1394_EMISPLACED_RECV; continue; } @@ -610,13 +536,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) } if ((pktcnt == 0) || ((pktsize * pktcnt) != cur_xfer_buf_ixlp->size)) { - - TNF_PROBE_3(hci1394_parse_ixl_rat_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EPKTSIZE_RATIO", tnf_int, - buf_size, cur_xfer_buf_ixlp->size, tnf_int, - pkt_size, pktsize); - wvp->dma_bld_error = IXL1394_EPKTSIZE_RATIO; continue; } @@ -673,11 +592,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) * else error */ if (cur_xfer_pkt_ixlp->size < 4) { - TNF_PROBE_2(hci1394_parse_ixl_hdr_missing_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EPKT_HDR_MISSING", tnf_int, - pkt_size, cur_xfer_pkt_ixlp->size); - wvp->dma_bld_error = IXL1394_EPKT_HDR_MISSING; continue; } @@ -704,11 +618,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) /* error if xfer_state not xfer pkt */ if (wvp->xfer_state != XFER_PKT) { - TNF_PROBE_1(hci1394_parse_ixl_misplacesnd_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EMISPLACED_SEND: SEND_PKT " - "without SEND_PKT_ST"); - wvp->dma_bld_error = IXL1394_EMISPLACED_SEND; continue; } @@ -777,13 +686,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) if ((cur_jump_ixlp->label != NULL) && (cur_jump_ixlp->label->ixl_opcode != IXL1394_OP_LABEL)) { - TNF_PROBE_3(hci1394_parse_ixl_jumplabel_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EJUMP_NOT_TO_LABEL", - tnf_opaque, jumpixl_commandp, ixlcurp, - tnf_opaque, jumpto_ixl, - cur_jump_ixlp->label); - wvp->dma_bld_error = IXL1394_EJUMP_NOT_TO_LABEL; continue; } @@ -818,12 +720,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) * this xfer */ if (wvp->ixl_setskipmode_cmdp != NULL) { - TNF_PROBE_2(hci1394_parse_ixl_dup_set_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EDUPLICATE_SET_CMD:" - " duplicate set skipmode", tnf_opaque, - ixl_commandp, ixlcurp); - wvp->dma_bld_error = IXL1394_EDUPLICATE_SET_CMD; continue; } @@ -840,13 +736,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) IXL1394_SKIP_TO_STOP) && (wvp->ixl_setskipmode_cmdp->skipmode != IXL1394_SKIP_TO_LABEL)) { - - TNF_PROBE_3(hci1394_parse_ixl_dup_set_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL EBAD_SKIPMODE", tnf_opaque, - ixl_commandp, ixlcurp, tnf_int, skip, - wvp->ixl_setskipmode_cmdp->skipmode); - wvp->dma_bld_error = IXL1394_EBAD_SKIPMODE; continue; } @@ -860,14 +749,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) ((wvp->ixl_setskipmode_cmdp->label == NULL) || (wvp->ixl_setskipmode_cmdp->label->ixl_opcode != IXL1394_OP_LABEL))) { - - TNF_PROBE_3(hci1394_parse_ixl_jump_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EJUMP_NOT_TO_LABEL", - tnf_opaque, jumpixl_commandp, ixlcurp, - tnf_opaque, jumpto_ixl, - wvp->ixl_setskipmode_cmdp->label); - wvp->dma_bld_error = IXL1394_EJUMP_NOT_TO_LABEL; continue; } @@ -887,12 +768,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) * for this xfer */ if (wvp->ixl_settagsync_cmdp != NULL) { - TNF_PROBE_2(hci1394_parse_ixl_dup_set_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_EDUPLICATE_SET_CMD:" - " duplicate set tagsync", tnf_opaque, - ixl_commandp, ixlcurp); - wvp->dma_bld_error = IXL1394_EDUPLICATE_SET_CMD; continue; } @@ -921,11 +796,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) default: /* error - unknown/unimplemented ixl command */ - TNF_PROBE_3(hci1394_parse_ixl_bad_opcode_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_BAD_IXL_OPCODE", tnf_opaque, ixl_commandp, - ixlcurp, tnf_opaque, ixl_opcode, ixlopcode); - wvp->dma_bld_error = IXL1394_EBAD_IXL_OPCODE; continue; } @@ -936,9 +806,6 @@ hci1394_parse_ixl(hci1394_comp_ixl_vars_t *wvp, ixl1394_command_t *ixlp) if (wvp->dma_bld_error == 0) { hci1394_finalize_cur_xfer_desc(wvp); } - - TNF_PROBE_0_DEBUG(hci1394_parse_ixl_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -973,9 +840,6 @@ hci1394_finalize_all_xfer_desc(hci1394_comp_ixl_vars_t *wvp) int ii; int err; - TNF_PROBE_0_DEBUG(hci1394_finalize_all_xfer_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * If xmit mode and if default skipmode is skip to label - * follow exec path starting at default skipmode label until @@ -988,14 +852,6 @@ hci1394_finalize_all_xfer_desc(hci1394_comp_ixl_vars_t *wvp) err = hci1394_ixl_find_next_exec_xfer(wvp->default_skiplabelp, NULL, &wvp->default_skipxferp); if (err == DDI_FAILURE) { - TNF_PROBE_2(hci1394_finalize_all_xfer_desc_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_ENO_DATA_PKTS: label<->jump loop detected " - "for skiplabel default w/no xfers", tnf_opaque, - skipixl_cmdp, wvp->default_skiplabelp); - TNF_PROBE_0_DEBUG(hci1394_finalize_all_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - wvp->dma_bld_error = IXL1394_ENO_DATA_PKTS; return; } @@ -1058,12 +914,6 @@ hci1394_finalize_all_xfer_desc(hci1394_comp_ixl_vars_t *wvp) /* if label<->jump loop detected, return error */ if (err == DDI_FAILURE) { wvp->dma_bld_error = IXL1394_ENO_DATA_PKTS; - - TNF_PROBE_2(hci1394_finalize_all_xfer_desc_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_ENO_DATA_PKTS: label<->jump loop detected " - "w/no xfers", tnf_opaque, ixl_cmdp, - ixlcurp->next_ixlp); continue; } @@ -1226,9 +1076,6 @@ hci1394_finalize_all_xfer_desc(hci1394_comp_ixl_vars_t *wvp) } /* for */ } /* if */ } /* while */ - - TNF_PROBE_0_DEBUG(hci1394_finalize_all_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -1244,9 +1091,6 @@ hci1394_finalize_cur_xfer_desc(hci1394_comp_ixl_vars_t *wvp) uint16_t ixlopcode; uint16_t ixlopraw; - TNF_PROBE_0_DEBUG(hci1394_finalize_cur_xfer_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* extract opcode from current IXL cmd (if any) */ if (wvp->ixl_cur_cmdp != NULL) { ixlopcode = wvp->ixl_cur_cmdp->ixl_opcode; @@ -1272,40 +1116,17 @@ hci1394_finalize_cur_xfer_desc(hci1394_comp_ixl_vars_t *wvp) if ((wvp->ixl_settagsync_cmdp != NULL) || (wvp->ixl_setskipmode_cmdp != NULL) || (wvp->ixl_setsyncwait_cnt != 0)) { - wvp->dma_bld_error = IXL1394_EUNAPPLIED_SET_CMD; - - TNF_PROBE_2( - hci1394_finalize_cur_xfer_desc_set_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_UNAPPLIED_SET_CMD: " - "orphaned set (no associated packet)", - tnf_opaque, ixl_commandp, - wvp->ixl_cur_cmdp); - TNF_PROBE_0_DEBUG( - hci1394_finalize_cur_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } } /* error if finalize is due to updateable jump cmd */ if (ixlopcode == IXL1394_OP_JUMP_U) { - wvp->dma_bld_error = IXL1394_EUPDATE_DISALLOWED; - - TNF_PROBE_2(hci1394_finalize_cur_xfer_desc_upd_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EUPDATE_DISALLOWED: jumpU w/out pkt", - tnf_opaque, ixl_commandp, wvp->ixl_cur_cmdp); - TNF_PROBE_0_DEBUG(hci1394_finalize_cur_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } - TNF_PROBE_0_DEBUG(hci1394_finalize_cur_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* no error, no xfer */ return; } @@ -1350,12 +1171,7 @@ hci1394_finalize_cur_xfer_desc(hci1394_comp_ixl_vars_t *wvp) IXL1394_OPTY_XFER_PKT_ST) != 0) || ((wvp->xfer_hci_flush & (UPDATEABLE_XFER | UPDATEABLE_SET | INITIATING_LBL)) != 0)) { - if (hci1394_flush_hci_cache(wvp) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG( - hci1394_finalize_cur_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -1395,18 +1211,11 @@ hci1394_finalize_cur_xfer_desc(hci1394_comp_ixl_vars_t *wvp) default: /* internal compiler error */ - TNF_PROBE_2(hci1394_finalize_cur_xfer_desc_internal_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_INTERNAL_ERROR: invalid state", tnf_opaque, - ixl_commandp, wvp->ixl_cur_cmdp); wvp->dma_bld_error = IXL1394_EINTERNAL_ERROR; } /* return if error */ if (wvp->dma_bld_error != 0) { - TNF_PROBE_0_DEBUG(hci1394_finalize_cur_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -1458,9 +1267,6 @@ hci1394_finalize_cur_xfer_desc(hci1394_comp_ixl_vars_t *wvp) /* set no xmit descriptor block being built */ wvp->xfer_state = XFER_NONE; - - TNF_PROBE_0_DEBUG(hci1394_finalize_cur_xfer_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -1477,38 +1283,18 @@ hci1394_bld_recv_pkt_desc(hci1394_comp_ixl_vars_t *wvp) uint32_t ii; hci1394_desc_t *wv_descp; /* shorthand to local descrpt */ - TNF_PROBE_0_DEBUG(hci1394_bld_recv_pkt_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * is error if number of descriptors to be built exceeds maximum * descriptors allowed in a descriptor block. */ if ((wvp->descriptors + wvp->xfer_bufcnt) > HCI1394_DESC_MAX_Z) { - wvp->dma_bld_error = IXL1394_EFRAGMENT_OFLO; - - TNF_PROBE_3(hci1394_bld_recv_pkt_desc_fragment_oflo_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EFRAGMENT_OFLO", tnf_opaque, ixl_commandp, - wvp->ixl_cur_xfer_stp, tnf_int, frag_count, - wvp->descriptors + wvp->xfer_bufcnt); - TNF_PROBE_0_DEBUG(hci1394_bld_recv_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } /* allocate an xfer_ctl struct, including 1 xfer_ctl_dma struct */ if ((xctlp = hci1394_alloc_xfer_ctl(wvp, 1)) == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_2(hci1394_bld_recv_pkt_desc_mem_alloc_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: for xfer_ctl", tnf_opaque, - ixl_commandp, wvp->ixl_cur_xfer_stp); - TNF_PROBE_0_DEBUG(hci1394_bld_recv_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } @@ -1550,9 +1336,6 @@ hci1394_bld_recv_pkt_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate and copy descriptor block to dma memory */ if (hci1394_bld_dma_mem_desc_blk(wvp, &dma_descp, &dma_desc_bound) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(hci1394_bld_recv_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above function call */ return; } @@ -1565,9 +1348,6 @@ hci1394_bld_recv_pkt_desc(hci1394_comp_ixl_vars_t *wvp) xctlp->dma[0].dma_descp = dma_descp + (wvp->xfer_bufcnt - 1) * sizeof (hci1394_desc_t); xctlp->dma[0].dma_buf = &wvp->dma_currentp->mem; - - TNF_PROBE_0_DEBUG(hci1394_bld_recv_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -1588,9 +1368,6 @@ hci1394_bld_recv_buf_ppb_desc(hci1394_comp_ixl_vars_t *wvp) uint32_t ii; hci1394_desc_t *wv_descp; /* shorthand to local descriptor */ - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_ppb_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - local_ixl_cur_xfer_stp = (ixl1394_xfer_buf_t *)wvp->ixl_cur_xfer_stp; /* determine number and size of pkt desc blocks to create */ @@ -1599,15 +1376,7 @@ hci1394_bld_recv_buf_ppb_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate an xfer_ctl struct including pktcnt xfer_ctl_dma structs */ if ((xctlp = hci1394_alloc_xfer_ctl(wvp, pktcnt)) == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_2(hci1394_bld_recv_buf_ppb_desc_mem_alloc_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: for xfer_ctl", tnf_opaque, - ixl_commandp, wvp->ixl_cur_xfer_stp); - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_ppb_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } @@ -1639,12 +1408,6 @@ hci1394_bld_recv_buf_ppb_desc(hci1394_comp_ixl_vars_t *wvp) DESC_ST_RESCOUNT_MASK; wvp->descriptors++; - /* useful debug trace info - IXL command, and packet count and size */ - TNF_PROBE_3_DEBUG(hci1394_bld_recv_buf_ppb_desc_recv_buf_info, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_opaque, ixl_commandp, - wvp->ixl_cur_xfer_stp, tnf_int, pkt_count, pktcnt, tnf_int, - pkt_size, pktsize); - /* * generate as many contiguous descriptor blocks as there are * recv pkts @@ -1656,14 +1419,6 @@ hci1394_bld_recv_buf_ppb_desc(hci1394_comp_ixl_vars_t *wvp) /* check and perform any required hci cache flush */ if (hci1394_flush_end_desc_check(wvp, ii) != DDI_SUCCESS) { - TNF_PROBE_1_DEBUG( - hci1394_bld_recv_buf_ppb_desc_fl_error, - HCI1394_TNF_HAL_INFO_ISOCH, "", tnf_int, - for_ii, ii); - TNF_PROBE_0_DEBUG( - hci1394_bld_recv_buf_ppb_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -1672,10 +1427,6 @@ hci1394_bld_recv_buf_ppb_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate and copy descriptor block to dma memory */ if (hci1394_bld_dma_mem_desc_blk(wvp, &dma_descp, &dma_desc_bound) != DDI_SUCCESS) { - - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_ppb_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -1692,8 +1443,6 @@ hci1394_bld_recv_buf_ppb_desc(hci1394_comp_ixl_vars_t *wvp) wvp->descriptor_block[wvp->descriptors - 1].data_addr += pktsize; } - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_ppb_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -1710,23 +1459,12 @@ hci1394_bld_recv_buf_fill_desc(hci1394_comp_ixl_vars_t *wvp) uint32_t wait_for_sync; ixl1394_xfer_buf_t *local_ixl_cur_xfer_stp; - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_fill_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - local_ixl_cur_xfer_stp = (ixl1394_xfer_buf_t *)wvp->ixl_cur_xfer_stp; /* allocate an xfer_ctl struct including 1 xfer_ctl_dma structs */ if ((xctlp = hci1394_alloc_xfer_ctl(wvp, 1)) == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_2(hci1394_bld_recv_buf_fill_desc_mem_alloc_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: xfer_ctl", tnf_opaque, - ixl_commandp, wvp->ixl_cur_xfer_stp); - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_fill_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } @@ -1764,9 +1502,6 @@ hci1394_bld_recv_buf_fill_desc(hci1394_comp_ixl_vars_t *wvp) /* check and perform any required hci cache flush */ if (hci1394_flush_end_desc_check(wvp, 0) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_fill_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -1774,9 +1509,6 @@ hci1394_bld_recv_buf_fill_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate and copy descriptor block to dma memory */ if (hci1394_bld_dma_mem_desc_blk(wvp, &dma_descp, &dma_desc_bound) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_fill_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -1788,9 +1520,6 @@ hci1394_bld_recv_buf_fill_desc(hci1394_comp_ixl_vars_t *wvp) xctlp->dma[0].dma_bound = dma_desc_bound; xctlp->dma[0].dma_descp = dma_descp; xctlp->dma[0].dma_buf = &wvp->dma_currentp->mem; - - TNF_PROBE_0_DEBUG(hci1394_bld_recv_buf_fill_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -1807,54 +1536,25 @@ hci1394_bld_xmit_pkt_desc(hci1394_comp_ixl_vars_t *wvp) uint32_t dma_desc_bound; uint32_t ii; - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_pkt_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * is error if number of descriptors to be built exceeds maximum * descriptors allowed in a descriptor block. Add 2 for the overhead * of the OMORE-Immediate. */ if ((wvp->descriptors + 2 + wvp->xfer_bufcnt) > HCI1394_DESC_MAX_Z) { - wvp->dma_bld_error = IXL1394_EFRAGMENT_OFLO; - - TNF_PROBE_3(hci1394_bld_xmit_pkt_desc_fragment_oflo_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EFRAGMENT_OFLO", tnf_opaque, ixl_commandp, - wvp->ixl_cur_xfer_stp, tnf_int, frag_count, - wvp->descriptors + 2 + wvp->xfer_bufcnt); - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } /* is error if total packet length exceeds 0xFFFF */ if (wvp->xfer_pktlen > 0xFFFF) { - wvp->dma_bld_error = IXL1394_EPKTSIZE_MAX_OFLO; - - TNF_PROBE_3(hci1394_bld_xmit_pkt_desc_packet_oflo_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EPKTSIZE_MAX_OFLO", tnf_opaque, ixl_commandp, - wvp->ixl_cur_xfer_stp, tnf_int, total_pktlen, - wvp->xfer_pktlen); - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } /* allocate an xfer_ctl struct, including 1 xfer_ctl_dma struct */ if ((xctlp = hci1394_alloc_xfer_ctl(wvp, 1)) == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_2(hci1394_bld_xmit_pkt_desc_mem_alloc_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: for xfer_ctl", tnf_opaque, - ixl_commandp, wvp->ixl_cur_cmdp); - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } @@ -1907,9 +1607,6 @@ hci1394_bld_xmit_pkt_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate and copy descriptor block to dma memory */ if (hci1394_bld_dma_mem_desc_blk(wvp, &dma_descp, &dma_desc_bound) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -1922,9 +1619,6 @@ hci1394_bld_xmit_pkt_desc(hci1394_comp_ixl_vars_t *wvp) xctlp->dma[0].dma_descp = dma_descp + (wvp->xfer_bufcnt + 1) * sizeof (hci1394_desc_t); xctlp->dma[0].dma_buf = &wvp->dma_currentp->mem; - - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_pkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -1944,9 +1638,6 @@ hci1394_bld_xmit_buf_desc(hci1394_comp_ixl_vars_t *wvp) uint32_t pktcnt; uint32_t ii; - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_buf_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - local_ixl_cur_xfer_stp = (ixl1394_xfer_buf_t *)wvp->ixl_cur_xfer_stp; /* determine number and size of pkt desc blocks to create */ @@ -1955,15 +1646,7 @@ hci1394_bld_xmit_buf_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate an xfer_ctl struct including pktcnt xfer_ctl_dma structs */ if ((xctlp = hci1394_alloc_xfer_ctl(wvp, pktcnt)) == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_2(hci1394_bld_xmit_buf_desc_mem_alloc_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: for xfer_ctl", tnf_opaque, - ixl_commandp, wvp->ixl_cur_cmdp); - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_buf_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } @@ -2016,10 +1699,6 @@ hci1394_bld_xmit_buf_desc(hci1394_comp_ixl_vars_t *wvp) /* check and perform any required hci cache flush */ if (hci1394_flush_end_desc_check(wvp, ii) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG( - hci1394_bld_xmit_buf_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -2028,9 +1707,6 @@ hci1394_bld_xmit_buf_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate and copy descriptor block to dma memory */ if (hci1394_bld_dma_mem_desc_blk(wvp, &dma_descp, &dma_desc_bound) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_buf_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -2048,8 +1724,6 @@ hci1394_bld_xmit_buf_desc(hci1394_comp_ixl_vars_t *wvp) wvp->descriptor_block[wvp->descriptors - 1].data_addr += pktsize; } - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_buf_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -2074,9 +1748,6 @@ hci1394_bld_xmit_hdronly_nopkt_desc(hci1394_comp_ixl_vars_t *wvp) uint32_t repcnt; uint32_t ii; - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_hdronly_nopkt_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* determine # of instances of output hdronly/nopkt to generate */ repcnt = ((ixl1394_xmit_special_t *)wvp->ixl_cur_xfer_stp)->count; @@ -2088,12 +1759,6 @@ hci1394_bld_xmit_hdronly_nopkt_desc(hci1394_comp_ixl_vars_t *wvp) wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - TNF_PROBE_2(hci1394_bld_xmit_hdronly_nopkt_desc_mem_alloc_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL EMEM_ALLOC_FAIL: for xfer_ctl", tnf_opaque, - ixl_commandp, wvp->ixl_cur_cmdp); - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_hdronly_nopkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return; } @@ -2162,10 +1827,6 @@ hci1394_bld_xmit_hdronly_nopkt_desc(hci1394_comp_ixl_vars_t *wvp) /* check and perform any required hci cache flush */ if (hci1394_flush_end_desc_check(wvp, ii) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG( - hci1394_bld_xmit_hdronly_nopkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -2174,10 +1835,6 @@ hci1394_bld_xmit_hdronly_nopkt_desc(hci1394_comp_ixl_vars_t *wvp) /* allocate and copy descriptor block to dma memory */ if (hci1394_bld_dma_mem_desc_blk(wvp, &dma_descp, &dma_desc_bound) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG( - hci1394_bld_xmit_hdronly_nopkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return; } @@ -2190,8 +1847,6 @@ hci1394_bld_xmit_hdronly_nopkt_desc(hci1394_comp_ixl_vars_t *wvp) xctlp->dma[ii].dma_descp = dma_descp + sizeof (hci1394_desc_t); xctlp->dma[ii].dma_buf = &wvp->dma_currentp->mem; } - TNF_PROBE_0_DEBUG(hci1394_bld_xmit_hdronly_nopkt_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -2204,19 +1859,9 @@ hci1394_bld_dma_mem_desc_blk(hci1394_comp_ixl_vars_t *wvp, caddr_t *dma_descpp, { uint32_t dma_bound; - TNF_PROBE_0_DEBUG(hci1394_bld_dma_mem_desc_blk_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* set internal error if no descriptor blocks to build */ if (wvp->descriptors == 0) { - wvp->dma_bld_error = IXL1394_EINTERNAL_ERROR; - - TNF_PROBE_1(hci1394_bld_dma_mem_desc_blk_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_INTERNAL_ERROR: no descriptors to build"); - TNF_PROBE_0_DEBUG(hci1394_bld_dma_mem_desc_blk_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -2225,14 +1870,7 @@ hci1394_bld_dma_mem_desc_blk(hci1394_comp_ixl_vars_t *wvp, caddr_t *dma_descpp, sizeof (hci1394_desc_t), &dma_bound); if (*dma_descpp == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_1(hci1394_bld_dma_mem_desc_blk_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: for descriptors"); - TNF_PROBE_0_DEBUG(hci1394_bld_dma_mem_desc_blk_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } #ifdef _KERNEL @@ -2250,9 +1888,6 @@ hci1394_bld_dma_mem_desc_blk(hci1394_comp_ixl_vars_t *wvp, caddr_t *dma_descpp, */ *dma_desc_bound = (dma_bound & ~DESC_Z_MASK) | wvp->descriptors; - TNF_PROBE_0_DEBUG(hci1394_bld_dma_mem_desc_blk_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - return (DDI_SUCCESS); } @@ -2266,9 +1901,6 @@ hci1394_set_xmit_pkt_hdr(hci1394_comp_ixl_vars_t *wvp) uint16_t tag; uint16_t sync; - TNF_PROBE_0_DEBUG(hci1394_set_xmit_pkt_hdr_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * choose tag and sync bits for header either from default values or * from currently active set tag and sync IXL command @@ -2296,9 +1928,6 @@ hci1394_set_xmit_pkt_hdr(hci1394_comp_ixl_vars_t *wvp) DESC_PKT_TCODE_SHIFT) | (sync << DESC_PKT_SY_SHIFT); wvp->xmit_pkthdr2 = wvp->xfer_pktlen << DESC_PKT_DATALEN_SHIFT; - - TNF_PROBE_0_DEBUG(hci1394_set_xmit_pkt_hdr_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -2313,9 +1942,6 @@ hci1394_set_xmit_skip_mode(hci1394_comp_ixl_vars_t *wvp) { int err; - TNF_PROBE_0_DEBUG(hci1394_set_xmit_skip_mode_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - if (wvp->ixl_setskipmode_cmdp == NULL) { wvp->skipmode = wvp->default_skipmode; wvp->skiplabelp = wvp->default_skiplabelp; @@ -2328,12 +1954,6 @@ hci1394_set_xmit_skip_mode(hci1394_comp_ixl_vars_t *wvp) err = hci1394_ixl_find_next_exec_xfer(wvp->skiplabelp, NULL, &wvp->skipxferp); if (err == DDI_FAILURE) { - TNF_PROBE_2(hci1394_set_xmit_skip_mode_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "IXL1394_ENO_DATA_PKTS: " - "label<->jump loop detected for skiplabel " - "w/no xfers", tnf_opaque, setskip_cmdp, - wvp->ixl_setskipmode_cmdp); wvp->skipxferp = NULL; wvp->dma_bld_error = IXL1394_ENO_DATA_PKTS; } @@ -2341,8 +1961,6 @@ hci1394_set_xmit_skip_mode(hci1394_comp_ixl_vars_t *wvp) wvp->ixl_setskipmode_cmdp->compiler_privatep = (void *)wvp->skipxferp; } - TNF_PROBE_0_DEBUG(hci1394_set_xmit_skip_mode_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -2354,9 +1972,6 @@ hci1394_set_xmit_skip_mode(hci1394_comp_ixl_vars_t *wvp) static void hci1394_set_xmit_storevalue_desc(hci1394_comp_ixl_vars_t *wvp) { - TNF_PROBE_0_DEBUG(hci1394_set_xmit_storevalue_desc_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - wvp->descriptors++; HCI1394_INIT_IT_STORE(&wvp->descriptor_block[wvp->descriptors - 1], @@ -2365,9 +1980,6 @@ hci1394_set_xmit_storevalue_desc(hci1394_comp_ixl_vars_t *wvp) wvp->storevalue_bufp; wvp->descriptor_block[wvp->descriptors - 1].branch = 0; wvp->descriptor_block[wvp->descriptors - 1].status = 0; - - TNF_PROBE_0_DEBUG(hci1394_set_xmit_storevalue_desc_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -2380,16 +1992,9 @@ static int hci1394_set_next_xfer_buf(hci1394_comp_ixl_vars_t *wvp, uint32_t bufp, uint16_t size) { - TNF_PROBE_0_DEBUG(hci1394_set_next_xfer_buf_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* error if buffer pointer is null (size may be 0) */ if (bufp == 0) { - wvp->dma_bld_error = IXL1394_ENULL_BUFFER_ADDR; - - TNF_PROBE_0_DEBUG(hci1394_set_next_xfer_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -2398,15 +2003,7 @@ hci1394_set_next_xfer_buf(hci1394_comp_ixl_vars_t *wvp, uint32_t bufp, /* error if exceeds maximum xfer buffer components allowed */ if (wvp->xfer_bufcnt > HCI1394_DESC_MAX_Z) { - wvp->dma_bld_error = IXL1394_EFRAGMENT_OFLO; - - TNF_PROBE_2(hci1394_set_next_xfer_buf_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EFRAGMENT_OFLO", tnf_int, frag_count, - wvp->xfer_bufcnt); - TNF_PROBE_0_DEBUG(hci1394_set_next_xfer_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -2417,8 +2014,6 @@ hci1394_set_next_xfer_buf(hci1394_comp_ixl_vars_t *wvp, uint32_t bufp, /* accumulate total packet length */ wvp->xfer_pktlen += size; - TNF_PROBE_0_DEBUG(hci1394_set_next_xfer_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -2437,28 +2032,18 @@ hci1394_set_next_xfer_buf(hci1394_comp_ixl_vars_t *wvp, uint32_t bufp, static int hci1394_flush_end_desc_check(hci1394_comp_ixl_vars_t *wvp, uint32_t count) { - TNF_PROBE_0_DEBUG(hci1394_flush_end_desc_check_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - if ((count != 0) || ((wvp->xfer_hci_flush & (UPDATEABLE_XFER | UPDATEABLE_SET | INITIATING_LBL)) == 0)) { if (wvp->xfer_hci_flush & UPDATEABLE_JUMP) { if (hci1394_flush_hci_cache(wvp) != DDI_SUCCESS) { - - TNF_PROBE_0_DEBUG( - hci1394_flush_end_desc_check_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* wvp->dma_bld_error is set by above call */ return (DDI_FAILURE); } } } - TNF_PROBE_0_DEBUG(hci1394_flush_end_desc_check_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -2524,24 +2109,12 @@ hci1394_flush_hci_cache(hci1394_comp_ixl_vars_t *wvp) { uint32_t dma_bound; - TNF_PROBE_0_DEBUG(hci1394_flush_hci_cache_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - if (hci1394_alloc_dma_mem(wvp, sizeof (hci1394_desc_t), &dma_bound) == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_1(hci1394_flush_hci_cache_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: for flush_hci_cache"); - TNF_PROBE_0_DEBUG(hci1394_flush_hci_cache_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_flush_hci_cache_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -2559,26 +2132,12 @@ hci1394_alloc_storevalue_dma_mem(hci1394_comp_ixl_vars_t *wvp) { uint32_t dma_bound; - TNF_PROBE_0_DEBUG(hci1394_alloc_storevalue_dma_mem_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - if (hci1394_alloc_dma_mem(wvp, sizeof (hci1394_desc_t), &dma_bound) == NULL) { - wvp->dma_bld_error = IXL1394_EMEM_ALLOC_FAIL; - - TNF_PROBE_2(hci1394_bld_alloc_storevalue_dma_mem_alloc_fail, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "IXL1394_EMEM_ALLOC_FAIL: for storevalue dma", - tnf_opaque, ixl_commandp, wvp->ixl_cur_cmdp); - TNF_PROBE_0_DEBUG(hci1394_alloc_storevalue_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (0); } - TNF_PROBE_0_DEBUG(hci1394_alloc_storevalue_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* return bound address of allocated memory */ return (dma_bound); } @@ -2593,9 +2152,6 @@ hci1394_alloc_xfer_ctl(hci1394_comp_ixl_vars_t *wvp, uint32_t dmacnt) { hci1394_xfer_ctl_t *xcsp; - TNF_PROBE_0_DEBUG(hci1394_alloc_xfer_ctl_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * allocate an xfer_ctl struct which includes dmacnt of * xfer_ctl_dma structs @@ -2605,8 +2161,6 @@ hci1394_alloc_xfer_ctl(hci1394_comp_ixl_vars_t *wvp, uint32_t dmacnt) (sizeof (hci1394_xfer_ctl_t) + (dmacnt - 1) * sizeof (hci1394_xfer_ctl_dma_t)), KM_NOSLEEP)) == NULL) { - TNF_PROBE_0_DEBUG(hci1394_alloc_xfer_ctl_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (NULL); } #else @@ -2617,9 +2171,6 @@ hci1394_alloc_xfer_ctl(hci1394_comp_ixl_vars_t *wvp, uint32_t dmacnt) if ((xcsp = (hci1394_xfer_ctl_t *)calloc(1, sizeof (hci1394_xfer_ctl_t) + (dmacnt - 1) * sizeof (hci1394_xfer_ctl_dma_t))) == NULL) { - - TNF_PROBE_0_DEBUG(hci1394_alloc_xfer_ctl_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (NULL); } #endif @@ -2637,9 +2188,6 @@ hci1394_alloc_xfer_ctl(hci1394_comp_ixl_vars_t *wvp, uint32_t dmacnt) wvp->xcs_currentp = xcsp; } - TNF_PROBE_0_DEBUG(hci1394_alloc_xfer_ctl_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* return allocated xfer_ctl structure */ return (xcsp); } @@ -2658,9 +2206,6 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size, void *dma_mem_ret; int ret; - TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * if no dma has been allocated or current request exceeds * remaining memory @@ -2675,9 +2220,6 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size, if ((dma_new = (hci1394_idma_desc_mem_t *) kmem_zalloc(sizeof (hci1394_idma_desc_mem_t), KM_NOSLEEP)) == NULL) { - - TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (NULL); } @@ -2723,8 +2265,6 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size, kmem_free(dma_new, sizeof (hci1394_idma_desc_mem_t)); - TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (NULL); } @@ -2734,8 +2274,6 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size, kmem_free(dma_new, sizeof (hci1394_idma_desc_mem_t)); - TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (NULL); } dma_new->offset = 0; @@ -2745,16 +2283,12 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size, /* allocate another dma_desc_mem struct */ if ((dma_new = (hci1394_idma_desc_mem_t *) calloc(1, sizeof (hci1394_idma_desc_mem_t))) == NULL) { - TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (NULL); } dma_new->mem.bi_dma_handle = NULL; dma_new->mem.bi_handle = NULL; if ((dma_new->mem.bi_kaddr = (caddr_t)calloc(1, HCI1394_IXL_PAGESIZE)) == NULL) { - TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (NULL); } dma_new->mem.bi_cookie.dmac_address = @@ -2780,8 +2314,6 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size, wvp->dma_currentp->used; wvp->dma_currentp->used += size; - TNF_PROBE_0_DEBUG(hci1394_alloc_dma_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (dma_mem_ret); } @@ -2796,9 +2328,6 @@ hci1394_alloc_dma_mem(hci1394_comp_ixl_vars_t *wvp, uint32_t size, static boolean_t hci1394_is_opcode_valid(uint16_t ixlopcode) { - TNF_PROBE_0_DEBUG(hci1394_is_opcode_bad_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* if it's not one we know about, then it's bad */ switch (ixlopcode) { case IXL1394_OP_LABEL: @@ -2828,19 +2357,8 @@ hci1394_is_opcode_valid(uint16_t ixlopcode) case IXL1394_OP_SEND_BUF_U: case IXL1394_OP_SET_TAGSYNC_U: case IXL1394_OP_SET_SKIPMODE_U: - TNF_PROBE_1_DEBUG(hci1394_is_opcode_valid_enter, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "ixl opcode is valid"); - TNF_PROBE_0_DEBUG(hci1394_is_opcode_bad_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (B_TRUE); default: - TNF_PROBE_2(hci1394_is_opcode_valid_enter, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "ixl opcode is NOT valid", tnf_opaque, ixl_opcode, - ixlopcode); - TNF_PROBE_0_DEBUG(hci1394_is_opcode_valid_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (B_FALSE); } } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_isr.c b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_isr.c index 886b8565f8..fa6ab50bf0 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_isr.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_isr.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_ixl_isr.c * Isochronous IXL Interrupt Service Routines. @@ -37,9 +35,6 @@ #include <sys/types.h> #include <sys/conf.h> - -#include <sys/tnf_probe.h> - #include <sys/1394/h1394.h> #include <sys/1394/ixl1394.h> #include <sys/1394/adapters/hci1394.h> @@ -70,9 +65,6 @@ hci1394_ixl_interrupt(hci1394_state_t *soft_statep, uint_t status; int retcode; - TNF_PROBE_0_DEBUG(hci1394_ixl_interrupt_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - status = 1; /* acquire the interrupt processing context mutex */ @@ -85,32 +77,18 @@ hci1394_ixl_interrupt(hci1394_state_t *soft_statep, if (ctxtp->intr_flags & HCI1394_ISO_CTXT_INUPDATE) { retcode = HCI1394_IXL_INTR_INUPDATE; status = 0; - TNF_PROBE_1_DEBUG(hci1394_ixl_interrupt_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "HCI1394_IXL_INTR_INUPDATE"); - } else if (ctxtp->intr_flags & HCI1394_ISO_CTXT_ININTR) { /* else fatal error if inter processing already in progress */ retcode = HCI1394_IXL_INTR_ININTR; status = 0; - TNF_PROBE_1(hci1394_ixl_interrupt_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "HCI1394_IXL_INTR_ININTR"); - } else if (ctxtp->intr_flags & HCI1394_ISO_CTXT_INCALL) { /* else fatal error if callback in progress flag is set */ retcode = HCI1394_IXL_INTR_INCALL; status = 0; - TNF_PROBE_1_DEBUG(hci1394_ixl_interrupt_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "HCI1394_IXL_INTR_INCALL"); } else if (!in_stop && (ctxtp->intr_flags & HCI1394_ISO_CTXT_STOP)) { /* context is being stopped */ retcode = HCI1394_IXL_INTR_STOP; status = 0; - TNF_PROBE_1_DEBUG(hci1394_ixl_interrupt_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "HCI1394_IXL_INTR_STOP"); } /* @@ -144,9 +122,6 @@ hci1394_ixl_interrupt(hci1394_state_t *soft_statep, if (retcode == HCI1394_IXL_INTR_DMALOST) { hci1394_do_stop(soft_statep, ctxtp, B_TRUE, ID1394_FAIL); } - - TNF_PROBE_0_DEBUG(hci1394_ixl_interrupt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -170,9 +145,6 @@ hci1394_ixl_dma_sync(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp) void (*callback)(opaque_t, struct ixl1394_callback *); - TNF_PROBE_0_DEBUG(hci1394_ixl_dma_sync_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - ASSERT(MUTEX_NOT_HELD(&ctxtp->intrprocmutex)); /* xfer start ixl cmd where last left off */ @@ -204,8 +176,6 @@ hci1394_ixl_dma_sync(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp) ixlp, &ixlnextp, ×tamp, &donecode); if (isdone == B_TRUE) { - TNF_PROBE_0_DEBUG(hci1394_ixl_dma_sync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (donecode); } @@ -265,9 +235,6 @@ hci1394_ixl_dma_sync(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp) */ if ((ixlp != NULL) && (ixlp->ixl_opcode == IXL1394_OP_JUMP_U)) { ctxtp->ixl_execp = ixlp; - TNF_PROBE_1_DEBUG(hci1394_ixl_dma_sync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "INTR_NOERROR"); return (HCI1394_IXL_INTR_NOERROR); } @@ -281,15 +248,10 @@ hci1394_ixl_dma_sync(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp) /* return stopped status if at end of IXL cmds & context stopped */ if (HCI1394_ISOCH_CTXT_ACTIVE(soft_statep, ctxtp) == 0) { - TNF_PROBE_1_DEBUG(hci1394_ixl_dma_sync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "INTR_DMASTOP"); return (HCI1394_IXL_INTR_DMASTOP); } /* else interrupt processing is lost */ - TNF_PROBE_1_DEBUG(hci1394_ixl_dma_sync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, "INTR_DMALOST"); return (HCI1394_IXL_INTR_DMALOST); } @@ -318,10 +280,6 @@ hci1394_ixl_intr_check_xfer(hci1394_state_t *soft_statep, uint16_t ixldepth; uint16_t ixlopcode; - - TNF_PROBE_0_DEBUG(hci1394_ixl_intr_check_xfer_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - *donecodep = 0; dma_advances = 0; ixldepth = ctxtp->ixl_exec_depth; @@ -390,11 +348,6 @@ hci1394_ixl_intr_check_xfer(hci1394_state_t *soft_statep, * processing is lost */ *donecodep = HCI1394_IXL_INTR_DMALOST; - - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "INTR_DMALOST"); return (B_TRUE); } } @@ -414,10 +367,6 @@ hci1394_ixl_intr_check_xfer(hci1394_state_t *soft_statep, ctxtp->rem_noadv_intrs = 0; *donecodep = HCI1394_IXL_INTR_DMASTOP; - - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "INTR_DMASTOP"); return (B_TRUE); } @@ -441,11 +390,6 @@ hci1394_ixl_intr_check_xfer(hci1394_state_t *soft_statep, } *donecodep = HCI1394_IXL_INTR_NOERROR; - - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "INTR_NOERROR"); return (B_TRUE); } @@ -473,19 +417,10 @@ hci1394_ixl_intr_check_xfer(hci1394_state_t *soft_statep, */ if (ctxtp->rem_noadv_intrs == 0) { *donecodep = HCI1394_IXL_INTR_NOADV; - - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "INTR_NOADV"); return (B_TRUE); } *donecodep = HCI1394_IXL_INTR_NOERROR; - - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "INTR_NOERROR2"); return (B_TRUE); } @@ -521,9 +456,6 @@ hci1394_ixl_intr_check_xfer(hci1394_state_t *soft_statep, ctxtp->rem_noadv_intrs = ctxtp->max_noadv_intrs; } - TNF_PROBE_0_DEBUG(hci1394_ixl_intr_check_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* continue to process next IXL command */ return (B_FALSE); } @@ -546,7 +478,6 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, uint32_t desc_status; hci1394_desc_t *hcidescp; off_t hcidesc_off; - int err; uint32_t dma_cmd_cur_loc; uint32_t dma_cmd_last_loc; uint32_t dma_loc_check_enabled; @@ -559,9 +490,6 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, ixl1394_command_t *skipdestp; ixl1394_command_t *skipxferp; - TNF_PROBE_0_DEBUG(hci1394_ixl_intr_check_done_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * start looking through the IXL list from the xfer start command where * we last left off (for composite opcodes, need to start from the @@ -607,15 +535,9 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, ((dma_cmd_cur_loc >= dmastartp) && (dma_cmd_cur_loc < dmaendp))) { if (HCI1394_ISOCH_CTXT_ACTIVE(soft_statep, ctxtp) == 0) { - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_STOP"); return (IXL_CHECK_STOP); } - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_DONE"); return (IXL_CHECK_DONE); } @@ -629,21 +551,12 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, * else return location indeterminate */ if (HCI1394_ISOCH_CTXT_ACTIVE(soft_statep, ctxtp) == 0) { - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_STOP"); return (IXL_CHECK_STOP); } if (!dma_loc_check_enabled) { - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_DONE"); return (IXL_CHECK_DONE); } - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_LOST"); return (IXL_CHECK_LOST); } @@ -657,13 +570,8 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, hcidesc_off = (off_t)hcidescp - (off_t)dma->dma_buf->bi_kaddr; /* Sync the descriptor before we get the status */ - err = ddi_dma_sync(dma_hdl, hcidesc_off, sizeof (hci1394_desc_t), + (void) ddi_dma_sync(dma_hdl, hcidesc_off, sizeof (hci1394_desc_t), DDI_DMA_SYNC_FORCPU); - if (err != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_ixl_intr_check_done_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "dma_sync() failed"); - } desc_status = ddi_get32(acc_hdl, &hcidescp->status); if ((desc_status & DESC_XFER_ACTIVE_MASK) != 0) { @@ -672,9 +580,6 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, * if status is now set here, return skipped, to cause calling * function to continue, even though location hasn't changed */ - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_SKIP"); return (IXL_CHECK_SKIP); } @@ -722,24 +627,13 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, */ if (HCI1394_ISOCH_CTXT_ACTIVE(soft_statep, ctxtp) == 0) { - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "CHECK_STOP"); return (IXL_CHECK_STOP); } if (!dma_loc_check_enabled) { - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "CHECK_DONE"); return (IXL_CHECK_DONE); } - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_LOST"); return (IXL_CHECK_LOST); case IXL1394_SKIP_TO_NEXT: @@ -808,23 +702,12 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, */ if (HCI1394_ISOCH_CTXT_ACTIVE(soft_statep, ctxtp) == 0) { - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "CHECK_STOP"); return (IXL_CHECK_STOP); } if (!dma_loc_check_enabled) { - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "CHECK_DONE"); return (IXL_CHECK_DONE); } - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_LOST"); return (IXL_CHECK_LOST); } @@ -840,13 +723,8 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, hcidesc_off = (off_t)hcidescp - (off_t)dma->dma_buf->bi_kaddr; /* Sync the descriptor before we get the status */ - err = ddi_dma_sync(dma_hdl, hcidesc_off, + (void) ddi_dma_sync(dma_hdl, hcidesc_off, sizeof (hci1394_desc_t), DDI_DMA_SYNC_FORCPU); - if (err != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_ixl_intr_check_done_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "dma_sync() failed"); - } desc_status = ddi_get32(acc_hdl, &hcidescp->status); if ((desc_status & DESC_XFER_ACTIVE_MASK) != 0) { @@ -860,9 +738,6 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, ctxtp->ixl_execp = skipdestp; ctxtp->ixl_exec_depth = skipdepth; - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_SKIP"); return (IXL_CHECK_SKIP); } @@ -880,10 +755,6 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, /* if the context is stopped, return stopped */ if (HCI1394_ISOCH_CTXT_ACTIVE(soft_statep, ctxtp) == 0) { - TNF_PROBE_1_DEBUG( - hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", - tnf_string, msg, "CHECK STOP"); return (IXL_CHECK_STOP); } /* @@ -894,9 +765,6 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, ctxtp->ixl_execp = skipdestp; ctxtp->ixl_exec_depth = skipdepth; - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_SKIP"); return (IXL_CHECK_SKIP); } @@ -921,20 +789,12 @@ hci1394_ixl_intr_check_done(hci1394_state_t *soft_statep, */ if (HCI1394_ISOCH_CTXT_ACTIVE(soft_statep, ctxtp) == 0) { - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_STOP"); return (IXL_CHECK_STOP); } if (!dma_loc_check_enabled) { - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "CHECK_DONE"); return (IXL_CHECK_DONE); } - TNF_PROBE_1_DEBUG(hci1394_ixl_intr_check_done_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, "CHECK_LOST"); return (IXL_CHECK_LOST); } @@ -954,8 +814,6 @@ hci1394_isoch_cycle_inconsistent(hci1394_state_t *soft_statep) hci1394_iso_ctxt_t *ctxtp; /* current context */ ASSERT(soft_statep); - TNF_PROBE_0_DEBUG(hci1394_isoch_cycle_inconsistent_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); hci1394_ohci_intr_clear(soft_statep->ohci, OHCI_INTR_CYC_INCONSISTENT); @@ -1022,13 +880,7 @@ hci1394_isoch_cycle_inconsistent(hci1394_state_t *soft_statep) cmn_err(CE_NOTE, "!hci1394(%d): cycle_inconsistent interrupt " "disabled until next bus reset", soft_statep->drvinfo.di_instance); - TNF_PROBE_1(hci1394_isoch_cycle_inconsistent_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, msg, - "CYCLE_INCONSISTENT intr disabled until next bus reset"); } - - TNF_PROBE_0_DEBUG(hci1394_isoch_cycle_inconsistent_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } @@ -1047,8 +899,6 @@ hci1394_isoch_cycle_lost(hci1394_state_t *soft_statep) hci1394_iso_ctxt_t *ctxtp; /* current context */ ASSERT(soft_statep); - TNF_PROBE_0_DEBUG(hci1394_isoch_cycle_lost_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); hci1394_ohci_intr_clear(soft_statep->ohci, OHCI_INTR_CYC_LOST); @@ -1115,11 +965,5 @@ hci1394_isoch_cycle_lost(hci1394_state_t *soft_statep) cmn_err(CE_NOTE, "!hci1394(%d): cycle_lost interrupt " "disabled until next bus reset", soft_statep->drvinfo.di_instance); - TNF_PROBE_1(hci1394_isoch_cycle_lost_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, msg, - "CYCLE_LOST intr disabled until next bus reset"); } - - TNF_PROBE_0_DEBUG(hci1394_isoch_cycle_lost_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_misc.c b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_misc.c index 845f901898..18007a0d33 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_misc.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_misc.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_ixl_misc.c * Isochronous IXL miscellaneous routines. @@ -36,9 +34,6 @@ #include <sys/kmem.h> #include <sys/types.h> #include <sys/conf.h> - -#include <sys/tnf_probe.h> - #include <sys/1394/h1394.h> #include <sys/1394/ixl1394.h> #include <sys/1394/adapters/hci1394.h> @@ -70,9 +65,6 @@ hci1394_ixl_set_start(hci1394_iso_ctxt_t *ctxtp, ixl1394_command_t *ixlstp) ixl1394_command_t *ixl_exec_startp; - TNF_PROBE_0_DEBUG(hci1394_ixl_set_start_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* if ixl start command is null, use first compiled ixl command */ if (ixlstp == NULL) { ixlstp = ctxtp->ixl_firstp; @@ -84,8 +76,6 @@ hci1394_ixl_set_start(hci1394_iso_ctxt_t *ctxtp, ixl1394_command_t *ixlstp) */ if ((ixlstp != ctxtp->ixl_firstp) && (ixlstp->ixl_opcode != IXL1394_OP_LABEL)) { - TNF_PROBE_0_DEBUG(hci1394_ixl_set_start_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (-1); } @@ -107,14 +97,10 @@ hci1394_ixl_set_start(hci1394_iso_ctxt_t *ctxtp, ixl1394_command_t *ixlstp) ctxtp->ixl_execp = ixlstp; ctxtp->rem_noadv_intrs = ctxtp->max_noadv_intrs; - TNF_PROBE_0_DEBUG(hci1394_ixl_set_start_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (0); } /* else no executeable xfer command found, return error */ - TNF_PROBE_0_DEBUG(hci1394_ixl_set_start_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (1); } #ifdef _KERNEL @@ -134,9 +120,6 @@ hci1394_ixl_reset_status(hci1394_iso_ctxt_t *ctxtp) uint_t ixldepth; uint16_t timestamp; - TNF_PROBE_0_DEBUG(hci1394_ixl_reset_status_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - ixlnext = ctxtp->ixl_firstp; /* @@ -169,9 +152,6 @@ hci1394_ixl_reset_status(hci1394_iso_ctxt_t *ctxtp) ixldepth++; } } - - TNF_PROBE_0_DEBUG(hci1394_ixl_reset_status_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } #endif /* @@ -201,9 +181,6 @@ hci1394_ixl_find_next_exec_xfer(ixl1394_command_t *ixl_start, ixl1394_command_t *ixlp; int ii; - TNF_PROBE_0_DEBUG(hci1394_ixl_find_next_exec_xfer_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - ixlp = ixl_start; xferfound = B_FALSE; ii = HCI1394_IXL_MAX_SEQ_JUMPS; @@ -232,13 +209,6 @@ hci1394_ixl_find_next_exec_xfer(ixl1394_command_t *ixl_start, /* if exceeded tolerance, give up */ if (ii == 0) { - TNF_PROBE_1( - hci1394_ixl_find_next_exec_xfer_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "Infinite loop w/no xfers"); - TNF_PROBE_0_DEBUG( - hci1394_ixl_find_next_exec_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } continue; @@ -257,8 +227,6 @@ hci1394_ixl_find_next_exec_xfer(ixl1394_command_t *ixl_start, /* return ixl xfer start command found, if any */ *next_exec_ixlpp = ixlp; - TNF_PROBE_0_DEBUG(hci1394_ixl_find_next_exec_xfer_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } #ifdef _KERNEL @@ -279,10 +247,6 @@ hci1394_ixl_check_status(hci1394_xfer_ctl_dma_t *dma, uint16_t ixlopcode, ddi_dma_handle_t dma_hdl; uint32_t desc_status; uint32_t desc_hdr; - int err; - - TNF_PROBE_0_DEBUG(hci1394_ixl_check_status_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); /* last dma descriptor in descriptor block from dma structure */ hcidescp = (hci1394_desc_t *)(dma->dma_descp); @@ -294,13 +258,8 @@ hci1394_ixl_check_status(hci1394_xfer_ctl_dma_t *dma, uint16_t ixlopcode, if ((ixlopcode & IXL1394_OPF_ONXMIT) != 0) { /* Sync the descriptor before we get the status */ - err = ddi_dma_sync(dma_hdl, hcidesc_off, + (void) ddi_dma_sync(dma_hdl, hcidesc_off, sizeof (hci1394_desc_t), DDI_DMA_SYNC_FORCPU); - if (err != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_ixl_check_status_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "dma_sync() failed"); - } desc_status = ddi_get32(acc_hdl, &hcidescp->status); /* check if status is set in last dma descriptor in block */ @@ -320,21 +279,12 @@ hci1394_ixl_check_status(hci1394_xfer_ctl_dma_t *dma, uint16_t ixlopcode, ddi_put32(acc_hdl, &hcidescp->status, 0); /* Sync descriptor for device (status was cleared) */ - err = ddi_dma_sync(dma_hdl, hcidesc_off, + (void) ddi_dma_sync(dma_hdl, hcidesc_off, sizeof (hci1394_desc_t), DDI_DMA_SYNC_FORDEV); - if (err != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_ixl_check_status_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "dma_sync() failed"); - } - TNF_PROBE_0_DEBUG(hci1394_ixl_check_status_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (1); } /* else, return dma descriptor block status not set */ - TNF_PROBE_0_DEBUG(hci1394_ixl_check_status_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (0); } @@ -350,13 +300,8 @@ hci1394_ixl_check_status(hci1394_xfer_ctl_dma_t *dma, uint16_t ixlopcode, while (hcicnt-- != 0) { /* Sync the descriptor before we get the status */ - err = ddi_dma_sync(dma_hdl, hcidesc_off, + (void) ddi_dma_sync(dma_hdl, hcidesc_off, hcicnt * sizeof (hci1394_desc_t), DDI_DMA_SYNC_FORCPU); - if (err != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_ixl_check_status_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, errmsg, - "dma_sync() failed"); - } desc_hdr = ddi_get32(acc_hdl, &hcidescp->hdr); @@ -376,8 +321,6 @@ hci1394_ixl_check_status(hci1394_xfer_ctl_dma_t *dma, uint16_t ixlopcode, * descriptor block status set */ if (do_status_reset == B_FALSE) { - TNF_PROBE_0_DEBUG(hci1394_ixl_check_status_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (1); } @@ -389,28 +332,19 @@ hci1394_ixl_check_status(hci1394_xfer_ctl_dma_t *dma, uint16_t ixlopcode, ddi_put32(acc_hdl, &hcidescp->status, desc_status); /* Sync descriptor for device (status was cleared) */ - err = ddi_dma_sync(dma_hdl, hcidesc_off, + (void) ddi_dma_sync(dma_hdl, hcidesc_off, sizeof (hci1394_desc_t), DDI_DMA_SYNC_FORDEV); - if (err != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_ixl_check_status_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, - errmsg, "dma_sync() failed"); - } - TNF_PROBE_0_DEBUG(hci1394_ixl_check_status_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (1); } else { /* else, set to evaluate next descriptor. */ hcidescp++; hcidesc_off = (off_t)hcidescp - - (off_t)dma->dma_buf->bi_kaddr; + (off_t)dma->dma_buf->bi_kaddr; } } /* return input not complete status */ - TNF_PROBE_0_DEBUG(hci1394_ixl_check_status_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (0); } #endif @@ -421,14 +355,8 @@ hci1394_ixl_check_status(hci1394_xfer_ctl_dma_t *dma, uint16_t ixlopcode, void hci1394_ixl_cleanup(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp) { - TNF_PROBE_0_DEBUG(hci1394_ixl_cleanup_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - hci1394_delete_xfer_ctl((hci1394_xfer_ctl_t *)ctxtp->xcs_firstp); hci1394_delete_dma_desc_mem(soft_statep, ctxtp->dma_firstp); - - TNF_PROBE_0_DEBUG(hci1394_ixl_cleanup_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -444,9 +372,6 @@ hci1394_delete_dma_desc_mem(hci1394_state_t *soft_statep, { hci1394_idma_desc_mem_t *dma_next; - TNF_PROBE_0_DEBUG(hci1394_delete_dma_desc_mem_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - while (dma_firstp != NULL) { dma_next = dma_firstp->dma_nextp; #ifdef _KERNEL @@ -471,8 +396,6 @@ hci1394_delete_dma_desc_mem(hci1394_state_t *soft_statep, /* advance to next dma memory descriptor */ dma_firstp = dma_next; } - TNF_PROBE_0_DEBUG(hci1394_delete_dma_desc_mem_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } /* @@ -484,9 +407,6 @@ hci1394_delete_xfer_ctl(hci1394_xfer_ctl_t *xcsp) { hci1394_xfer_ctl_t *delp; - TNF_PROBE_0_DEBUG(hci1394_delete_xfer_ctl_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - while ((delp = xcsp) != NULL) { /* advance ptr to next xfer_ctl struct */ xcsp = xcsp->ctl_nextp; @@ -503,6 +423,4 @@ hci1394_delete_xfer_ctl(hci1394_xfer_ctl_t *xcsp) free(delp); #endif } - TNF_PROBE_0_DEBUG(hci1394_delete_xfer_ctl_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c index 45db7e614f..b33ba7213e 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_ixl_update.c @@ -34,9 +34,6 @@ #include <sys/types.h> #include <sys/conf.h> #include <sys/disp.h> - -#include <sys/tnf_probe.h> - #include <sys/1394/h1394.h> #include <sys/1394/ixl1394.h> /* IXL opcodes & data structs */ @@ -111,10 +108,6 @@ hci1394_ixl_update(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, int prepstatus; int ret; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - - /* save caller specified values in update work variables structure */ uv.soft_statep = soft_statep; uv.ctxtp = ctxtp; @@ -152,16 +145,9 @@ hci1394_ixl_update(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, /* if prep evaluation error, return failure */ if (prepstatus != IXL_PREP_SUCCESS) { - TNF_PROBE_1_DEBUG(hci1394_ixl_update_error, - HCI1394_TNF_HAL_ERROR_ISOCH, "", tnf_string, msg, - "IXL_PREP_FAILURE"); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } /* if no action or update done, return update successful */ - TNF_PROBE_0_DEBUG(hci1394_ixl_update_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -172,8 +158,6 @@ hci1394_ixl_update(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, /* error acquiring control of context - return */ *resultp = uv.upd_status; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -201,8 +185,6 @@ hci1394_ixl_update(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, } *resultp = uv.upd_status; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -217,8 +199,6 @@ hci1394_ixl_update(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, *resultp = uv.upd_status; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -246,8 +226,6 @@ hci1394_ixl_update(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, *resultp = uv.upd_status; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -257,8 +235,6 @@ hci1394_ixl_update(hci1394_state_t *soft_statep, hci1394_iso_ctxt_t *ctxtp, /* return update completion status */ *resultp = uv.upd_status; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_exit, HCI1394_TNF_HAL_STACK_ISOCH, - ""); return (DDI_SUCCESS); } @@ -275,9 +251,6 @@ hci1394_ixl_update_enable(hci1394_ixl_update_vars_t *uvp) boolean_t retry; uint_t remretries; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_enable_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - retry = B_TRUE; /* set arbitrary number of retries before giving up */ remretries = hci1394_upd_retries_before_fail; @@ -335,8 +308,6 @@ hci1394_ixl_update_enable(hci1394_ixl_update_vars_t *uvp) ASSERT(MUTEX_HELD(&uvp->ctxtp->intrprocmutex)); mutex_exit(&uvp->ctxtp->intrprocmutex); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_enable_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (status); } @@ -352,9 +323,6 @@ hci1394_ixl_update_endup(hci1394_ixl_update_vars_t *uvp) uint_t status; hci1394_iso_ctxt_t *ctxtp; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_endup_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - status = HCI1394_IXL_INTR_NOERROR; ctxtp = uvp->ctxtp; @@ -405,8 +373,6 @@ hci1394_ixl_update_endup(hci1394_ixl_update_vars_t *uvp) hci1394_do_stop(uvp->soft_statep, ctxtp, B_TRUE, ID1394_FAIL); } - TNF_PROBE_0_DEBUG(hci1394_ixl_update_endup_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (status); } @@ -419,17 +385,11 @@ hci1394_ixl_update_prepare(hci1394_ixl_update_vars_t *uvp) { int ret; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* both new and old ixl commands must be the same */ if (uvp->ixlnewp->ixl_opcode != uvp->ixloldp->ixl_opcode) { uvp->upd_status = IXL1394_EOPCODE_MISMATCH; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, msg, - "EOPCODE_MISMATCH"); return (IXL_PREP_FAILURE); } @@ -452,45 +412,33 @@ hci1394_ixl_update_prepare(hci1394_ixl_update_vars_t *uvp) old_callback_ixlp->callback = new_callback_ixlp->callback; /* nothing else to do, return with done ok status */ - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_SUCCESS); } case IXL1394_OP_JUMP_U: ret = hci1394_ixl_update_prep_jump(uvp); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (ret); case IXL1394_OP_SET_SKIPMODE_U: ret = hci1394_ixl_update_prep_set_skipmode(uvp); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (ret); case IXL1394_OP_SET_TAGSYNC_U: ret = hci1394_ixl_update_prep_set_tagsync(uvp); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (ret); case IXL1394_OP_RECV_PKT_U: case IXL1394_OP_RECV_PKT_ST_U: ret = hci1394_ixl_update_prep_recv_pkt(uvp); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (ret); case IXL1394_OP_RECV_BUF_U: ret = hci1394_ixl_update_prep_recv_buf(uvp); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (ret); case IXL1394_OP_SEND_PKT_U: @@ -498,23 +446,17 @@ hci1394_ixl_update_prepare(hci1394_ixl_update_vars_t *uvp) case IXL1394_OP_SEND_PKT_WHDR_ST_U: ret = hci1394_ixl_update_prep_send_pkt(uvp); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (ret); case IXL1394_OP_SEND_BUF_U: ret = hci1394_ixl_update_prep_send_buf(uvp); - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (ret); default: /* ixl command being updated must be one of above, else error */ uvp->upd_status = IXL1394_EOPCODE_DISALLOWED; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } } @@ -537,9 +479,6 @@ hci1394_ixl_update_prep_jump(hci1394_ixl_update_vars_t *uvp) uint32_t desc_hdr; int err; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_jump_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - old_jump_ixlp = (ixl1394_jump_t *)uvp->ixloldp; new_jump_ixlp = (ixl1394_jump_t *)uvp->ixlnewp; @@ -547,8 +486,6 @@ hci1394_ixl_update_prep_jump(hci1394_ixl_update_vars_t *uvp) if (new_jump_ixlp->label == old_jump_ixlp->label) { /* if none, return with done ok status */ - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_jump_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_SUCCESS); } @@ -559,9 +496,6 @@ hci1394_ixl_update_prep_jump(hci1394_ixl_update_vars_t *uvp) /* if not jumping to label, return an error */ uvp->upd_status = IXL1394_EJUMP_NOT_TO_LABEL; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prepare_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, errmsg, - "EJUMP_NOT_TO_LABEL"); return (IXL_PREP_FAILURE); } @@ -592,9 +526,6 @@ hci1394_ixl_update_prep_jump(hci1394_ixl_update_vars_t *uvp) /* if none, return an error */ uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prep_jump_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, errmsg, - "EORIG_IXL_CORRUPTED"); return (IXL_PREP_FAILURE); } @@ -614,9 +545,6 @@ hci1394_ixl_update_prep_jump(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prep_jump_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, errmsg, - "EINTERNAL_ERROR: dma_sync() failed"); return (IXL_PREP_FAILURE); } @@ -685,8 +613,6 @@ hci1394_ixl_update_prep_jump(hci1394_ixl_update_vars_t *uvp) } } } - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_jump_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_READY); } @@ -702,9 +628,6 @@ hci1394_ixl_update_prep_set_skipmode(hci1394_ixl_update_vars_t *uvp) ixl1394_command_t *ixlp; hci1394_xfer_ctl_t *xferctlp; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_skipmode_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - old_set_skipmode_ixlp = (ixl1394_set_skipmode_t *)uvp->ixloldp; new_set_skipmode_ixlp = (ixl1394_set_skipmode_t *)uvp->ixlnewp; @@ -716,11 +639,6 @@ hci1394_ixl_update_prep_set_skipmode(hci1394_ixl_update_vars_t *uvp) IXL1394_SKIP_TO_LABEL) || (old_set_skipmode_ixlp->label == new_set_skipmode_ixlp->label)) { - - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_prep_set_skipmode_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* No change, return with done ok status */ return (IXL_PREP_SUCCESS); } @@ -740,9 +658,6 @@ hci1394_ixl_update_prep_set_skipmode(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prep_set_skipmode_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, - errmsg, "EORIG_IXL_CORRUPTED"); return (IXL_PREP_FAILURE); } @@ -755,9 +670,6 @@ hci1394_ixl_update_prep_set_skipmode(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prep_set_skipmode_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, errmsg, - "EORIG_IXL_CORRUPTED"); return (IXL_PREP_FAILURE); } uvp->hci_offset = xferctlp->dma[0].dma_bound & DESC_Z_MASK; @@ -796,9 +708,6 @@ hci1394_ixl_update_prep_set_skipmode(hci1394_ixl_update_vars_t *uvp) /* return an error if invalid mode */ uvp->upd_status = IXL1394_EBAD_SKIPMODE; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prep_set_skipmode_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, - errmsg, "EBAD_SKIPMODE"); return (IXL_PREP_FAILURE); } @@ -813,9 +722,6 @@ hci1394_ixl_update_prep_set_skipmode(hci1394_ixl_update_vars_t *uvp) /* Error - not skipping to valid label */ uvp->upd_status = IXL1394_EBAD_SKIP_LABEL; - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_prep_set_skipmode_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -863,8 +769,6 @@ hci1394_ixl_update_prep_set_skipmode(hci1394_ixl_update_vars_t *uvp) uvp->skipaddr = xferctlp->dma[0].dma_bound; } } - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_skipmode_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_READY); } @@ -879,9 +783,6 @@ hci1394_ixl_update_prep_set_tagsync(hci1394_ixl_update_vars_t *uvp) ixl1394_set_tagsync_t *new_set_tagsync_ixlp; hci1394_xfer_ctl_t *xferctlp; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_tagsync_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - old_set_tagsync_ixlp = (ixl1394_set_tagsync_t *)uvp->ixloldp; new_set_tagsync_ixlp = (ixl1394_set_tagsync_t *)uvp->ixlnewp; @@ -889,9 +790,6 @@ hci1394_ixl_update_prep_set_tagsync(hci1394_ixl_update_vars_t *uvp) if ((new_set_tagsync_ixlp->tag == old_set_tagsync_ixlp->tag) && (new_set_tagsync_ixlp->sync == old_set_tagsync_ixlp->sync)) { - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_tagsync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* no change, return with done ok status */ return (IXL_PREP_SUCCESS); } @@ -910,16 +808,11 @@ hci1394_ixl_update_prep_set_tagsync(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_tagsync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } /* is IXL xfer command an IXL1394_OP_SEND_NO_PKT? */ if (uvp->ixlxferp->ixl_opcode == IXL1394_OP_SEND_NO_PKT) { - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_tagsync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* no update needed, return done ok status */ return (IXL_PREP_SUCCESS); } @@ -939,8 +832,6 @@ hci1394_ixl_update_prep_set_tagsync(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_tagsync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } uvp->hdr_offset = xferctlp->dma[0].dma_bound & DESC_Z_MASK; @@ -968,8 +859,6 @@ hci1394_ixl_update_prep_set_tagsync(hci1394_ixl_update_vars_t *uvp) uvp->ixldepth = 0; uvp->ixlcount = xferctlp->cnt; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_set_tagsync_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_READY); } @@ -990,9 +879,6 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp) uint32_t desc_hdr; int err; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_pkt_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - old_xfer_pkt_ixlp = (ixl1394_xfer_pkt_t *)uvp->ixloldp; new_xfer_pkt_ixlp = (ixl1394_xfer_pkt_t *)uvp->ixlnewp; @@ -1001,10 +887,6 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp) (new_xfer_pkt_ixlp->ixl_buf.ixldmac_addr == old_xfer_pkt_ixlp->ixl_buf.ixldmac_addr) && (new_xfer_pkt_ixlp->mem_bufp == old_xfer_pkt_ixlp->mem_bufp)) { - - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* no change. return with done ok status */ return (IXL_PREP_SUCCESS); } @@ -1015,8 +897,6 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EXFER_BUF_MISSING; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1030,12 +910,8 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp) uvp->ixloldp->compiler_privatep; if (uvp->ixlxferp == NULL) { - /* Error - no IXL xfer start command found */ uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } } else { @@ -1046,12 +922,8 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp) /* check that xfer_ctl is present in the IXL xfer start command */ if ((xferctlp = (hci1394_xfer_ctl_t *) uvp->ixlxferp->compiler_privatep) == NULL) { - /* Error - no xfer_ctl struct found */ uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1093,10 +965,6 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp) DDI_DMA_SYNC_FORCPU); if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prep_recv_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, errmsg, - "EINTERNAL_ERROR: dma_sync() failed"); return (IXL_PREP_FAILURE); } @@ -1108,8 +976,6 @@ hci1394_ixl_update_prep_recv_pkt(hci1394_ixl_update_vars_t *uvp) uvp->hcistatus = (uvp->bufsize << DESC_ST_RESCOUNT_SHIFT) & DESC_ST_RESCOUNT_MASK; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_READY); } @@ -1124,9 +990,6 @@ hci1394_ixl_update_prep_recv_buf(hci1394_ixl_update_vars_t *uvp) ixl1394_xfer_buf_t *new_xfer_buf_ixlp; hci1394_xfer_ctl_t *xferctlp; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_buf_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - old_xfer_buf_ixlp = (ixl1394_xfer_buf_t *)uvp->ixloldp; new_xfer_buf_ixlp = (ixl1394_xfer_buf_t *)uvp->ixlnewp; @@ -1139,10 +1002,6 @@ hci1394_ixl_update_prep_recv_buf(hci1394_ixl_update_vars_t *uvp) if (((uvp->ctxtp->ctxt_flags & HCI1394_ISO_CTXT_BFFILL) != 0) || (new_xfer_buf_ixlp->pkt_size == old_xfer_buf_ixlp->pkt_size)) { - - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* no change. return with done ok status */ return (IXL_PREP_SUCCESS); } @@ -1151,11 +1010,7 @@ hci1394_ixl_update_prep_recv_buf(hci1394_ixl_update_vars_t *uvp) /* if new IXL buffer addrs are null, return error */ if ((new_xfer_buf_ixlp->ixl_buf.ixldmac_addr == 0) || (new_xfer_buf_ixlp->mem_bufp == NULL)) { - uvp->upd_status = IXL1394_EXFER_BUF_MISSING; - - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1168,13 +1023,8 @@ hci1394_ixl_update_prep_recv_buf(hci1394_ixl_update_vars_t *uvp) if ((new_xfer_buf_ixlp->pkt_size == 0) || ((new_xfer_buf_ixlp->size / new_xfer_buf_ixlp->pkt_size) != (old_xfer_buf_ixlp->size / old_xfer_buf_ixlp->pkt_size))) { - /* count changes. return an error */ uvp->upd_status = IXL1394_EXFER_BUF_CNT_DIFF; - - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_prep_recv_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } } @@ -1185,12 +1035,8 @@ hci1394_ixl_update_prep_recv_buf(hci1394_ixl_update_vars_t *uvp) /* check that the xfer_ctl struct is present in IXL xfer command */ if ((xferctlp = (hci1394_xfer_ctl_t *)uvp->ixlxferp->compiler_privatep) == NULL) { - /* return an error if no xfer_ctl struct is found for command */ uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1215,8 +1061,6 @@ hci1394_ixl_update_prep_recv_buf(hci1394_ixl_update_vars_t *uvp) uvp->hcistatus = (uvp->bufsize << DESC_ST_RESCOUNT_SHIFT) & DESC_ST_RESCOUNT_MASK; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_recv_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_READY); } @@ -1238,9 +1082,6 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) uint32_t desc_hdr, desc_hdr2; int err; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - old_xfer_pkt_ixlp = (ixl1394_xfer_pkt_t *)uvp->ixloldp; new_xfer_pkt_ixlp = (ixl1394_xfer_pkt_t *)uvp->ixlnewp; @@ -1250,9 +1091,6 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) old_xfer_pkt_ixlp->ixl_buf.ixldmac_addr) && (new_xfer_pkt_ixlp->mem_bufp == old_xfer_pkt_ixlp->mem_bufp)) { - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* if none, return with done ok status */ return (IXL_PREP_SUCCESS); } @@ -1263,8 +1101,6 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EXFER_BUF_MISSING; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1274,8 +1110,6 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EPKT_HDR_MISSING; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1292,8 +1126,6 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) /* error if no IXL xfer start command found */ uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } } else { @@ -1311,8 +1143,6 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1357,9 +1187,6 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_1_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, "", tnf_string, errmsg, - "EINTERNAL_ERROR: dma_sync() failed"); return (IXL_PREP_FAILURE); } @@ -1380,15 +1207,11 @@ hci1394_ixl_update_prep_send_pkt(hci1394_ixl_update_vars_t *uvp) if (uvp->pkthdr2 > 0xFFFF) { uvp->upd_status = IXL1394_EPKTSIZE_MAX_OFLO; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } uvp->pkthdr2 = (uvp->pkthdr2 << DESC_PKT_DATALEN_SHIFT) & DESC_PKT_DATALEN_MASK; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_pkt_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_READY); } @@ -1403,9 +1226,6 @@ hci1394_ixl_update_prep_send_buf(hci1394_ixl_update_vars_t *uvp) ixl1394_xfer_buf_t *new_xfer_buf_ixlp; hci1394_xfer_ctl_t *xferctlp; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_buf_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - old_xfer_buf_ixlp = (ixl1394_xfer_buf_t *)uvp->ixloldp; new_xfer_buf_ixlp = (ixl1394_xfer_buf_t *)uvp->ixlnewp; @@ -1415,10 +1235,6 @@ hci1394_ixl_update_prep_send_buf(hci1394_ixl_update_vars_t *uvp) (new_xfer_buf_ixlp->ixl_buf.ixldmac_addr == old_xfer_buf_ixlp->ixl_buf.ixldmac_addr) && (new_xfer_buf_ixlp->mem_bufp == old_xfer_buf_ixlp->mem_bufp)) { - - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* no change, return with done ok status */ return (IXL_PREP_SUCCESS); } @@ -1429,8 +1245,6 @@ hci1394_ixl_update_prep_send_buf(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EXFER_BUF_MISSING; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1445,8 +1259,6 @@ hci1394_ixl_update_prep_send_buf(hci1394_ixl_update_vars_t *uvp) /* Error - new has different pkt count than old */ uvp->upd_status = IXL1394_EXFER_BUF_CNT_DIFF; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1463,8 +1275,6 @@ hci1394_ixl_update_prep_send_buf(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EORIG_IXL_CORRUPTED; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_FAILURE); } @@ -1502,8 +1312,6 @@ hci1394_ixl_update_prep_send_buf(hci1394_ixl_update_vars_t *uvp) uvp->pkthdr2 = (uvp->bufsize << DESC_PKT_DATALEN_SHIFT) & DESC_PKT_DATALEN_MASK; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_prep_send_buf_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (IXL_PREP_READY); } @@ -1523,9 +1331,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) ddi_dma_handle_t dma_hdl; int err; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - ctxtp = uvp->ctxtp; /* @@ -1538,9 +1343,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - return (DDI_FAILURE); } @@ -1584,8 +1386,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -1639,9 +1439,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } } @@ -1683,9 +1480,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } } @@ -1724,8 +1518,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -1741,8 +1533,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -1791,9 +1581,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -1821,9 +1608,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } } @@ -1868,8 +1652,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -1916,9 +1698,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -1937,9 +1716,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) if (err != DDI_SUCCESS) { uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG( - hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } } @@ -1959,8 +1735,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) /* ixl command being updated must be one of above, else error */ uvp->upd_status = IXL1394_EINTERNAL_ERROR; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -1974,8 +1748,6 @@ hci1394_ixl_update_perform(hci1394_ixl_update_vars_t *uvp) } /* perform update completed successfully */ - TNF_PROBE_0_DEBUG(hci1394_ixl_update_perform_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -1992,9 +1764,6 @@ hci1394_ixl_update_evaluate(hci1394_ixl_update_vars_t *uvp) int ixldepth; int ii; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_evaluate_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - ctxtp = uvp->ctxtp; ixlp = NULL; @@ -2034,8 +1803,6 @@ hci1394_ixl_update_evaluate(hci1394_ixl_update_vars_t *uvp) /* return post-perform update failed status */ uvp->upd_status = IXL1394_EPOST_UPD_DMALOST; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_evaluate_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } } @@ -2049,8 +1816,6 @@ hci1394_ixl_update_evaluate(hci1394_ixl_update_vars_t *uvp) if ((uvp->locn_info[ii].ixlp == ixlp) && (uvp->locn_info[ii].ixldepth == ixldepth)) { - TNF_PROBE_0_DEBUG(hci1394_ixl_update_evaluate_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } } @@ -2062,8 +1827,6 @@ hci1394_ixl_update_evaluate(hci1394_ixl_update_vars_t *uvp) */ uvp->upd_status = IXL1394_EPOST_UPD_DMALOST; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_evaluate_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } @@ -2081,9 +1844,6 @@ hci1394_ixl_update_analysis(hci1394_ixl_update_vars_t *uvp) int ii; int status; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_analysis_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - ctxtp = uvp->ctxtp; ixlp = NULL; @@ -2126,8 +1886,6 @@ hci1394_ixl_update_analysis(hci1394_ixl_update_vars_t *uvp) */ uvp->upd_status = IXL1394_EPRE_UPD_DMALOST; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_analysis_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } } @@ -2156,15 +1914,11 @@ hci1394_ixl_update_analysis(hci1394_ixl_update_vars_t *uvp) uvp->upd_status = IXL1394_ERISK_PROHIBITS_UPD; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_analysis_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_FAILURE); } } /* is save for update to be performed, return ok status */ - TNF_PROBE_0_DEBUG(hci1394_ixl_update_analysis_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); return (DDI_SUCCESS); } @@ -2181,9 +1935,6 @@ hci1394_ixl_update_set_locn_info(hci1394_ixl_update_vars_t *uvp) int ixldepth; int ii; - TNF_PROBE_0_DEBUG(hci1394_ixl_update_set_locn_info_enter, - HCI1394_TNF_HAL_STACK_ISOCH, ""); - /* * find next xfer start ixl command, starting with current ixl command * where execution last left off @@ -2224,6 +1975,4 @@ hci1394_ixl_update_set_locn_info(hci1394_ixl_update_vars_t *uvp) } } } - TNF_PROBE_0_DEBUG(hci1394_ixl_update_set_locn_info_exit, - HCI1394_TNF_HAL_STACK_ISOCH, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_misc.c b/usr/src/uts/common/io/1394/adapters/hci1394_misc.c index 3bdefa1169..4f7666bfcf 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_misc.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_misc.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_misc.c * Misc. HBA functions. These include getinfo, open, close, shutdown, and @@ -53,20 +51,12 @@ hci1394_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd, void *arg, void **result) minor_t instance; int status; - - TNF_PROBE_0_DEBUG(hci1394_getinfo_enter, HCI1394_TNF_HAL_STACK, ""); - switch (cmd) { case DDI_INFO_DEVT2DEVINFO: dev = (dev_t)arg; instance = getminor(dev); soft_state = ddi_get_soft_state(hci1394_statep, instance); if (soft_state == NULL) { - TNF_PROBE_1(hci1394_getinfo_gss_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "ddi_get_soft_state() failed"); - TNF_PROBE_0_DEBUG(hci1394_getinfo_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } *result = (void *)soft_state->drvinfo.di_dip; @@ -81,12 +71,9 @@ hci1394_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd, void *arg, void **result) break; default: - TNF_PROBE_1(hci1394_getinfo_def_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "reached default in switch"); status = DDI_FAILURE; } - TNF_PROBE_0_DEBUG(hci1394_getinfo_exit, HCI1394_TNF_HAL_STACK, ""); return (status); } @@ -97,18 +84,11 @@ hci1394_open(dev_t *devp, int flag, int otyp, cred_t *credp) { hci1394_state_t *soft_state; - - TNF_PROBE_0_DEBUG(hci1394_open_enter, HCI1394_TNF_HAL_STACK, ""); - soft_state = ddi_get_soft_state(hci1394_statep, getminor(*devp)); if (soft_state == NULL) { - TNF_PROBE_1(hci1394_open_gss_fail, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "ddi_get_soft_state() failed"); - TNF_PROBE_0_DEBUG(hci1394_open_exit, HCI1394_TNF_HAL_STACK, ""); return (ENXIO); } - TNF_PROBE_0_DEBUG(hci1394_open_exit, HCI1394_TNF_HAL_STACK, ""); return (0); } @@ -117,10 +97,6 @@ hci1394_open(dev_t *devp, int flag, int otyp, cred_t *credp) int hci1394_close(dev_t dev, int flag, int otyp, cred_t *credp) { - TNF_PROBE_0_DEBUG(hci1394_close_enter, HCI1394_TNF_HAL_STACK, ""); - - TNF_PROBE_0_DEBUG(hci1394_close_exit, HCI1394_TNF_HAL_STACK, ""); - return (0); } @@ -144,14 +120,8 @@ hci1394_shutdown(dev_info_t *dip) ASSERT(0); #endif - TNF_PROBE_0_DEBUG(hci1394_shutdown_enter, HCI1394_TNF_HAL_STACK, ""); - soft_state = ddi_get_soft_state(hci1394_statep, ddi_get_instance(dip)); if (soft_state == NULL) { - TNF_PROBE_1(hci1394_shutdown_gss_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "ddi_get_soft_state() failed"); - TNF_PROBE_0_DEBUG(hci1394_shutdown_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -169,8 +139,6 @@ hci1394_shutdown(dev_info_t *dip) /* Flush out async DMA Q's (cancels pendingQ timeouts too) */ hci1394_async_flush(soft_state->async); - - TNF_PROBE_0_DEBUG(hci1394_shutdown_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -183,11 +151,9 @@ hci1394_state(hci1394_drvinfo_t *drvinfo) { hci1394_statevar_t hal_state; - TNF_PROBE_0_DEBUG(hci1394_state_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&drvinfo->di_drvstate.ds_mutex); hal_state = drvinfo->di_drvstate.ds_state; mutex_exit(&drvinfo->di_drvstate.ds_mutex); - TNF_PROBE_0_DEBUG(hci1394_state_exit, HCI1394_TNF_HAL_STACK, ""); return (hal_state); } @@ -202,22 +168,16 @@ hci1394_state(hci1394_drvinfo_t *drvinfo) int hci1394_state_set(hci1394_drvinfo_t *drvinfo, hci1394_statevar_t state) { - TNF_PROBE_0_DEBUG(hci1394_state_set_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&drvinfo->di_drvstate.ds_mutex); /* Do not allow a transition out of shutdown */ if (drvinfo->di_drvstate.ds_state == HCI1394_SHUTDOWN) { mutex_exit(&drvinfo->di_drvstate.ds_mutex); - TNF_PROBE_1(hci1394_state_set_fail, HCI1394_TNF_HAL_STACK, "", - tnf_string, errmsg, "driver shutdown"); - TNF_PROBE_0_DEBUG(hci1394_state_set_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } drvinfo->di_drvstate.ds_state = state; mutex_exit(&drvinfo->di_drvstate.ds_mutex); - TNF_PROBE_0_DEBUG(hci1394_state_set_exit, HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c b/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c index ed79737f03..e0d9dbdd9c 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_ohci.c @@ -24,8 +24,6 @@ * Copyright (c) 2016 by Delphix. All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_ohci.c * Provides access routines to the OpenHCI HW. @@ -89,7 +87,6 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_enter, HCI1394_TNF_HAL_STACK, ""); /* alloc the space for ohci */ ohci = kmem_alloc(sizeof (hci1394_ohci_t), KM_SLEEP); @@ -121,10 +118,6 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, mutex_destroy(&ohci->ohci_mutex); kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - TNF_PROBE_0(ddi_regs_map_setup_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -155,10 +148,6 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, mutex_destroy(&ohci->ohci_mutex); kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - TNF_PROBE_0(hci1394_ohci_chip_init_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -170,10 +159,6 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, mutex_destroy(&ohci->ohci_mutex); kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - TNF_PROBE_0(hci1394_ohci_phy_init_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -186,10 +171,6 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, mutex_destroy(&ohci->ohci_mutex); kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - TNF_PROBE_0(hci1394_ohci_1394a_init_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } } @@ -213,10 +194,6 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, mutex_destroy(&ohci->ohci_mutex); kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - TNF_PROBE_0(hci1394_ohci_selfid_init_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -228,10 +205,6 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, mutex_destroy(&ohci->ohci_mutex); kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - TNF_PROBE_0(hci1394_ohci_selfid_init_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -244,15 +217,9 @@ hci1394_ohci_init(hci1394_state_t *soft_state, hci1394_drvinfo_t *drvinfo, mutex_destroy(&ohci->ohci_mutex); kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - TNF_PROBE_0(hci1394_ohci_cfgrom_init_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -268,7 +235,6 @@ hci1394_ohci_fini(hci1394_ohci_handle_t *ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_fini_enter, HCI1394_TNF_HAL_STACK, ""); ohci = *ohci_hdl; @@ -289,8 +255,6 @@ hci1394_ohci_fini(hci1394_ohci_handle_t *ohci_hdl) /* Free the OpenHCI state space */ kmem_free(ohci, sizeof (hci1394_ohci_t)); *ohci_hdl = NULL; - - TNF_PROBE_0_DEBUG(hci1394_ohci_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -306,16 +270,10 @@ hci1394_ohci_chip_init(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_chip_init_enter, HCI1394_TNF_HAL_STACK, - ""); /* Reset 1394 OHCI HW */ status = hci1394_ohci_soft_reset(ohci_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_soft_reset_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -429,8 +387,6 @@ hci1394_ohci_chip_init(hci1394_ohci_handle_t ohci_hdl) ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->intr_mask_clr, (uint32_t)0xFFFFFFFF); - TNF_PROBE_0_DEBUG(hci1394_ohci_chip_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); } @@ -446,8 +402,6 @@ hci1394_ohci_soft_reset(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_soft_reset_enter, - HCI1394_TNF_HAL_STACK, ""); /* Reset 1394 HW - Reset is bit 16 in HCControl */ ddi_put32(ohci_hdl->ohci_reg_handle, @@ -461,16 +415,9 @@ hci1394_ohci_soft_reset(hci1394_ohci_handle_t ohci_hdl) &ohci_hdl->ohci_regs->hc_ctrl_set); resetStatus = resetStatus & OHCI_HC_SOFT_RESET; if (resetStatus != 0) { - TNF_PROBE_0(hci1394_ohci_reset_not_complete_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_soft_reset_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_ohci_soft_reset_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -489,15 +436,10 @@ hci1394_ohci_reg_read(hci1394_ohci_handle_t ohci_hdl, ASSERT(ohci_hdl != NULL); ASSERT(data != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_reg_read_enter, - HCI1394_TNF_HAL_STACK, ""); addr = (uint32_t *)((uintptr_t)ohci_hdl->ohci_regs + (uintptr_t)(offset & OHCI_REG_ADDR_MASK)); *data = ddi_get32(ohci_hdl->ohci_reg_handle, addr); - - TNF_PROBE_0_DEBUG(hci1394_ohci_reg_read_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -514,15 +456,10 @@ hci1394_ohci_reg_write(hci1394_ohci_handle_t ohci_hdl, ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_reg_read_enter, - HCI1394_TNF_HAL_STACK, ""); addr = (uint32_t *)((uintptr_t)ohci_hdl->ohci_regs + (uintptr_t)(offset & OHCI_REG_ADDR_MASK)); ddi_put32(ohci_hdl->ohci_reg_handle, addr, data); - - TNF_PROBE_0_DEBUG(hci1394_ohci_reg_read_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -536,14 +473,9 @@ void hci1394_ohci_intr_master_enable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_master_enable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->intr_mask_set, OHCI_INTR_MASTER_INTR_ENBL); - - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_master_enable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -557,14 +489,9 @@ void hci1394_ohci_intr_master_disable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_master_disable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->intr_mask_clr, OHCI_INTR_MASTER_INTR_ENBL); - - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_master_disable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -581,8 +508,6 @@ hci1394_ohci_intr_asserted(hci1394_ohci_handle_t ohci_hdl) uint32_t interrupts_asserted; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_asserted_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Only look at interrupts which are enabled by reading the @@ -591,8 +516,6 @@ hci1394_ohci_intr_asserted(hci1394_ohci_handle_t ohci_hdl) interrupts_asserted = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->intr_event_clr); - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_asserted_exit, - HCI1394_TNF_HAL_STACK, ""); return (interrupts_asserted); } @@ -607,14 +530,9 @@ hci1394_ohci_intr_enable(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_enable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->intr_mask_set, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_enable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -628,14 +546,9 @@ hci1394_ohci_intr_disable(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_disable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->intr_mask_clr, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_disable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -650,16 +563,9 @@ hci1394_ohci_intr_clear(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_clear_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->intr_event_clr, interrupt_mask); - TNF_PROBE_1_DEBUG(hci1394_ohci_intr_clear, HCI1394_TNF_HAL, "", - tnf_uint, intr_mask, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_intr_clear_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -676,15 +582,11 @@ hci1394_ohci_it_intr_asserted(hci1394_ohci_handle_t ohci_hdl) uint32_t interrupts_asserted; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_asserted_enter, - HCI1394_TNF_HAL_STACK, ""); /* Only look at interrupts which are enabled */ interrupts_asserted = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->it_intr_event_clr); - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_asserted_exit, - HCI1394_TNF_HAL_STACK, ""); return (interrupts_asserted); } @@ -700,14 +602,9 @@ hci1394_ohci_it_intr_enable(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_enable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->it_intr_mask_set, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_enable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -722,14 +619,9 @@ hci1394_ohci_it_intr_disable(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_disable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->it_intr_mask_clr, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_disable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -744,14 +636,9 @@ hci1394_ohci_it_intr_clear(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_clear_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->it_intr_event_clr, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_it_intr_clear_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -766,8 +653,6 @@ hci1394_ohci_it_ctxt_count_get(hci1394_ohci_handle_t ohci_hdl) int count; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_it_ctxt_count_get_enter, - HCI1394_TNF_HAL_STACK, ""); /* * hw is required to support contexts 0 to N, where N <= 31 @@ -785,8 +670,6 @@ hci1394_ohci_it_ctxt_count_get(hci1394_ohci_handle_t ohci_hdl) count++; } - TNF_PROBE_0_DEBUG(hci1394_ohci_it_ctxt_count_get_exit, - HCI1394_TNF_HAL_STACK, ""); return (count); } @@ -802,15 +685,10 @@ hci1394_ohci_it_cmd_ptr_set(hci1394_ohci_handle_t ohci_hdl, uint_t context_number, uint32_t io_addr) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_it_cmd_ptr_set_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->it[context_number].cmd_ptrlo, io_addr); - - TNF_PROBE_0_DEBUG(hci1394_ohci_it_cmd_ptr_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -827,15 +705,11 @@ hci1394_ohci_ir_intr_asserted(hci1394_ohci_handle_t ohci_hdl) uint32_t interrupts_asserted; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_asserted_enter, - HCI1394_TNF_HAL_STACK, ""); /* Only look at interrupts which are enabled */ interrupts_asserted = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ir_intr_event_clr); - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_asserted_exit, - HCI1394_TNF_HAL_STACK, ""); return (interrupts_asserted); } @@ -851,14 +725,9 @@ hci1394_ohci_ir_intr_enable(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_enable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ir_intr_mask_set, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_enable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -873,14 +742,9 @@ hci1394_ohci_ir_intr_disable(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_disable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ir_intr_mask_clr, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_disable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -895,14 +759,9 @@ hci1394_ohci_ir_intr_clear(hci1394_ohci_handle_t ohci_hdl, uint32_t interrupt_mask) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_clear_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ir_intr_event_clr, interrupt_mask); - - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_intr_clear_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -917,8 +776,6 @@ hci1394_ohci_ir_ctxt_count_get(hci1394_ohci_handle_t ohci_hdl) int count; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_ctxt_count_get_enter, - HCI1394_TNF_HAL_STACK, ""); /* * hw is required to support contexts 0 to N, where N <= 31 @@ -936,8 +793,6 @@ hci1394_ohci_ir_ctxt_count_get(hci1394_ohci_handle_t ohci_hdl) count++; } - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_ctxt_count_get_exit, - HCI1394_TNF_HAL_STACK, ""); return (count); } @@ -953,15 +808,10 @@ hci1394_ohci_ir_cmd_ptr_set(hci1394_ohci_handle_t ohci_hdl, uint_t context_number, uint32_t io_addr) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_cmd_ptr_set_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ir[context_number].cmd_ptrlo, io_addr); - - TNF_PROBE_0_DEBUG(hci1394_ohci_ir_cmd_ptr_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -974,14 +824,9 @@ void hci1394_ohci_link_enable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_link_enable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->hc_ctrl_set, OHCI_HC_LINK_ENBL); - - TNF_PROBE_0_DEBUG(hci1394_ohci_link_enable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -995,14 +840,9 @@ void hci1394_ohci_link_disable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_link_disable_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->hc_ctrl_clr, OHCI_HC_LINK_ENBL); - - TNF_PROBE_0_DEBUG(hci1394_ohci_link_disable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -1019,8 +859,6 @@ hci1394_ohci_bus_reset(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_enter, - HCI1394_TNF_HAL_STACK, ""); /* * We want to reset the bus. We also handle the root_holdoff and gap @@ -1043,10 +881,6 @@ hci1394_ohci_bus_reset(hci1394_ohci_handle_t ohci_hdl) */ status = hci1394_ohci_phy_write(ohci_hdl, 0x1, reg); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_write_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1054,9 +888,6 @@ hci1394_ohci_bus_reset(hci1394_ohci_handle_t ohci_hdl) ohci_hdl->ohci_set_root_holdoff = B_FALSE; ohci_hdl->ohci_set_gap_count = B_FALSE; - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1088,10 +919,6 @@ hci1394_ohci_bus_reset_nroot(hci1394_ohci_handle_t ohci_hdl) */ status = hci1394_ohci_phy_write(ohci_hdl, 0x1, reg); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_write_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_nroot_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1111,8 +938,6 @@ hci1394_ohci_phy_init(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_init_enter, - HCI1394_TNF_HAL_STACK, ""); /* * if the phy has extended set to 7, the phy is a not a 1394-1995 PHY. @@ -1131,10 +956,6 @@ hci1394_ohci_phy_init(hci1394_ohci_handle_t ohci_hdl) */ status = hci1394_ohci_phy_read(ohci_hdl, 2, &phy_reg); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_read_failed, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1149,9 +970,6 @@ hci1394_ohci_phy_init(hci1394_ohci_handle_t ohci_hdl) ohci_hdl->ohci_phy = H1394_PHY_1394A; } - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_init_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1166,14 +984,8 @@ static int hci1394_ohci_phy_resume(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_resume_enter, - HCI1394_TNF_HAL_STACK, ""); /* There is currently nothing to re-initialize here */ - - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_resume_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1191,8 +1003,6 @@ hci1394_ohci_phy_set(hci1394_ohci_handle_t ohci_hdl, uint_t address, ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_set_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&ohci_hdl->ohci_mutex); @@ -1200,10 +1010,6 @@ hci1394_ohci_phy_set(hci1394_ohci_handle_t ohci_hdl, uint_t address, status = hci1394_ohci_phy_read_no_lock(ohci_hdl, address, ®); if (status != DDI_SUCCESS) { mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0(hci1394_ohci_phy_read_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_set_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1212,18 +1018,11 @@ hci1394_ohci_phy_set(hci1394_ohci_handle_t ohci_hdl, uint_t address, status = hci1394_ohci_phy_write_no_lock(ohci_hdl, address, reg); if (status != DDI_SUCCESS) { mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0(hci1394_ohci_phy_write_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_set_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_set_exit, HCI1394_TNF_HAL_STACK, - ""); - return (DDI_SUCCESS); } @@ -1241,8 +1040,6 @@ hci1394_ohci_phy_clr(hci1394_ohci_handle_t ohci_hdl, uint_t address, ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_clr_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&ohci_hdl->ohci_mutex); @@ -1250,10 +1047,6 @@ hci1394_ohci_phy_clr(hci1394_ohci_handle_t ohci_hdl, uint_t address, status = hci1394_ohci_phy_read_no_lock(ohci_hdl, address, ®); if (status != DDI_SUCCESS) { mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0(hci1394_ohci_phy_read_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_clr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1262,18 +1055,10 @@ hci1394_ohci_phy_clr(hci1394_ohci_handle_t ohci_hdl, uint_t address, status = hci1394_ohci_phy_write_no_lock(ohci_hdl, address, reg); if (status != DDI_SUCCESS) { mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0(hci1394_ohci_phy_write_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_clr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } mutex_exit(&ohci_hdl->ohci_mutex); - - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_clr_exit, HCI1394_TNF_HAL_STACK, - ""); - return (DDI_SUCCESS); } @@ -1289,13 +1074,9 @@ hci1394_ohci_phy_read(hci1394_ohci_handle_t ohci_hdl, uint_t address, int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_read_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&ohci_hdl->ohci_mutex); status = hci1394_ohci_phy_read_no_lock(ohci_hdl, address, data); mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_read_exit, HCI1394_TNF_HAL_STACK, - ""); return (status); } @@ -1312,13 +1093,9 @@ hci1394_ohci_phy_write(hci1394_ohci_handle_t ohci_hdl, uint_t address, int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_write_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&ohci_hdl->ohci_mutex); status = hci1394_ohci_phy_write_no_lock(ohci_hdl, address, data); mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_write_exit, HCI1394_TNF_HAL_STACK, - ""); return (status); } @@ -1341,15 +1118,9 @@ hci1394_ohci_phy_read_no_lock(hci1394_ohci_handle_t ohci_hdl, uint_t address, ASSERT(ohci_hdl != NULL); ASSERT(data != NULL); ASSERT(MUTEX_HELD(&ohci_hdl->ohci_mutex)); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_read_no_lock_enter, - HCI1394_TNF_HAL_STACK, ""); /* You can't read or write PHY register #0 */ if (address == 0) { - TNF_PROBE_1(hci1394_ohci_phy_addr_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "can't rd/wr PHY reg #0"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_read_no_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1357,10 +1128,6 @@ hci1394_ohci_phy_read_no_lock(hci1394_ohci_handle_t ohci_hdl, uint_t address, ohci_reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->phy_ctrl); if ((ohci_reg & (OHCI_PHYC_RDREG | OHCI_PHYC_WRREG)) != 0) { - TNF_PROBE_1(hci1394_ohci_phy_xfer_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "transfer already in progress?"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_read_no_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1408,10 +1175,6 @@ hci1394_ohci_phy_read_no_lock(hci1394_ohci_handle_t ohci_hdl, uint_t address, if (count >= hci1394_phy_delay_uS) { /* we timed out, return failure */ *data = 0; - TNF_PROBE_0(hci1394_ohci_phy_rd_timeout_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_read_no_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1420,9 +1183,6 @@ hci1394_ohci_phy_read_no_lock(hci1394_ohci_handle_t ohci_hdl, uint_t address, &ohci_hdl->ohci_regs->phy_ctrl) & OHCI_PHYC_RDDATA_MASK) >> OHCI_PHYC_RDDATA_SHIFT; - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_read_no_lock_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1443,15 +1203,9 @@ hci1394_ohci_phy_write_no_lock(hci1394_ohci_handle_t ohci_hdl, uint_t address, ASSERT(ohci_hdl != NULL); ASSERT(MUTEX_HELD(&ohci_hdl->ohci_mutex)); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_write_enter, - HCI1394_TNF_HAL_STACK, ""); /* You can't read or write PHY register #0 */ if (address == 0) { - TNF_PROBE_1(hci1394_ohci_phy_addr_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "can't rd/wr PHY reg #0"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1459,10 +1213,6 @@ hci1394_ohci_phy_write_no_lock(hci1394_ohci_handle_t ohci_hdl, uint_t address, ohci_reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->phy_ctrl); if ((ohci_reg & (OHCI_PHYC_RDREG | OHCI_PHYC_WRREG)) != 0) { - TNF_PROBE_1(hci1394_ohci_phy_xfer_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "transfer already in progress?"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1504,16 +1254,9 @@ hci1394_ohci_phy_write_no_lock(hci1394_ohci_handle_t ohci_hdl, uint_t address, /* Check to see if we timed out */ if (count >= hci1394_phy_delay_uS) { /* we timed out, return failure */ - TNF_PROBE_0(hci1394_ohci_phy_wr_timeout_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_write_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1543,8 +1286,6 @@ hci1394_ohci_phy_info(hci1394_ohci_handle_t ohci_hdl, uint32_t *info) ASSERT(ohci_hdl != NULL); ASSERT(info != NULL); ASSERT(ohci_hdl->ohci_phy == H1394_PHY_1995); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_info_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Set Link on. We are using power class 0 since we have no idea what @@ -1561,10 +1302,6 @@ hci1394_ohci_phy_info(hci1394_ohci_handle_t ohci_hdl, uint32_t *info) /* Add in Gap Count */ status = hci1394_ohci_phy_read(ohci_hdl, 1, ®); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_read_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_info_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } phy_info = phy_info | ((reg << IEEE1394_SELFID_GAP_CNT_SHIFT) & @@ -1573,10 +1310,6 @@ hci1394_ohci_phy_info(hci1394_ohci_handle_t ohci_hdl, uint32_t *info) /* Add in speed & ports */ status = hci1394_ohci_phy_read(ohci_hdl, 2, ®); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_read_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_info_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } phy_info = phy_info | ((reg & 0xC0) << 8); @@ -1584,11 +1317,6 @@ hci1394_ohci_phy_info(hci1394_ohci_handle_t ohci_hdl, uint32_t *info) /* PHY reports that it has 0 ports?? */ if (num_ports == 0) { - TNF_PROBE_1(hci1394_ohci_phy_zero_ports_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "1995 phy has zero ports?"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_info_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1599,10 +1327,6 @@ hci1394_ohci_phy_info(hci1394_ohci_handle_t ohci_hdl, uint32_t *info) status = hci1394_ohci_phy_read(ohci_hdl, count + 3, ®); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_read_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_info_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* if port is not connected */ @@ -1632,9 +1356,6 @@ hci1394_ohci_phy_info(hci1394_ohci_handle_t ohci_hdl, uint32_t *info) /* Copy the PHY selfid info to the return parameter */ *info = phy_info; - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_info_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1651,16 +1372,11 @@ hci1394_ohci_current_busgen(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_current_busgen_enter, - HCI1394_TNF_HAL_STACK, ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->self_id_count); generation_count = (reg & OHCI_SLFC_GEN_MASK) >> OHCI_SLFC_GEN_SHIFT; - TNF_PROBE_0_DEBUG(hci1394_ohci_current_busgen_exit, - HCI1394_TNF_HAL_STACK, ""); - return (generation_count); } @@ -1678,8 +1394,6 @@ hci1394_ohci_startup(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_startup_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Turn on 1394 link. This allows us to receive 1394 traffic off the @@ -1695,11 +1409,6 @@ hci1394_ohci_startup(hci1394_ohci_handle_t ohci_hdl) */ status = hci1394_ohci_bus_reset(ohci_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_1_DEBUG(hci1394_ohci_startup_exit, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "failed to reset bus"); - TNF_PROBE_0_DEBUG(hci1394_ohci_startup_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1707,9 +1416,6 @@ hci1394_ohci_startup(hci1394_ohci_handle_t ohci_hdl) hci1394_isr_mask_setup(ohci_hdl->soft_state); hci1394_ohci_intr_master_enable(ohci_hdl); - TNF_PROBE_0_DEBUG(hci1394_ohci_startup_exit, HCI1394_TNF_HAL_STACK, - ""); - return (DDI_SUCCESS); } @@ -1727,8 +1433,6 @@ hci1394_ohci_postwr_addr(hci1394_ohci_handle_t ohci_hdl, uint64_t *addr) ASSERT(ohci_hdl != NULL); ASSERT(addr != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_postwr_addr_enter, - HCI1394_TNF_HAL_STACK, ""); /* read in the errored address */ reg = ddi_get32(ohci_hdl->ohci_reg_handle, @@ -1743,9 +1447,6 @@ hci1394_ohci_postwr_addr(hci1394_ohci_handle_t ohci_hdl, uint64_t *addr) * See 13.2.8.1 in OpenHCI spec v1.0. */ hci1394_ohci_intr_clear(ohci_hdl, OHCI_INTR_POST_WR_ERR); - - TNF_PROBE_0_DEBUG(hci1394_ohci_postwr_addr_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -1761,7 +1462,6 @@ hci1394_ohci_guid(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_guid_enter, HCI1394_TNF_HAL_STACK, ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->guid_hi); @@ -1770,8 +1470,6 @@ hci1394_ohci_guid(hci1394_ohci_handle_t ohci_hdl) &ohci_hdl->ohci_regs->guid_lo); guid = guid | (uint64_t)reg; - TNF_PROBE_0_DEBUG(hci1394_ohci_guid_exit, HCI1394_TNF_HAL_STACK, ""); - return (guid); } @@ -1794,8 +1492,6 @@ hci1394_ohci_csr_read(hci1394_ohci_handle_t ohci_hdl, uint_t offset, ASSERT(ohci_hdl != NULL); ASSERT(data != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_read_enter, HCI1394_TNF_HAL_STACK, - ""); /* * read the CSR register by doing a cswap with the same compare and @@ -1805,16 +1501,9 @@ hci1394_ohci_csr_read(hci1394_ohci_handle_t ohci_hdl, uint_t offset, status = hci1394_ohci_csr_cswap(ohci_hdl, generation, offset, 0, 0, data); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_csr_read_csw_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_read_exit, HCI1394_TNF_HAL_STACK, - ""); - return (DDI_SUCCESS); } @@ -1837,18 +1526,12 @@ hci1394_ohci_csr_cswap(hci1394_ohci_handle_t ohci_hdl, uint_t generation, ASSERT(ohci_hdl != NULL); ASSERT(old != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_cswap_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Make sure we have not gotten a bus reset since this action was * started. */ if (generation != hci1394_ohci_current_busgen(ohci_hdl)) { - TNF_PROBE_1(hci1394_ohci_invbusgen_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "Invalid Bus Generation"); - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_cswap_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1892,10 +1575,6 @@ hci1394_ohci_csr_cswap(hci1394_ohci_handle_t ohci_hdl, uint_t generation, if (count >= 2) { *old = 0; mutex_exit(&ohci_hdl->ohci_mutex); - TNF_PROBE_0(hci1394_ohci_phy_csr_timeout_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_cswap_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1917,18 +1596,10 @@ hci1394_ohci_csr_cswap(hci1394_ohci_handle_t ohci_hdl, uint_t generation, if (generation != hci1394_ohci_current_busgen(ohci_hdl)) { if (*old == compare) { (void) hci1394_ohci_bus_reset(ohci_hdl); - TNF_PROBE_1(hci1394_ohci_invbusgen_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "Invalid Bus Generation"); - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_cswap_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(hci1394_ohci_csr_cswap_exit, HCI1394_TNF_HAL_STACK, - ""); - return (DDI_SUCCESS); } @@ -1946,34 +1617,21 @@ hci1394_ohci_contender_enable(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_contender_enable_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Make sure that phy is not a 1394-1995 phy. Those phy's do not have a * contender bit to set. */ if (ohci_hdl->ohci_phy == H1394_PHY_1995) { - TNF_PROBE_0(hci1394_ohci_phy_type_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_contender_enable_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* Set the Contender Bit */ status = hci1394_ohci_phy_set(ohci_hdl, 0x4, OHCI_PHY_CNTDR); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_set_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_contender_enable_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_ohci_contender_enable_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -1988,14 +1646,9 @@ int hci1394_ohci_root_holdoff_enable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_root_holdoff_enable_enter, - HCI1394_TNF_HAL_STACK, ""); ohci_hdl->ohci_set_root_holdoff = B_TRUE; - TNF_PROBE_0_DEBUG(hci1394_ohci_root_holdoff_enable_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2010,15 +1663,10 @@ int hci1394_ohci_gap_count_set(hci1394_ohci_handle_t ohci_hdl, uint_t gap_count) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_gap_count_set_enter, - HCI1394_TNF_HAL_STACK, ""); ohci_hdl->ohci_set_gap_count = B_TRUE; ohci_hdl->ohci_gap_count = gap_count & OHCI_PHY_MAX_GAP; - TNF_PROBE_0_DEBUG(hci1394_ohci_gap_count_set_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2044,18 +1692,12 @@ hci1394_ohci_phy_filter_set(hci1394_ohci_handle_t ohci_hdl, uint64_t mask, ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_filter_set_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Make sure we have not gotten a bus reset since this action was * started. */ if (generation != hci1394_ohci_current_busgen(ohci_hdl)) { - TNF_PROBE_1(hci1394_ohci_invbusgen_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "Invalid Bus Generation"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_filter_set_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2075,16 +1717,9 @@ hci1394_ohci_phy_filter_set(hci1394_ohci_handle_t ohci_hdl, uint64_t mask, */ if (generation != hci1394_ohci_current_busgen(ohci_hdl)) { (void) hci1394_ohci_bus_reset(ohci_hdl); - TNF_PROBE_1(hci1394_ohci_filterrace_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "Invalid Bus Generation"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_filter_set_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_filter_set_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2102,18 +1737,12 @@ hci1394_ohci_phy_filter_clr(hci1394_ohci_handle_t ohci_hdl, ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_filter_clr_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Make sure we have not gotten a bus reset since this action was * started. */ if (generation != hci1394_ohci_current_busgen(ohci_hdl)) { - TNF_PROBE_1(hci1394_ohci_invbusgen_fail, HCI1394_TNF_HAL_ERROR, - "", tnf_string, errmsg, "Invalid Bus Generation"); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_filter_clr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2124,9 +1753,6 @@ hci1394_ohci_phy_filter_clr(hci1394_ohci_handle_t ohci_hdl, ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->phys_req_filterlo_clr, data); - TNF_PROBE_0_DEBUG(hci1394_ohci_phy_filter_clr_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2142,34 +1768,21 @@ hci1394_ohci_bus_reset_short(hci1394_ohci_handle_t ohci_hdl) int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_short_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Make sure that phy is not a 1394-1995 phy. Those phy's do not have a * contender bit to set. */ if (ohci_hdl->ohci_phy == H1394_PHY_1995) { - TNF_PROBE_0(hci1394_ohci_brs_phy_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_short_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* Initiate the short bus reset */ status = hci1394_ohci_phy_set(ohci_hdl, 0x5, OHCI_PHY_ISBR); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_set_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_short_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_reset_short_exit, - HCI1394_TNF_HAL_STACK, ""); - return (status); } @@ -2191,8 +1804,6 @@ hci1394_ohci_cfgrom_update(hci1394_ohci_handle_t ohci_hdl, void *local_buf, ASSERT(ohci_hdl != NULL); ASSERT(local_buf != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_cfgrom_update_enter, - HCI1394_TNF_HAL_STACK, ""); data = (uint32_t *)local_buf; @@ -2218,9 +1829,6 @@ hci1394_ohci_cfgrom_update(hci1394_ohci_handle_t ohci_hdl, void *local_buf, &ohci_hdl->ohci_regs->bus_options, OHCI_SWAP32(data[2])); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->config_rom_hdr, OHCI_SWAP32(data[0])); - - TNF_PROBE_0_DEBUG(hci1394_ohci_cfgrom_update_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2235,13 +1843,9 @@ hci1394_ohci_nodeid_get(hci1394_ohci_handle_t ohci_hdl, uint_t *nodeid) ASSERT(ohci_hdl != NULL); ASSERT(nodeid != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_nodeid_get_enter, HCI1394_TNF_HAL_STACK, - ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->node_id); *nodeid = (reg & 0xFFFF) << 16; - TNF_PROBE_0_DEBUG(hci1394_ohci_nodeid_get_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -2257,15 +1861,10 @@ hci1394_ohci_nodeid_set(hci1394_ohci_handle_t ohci_hdl, uint_t nodeid) uint32_t reg; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_nodeid_set_enter, - HCI1394_TNF_HAL_STACK, ""); reg = ((nodeid & 0xFFC00000) >> 16); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->node_id, reg); - - TNF_PROBE_0_DEBUG(hci1394_ohci_nodeid_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2284,8 +1883,6 @@ hci1394_ohci_nodeid_info(hci1394_ohci_handle_t ohci_hdl, uint_t *nodeid, ASSERT(ohci_hdl != NULL); ASSERT(nodeid != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_nodeid_info_enter, - HCI1394_TNF_HAL_STACK, ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->node_id); @@ -2295,9 +1892,6 @@ hci1394_ohci_nodeid_info(hci1394_ohci_handle_t ohci_hdl, uint_t *nodeid, } else { *error = B_FALSE; } - - TNF_PROBE_0_DEBUG(hci1394_ohci_nodeid_info_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2311,12 +1905,8 @@ hci1394_ohci_cycletime_get(hci1394_ohci_handle_t ohci_hdl, { ASSERT(ohci_hdl != NULL); ASSERT(cycle_time != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_cycletime_get_enter, - HCI1394_TNF_HAL_STACK, ""); *cycle_time = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->isoch_cycle_timer); - TNF_PROBE_0_DEBUG(hci1394_ohci_cycletime_get_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2329,12 +1919,8 @@ hci1394_ohci_cycletime_set(hci1394_ohci_handle_t ohci_hdl, uint32_t cycle_time) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_cycletime_set_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->isoch_cycle_timer, cycle_time); - TNF_PROBE_0_DEBUG(hci1394_ohci_cycletime_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2352,8 +1938,6 @@ hci1394_ohci_bustime_get(hci1394_ohci_handle_t ohci_hdl, uint32_t *bus_time) ASSERT(ohci_hdl != NULL); ASSERT(bus_time != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_bustime_get_enter, - HCI1394_TNF_HAL_STACK, ""); /* * The bus time is composed of a portion of the cycle time and the @@ -2370,9 +1954,6 @@ hci1394_ohci_bustime_get(hci1394_ohci_handle_t ohci_hdl, uint32_t *bus_time) } while (bus_time1 != bus_time2); *bus_time = (bus_time2 << 7) | (cycle_time >> 25); - - TNF_PROBE_0_DEBUG(hci1394_ohci_bustime_get_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2384,8 +1965,6 @@ void hci1394_ohci_bustime_set(hci1394_ohci_handle_t ohci_hdl, uint32_t bus_time) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_bustime_set_enter, - HCI1394_TNF_HAL_STACK, ""); /* * we will start with the cycle 64 seconds interrupt disabled. If this @@ -2398,9 +1977,6 @@ hci1394_ohci_bustime_set(hci1394_ohci_handle_t ohci_hdl, uint32_t bus_time) hci1394_ohci_intr_enable(ohci_hdl, OHCI_INTR_CYC_64_SECS); } ohci_hdl->ohci_bustime_count = (bus_time >> 7); - - TNF_PROBE_0_DEBUG(hci1394_ohci_bustime_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2416,13 +1992,9 @@ hci1394_ohci_atreq_retries_get(hci1394_ohci_handle_t ohci_hdl, ASSERT(ohci_hdl != NULL); ASSERT(atreq_retries != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_retries_get_enter, - HCI1394_TNF_HAL_STACK, ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_retries); *atreq_retries = reg & OHCI_RET_MAX_ATREQ_MASK; - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_retries_get_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2438,8 +2010,6 @@ hci1394_ohci_atreq_retries_set(hci1394_ohci_handle_t ohci_hdl, ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_retries_set_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&ohci_hdl->ohci_mutex); reg = ddi_get32(ohci_hdl->ohci_reg_handle, @@ -2449,9 +2019,6 @@ hci1394_ohci_atreq_retries_set(hci1394_ohci_handle_t ohci_hdl, ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_retries, reg); mutex_exit(&ohci_hdl->ohci_mutex); - - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_retries_set_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2465,8 +2032,6 @@ hci1394_ohci_isr_cycle64seconds(hci1394_ohci_handle_t ohci_hdl) uint32_t cycle_time; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_isr_cycle64seconds_enter, - HCI1394_TNF_HAL_STACK, ""); hci1394_ohci_intr_clear(ohci_hdl, OHCI_INTR_CYC_64_SECS); cycle_time = ddi_get32(ohci_hdl->ohci_reg_handle, @@ -2480,9 +2045,6 @@ hci1394_ohci_isr_cycle64seconds(hci1394_ohci_handle_t ohci_hdl) if ((cycle_time & 0x80000000) == 0) { ohci_hdl->ohci_bustime_count++; } - - TNF_PROBE_0_DEBUG(hci1394_ohci_isr_cycle64seconds_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2498,8 +2060,6 @@ hci1394_ohci_isr_phy(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_isr_phy_enter, - HCI1394_TNF_HAL_STACK, ""); /* clear the interrupt */ hci1394_ohci_intr_clear(ohci_hdl, OHCI_INTR_PHY); @@ -2512,20 +2072,12 @@ hci1394_ohci_isr_phy(hci1394_ohci_handle_t ohci_hdl) * to read. */ if (ohci_hdl->ohci_phy == H1394_PHY_1995) { - TNF_PROBE_0(hci1394_ohci_phy_isr_1995, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_isr_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return; } /* See why we got this interrupt */ status = hci1394_ohci_phy_read(ohci_hdl, 5, &phy_status); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_read_failed, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_isr_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -2533,28 +2085,20 @@ hci1394_ohci_isr_phy(hci1394_ohci_handle_t ohci_hdl) ohci_hdl->ohci_drvinfo->di_stats.st_phy_loop_err++; cmn_err(CE_NOTE, "hci1394(%d): ERROR - bus loop detected", ohci_hdl->ohci_drvinfo->di_instance); - TNF_PROBE_0(hci1394_ohci_phy_isr_loop, HCI1394_TNF_HAL, ""); } if (phy_status & OHCI_PHY_PWRFAIL_ERR) { ohci_hdl->ohci_drvinfo->di_stats.st_phy_pwrfail_err++; - TNF_PROBE_0(hci1394_ohci_phy_isr_pwr, HCI1394_TNF_HAL, ""); } if (phy_status & OHCI_PHY_TIMEOUT_ERR) { ohci_hdl->ohci_drvinfo->di_stats.st_phy_timeout_err++; - TNF_PROBE_0(hci1394_ohci_phy_isr_tmout, HCI1394_TNF_HAL, ""); } if (phy_status & OHCI_PHY_PORTEVT_ERR) { ohci_hdl->ohci_drvinfo->di_stats.st_phy_portevt_err++; - TNF_PROBE_0(hci1394_ohci_phy_isr_pevt, HCI1394_TNF_HAL, ""); } /* clear any set status bits */ status = hci1394_ohci_phy_write(ohci_hdl, 5, phy_status); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_write_failed, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_isr_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -2564,9 +2108,6 @@ hci1394_ohci_isr_phy(hci1394_ohci_handle_t ohci_hdl) * we see a selfid complete. */ hci1394_ohci_intr_disable(ohci_hdl, OHCI_INTR_PHY); - - TNF_PROBE_0_DEBUG(hci1394_ohci_isr_phy_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2582,8 +2123,6 @@ hci1394_ohci_root_check(hci1394_ohci_handle_t ohci_hdl) int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_root_check_enter, HCI1394_TNF_HAL_STACK, - ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->node_id); if ((reg & OHCI_REG_NODEID_ROOT) && (reg & OHCI_NDID_IDVALID)) { @@ -2591,8 +2130,6 @@ hci1394_ohci_root_check(hci1394_ohci_handle_t ohci_hdl) } else { status = B_FALSE; } - TNF_PROBE_0_DEBUG(hci1394_ohci_root_check_exit, HCI1394_TNF_HAL_STACK, - ""); return (status); } @@ -2611,8 +2148,6 @@ hci1394_ohci_cmc_check(hci1394_ohci_handle_t ohci_hdl) int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_cmc_check_enter, HCI1394_TNF_HAL_STACK, - ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->bus_options); if (reg & OHCI_REG_BUSOPTIONS_CMC) { @@ -2620,8 +2155,6 @@ hci1394_ohci_cmc_check(hci1394_ohci_handle_t ohci_hdl) } else { status = B_FALSE; } - TNF_PROBE_0_DEBUG(hci1394_ohci_cmc_check_exit, HCI1394_TNF_HAL_STACK, - ""); return (status); } @@ -2636,8 +2169,6 @@ void hci1394_ohci_cycle_master_enable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_cycle_master_enable_enter, - HCI1394_TNF_HAL_STACK, ""); /* First make sure that cycleTooLong is clear */ ddi_put32(ohci_hdl->ohci_reg_handle, @@ -2646,9 +2177,6 @@ hci1394_ohci_cycle_master_enable(hci1394_ohci_handle_t ohci_hdl) /* Enable Cycle Master */ ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->link_ctrl_set, OHCI_LC_CYC_MAST); - - TNF_PROBE_0_DEBUG(hci1394_ohci_cycle_master_enable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2661,15 +2189,10 @@ void hci1394_ohci_cycle_master_disable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_cycle_master_disable_enter, - HCI1394_TNF_HAL_STACK, ""); /* disable cycle master */ ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->link_ctrl_clr, OHCI_LC_CYC_MAST); - - TNF_PROBE_0_DEBUG(hci1394_ohci_cycle_master_disable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2685,36 +2208,22 @@ hci1394_ohci_resume(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_resume_enter, - HCI1394_TNF_HAL_STACK, ""); /* Re-initialize the OpenHCI chip */ status = hci1394_ohci_chip_init(ohci_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_chip_init_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* Re-initialize the PHY */ status = hci1394_ohci_phy_resume(ohci_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_phy_resume_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* Re-initialize any 1394A features we are using */ status = hci1394_ohci_1394a_resume(ohci_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_1394a_resume_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2749,8 +2258,6 @@ hci1394_ohci_resume(hci1394_ohci_handle_t ohci_hdl) ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->config_rom_hdr, OHCI_SWAP32(quadlet)); - TNF_PROBE_0_DEBUG(hci1394_ohci_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -2767,7 +2274,6 @@ hci1394_ohci_selfid_init(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_init_selfid_enter, HCI1394_TNF_HAL_STACK, ""); /* * Setup for 2K buffer, aligned on a 2Kbyte address boundary. Make sure @@ -2780,9 +2286,6 @@ hci1394_ohci_selfid_init(hci1394_ohci_handle_t ohci_hdl) status = hci1394_buf_alloc(ohci_hdl->ohci_drvinfo, &parms, &ohci_hdl->ohci_selfid, &ohci_hdl->ohci_selfid_handle); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_buf_alloc_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_init_selfid_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2794,8 +2297,6 @@ hci1394_ohci_selfid_init(hci1394_ohci_handle_t ohci_hdl) /* Enable selfid DMA engine */ hci1394_ohci_selfid_enable(ohci_hdl); - TNF_PROBE_0_DEBUG(hci1394_init_selfid_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -2809,8 +2310,6 @@ void hci1394_ohci_selfid_enable(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_enable_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Allow selfid packets to be received. This should be called during @@ -2821,9 +2320,6 @@ hci1394_ohci_selfid_enable(hci1394_ohci_handle_t ohci_hdl) */ ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->link_ctrl_set, OHCI_LC_RCV_SELF); - - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_enable_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2837,12 +2333,8 @@ hci1394_ohci_selfid_read(hci1394_ohci_handle_t ohci_hdl, uint_t offset, { ASSERT(ohci_hdl != NULL); ASSERT(data != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_read_enter, - HCI1394_TNF_HAL_STACK, ""); *data = ddi_get32(ohci_hdl->ohci_selfid.bi_handle, &((uint32_t *)ohci_hdl->ohci_selfid.bi_kaddr)[offset]); - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_read_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2862,8 +2354,6 @@ hci1394_ohci_selfid_info(hci1394_ohci_handle_t ohci_hdl, uint_t *busgen, ASSERT(busgen != NULL); ASSERT(size != NULL); ASSERT(error != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_info_enter, - HCI1394_TNF_HAL_STACK, ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->self_id_count); @@ -2874,9 +2364,6 @@ hci1394_ohci_selfid_info(hci1394_ohci_handle_t ohci_hdl, uint_t *busgen, } else { *error = B_TRUE; } - - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_info_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -2892,8 +2379,6 @@ hci1394_ohci_selfid_buf_current(hci1394_ohci_handle_t ohci_hdl) int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_buf_current_enter, - HCI1394_TNF_HAL_STACK, ""); /* * if the generation stored in the selfid buffer is not equal to the @@ -2909,9 +2394,6 @@ hci1394_ohci_selfid_buf_current(hci1394_ohci_handle_t ohci_hdl) status = B_TRUE; } - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_buf_current_exit, - HCI1394_TNF_HAL_STACK, ""); - return (status); } @@ -2924,12 +2406,8 @@ void hci1394_ohci_selfid_sync(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_sync_enter, - HCI1394_TNF_HAL_STACK, ""); (void) ddi_dma_sync(ohci_hdl->ohci_selfid.bi_dma_handle, 0, ohci_hdl->ohci_selfid.bi_length, DDI_DMA_SYNC_FORKERNEL); - TNF_PROBE_0_DEBUG(hci1394_ohci_selfid_sync_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -2945,8 +2423,6 @@ hci1394_ohci_cfgrom_init(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_cfgrom_init_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Setup for 1K buffer, aligned at 1K address boundary, and allow no @@ -2960,9 +2436,6 @@ hci1394_ohci_cfgrom_init(hci1394_ohci_handle_t ohci_hdl) status = hci1394_buf_alloc(ohci_hdl->ohci_drvinfo, &parms, &ohci_hdl->ohci_cfgrom, &ohci_hdl->ohci_cfgrom_handle); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_buf_alloc_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_cfgrom_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -2971,9 +2444,6 @@ hci1394_ohci_cfgrom_init(hci1394_ohci_handle_t ohci_hdl) &ohci_hdl->ohci_regs->config_rom_maplo, (uint32_t)ohci_hdl->ohci_cfgrom.bi_cookie.dmac_address); - TNF_PROBE_0_DEBUG(hci1394_ohci_cfgrom_init_exit, HCI1394_TNF_HAL_STACK, - ""); - return (DDI_SUCCESS); } @@ -2987,8 +2457,7 @@ hci1394_ohci_bus_capabilities(hci1394_ohci_handle_t ohci_hdl, uint32_t *bus_capabilities) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_capabilities_enter, - HCI1394_TNF_HAL_STACK, ""); + /* * read in the bus options register. Set bits saying that we are isoch * resource manager capable, Cycle master capable, and Isoch capable @@ -2996,8 +2465,6 @@ hci1394_ohci_bus_capabilities(hci1394_ohci_handle_t ohci_hdl, *bus_capabilities = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->bus_options) | (OHCI_BOPT_IRMC | OHCI_BOPT_CMC | OHCI_BOPT_ISC); - TNF_PROBE_0_DEBUG(hci1394_ohci_bus_capabilities_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3014,18 +2481,12 @@ hci1394_ohci_at_active(hci1394_ohci_handle_t ohci_hdl) ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_at_active_enter, - HCI1394_TNF_HAL_STACK, ""); /* see if atreq active bit set */ reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_req.ctxt_ctrl_set); if (reg & OHCI_CC_ACTIVE_MASK) { /* atreq engine is still active */ - TNF_PROBE_0(hci1394_ohci_atreq_active_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_at_active_exit, - HCI1394_TNF_HAL_STACK, ""); return (B_TRUE); } @@ -3034,16 +2495,9 @@ hci1394_ohci_at_active(hci1394_ohci_handle_t ohci_hdl) &ohci_hdl->ohci_regs->at_resp.ctxt_ctrl_set); if (reg & OHCI_CC_ACTIVE_MASK) { /* atresp engine is still active */ - TNF_PROBE_0(hci1394_ohci_atresp_active_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_at_active_exit, - HCI1394_TNF_HAL_STACK, ""); return (B_TRUE); } - TNF_PROBE_0_DEBUG(hci1394_ohci_at_active_exit, - HCI1394_TNF_HAL_STACK, ""); - /* both atreq and atresp active bits are cleared */ return (B_FALSE); } @@ -3058,16 +2512,11 @@ void hci1394_ohci_atreq_start(hci1394_ohci_handle_t ohci_hdl, uint32_t cmdptr) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_start_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_req.cmd_ptrlo, cmdptr); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_req.ctxt_ctrl_set, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3081,14 +2530,9 @@ void hci1394_ohci_atreq_wake(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_wake_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_req.ctxt_ctrl_set, OHCI_CC_WAKE_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3101,14 +2545,9 @@ void hci1394_ohci_atreq_stop(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_stop_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_req.ctxt_ctrl_clr, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_atreq_stop_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3121,16 +2560,11 @@ void hci1394_ohci_arresp_start(hci1394_ohci_handle_t ohci_hdl, uint32_t cmdptr) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_arresp_start_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_resp.cmd_ptrlo, cmdptr); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_resp.ctxt_ctrl_set, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_arresp_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3144,14 +2578,9 @@ void hci1394_ohci_arresp_wake(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_arresp_wake_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_resp.ctxt_ctrl_set, OHCI_CC_WAKE_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_arresp_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3164,14 +2593,9 @@ void hci1394_ohci_arresp_stop(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_arresp_stop_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_resp.ctxt_ctrl_clr, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_arresp_stop_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3184,16 +2608,11 @@ void hci1394_ohci_arreq_start(hci1394_ohci_handle_t ohci_hdl, uint32_t cmdptr) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_arreq_start_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_req.cmd_ptrlo, cmdptr); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_req.ctxt_ctrl_set, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_arreq_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3207,14 +2626,9 @@ void hci1394_ohci_arreq_wake(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_arreq_wake_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_req.ctxt_ctrl_set, OHCI_CC_WAKE_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_arreq_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3227,14 +2641,9 @@ void hci1394_ohci_arreq_stop(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_arreq_stop_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->ar_req.ctxt_ctrl_clr, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_arreq_stop_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3247,16 +2656,11 @@ void hci1394_ohci_atresp_start(hci1394_ohci_handle_t ohci_hdl, uint32_t cmdptr) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atresp_start_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_resp.cmd_ptrlo, cmdptr); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_resp.ctxt_ctrl_set, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_atresp_start_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3270,14 +2674,9 @@ void hci1394_ohci_atresp_wake(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atresp_wake_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_resp.ctxt_ctrl_set, OHCI_CC_WAKE_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_atresp_wake_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3290,14 +2689,9 @@ void hci1394_ohci_atresp_stop(hci1394_ohci_handle_t ohci_hdl) { ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_atresp_stop_enter, - HCI1394_TNF_HAL_STACK, ""); ddi_put32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->at_resp.ctxt_ctrl_clr, OHCI_CC_RUN_MASK); - - TNF_PROBE_0_DEBUG(hci1394_ohci_atresp_stop_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -3313,8 +2707,6 @@ hci1394_ohci_1394a_init(hci1394_ohci_handle_t ohci_hdl) int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_1394a_init_enter, HCI1394_TNF_HAL_STACK, - ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->hc_ctrl_set); @@ -3324,16 +2716,10 @@ hci1394_ohci_1394a_init(hci1394_ohci_handle_t ohci_hdl) status = hci1394_ohci_phy_set(ohci_hdl, 5, (OHCI_PHY_ENBL_ACCEL | OHCI_PHY_ENBL_MULTI)); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_1394a_init_phy_fail, - HCI1394_TNF_HAL_STACK, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_1394a_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(hci1394_ohci_1394a_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); } @@ -3350,8 +2736,6 @@ hci1394_ohci_1394a_resume(hci1394_ohci_handle_t ohci_hdl) int status; ASSERT(ohci_hdl != NULL); - TNF_PROBE_0_DEBUG(hci1394_ohci_1394a_resume_enter, - HCI1394_TNF_HAL_STACK, ""); reg = ddi_get32(ohci_hdl->ohci_reg_handle, &ohci_hdl->ohci_regs->hc_ctrl_set); @@ -3361,15 +2745,9 @@ hci1394_ohci_1394a_resume(hci1394_ohci_handle_t ohci_hdl) status = hci1394_ohci_phy_set(ohci_hdl, 5, (OHCI_PHY_ENBL_ACCEL | OHCI_PHY_ENBL_MULTI)); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_ohci_1394a_resume_phy_fail, - HCI1394_TNF_HAL_STACK, ""); - TNF_PROBE_0_DEBUG(hci1394_ohci_1394a_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(hci1394_ohci_1394a_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_q.c b/usr/src/uts/common/io/1394/adapters/hci1394_q.c index 7f4bcfb4a6..891a805f65 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_q.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_q.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_q.c * This code decouples some of the OpenHCI async descriptor logic/structures @@ -101,7 +99,6 @@ hci1394_q_init(hci1394_drvinfo_t *drvinfo, ASSERT(drvinfo != NULL); ASSERT(qinfo != NULL); ASSERT(q_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_init_enter, HCI1394_TNF_HAL_STACK, ""); /* * allocate the memory to track this Q. Initialize the internal Q @@ -130,9 +127,6 @@ hci1394_q_init(hci1394_drvinfo_t *drvinfo, mutex_destroy(&q->q_mutex); kmem_free(q, sizeof (hci1394_q_t)); *q_handle = NULL; - TNF_PROBE_0(hci1394_q_init_bae_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -162,9 +156,6 @@ hci1394_q_init(hci1394_drvinfo_t *drvinfo, mutex_destroy(&q->q_mutex); kmem_free(q, sizeof (hci1394_q_t)); *q_handle = NULL; - TNF_PROBE_0(hci1394_q_init_baa_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -220,8 +211,6 @@ hci1394_q_init(hci1394_drvinfo_t *drvinfo, *q_handle = q; - TNF_PROBE_0_DEBUG(hci1394_q_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -238,7 +227,6 @@ hci1394_q_fini(hci1394_q_handle_t *q_handle) hci1394_q_t *q; ASSERT(q_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_fini_enter, HCI1394_TNF_HAL_STACK, ""); q = *q_handle; if (q->q_info.qi_mode == HCI1394_ATQ) { @@ -249,8 +237,6 @@ hci1394_q_fini(hci1394_q_handle_t *q_handle) hci1394_buf_free(&q->q_data.qb_buf_handle); kmem_free(q, sizeof (hci1394_q_t)); *q_handle = NULL; - - TNF_PROBE_0_DEBUG(hci1394_q_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -263,7 +249,6 @@ static void hci1394_q_buf_setup(hci1394_q_buf_t *qbuf) { ASSERT(qbuf != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_buf_setup_enter, HCI1394_TNF_HAL_STACK, ""); /* start with the first cookie */ qbuf->qb_ptrs.qp_current_buf = 0; @@ -285,8 +270,6 @@ hci1394_q_buf_setup(hci1394_q_buf_t *qbuf) * hci1394_q_reserve() before calling hci1394_q_at_write_O*(). */ qbuf->qb_ptrs.qp_resv_size = 0; - - TNF_PROBE_0_DEBUG(hci1394_q_buf_setup_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -303,7 +286,6 @@ hci1394_q_reset(hci1394_q_handle_t q_handle) int index; ASSERT(q_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_reset_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&q_handle->q_mutex); desc = &q_handle->q_desc; @@ -340,7 +322,6 @@ hci1394_q_reset(hci1394_q_handle_t q_handle) } mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_reset_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -354,9 +335,7 @@ void hci1394_q_resume(hci1394_q_handle_t q_handle) { ASSERT(q_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_resume_enter, HCI1394_TNF_HAL_STACK, ""); hci1394_q_reset(q_handle); - TNF_PROBE_0_DEBUG(hci1394_q_resume_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -370,11 +349,9 @@ void hci1394_q_stop(hci1394_q_handle_t q_handle) { ASSERT(q_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_stop_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&q_handle->q_mutex); q_handle->q_dma_running = B_FALSE; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_stop_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -400,7 +377,6 @@ hci1394_q_reserve(hci1394_q_buf_t *qbuf, uint_t size, uint32_t *io_addr) ASSERT(qbuf != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_reserve_enter, HCI1394_TNF_HAL_STACK, ""); /* Save backup of pointers in case we have to unreserve */ qbuf->qb_backup_ptrs = qbuf->qb_ptrs; @@ -436,10 +412,6 @@ hci1394_q_reserve(hci1394_q_buf_t *qbuf, uint_t size, uint32_t *io_addr) */ } else { qbuf->qb_ptrs.qp_resv_size = 0; - TNF_PROBE_0(hci1394_q_reserve_ns_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_reserve_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -464,10 +436,6 @@ hci1394_q_reserve(hci1394_q_buf_t *qbuf, uint_t size, uint32_t *io_addr) if ((qbuf->qb_ptrs.qp_current + aligned_size) > qbuf->qb_ptrs.qp_free) { qbuf->qb_ptrs.qp_resv_size = 0; - TNF_PROBE_0(hci1394_q_reserve_ns_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_reserve_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); /* * The free pointer is in this buffer. We have enough @@ -508,8 +476,6 @@ hci1394_q_reserve(hci1394_q_buf_t *qbuf, uint_t size, uint32_t *io_addr) qbuf->qb_ptrs.qp_offset); } - TNF_PROBE_0_DEBUG(hci1394_q_reserve_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -522,12 +488,9 @@ static void hci1394_q_unreserve(hci1394_q_buf_t *qbuf) { ASSERT(qbuf != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_unreserve_enter, HCI1394_TNF_HAL_STACK, ""); /* Go back to pointer setting before the reserve */ qbuf->qb_ptrs = qbuf->qb_backup_ptrs; - - TNF_PROBE_0_DEBUG(hci1394_q_unreserve_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -540,7 +503,6 @@ void hci1394_q_next_buf(hci1394_q_buf_t *qbuf) { ASSERT(qbuf != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_next_buf_enter, HCI1394_TNF_HAL_STACK, ""); /* * go to the next cookie, if we are >= the cookie count, go back to the @@ -560,8 +522,6 @@ hci1394_q_next_buf(hci1394_q_buf_t *qbuf) qbuf->qb_cookie[qbuf->qb_ptrs.qp_current_buf].dmac_size - 1; qbuf->qb_ptrs.qp_current = qbuf->qb_ptrs.qp_begin; qbuf->qb_ptrs.qp_offset = 0; - - TNF_PROBE_0_DEBUG(hci1394_q_next_buf_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -582,7 +542,6 @@ hci1394_q_at(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, ASSERT(q_handle != NULL); ASSERT(cmd != NULL); ASSERT(hdr != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_at_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&q_handle->q_mutex); @@ -596,9 +555,6 @@ hci1394_q_at(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, cmd->qc_generation)) { *result = H1394_STATUS_INVALID_BUSGEN; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0(hci1394_q_at_st_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_at_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -614,9 +570,6 @@ hci1394_q_at(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, if (status != DDI_SUCCESS) { *result = H1394_STATUS_NOMORE_SPACE; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0(hci1394_q_at_qre_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_at_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -627,7 +580,6 @@ hci1394_q_at(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, hci1394_tlist_add(q_handle->q_queued_list, &cmd->qc_node); mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_exit, HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -676,8 +628,6 @@ hci1394_q_at_with_data(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, ASSERT(cmd != NULL); ASSERT(hdr != NULL); ASSERT(data != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_data_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&q_handle->q_mutex); @@ -691,8 +641,6 @@ hci1394_q_at_with_data(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, cmd->qc_generation)) { *result = H1394_STATUS_INVALID_BUSGEN; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_wd_st_fail, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -709,10 +657,6 @@ hci1394_q_at_with_data(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, if (status != DDI_SUCCESS) { *result = H1394_STATUS_NOMORE_SPACE; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0(hci1394_q_at_wd_qre_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_data_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -722,10 +666,6 @@ hci1394_q_at_with_data(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, *result = H1394_STATUS_NOMORE_SPACE; hci1394_q_unreserve(&q_handle->q_desc); mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0(hci1394_q_at_wd_qra_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_data_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -743,8 +683,6 @@ hci1394_q_at_with_data(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, hci1394_tlist_add(q_handle->q_queued_list, &cmd->qc_node); mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_data_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); } @@ -773,8 +711,6 @@ hci1394_q_at_with_mblk(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, ASSERT(cmd != NULL); ASSERT(hdr != NULL); ASSERT(mblk != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_mblk_enter, HCI1394_TNF_HAL_STACK, - ""); mutex_enter(&q_handle->q_mutex); @@ -788,8 +724,6 @@ hci1394_q_at_with_mblk(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, cmd->qc_generation)) { *result = H1394_STATUS_INVALID_BUSGEN; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_wm_st_fail, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -806,10 +740,6 @@ hci1394_q_at_with_mblk(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, if (status != DDI_SUCCESS) { *result = H1394_STATUS_NOMORE_SPACE; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0(hci1394_q_at_wm_qre_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_mblk_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -820,10 +750,6 @@ hci1394_q_at_with_mblk(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, *result = H1394_STATUS_NOMORE_SPACE; hci1394_q_unreserve(&q_handle->q_desc); mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0(hci1394_q_at_wm_qra_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_mblk_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -841,8 +767,6 @@ hci1394_q_at_with_mblk(hci1394_q_handle_t q_handle, hci1394_q_cmd_t *cmd, hci1394_tlist_add(q_handle->q_queued_list, &cmd->qc_node); mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_with_mblk_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_SUCCESS); } @@ -866,7 +790,6 @@ hci1394_q_at_next(hci1394_q_handle_t q_handle, boolean_t flush_q, ASSERT(q_handle != NULL); ASSERT(cmd != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_at_next_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&q_handle->q_mutex); @@ -883,8 +806,6 @@ hci1394_q_at_next(hci1394_q_handle_t q_handle, boolean_t flush_q, /* There are no more commands left on the queued list */ *cmd = NULL; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_next_exit, HCI1394_TNF_HAL_STACK, - ""); return; } @@ -907,8 +828,6 @@ hci1394_q_at_next(hci1394_q_handle_t q_handle, boolean_t flush_q, if (cmd_status == 0) { *cmd = NULL; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_next_exit, - HCI1394_TNF_HAL_STACK, ""); return; } } @@ -936,7 +855,6 @@ hci1394_q_at_next(hci1394_q_handle_t q_handle, boolean_t flush_q, (*cmd)->qc_status = cmd_status; mutex_exit(&q_handle->q_mutex); - TNF_PROBE_0_DEBUG(hci1394_q_at_next_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -958,8 +876,6 @@ hci1394_q_at_write_OMI(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, ASSERT(cmd != NULL); ASSERT(hdr != NULL); ASSERT(MUTEX_HELD(&q_handle->q_mutex)); - TNF_PROBE_0_DEBUG(hci1394_q_at_write_OMI_enter, HCI1394_TNF_HAL_STACK, - ""); /* The only valid "header" sizes for an OMI are 8 bytes or 16 bytes */ ASSERT((hdrsize == 8) || (hdrsize == 16)); @@ -993,9 +909,6 @@ hci1394_q_at_write_OMI(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, q_handle->q_block_cnt += 2; qbuf->qb_ptrs.qp_resv_size -= sizeof (hci1394_desc_imm_t); qbuf->qb_ptrs.qp_current += sizeof (hci1394_desc_imm_t); - - TNF_PROBE_0_DEBUG(hci1394_q_at_write_OMI_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -1019,8 +932,6 @@ hci1394_q_at_write_OLI(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, ASSERT(cmd != NULL); ASSERT(hdr != NULL); ASSERT(MUTEX_HELD(&q_handle->q_mutex)); - TNF_PROBE_0_DEBUG(hci1394_q_at_write_OLI_enter, HCI1394_TNF_HAL_STACK, - ""); /* The only valid "header" sizes for an OLI are 8, 12, 16 bytes */ ASSERT((hdrsize == 8) || (hdrsize == 12) || (hdrsize == 16)); @@ -1119,9 +1030,6 @@ hci1394_q_at_write_OLI(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, } else { q_handle->q_info.qi_wake(q_handle->q_info.qi_callback_arg); } - - TNF_PROBE_0_DEBUG(hci1394_q_at_write_OLI_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -1145,8 +1053,6 @@ hci1394_q_at_write_OL(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, ASSERT(qbuf != NULL); ASSERT(cmd != NULL); ASSERT(MUTEX_HELD(&q_handle->q_mutex)); - TNF_PROBE_0_DEBUG(hci1394_q_at_write_OL_enter, HCI1394_TNF_HAL_STACK, - ""); /* make sure enough room for OL */ ASSERT(qbuf->qb_ptrs.qp_resv_size >= sizeof (hci1394_desc_t)); @@ -1219,9 +1125,6 @@ hci1394_q_at_write_OL(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, } else { q_handle->q_info.qi_wake(q_handle->q_info.qi_callback_arg); } - - TNF_PROBE_0_DEBUG(hci1394_q_at_write_OL_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -1238,8 +1141,6 @@ hci1394_q_at_rep_put8(hci1394_q_buf_t *qbuf, hci1394_q_cmd_t *cmd, ASSERT(qbuf != NULL); ASSERT(cmd != NULL); ASSERT(data != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_at_rep_put8_enter, HCI1394_TNF_HAL_STACK, - ""); /* Make sure enough room for data */ ASSERT(qbuf->qb_ptrs.qp_resv_size >= datasize); @@ -1262,9 +1163,6 @@ hci1394_q_at_rep_put8(hci1394_q_buf_t *qbuf, hci1394_q_cmd_t *cmd, /* Sync data buffer */ (void) ddi_dma_sync(qbuf->qb_buf.bi_dma_handle, 0, qbuf->qb_buf.bi_length, DDI_DMA_SYNC_FORDEV); - - TNF_PROBE_0_DEBUG(hci1394_q_at_rep_put8_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -1288,8 +1186,6 @@ hci1394_q_at_copy_from_mblk(hci1394_q_buf_t *qbuf, hci1394_q_cmd_t *cmd, ASSERT(qbuf != NULL); ASSERT(cmd != NULL); ASSERT(mblk != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_at_copy_from_mblk_enter, - HCI1394_TNF_HAL_STACK, ""); /* We return these variables to the Services Layer when we are done */ mblk->next_offset = mblk->curr_offset; @@ -1347,9 +1243,6 @@ hci1394_q_at_copy_from_mblk(hci1394_q_buf_t *qbuf, hci1394_q_cmd_t *cmd, mblk->next_offset = mblk->next_mblk->b_rptr; } } while (bytes_left > 0); - - TNF_PROBE_0_DEBUG(hci1394_q_at_copy_from_mblk_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -1369,7 +1262,6 @@ hci1394_q_ar_next(hci1394_q_handle_t q_handle, uint32_t **q_addr) ASSERT(q_handle != NULL); ASSERT(q_addr != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_ar_next_enter, HCI1394_TNF_HAL_STACK, ""); descb = &q_handle->q_desc; datab = &q_handle->q_data; @@ -1388,8 +1280,6 @@ hci1394_q_ar_next(hci1394_q_handle_t q_handle, uint32_t **q_addr) if (residual_count >= q_handle->q_space_left) { /* No new packets received */ *q_addr = NULL; - TNF_PROBE_0_DEBUG(hci1394_q_ar_next_exit, - HCI1394_TNF_HAL_STACK, ""); return; } @@ -1402,8 +1292,6 @@ hci1394_q_ar_next(hci1394_q_handle_t q_handle, uint32_t **q_addr) * packet. */ *q_addr = (uint32_t *)datab->qb_ptrs.qp_current; - - TNF_PROBE_0_DEBUG(hci1394_q_ar_next_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -1422,7 +1310,6 @@ hci1394_q_ar_free(hci1394_q_handle_t q_handle, uint_t size) ASSERT(q_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_ar_free_enter, HCI1394_TNF_HAL_STACK, ""); descb = &q_handle->q_desc; datab = &q_handle->q_data; @@ -1462,8 +1349,6 @@ hci1394_q_ar_free(hci1394_q_handle_t q_handle, uint_t size) q_handle->q_space_left -= size; datab->qb_ptrs.qp_current += size; } - - TNF_PROBE_0_DEBUG(hci1394_q_ar_free_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -1485,7 +1370,6 @@ hci1394_q_ar_get32(hci1394_q_handle_t q_handle, uint32_t *addr) ASSERT(q_handle != NULL); ASSERT(addr != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_get32_enter, HCI1394_TNF_HAL_STACK, ""); data = &q_handle->q_data; @@ -1503,8 +1387,6 @@ hci1394_q_ar_get32(hci1394_q_handle_t q_handle, uint32_t *addr) data32 = ddi_get32(data->qb_buf.bi_handle, addr); } - TNF_PROBE_0_DEBUG(hci1394_q_get32_exit, HCI1394_TNF_HAL_STACK, ""); - return (data32); } @@ -1531,8 +1413,6 @@ hci1394_q_ar_rep_get8(hci1394_q_handle_t q_handle, uint8_t *dest, ASSERT(q_handle != NULL); ASSERT(dest != NULL); ASSERT(q_addr != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_ar_rep_get8_enter, HCI1394_TNF_HAL_STACK, - ""); data = &q_handle->q_data; @@ -1575,9 +1455,6 @@ hci1394_q_ar_rep_get8(hci1394_q_handle_t q_handle, uint8_t *dest, ddi_rep_get8(data->qb_buf.bi_handle, dest, q_addr, size, DDI_DEV_AUTOINCR); } - - TNF_PROBE_0_DEBUG(hci1394_q_ar_rep_get8_exit, HCI1394_TNF_HAL_STACK, - ""); } @@ -1605,8 +1482,6 @@ hci1394_q_ar_copy_to_mblk(hci1394_q_handle_t q_handle, uint8_t *addr, ASSERT(q_handle != NULL); ASSERT(addr != NULL); ASSERT(mblk != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_copy_to_mblk_enter, - HCI1394_TNF_HAL_STACK, ""); /* We return these variables to the Services Layer when we are done */ mblk->next_offset = mblk->curr_offset; @@ -1675,9 +1550,6 @@ hci1394_q_ar_copy_to_mblk(hci1394_q_handle_t q_handle, uint8_t *addr, mblk->next_offset = mblk->next_mblk->b_wptr; } } while (bytes_left > 0); - - TNF_PROBE_0_DEBUG(hci1394_q_copy_to_mblk_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -1698,8 +1570,6 @@ hci1394_q_ar_write_IM(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, ASSERT(q_handle != NULL); ASSERT(qbuf != NULL); - TNF_PROBE_0_DEBUG(hci1394_q_ar_write_IM_enter, HCI1394_TNF_HAL_STACK, - ""); /* Make sure enough room for IM */ if ((qbuf->qb_ptrs.qp_current + sizeof (hci1394_desc_t)) > @@ -1760,7 +1630,4 @@ hci1394_q_ar_write_IM(hci1394_q_handle_t q_handle, hci1394_q_buf_t *qbuf, } else { q_handle->q_info.qi_wake(q_handle->q_info.qi_callback_arg); } - - TNF_PROBE_0_DEBUG(hci1394_q_ar_write_IM_exit, HCI1394_TNF_HAL_STACK, - ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_s1394if.c b/usr/src/uts/common/io/1394/adapters/hci1394_s1394if.c index 80948d8d9e..20a66ea5fb 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_s1394if.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_s1394if.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_s1394if.c * The interface into the HAL from the services layer. @@ -128,14 +126,9 @@ hci1394_s1394if_shutdown(void *hal_private) ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_shutdown_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; hci1394_shutdown(soft_state->drvinfo.di_dip); - - TNF_PROBE_0_DEBUG(hci1394_s1394if_shutdown_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -153,8 +146,6 @@ hci1394_s1394if_phy(void *hal_private, cmd1394_cmd_t *cmd_id, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; @@ -165,24 +156,15 @@ hci1394_s1394if_phy(void *hal_private, cmd1394_cmd_t *cmd_id, } else { *result = H1394_STATUS_INTERNAL_ERROR; } - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_async_phy(soft_state->async, cmd_id, cmd_private, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_phy_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -201,8 +183,6 @@ hci1394_s1394if_write(void *hal_private, cmd1394_cmd_t *cmd_id, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; @@ -213,25 +193,15 @@ hci1394_s1394if_write(void *hal_private, cmd1394_cmd_t *cmd_id, } else { *result = H1394_STATUS_INTERNAL_ERROR; } - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_async_write(soft_state->async, cmd_id, cmd_private, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_write_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -250,8 +220,6 @@ hci1394_s1394if_read(void *hal_private, cmd1394_cmd_t *cmd_id, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; @@ -262,24 +230,15 @@ hci1394_s1394if_read(void *hal_private, cmd1394_cmd_t *cmd_id, } else { *result = H1394_STATUS_INTERNAL_ERROR; } - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_async_read(soft_state->async, cmd_id, cmd_private, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_read_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -300,8 +259,6 @@ hci1394_s1394if_lock(void *hal_private, cmd1394_cmd_t *cmd_id, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; @@ -312,24 +269,15 @@ hci1394_s1394if_lock(void *hal_private, cmd1394_cmd_t *cmd_id, } else { *result = H1394_STATUS_INTERNAL_ERROR; } - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_async_lock(soft_state->async, cmd_id, cmd_private, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_lock_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -348,8 +296,6 @@ hci1394_s1394if_write_response(void *hal_private, cmd1394_cmd_t *cmd_id, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_response_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; @@ -360,25 +306,15 @@ hci1394_s1394if_write_response(void *hal_private, cmd1394_cmd_t *cmd_id, } else { *result = H1394_STATUS_INTERNAL_ERROR; } - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_async_write_response(soft_state->async, cmd_id, cmd_private, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_write_response_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_write_response_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -397,8 +333,6 @@ hci1394_s1394if_read_response(void *hal_private, cmd1394_cmd_t *cmd_id, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_response_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; @@ -409,25 +343,15 @@ hci1394_s1394if_read_response(void *hal_private, cmd1394_cmd_t *cmd_id, } else { *result = H1394_STATUS_INTERNAL_ERROR; } - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_async_read_response(soft_state->async, cmd_id, cmd_private, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_read_response_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_read_response_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -448,8 +372,6 @@ hci1394_s1394if_lock_response(void *hal_private, cmd1394_cmd_t *cmd_id, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_response_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; @@ -460,25 +382,15 @@ hci1394_s1394if_lock_response(void *hal_private, cmd1394_cmd_t *cmd_id, } else { *result = H1394_STATUS_INTERNAL_ERROR; } - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_async_lock_response(soft_state->async, cmd_id, cmd_private, result); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_async_lock_response_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_lock_response_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -499,12 +411,8 @@ hci1394_s1394if_response_complete(void *hal_private, cmd1394_cmd_t *cmd_id, hci1394_state_t *soft_state; ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_response_complete_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; hci1394_async_response_complete(soft_state->async, cmd_id, cmd_private); - TNF_PROBE_0_DEBUG(hci1394_s1394if_response_complete_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -521,31 +429,19 @@ hci1394_s1394if_reset_bus(void *hal_private) ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_reset_bus_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_reset_bus_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_ohci_bus_reset(soft_state->ohci); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_s1394if_reset_bus_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_reset_bus_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_reset_bus_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -564,39 +460,23 @@ hci1394_s1394if_set_contender_bit(void *hal_private) ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_contender_bit_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_contender_bit_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } if (soft_state->halinfo.phy == H1394_PHY_1995) { - TNF_PROBE_0(hci1394_s1394if_set_contender_bit_phyver_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_root_holdoff_bit_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_ohci_contender_enable(soft_state->ohci); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_s1394if_set_contender_bit_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_contender_bit_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_contender_bit_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -621,31 +501,19 @@ hci1394_s1394if_set_root_holdoff_bit(void *hal_private) ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_root_holdoff_bit_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_root_holdoff_bit_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_ohci_root_holdoff_enable(soft_state->ohci); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_s1394if_set_root_holdoff_bit_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_root_holdoff_bit_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_root_holdoff_bit_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -670,31 +538,19 @@ hci1394_s1394if_set_gap_count(void *hal_private, uint_t gap_count) ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_gap_count_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_gap_count_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_ohci_gap_count_set(soft_state->ohci, gap_count); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_s1394if_set_gap_count_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_gap_count_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_gap_count_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -727,32 +583,20 @@ hci1394_s1394if_phy_filter_set(void *hal_private, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_set_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_set_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_ohci_phy_filter_set(soft_state->ohci, mask, generation); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_s1394if_phy_filter_set_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_set_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_set_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -788,32 +632,20 @@ hci1394_s1394if_phy_filter_clr(void *hal_private, ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_clr_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_clr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_ohci_phy_filter_clr(soft_state->ohci, mask, generation); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_s1394if_phy_filter_clr_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_clr_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_phy_filter_clr_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -832,39 +664,23 @@ hci1394_s1394if_short_bus_reset(void *hal_private) ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_short_bus_reset_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_short_bus_reset_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } if (soft_state->halinfo.phy == H1394_PHY_1995) { - TNF_PROBE_0(hci1394_s1394if_short_bus_reset_phyver_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_set_root_holdoff_bit_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } status = hci1394_ohci_bus_reset_short(soft_state->ohci); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_s1394if_short_bus_reset_fail, - HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_short_bus_reset_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(hci1394_s1394if_short_bus_reset_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -885,24 +701,16 @@ hci1394_s1394if_update_config_rom(void *hal_private, ASSERT(hal_private != NULL); ASSERT(local_buf != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_update_config_rom_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_update_config_rom_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hci1394_ohci_cfgrom_update(soft_state->ohci, local_buf, quadlet_count); - TNF_PROBE_0_DEBUG(hci1394_s1394if_update_config_rom_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -926,16 +734,11 @@ hci1394_s1394if_csr_read(void *hal_private, uint_t offset, uint32_t *data) ASSERT(hal_private != NULL); ASSERT(data != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_read_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -999,14 +802,6 @@ hci1394_s1394if_csr_read(void *hal_private, uint_t offset, uint32_t *data) break; } - if (status != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_s1394if_csr_read_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, csr_address, offset); - } - - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_read_exit, - HCI1394_TNF_HAL_STACK, ""); - return (status); } @@ -1029,16 +824,11 @@ hci1394_s1394if_csr_write(void *hal_private, uint_t offset, uint32_t data) ASSERT(hal_private != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_write_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_write_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1123,14 +913,6 @@ hci1394_s1394if_csr_write(void *hal_private, uint_t offset, uint32_t data) break; } - if (status != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_s1394if_csr_write_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, csr_address, offset); - } - - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_write_exit, - HCI1394_TNF_HAL_STACK, ""); - return (status); } @@ -1155,16 +937,11 @@ hci1394_s1394if_csr_cswap32(void *hal_private, uint_t generation, uint_t offset, ASSERT(hal_private != NULL); ASSERT(old != NULL); - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_cswap32_enter, - HCI1394_TNF_HAL_STACK, ""); soft_state = (hci1394_state_t *)hal_private; /* make sure we are not shutdown */ if (hci1394_state(&soft_state->drvinfo) == HCI1394_SHUTDOWN) { - TNF_PROBE_0(hci1394_state_fail, HCI1394_TNF_HAL_ERROR, ""); - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_cswap32_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -1230,14 +1007,6 @@ hci1394_s1394if_csr_cswap32(void *hal_private, uint_t generation, uint_t offset, break; } - if (status != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_s1394if_csr_read_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, csr_address, offset); - } - - TNF_PROBE_0_DEBUG(hci1394_s1394if_csr_cswap32_exit, - HCI1394_TNF_HAL_STACK, ""); - return (status); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_tlabel.c b/usr/src/uts/common/io/1394/adapters/hci1394_tlabel.c index f96a48f66d..c06c7402f2 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_tlabel.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_tlabel.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_tlabel.h * These routines track the tlabel usage for a 1394 adapter. @@ -56,7 +54,6 @@ hci1394_tlabel_init(hci1394_drvinfo_t *drvinfo, hrtime_t reclaim_time_nS, ASSERT(tlabel_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlabel_init_enter, HCI1394_TNF_HAL_STACK, ""); /* alloc space for tlabel data */ tstruct = kmem_alloc(sizeof (hci1394_tlabel_t), KM_SLEEP); @@ -84,8 +81,6 @@ hci1394_tlabel_init(hci1394_drvinfo_t *drvinfo, hrtime_t reclaim_time_nS, * initialization) */ hci1394_tlabel_reset(tstruct); - - TNF_PROBE_0_DEBUG(hci1394_tlabel_init_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -102,7 +97,6 @@ hci1394_tlabel_fini(hci1394_tlabel_handle_t *tlabel_handle) ASSERT(tlabel_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlabel_fini_enter, HCI1394_TNF_HAL_STACK, ""); tstruct = (hci1394_tlabel_t *)*tlabel_handle; @@ -111,8 +105,6 @@ hci1394_tlabel_fini(hci1394_tlabel_handle_t *tlabel_handle) /* set handle to null. This helps catch bugs. */ *tlabel_handle = NULL; - - TNF_PROBE_0_DEBUG(hci1394_tlabel_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -136,8 +128,6 @@ hci1394_tlabel_alloc(hci1394_tlabel_handle_t tlabel_handle, uint_t destination, ASSERT(tlabel_handle != NULL); ASSERT(tlabel_info != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlabel_alloc_enter, - HCI1394_TNF_HAL_STACK, ""); /* copy destination into tlabel_info */ tlabel_info->tbi_destination = destination; @@ -178,10 +168,6 @@ hci1394_tlabel_alloc(hci1394_tlabel_handle_t tlabel_handle, uint_t destination, /* clear the bad list */ bad = 0; - - TNF_PROBE_1(hci1394_tlabel_free_bad, - HCI1394_TNF_HAL_ERROR, "", tnf_uint, nodeid, - node_number); } } @@ -198,11 +184,6 @@ hci1394_tlabel_alloc(hci1394_tlabel_handle_t tlabel_handle, uint_t destination, /* we are using this tlabel */ tlabel_info->tbi_tlabel = last; - TNF_PROBE_2_DEBUG(hci1394_tlabel_alloc, - HCI1394_TNF_HAL_TLABEL, "", tnf_uint, nodeid, - node_number, tnf_uint, alloced_tlabel, - tlabel_info->tbi_tlabel); - /* take it out of the free list */ free = free & ~((uint64_t)1 << last); @@ -224,9 +205,6 @@ hci1394_tlabel_alloc(hci1394_tlabel_handle_t tlabel_handle, uint_t destination, /* unlock the tlabel structure */ mutex_exit(&tlabel_handle->tb_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlabel_alloc_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -249,10 +227,6 @@ hci1394_tlabel_alloc(hci1394_tlabel_handle_t tlabel_handle, uint_t destination, mutex_exit(&tlabel_handle->tb_mutex); - TNF_PROBE_1(hci1394_tlabel_alloc_empty, HCI1394_TNF_HAL_ERROR, "", - tnf_string, errmsg, "No more tlabels left to alloc"); - TNF_PROBE_0_DEBUG(hci1394_tlabel_alloc_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_FAILURE); } @@ -273,16 +247,11 @@ hci1394_tlabel_free(hci1394_tlabel_handle_t tlabel_handle, ASSERT(tlabel_handle != NULL); ASSERT(tlabel_info != NULL); ASSERT(tlabel_info->tbi_tlabel <= TLABEL_MASK); - TNF_PROBE_0_DEBUG(hci1394_tlabel_free_enter, HCI1394_TNF_HAL_STACK, ""); /* figure out what node and tlabel we are using */ node_number = IEEE1394_NODE_NUM(tlabel_info->tbi_destination); tlabel = tlabel_info->tbi_tlabel; - TNF_PROBE_2_DEBUG(hci1394_tlabel_free, - HCI1394_TNF_HAL_TLABEL, "", tnf_uint, nodeid, node_number, - tnf_uint, freed_tlabel, tlabel_info->tbi_tlabel); - mutex_enter(&tlabel_handle->tb_mutex); /* @@ -295,8 +264,6 @@ hci1394_tlabel_free(hci1394_tlabel_handle_t tlabel_handle, tlabel_handle->tb_free[node_number] |= ((uint64_t)1 << tlabel); mutex_exit(&tlabel_handle->tb_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlabel_free_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -316,8 +283,6 @@ hci1394_tlabel_register(hci1394_tlabel_handle_t tlabel_handle, ASSERT(tlabel_handle != NULL); ASSERT(tlabel_info != NULL); ASSERT(tlabel_info->tbi_tlabel <= TLABEL_MASK); - TNF_PROBE_0_DEBUG(hci1394_tlabel_register_enter, - HCI1394_TNF_HAL_STACK, ""); /* figure out what node and tlabel we are using */ node_number = IEEE1394_NODE_NUM(tlabel_info->tbi_destination); @@ -329,9 +294,6 @@ hci1394_tlabel_register(hci1394_tlabel_handle_t tlabel_handle, tlabel_handle->tb_lookup[node_number][tlabel] = cmd; mutex_exit(&tlabel_handle->tb_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlabel_register_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -353,8 +315,6 @@ hci1394_tlabel_lookup(hci1394_tlabel_handle_t tlabel_handle, ASSERT(tlabel_info != NULL); ASSERT(cmd != NULL); ASSERT(tlabel_info->tbi_tlabel <= TLABEL_MASK); - TNF_PROBE_0_DEBUG(hci1394_tlabel_lookup_enter, - HCI1394_TNF_HAL_STACK, ""); /* figure out what node and tlabel we are using */ node_number = IEEE1394_NODE_NUM(tlabel_info->tbi_destination); @@ -369,13 +329,6 @@ hci1394_tlabel_lookup(hci1394_tlabel_handle_t tlabel_handle, *cmd = tlabel_handle->tb_lookup[node_number][tlabel]; mutex_exit(&tlabel_handle->tb_mutex); - - TNF_PROBE_2_DEBUG(hci1394_tlabel_lookup, - HCI1394_TNF_HAL_TLABEL, "", tnf_uint, nodeid, node_number, - tnf_uint, lookup_tlabel, tlabel_info->tbi_tlabel); - - TNF_PROBE_0_DEBUG(hci1394_tlabel_lookup_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -396,7 +349,6 @@ hci1394_tlabel_bad(hci1394_tlabel_handle_t tlabel_handle, ASSERT(tlabel_handle != NULL); ASSERT(tlabel_info != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlabel_bad_enter, HCI1394_TNF_HAL_STACK, ""); /* figure out what node and tlabel we are using */ node_number = IEEE1394_NODE_NUM(tlabel_info->tbi_destination); @@ -404,9 +356,6 @@ hci1394_tlabel_bad(hci1394_tlabel_handle_t tlabel_handle, mutex_enter(&tlabel_handle->tb_mutex); - TNF_PROBE_2(hci1394_tlabel_timeout, HCI1394_TNF_HAL_ERROR, "", tnf_uint, - nodeid, node_number, tnf_uint, bad_tlabel, tlabel_info->tbi_tlabel); - /* * Put the tlabel in the bad list and NULL out the (void *) in the * lookup structure. We may see this tlabel shortly if the device is @@ -421,8 +370,6 @@ hci1394_tlabel_bad(hci1394_tlabel_handle_t tlabel_handle, tlabel_handle->tb_lookup[node_number][tlabel] = NULL; mutex_exit(&tlabel_handle->tb_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlabel_bad_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -440,13 +387,9 @@ hci1394_tlabel_reset(hci1394_tlabel_handle_t tlabel_handle) ASSERT(tlabel_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlabel_reset_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&tlabel_handle->tb_mutex); - TNF_PROBE_0_DEBUG(hci1394_tlabel_reset, HCI1394_TNF_HAL_TLABEL, ""); - /* Bus reset optimization. handle broadcast writes separately */ if (tlabel_handle->tb_bcast_sent == B_TRUE) { tlabel_handle->tb_free[IEEE1394_BROADCAST_NODEID] = @@ -481,8 +424,6 @@ hci1394_tlabel_reset(hci1394_tlabel_handle_t tlabel_handle) tlabel_handle->tb_bcast_sent = B_FALSE; mutex_exit(&tlabel_handle->tb_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlabel_reset_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -504,8 +445,6 @@ hci1394_tlabel_set_reclaim_time(hci1394_tlabel_handle_t tlabel_handle, hrtime_t reclaim_time_nS) { ASSERT(tlabel_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlabel_set_reclaim_time_enter, - HCI1394_TNF_HAL_STACK, ""); /* * We do not need to lock the tlabel structure in this because we are @@ -513,7 +452,4 @@ hci1394_tlabel_set_reclaim_time(hci1394_tlabel_handle_t tlabel_handle, * we may need to add calls to lock() and unlock(). */ tlabel_handle->tb_reclaim_time = reclaim_time_nS; - - TNF_PROBE_0_DEBUG(hci1394_tlabel_set_reclaim_time_exit, - HCI1394_TNF_HAL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_tlist.c b/usr/src/uts/common/io/1394/adapters/hci1394_tlist.c index e32ab382c0..7308e46f45 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_tlist.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_tlist.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_tlist.c * This implements a timed double linked list. @@ -77,7 +75,6 @@ hci1394_tlist_init(hci1394_drvinfo_t *drvinfo, hci1394_tlist_timer_t *timer, ASSERT(tlist_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_init_enter, HCI1394_TNF_HAL_STACK, ""); /* try to alloc the space to keep track of the list */ list = kmem_alloc(sizeof (hci1394_tlist_t), KM_SLEEP); @@ -99,8 +96,6 @@ hci1394_tlist_init(hci1394_drvinfo_t *drvinfo, hci1394_tlist_timer_t *timer, } mutex_init(&list->tl_mutex, NULL, MUTEX_DRIVER, drvinfo->di_iblock_cookie); - - TNF_PROBE_0_DEBUG(hci1394_tlist_init_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -117,7 +112,6 @@ hci1394_tlist_fini(hci1394_tlist_handle_t *tlist_handle) ASSERT(tlist_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_fini_enter, HCI1394_TNF_HAL_STACK, ""); list = (hci1394_tlist_t *)*tlist_handle; hci1394_tlist_timeout_cancel(list); @@ -126,8 +120,6 @@ hci1394_tlist_fini(hci1394_tlist_handle_t *tlist_handle) /* set handle to null. This helps catch bugs. */ *tlist_handle = NULL; - - TNF_PROBE_0_DEBUG(hci1394_tlist_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -142,7 +134,6 @@ hci1394_tlist_add(hci1394_tlist_handle_t tlist_handle, { ASSERT(tlist_handle != NULL); ASSERT(node != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_add_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&tlist_handle->tl_mutex); @@ -185,8 +176,6 @@ hci1394_tlist_add(hci1394_tlist_handle_t tlist_handle, } mutex_exit(&tlist_handle->tl_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlist_add_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -202,8 +191,6 @@ hci1394_tlist_delete(hci1394_tlist_handle_t tlist_handle, { ASSERT(tlist_handle != NULL); ASSERT(node != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_delete_enter, - HCI1394_TNF_HAL_STACK, ""); mutex_enter(&tlist_handle->tl_mutex); @@ -215,15 +202,12 @@ hci1394_tlist_delete(hci1394_tlist_handle_t tlist_handle, */ if (node->tln_on_list == B_FALSE) { mutex_exit(&tlist_handle->tl_mutex); - TNF_PROBE_0_DEBUG(hci1394_tlist_delete_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } hci1394_tlist_remove(tlist_handle, node); mutex_exit(&tlist_handle->tl_mutex); - TNF_PROBE_0_DEBUG(hci1394_tlist_delete_exit, HCI1394_TNF_HAL_STACK, ""); return (DDI_SUCCESS); } @@ -239,7 +223,6 @@ hci1394_tlist_get(hci1394_tlist_handle_t tlist_handle, { ASSERT(tlist_handle != NULL); ASSERT(node != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_get_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&tlist_handle->tl_mutex); @@ -252,8 +235,6 @@ hci1394_tlist_get(hci1394_tlist_handle_t tlist_handle, } mutex_exit(&tlist_handle->tl_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlist_get_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -268,13 +249,10 @@ hci1394_tlist_peek(hci1394_tlist_handle_t tlist_handle, { ASSERT(tlist_handle != NULL); ASSERT(node != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_peek_enter, HCI1394_TNF_HAL_STACK, ""); mutex_enter(&tlist_handle->tl_mutex); *node = tlist_handle->tl_head; mutex_exit(&tlist_handle->tl_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlist_peek_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -290,14 +268,9 @@ hci1394_tlist_timeout_update(hci1394_tlist_handle_t tlist_handle, hrtime_t timeout) { ASSERT(tlist_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_update_timeout_enter, - HCI1394_TNF_HAL_STACK, ""); /* set timeout to the new timeout */ tlist_handle->tl_timer_info.tlt_timeout = timeout; - - TNF_PROBE_0_DEBUG(hci1394_tlist_update_timeout_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -311,8 +284,6 @@ void hci1394_tlist_timeout_cancel(hci1394_tlist_handle_t tlist_handle) { ASSERT(tlist_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_timeout_cancel_enter, - HCI1394_TNF_HAL_STACK, ""); /* * Cancel the timeout. Do NOT use the tlist mutex here. It could cause a @@ -322,9 +293,6 @@ hci1394_tlist_timeout_cancel(hci1394_tlist_handle_t tlist_handle) (void) untimeout(tlist_handle->tl_timeout_id); tlist_handle->tl_state = HCI1394_TLIST_TIMEOUT_OFF; } - - TNF_PROBE_0_DEBUG(hci1394_tlist_timeout_cancel_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -344,8 +312,6 @@ hci1394_tlist_callback(void *tlist_handle) ASSERT(tlist_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_tlist_callback_enter, - HCI1394_TNF_HAL_STACK, ""); list = (hci1394_tlist_t *)tlist_handle; @@ -444,9 +410,6 @@ hci1394_tlist_callback(void *tlist_handle) } mutex_exit(&list->tl_mutex); - - TNF_PROBE_0_DEBUG(hci1394_tlist_callback_exit, - HCI1394_TNF_HAL_STACK, ""); } @@ -462,8 +425,6 @@ hci1394_tlist_remove(hci1394_tlist_t *list, hci1394_tlist_node_t *node) ASSERT(node != NULL); ASSERT(node->tln_on_list == B_TRUE); ASSERT(MUTEX_HELD(&list->tl_mutex)); - TNF_PROBE_0_DEBUG(hci1394_tlist_remove_enter, - HCI1394_TNF_HAL_STACK, ""); /* if this is the only node on the list */ if ((list->tl_head == node) && @@ -493,8 +454,6 @@ hci1394_tlist_remove(hci1394_tlist_t *list, hci1394_tlist_node_t *node) /* cleanup the node's link pointers */ node->tln_prev = NULL; node->tln_next = NULL; - - TNF_PROBE_0_DEBUG(hci1394_tlist_remove_exit, HCI1394_TNF_HAL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/adapters/hci1394_vendor.c b/usr/src/uts/common/io/1394/adapters/hci1394_vendor.c index cba68f5629..106590e0b7 100644 --- a/usr/src/uts/common/io/1394/adapters/hci1394_vendor.c +++ b/usr/src/uts/common/io/1394/adapters/hci1394_vendor.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * hci1394_vendor.c * These routines provide initialization, cleanup, and general access to @@ -87,7 +85,6 @@ hci1394_vendor_init(hci1394_drvinfo_t *drvinfo, hci1394_ohci_handle_t ohci, ASSERT(drvinfo != NULL); ASSERT(vendor_info != NULL); ASSERT(vendor_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_vendor_init_enter, HCI1394_TNF_HAL_STACK, ""); /* * alloc the space to keep track of the vendor registers. @@ -114,11 +111,6 @@ hci1394_vendor_init(hci1394_drvinfo_t *drvinfo, hci1394_ohci_handle_t ohci, kmem_free(vendor, sizeof (hci1394_vendor_t)); *vendor_handle = NULL; - TNF_PROBE_1(hci1394_vendor_init_rio_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, - errmsg, "hci1394_rio_init() failed"); - TNF_PROBE_0_DEBUG(hci1394_vendor_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } break; @@ -140,8 +132,6 @@ hci1394_vendor_init(hci1394_drvinfo_t *drvinfo, hci1394_ohci_handle_t ohci, vendor_info->vendor_reg_count = vendor->ve_reg_count; - TNF_PROBE_0_DEBUG(hci1394_vendor_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -165,7 +155,6 @@ hci1394_vendor_fini(hci1394_vendor_handle_t *vendor_handle) ASSERT(vendor_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_vendor_fini_enter, HCI1394_TNF_HAL_STACK, ""); for (index = 0; index < (*vendor_handle)->ve_reg_count; index++) { ddi_regs_map_free(&(*vendor_handle)-> @@ -175,8 +164,6 @@ hci1394_vendor_fini(hci1394_vendor_handle_t *vendor_handle) /* Set the vendor_handle to NULL to help catch bugs */ *vendor_handle = NULL; - - TNF_PROBE_0_DEBUG(hci1394_vendor_fini_exit, HCI1394_TNF_HAL_STACK, ""); } @@ -193,8 +180,6 @@ hci1394_vendor_resume(hci1394_vendor_handle_t vendor_handle) ASSERT(vendor_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_vendor_resume_enter, HCI1394_TNF_HAL_STACK, - ""); vendor_info = &vendor_handle->ve_info; @@ -209,11 +194,6 @@ hci1394_vendor_resume(hci1394_vendor_handle_t vendor_handle) case VENDOR_DID_RIO_1394: status = hci1394_rio_resume(vendor_handle); if (status != DDI_SUCCESS) { - TNF_PROBE_1(hci1394_vendor_resume_rio_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, - errmsg, "hci1394_rio_resume() failed"); - TNF_PROBE_0_DEBUG(hci1394_vendor_resume_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } break; @@ -231,9 +211,6 @@ hci1394_vendor_resume(hci1394_vendor_handle_t vendor_handle) break; } - TNF_PROBE_0_DEBUG(hci1394_vendor_resume_exit, HCI1394_TNF_HAL_STACK, - ""); - return (DDI_SUCCESS); } @@ -255,15 +232,8 @@ hci1394_vendor_reg_write(hci1394_vendor_handle_t vendor_handle, ASSERT(vendor_handle != NULL); - TNF_PROBE_0_DEBUG(hci1394_vendor_reg_write_enter, - HCI1394_TNF_HAL_STACK, ""); if (vendor_handle->ve_reg_count < (reg_set + 1)) { - TNF_PROBE_1(hci1394_vendor_reg_write_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "reg_set not present"); - TNF_PROBE_0_DEBUG(hci1394_vendor_reg_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -273,9 +243,6 @@ hci1394_vendor_reg_write(hci1394_vendor_handle_t vendor_handle, ddi_put32(venreg->vr_reg_handle, regaddr, data); - TNF_PROBE_0_DEBUG(hci1394_vendor_reg_write_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -298,15 +265,8 @@ hci1394_vendor_reg_read(hci1394_vendor_handle_t vendor_handle, uint_t reg_set, ASSERT(vendor_handle != NULL); ASSERT(data != NULL); - TNF_PROBE_0_DEBUG(hci1394_vendor_reg_read_enter, - HCI1394_TNF_HAL_STACK, ""); if (vendor_handle->ve_reg_count < (reg_set + 1)) { - TNF_PROBE_1(hci1394_vendor_reg_read_fail, - HCI1394_TNF_HAL_ERROR, "", tnf_string, errmsg, - "reg_set not present"); - TNF_PROBE_0_DEBUG(hci1394_vendor_reg_read_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } @@ -316,9 +276,6 @@ hci1394_vendor_reg_read(hci1394_vendor_handle_t vendor_handle, uint_t reg_set, *data = ddi_get32(venreg->vr_reg_handle, regaddr); - TNF_PROBE_0_DEBUG(hci1394_vendor_reg_read_exit, - HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -333,7 +290,6 @@ hci1394_rio_init(hci1394_vendor_t *vendor) ASSERT(vendor != NULL); - TNF_PROBE_0_DEBUG(hci1394_rio_init_enter, HCI1394_TNF_HAL_STACK, ""); vendor->ve_reg_count = 1; vendor->ve_reg_array[0] = kmem_alloc(sizeof (hci1394_vendor_reg_t), @@ -347,10 +303,6 @@ hci1394_rio_init(hci1394_vendor_t *vendor) vendor->ve_reg_count = 0; kmem_free(vendor->ve_reg_array[0], sizeof (hci1394_vendor_reg_t)); - TNF_PROBE_0(hci1394_rio_init_rms_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_rio_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } @@ -363,18 +315,12 @@ hci1394_rio_init(hci1394_vendor_t *vendor) kmem_free(vendor->ve_reg_array[0], sizeof (hci1394_vendor_reg_t)); vendor->ve_reg_array[0] = NULL; - TNF_PROBE_0(hci1394_rio_init_vrw_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_rio_init_exit, - HCI1394_TNF_HAL_STACK, ""); return (DDI_FAILURE); } /* Setup GUID on RIO without firmware support */ hci1394_rio_guid_init(vendor); - TNF_PROBE_0_DEBUG(hci1394_rio_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -390,24 +336,17 @@ hci1394_rio_resume(hci1394_vendor_t *vendor) ASSERT(vendor != NULL); - TNF_PROBE_0_DEBUG(hci1394_rio_init_enter, HCI1394_TNF_HAL_STACK, ""); /* Setup RIO Host Control Register */ status = hci1394_vendor_reg_write(vendor, 0, RIOREG_HOST_CONTROL, RIOREG_HOST_CONTROL_SETTING); if (status != DDI_SUCCESS) { - TNF_PROBE_0(hci1394_rio_resume_vrw_fail, HCI1394_TNF_HAL_ERROR, - ""); - TNF_PROBE_0_DEBUG(hci1394_rio_init_exit, HCI1394_TNF_HAL_STACK, - ""); return (DDI_FAILURE); } /* Setup GUID on RIO PPX */ hci1394_rio_guid_init(vendor); - TNF_PROBE_0_DEBUG(hci1394_rio_init_exit, HCI1394_TNF_HAL_STACK, ""); - return (DDI_SUCCESS); } @@ -425,8 +364,6 @@ hci1394_rio_guid_init(hci1394_vendor_t *vendor) hrtime_t guid_timestamp; ASSERT(vendor != NULL); - TNF_PROBE_0_DEBUG(hci1394_rio_guid_init_enter, HCI1394_TNF_HAL_STACK, - ""); if (hci1394_set_rio_guid != 0) { guid_timestamp = gethrtime(); @@ -445,7 +382,4 @@ hci1394_rio_guid_init(hci1394_vendor_t *vendor) &vendor->ve_ohci->ohci_regs->guid_lo, (uint32_t)(guid_timestamp & 0xFFFFFFFF)); } - - TNF_PROBE_0_DEBUG(hci1394_rio_guid_init_exit, HCI1394_TNF_HAL_STACK, - ""); } diff --git a/usr/src/uts/common/io/1394/h1394.c b/usr/src/uts/common/io/1394/h1394.c index 09b888ee45..fb1d673ede 100644 --- a/usr/src/uts/common/io/1394/h1394.c +++ b/usr/src/uts/common/io/1394/h1394.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * h1394.c * 1394 Services Layer HAL Interface @@ -46,8 +44,6 @@ #include <sys/disp.h> #include <sys/time.h> #include <sys/devctl.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -74,12 +70,9 @@ h1394_init(struct modlinkage *modlp) { struct dev_ops *devops; - TNF_PROBE_0_DEBUG(h1394_init_enter, S1394_TNF_SL_STACK, ""); - devops = ((struct modldrv *)(modlp->ml_linkage[0]))->drv_dev_ops; devops->devo_bus_ops = &nx1394_busops; - TNF_PROBE_0_DEBUG(h1394_init_exit, S1394_TNF_SL_STACK, ""); return (0); } @@ -98,12 +91,8 @@ h1394_fini(struct modlinkage *modlp) { struct dev_ops *devops; - TNF_PROBE_0_DEBUG(h1394_fini_enter, S1394_TNF_SL_STACK, ""); - devops = ((struct modldrv *)(modlp->ml_linkage[0]))->drv_dev_ops; devops->devo_bus_ops = NULL; - - TNF_PROBE_0_DEBUG(h1394_fini_enter, S1394_TNF_SL_STACK, ""); } /* @@ -130,8 +119,6 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) char buf[32]; uint_t cmd_size; - TNF_PROBE_0_DEBUG(h1394_attach_enter, S1394_TNF_SL_STACK, ""); - ASSERT(sl_private != NULL); /* If this is a DDI_RESUME, return success */ @@ -141,15 +128,8 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) if (hal->halinfo.phy == H1394_PHY_1394A) (void) HAL_CALL(hal).set_contender_bit( hal->halinfo.hal_private); - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, - ""); return (DDI_SUCCESS); } else if (cmd != DDI_ATTACH) { - TNF_PROBE_2(h1394_attach_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Invalid ddi_attach_cmd received", - tnf_uint, attach_cmd, (uint_t)cmd); - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, - ""); return (DDI_FAILURE); } @@ -216,10 +196,6 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) /* Clean up before leaving */ s1394_cleanup_for_detach(hal, H1394_CLEANUP_LEVEL0); - TNF_PROBE_1(h1394_attach_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Unable to define attach events"); - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, - ""); return (DDI_FAILURE); } @@ -258,10 +234,6 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) /* Clean up before leaving */ s1394_cleanup_for_detach(hal, H1394_CLEANUP_LEVEL3); - TNF_PROBE_1(h1394_attach_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Failure in s1394_kstat_init"); - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, - ""); return (DDI_FAILURE); } hal->hal_kstats->guid = hal->halinfo.guid; @@ -276,9 +248,6 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) /* Clean up before leaving */ s1394_cleanup_for_detach(hal, H1394_CLEANUP_LEVEL4); - TNF_PROBE_1(h1394_attach_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Failure in s1394_init_local_config_rom"); - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, ""); return (DDI_FAILURE); } @@ -288,10 +257,6 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) /* Clean up before leaving */ s1394_cleanup_for_detach(hal, H1394_CLEANUP_LEVEL5); - TNF_PROBE_1(h1394_attach_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Invalid 1394 address space"); - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, - ""); return (DDI_FAILURE); } @@ -301,10 +266,6 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) /* Clean up before leaving */ s1394_cleanup_for_detach(hal, H1394_CLEANUP_LEVEL6); - TNF_PROBE_1(h1394_attach_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "FCP initialization failure"); - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, - ""); return (DDI_FAILURE); } @@ -332,7 +293,6 @@ h1394_attach(h1394_halinfo_t *halinfo, ddi_attach_cmd_t cmd, void **sl_private) /* Fill in services layer private info */ *sl_private = (void *)hal; - TNF_PROBE_0_DEBUG(h1394_attach_exit, S1394_TNF_SL_STACK, ""); return (DDI_SUCCESS); } @@ -356,8 +316,6 @@ h1394_detach(void **sl_private, ddi_detach_cmd_t cmd) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(h1394_detach_enter, S1394_TNF_SL_STACK, ""); - hal = (s1394_hal_t *)(*sl_private); switch (cmd) { @@ -376,14 +334,9 @@ h1394_detach(void **sl_private, ddi_detach_cmd_t cmd) break; default: - TNF_PROBE_2(h1394_attach_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Invalid ddi_detach_cmd_t type specified", - tnf_uint, detach_cmd, (uint_t)cmd); - TNF_PROBE_0_DEBUG(h1394_detach_exit, S1394_TNF_SL_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(h1394_detach_exit, S1394_TNF_SL_STACK, ""); return (DDI_SUCCESS); } @@ -412,16 +365,9 @@ h1394_alloc_cmd(void *sl_private, uint_t flags, cmd1394_cmd_t **cmdp, s1394_hal_t *hal; s1394_cmd_priv_t *s_priv; - TNF_PROBE_0_DEBUG(h1394_alloc_cmd_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - hal = (s1394_hal_t *)sl_private; if (s1394_alloc_cmd(hal, flags, cmdp) != DDI_SUCCESS) { - TNF_PROBE_1(h1394_alloc_cmd_error, S1394_TNF_SL_ARREQ_ERROR, "", - tnf_string, msg, "Failed to allocate command structure"); - TNF_PROBE_0_DEBUG(h1394_alloc_cmd_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -430,8 +376,6 @@ h1394_alloc_cmd(void *sl_private, uint_t flags, cmd1394_cmd_t **cmdp, *hal_priv_ptr = &s_priv->hal_cmd_private; - TNF_PROBE_0_DEBUG(h1394_alloc_cmd_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (DDI_SUCCESS); } @@ -455,9 +399,6 @@ h1394_free_cmd(void *sl_private, cmd1394_cmd_t **cmdp) s1394_hal_t *hal; s1394_cmd_priv_t *s_priv; - TNF_PROBE_0_DEBUG(h1394_free_cmd_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - hal = (s1394_hal_t *)sl_private; /* Get the Services Layer private area */ @@ -465,10 +406,6 @@ h1394_free_cmd(void *sl_private, cmd1394_cmd_t **cmdp) /* Check that command isn't in use */ if (s_priv->cmd_in_use == B_TRUE) { - TNF_PROBE_1(h1394_free_cmd_error, S1394_TNF_SL_ARREQ_ERROR, "", - tnf_string, msg, "Attempted to free an in-use command"); - TNF_PROBE_0_DEBUG(h1394_free_cmd_exit, S1394_TNF_SL_ARREQ_STACK, - ""); ASSERT(s_priv->cmd_in_use == B_FALSE); return (DDI_FAILURE); } @@ -481,8 +418,6 @@ h1394_free_cmd(void *sl_private, cmd1394_cmd_t **cmdp) /* kstats - number of cmds freed */ hal->hal_kstats->cmd_free++; - TNF_PROBE_0_DEBUG(h1394_free_cmd_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (DDI_SUCCESS); } @@ -511,9 +446,6 @@ h1394_cmd_is_complete(void *sl_private, cmd1394_cmd_t *command_id, s1394_hal_t *hal; dev_info_t *dip; - TNF_PROBE_0_DEBUG(h1394_cmd_is_complete_enter, - S1394_TNF_SL_ATREQ_ATRESP_STACK, ""); - hal = (s1394_hal_t *)sl_private; /* Is it AT_RESP or AT_REQ? */ @@ -536,14 +468,8 @@ h1394_cmd_is_complete(void *sl_private, cmd1394_cmd_t *command_id, /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_cmd_is_complete_error, - S1394_TNF_SL_ATREQ_ATRESP_ERROR, "", - tnf_string, msg, "Invalid command type specified"); break; } - - TNF_PROBE_0_DEBUG(h1394_cmd_is_complete_exit, - S1394_TNF_SL_ATREQ_ATRESP_STACK, ""); } /* @@ -563,8 +489,6 @@ h1394_bus_reset(void *sl_private, void **selfid_buf_addr) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(h1394_bus_reset_enter, S1394_TNF_SL_BR_STACK, ""); - hal = (s1394_hal_t *)sl_private; mutex_enter(&hal->topology_tree_mutex); @@ -581,11 +505,6 @@ h1394_bus_reset(void *sl_private, void **selfid_buf_addr) hal->initiated_bus_reset = B_FALSE; if (hal->num_bus_reset_till_fail > 0) { hal->num_bus_reset_till_fail--; - } else { - TNF_PROBE_2(h1394_bus_reset_error, - S1394_TNF_SL_BR_ERROR, "", - tnf_string, msg, "Bus reset fail (too many resets)", - tnf_uint, br_type, hal->initiated_br_reason); } } else { hal->num_bus_reset_till_fail = NUM_BR_FAIL; @@ -615,8 +534,6 @@ h1394_bus_reset(void *sl_private, void **selfid_buf_addr) mutex_enter(&hal->bus_mgr_node_mutex); hal->bus_mgr_node = -1; mutex_exit(&hal->bus_mgr_node_mutex); - - TNF_PROBE_0_DEBUG(h1394_bus_reset_exit, S1394_TNF_SL_BR_STACK, ""); } /* @@ -655,17 +572,12 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, * able to build the topology tree. * tree_processed indicates we read the config ROMs as needed. */ - TNF_PROBE_1_DEBUG(h1394_self_ids_enter, S1394_TNF_SL_BR_STACK, "", - tnf_uint, hal_generation, generation_count); - hal = (s1394_hal_t *)sl_private; /* Lock the topology tree */ mutex_enter(&hal->topology_tree_mutex); if (hal->hal_state == S1394_HAL_SHUTDOWN) { mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_0_DEBUG(h1394_self_ids_exit, S1394_TNF_SL_BR_STACK, - ""); return; } @@ -689,8 +601,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, */ if ((hal->topology_tree_valid == B_TRUE) && (hal->topology_tree_processed == B_TRUE)) { - TNF_PROBE_0_DEBUG(h1394_self_ids_tree_copy, - S1394_TNF_SL_BR_STACK, ""); /* Trees are switched after the copy completes */ s1394_copy_old_tree(hal); tree_copied = B_TRUE; @@ -705,9 +615,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, hal->topology_tree_processed = B_FALSE; hal->cfgroms_being_read = 0; - TNF_PROBE_0_DEBUG(h1394_self_ids_parse_selfid, S1394_TNF_SL_BR_STACK, - ""); - /* * Save the number of nodes prior to parsing the self id buffer. * We need this saved value while initializing the topology tree @@ -720,10 +627,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, DDI_SUCCESS) { /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_1(h1394_self_ids_error, S1394_TNF_SL_BR_ERROR, "", - tnf_string, msg, "Unable to parse selfID buffer"); - TNF_PROBE_0_DEBUG(h1394_self_ids_exit, S1394_TNF_SL_BR_STACK, - ""); /* kstats - SelfID buffer error */ hal->hal_kstats->selfid_buffer_error++; @@ -732,8 +635,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, /* Sort the SelfID packets by node number (if it's a 1995 PHY) */ if (hal->halinfo.phy == H1394_PHY_1995) { - TNF_PROBE_0_DEBUG(h1394_self_ids_sort, S1394_TNF_SL_BR_STACK, - ""); s1394_sort_selfids(hal); } @@ -753,8 +654,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, mutex_exit(&hal->cm_timer_mutex); } - TNF_PROBE_0_DEBUG(h1394_self_ids_init_topology, S1394_TNF_SL_BR_STACK, - ""); s1394_init_topology_tree(hal, tree_copied, saved_number_of_nodes); /* Determine the 1394 bus gap count */ @@ -763,10 +662,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, if (hal->gap_count == -1) { /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_1(h1394_self_ids_error, S1394_TNF_SL_BR_ERROR, "", - tnf_string, msg, "Invalid gap counts in SelfID pkts"); - TNF_PROBE_0_DEBUG(h1394_self_ids_exit, S1394_TNF_SL_BR_STACK, - ""); /* kstats - SelfID buffer error (invalid gap counts) */ hal->hal_kstats->selfid_buffer_error++; @@ -780,35 +675,19 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, } } - TNF_PROBE_1_DEBUG(h1394_self_ids_get_gap_count, S1394_TNF_SL_BR_STACK, - "", tnf_uint, gap_count, hal->gap_count); - /* Determine the Isoch Resource Manager */ hal->IRM_node = s1394_get_isoch_rsrc_mgr(hal); - TNF_PROBE_1_DEBUG(h1394_self_ids_IRM_node, S1394_TNF_SL_BR_STACK, "", - tnf_int, IRM_node, hal->IRM_node); - - TNF_PROBE_0_DEBUG(h1394_self_ids_build_topology_tree, - S1394_TNF_SL_BR_STACK, ""); - /* Build the topology tree */ if (s1394_topology_tree_build(hal) != DDI_SUCCESS) { /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_1(h1394_self_ids_error, S1394_TNF_SL_BR_ERROR, "", - tnf_string, msg, "Error building the topology tree"); - TNF_PROBE_0_DEBUG(h1394_self_ids_exit, S1394_TNF_SL_BR_STACK, - ""); /* kstats - SelfID buffer error (Invalid topology tree) */ hal->hal_kstats->selfid_buffer_error++; return; /* Error building topology tree from SelfIDs */ } - TNF_PROBE_0_DEBUG(h1394_self_ids_topology_CSRs, S1394_TNF_SL_BR_STACK, - ""); - /* Update the CSR topology_map */ s1394_CSR_topology_map_update(hal); @@ -818,12 +697,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, /* Determine the optimum gap count */ hal->optimum_gap_count = s1394_gap_count_optimize(diameter); - TNF_PROBE_1_DEBUG(h1394_self_ids_diameter_and_gap_count, - S1394_TNF_SL_BR_STACK, "", - tnf_uint, optimum_gap, hal->optimum_gap_count); - - TNF_PROBE_0_DEBUG(h1394_self_ids_speed_map, S1394_TNF_SL_BR_STACK, ""); - /* Fill in the speed map */ s1394_speed_map_fill(hal); @@ -843,8 +716,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, /* If only one bus reset occurred, match the trees */ if (((hal->old_generation_count + 1) % gen_rollover) == generation_count) { - TNF_PROBE_0_DEBUG(h1394_self_ids_tree_matching, - S1394_TNF_SL_BR_STACK, ""); s1394_match_tree_nodes(hal); } } @@ -855,9 +726,6 @@ h1394_self_ids(void *sl_private, void *selfid_buf_addr, uint32_t selfid_size, /* Wake up the bus reset processing thread */ s1394_tickle_bus_reset_thread(hal); - - TNF_PROBE_0_DEBUG(h1394_self_ids_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -890,9 +758,6 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) uchar_t *tmp_ptr; void (*recv_read_req)(cmd1394_cmd_t *); - TNF_PROBE_0_DEBUG(h1394_read_request_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - hal = (s1394_hal_t *)sl_private; /* Get the Services Layer private area */ @@ -921,11 +786,6 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_read_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", - tnf_string, msg, "Invalid command type specified"); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -935,17 +795,12 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) /* Has the 1394 address been allocated? */ addr_blk = s1394_used_tree_search(hal, req->cmd_addr); - TNF_PROBE_0_DEBUG(h1394_read_request_addr_search, - S1394_TNF_SL_ARREQ_STACK, ""); - /* If it wasn't found, it isn't owned... */ if (addr_blk == NULL) { /* Unlock the "used" tree */ mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_ADDRESS_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -956,8 +811,6 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_ADDRESS_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -967,8 +820,6 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -980,8 +831,6 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -1018,11 +867,6 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_read_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, - msg, "Error - mblk too small for request"); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } break; @@ -1040,11 +884,6 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_read_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid command type specified"); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } } @@ -1063,19 +902,12 @@ h1394_read_request(void *sl_private, cmd1394_cmd_t *req) * HAL. */ if (recv_read_req != NULL) { - TNF_PROBE_0_DEBUG(h1394_read_request_do_callback, - S1394_TNF_SL_ARREQ_STACK, ""); recv_read_req(req); } else { req->cmd_result = IEEE1394_RESP_COMPLETE; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_read_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } - - TNF_PROBE_0_DEBUG(h1394_read_request_exit, S1394_TNF_SL_ARREQ_STACK, - ""); } /* @@ -1111,9 +943,6 @@ h1394_write_request(void *sl_private, cmd1394_cmd_t *req) boolean_t write_error = B_FALSE; void (*recv_write_req)(cmd1394_cmd_t *); - TNF_PROBE_0_DEBUG(h1394_write_request_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - hal = (s1394_hal_t *)sl_private; /* Get the Services Layer private area */ @@ -1143,11 +972,6 @@ h1394_write_request(void *sl_private, cmd1394_cmd_t *req) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_write_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid command type specified"); - TNF_PROBE_0_DEBUG(h1394_write_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -1157,9 +981,6 @@ h1394_write_request(void *sl_private, cmd1394_cmd_t *req) /* Has the 1394 address been allocated? */ addr_blk = s1394_used_tree_search(hal, req->cmd_addr); - TNF_PROBE_0_DEBUG(h1394_write_request_addr_search, - S1394_TNF_SL_ARREQ_STACK, ""); - /* Is this a posted write request? */ posted_write = s1394_is_posted_write(hal, req->cmd_addr); @@ -1207,13 +1028,9 @@ write_error_check: /* Free the command - Pass it back to the HAL */ HAL_CALL(hal).response_complete( hal->halinfo.hal_private, req, h_priv); - TNF_PROBE_0_DEBUG(h1394_write_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } else { (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_write_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } } @@ -1248,11 +1065,6 @@ write_error_check: /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_write_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, - msg, "Error - mblk too small for request"); - TNF_PROBE_0_DEBUG(h1394_write_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } break; @@ -1270,11 +1082,6 @@ write_error_check: /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_write_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid command type specified"); - TNF_PROBE_0_DEBUG(h1394_write_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } } @@ -1296,19 +1103,12 @@ write_error_check: * HAL. */ if (recv_write_req != NULL) { - TNF_PROBE_0_DEBUG(h1394_write_request_do_callback, - S1394_TNF_SL_ARREQ_STACK, ""); recv_write_req(req); } else { req->cmd_result = IEEE1394_RESP_COMPLETE; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_write_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } - - TNF_PROBE_0_DEBUG(h1394_write_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); } /* @@ -1338,9 +1138,6 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) cmd1394_lock_type_t lock_type; void (*recv_lock_req)(cmd1394_cmd_t *); - TNF_PROBE_0_DEBUG(h1394_lock_request_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - hal = (s1394_hal_t *)sl_private; /* Get the Services Layer private area */ @@ -1360,8 +1157,6 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_ADDRESS_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -1392,11 +1187,6 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(h1394_lock_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid command type specified"); - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -1405,8 +1195,6 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_ADDRESS_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -1416,8 +1204,6 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } @@ -1517,11 +1303,6 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_1(h1394_lock_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, - msg, "Invalid lock_type"); - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } } else { @@ -1616,11 +1397,6 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) mutex_exit(&hal->addr_space_used_mutex); req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_1(h1394_lock_request_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, - msg, "Invalid lock_type"); - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } } @@ -1640,19 +1416,12 @@ h1394_lock_request(void *sl_private, cmd1394_cmd_t *req) * HAL. */ if (recv_lock_req != NULL) { - TNF_PROBE_0_DEBUG(h1394_lock_request_do_callback, - S1394_TNF_SL_ARREQ_STACK, ""); recv_lock_req(req); } else { req->cmd_result = IEEE1394_RESP_COMPLETE; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return; } - - TNF_PROBE_0_DEBUG(h1394_lock_request_exit, - S1394_TNF_SL_ARREQ_STACK, ""); } /* @@ -1676,16 +1445,12 @@ h1394_ioctl(void *sl_private, int cmd, intptr_t arg, int mode, cred_t *cred_p, { int status; - TNF_PROBE_0_DEBUG(h1394_ioctl_enter, S1394_TNF_SL_IOCTL_STACK, ""); - if ((cmd & DEVCTL_IOC) != DEVCTL_IOC) return (EINVAL); status = s1394_ioctl((s1394_hal_t *)sl_private, cmd, arg, mode, cred_p, rval_p); - TNF_PROBE_1_DEBUG(h1394_ioctl_exit, S1394_TNF_SL_IOCTL_STACK, "", - tnf_int, status, status); return (status); } @@ -1711,13 +1476,7 @@ void h1394_phy_packet(void *sl_private, uint32_t *packet_data, uint_t quadlet_count, uint_t timestamp) { - TNF_PROBE_0_DEBUG(h1394_phy_packet_enter, S1394_TNF_SL_STACK, ""); - /* This interface is not yet implemented */ - TNF_PROBE_1_DEBUG(h1394_phy_packet, S1394_TNF_SL_STACK, "", - tnf_string, msg, "h1394_phy_packet: Received"); - - TNF_PROBE_0_DEBUG(h1394_phy_packet_exit, S1394_TNF_SL_STACK, ""); } /* @@ -1739,14 +1498,10 @@ h1394_error_detected(void *sl_private, h1394_error_t type, void *arg) uint_t hal_node_num; uint_t IRM_node_num; - TNF_PROBE_0_DEBUG(h1394_error_detected_enter, S1394_TNF_SL_STACK, ""); - hal = (s1394_hal_t *)sl_private; switch (type) { case H1394_LOCK_RESP_ERR: - TNF_PROBE_1(h1394_error_detected, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Lock response error"); /* If we are the IRM, then initiate a bus reset */ mutex_enter(&hal->topology_tree_mutex); hal_node_num = IEEE1394_NODE_NUM(hal->node_id); @@ -1757,14 +1512,9 @@ h1394_error_detected(void *sl_private, h1394_error_t type, void *arg) break; case H1394_POSTED_WR_ERR: - TNF_PROBE_2(h1394_error_detected, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Posted write error detected", - tnf_opaque, addr, ((h1394_posted_wr_err_t *)arg)->addr); break; case H1394_SELF_INITIATED_SHUTDOWN: - TNF_PROBE_1(h1394_error_detected, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "HAL self-initiated shutdown"); s1394_hal_shutdown(hal, B_FALSE); break; @@ -1776,16 +1526,9 @@ h1394_error_detected(void *sl_private, h1394_error_t type, void *arg) hal->cm_timer = timeout(s1394_cycle_too_long_callback, hal, drv_usectohz(CYCLE_MASTER_TIMER * 1000)); - TNF_PROBE_1(h1394_error_detected, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Isochronous cycle too long error"); break; default: - TNF_PROBE_2(h1394_error_detected, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Unknown error type received", - tnf_uint, type, type); break; } - - TNF_PROBE_0_DEBUG(h1394_error_detected_exit, S1394_TNF_SL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/nx1394.c b/usr/src/uts/common/io/1394/nx1394.c index 216b70a319..21dec50620 100644 --- a/usr/src/uts/common/io/1394/nx1394.c +++ b/usr/src/uts/common/io/1394/nx1394.c @@ -40,9 +40,6 @@ #include <sys/cmn_err.h> #include <sys/types.h> #include <sys/ddi_impldefs.h> - -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -137,16 +134,12 @@ nx1394_bus_ctl(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t op, void *arg, { int status; - TNF_PROBE_0_DEBUG(nx1394_bus_ctl_enter, S1394_TNF_SL_NEXUS_STACK, ""); - switch (op) { case DDI_CTLOPS_REPORTDEV: { dev_info_t *pdip = ddi_get_parent(rdip); cmn_err(CE_CONT, "?%s%d at %s%d", ddi_node_name(rdip), ddi_get_instance(rdip), ddi_node_name(pdip), ddi_get_instance(pdip)); - TNF_PROBE_0_DEBUG(nx1394_bus_ctl_exit, S1394_TNF_SL_NEXUS_STACK, - ""); return (DDI_SUCCESS); } @@ -157,9 +150,6 @@ nx1394_bus_ctl(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t op, void *arg, uint32_t *regptr; char addr[MAXNAMELEN]; - TNF_PROBE_1(nx1394_bus_ctl_init_child, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_opaque, dip, cdip); - i = ddi_prop_lookup_int_array(DDI_DEV_T_ANY, cdip, DDI_PROP_DONTPASS, "reg", (int **)®ptr, (uint_t *)®len); @@ -167,12 +157,6 @@ nx1394_bus_ctl(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t op, void *arg, if (i != DDI_PROP_SUCCESS) { cmn_err(CE_NOTE, "!%s(%d): \"reg\" property not found", ddi_node_name(cdip), ddi_get_instance(cdip)); - TNF_PROBE_2(nx1394_bus_ctl, - S1394_TNF_SL_NEXUS_ERROR, "", tnf_string, msg, - "Reg property not found", tnf_int, reason, i); - TNF_PROBE_1_DEBUG(nx1394_bus_ctl_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_string, op, - "initchild"); return (DDI_NOT_WELL_FORMED); } @@ -200,12 +184,6 @@ nx1394_bus_ctl(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t op, void *arg, "!%s(%d): Duplicate dev_info node found %s@%s", ddi_node_name(cdip), ddi_get_instance(cdip), ddi_node_name(ocdip), addr); - TNF_PROBE_1(nx1394_bus_ctl, - S1394_TNF_SL_NEXUS_ERROR, "", tnf_string, msg, - "Duplicate nodes"); - TNF_PROBE_1_DEBUG(nx1394_bus_ctl_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_string, op, - "initchild"); ddi_set_name_addr(cdip, NULL); return (DDI_NOT_WELL_FORMED); } @@ -224,35 +202,22 @@ nx1394_bus_ctl(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t op, void *arg, "\"active-dma-flush\" property", ddi_node_name(cdip), ddi_get_instance(cdip)); - TNF_PROBE_1(nx1394_bus_ctl, - S1394_TNF_SL_NEXUS_ERROR, "", tnf_string, - msg, "Unable to add \"active-dma-flush\" " - "property"); - TNF_PROBE_1_DEBUG(nx1394_bus_ctl_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_string, - op, "initchild"); ddi_set_name_addr(cdip, NULL); return (DDI_NOT_WELL_FORMED); } } - TNF_PROBE_1_DEBUG(nx1394_bus_ctl_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_string, op, "initchild"); return (DDI_SUCCESS); } case DDI_CTLOPS_UNINITCHILD: { ddi_prop_remove_all((dev_info_t *)arg); ddi_set_name_addr((dev_info_t *)arg, NULL); - TNF_PROBE_1_DEBUG(nx1394_bus_ctl_exit, S1394_TNF_SL_NEXUS_STACK, - "", tnf_string, op, "uninitchild"); return (DDI_SUCCESS); } case DDI_CTLOPS_IOMIN: { status = ddi_ctlops(dip, rdip, op, arg, result); - TNF_PROBE_1_DEBUG(nx1394_bus_ctl_exit, S1394_TNF_SL_NEXUS_STACK, - "", tnf_string, op, "iomin"); return (status); } @@ -276,10 +241,6 @@ nx1394_bus_ctl(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t op, void *arg, cmn_err(CE_CONT, "!%s(%d): invalid op (%d) from %s(%d)", ddi_node_name(dip), ddi_get_instance(dip), op, ddi_node_name(rdip), ddi_get_instance(rdip)); - TNF_PROBE_2(nx1394_bus_ctl, S1394_TNF_SL_NEXUS_ERROR, "", - tnf_string, msg, "invalid op", tnf_int, op, op); - TNF_PROBE_0_DEBUG(nx1394_bus_ctl_exit, S1394_TNF_SL_NEXUS_STACK, - ""); return (DDI_FAILURE); } @@ -288,8 +249,6 @@ nx1394_bus_ctl(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t op, void *arg, */ default: { status = ddi_ctlops(dip, rdip, op, arg, result); - TNF_PROBE_0_DEBUG(nx1394_bus_ctl_exit, S1394_TNF_SL_NEXUS_STACK, - ""); return (status); } } @@ -311,9 +270,6 @@ nx1394_dma_allochdl(dev_info_t *dip, dev_info_t *rdip, ddi_dma_attr_t *attr, _NOTE(SCHEME_PROTECTS_DATA("unique (per thread)", ddi_dma_attr_t)) - TNF_PROBE_0_DEBUG(nx1394_dma_allochdl_enter, S1394_TNF_SL_NEXUS_STACK, - ""); - /* * If hal calls ddi_dma_alloc_handle, dip == rdip == hal dip. * Unfortunately, we cannot verify this (by way of looking up for hal @@ -327,8 +283,6 @@ nx1394_dma_allochdl(dev_info_t *dip, dev_info_t *rdip, ddi_dma_attr_t *attr, ddi_dma_attr_merge(attr, hal_attr); } status = ddi_dma_allochdl(dip, rdip, attr, waitfnp, arg, handlep); - TNF_PROBE_1_DEBUG(nx1394_dma_allochdl_exit, S1394_TNF_SL_NEXUS_STACK, - "", tnf_int, status, status); return (status); } @@ -344,20 +298,12 @@ nx1394_get_event_cookie(dev_info_t *dip, dev_info_t *rdip, char *name, int ret; s1394_hal_t *hal; - TNF_PROBE_1_DEBUG(nx1394_get_event_cookie_enter, - S1394_TNF_SL_NEXUS_STACK, "", tnf_string, name, name); - hal = s1394_dip_to_hal(dip); ASSERT(hal); ret = ndi_event_retrieve_cookie(hal->hal_ndi_event_hdl, rdip, name, event_cookiep, 0); - TNF_PROBE_4_DEBUG(nx1394_get_event_cookie_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_opaque, parent_dip, (void *)dip, - tnf_opaque, requestor_dip, (void *)rdip, tnf_string, event_name, - name, tnf_int, request_status, ret); - return (ret); } @@ -384,9 +330,6 @@ nx1394_add_eventcall(dev_info_t *dip, dev_info_t *rdip, hal = s1394_dip_to_hal(dip); ASSERT(hal); - TNF_PROBE_0_DEBUG(nx1394_add_eventcall_enter, S1394_TNF_SL_NEXUS_STACK, - ""); - ret = ndi_event_add_callback(hal->hal_ndi_event_hdl, rdip, cookie, callback, arg, NDI_NOSLEEP, cb_id); #if defined(DEBUG) @@ -394,10 +337,6 @@ nx1394_add_eventcall(dev_info_t *dip, dev_info_t *rdip, if (event_name == NULL) event_name = ""; #endif - TNF_PROBE_4_DEBUG(nx1394_add_eventcall_exit, S1394_TNF_SL_NEXUS_STACK, - "", tnf_opaque, parent_dip, (void *)dip, tnf_opaque, requestor_dip, - (void *)rdip, tnf_string, event_name, event_name, tnf_int, - request_status, ret); return (ret); } @@ -423,9 +362,6 @@ nx1394_remove_eventcall(dev_info_t *dip, ddi_callback_id_t cb_id) hal = s1394_dip_to_hal(dip); ASSERT(hal); - TNF_PROBE_0_DEBUG(nx1394_remove_eventcall_enter, - S1394_TNF_SL_NEXUS_STACK, ""); - ret = ndi_event_remove_callback(hal->hal_ndi_event_hdl, cb_id); #if defined(DEBUG) @@ -433,10 +369,6 @@ nx1394_remove_eventcall(dev_info_t *dip, ddi_callback_id_t cb_id) if (event_name == NULL) event_name = ""; - TNF_PROBE_4_DEBUG(nx1394_remove_eventcall_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_opaque, parent_dip, (void *)dip, - tnf_opaque, callback_id, (void *)cb_id, tnf_string, event_name, - event_name, tnf_int, request_status, ret); #endif return (ret); @@ -464,9 +396,6 @@ nx1394_post_event(dev_info_t *dip, dev_info_t *rdip, ddi_eventcookie_t cookie, hal = s1394_dip_to_hal(dip); ASSERT(hal); - TNF_PROBE_0_DEBUG(nx1394_post_event_enter, S1394_TNF_SL_NEXUS_STACK, - ""); - name = ndi_event_cookie_to_name(hal->hal_ndi_event_hdl, cookie); /* name is NULL if we don't generate the event */ if (name != NULL) { @@ -480,18 +409,11 @@ nx1394_post_event(dev_info_t *dip, dev_info_t *rdip, ddi_eventcookie_t cookie, ret = ndi_event_run_callbacks(hal->hal_ndi_event_hdl, rdip, cookie, impl_data); - TNF_PROBE_4_DEBUG(nx1394_post_event_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_opaque, parent_dip, - (void *)dip, tnf_opaque, requestor_dip, (void *)rdip, - tnf_string, event_name, name, tnf_int, request_status, ret); return (ret); } else { ret = ndi_post_event(ddi_get_parent(dip), rdip, cookie, impl_data); - TNF_PROBE_2_DEBUG(nx1394_post_event_exit, - S1394_TNF_SL_NEXUS_STACK, "", tnf_string, msg, - "Not our event", tnf_int, ret, ret); return (ret); } } @@ -505,32 +427,19 @@ nx1394_define_events(s1394_hal_t *hal) { int ret; - TNF_PROBE_0_DEBUG(nx1394_define_events_enter, S1394_TNF_SL_NEXUS_STACK, - ""); - /* get event handle */ ret = ndi_event_alloc_hdl(hal->halinfo.dip, hal->halinfo.hw_interrupt, &hal->hal_ndi_event_hdl, NDI_SLEEP); - if (ret != NDI_SUCCESS) { - TNF_PROBE_1(nx1394_define_events_alloc_fail, - S1394_TNF_SL_NEXUS_ERROR, "", tnf_int, ret, ret); - } else { + if (ret == NDI_SUCCESS) { /* and bind to it */ ret = ndi_event_bind_set(hal->hal_ndi_event_hdl, &nx1394_events, NDI_SLEEP); if (ret != NDI_SUCCESS) { - TNF_PROBE_1(nx1394_define_events_bind_fail, - S1394_TNF_SL_NEXUS_ERROR, "", tnf_int, ret, ret); (void) ndi_event_free_hdl(hal->hal_ndi_event_hdl); - TNF_PROBE_0_DEBUG(nx1394_define_events_exit, - S1394_TNF_SL_NEXUS_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(nx1394_define_events_exit, S1394_TNF_SL_NEXUS_STACK, - ""); - return (DDI_SUCCESS); } @@ -543,22 +452,8 @@ nx1394_undefine_events(s1394_hal_t *hal) { int ret; - TNF_PROBE_0_DEBUG(nx1394_undefine_events_enter, - S1394_TNF_SL_NEXUS_STACK, ""); - ret = ndi_event_unbind_set(hal->hal_ndi_event_hdl, &nx1394_events, NDI_SLEEP); - if (ret != NDI_SUCCESS) { - TNF_PROBE_1(nx1394_undefine_events_unbind_fail, - S1394_TNF_SL_NEXUS_ERROR, "", tnf_int, ret, ret); - } else { + if (ret == NDI_SUCCESS) ret = ndi_event_free_hdl(hal->hal_ndi_event_hdl); - if (ret != NDI_SUCCESS) { - TNF_PROBE_1(nx1394_undefine_events_free_hdl_fail, - S1394_TNF_SL_NEXUS_ERROR, "", tnf_int, ret, ret); - } - } - - TNF_PROBE_0_DEBUG(nx1394_undefine_events_exit, - S1394_TNF_SL_NEXUS_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/s1394.c b/usr/src/uts/common/io/1394/s1394.c index a3dcd4b5be..13f1bb3603 100644 --- a/usr/src/uts/common/io/1394/s1394.c +++ b/usr/src/uts/common/io/1394/s1394.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394.c * 1394 Services Layer Initialization and Cleanup Routines @@ -37,8 +35,6 @@ #include <sys/sunddi.h> #include <sys/types.h> #include <sys/kmem.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -62,37 +58,17 @@ static struct modlinkage s1394_modlinkage = { static int s1394_init(); static void s1394_fini(); -#ifndef NPROBE -extern int tnf_mod_load(void); -extern int tnf_mod_unload(struct modlinkage *mlp); -#endif - int _init() { int status; -#ifndef NPROBE - (void) tnf_mod_load(); -#endif status = s1394_init(); if (status != 0) { - TNF_PROBE_1(_init_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "s1394: failed in s1394_init"); -#ifndef NPROBE - (void) tnf_mod_unload(&s1394_modlinkage); -#endif return (status); } status = mod_install(&s1394_modlinkage); - if (status != 0) { - TNF_PROBE_1(_init_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "s1394: failed in mod_install"); -#ifndef NPROBE - (void) tnf_mod_unload(&s1394_modlinkage); -#endif - } return (status); } @@ -109,15 +85,10 @@ _fini() status = mod_remove(&s1394_modlinkage); if (status != 0) { - TNF_PROBE_1(_fini_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "s1394: failed in mod_remove"); return (status); } s1394_fini(); -#ifndef NPROBE - (void) tnf_mod_unload(&s1394_modlinkage); -#endif return (status); } @@ -129,15 +100,12 @@ _fini() static int s1394_init() { - TNF_PROBE_0_DEBUG(s1394_init_enter, S1394_TNF_SL_STACK, ""); - s1394_statep = kmem_zalloc(sizeof (s1394_state_t), KM_SLEEP); s1394_statep->hal_head = NULL; s1394_statep->hal_tail = NULL; mutex_init(&s1394_statep->hal_list_mutex, NULL, MUTEX_DRIVER, NULL); - TNF_PROBE_0_DEBUG(s1394_init_exit, S1394_TNF_SL_STACK, ""); return (0); } @@ -149,11 +117,7 @@ s1394_init() static void s1394_fini() { - TNF_PROBE_0_DEBUG(s1394_fini_enter, S1394_TNF_SL_STACK, ""); - mutex_destroy(&s1394_statep->hal_list_mutex); kmem_free(s1394_statep, sizeof (s1394_state_t)); - - TNF_PROBE_0_DEBUG(s1394_fini_exit, S1394_TNF_SL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/s1394_addr.c b/usr/src/uts/common/io/1394/s1394_addr.c index 4ff928bb14..29fa405635 100644 --- a/usr/src/uts/common/io/1394/s1394_addr.c +++ b/usr/src/uts/common/io/1394/s1394_addr.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_addr.c * 1394 Address Space Routines @@ -38,8 +36,6 @@ #include <sys/sunddi.h> #include <sys/types.h> #include <sys/kmem.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -90,9 +86,6 @@ s1394_request_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_space_blk_t *new_blk; uint64_t amount_free; - TNF_PROBE_0_DEBUG(s1394_request_addr_blk_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(hal != NULL); /* Lock the address space "free" list */ @@ -104,11 +97,6 @@ s1394_request_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_1(s1394_request_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "1394 address space - no more memory"); - TNF_PROBE_0_DEBUG(s1394_request_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -134,8 +122,6 @@ s1394_request_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_alloc_kstat(hal, addr_allocp->aa_address); - TNF_PROBE_0_DEBUG(s1394_request_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } else { @@ -145,10 +131,6 @@ s1394_request_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) if (new_blk == NULL) { /* Unlock the address space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0(s1394_request_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG(s1394_request_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -174,8 +156,6 @@ s1394_request_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_alloc_kstat(hal, addr_allocp->aa_address); - TNF_PROBE_0_DEBUG(s1394_request_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } } @@ -196,9 +176,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_space_blk_t *middle_blk; uint64_t upper_bound; - TNF_PROBE_0_DEBUG(s1394_claim_addr_blk_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(hal != NULL); /* Lock the address space "free" list */ @@ -212,11 +189,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_1(s1394_claim_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "1394 address space - address unavailable"); - TNF_PROBE_0_DEBUG(s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -251,8 +223,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_alloc_kstat(hal, addr_allocp->aa_address); - TNF_PROBE_0_DEBUG(s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } else { @@ -268,11 +238,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) if (new_blk == NULL) { /* Unlock the addr space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0(s1394_claim_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG( - s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -298,8 +263,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_alloc_kstat(hal, addr_allocp->aa_address); - TNF_PROBE_0_DEBUG(s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } @@ -317,11 +280,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) if (new_blk == NULL) { /* Unlock the addr space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0(s1394_claim_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG - (s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -347,8 +305,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_alloc_kstat(hal, addr_allocp->aa_address); - TNF_PROBE_0_DEBUG(s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } else { @@ -364,11 +320,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) if (new_blk == NULL) { /* Unlock the addr space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0(s1394_claim_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG( - s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -380,11 +331,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) mutex_exit(&hal->addr_space_free_mutex); kmem_free(new_blk, sizeof (s1394_addr_space_blk_t)); - TNF_PROBE_0(s1394_claim_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG - (s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -420,8 +366,6 @@ s1394_claim_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_alloc_kstat(hal, addr_allocp->aa_address); - TNF_PROBE_0_DEBUG(s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } } @@ -431,8 +375,6 @@ claim_error: /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_claim_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -444,9 +386,6 @@ claim_error: int s1394_free_addr_blk(s1394_hal_t *hal, s1394_addr_space_blk_t *blk) { - TNF_PROBE_0_DEBUG(s1394_free_addr_blk_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - /* Lock the address space "free" list */ mutex_enter(&hal->addr_space_free_mutex); @@ -456,11 +395,6 @@ s1394_free_addr_blk(s1394_hal_t *hal, s1394_addr_space_blk_t *blk) if (blk == NULL) { /* Unlock the address space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_1(s1394_free_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Can't free block not found in used list"); - TNF_PROBE_0_DEBUG(s1394_free_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -470,8 +404,6 @@ s1394_free_addr_blk(s1394_hal_t *hal, s1394_addr_space_blk_t *blk) /* Unlock the address space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_free_addr_blk_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (DDI_SUCCESS); } @@ -492,9 +424,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) s1394_addr_space_blk_t *middle_blk; uint64_t upper_bound; - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(hal != NULL); /* Lock the address space "free" list */ @@ -507,11 +436,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_1(s1394_reserve_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "1394 address space - address unavailable"); - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -520,8 +444,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -539,8 +461,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } else { @@ -551,12 +471,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) if (new_blk == NULL) { /* Unlock the addr space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0( - s1394_reserve_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG( - s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -573,8 +487,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_exit, - "stacktrace 1394 s1394 arreq", ""); return (DDI_SUCCESS); } @@ -587,12 +499,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) if (new_blk == NULL) { /* Unlock the addr space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0( - s1394_reserve_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG( - s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -609,8 +515,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } else { @@ -621,12 +525,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) if (new_blk == NULL) { /* Unlock the addr space "free" list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0( - s1394_reserve_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG( - s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -638,12 +536,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) mutex_exit(&hal->addr_space_free_mutex); kmem_free(new_blk, sizeof (s1394_addr_space_blk_t)); - TNF_PROBE_0( - s1394_reserve_addr_blk_error, - S1394_TNF_SL_ARREQ_ERROR, ""); - TNF_PROBE_0_DEBUG( - s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -666,8 +558,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } } @@ -676,8 +566,6 @@ s1394_reserve_addr_blk(s1394_hal_t *hal, t1394_alloc_addr_t *addr_allocp) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); - TNF_PROBE_0_DEBUG(s1394_reserve_addr_blk_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -703,9 +591,6 @@ s1394_init_addr_space(s1394_hal_t *hal) int i; int ret; - TNF_PROBE_0_DEBUG(s1394_init_addr_space_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - /* Setup Address Space */ mutex_init(&hal->addr_space_free_mutex, NULL, MUTEX_DRIVER, NULL); @@ -777,11 +662,6 @@ s1394_init_addr_space(s1394_hal_t *hal) /* Unlock the address space free list */ mutex_exit(&hal->addr_space_free_mutex); s1394_destroy_addr_space(hal); - TNF_PROBE_1(s1394_init_addr_space_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid addr_type specified"); - TNF_PROBE_0_DEBUG(s1394_init_addr_space_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } s1394_free_list_insert(hal, addr_blk); @@ -793,11 +673,6 @@ s1394_init_addr_space(s1394_hal_t *hal) /* Setup the necessary CSR space */ if (s1394_setup_CSR_space(hal) != DDI_SUCCESS) { s1394_destroy_addr_space(hal); - TNF_PROBE_1(s1394_init_addr_space_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Failed in s1394_setup_CSR_space()"); - TNF_PROBE_0_DEBUG(s1394_init_addr_space_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -813,11 +688,6 @@ s1394_init_addr_space(s1394_hal_t *hal) if ((lo >= hal->physical_addr_lo) && (hi <= hal->physical_addr_hi)) { s1394_destroy_addr_space(hal); - TNF_PROBE_1(s1394_init_addr_space_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Attempted to reserve physical memory"); - TNF_PROBE_0_DEBUG(s1394_init_addr_space_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -826,17 +696,10 @@ s1394_init_addr_space(s1394_hal_t *hal) ret = s1394_reserve_addr_blk(hal, &addr_alloc); if (ret != DDI_SUCCESS) { s1394_destroy_addr_space(hal); - TNF_PROBE_1(s1394_init_addr_space_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Unable to reserve 1394 address"); - TNF_PROBE_0_DEBUG(s1394_init_addr_space_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } } - TNF_PROBE_0_DEBUG(s1394_init_addr_space_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (DDI_SUCCESS); } @@ -857,9 +720,6 @@ s1394_destroy_addr_space(s1394_hal_t *hal) uint64_t hi; uint_t length; - TNF_PROBE_0_DEBUG(s1394_destroy_addr_space_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - /* Lock the address space "used" tree */ mutex_enter(&hal->addr_space_used_mutex); @@ -917,9 +777,6 @@ s1394_destroy_addr_space(s1394_hal_t *hal) /* Unlock & destroy the address space "free" list */ mutex_exit(&hal->addr_space_free_mutex); mutex_destroy(&hal->addr_space_free_mutex); - - TNF_PROBE_0_DEBUG(s1394_destroy_addr_space_exit, - S1394_TNF_SL_ARREQ_STACK, ""); } /* @@ -936,9 +793,6 @@ s1394_free_list_insert(s1394_hal_t *hal, s1394_addr_space_blk_t *new_blk) s1394_addr_space_blk_t *left_blk; s1394_addr_space_blk_t *right_blk; - TNF_PROBE_0_DEBUG(s1394_free_list_insert_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(MUTEX_HELD(&hal->addr_space_free_mutex)); /* Start at the head of the "free" list */ @@ -1006,9 +860,6 @@ s1394_free_list_insert(s1394_hal_t *hal, s1394_addr_space_blk_t *new_blk) new_blk->addr_enable = 0; new_blk->kmem_bufp = NULL; new_blk->addr_arg = NULL; - - TNF_PROBE_0_DEBUG(s1394_free_list_insert_exit, - S1394_TNF_SL_ARREQ_STACK, ""); } /* @@ -1021,9 +872,6 @@ s1394_free_list_search(s1394_hal_t *hal, uint64_t addr) { s1394_addr_space_blk_t *curr_blk; - TNF_PROBE_0_DEBUG(s1394_free_list_search_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(MUTEX_HELD(&hal->addr_space_free_mutex)); /* Start at the head of the list */ @@ -1035,8 +883,6 @@ s1394_free_list_search(s1394_hal_t *hal, uint64_t addr) curr_blk = curr_blk->asb_right; } - TNF_PROBE_0_DEBUG(s1394_free_list_search_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (curr_blk); } @@ -1051,9 +897,6 @@ s1394_free_list_find(s1394_hal_t *hal, uint32_t type, uint32_t length) s1394_addr_space_blk_t *curr_blk; uint64_t size; - TNF_PROBE_0_DEBUG(s1394_free_list_find_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - ASSERT(MUTEX_HELD(&hal->addr_space_free_mutex)); /* Start at the head of the list */ @@ -1079,8 +922,6 @@ s1394_free_list_find(s1394_hal_t *hal, uint32_t type, uint32_t length) curr_blk = curr_blk->asb_right; } - TNF_PROBE_0_DEBUG(s1394_free_list_find_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (curr_blk); } @@ -1095,9 +936,6 @@ s1394_free_list_delete(s1394_hal_t *hal, s1394_addr_space_blk_t *del_blk) s1394_addr_space_blk_t *left_blk; s1394_addr_space_blk_t *right_blk; - TNF_PROBE_0_DEBUG(s1394_free_list_delete_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(MUTEX_HELD(&hal->addr_space_free_mutex)); left_blk = del_blk->asb_left; @@ -1114,8 +952,6 @@ s1394_free_list_delete(s1394_hal_t *hal, s1394_addr_space_blk_t *del_blk) if (right_blk != NULL) right_blk->asb_left = left_blk; - TNF_PROBE_0_DEBUG(s1394_free_list_delete_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (del_blk); } @@ -1137,9 +973,6 @@ s1394_used_tree_insert(s1394_hal_t *hal, s1394_addr_space_blk_t *x) s1394_addr_space_blk_t *y; s1394_addr_space_blk_t **root; - TNF_PROBE_0_DEBUG(s1394_used_tree_insert_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - /* Lock the "used" tree */ mutex_enter(&hal->addr_space_used_mutex); @@ -1197,9 +1030,6 @@ s1394_used_tree_insert(s1394_hal_t *hal, s1394_addr_space_blk_t *x) /* Unlock the "used" tree */ mutex_exit(&hal->addr_space_used_mutex); - - TNF_PROBE_0_DEBUG(s1394_used_tree_insert_exit, - S1394_TNF_SL_ARREQ_STACK, ""); } /* @@ -1214,9 +1044,6 @@ s1394_tree_insert(s1394_addr_space_blk_t **root, s1394_addr_space_blk_t *z) s1394_addr_space_blk_t *y = NULL; s1394_addr_space_blk_t *x = *root; - TNF_PROBE_0_DEBUG(s1394_tree_insert_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - while (x != NULL) { y = x; if (z->addr_lo < x->addr_lo) @@ -1235,9 +1062,6 @@ s1394_tree_insert(s1394_addr_space_blk_t **root, s1394_addr_space_blk_t *z) y->asb_left = z; else y->asb_right = z; - - TNF_PROBE_0_DEBUG(s1394_tree_insert_exit, S1394_TNF_SL_ARREQ_STACK, - ""); } /* @@ -1251,16 +1075,11 @@ s1394_used_tree_search(s1394_hal_t *hal, uint64_t addr) { s1394_addr_space_blk_t *curr_blk; - TNF_PROBE_0_DEBUG(s1394_used_tree_search_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(MUTEX_HELD(&hal->addr_space_used_mutex)); /* Search the HAL's "used" tree for this address */ curr_blk = s1394_tree_search(hal->addr_space_used_tree, addr); - TNF_PROBE_0_DEBUG(s1394_used_tree_search_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (curr_blk); } @@ -1272,9 +1091,6 @@ s1394_used_tree_search(s1394_hal_t *hal, uint64_t addr) static s1394_addr_space_blk_t * s1394_tree_search(s1394_addr_space_blk_t *x, uint64_t address) { - TNF_PROBE_0_DEBUG(s1394_tree_search_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - while (x != NULL) { if (x->addr_lo > address) x = x->asb_left; @@ -1284,8 +1100,6 @@ s1394_tree_search(s1394_addr_space_blk_t *x, uint64_t address) break; } - TNF_PROBE_0_DEBUG(s1394_tree_search_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (x); } @@ -1307,9 +1121,6 @@ s1394_used_tree_delete(s1394_hal_t *hal, s1394_addr_space_blk_t *z) int old_color; int side_of_x; - TNF_PROBE_0_DEBUG(s1394_used_tree_delete_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - /* Lock the "used" tree */ mutex_enter(&hal->addr_space_used_mutex); @@ -1396,8 +1207,6 @@ s1394_used_tree_delete(s1394_hal_t *hal, s1394_addr_space_blk_t *z) /* Unlock the "used" tree */ mutex_exit(&hal->addr_space_used_mutex); - TNF_PROBE_0_DEBUG(s1394_used_tree_delete_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (z); } @@ -1413,9 +1222,6 @@ s1394_used_tree_delete_fixup(s1394_addr_space_blk_t **root, { boolean_t first_time; - TNF_PROBE_0_DEBUG(s1394_used_tree_delete_fixup_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - first_time = B_TRUE; while ((x != *root) && ((x == NULL) || (x->asb_color == BLACK))) { if (((first_time == B_TRUE) && (side_of_x == LEFT)) || @@ -1510,9 +1316,6 @@ s1394_used_tree_delete_fixup(s1394_addr_space_blk_t **root, } if (x != NULL) x->asb_color = BLACK; - - TNF_PROBE_0_DEBUG(s1394_used_tree_delete_fixup_exit, - S1394_TNF_SL_ARREQ_STACK, ""); } /* @@ -1526,9 +1329,6 @@ s1394_left_rotate(s1394_addr_space_blk_t **root, s1394_addr_space_blk_t *x) { s1394_addr_space_blk_t *y; - TNF_PROBE_0_DEBUG(s1394_left_rotate_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - y = x->asb_right; x->asb_right = y->asb_left; @@ -1545,9 +1345,6 @@ s1394_left_rotate(s1394_addr_space_blk_t **root, s1394_addr_space_blk_t *x) y->asb_left = x; x->asb_parent = y; - - TNF_PROBE_0_DEBUG(s1394_left_rotate_exit, S1394_TNF_SL_ARREQ_STACK, - ""); } /* @@ -1561,9 +1358,6 @@ s1394_right_rotate(s1394_addr_space_blk_t **root, s1394_addr_space_blk_t *x) { s1394_addr_space_blk_t *y; - TNF_PROBE_0_DEBUG(s1394_right_rotate_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - y = x->asb_left; x->asb_left = y->asb_right; @@ -1580,9 +1374,6 @@ s1394_right_rotate(s1394_addr_space_blk_t **root, s1394_addr_space_blk_t *x) y->asb_right = x; x->asb_parent = y; - - TNF_PROBE_0_DEBUG(s1394_right_rotate_exit, S1394_TNF_SL_ARREQ_STACK, - ""); } /* @@ -1592,14 +1383,9 @@ s1394_right_rotate(s1394_addr_space_blk_t **root, s1394_addr_space_blk_t *x) static s1394_addr_space_blk_t * s1394_tree_minimum(s1394_addr_space_blk_t *x) { - TNF_PROBE_0_DEBUG(s1394_tree_minimum_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - while (x->asb_left != NULL) x = x->asb_left; - TNF_PROBE_0_DEBUG(s1394_tree_minimum_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (x); } @@ -1613,14 +1399,9 @@ s1394_tree_successor(s1394_addr_space_blk_t *x) { s1394_addr_space_blk_t *y; - TNF_PROBE_0_DEBUG(s1394_tree_successor_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - if (x->asb_right != NULL) { y = s1394_tree_minimum(x->asb_right); - TNF_PROBE_0_DEBUG(s1394_tree_successor_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (y); } @@ -1630,8 +1411,6 @@ s1394_tree_successor(s1394_addr_space_blk_t *x) y = y->asb_parent; } - TNF_PROBE_0_DEBUG(s1394_tree_successor_exit, S1394_TNF_SL_ARREQ_STACK, - ""); return (y); } diff --git a/usr/src/uts/common/io/1394/s1394_asynch.c b/usr/src/uts/common/io/1394/s1394_asynch.c index 66e3a6cc13..b8901aa949 100644 --- a/usr/src/uts/common/io/1394/s1394_asynch.c +++ b/usr/src/uts/common/io/1394/s1394_asynch.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_asynch.c * 1394 Services Layer Asynchronous Communications Routines @@ -38,8 +36,6 @@ #include <sys/types.h> #include <sys/kmem.h> #include <sys/disp.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -72,16 +68,10 @@ s1394_alloc_cmd(s1394_hal_t *hal, uint_t flags, cmd1394_cmd_t **cmdp) uint_t cmd_size; int alloc_sleep; - TNF_PROBE_0_DEBUG(s1394_alloc_cmd_enter, S1394_TNF_SL_STACK, ""); - alloc_sleep = (flags & T1394_ALLOC_CMD_NOSLEEP) ? KM_NOSLEEP : KM_SLEEP; if ((alloc_sleep == KM_SLEEP) && (servicing_interrupt())) { - TNF_PROBE_1(s1394_alloc_cmd_error, S1394_TNF_SL_ATREQ_ERROR, - "", tnf_string, msg, "Tried to sleep in intr context"); - TNF_PROBE_0_DEBUG(s1394_alloc_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); ASSERT(alloc_sleep != KM_SLEEP); /* fail */ return (DDI_FAILURE); } @@ -90,17 +80,11 @@ s1394_alloc_cmd(s1394_hal_t *hal, uint_t flags, cmd1394_cmd_t **cmdp) if ((flags & (T1394_ALLOC_CMD_FCP_COMMAND | T1394_ALLOC_CMD_FCP_RESPONSE)) == (T1394_ALLOC_CMD_FCP_COMMAND | T1394_ALLOC_CMD_FCP_RESPONSE)) { - TNF_PROBE_1(s1394_alloc_cmd_error, S1394_TNF_SL_ATREQ_ERROR, - "", tnf_string, msg, "Both FCP cmd and resp flags"); - TNF_PROBE_0_DEBUG(s1394_alloc_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } *cmdp = kmem_cache_alloc(hal->hal_kmem_cachep, alloc_sleep); if (*cmdp == NULL) { - TNF_PROBE_0_DEBUG(s1394_alloc_cmd_exit, - S1394_TNF_SL_STACK, ""); return (DDI_FAILURE); } cmd_size = sizeof (cmd1394_cmd_t) + @@ -124,13 +108,9 @@ s1394_alloc_cmd(s1394_hal_t *hal, uint_t flags, cmd1394_cmd_t **cmdp) hal_overhead = (uchar_t *)s_priv + sizeof (s1394_cmd_priv_t); s_priv->hal_cmd_private.hal_overhead = (void *)hal_overhead; - TNF_PROBE_1_DEBUG(s1394_alloc_cmd, S1394_TNF_SL_STACK, "", - tnf_opaque, cmd, *cmdp); - /* kstats - number of cmd allocs */ hal->hal_kstats->cmd_alloc++; - TNF_PROBE_0_DEBUG(s1394_alloc_cmd_exit, S1394_TNF_SL_STACK, ""); return (DDI_SUCCESS); } @@ -144,21 +124,14 @@ s1394_free_cmd(s1394_hal_t *hal, cmd1394_cmd_t **cmdp) { s1394_cmd_priv_t *s_priv; - TNF_PROBE_0_DEBUG(s1394_free_cmd_enter, S1394_TNF_SL_STACK, ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(*cmdp); /* Check that command isn't in use */ if (s_priv->cmd_in_use == B_TRUE) { - TNF_PROBE_1(s1394_free_cmd_error, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "Attempted to free an in-use command"); - TNF_PROBE_0_DEBUG(s1394_free_cmd_exit, S1394_TNF_SL_STACK, ""); ASSERT(s_priv->cmd_in_use == B_FALSE); return (DDI_FAILURE); } - TNF_PROBE_1_DEBUG(s1394_free_cmd, S1394_TNF_SL_STACK, "", - tnf_opaque, cmd, *cmdp); /* kstats - number of cmd allocs */ kmem_cache_free(hal->hal_kmem_cachep, *cmdp); @@ -169,7 +142,6 @@ s1394_free_cmd(s1394_hal_t *hal, cmd1394_cmd_t **cmdp) /* kstats - number of cmd frees */ hal->hal_kstats->cmd_free++; - TNF_PROBE_0_DEBUG(s1394_free_cmd_exit, S1394_TNF_SL_STACK, ""); return (DDI_SUCCESS); } @@ -190,9 +162,6 @@ s1394_xfer_asynch_command(s1394_hal_t *hal, cmd1394_cmd_t *cmd, int *err) int result_from_hal; int ret; - TNF_PROBE_0_DEBUG(s1394_xfer_asynch_command_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); mutex_enter(&hal->topology_tree_mutex); @@ -201,8 +170,6 @@ s1394_xfer_asynch_command(s1394_hal_t *hal, cmd1394_cmd_t *cmd, int *err) (hal->disable_requests_bit == 1)) { *err = s1394_HAL_asynch_error(hal, cmd, state); mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_0_DEBUG(s1394_xfer_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } mutex_exit(&hal->topology_tree_mutex); @@ -269,17 +236,9 @@ s1394_xfer_asynch_command(s1394_hal_t *hal, cmd1394_cmd_t *cmd, int *err) default: *err = CMD1394_EUNKNOWN_ERROR; - TNF_PROBE_1(s1394_xfer_asynch_command_error, - S1394_TNF_SL_ATREQ_ERROR, "", tnf_string, msg, - "Invalid command type specified"); - TNF_PROBE_0_DEBUG(s1394_xfer_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(s1394_xfer_asynch_command_return_from_HAL, - S1394_TNF_SL_ATREQ_STACK, ""); - if (ret == DDI_FAILURE) { switch (result_from_hal) { case H1394_STATUS_EMPTY_TLABEL: @@ -324,18 +283,12 @@ s1394_xfer_asynch_command(s1394_hal_t *hal, cmd1394_cmd_t *cmd, int *err) break; } - TNF_PROBE_2_DEBUG(s1394_xfer_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, "", - tnf_int, result_from_hal, result_from_hal, - tnf_int, err, *err); return (DDI_FAILURE); } /* No errors, return success */ *err = CMD1394_NOSTATUS; - TNF_PROBE_0_DEBUG(s1394_xfer_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } @@ -361,9 +314,6 @@ s1394_setup_asynch_command(s1394_hal_t *hal, s1394_target_t *target, uint_t max_rec; uint_t max_blk; - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); switch (cmd->cmd_type) { @@ -377,19 +327,12 @@ s1394_setup_asynch_command(s1394_hal_t *hal, s1394_target_t *target, default: *err = CMD1394_EINVALID_COMMAND; - TNF_PROBE_1(s1394_setup_asynch_command_error, - S1394_TNF_SL_ATREQ_ERROR, "", tnf_string, msg, - "Invalid command type specified"); - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } /* Check for potential address roll-over */ if (s1394_address_rollover(cmd) != B_FALSE) { *err = CMD1394_EADDRESS_ERROR; - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -413,8 +356,6 @@ s1394_setup_asynch_command(s1394_hal_t *hal, s1394_target_t *target, if (cmd->bus_generation != hal->generation_count) { *err = CMD1394_ESTALE_GENERATION; - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -431,8 +372,6 @@ s1394_setup_asynch_command(s1394_hal_t *hal, s1394_target_t *target, target->on_node == NULL) { rw_exit(&hal->target_list_rwlock); *err = CMD1394_EDEVICE_REMOVED; - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -464,8 +403,6 @@ s1394_setup_asynch_command(s1394_hal_t *hal, s1394_target_t *target, if (cmd->cmd_options & CMD1394_OVERRIDE_SPEED) { if (cmd->cmd_speed > IEEE1394_S400) { *err = CMD1394_EINVALID_COMMAND; - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } else { @@ -484,16 +421,12 @@ s1394_setup_asynch_command(s1394_hal_t *hal, s1394_target_t *target, if (cmd->cmd_u.b.data_block == NULL) { *err = CMD1394_ENULL_MBLK; - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } /* Also need to check for MBLK_TOO_SMALL */ if (s1394_mblk_too_small(cmd) != B_FALSE) { *err = CMD1394_EMBLK_TOO_SMALL; - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -563,8 +496,6 @@ s1394_setup_asynch_command(s1394_hal_t *hal, s1394_target_t *target, /* Put command on the HAL's outstanding request Q */ s1394_insert_q_asynch_cmd(hal, cmd); - TNF_PROBE_0_DEBUG(s1394_setup_asynch_command_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } @@ -580,9 +511,6 @@ s1394_insert_q_asynch_cmd(s1394_hal_t *hal, cmd1394_cmd_t *cmd) s1394_cmd_priv_t *c_priv; cmd1394_cmd_t *temp_cmd; - TNF_PROBE_0_DEBUG(s1394_insert_q_asynch_cmd_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - mutex_enter(&hal->outstanding_q_mutex); /* Get the Services Layer private area */ @@ -610,9 +538,6 @@ s1394_insert_q_asynch_cmd(s1394_hal_t *hal, cmd1394_cmd_t *cmd) } mutex_exit(&hal->outstanding_q_mutex); - - TNF_PROBE_0_DEBUG(s1394_insert_q_asynch_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); } /* @@ -628,9 +553,6 @@ s1394_remove_q_asynch_cmd(s1394_hal_t *hal, cmd1394_cmd_t *cmd) cmd1394_cmd_t *prev_cmd; cmd1394_cmd_t *next_cmd; - TNF_PROBE_0_DEBUG(s1394_remove_q_asynch_cmd_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - mutex_enter(&hal->outstanding_q_mutex); /* Get the Services Layer private area */ @@ -663,9 +585,6 @@ s1394_remove_q_asynch_cmd(s1394_hal_t *hal, cmd1394_cmd_t *cmd) } mutex_exit(&hal->outstanding_q_mutex); - - TNF_PROBE_0_DEBUG(s1394_remove_q_asynch_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); } /* @@ -686,9 +605,6 @@ s1394_atreq_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *req, int status) int cmd_result; int err; - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(req); @@ -738,8 +654,6 @@ s1394_atreq_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *req, int status) } s1394_remove_q_asynch_cmd(hal, req); s1394_pending_q_insert(hal, req, S1394_PENDING_Q_REAR); - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; /* ack_busy_X */ @@ -797,12 +711,6 @@ s1394_atreq_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *req, int status) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_2(s1394_atreq_cmd_complete_error, - S1394_TNF_SL_ATREQ_ERROR, "", tnf_string, msg, - "Unrecognized cmd status code", - tnf_int, status, status); - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } @@ -821,20 +729,14 @@ s1394_atreq_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *req, int status) cv_signal(&s_priv->blocking_cv); mutex_exit(&s_priv->blocking_mutex); - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } /* Call the target's completion_callback() */ if (req->completion_callback != NULL) { - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_do_callback, - S1394_TNF_SL_ATREQ_STACK, ""); req->completion_callback(req); } - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } @@ -884,8 +786,6 @@ s1394_atreq_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *req, int status) ret = s1394_xfer_asynch_command(hal, req, &err); if (ret == DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } else if (err == CMD1394_ESTALE_GENERATION) { @@ -894,8 +794,6 @@ s1394_atreq_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *req, int status) s1394_pending_q_insert(hal, req, S1394_PENDING_Q_REAR); - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } } @@ -917,26 +815,16 @@ s1394_atreq_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *req, int status) cv_signal(&s_priv->blocking_cv); mutex_exit(&s_priv->blocking_mutex); - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } /* Set status and call completion_callback() */ if (req->completion_callback != NULL) { - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_do_callback, - S1394_TNF_SL_ATREQ_STACK, ""); - req->completion_callback(req); - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } - - TNF_PROBE_0_DEBUG(s1394_atreq_cmd_complete_exit, - S1394_TNF_SL_ATREQ_STACK, ""); } /* @@ -956,9 +844,6 @@ s1394_atresp_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *resp, int status) boolean_t valid_addr_blk; int target_status; - TNF_PROBE_0_DEBUG(s1394_atresp_cmd_complete_enter, - S1394_TNF_SL_ATRESP_STACK, ""); - target_status = CMD1394_CMDSUCCESS; /* If not an ack_complete */ @@ -1027,12 +912,6 @@ s1394_atresp_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *resp, int status) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_2(s1394_atresp_cmd_complete_error, - S1394_TNF_SL_ATRESP_ERROR, "", tnf_string, msg, - "Unrecognized cmd status code", - tnf_int, status, status); - TNF_PROBE_0_DEBUG(s1394_atresp_cmd_complete_exit, - S1394_TNF_SL_ATRESP_STACK, ""); return; } } @@ -1054,9 +933,6 @@ s1394_atresp_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *resp, int status) case S1394_CMD_WRITE: case S1394_CMD_LOCK: if (resp->completion_callback != NULL) { - TNF_PROBE_0_DEBUG( - s1394_atresp_cmd_complete_do_callback, - S1394_TNF_SL_ATRESP_STACK, ""); resp->completion_callback(resp); } break; @@ -1071,23 +947,12 @@ s1394_atresp_cmd_complete(s1394_hal_t *hal, cmd1394_cmd_t *resp, int status) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(s1394_atresp_cmd_complete_error, - S1394_TNF_SL_ATRESP_ERROR, "", tnf_string, msg, - "Unrecognized transfer type"); - TNF_PROBE_0_DEBUG(s1394_atresp_cmd_complete_exit, - S1394_TNF_SL_ATRESP_STACK, ""); return; } } - TNF_PROBE_0_DEBUG(s1394_atresp_cmd_complete_call_hal_cmplt, - S1394_TNF_SL_ATRESP_STACK, ""); - /* Free the command - Pass it back to the HAL */ HAL_CALL(hal).response_complete(hal->halinfo.hal_private, resp, h_priv); - - TNF_PROBE_1_DEBUG(s1394_atresp_cmd_complete_exit, - S1394_TNF_SL_ATRESP_STACK, "", tnf_int, status, target_status); } /* @@ -1111,9 +976,6 @@ s1394_send_response(s1394_hal_t *hal, cmd1394_cmd_t *resp) int ret; int result; - TNF_PROBE_0_DEBUG(s1394_send_response_enter, S1394_TNF_SL_ATRESP_STACK, - ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(resp); @@ -1128,21 +990,13 @@ s1394_send_response(s1394_hal_t *hal, cmd1394_cmd_t *resp) ((resp->cmd_result == CMD1394_ASYNCH_WR_QUAD) || (resp->cmd_result == CMD1394_ASYNCH_WR_BLOCK)))) { - TNF_PROBE_0_DEBUG(s1394_send_response_call_hal_cmplt, - S1394_TNF_SL_ATRESP_STACK, ""); - /* Free the command - Pass it back to the HAL */ HAL_CALL(hal).response_complete(hal->halinfo.hal_private, resp, h_priv); - TNF_PROBE_0_DEBUG(s1394_send_response_exit, - S1394_TNF_SL_ATRESP_STACK, ""); return (DDI_SUCCESS); } - TNF_PROBE_0_DEBUG(s1394_send_response_call_hal_resp, - S1394_TNF_SL_ATRESP_STACK, ""); - /* kstats - number of failure responses sent */ if (resp->cmd_result != IEEE1394_RESP_COMPLETE) { switch (resp->cmd_type) { @@ -1208,43 +1062,18 @@ s1394_send_response(s1394_hal_t *hal, cmd1394_cmd_t *resp) /* Disable the HAL */ s1394_hal_shutdown(hal, B_TRUE); - TNF_PROBE_1(s1394_send_response_error, - S1394_TNF_SL_ATRESP_ERROR, "", tnf_string, msg, - "Unrecognized transfer type"); - TNF_PROBE_0_DEBUG(s1394_send_response_exit, - S1394_TNF_SL_ATRESP_STACK, ""); return (DDI_FAILURE); } /* Unable to send a response */ if (ret != DDI_SUCCESS) { - if (result == H1394_STATUS_INVALID_BUSGEN) { - TNF_PROBE_1(s1394_send_response_error, - S1394_TNF_SL_ATRESP_ERROR, "", tnf_string, msg, - "Invalid generation in response"); - } else if (result == H1394_STATUS_NOMORE_SPACE) { - TNF_PROBE_1(s1394_send_response_error, - S1394_TNF_SL_ATRESP_ERROR, "", tnf_string, msg, - "No more space on AT response queue"); - } else { - TNF_PROBE_1(s1394_send_response_error, - S1394_TNF_SL_ATRESP_ERROR, "", tnf_string, msg, - "Unknown problem in s1394_send_response"); - } - TNF_PROBE_0_DEBUG(s1394_send_response_call_hal_cmplt, - S1394_TNF_SL_ATRESP_STACK, ""); - /* Free the command - Pass it back to the HAL */ HAL_CALL(hal).response_complete(hal->halinfo.hal_private, resp, h_priv); - TNF_PROBE_0_DEBUG(s1394_send_response_exit, - S1394_TNF_SL_ATRESP_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(s1394_send_response_exit, S1394_TNF_SL_ATRESP_STACK, - ""); return (DDI_SUCCESS); } @@ -1262,9 +1091,6 @@ s1394_compare_swap(s1394_hal_t *hal, s1394_target_t *target, cmd1394_cmd_t *cmd) int err; int ret; - TNF_PROBE_0_DEBUG(s1394_compare_swap_enter, S1394_TNF_SL_ATREQ_STACK, - ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); /* Lock the topology tree - protect from bus reset */ @@ -1284,10 +1110,6 @@ s1394_compare_swap(s1394_hal_t *hal, s1394_target_t *target, cmd1394_cmd_t *cmd) /* Copy error code into result */ cmd->cmd_result = err; - TNF_PROBE_0(s1394_compare_swap_error_in_setup_asynch, - S1394_TNF_SL_ATREQ_ERROR, ""); - TNF_PROBE_0_DEBUG(s1394_compare_swap_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -1309,11 +1131,6 @@ s1394_compare_swap(s1394_hal_t *hal, s1394_target_t *target, cmd1394_cmd_t *cmd) cmd->cmd_result = CMD1394_EINVALID_CONTEXT; - TNF_PROBE_1(s1394_compare_swap_error, - S1394_TNF_SL_ATREQ_ERROR, "", tnf_string, - msg, "CMD1394_BLOCKING in bus reset ctxt"); - TNF_PROBE_0_DEBUG(s1394_compare_swap_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } } @@ -1324,8 +1141,6 @@ s1394_compare_swap(s1394_hal_t *hal, s1394_target_t *target, cmd1394_cmd_t *cmd) /* Block (if necessary) */ s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(t1394_write_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_SUCCESS); } mutex_exit(&hal->topology_tree_mutex); @@ -1342,8 +1157,6 @@ s1394_compare_swap(s1394_hal_t *hal, s1394_target_t *target, cmd1394_cmd_t *cmd) /* Block (if necessary) */ s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(s1394_compare_swap_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } else { @@ -1355,18 +1168,12 @@ s1394_compare_swap(s1394_hal_t *hal, s1394_target_t *target, cmd1394_cmd_t *cmd) /* Copy error code into result */ cmd->cmd_result = err; - TNF_PROBE_0(s1394_compare_swap_error_in_xfer, - S1394_TNF_SL_ATREQ_ERROR, ""); - TNF_PROBE_0_DEBUG(s1394_compare_swap_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } } else { /* Block (if necessary) */ s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(s1394_compare_swap_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } } @@ -1385,18 +1192,11 @@ s1394_split_lock_req(s1394_hal_t *hal, s1394_target_t *target, s1394_cmd_priv_t *s_priv; cmd1394_cmd_t *tmp_cmd; - TNF_PROBE_0_DEBUG(s1394_split_lock_req_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - /* Allocate a temporary command */ if (s1394_alloc_cmd(hal, T1394_ALLOC_CMD_NOSLEEP, &tmp_cmd) != DDI_SUCCESS) { cmd->cmd_result = CMD1394_EUNKNOWN_ERROR; - TNF_PROBE_0(s1394_split_lock_req_error_alloc_cmd, - S1394_TNF_SL_ATREQ_ERROR, ""); - TNF_PROBE_0_DEBUG(s1394_split_lock_req_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -1442,16 +1242,12 @@ s1394_split_lock_req(s1394_hal_t *hal, s1394_target_t *target, if (s1394_free_cmd(hal, &tmp_cmd) != DDI_SUCCESS) cmd->cmd_result = CMD1394_EUNKNOWN_ERROR; - TNF_PROBE_0_DEBUG(s1394_split_lock_req_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } /* Block (if necessary) */ s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(s1394_split_lock_req_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } @@ -1473,10 +1269,6 @@ s1394_handle_lock(cmd1394_cmd_t *cmd) int tcmd_result; int ret; - - TNF_PROBE_0_DEBUG(s1394_handle_lock_enter, S1394_TNF_SL_ATREQ_STACK, - ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(cmd); @@ -1510,8 +1302,6 @@ lock_req_step_0: tcmd_result = cmd->cmd_result; goto lock_req_done; } else { - TNF_PROBE_0_DEBUG(s1394_handle_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } } else { @@ -1540,10 +1330,7 @@ lock_req_step_0: } lock_req_done: - if (s1394_free_cmd(to_hal, &cmd) != DDI_SUCCESS) { - TNF_PROBE_0(s1394_handle_lock_error_in_freecmd, - S1394_TNF_SL_ATREQ_ERROR, ""); - } + (void) s1394_free_cmd(to_hal, &cmd); /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(target_cmd); @@ -1560,17 +1347,12 @@ lock_req_done: cv_signal(&s_priv->blocking_cv); mutex_exit(&s_priv->blocking_mutex); - TNF_PROBE_0_DEBUG(s1394_handle_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return; } /* Call the target's completion_callback() */ if (target_cmd->completion_callback != NULL) target_cmd->completion_callback(target_cmd); - - TNF_PROBE_0_DEBUG(s1394_handle_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); } /* @@ -1587,9 +1369,6 @@ s1394_pending_q_insert(s1394_hal_t *hal, cmd1394_cmd_t *cmd, uint_t flags) s1394_cmd_priv_t *s_priv; s1394_cmd_priv_t *c_priv; - TNF_PROBE_0_DEBUG(s1394_pending_q_insert_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - mutex_enter(&hal->pending_q_mutex); /* Get the Services Layer private area */ @@ -1630,9 +1409,6 @@ s1394_pending_q_insert(s1394_hal_t *hal, cmd1394_cmd_t *cmd, uint_t flags) /* kstats - number of pending Q insertions */ hal->hal_kstats->pending_q_insert++; - - TNF_PROBE_0_DEBUG(s1394_pending_q_insert_exit, - S1394_TNF_SL_ATREQ_STACK, ""); } /* @@ -1648,16 +1424,11 @@ s1394_pending_q_remove(s1394_hal_t *hal) cmd1394_cmd_t *cmd; cmd1394_cmd_t *prev_cmd; - TNF_PROBE_0_DEBUG(s1394_pending_q_remove_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - mutex_enter(&hal->pending_q_mutex); cmd = (cmd1394_cmd_t *)hal->pending_q_tail; if (cmd == NULL) { mutex_exit(&hal->pending_q_mutex); - TNF_PROBE_0_DEBUG(s1394_pending_q_remove_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (NULL); } @@ -1681,8 +1452,6 @@ s1394_pending_q_remove(s1394_hal_t *hal) mutex_exit(&hal->pending_q_mutex); - TNF_PROBE_0_DEBUG(s1394_pending_q_remove_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (cmd); } @@ -1696,9 +1465,6 @@ s1394_resend_pending_cmds(s1394_hal_t *hal) { int done; - TNF_PROBE_0_DEBUG(s1394_resend_pending_cmds_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); do { @@ -1706,9 +1472,6 @@ s1394_resend_pending_cmds(s1394_hal_t *hal) } while (done == B_FALSE); ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - - TNF_PROBE_0_DEBUG(s1394_resend_pending_cmds_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -1733,17 +1496,12 @@ s1394_process_pending_q(s1394_hal_t *hal) uint_t current_max_payload; int ret; - TNF_PROBE_0_DEBUG(s1394_process_pending_q_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); /* Pull a command from the Pending Q */ cmd = s1394_pending_q_remove(hal); if (cmd == NULL) { - TNF_PROBE_0_DEBUG(s1394_process_pending_q_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_TRUE); } @@ -1772,8 +1530,6 @@ s1394_process_pending_q(s1394_hal_t *hal) cv_signal(&s_priv->blocking_cv); mutex_exit(&s_priv->blocking_mutex); - TNF_PROBE_0_DEBUG(s1394_process_pending_q_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } @@ -1782,8 +1538,6 @@ s1394_process_pending_q(s1394_hal_t *hal) cmd->completion_callback(cmd); } - TNF_PROBE_0_DEBUG(s1394_process_pending_q_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } } else { @@ -1829,10 +1583,6 @@ s1394_process_pending_q(s1394_hal_t *hal) cv_signal(&s_priv->blocking_cv); mutex_exit(&s_priv->blocking_mutex); - TNF_PROBE_0_DEBUG( - s1394_process_pending_q_exit, - S1394_TNF_SL_BR_STACK, - ""); return (B_FALSE); } @@ -1840,15 +1590,9 @@ s1394_process_pending_q(s1394_hal_t *hal) if (cmd->completion_callback != NULL) { s1394_unlock_tree(hal); cmd->completion_callback(cmd); - TNF_PROBE_0_DEBUG( - s1394_process_pending_q_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } else { s1394_unlock_tree(hal); - TNF_PROBE_0_DEBUG( - s1394_process_pending_q_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } } @@ -1914,8 +1658,6 @@ s1394_process_pending_q(s1394_hal_t *hal) } s1394_unlock_tree(hal); ret = s1394_pending_q_helper(hal, cmd); - TNF_PROBE_0_DEBUG(s1394_process_pending_q_exit, - S1394_TNF_SL_BR_STACK, ""); return (ret); } } @@ -1933,9 +1675,6 @@ s1394_pending_q_helper(s1394_hal_t *hal, cmd1394_cmd_t *cmd) int err; int ret; - TNF_PROBE_0_DEBUG(s1394_pending_q_helper_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); /* Get the Services Layer private area */ @@ -1953,8 +1692,6 @@ s1394_pending_q_helper(s1394_hal_t *hal, cmd1394_cmd_t *cmd) s1394_remove_q_asynch_cmd(hal, cmd); s1394_pending_q_insert(hal, cmd, S1394_PENDING_Q_FRONT); - TNF_PROBE_0_DEBUG(s1394_pending_q_helper_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_TRUE); } else { /* Remove cmd from outstanding request Q */ @@ -1972,27 +1709,19 @@ s1394_pending_q_helper(s1394_hal_t *hal, cmd1394_cmd_t *cmd) cv_signal(&s_priv->blocking_cv); mutex_exit(&s_priv->blocking_mutex); - TNF_PROBE_0_DEBUG(s1394_pending_q_helper_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } /* Call target completion_callback() */ if (cmd->completion_callback != NULL) { cmd->completion_callback(cmd); - TNF_PROBE_0_DEBUG(s1394_pending_q_helper_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } else { - TNF_PROBE_0_DEBUG(s1394_pending_q_helper_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } } } - TNF_PROBE_0_DEBUG(s1394_pending_q_helper_exit, - S1394_TNF_SL_BR_STACK, ""); return (B_FALSE); } @@ -2016,9 +1745,6 @@ s1394_process_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) uint32_t old_value32; uint32_t temp_value32; - TNF_PROBE_0_DEBUG(s1394_process_split_lock_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - if (cmd->cmd_type == CMD1394_ASYNCH_LOCK_32) { old_value32 = cmd->cmd_u.l32.old_value; data_value32 = target_cmd->cmd_u.l32.data_value; @@ -2078,9 +1804,6 @@ s1394_process_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) target_cmd->cmd_u.l32.old_value = T1394_DATA32(cmd->cmd_u.l32.old_value); target_cmd->cmd_result = CMD1394_CMDSUCCESS; - TNF_PROBE_0_DEBUG( - s1394_process_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } break; @@ -2097,9 +1820,6 @@ s1394_process_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) target_cmd->cmd_u.l32.old_value = T1394_DATA32(cmd->cmd_u.l32.old_value); target_cmd->cmd_result = CMD1394_CMDSUCCESS; - TNF_PROBE_0_DEBUG( - s1394_process_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } break; @@ -2189,9 +1909,6 @@ s1394_process_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) target_cmd->cmd_u.l64.old_value = T1394_DATA64(cmd->cmd_u.l64.old_value); target_cmd->cmd_result = CMD1394_CMDSUCCESS; - TNF_PROBE_0_DEBUG( - s1394_process_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } break; @@ -2208,9 +1925,6 @@ s1394_process_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) target_cmd->cmd_u.l64.old_value = T1394_DATA64(cmd->cmd_u.l64.old_value); target_cmd->cmd_result = CMD1394_CMDSUCCESS; - TNF_PROBE_0_DEBUG( - s1394_process_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } break; @@ -2243,8 +1957,6 @@ s1394_process_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) cmd->cmd_u.l64.data_value = new_value64; } - TNF_PROBE_0_DEBUG(s1394_process_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } @@ -2260,9 +1972,6 @@ s1394_finish_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) uint64_t tmp_value64; uint32_t tmp_value32; - TNF_PROBE_0_DEBUG(s1394_finish_split_lock_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(cmd); @@ -2312,8 +2021,6 @@ s1394_finish_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) } /* Set status */ target_cmd->cmd_result = CMD1394_CMDSUCCESS; - TNF_PROBE_0_DEBUG(s1394_finish_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } else { if (s_priv->temp_num_retries > 0) { @@ -2323,17 +2030,11 @@ s1394_finish_split_lock(cmd1394_cmd_t *cmd, cmd1394_cmd_t *target_cmd) /* Reset lock_req_step */ s_priv->lock_req_step = 0; - TNF_PROBE_0_DEBUG(s1394_finish_split_lock_start_over, - S1394_TNF_SL_ATREQ_STACK, ""); /* Resend... start at step 0 again */ - TNF_PROBE_0_DEBUG(s1394_finish_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } else { /* Failed... RETRIES_EXCEEDED */ target_cmd->cmd_result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_0_DEBUG(s1394_finish_split_lock_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } } diff --git a/usr/src/uts/common/io/1394/s1394_bus_reset.c b/usr/src/uts/common/io/1394/s1394_bus_reset.c index 70d95f8031..274625d04e 100644 --- a/usr/src/uts/common/io/1394/s1394_bus_reset.c +++ b/usr/src/uts/common/io/1394/s1394_bus_reset.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_bus_reset.c * 1394 Services Layer Bus Reset Routines @@ -37,8 +35,6 @@ #include <sys/sunddi.h> #include <sys/types.h> #include <sys/kmem.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -94,18 +90,11 @@ s1394_parse_selfid_buffer(s1394_hal_t *hal, void *selfid_buf_addr, boolean_t error = B_FALSE; int valid_pkt_id; - TNF_PROBE_0_DEBUG(s1394_parse_selfid_buffer_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); data = (uint32_t *)selfid_buf_addr; if (selfid_size == 0) { - TNF_PROBE_1(s1394_parse_selfid_buffer_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "SelfID buffer error - zero size"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); @@ -147,12 +136,6 @@ s1394_parse_selfid_buffer(s1394_hal_t *hal, void *selfid_buf_addr, IEEE1394_SELFID_PCKT_ID_VALID)) { j += 2; } else { - TNF_PROBE_1( - s1394_parse_selfid_buffer_error, - S1394_TNF_SL_BR_ERROR, "", - tnf_string, msg, "SelfID packet " - "error - invalid inverse"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); @@ -165,10 +148,6 @@ s1394_parse_selfid_buffer(s1394_hal_t *hal, void *selfid_buf_addr, } i++; } else { - TNF_PROBE_1(s1394_parse_selfid_buffer_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "SelfID packet error - invalid inverse"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); @@ -183,8 +162,6 @@ s1394_parse_selfid_buffer(s1394_hal_t *hal, void *selfid_buf_addr, hal->number_of_nodes = i; parse_buffer_done: - TNF_PROBE_0_DEBUG(s1394_parse_selfid_buffer_exit, - S1394_TNF_SL_BR_STACK, ""); if (error == B_TRUE) return (DDI_FAILURE); else @@ -204,8 +181,6 @@ s1394_sort_selfids(s1394_hal_t *hal) int i; int j; - TNF_PROBE_0_DEBUG(s1394_sort_selfids_enter, S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; @@ -267,8 +242,6 @@ s1394_sort_selfids(s1394_hal_t *hal) } } } - - TNF_PROBE_0_DEBUG(s1394_sort_selfids_exit, S1394_TNF_SL_BR_STACK, ""); } /* @@ -334,13 +307,6 @@ selfid_port_type(s1394_selfid_pkt_t *s, int port) int block; int offset = IEEE1394_SELFID_PORT_OFFSET_FIRST; - if (port > selfid_num_ports(s)) { - TNF_PROBE_1(selfid_port_type_error, - "1394 s1394 error", - "Invalid port number requested for node", - tnf_uint, node_num, IEEE1394_SELFID_PHYID(s)); - } - if (port > 2) { /* Calculate which quadlet and bits for this port */ port -= 3; @@ -375,9 +341,6 @@ s1394_init_topology_tree(s1394_hal_t *hal, boolean_t copied, uint_t tree_size; int i; - TNF_PROBE_0_DEBUG(s1394_init_topology_tree_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); /* @@ -399,18 +362,8 @@ s1394_init_topology_tree(s1394_hal_t *hal, boolean_t copied, config_rom = node->cfgrom; if (config_rom != NULL) { if (CFGROM_NEW_ALLOC(node) == B_TRUE) { - TNF_PROBE_2_DEBUG( - s1394_init_top_tree_free_cfgrom, - S1394_TNF_SL_BR_STACK, - "cfgrom free", tnf_int, node_num, i, - tnf_opaque, cfgrom, config_rom); kmem_free((void *)config_rom, IEEE1394_CONFIG_ROM_SZ); - } else { - TNF_PROBE_2_DEBUG(s1394_init_top_tree, - S1394_TNF_SL_BR_STACK, "", - tnf_int, node_num, i, - tnf_opaque, cfgrom, config_rom); } } } @@ -418,9 +371,6 @@ s1394_init_topology_tree(s1394_hal_t *hal, boolean_t copied, tree_size = hal->number_of_nodes * sizeof (s1394_node_t); bzero((void *)hal->topology_tree, tree_size); - - TNF_PROBE_0_DEBUG(s1394_init_topology_tree_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -447,9 +397,6 @@ s1394_topology_tree_build(s1394_hal_t *hal) * nodes which have yet to find their Parent node. */ - TNF_PROBE_0_DEBUG(s1394_topology_tree_build_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; @@ -461,15 +408,9 @@ s1394_topology_tree_build(s1394_hal_t *hal) for (i = 0; i < number_of_nodes; i++) { /* Make sure that node numbers are correct */ if (i != IEEE1394_SELFID_PHYID(hal->selfid_ptrs[i])) { - TNF_PROBE_1(s1394_topology_tree_build_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "SelfIDs - Invalid node numbering"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); - TNF_PROBE_0_DEBUG(s1394_topology_tree_build_exit, - S1394_TNF_SL_BR_STACK, ""); return (DDI_FAILURE); } @@ -504,18 +445,9 @@ s1394_topology_tree_build(s1394_hal_t *hal) found_parent = B_TRUE; } else { - TNF_PROBE_1( - s1394_topology_tree_build_error, - S1394_TNF_SL_BR_ERROR, "", - tnf_string, msg, "SelfID packet - " - "Has multiple parents"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); - TNF_PROBE_0_DEBUG( - s1394_topology_tree_build_exit, - S1394_TNF_SL_BR_STACK, ""); return (DDI_FAILURE); } } else if (selfid_port_type(hal->selfid_ptrs[i], j) == @@ -524,18 +456,9 @@ s1394_topology_tree_build(s1394_hal_t *hal) found_connection = B_TRUE; tmp = (s1394_node_t *)s1394_hal_stack_pop(hal); if (tmp == NULL) { - TNF_PROBE_1( - s1394_topology_tree_build_error, - S1394_TNF_SL_BR_ERROR, "", - tnf_string, msg, "Topology Tree " - "invalid - Tree build failed"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); - TNF_PROBE_0_DEBUG( - s1394_topology_tree_build_exit, - S1394_TNF_SL_BR_STACK, ""); return (DDI_FAILURE); } @@ -548,15 +471,9 @@ s1394_topology_tree_build(s1394_hal_t *hal) /* If current node has no parents or children - Invalid */ if ((found_connection == B_FALSE) && (number_of_nodes > 1)) { - TNF_PROBE_1(s1394_topology_tree_build_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "SelfID packet - Has no connections"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); - TNF_PROBE_0_DEBUG(s1394_topology_tree_build_exit, - S1394_TNF_SL_BR_STACK, ""); return (DDI_FAILURE); } @@ -569,23 +486,15 @@ s1394_topology_tree_build(s1394_hal_t *hal) /* If the stack is not empty, then something has gone seriously wrong */ if (hal->hal_stack_depth != -1) { - TNF_PROBE_1(s1394_topology_tree_build_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "Topology Tree invalid - Tree build failed"); - /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); - TNF_PROBE_0_DEBUG(s1394_topology_tree_build_exit, - S1394_TNF_SL_BR_STACK, ""); return (DDI_FAILURE); } /* New topology tree is now valid */ hal->topology_tree_valid = B_TRUE; - TNF_PROBE_0_DEBUG(s1394_topology_tree_build_exit, - S1394_TNF_SL_BR_STACK, ""); return (DDI_SUCCESS); } @@ -598,23 +507,10 @@ s1394_topology_tree_build(s1394_hal_t *hal) static void s1394_hal_stack_push(s1394_hal_t *hal, void *obj) { - TNF_PROBE_0_DEBUG(s1394_hal_stack_push_enter, - S1394_TNF_SL_BR_STACK, ""); - if (hal->hal_stack_depth < IEEE1394_MAX_NODES - 1) { hal->hal_stack_depth++; hal->hal_stack[hal->hal_stack_depth] = obj; - } else { - TNF_PROBE_1(s1394_hal_stack_push_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "HAL stack - Overflow"); - TNF_PROBE_0_DEBUG(s1394_hal_stack_push_exit, - S1394_TNF_SL_BR_STACK, ""); - return; } - - TNF_PROBE_0_DEBUG(s1394_hal_stack_push_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -626,21 +522,11 @@ s1394_hal_stack_push(s1394_hal_t *hal, void *obj) static void * s1394_hal_stack_pop(s1394_hal_t *hal) { - TNF_PROBE_0_DEBUG(s1394_hal_stack_pop_enter, - S1394_TNF_SL_BR_STACK, ""); - if (hal->hal_stack_depth > -1) { hal->hal_stack_depth--; - TNF_PROBE_0_DEBUG(s1394_hal_stack_pop_exit, - S1394_TNF_SL_BR_STACK, ""); return (hal->hal_stack[hal->hal_stack_depth + 1]); } else { - TNF_PROBE_1(s1394_hal_stack_pop_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "HAL stack - Underflow"); - TNF_PROBE_0_DEBUG(s1394_hal_stack_pop_exit, - S1394_TNF_SL_BR_STACK, ""); return (NULL); } } @@ -654,26 +540,14 @@ s1394_hal_stack_pop(s1394_hal_t *hal) static void s1394_hal_queue_insert(s1394_hal_t *hal, void *obj) { - TNF_PROBE_0_DEBUG(s1394_hal_queue_insert_enter, - S1394_TNF_SL_BR_STACK, ""); - if (((hal->hal_queue_front + 1) % IEEE1394_MAX_NODES) == hal->hal_queue_back) { - TNF_PROBE_1(s1394_hal_queue_insert_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "HAL Queue - Overflow"); - TNF_PROBE_0_DEBUG(s1394_hal_queue_insert_exit, - S1394_TNF_SL_BR_STACK, ""); return; - } else { hal->hal_queue[hal->hal_queue_front] = obj; hal->hal_queue_front = (hal->hal_queue_front + 1) % IEEE1394_MAX_NODES; } - - TNF_PROBE_0_DEBUG(s1394_hal_queue_insert_exit, - S1394_TNF_SL_BR_STACK, ""); } @@ -688,23 +562,12 @@ s1394_hal_queue_remove(s1394_hal_t *hal) { void *tmp; - TNF_PROBE_0_DEBUG(s1394_hal_queue_remove_enter, - S1394_TNF_SL_BR_STACK, ""); - if (hal->hal_queue_back == hal->hal_queue_front) { - TNF_PROBE_1(s1394_hal_queue_remove_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "HAL Queue - Underflow"); - TNF_PROBE_0_DEBUG(s1394_hal_queue_remove_exit, - S1394_TNF_SL_BR_STACK, ""); return (NULL); - } else { tmp = hal->hal_queue[hal->hal_queue_back]; hal->hal_queue_back = (hal->hal_queue_back + 1) % IEEE1394_MAX_NODES; - TNF_PROBE_0_DEBUG(s1394_hal_queue_remove_exit, - S1394_TNF_SL_BR_STACK, ""); return (tmp); } } @@ -720,23 +583,12 @@ s1394_hal_queue_remove(s1394_hal_t *hal) static void s1394_node_number_list_add(s1394_hal_t *hal, int node_num) { - TNF_PROBE_1_DEBUG(s1394_node_number_list_add_enter, - S1394_TNF_SL_BR_STACK, "", tnf_int, node_num, node_num); - if (hal->hal_node_number_list_size >= IEEE1394_MAX_NODES - 1) { - TNF_PROBE_1(s1394_node_number_list_add_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "Node Number List - Overflow"); - TNF_PROBE_0_DEBUG(s1394_node_number_list_add_exit, - S1394_TNF_SL_BR_STACK, ""); return; } hal->hal_node_number_list[hal->hal_node_number_list_size] = node_num; hal->hal_node_number_list_size++; - - TNF_PROBE_0_DEBUG(s1394_node_number_list_add_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -750,17 +602,11 @@ s1394_topology_tree_mark_all_unvisited(s1394_hal_t *hal) uint_t number_of_nodes; int i; - TNF_PROBE_0_DEBUG(s1394_topology_tree_mark_all_unvisited_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; for (i = 0; i < number_of_nodes; i++) CLEAR_NODE_VISITED(&hal->topology_tree[i]); - - TNF_PROBE_0_DEBUG(s1394_topology_tree_mark_all_unvisited_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -774,17 +620,11 @@ s1394_old_tree_mark_all_unvisited(s1394_hal_t *hal) uint_t number_of_nodes; int i; - TNF_PROBE_0_DEBUG(s1394_old_tree_mark_all_unvisited_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->old_number_of_nodes; for (i = 0; i < number_of_nodes; i++) CLEAR_NODE_VISITED(&hal->old_tree[i]); - - TNF_PROBE_0_DEBUG(s1394_old_tree_mark_all_unvisited_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -798,18 +638,12 @@ s1394_old_tree_mark_all_unmatched(s1394_hal_t *hal) uint_t number_of_nodes; int i; - TNF_PROBE_0_DEBUG(s1394_old_tree_mark_all_unmatched_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->old_number_of_nodes; for (i = 0; i < number_of_nodes; i++) CLEAR_NODE_MATCHED(&hal->old_tree[i]); - - TNF_PROBE_0_DEBUG(s1394_old_tree_mark_all_unmatched_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -821,9 +655,6 @@ s1394_copy_old_tree(s1394_hal_t *hal) { s1394_node_t *temp; - TNF_PROBE_0_DEBUG(s1394_copy_old_tree_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); temp = hal->old_tree; @@ -836,9 +667,6 @@ s1394_copy_old_tree(s1394_hal_t *hal) /* Old tree is now valid and filled also */ hal->old_tree_valid = B_TRUE; - - TNF_PROBE_0_DEBUG(s1394_copy_old_tree_exit, - S1394_TNF_SL_BR_STACK, ""); } @@ -863,9 +691,6 @@ s1394_match_tree_nodes(s1394_hal_t *hal) int i; int port_type; - TNF_PROBE_0_DEBUG(s1394_match_tree_nodes_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); /* To ensure that the queue is empty */ @@ -938,9 +763,6 @@ s1394_match_tree_nodes(s1394_hal_t *hal) } } } - - TNF_PROBE_0_DEBUG(s1394_match_tree_nodes_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -963,9 +785,6 @@ s1394_topology_tree_calculate_diameter(s1394_hal_t *hal) int diameter = 0; int local_diameter = 0; - TNF_PROBE_0_DEBUG(s1394_topology_tree_calculate_diameter_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; @@ -1028,8 +847,6 @@ s1394_topology_tree_calculate_diameter(s1394_hal_t *hal) } } while (done == B_FALSE); - TNF_PROBE_0_DEBUG(s1394_topology_tree_calculate_diameter_exit, - S1394_TNF_SL_BR_STACK, ""); return (diameter); } @@ -1063,9 +880,6 @@ s1394_get_current_gap_count(s1394_hal_t *hal) int i; int gap_count = -1; - TNF_PROBE_0_DEBUG(s1394_get_current_gap_count_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); /* Grab the first gap_count in the SelfID packets */ @@ -1077,23 +891,15 @@ s1394_get_current_gap_count(s1394_hal_t *hal) IEEE1394_SELFID_GAP_CNT(hal->selfid_ptrs[i])) { /* Inconsistent gap counts */ - TNF_PROBE_1(s1394_get_current_gap_count_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "Inconsistent gap count"); - if (s1394_ignore_invalid_gap_cnt == 0) { /* Initiate a bus reset */ s1394_initiate_hal_reset(hal, CRITICAL); } - TNF_PROBE_0_DEBUG(s1394_get_current_gap_count_exit, - S1394_TNF_SL_BR_STACK, ""); return (-1); } } - TNF_PROBE_0_DEBUG(s1394_get_current_gap_count_exit, - S1394_TNF_SL_BR_STACK, ""); return (gap_count); } @@ -1122,9 +928,6 @@ s1394_speed_map_fill(s1394_hal_t *hal) int j; int node_num; - TNF_PROBE_0_DEBUG(s1394_speed_map_fill_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; @@ -1156,9 +959,6 @@ s1394_speed_map_fill(s1394_hal_t *hal) hal->speed_map[i][i] = selfid_speed(hal->topology_tree[i].selfid_packet); } - - TNF_PROBE_0_DEBUG(s1394_speed_map_fill_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -1179,9 +979,6 @@ s1394_speed_map_fill_speed_N(s1394_hal_t *hal, int min_spd) int size; int ix_a, ix_b; - TNF_PROBE_0_DEBUG(s1394_speed_map_fill_speed_N_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; @@ -1246,9 +1043,6 @@ s1394_speed_map_fill_speed_N(s1394_hal_t *hal, int min_spd) hal->hal_node_number_list_size = 0; } } - - TNF_PROBE_0_DEBUG(s1394_speed_map_fill_speed_N_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -1263,9 +1057,6 @@ s1394_speed_map_initialize(s1394_hal_t *hal) uint_t number_of_nodes; int i, j; - TNF_PROBE_0_DEBUG(s1394_speed_map_initialize_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; @@ -1277,9 +1068,6 @@ s1394_speed_map_initialize(s1394_hal_t *hal) hal->speed_map[i][j] = SPEED_MAP_INVALID; } } - - TNF_PROBE_0_DEBUG(s1394_speed_map_initialize_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -1313,9 +1101,6 @@ s1394_update_speed_map_link_speeds(s1394_hal_t *hal) uint_t number_of_nodes; int i, j; - TNF_PROBE_0_DEBUG(s1394_update_speed_map_link_speeds_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); number_of_nodes = hal->number_of_nodes; @@ -1353,9 +1138,6 @@ s1394_update_speed_map_link_speeds(s1394_hal_t *hal) } } } - - TNF_PROBE_0_DEBUG(s1394_update_speed_map_link_speeds_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -1370,25 +1152,17 @@ s1394_get_isoch_rsrc_mgr(s1394_hal_t *hal) { int i; - TNF_PROBE_0_DEBUG(s1394_get_isoch_rsrc_mgr_enter, S1394_TNF_SL_BR_STACK, - ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); for (i = hal->number_of_nodes - 1; i >= 0; i--) { /* Highest numbered node with L=1 and C=1 */ if ((IEEE1394_SELFID_ISLINKON(hal->selfid_ptrs[i])) && (IEEE1394_SELFID_ISCONTENDER(hal->selfid_ptrs[i]))) { - - TNF_PROBE_0_DEBUG(s1394_get_isoch_rsrc_mgr_exit, - S1394_TNF_SL_BR_STACK, ""); return (i); } } /* No Isochronous Resource Manager */ - TNF_PROBE_0_DEBUG(s1394_get_isoch_rsrc_mgr_exit, S1394_TNF_SL_BR_STACK, - ""); return (-1); } @@ -1407,9 +1181,6 @@ s1394_physical_arreq_setup_all(s1394_hal_t *hal) uint32_t node_num; uint_t generation; - TNF_PROBE_0_DEBUG(s1394_physical_arreq_setup_all_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); mutex_enter(&hal->topology_tree_mutex); @@ -1436,9 +1207,6 @@ s1394_physical_arreq_setup_all(s1394_hal_t *hal) */ (void) HAL_CALL(hal).physical_arreq_enable_set( hal->halinfo.hal_private, mask, generation); - - TNF_PROBE_0_DEBUG(s1394_physical_arreq_setup_all_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -1455,9 +1223,6 @@ s1394_physical_arreq_set_one(s1394_target_t *target) uint32_t node_num; uint_t generation; - TNF_PROBE_0_DEBUG(s1394_physical_arreq_set_one_enter, - S1394_TNF_SL_STACK, ""); - /* Find the HAL this target resides on */ hal = target->on_hal; @@ -1488,9 +1253,6 @@ s1394_physical_arreq_set_one(s1394_target_t *target) rw_exit(&hal->target_list_rwlock); mutex_exit(&hal->topology_tree_mutex); } - - TNF_PROBE_0_DEBUG(s1394_physical_arreq_set_one_exit, - S1394_TNF_SL_STACK, ""); } /* @@ -1507,9 +1269,6 @@ s1394_physical_arreq_clear_one(s1394_target_t *target) uint32_t node_num; uint_t generation; - TNF_PROBE_0_DEBUG(s1394_physical_arreq_clear_one_enter, - S1394_TNF_SL_STACK, ""); - /* Find the HAL this target resides on */ hal = target->on_hal; @@ -1540,10 +1299,6 @@ s1394_physical_arreq_clear_one(s1394_target_t *target) rw_exit(&hal->target_list_rwlock); mutex_exit(&hal->topology_tree_mutex); } - - - TNF_PROBE_0_DEBUG(s1394_physical_arreq_clear_one_exit, - S1394_TNF_SL_STACK, ""); } /* @@ -1554,13 +1309,7 @@ s1394_physical_arreq_clear_one(s1394_target_t *target) s1394_node_t * s1394_topology_tree_get_root_node(s1394_hal_t *hal) { - TNF_PROBE_0_DEBUG(s1394_topology_tree_get_root_node_enter, - S1394_TNF_SL_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_topology_tree_get_root_node_exit, - S1394_TNF_SL_STACK, ""); - return (&hal->topology_tree[hal->number_of_nodes - 1]); } diff --git a/usr/src/uts/common/io/1394/s1394_cmp.c b/usr/src/uts/common/io/1394/s1394_cmp.c index 05944d7379..3168b440bb 100644 --- a/usr/src/uts/common/io/1394/s1394_cmp.c +++ b/usr/src/uts/common/io/1394/s1394_cmp.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_cmp.c * 1394 Services Layer Connection Management Procedures Support Routines @@ -37,8 +35,6 @@ #include <sys/cmn_err.h> #include <sys/types.h> #include <sys/kmem.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -90,8 +86,6 @@ s1394_cmp_register(s1394_target_t *target, t1394_cmp_evts_t *evts) s1394_hal_t *hal = target->on_hal; static t1394_cmp_evts_t default_evts = { NULL, NULL }; - TNF_PROBE_0_DEBUG(s1394_cmp_register_enter, S1394_TNF_SL_CMP_STACK, ""); - rw_enter(&hal->target_list_rwlock, RW_WRITER); /* * if registering the first target, claim and initialize addresses @@ -123,7 +117,6 @@ s1394_cmp_register(s1394_target_t *target, t1394_cmp_evts_t *evts) rw_exit(&hal->target_list_rwlock); - TNF_PROBE_0_DEBUG(s1394_cmp_register_exit, S1394_TNF_SL_CMP_STACK, ""); return (DDI_SUCCESS); } @@ -132,9 +125,6 @@ s1394_cmp_unregister(s1394_target_t *target) { s1394_hal_t *hal = target->on_hal; - TNF_PROBE_0_DEBUG(s1394_cmp_unregister_enter, S1394_TNF_SL_CMP_STACK, - ""); - rw_enter(&hal->target_list_rwlock, RW_WRITER); if (s1394_fa_list_remove(hal, target, @@ -144,15 +134,10 @@ s1394_cmp_unregister(s1394_target_t *target) s1394_fa_free_addr(hal, S1394_FA_TYPE_CMP_IMPR); s1394_cmp_fini(hal); } - } else { - TNF_PROBE_0(s1394_cmp_unregister_common_error_list, - S1394_TNF_SL_CMP_ERROR, ""); } rw_exit(&hal->target_list_rwlock); - TNF_PROBE_0_DEBUG(s1394_cmp_unregister_exit, S1394_TNF_SL_CMP_STACK, - ""); return (DDI_SUCCESS); } @@ -163,8 +148,6 @@ s1394_cmp_read(s1394_target_t *target, t1394_cmp_reg_t reg, uint32_t *valp) s1394_cmp_hal_t *cmp = &hal->hal_cmp; int ret = DDI_FAILURE; - TNF_PROBE_0_DEBUG(s1394_cmp_read_enter, S1394_TNF_SL_CMP_STACK, ""); - if (reg == T1394_CMP_OMPR) { rw_enter(&cmp->cmp_ompr_rwlock, RW_READER); *valp = cmp->cmp_ompr_val; @@ -177,7 +160,6 @@ s1394_cmp_read(s1394_target_t *target, t1394_cmp_reg_t reg, uint32_t *valp) ret = DDI_SUCCESS; } - TNF_PROBE_0_DEBUG(s1394_cmp_read_exit, S1394_TNF_SL_CMP_STACK, ""); return (ret); } @@ -189,8 +171,6 @@ s1394_cmp_cas(s1394_target_t *target, t1394_cmp_reg_t reg, uint32_t arg_val, s1394_cmp_hal_t *cmp = &hal->hal_cmp; int ret = DDI_SUCCESS; - TNF_PROBE_0_DEBUG(s1394_cmp_cas_enter, S1394_TNF_SL_CMP_STACK, ""); - if (reg == T1394_CMP_OMPR) { rw_enter(&cmp->cmp_ompr_rwlock, RW_WRITER); *old_valp = cmp->cmp_ompr_val; @@ -214,7 +194,6 @@ s1394_cmp_cas(s1394_target_t *target, t1394_cmp_reg_t reg, uint32_t arg_val, s1394_cmp_notify_reg_change(hal, reg, target); } - TNF_PROBE_0_DEBUG(s1394_cmp_cas_exit, S1394_TNF_SL_CMP_STACK, ""); return (ret); } @@ -248,9 +227,6 @@ s1394_cmp_ompr_recv_read_request(cmd1394_cmd_t *req) s1394_hal_t *hal = req->cmd_callback_arg; s1394_cmp_hal_t *cmp = &hal->hal_cmp; - TNF_PROBE_0_DEBUG(s1394_cmp_ompr_recv_read_request_enter, - S1394_TNF_SL_CMP_STACK, ""); - if (req->cmd_type != CMD1394_ASYNCH_RD_QUAD) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; } else { @@ -261,9 +237,6 @@ s1394_cmp_ompr_recv_read_request(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - - TNF_PROBE_0_DEBUG(s1394_cmp_ompr_recv_read_request_exit, - S1394_TNF_SL_CMP_STACK, ""); } static void @@ -272,9 +245,6 @@ s1394_cmp_impr_recv_read_request(cmd1394_cmd_t *req) s1394_hal_t *hal = req->cmd_callback_arg; s1394_cmp_hal_t *cmp = &hal->hal_cmp; - TNF_PROBE_0_DEBUG(s1394_cmp_impr_recv_read_request_enter, - S1394_TNF_SL_CMP_STACK, ""); - if (req->cmd_type != CMD1394_ASYNCH_RD_QUAD) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; } else { @@ -285,9 +255,6 @@ s1394_cmp_impr_recv_read_request(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - - TNF_PROBE_0_DEBUG(s1394_cmp_impr_recv_read_request_exit, - S1394_TNF_SL_CMP_STACK, ""); } static void @@ -297,9 +264,6 @@ s1394_cmp_ompr_recv_lock_request(cmd1394_cmd_t *req) s1394_cmp_hal_t *cmp = &hal->hal_cmp; boolean_t notify = B_TRUE; - TNF_PROBE_0_DEBUG(s1394_cmp_ompr_recv_lock_request_enter, - S1394_TNF_SL_CMP_STACK, ""); - if ((req->cmd_type != CMD1394_ASYNCH_LOCK_32) || (req->cmd_u.l32.lock_type != CMD1394_LOCK_COMPARE_SWAP)) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; @@ -323,9 +287,6 @@ s1394_cmp_ompr_recv_lock_request(cmd1394_cmd_t *req) if (notify) { s1394_cmp_notify_reg_change(hal, T1394_CMP_OMPR, NULL); } - - TNF_PROBE_0_DEBUG(s1394_cmp_ompr_recv_lock_request_exit, - S1394_TNF_SL_CMP_STACK, ""); } static void @@ -335,9 +296,6 @@ s1394_cmp_impr_recv_lock_request(cmd1394_cmd_t *req) s1394_cmp_hal_t *cmp = &hal->hal_cmp; boolean_t notify = B_TRUE; - TNF_PROBE_0_DEBUG(s1394_cmp_impr_recv_lock_request_enter, - S1394_TNF_SL_CMP_STACK, ""); - if ((req->cmd_type != CMD1394_ASYNCH_LOCK_32) || (req->cmd_u.l32.lock_type != CMD1394_LOCK_COMPARE_SWAP)) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; @@ -361,9 +319,6 @@ s1394_cmp_impr_recv_lock_request(cmd1394_cmd_t *req) if (notify) { s1394_cmp_notify_reg_change(hal, T1394_CMP_IMPR, NULL); } - - TNF_PROBE_0_DEBUG(s1394_cmp_impr_recv_lock_request_exit, - S1394_TNF_SL_CMP_STACK, ""); } /* @@ -380,9 +335,6 @@ s1394_cmp_notify_reg_change(s1394_hal_t *hal, t1394_cmp_reg_t reg, void (*cb)(opaque_t, t1394_cmp_reg_t); opaque_t arg; - TNF_PROBE_0_DEBUG(s1394_cmp_notify_reg_change_enter, - S1394_TNF_SL_CMP_STACK, ""); - rw_enter(&hal->target_list_rwlock, RW_READER); start: @@ -419,10 +371,6 @@ start: * target than receiving same notification more than once */ if (saved_gen != s1394_fa_list_gen(hal, S1394_FA_TYPE_CMP)) { - TNF_PROBE_2(s1394_cmp_notify_reg_change_error, - S1394_TNF_SL_CMP_ERROR, "", - tnf_string, msg, "list gen changed", - tnf_opaque, num_retries, num_retries); if (++num_retries <= s1394_cmp_notify_retry_cnt) { goto start; } else { @@ -432,7 +380,4 @@ start: } rw_exit(&hal->target_list_rwlock); - - TNF_PROBE_0_DEBUG(s1394_cmp_notify_reg_change_exit, - S1394_TNF_SL_CMP_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/s1394_csr.c b/usr/src/uts/common/io/1394/s1394_csr.c index 306a800886..46eb1d55cf 100644 --- a/usr/src/uts/common/io/1394/s1394_csr.c +++ b/usr/src/uts/common/io/1394/s1394_csr.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_csr.c * 1394 Services Layer CSR and Config ROM Routines @@ -40,8 +38,6 @@ #include <sys/sunddi.h> #include <sys/types.h> #include <sys/kmem.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -96,9 +92,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) t1394_addr_enable_t rw_flags; int result; - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_enter, S1394_TNF_SL_CSR_STACK, - ""); - /* * Although they are not freed up in this routine, if * one of the s1394_claim_addr_blk() routines fails, @@ -125,11 +118,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "STATE_CLEAR: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -149,11 +137,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "STATE_SET: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -173,11 +156,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "NODE_IDS: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -197,11 +175,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "RESET_START: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -221,11 +194,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "SPLIT_TIMEOUT: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -245,11 +213,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "ARGUMENT registers: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -269,11 +232,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "TEST registers: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -293,11 +251,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "INTERRUPT registers: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -317,11 +270,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "CLOCK registers: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -341,11 +289,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "MESSAGE registers: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -364,11 +307,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "CYCLE_TIME: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -387,11 +325,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "BUS_TIME: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -410,11 +343,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "BUSY_TIMEOUT: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -435,11 +363,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_arg = hal; result = s1394_claim_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "IRM registers: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -451,11 +374,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_length = IEEE1394_CONFIG_ROM_SZ; result = s1394_reserve_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "Unable to reserve Config ROM"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -478,11 +396,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) if (result != DDI_SUCCESS) { kmem_free((void *)hal->CSR_topology_map, IEEE1394_UCSR_TOPOLOGY_MAP_SZ); - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "TOPOLOGY_MAP: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } curr_blk = (s1394_addr_space_blk_t *)(addr.aa_hdl); @@ -498,11 +411,6 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_length = IEEE1394_UCSR_SPEED_MAP_SZ; result = s1394_reserve_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "SPEED_MAP: CSR setup failed"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -519,16 +427,9 @@ s1394_setup_CSR_space(s1394_hal_t *hal) addr.aa_length = IEEE1394_QUADLET; result = s1394_reserve_addr_blk(hal, &addr); if (result != DDI_SUCCESS) { - TNF_PROBE_1(s1394_setup_CSR_space_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "Unable to reserve boundary quadlet"); - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, - "stacktrace 1394 s1394", ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(s1394_setup_CSR_space_exit, S1394_TNF_SL_CSR_STACK, - ""); return (DDI_SUCCESS); } @@ -548,9 +449,6 @@ s1394_CSR_state_clear(cmd1394_cmd_t *req) uint_t should_be_from; int result; - TNF_PROBE_0_DEBUG(s1394_CSR_state_clear_enter, S1394_TNF_SL_CSR_STACK, - ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* Register offset */ @@ -560,8 +458,6 @@ s1394_CSR_state_clear(cmd1394_cmd_t *req) if ((offset & 0x3) != 0) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_state_clear_exit, - S1394_TNF_SL_CSR_STACK, ""); return; } @@ -639,8 +535,6 @@ s1394_CSR_state_clear(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_state_clear_exit, S1394_TNF_SL_CSR_STACK, - ""); } /* @@ -661,9 +555,6 @@ s1394_CSR_state_set(cmd1394_cmd_t *req) uint_t hal_number_of_nodes; int result; - TNF_PROBE_0_DEBUG(s1394_CSR_state_set_enter, S1394_TNF_SL_CSR_STACK, - ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* Register offset */ @@ -673,8 +564,6 @@ s1394_CSR_state_set(cmd1394_cmd_t *req) if ((offset & 0x3) != 0) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_state_set_exit, - S1394_TNF_SL_CSR_STACK, ""); return; } @@ -739,8 +628,6 @@ s1394_CSR_state_set(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_state_set_exit, S1394_TNF_SL_CSR_STACK, - ""); } /* @@ -753,13 +640,9 @@ s1394_CSR_node_ids(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_node_ids_enter, S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; s1394_common_CSR_routine(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_node_ids_exit, S1394_TNF_SL_CSR_STACK, ""); } /* @@ -774,9 +657,6 @@ s1394_CSR_reset_start(cmd1394_cmd_t *req) uint32_t data; uint_t offset; - TNF_PROBE_0_DEBUG(s1394_CSR_reset_start_enter, S1394_TNF_SL_CSR_STACK, - ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* RESET_START register offset */ @@ -786,8 +666,6 @@ s1394_CSR_reset_start(cmd1394_cmd_t *req) if ((offset & 0x3) != 0) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_reset_start_exit, - S1394_TNF_SL_CSR_STACK, ""); return; } @@ -811,8 +689,6 @@ s1394_CSR_reset_start(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_reset_start_exit, S1394_TNF_SL_CSR_STACK, - ""); } /* @@ -825,15 +701,9 @@ s1394_CSR_split_timeout(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_split_timeout_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; s1394_common_CSR_routine(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_split_timeout_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -846,15 +716,9 @@ s1394_CSR_argument_regs(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_argument_regs_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; s1394_common_CSR_routine(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_argument_regs_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -868,9 +732,6 @@ s1394_CSR_test_regs(cmd1394_cmd_t *req) s1394_hal_t *hal; uint_t offset; - TNF_PROBE_0_DEBUG(s1394_CSR_test_regs_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* TEST register offset */ @@ -884,9 +745,6 @@ s1394_CSR_test_regs(cmd1394_cmd_t *req) } else { s1394_common_CSR_routine(hal, req); } - - TNF_PROBE_0_DEBUG(s1394_CSR_test_regs_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -899,15 +757,9 @@ s1394_CSR_interrupt_regs(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_interrupt_regs_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; s1394_common_CSR_routine(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_interrupt_regs_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -920,15 +772,9 @@ s1394_CSR_clock_regs(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_clock_regs_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; s1394_common_CSR_routine(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_clock_regs_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -941,15 +787,9 @@ s1394_CSR_message_regs(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_message_regs_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; s1394_common_CSR_routine(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_message_regs_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -964,9 +804,6 @@ s1394_CSR_cycle_time(cmd1394_cmd_t *req) uint_t offset; int result; - TNF_PROBE_0_DEBUG(s1394_CSR_cycle_time_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* CYCLE_TIME register offset */ @@ -976,8 +813,6 @@ s1394_CSR_cycle_time(cmd1394_cmd_t *req) if ((offset & 0x3) != 0) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_cycle_time_exit, - S1394_TNF_SL_CSR_STACK, ""); return; } @@ -1028,8 +863,6 @@ s1394_CSR_cycle_time(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_cycle_time_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -1048,8 +881,6 @@ s1394_CSR_bus_time(cmd1394_cmd_t *req) uint_t should_be_from; int result; - TNF_PROBE_0_DEBUG(s1394_CSR_bus_time_enter, S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* BUS_TIME register offset */ @@ -1059,8 +890,6 @@ s1394_CSR_bus_time(cmd1394_cmd_t *req) if ((offset & 0x3) != 0) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_bus_time_exit, - S1394_TNF_SL_CSR_STACK, ""); return; } @@ -1126,7 +955,6 @@ s1394_CSR_bus_time(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_bus_time_exit, S1394_TNF_SL_CSR_STACK, ""); } /* @@ -1139,15 +967,9 @@ s1394_CSR_busy_timeout(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_busy_timeout_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; s1394_common_CSR_routine(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_busy_timeout_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -1168,8 +990,6 @@ s1394_CSR_IRM_regs(cmd1394_cmd_t *req) uint_t offset; int result; - TNF_PROBE_0_DEBUG(s1394_CSR_IRM_regs_enter, S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* IRM register offset */ @@ -1179,8 +999,6 @@ s1394_CSR_IRM_regs(cmd1394_cmd_t *req) if ((offset & 0x3) != 0) { req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_IRM_regs_exit, - S1394_TNF_SL_CSR_STACK, ""); return; } @@ -1241,7 +1059,6 @@ s1394_CSR_IRM_regs(cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_CSR_IRM_regs_exit, S1394_TNF_SL_CSR_STACK, ""); } /* @@ -1255,9 +1072,6 @@ s1394_CSR_topology_map(cmd1394_cmd_t *req) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_CSR_topology_map_enter, - S1394_TNF_SL_CSR_STACK, ""); - hal = (s1394_hal_t *)req->cmd_callback_arg; /* Make sure it's a quadlet read request */ @@ -1267,9 +1081,6 @@ s1394_CSR_topology_map(cmd1394_cmd_t *req) req->cmd_result = IEEE1394_RESP_TYPE_ERROR; (void) s1394_send_response(hal, req); - - TNF_PROBE_0_DEBUG(s1394_CSR_topology_map_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -1291,9 +1102,6 @@ s1394_CSR_topology_map_update(s1394_hal_t *hal) uint32_t length; int i, j, c; - TNF_PROBE_0_DEBUG(s1394_CSR_topology_map_update_enter, - S1394_TNF_SL_BR_CSR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); tm_ptr = (uint32_t *)hal->CSR_topology_map; @@ -1324,9 +1132,6 @@ s1394_CSR_topology_map_update(s1394_hal_t *hal) length = self_id_count + 2; CRC = s1394_CRC16(&(tm_ptr[1]), length); tm_ptr[0] = (length << IEEE1394_TOP_MAP_LEN_SHIFT) | CRC; - - TNF_PROBE_0_DEBUG(s1394_CSR_topology_map_update_exit, - S1394_TNF_SL_BR_CSR_STACK, ""); } /* @@ -1340,18 +1145,12 @@ s1394_CSR_topology_map_disable(s1394_hal_t *hal) { uint32_t *tm_ptr; - TNF_PROBE_0_DEBUG(s1394_CSR_topology_map_disable_enter, - S1394_TNF_SL_BR_CSR_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); tm_ptr = (uint32_t *)hal->CSR_topology_map; /* Set length = 0 */ tm_ptr[0] = tm_ptr[0] & IEEE1394_TOP_MAP_LEN_MASK; - - TNF_PROBE_0_DEBUG(s1394_CSR_topology_map_disable_exit, - S1394_TNF_SL_BR_CSR_STACK, ""); } /* @@ -1367,9 +1166,6 @@ s1394_common_CSR_routine(s1394_hal_t *hal, cmd1394_cmd_t *req) uint_t offset; int result; - TNF_PROBE_0_DEBUG(s1394_common_CSR_routine_enter, - S1394_TNF_SL_CSR_STACK, ""); - /* Register offset */ offset = (req->cmd_addr & IEEE1394_CSR_OFFSET_MASK); @@ -1419,8 +1215,6 @@ s1394_common_CSR_routine(s1394_hal_t *hal, cmd1394_cmd_t *req) } (void) s1394_send_response(hal, req); - TNF_PROBE_0_DEBUG(s1394_common_CSR_routine_exit, - S1394_TNF_SL_CSR_STACK, ""); } /* @@ -1447,9 +1241,6 @@ s1394_init_local_config_rom(s1394_hal_t *hal) uint32_t CRC; int status, i, ret; - TNF_PROBE_0_DEBUG(s1394_init_local_config_rom_enter, - S1394_TNF_SL_CFGROM_STACK, ""); - /* Setup Config ROM mutex */ mutex_init(&hal->local_config_rom_mutex, NULL, MUTEX_DRIVER, hal->halinfo.hw_interrupt); @@ -1477,11 +1268,6 @@ s1394_init_local_config_rom(s1394_hal_t *hal) kmem_free((void *)hal->local_config_rom, IEEE1394_CONFIG_ROM_SZ); mutex_destroy(&hal->local_config_rom_mutex); - TNF_PROBE_1(s1394_init_local_config_rom_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Failed in s1394_init_config_rom_structures()"); - TNF_PROBE_0_DEBUG(s1394_init_local_config_rom_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } /* Build the Bus_Info_Block - see IEEE 1394-1995, Section 8.3.2.5.4 */ @@ -1577,11 +1363,6 @@ s1394_init_local_config_rom(s1394_hal_t *hal) kmem_free((void *)hal->local_config_rom, IEEE1394_CONFIG_ROM_SZ); mutex_destroy(&hal->local_config_rom_mutex); - TNF_PROBE_1(s1394_init_local_config_rom_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Failure in kmem_zalloc"); - TNF_PROBE_0_DEBUG(s1394_init_local_config_rom_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } kmem_free((void *)text_leaf, S1394_ROOT_TEXT_LEAF_SZ); @@ -1614,11 +1395,6 @@ s1394_init_local_config_rom(s1394_hal_t *hal) kmem_free((void *)hal->local_config_rom, IEEE1394_CONFIG_ROM_SZ); mutex_destroy(&hal->local_config_rom_mutex); - TNF_PROBE_1(s1394_init_local_config_rom_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Failure in kmem_zalloc"); - TNF_PROBE_0_DEBUG(s1394_init_local_config_rom_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } kmem_free((void *)node_unique_id_leaf, S1394_NODE_UNIQUE_ID_SZ); @@ -1666,11 +1442,6 @@ s1394_init_local_config_rom(s1394_hal_t *hal) kmem_free((void *)hal->local_config_rom, IEEE1394_CONFIG_ROM_SZ); mutex_destroy(&hal->local_config_rom_mutex); - TNF_PROBE_1(s1394_init_local_config_rom_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Failure in kmem_zalloc"); - TNF_PROBE_0_DEBUG(s1394_init_local_config_rom_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } kmem_free((void *)unit_dir, S1394_UNIT_DIR_SZ); @@ -1688,8 +1459,6 @@ s1394_init_local_config_rom(s1394_hal_t *hal) (void) HAL_CALL(hal).update_config_rom(hal->halinfo.hal_private, config_rom, IEEE1394_CONFIG_ROM_QUAD_SZ); - TNF_PROBE_0_DEBUG(s1394_init_local_config_rom_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_SUCCESS); } @@ -1703,9 +1472,6 @@ s1394_init_local_config_rom(s1394_hal_t *hal) void s1394_destroy_local_config_rom(s1394_hal_t *hal) { - TNF_PROBE_0_DEBUG(s1394_destroy_local_config_rom_enter, - S1394_TNF_SL_CFGROM_STACK, ""); - /* Lock the Config ROM buffer */ mutex_enter(&hal->local_config_rom_mutex); @@ -1722,9 +1488,6 @@ s1394_destroy_local_config_rom(s1394_hal_t *hal) /* Setup Config ROM mutex */ mutex_destroy(&hal->local_config_rom_mutex); - - TNF_PROBE_0_DEBUG(s1394_destroy_local_config_rom_exit, - S1394_TNF_SL_CFGROM_STACK, ""); } /* @@ -1738,9 +1501,6 @@ s1394_init_config_rom_structures(s1394_hal_t *hal) s1394_config_rom_t *root_directory; s1394_config_rom_t *rest_of_config_rom; - TNF_PROBE_0_DEBUG(s1394_init_config_rom_structures_enter, - S1394_TNF_SL_CFGROM_STACK, ""); - ASSERT(MUTEX_HELD(&hal->local_config_rom_mutex)); root_directory = (s1394_config_rom_t *)kmem_zalloc( @@ -1766,8 +1526,6 @@ s1394_init_config_rom_structures(s1394_hal_t *hal) hal->free_space = IEEE1394_CONFIG_ROM_QUAD_SZ - (rest_of_config_rom->cfgrom_addr_lo); - TNF_PROBE_0_DEBUG(s1394_init_config_rom_structures_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_SUCCESS); } @@ -1782,9 +1540,6 @@ s1394_destroy_config_rom_structures(s1394_hal_t *hal) s1394_config_rom_t *curr_blk; s1394_config_rom_t *next_blk; - TNF_PROBE_0_DEBUG(s1394_destroy_config_rom_structures_enter, - S1394_TNF_SL_CFGROM_STACK, ""); - ASSERT(MUTEX_HELD(&hal->local_config_rom_mutex)); curr_blk = hal->root_directory; @@ -1795,8 +1550,6 @@ s1394_destroy_config_rom_structures(s1394_hal_t *hal) curr_blk = next_blk; } - TNF_PROBE_0_DEBUG(s1394_destroy_config_rom_structures_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_SUCCESS); } @@ -1824,16 +1577,11 @@ s1394_add_config_rom_entry(s1394_hal_t *hal, uint8_t key, uint32_t *buffer, uint_t last_entry_offset; int i; - TNF_PROBE_0_DEBUG(s1394_add_config_rom_entry_enter, - "stacktrace 1394 s1394", ""); - ASSERT(MUTEX_HELD(&hal->local_config_rom_mutex)); if (size > hal->free_space) { /* Out of space */ *status = CMD1394_ERSRC_CONFLICT; - TNF_PROBE_0_DEBUG(s1394_add_config_rom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } @@ -1891,8 +1639,6 @@ s1394_add_config_rom_entry(s1394_hal_t *hal, uint8_t key, uint32_t *buffer, new_blk = (s1394_config_rom_t *)kmem_zalloc( sizeof (s1394_config_rom_t), KM_SLEEP); if (new_blk == NULL) { - TNF_PROBE_0_DEBUG(s1394_add_config_rom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } @@ -1943,8 +1689,6 @@ s1394_add_config_rom_entry(s1394_hal_t *hal, uint8_t key, uint32_t *buffer, *status = T1394_NOERROR; - TNF_PROBE_0_DEBUG(s1394_add_config_rom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_SUCCESS); } @@ -1973,9 +1717,6 @@ s1394_remove_config_rom_entry(s1394_hal_t *hal, void **handle, int *status) uint_t tmp_size; int i; - TNF_PROBE_0_DEBUG(s1394_remove_config_rom_entry_enter, - S1394_TNF_SL_CFGROM_STACK, ""); - ASSERT(MUTEX_HELD(&hal->local_config_rom_mutex)); del_blk = (s1394_config_rom_t *)(*handle); @@ -2060,8 +1801,6 @@ s1394_remove_config_rom_entry(s1394_hal_t *hal, void **handle, int *status) free_blk = (s1394_config_rom_t *)kmem_zalloc( sizeof (s1394_config_rom_t), KM_SLEEP); if (free_blk == NULL) { - TNF_PROBE_0_DEBUG(s1394_remove_config_rom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } @@ -2107,8 +1846,6 @@ s1394_remove_config_rom_entry(s1394_hal_t *hal, void **handle, int *status) *status = T1394_NOERROR; - TNF_PROBE_0_DEBUG(s1394_remove_config_rom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_SUCCESS); } @@ -2129,10 +1866,7 @@ s1394_update_config_rom_callback(void *arg) uint32_t g; uint_t CRC; uint_t last_entry_offset; - int i, ret; - - TNF_PROBE_0_DEBUG(s1394_update_config_rom_callback_enter, - S1394_TNF_SL_CFGROM_STACK, ""); + int i; hal = (s1394_hal_t *)arg; @@ -2186,13 +1920,5 @@ s1394_update_config_rom_callback(void *arg) config_rom, last_entry_offset); /* Initiate a bus reset */ - ret = HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(s1394_update_config_rom_callback_error, - S1394_TNF_SL_ERROR, "", tnf_string, msg, - "Error initiating bus reset"); - } - - TNF_PROBE_0_DEBUG(s1394_update_config_rom_callback_exit, - S1394_TNF_SL_CFGROM_STACK, ""); + (void) HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); } diff --git a/usr/src/uts/common/io/1394/s1394_dev_disc.c b/usr/src/uts/common/io/1394/s1394_dev_disc.c index 08bb639647..3a254d5ddd 100644 --- a/usr/src/uts/common/io/1394/s1394_dev_disc.c +++ b/usr/src/uts/common/io/1394/s1394_dev_disc.c @@ -54,8 +54,6 @@ #include <sys/kstat.h> #include <sys/varargs.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -177,9 +175,6 @@ static int s1394_enable_rio_pass1_workarounds = 0; void s1394_br_thread(s1394_hal_t *hal) { - TNF_PROBE_0_DEBUG(s1394_br_thread_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); /* Initialize the Bus Mgr timers */ @@ -196,17 +191,10 @@ s1394_br_thread(s1394_hal_t *hal) for (;;) { ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_br_thread_wait, - S1394_TNF_SL_HOTPLUG_STACK, ""); - s1394_wait_for_events(hal, 0); ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_1_DEBUG(s1394_br_thread_restart, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, hal_instance, ddi_get_instance(hal->halinfo.dip)); - /* stop bus manager timeouts, if needed */ s1394_bus_mgr_timers_stop(hal, &hal->bus_mgr_query_timeout_id, &hal->bus_mgr_timeout_id); @@ -221,37 +209,19 @@ s1394_br_thread(s1394_hal_t *hal) s1394_isoch_rsrc_realloc(hal); if (s1394_cfgrom_scan_phase1(hal) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(br_thread_phase1_restart, - S1394_TNF_SL_HOTPLUG_STACK, ""); continue; } - TNF_PROBE_1_DEBUG(s1394_br_thread_phase1_done, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, hal_instance, ddi_get_instance(hal->halinfo.dip)); - if (s1394_bus_mgr_processing(hal) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(br_thread_bus_mgr_restart, - S1394_TNF_SL_HOTPLUG_STACK, ""); continue; } - TNF_PROBE_1_DEBUG(s1394_br_thread_bus_mgr_proc_done, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, hal_instance, ddi_get_instance(hal->halinfo.dip)); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); if (s1394_cfgrom_scan_phase2(hal) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(br_thread_phase2_restart, - S1394_TNF_SL_HOTPLUG_STACK, ""); continue; } - TNF_PROBE_1_DEBUG(s1394_br_thread_done, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, hal_instance, ddi_get_instance(hal->halinfo.dip)); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); } } @@ -272,9 +242,6 @@ s1394_wait_for_events(s1394_hal_t *hal, int firsttime) { uint_t event; - TNF_PROBE_0_DEBUG(s1394_wait_for_events_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->br_thread_mutex)); ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); @@ -291,37 +258,22 @@ s1394_wait_for_events(s1394_hal_t *hal, int firsttime) } if (event & BR_THR_GO_AWAY) { - TNF_PROBE_1(s1394_wait_for_events, S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_string, msg, "Go away set"); s1394_br_thread_exit(hal); - TNF_PROBE_0_DEBUG(s1394_wait_for_events_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); /*NOTREACHED*/ return; } if (firsttime) { - TNF_PROBE_0_DEBUG(s1394_wait_for_events_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); mutex_exit(&hal->br_thread_mutex); return; } mutex_enter(&hal->topology_tree_mutex); - if (event & BR_THR_CFGROM_SCAN) { - TNF_PROBE_2_DEBUG(s1394_wait_for_events_scan, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, br_thread_gen, hal->br_cfgrom_read_gen, - tnf_int, hal_generation, hal->generation_count); - } hal->br_cfgrom_read_gen = hal->generation_count; hal->br_thread_ev_type &= ~BR_THR_CFGROM_SCAN; mutex_exit(&hal->topology_tree_mutex); mutex_exit(&hal->br_thread_mutex); - - TNF_PROBE_0_DEBUG(s1394_wait_for_events_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -347,9 +299,6 @@ s1394_wait_for_cfgrom_callbacks(s1394_hal_t *hal, uint_t wait_gen, ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_1_DEBUG(s1394_wait_for_cfgrom_callbacks_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, wait_gen, wait_gen); - ret = DDI_SUCCESS; while (!done) { @@ -365,17 +314,9 @@ s1394_wait_for_cfgrom_callbacks(s1394_hal_t *hal, uint_t wait_gen, ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); if (wait_gen != hal->generation_count || (hal->br_thread_ev_type & BR_THR_GO_AWAY) != 0) { - -#if !defined(NPROBE) && defined(TNF_DEBUG) - int hal_gen = hal->generation_count; -#endif - mutex_exit(&hal->topology_tree_mutex); mutex_exit(&hal->br_cmplq_mutex); s1394_flush_cmplq(hal); - TNF_PROBE_1_DEBUG(s1394_wait_for_cfgrom_callbacks_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, hal_gen, - hal_gen); return (DDI_FAILURE); } mutex_exit(&hal->topology_tree_mutex); @@ -391,19 +332,10 @@ s1394_wait_for_cfgrom_callbacks(s1394_hal_t *hal, uint_t wait_gen, if (cmd != NULL) { if (cmd->bus_generation != wait_gen) { - TNF_PROBE_3( - s1394_wait_for_cfgrom_callbacks, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, "command gen != wait_gen", - tnf_uint, cmd_gen, cmd->bus_generation, - tnf_uint, wait_gen, wait_gen); (void) s1394_free_cmd(hal, &cmd); continue; } cmdret = (*handle_cmd_fn)(hal, cmd); - TNF_PROBE_2_DEBUG(s1394_wait_for_cfgrom_callbacks, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_opaque, cmd, cmd, tnf_int, cmdret, cmdret); ASSERT(cmdret != S1394_HCMD_INVALID); if (cmdret == S1394_HCMD_LOCK_FAILED) { /* flush completion queue */ @@ -422,9 +354,6 @@ s1394_wait_for_cfgrom_callbacks(s1394_hal_t *hal, uint_t wait_gen, } } - TNF_PROBE_0_DEBUG(s1394_wait_for_cfgrom_callbacks_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (ret); } @@ -440,9 +369,6 @@ s1394_flush_cmplq(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_flush_cmplq_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - cmd = NULL; do { @@ -455,9 +381,6 @@ s1394_flush_cmplq(s1394_hal_t *hal) s_priv = S1394_GET_CMD_PRIV(cmd); tcmd = s_priv->cmd_priv_next; - TNF_PROBE_2_DEBUG(s1394_flush_cmplq, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_opaque, cmd, - cmd, tnf_uint, cmd_gen, cmd->bus_generation); (void) s1394_free_cmd(hal, &cmd); cmd = tcmd; } @@ -467,10 +390,6 @@ s1394_flush_cmplq(s1394_hal_t *hal) mutex_exit(&hal->br_cmplq_mutex); } while (cmd != NULL); - - TNF_PROBE_0_DEBUG(s1394_flush_cmplq_exit, S1394_TNF_SL_HOTPLUG_STACK, - ""); - } /* @@ -483,7 +402,6 @@ s1394_br_thread_exit(s1394_hal_t *hal) { ASSERT(MUTEX_HELD(&hal->br_thread_mutex)); ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0(s1394_br_thread_exit_enter, S1394_TNF_SL_HOTPLUG_STACK, ""); s1394_flush_cmplq(hal); #ifndef __lock_lint CALLB_CPR_EXIT(&hal->hal_cprinfo); @@ -505,19 +423,12 @@ s1394_target_bus_reset_notifies(s1394_hal_t *hal, t1394_localinfo_t *localinfo) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_2_DEBUG(s1394_target_bus_reset_notifies_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, bus_gen, - localinfo->bus_generation, tnf_uint, node_id, - localinfo->local_nodeID); - if (ndi_event_retrieve_cookie(hal->hal_ndi_event_hdl, NULL, DDI_DEVI_BUS_RESET_EVENT, &cookie, NDI_EVENT_NOPASS) == NDI_SUCCESS) { (void) ndi_event_run_callbacks(hal->hal_ndi_event_hdl, NULL, cookie, localinfo); } - TNF_PROBE_0_DEBUG(s1394_target_bus_reset_notifies_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -534,9 +445,6 @@ s1394_alloc_cfgrom(s1394_hal_t *hal, s1394_node_t *node, s1394_status_t *status) ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_alloc_cfgrom_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - *status = S1394_NOSTATUS; /* @@ -559,19 +467,12 @@ s1394_alloc_cfgrom(s1394_hal_t *hal, s1394_node_t *node, s1394_status_t *status) if (s1394_lock_tree(hal) != DDI_SUCCESS) { kmem_free(cfgrom, IEEE1394_CONFIG_ROM_SZ); *status |= S1394_LOCK_FAILED; - TNF_PROBE_1(s1394_alloc_cfgrom, S1394_TNF_SL_HOTPLUG_ERROR, - "", tnf_string, msg, "cannot relock the tree"); - TNF_PROBE_0_DEBUG(s1394_alloc_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } node->cfgrom = cfgrom; node->cfgrom_size = IEEE1394_CONFIG_ROM_QUAD_SZ; SET_CFGROM_NEW_ALLOC(node); ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_3(s1394_alloc_cfgrom_exit, S1394_TNF_SL_HOTPLUG_STACK, - "cfgrom alloc", tnf_uint, hal_gen, hal->generation_count, tnf_uint, - node_num, node->node_num, tnf_opaque, cfgrom, cfgrom); return (DDI_SUCCESS); } @@ -586,9 +487,6 @@ s1394_free_cfgrom(s1394_hal_t *hal, s1394_node_t *node, ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); ASSERT(node->cfgrom != NULL); - TNF_PROBE_0_DEBUG(s1394_free_cfgrom_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - if (options == S1394_FREE_CFGROM_BOTH) { /* * free in both old and new trees; will be called with @@ -599,12 +497,6 @@ s1394_free_cfgrom(s1394_hal_t *hal, s1394_node_t *node, if (NODE_MATCHED(node) == B_TRUE && onode->cfgrom != NULL) ASSERT(onode->cfgrom == node->cfgrom); - TNF_PROBE_4(s1394_free_cfgrom_both, - S1394_TNF_SL_HOTPLUG_STACK, "cfgrom free", tnf_uint, - hal_gen, hal->generation_count, tnf_int, node_num, - node->node_num, tnf_opaque, old_cfgrom, onode->cfgrom, - tnf_opaque, cfgrom, node->cfgrom); - if (onode != NULL && onode->cfgrom != NULL && onode->cfgrom != node->cfgrom) kmem_free(onode->cfgrom, IEEE1394_CONFIG_ROM_SZ); @@ -618,11 +510,6 @@ s1394_free_cfgrom(s1394_hal_t *hal, s1394_node_t *node, } else if (options == S1394_FREE_CFGROM_NEW) { - TNF_PROBE_2(s1394_free_cfgrom_new, - S1394_TNF_SL_HOTPLUG_STACK, "cfgrom free", - tnf_int, node_num, node->node_num, - tnf_opaque, cfgrom, node->cfgrom); - ASSERT(CFGROM_NEW_ALLOC(node) == B_TRUE); kmem_free(node->cfgrom, IEEE1394_CONFIG_ROM_SZ); CLEAR_CFGROM_NEW_ALLOC(node); @@ -632,17 +519,10 @@ s1394_free_cfgrom(s1394_hal_t *hal, s1394_node_t *node, } else if (options == S1394_FREE_CFGROM_OLD) { /* freeing in old tree */ - TNF_PROBE_2_DEBUG(s1394_free_cfgrom_old, - S1394_TNF_SL_HOTPLUG_STACK, "cfgrom free", - tnf_int, node_num, node->node_num, - tnf_opaque, cfgrom, node->cfgrom); kmem_free(node->cfgrom, IEEE1394_CONFIG_ROM_SZ); node->cfgrom = NULL; CLEAR_CFGROM_STATE(node); } - - TNF_PROBE_0_DEBUG(s1394_free_cfgrom_exit, S1394_TNF_SL_HOTPLUG_STACK, - ""); } /* @@ -656,10 +536,6 @@ s1394_free_cfgrom(s1394_hal_t *hal, s1394_node_t *node, void s1394_copy_cfgrom(s1394_node_t *to, s1394_node_t *from) { - TNF_PROBE_3_DEBUG(s1394_copy_cfgrom_enter, S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_int, to_node, to->node_num, tnf_int, - from_node, from->node_num, tnf_opaque, from_cfgrom, from->cfgrom); - ASSERT(to->cfgrom == NULL); to->cfgrom = from->cfgrom; @@ -687,8 +563,6 @@ s1394_copy_cfgrom(s1394_node_t *to, s1394_node_t *from) * have been config rom allocated. */ ASSERT(from->cfgrom == NULL); - TNF_PROBE_0_DEBUG(s1394_copy_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return; } else { s1394_selfid_pkt_t *selfid_pkt = to->selfid_packet; @@ -696,9 +570,6 @@ s1394_copy_cfgrom(s1394_node_t *to, s1394_node_t *from) if (IEEE1394_SELFID_ISLINKON(selfid_pkt)) SET_LINK_ACTIVE(to); } - - TNF_PROBE_0_DEBUG(s1394_copy_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -720,10 +591,6 @@ s1394_read_bus_info_blk(s1394_hal_t *hal, s1394_node_t *node, node_num = node->node_num; - TNF_PROBE_2_DEBUG(s1394_read_bus_info_blk_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, hal_gen, - hal->generation_count, tnf_int, node_num, node_num); - /* * drop the topology lock around command allocation. Return failure * if either command allocation fails or cannot reacquire the lock @@ -732,21 +599,15 @@ s1394_read_bus_info_blk(s1394_hal_t *hal, s1394_node_t *node, *status = S1394_NOSTATUS; if (s1394_alloc_cmd(hal, 0, &cmd) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_read_bus_info_blk, S1394_TNF_SL_HOTPLUG_ERROR, - "", tnf_string, msg, "command allocation failed"); *status |= S1394_CMD_ALLOC_FAILED; } if (s1394_lock_tree(hal) != DDI_SUCCESS) { *status |= S1394_LOCK_FAILED; - TNF_PROBE_1(s1394_read_bus_info_blk, S1394_TNF_SL_HOTPLUG_ERROR, - "", tnf_string, msg, "unable to relock the tree"); /* free the cmd allocated above */ if (((*status) & S1394_CMD_ALLOC_FAILED) != 0) (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); } if (((*status) & (S1394_CMD_ALLOC_FAILED | S1394_LOCK_FAILED)) != 0) { - TNF_PROBE_0_DEBUG(s1394_read_bus_info_blk_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -756,10 +617,6 @@ s1394_read_bus_info_blk(s1394_hal_t *hal, s1394_node_t *node, ASSERT(((*status) & S1394_LOCK_FAILED) != 0); (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_1(s1394_read_bus_info_blk, S1394_TNF_SL_HOTPLUG_ERROR, - "", tnf_string, msg, "config rom allocation failed"); - TNF_PROBE_0_DEBUG(s1394_read_bus_info_blk_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -784,22 +641,8 @@ s1394_read_bus_info_blk(s1394_hal_t *hal, s1394_node_t *node, QUAD_TO_CFGROM_ADDR(IEEE1394_LOCAL_BUS, node_num, quadlet, cmd->cmd_addr); - TNF_PROBE_3_DEBUG(s1394_read_bus_info_blk, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, hal_gen, - hal->generation_count, tnf_int, node_num, node_num, tnf_uint, - quadlet, quadlet); - - TNF_PROBE_5_DEBUG(s1394_read_bus_info_blk, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, - node_num, node_num, tnf_int, parsed, CFGROM_PARSED(node), tnf_int, - matched, NODE_MATCHED(node), tnf_int, visited, - NODE_VISITED(node), tnf_int, generation_changed, - CFGROM_GEN_CHANGED(node)); - SETUP_QUAD_READ(node, 1, quadlet, 1); if (s1394_read_config_quadlet(hal, cmd, status) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_read_bus_info_blk, S1394_TNF_SL_HOTPLUG_ERROR, - "", tnf_string, msg, "Unable to start read"); /* free the command if it wasn't handed over to the HAL */ if (((*status) & S1394_CMD_INFLIGHT) == 0) { (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); @@ -807,18 +650,12 @@ s1394_read_bus_info_blk(s1394_hal_t *hal, s1394_node_t *node, if (((*status) & S1394_LOCK_FAILED) != 0) { ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); } - TNF_PROBE_0_DEBUG(s1394_read_bus_info_blk_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } hal->cfgroms_being_read++; ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_1_DEBUG(s1394_read_bus_info_blk_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, cfgrom_read_cnt, - hal->cfgroms_being_read); - return (DDI_SUCCESS); } @@ -838,10 +675,6 @@ s1394_read_rest_of_cfgrom(s1394_hal_t *hal, s1394_node_t *node, ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); ASSERT(LINK_ACTIVE(node) == B_TRUE); - TNF_PROBE_2_DEBUG(s1394_read_rest_of_cfgrom_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, hal_gen, - hal->generation_count, tnf_int, node_num, node_num); - /* * drop the topology lock around command allocation. Return failure * if either command allocation fails or cannot reacquire the lock @@ -851,22 +684,14 @@ s1394_read_rest_of_cfgrom(s1394_hal_t *hal, s1394_node_t *node, if (s1394_alloc_cmd(hal, 0, &cmd) != DDI_SUCCESS) { *status |= S1394_CMD_ALLOC_FAILED; - TNF_PROBE_1(s1394_read_rest_of_cfgrom, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "command allocation failed"); } if (s1394_lock_tree(hal) != DDI_SUCCESS) { *status |= S1394_LOCK_FAILED; /* free if we allocated a cmd above */ if (((*status) & S1394_CMD_ALLOC_FAILED) == 0) (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); - TNF_PROBE_1(s1394_read_rest_of_cfgrom, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to relock the tree"); } if (((*status) & (S1394_CMD_ALLOC_FAILED | S1394_LOCK_FAILED)) != 0) { - TNF_PROBE_0_DEBUG(s1394_read_rest_of_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -876,17 +701,10 @@ s1394_read_rest_of_cfgrom(s1394_hal_t *hal, s1394_node_t *node, CMD1394_OVERRIDE_ADDR); cmd->cmd_type = CMD1394_ASYNCH_RD_QUAD; - TNF_PROBE_2_DEBUG(s1394_read_rest_of_cfgrom, S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_uint, hal_gen, hal->generation_count, tnf_int, node_num, - node->node_num); - QUAD_TO_CFGROM_ADDR(IEEE1394_LOCAL_BUS, node_num, node->cfgrom_quad_to_read, cmd->cmd_addr); SETUP_QUAD_READ(node, 1, node->cfgrom_quad_to_read, 1); if (s1394_read_config_quadlet(hal, cmd, status) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_read_rest_of_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to start read"); /* free the command if it wasn't handed over to the HAL */ if (((*status) & S1394_CMD_INFLIGHT) == 0) { (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); @@ -894,18 +712,12 @@ s1394_read_rest_of_cfgrom(s1394_hal_t *hal, s1394_node_t *node, if (((*status) & S1394_LOCK_FAILED) != 0) { ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); } - TNF_PROBE_0_DEBUG(s1394_read_rest_of_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } hal->cfgroms_being_read++; ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_1_DEBUG(s1394_read_rest_of_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, cfgrom_read_cnt, - hal->cfgroms_being_read); - return (DDI_SUCCESS); } @@ -930,14 +742,9 @@ s1394_cfgrom_scan_phase1(s1394_hal_t *hal) s1394_selfid_pkt_t *selfid_pkt; s1394_status_t status; - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase1_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase1_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } wait_for_cbs = 0; @@ -1007,12 +814,6 @@ s1394_cfgrom_scan_phase1(s1394_hal_t *hal) if (NODE_MATCHED(nnode) == B_TRUE && LINK_ACTIVE(onode) == B_TRUE) { CLEAR_CFGROM_STATE(nnode); - TNF_PROBE_3(s1394_cfgrom_scan_phase1, - S1394_TNF_SL_HOTPLUG_ERROR, - "", tnf_string, msg, - "link lost power", tnf_int, node, - node, tnf_int, onode, - onode->node_num); } } } else { @@ -1033,9 +834,6 @@ s1394_cfgrom_scan_phase1(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); if ((status & S1394_LOCK_FAILED) != 0) { - TNF_PROBE_1(s1394_cfrom_scan_phase1_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, "Generations changed"); return (DDI_FAILURE); } @@ -1049,9 +847,6 @@ s1394_cfgrom_scan_phase1(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_cfrom_scan_phase1_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (ret); } @@ -1088,18 +883,12 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) s1394_get_quad_info(cmd, &node_num, &quadlet, &data); ASSERT(quadlet == 0 || quadlet < IEEE1394_BIB_QUAD_SZ); - TNF_PROBE_0_DEBUG(s1394_br_thread_handle_cmd_phase1_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - cmdret = S1394_HCMD_NODE_EXPECT_MORE; locked = 1; freecmd = 1; if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "unable to lock tree"); locked = 0; goto bail; } @@ -1147,13 +936,6 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) done++; } else { - TNF_PROBE_4(s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, - msg, "config rom generation changed", - tnf_int, node_num, node_num, - tnf_int, cur_gen, cur_gen, tnf_int, old_gen, - CONFIG_ROM_GEN(node->cfgrom)); - SET_CFGROM_GEN_CHANGED(node); if (onode != NULL) SET_CFGROM_GEN_CHANGED(onode); @@ -1217,13 +999,6 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) CFGROM_READ_PAUSE(readdelay); /* get next quadlet */ if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_3( - s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, - "unable to relock tree", tnf_uint, - node_num, node_num, tnf_int, - quad_to_read, quadlet); locked = 0; } else if (s1394_read_config_quadlet(hal, cmd, &status) != DDI_SUCCESS) { @@ -1233,13 +1008,6 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) * don't free it (it will get freed * later in the callback). */ - TNF_PROBE_3( - s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, - "unable to read", tnf_uint, - node_num, node_num, tnf_int, - quad_to_read, quadlet); if ((status & S1394_CMD_INFLIGHT) != 0) { freecmd = 0; @@ -1268,12 +1036,6 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) SET_CFGROM_ALL_READ(node); node->cfgrom_quad_to_read = quadlet; done++; - TNF_PROBE_3_DEBUG( - s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_string, msg, "read bus info blk", - tnf_int, node_num, node->node_num, - tnf_opaque, cfgrom, node->cfgrom); } } } else { @@ -1288,13 +1050,6 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) s1394_unlock_tree(hal); CFGROM_READ_PAUSE(readdelay); if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_3( - s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_string, msg, - "unable to relock tree", tnf_uint, - node_num, node_num, tnf_int, - quad_to_read, quadlet); locked = 0; } else if (s1394_read_config_quadlet(hal, cmd, &status) != DDI_SUCCESS) { @@ -1304,12 +1059,6 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) * don't free it (it will get freed * later in the callback). */ - TNF_PROBE_3( - s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "unable to re-read", tnf_uint, - node_num, node_num, tnf_int, quad_to_read, - quadlet); if ((status & S1394_CMD_INFLIGHT) != 0) { freecmd = 0; } @@ -1328,11 +1077,6 @@ s1394_br_thread_handle_cmd_phase1(s1394_hal_t *hal, cmd1394_cmd_t *cmd) freecmd = 0; } } else { - TNF_PROBE_4(s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "retries exceeded", tnf_int, node_num, node_num, - tnf_int, quadlet, quadlet, tnf_opaque, cfgrom, - node->cfgrom); if (CFGROM_NEW_ALLOC(node) == B_TRUE) { s1394_free_cfgrom(hal, node, S1394_FREE_CFGROM_NEW); @@ -1348,9 +1092,6 @@ bail: if (done) { cmdret = S1394_HCMD_NODE_DONE; - TNF_PROBE_2_DEBUG(s1394_br_thread_handle_cmd_phase1, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "done with node", tnf_int, node_num, node_num); } /* if we are bailing out because locking failed, locked == 0 */ @@ -1359,9 +1100,6 @@ bail: else s1394_unlock_tree(hal); - TNF_PROBE_0_DEBUG(s1394_br_thread_handle_cmd_phase1_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (cmdret); } @@ -1392,12 +1130,7 @@ s1394_cfgrom_scan_phase2(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -1407,20 +1140,10 @@ s1394_cfgrom_scan_phase2(s1394_hal_t *hal) if (s1394_process_old_tree(hal) != DDI_SUCCESS) { ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_1(s1394_cfgrom_scan_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "non-success return from process_old_tree"); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_cfgrom_scan_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to relock the tree"); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -1435,11 +1158,6 @@ s1394_cfgrom_scan_phase2(s1394_hal_t *hal) /* Notify targets of the end of bus reset processing */ if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_cfgrom_scan_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to relock the tree after isoch notify"); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -1449,11 +1167,6 @@ s1394_cfgrom_scan_phase2(s1394_hal_t *hal) s1394_unlock_tree(hal); s1394_target_bus_reset_notifies(hal, &localinfo); if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_cfgrom_scan_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to relock the tree after reset notify"); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -1469,21 +1182,11 @@ s1394_cfgrom_scan_phase2(s1394_hal_t *hal) s1394_resend_pending_cmds(hal); if (s1394_process_topology_tree(hal, &wait_for_cbs, &wait_gen)) { - TNF_PROBE_1(s1394_cfgrom_scan_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "non-success return from process_topology_tree"); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); return (DDI_FAILURE); } if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_cfgrom_scan_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to relock after processing topology tree"); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -1501,18 +1204,10 @@ s1394_cfgrom_scan_phase2(s1394_hal_t *hal) if (wait_for_cbs != 0) { ret = s1394_wait_for_cfgrom_callbacks(hal, wait_gen, s1394_br_thread_handle_cmd_phase2); - - TNF_PROBE_2_DEBUG(s1394_cfgrom_scan_phase2, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "returned from waiting for cfgrom callbacks", tnf_int, ret, - ret); } ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_cfgrom_scan_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (ret); } @@ -1539,9 +1234,6 @@ s1394_br_thread_handle_cmd_phase2(s1394_hal_t *hal, cmd1394_cmd_t *cmd) uchar_t readdelay; s1394_status_t status; - TNF_PROBE_0_DEBUG(s1394_br_thread_handle_cmd_phase2_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - /* * we end up here if this is a brand new node or if it is a known node * but the config ROM changed (and triggered a re-read). @@ -1556,10 +1248,6 @@ s1394_br_thread_handle_cmd_phase2(s1394_hal_t *hal, cmd1394_cmd_t *cmd) update_devinfo = 0; if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_3(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to lock tree", tnf_int, node_num, node_num, - tnf_int, quadlet, quadlet); locked = 0; goto bail; } @@ -1577,12 +1265,6 @@ s1394_br_thread_handle_cmd_phase2(s1394_hal_t *hal, cmd1394_cmd_t *cmd) * Done with this node. Mark config rom valid and * update the devinfo tree for this node. */ - TNF_PROBE_4_DEBUG(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "all read", tnf_int, node_num, node->node_num, - tnf_opaque, cfgrom, node->cfgrom, tnf_int, quadlet, - quadlet); - node->cfgrom_valid_size = quadlet + 1; if (s1394_valid_cfgrom(hal, node) == B_TRUE) { SET_CFGROM_ALL_READ(node); @@ -1598,20 +1280,9 @@ s1394_br_thread_handle_cmd_phase2(s1394_hal_t *hal, cmd1394_cmd_t *cmd) CFGROM_READ_PAUSE(readdelay); if (s1394_lock_tree(hal) != DDI_SUCCESS) { locked = 0; - TNF_PROBE_3(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "unable to relock the tree", - tnf_int, node_num, node->node_num, - tnf_int, quadlet, quadlet); } else if (s1394_read_config_quadlet(hal, cmd, &status) != DDI_SUCCESS) { /* give up on this guy */ - TNF_PROBE_3(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "cannot start quadlet read", tnf_int, - node_num, node_num, tnf_int, quadlet, - quadlet); - if ((status & S1394_CMD_INFLIGHT) != 0) { freecmd = 0; } @@ -1646,11 +1317,6 @@ s1394_br_thread_handle_cmd_phase2(s1394_hal_t *hal, cmd1394_cmd_t *cmd) CFGROM_READ_PAUSE(readdelay); if (s1394_lock_tree(hal) != DDI_SUCCESS) { locked = 0; - TNF_PROBE_3(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "unable to relock for reread", - tnf_int, node_num, node->node_num, - tnf_int, quadlet, quadlet); } else if (s1394_read_config_quadlet(hal, cmd, &status) != DDI_SUCCESS) { if ((status & S1394_CMD_INFLIGHT) != 0) { @@ -1660,13 +1326,6 @@ s1394_br_thread_handle_cmd_phase2(s1394_hal_t *hal, cmd1394_cmd_t *cmd) locked = 0; } else { /* stop further reads */ - TNF_PROBE_4( - s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_string, msg, "unable to retry", - tnf_int, node_num, node->node_num, - tnf_int, quadlet, quadlet, - tnf_opaque, cfgrom, node->cfgrom); node->cfgrom_valid_size = quadlet + 1; if (s1394_valid_cfgrom(hal, node) == B_TRUE) { @@ -1683,13 +1342,6 @@ s1394_br_thread_handle_cmd_phase2(s1394_hal_t *hal, cmd1394_cmd_t *cmd) freecmd = 0; } } else { - - TNF_PROBE_4(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "retries exceeded", tnf_int, node_num, node_num, - tnf_int, quadlet, quadlet, tnf_opaque, cfgrom, - node->cfgrom); - node->cfgrom_valid_size = quadlet + 1; if (s1394_valid_cfgrom(hal, node) == B_TRUE) { SET_CFGROM_ALL_READ(node); @@ -1707,9 +1359,6 @@ bail: if (done) { cmdret = S1394_HCMD_NODE_DONE; - TNF_PROBE_2_DEBUG(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "done with a node", tnf_int, node_num, node_num); } if (update_devinfo) { @@ -1723,10 +1372,6 @@ bail: if (s1394_update_devinfo_tree(hal, node) != DDI_SUCCESS) { ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); locked = 0; - TNF_PROBE_2(s1394_br_thread_handle_cmd_phase2, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "update devinfo returned failure", tnf_int, - node_num, node_num); } } @@ -1736,9 +1381,6 @@ bail: else s1394_unlock_tree(hal); - TNF_PROBE_1_DEBUG(s1394_br_thread_handle_cmd_phase2_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, cmdret, (int)cmdret); - return (cmdret); } @@ -1760,10 +1402,6 @@ s1394_read_config_quadlet(s1394_hal_t *hal, cmd1394_cmd_t *cmd, node = &hal->topology_tree[node_num]; quadlet = node->cfgrom_quad_to_read; - TNF_PROBE_2_DEBUG(s1394_read_config_quadlet_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, node_num, node_num, - tnf_uint, quadlet, quadlet); - /* Calculate the 64-bit address */ QUAD_TO_CFGROM_ADDR(IEEE1394_LOCAL_BUS, node_num, quadlet, cmd->cmd_addr); @@ -1775,12 +1413,6 @@ s1394_read_config_quadlet(s1394_hal_t *hal, cmd1394_cmd_t *cmd, if (ret != DDI_SUCCESS) { *status |= S1394_UNKNOWN; ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_3(s1394_read_config_quadlet, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "failure from setup asynch command", tnf_uint, node_num, - node_num, tnf_uint, quadlet, quadlet); - TNF_PROBE_0_DEBUG(s1394_read_config_quadlet_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -1794,11 +1426,6 @@ s1394_read_config_quadlet(s1394_hal_t *hal, cmd1394_cmd_t *cmd, s1394_cmd_priv_t *s_priv; - TNF_PROBE_3(s1394_read_config_quadlet, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "failure from xfer asynch command", - tnf_int, quadlet, quadlet, tnf_int, node_num, node_num); - /* Remove from queue */ s1394_remove_q_asynch_cmd(hal, cmd); s_priv = S1394_GET_CMD_PRIV(cmd); @@ -1812,14 +1439,8 @@ s1394_read_config_quadlet(s1394_hal_t *hal, cmd1394_cmd_t *cmd, if (s1394_lock_tree(hal) != DDI_SUCCESS) { *status |= S1394_LOCK_FAILED; ret = DDI_FAILURE; - TNF_PROBE_1(s1394_read_config_quadlet, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unable to relock the tree"); } - TNF_PROBE_0_DEBUG(s1394_read_config_quadlet_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (ret); } @@ -1840,9 +1461,6 @@ s1394_cfgrom_read_callback(cmd1394_cmd_t *cmd) uint32_t node_num, quadlet, data; #endif - TNF_PROBE_0_DEBUG(s1394_cfgrom_read_callback_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(cmd); @@ -1852,11 +1470,6 @@ s1394_cfgrom_read_callback(cmd1394_cmd_t *cmd) s1394_get_quad_info(cmd, &node_num, &quadlet, &data); - TNF_PROBE_5_DEBUG(s1394_cfgrom_read_callback, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, gen, cmd->bus_generation, - tnf_int, quadlet, quadlet, - tnf_int, node_num, node_num, - tnf_int, data, data, tnf_int, result, cmd->cmd_result); #endif if (cmd->cmd_result == CMD1394_EBUSRESET) { @@ -1880,9 +1493,6 @@ s1394_cfgrom_read_callback(cmd1394_cmd_t *cmd) cv_signal(&hal->br_cmplq_cv); mutex_exit(&hal->br_cmplq_mutex); } - - TNF_PROBE_0_DEBUG(s1394_cfgrom_read_callback_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -1897,11 +1507,7 @@ void s1394_cfgrom_parse_unit_dir(uint32_t *unit_dir, uint32_t *addr_hi, uint32_t *addr_lo, uint32_t *size_hi, uint32_t *size_lo) { - TNF_PROBE_0_DEBUG(s1394_cfgrom_parse_unit_dir_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); *addr_hi = *addr_lo = *size_hi = *size_lo = 0; - TNF_PROBE_0_DEBUG(s1394_cfgrom_parse_unit_dir_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -1914,18 +1520,12 @@ s1394_get_quad_info(cmd1394_cmd_t *cmd, uint32_t *node_num, uint32_t *quadlet, { uint64_t addr; - TNF_PROBE_0_DEBUG(s1394_get_quad_info_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - addr = cmd->cmd_addr; *node_num = IEEE1394_ADDR_PHY_ID(addr); *quadlet = ((addr & IEEE1394_ADDR_OFFSET_MASK) - IEEE1394_CONFIG_ROM_ADDR); *quadlet = (*quadlet >> 2); *data = T1394_DATA32(cmd->cmd_u.q.quadlet_data); - - TNF_PROBE_0_DEBUG(s1394_get_quad_info_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -1948,9 +1548,6 @@ s1394_match_GUID(s1394_hal_t *hal, s1394_node_t *nnode) s1394_target_t *t; int ret = DDI_SUCCESS; - TNF_PROBE_0_DEBUG(s1394_match_GUID_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - ASSERT(nnode->cfgrom != NULL); ASSERT(CFGROM_BIB_READ(nnode)); @@ -1969,12 +1566,6 @@ s1394_match_GUID(s1394_hal_t *hal, s1394_node_t *nnode) if ((old_a == new_a) && (old_b == new_b)) { if (NODE_MATCHED(onode) == B_TRUE) { - TNF_PROBE_4(s1394_match_GUID_duplicate, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_uint, guid_hi, old_a, - tnf_uint, guid_lo, old_b, - tnf_uint, old_node_num, old_node, - tnf_uint, node_num, nnode->node_num); cmn_err(CE_NOTE, "!Duplicate GUIDs: %08x%08x", old_a, old_b); /* offline the new node that last matched */ @@ -1996,13 +1587,6 @@ s1394_match_GUID(s1394_hal_t *hal, s1394_node_t *nnode) (CONFIG_ROM_GEN(onode->cfgrom) != CONFIG_ROM_GEN(nnode->cfgrom))) { gen_changed = 1; - TNF_PROBE_4_DEBUG(s1394_match_GUID_gen_change, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_opaque, old_cfgrom, onode->cfgrom, - tnf_int, old_gen, - CONFIG_ROM_GEN(onode->cfgrom), tnf_opaque, - cfgrom, nnode->cfgrom, tnf_int, new_gen, - CONFIG_ROM_GEN(nnode->cfgrom)); } else { gen_changed = 0; } @@ -2026,10 +1610,6 @@ s1394_match_GUID(s1394_hal_t *hal, s1394_node_t *nnode) ret = DDI_FAILURE; break; } - TNF_PROBE_2(s1394_match_GUID_gen_freecfg, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_opaque, old_cfgrom, onode->cfgrom, - tnf_opaque, new_cfgrom, nnode->cfgrom); s1394_free_cfgrom(hal, onode, S1394_FREE_CFGROM_OLD); CLEAR_CFGROM_PARSED(nnode); @@ -2045,16 +1625,6 @@ s1394_match_GUID(s1394_hal_t *hal, s1394_node_t *nnode) * point it at the same config rom as the old one. */ if (onode->cfgrom != nnode->cfgrom) { - - TNF_PROBE_5_DEBUG(s1394_match_GUID, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, node_num, nnode->node_num, - tnf_opaque, cfgrom, nnode->cfgrom, - tnf_int, old_node_num, old_node, - tnf_opaque, old_cfgrom, onode->cfgrom, - tnf_uint, cfgrom_state, - nnode->cfgrom_state); - ASSERT(CFGROM_NEW_ALLOC(nnode) == B_TRUE); s1394_free_cfgrom(hal, nnode, S1394_FREE_CFGROM_NEW); @@ -2086,9 +1656,6 @@ s1394_match_GUID(s1394_hal_t *hal, s1394_node_t *nnode) } } - TNF_PROBE_0_DEBUG(s1394_match_GUID_exit, S1394_TNF_SL_HOTPLUG_STACK, - ""); - return (ret); } @@ -2105,9 +1672,6 @@ s1394_match_all_GUIDs(s1394_hal_t *hal) int ret = DDI_SUCCESS; s1394_node_t *nnode; - TNF_PROBE_0_DEBUG(s1394_match_all_GUIDs_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); for (node = 0; node < hal->number_of_nodes; node++) { @@ -2137,9 +1701,6 @@ s1394_match_all_GUIDs(s1394_hal_t *hal) } } - TNF_PROBE_0_DEBUG(s1394_match_all_GUIDs_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (ret); } @@ -2154,16 +1715,10 @@ s1394_valid_cfgrom(s1394_hal_t *hal, s1394_node_t *node) { uint32_t crc_len, crc_value, CRC, CRC_old, quad0; - TNF_PROBE_0_DEBUG(s1394_valid_cfgrom_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); ASSERT(node->cfgrom); if (s1394_enable_crc_validation == 0) { - TNF_PROBE_1_DEBUG(s1394_valid_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "validation turned off"); return (B_TRUE); } @@ -2173,14 +1728,6 @@ s1394_valid_cfgrom(s1394_hal_t *hal, s1394_node_t *node) crc_value = quad0 & IEEE1394_CFG_ROM_CRC_VALUE_MASK; if (node->cfgrom_valid_size < crc_len + 1) { - TNF_PROBE_4(s1394_valid_cfgrom_not_enough, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_uint, node_guid_hi, node->node_guid_hi, - tnf_uint, node_guid_lo, node->node_guid_lo, - tnf_uint, crc_len, crc_len, - tnf_uint, valid_size, node->cfgrom_valid_size); - TNF_PROBE_0_DEBUG(s1394_valid_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (B_FALSE); } @@ -2189,14 +1736,6 @@ s1394_valid_cfgrom(s1394_hal_t *hal, s1394_node_t *node) if (CRC != crc_value) { CRC_old = s1394_CRC16_old(&node->cfgrom[1], crc_len); if (CRC_old == crc_value) { - TNF_PROBE_4_DEBUG(s1394_valid_cfgrom_busted_crc, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_uint, node_guid_hi, node->node_guid_hi, - tnf_uint, node_guid_lo, node->node_guid_lo, - tnf_uint, node_num, node->node_num, - tnf_uint, crc_len, crc_len); - TNF_PROBE_0_DEBUG(s1394_valid_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (B_TRUE); } @@ -2204,21 +1743,9 @@ s1394_valid_cfgrom(s1394_hal_t *hal, s1394_node_t *node) "!Bad CRC in config rom (node's GUID %08x%08x)", node->node_guid_hi, node->node_guid_lo); - TNF_PROBE_5(s1394_valid_cfgrom_bad_crc, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_uint, node_guid_hi, node->node_guid_hi, - tnf_uint, node_guid_lo, node->node_guid_lo, - tnf_uint, crc_len, crc_len, - tnf_uint, crc, crc_value, tnf_uint, crc_computed, CRC); - TNF_PROBE_0_DEBUG(s1394_valid_cfgrom_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (B_FALSE); } - TNF_PROBE_3_DEBUG(s1394_valid_cfgrom_exit, S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_uint, node_num, node->node_num, tnf_uint, crc_len, crc_len, - tnf_uint, crc, crc_value); - return (B_TRUE); } @@ -2234,9 +1761,6 @@ s1394_valid_dir(s1394_hal_t *hal, s1394_node_t *node, { uint32_t dir_len, crc_value, CRC, CRC_old, quad0; - TNF_PROBE_0_DEBUG(s1394_valid_dir_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - /* * Ideally, we would like to do crc validations for the entire cfgrom * as well as the individual directories. However, we have seen devices @@ -2245,9 +1769,6 @@ s1394_valid_dir(s1394_hal_t *hal, s1394_node_t *node, * is sad, but unfortunately, real world! */ if (s1394_enable_crc_validation == 0) { - TNF_PROBE_1_DEBUG(s1394_valid_dir_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "validation turned off"); return (B_TRUE); } @@ -2263,35 +1784,12 @@ s1394_valid_dir(s1394_hal_t *hal, s1394_node_t *node, if (CRC != crc_value) { CRC_old = s1394_CRC16_old(&dir[1], dir_len); if (CRC_old == crc_value) { - TNF_PROBE_5_DEBUG(s1394_valid_dir_crc_old, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_uint, node_guid_hi, node->node_guid_hi, - tnf_uint, node_guid_lo, node->node_guid_lo, - tnf_uint, node_num, node->node_num, - tnf_uint, key, key, tnf_uint, dir_len, dir_len); - TNF_PROBE_0_DEBUG(s1394_valid_dir_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (B_TRUE); } - TNF_PROBE_5(s1394_valid_dir_bad_crc, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_uint, node_guid_hi, node->node_guid_hi, - tnf_uint, node_guid_lo, node->node_guid_lo, - tnf_uint, node_num, node->node_num, - tnf_uint, key, key, tnf_uint, dir_len, dir_len); - - TNF_PROBE_0_DEBUG(s1394_valid_dir_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (B_FALSE); } - TNF_PROBE_4_DEBUG(s1394_valid_dir, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_uint, node_guid_hi, node->node_guid_hi, - tnf_uint, node_guid_lo, node->node_guid_lo, - tnf_uint, node_num, node->node_num, tnf_uint, key, key); - return (B_TRUE); } @@ -2322,9 +1820,6 @@ s1394_become_bus_mgr(void *arg) int err; int ret; - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_enter, S1394_TNF_SL_BR_STACK, - ""); - hal = (s1394_hal_t *)arg; /* Lock the topology tree */ @@ -2343,8 +1838,6 @@ s1394_become_bus_mgr(void *arg) /* Make sure we aren't already the Bus Manager */ if (bm_node != -1) { - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_exit, - S1394_TNF_SL_BR_STACK, ""); return; } @@ -2357,11 +1850,6 @@ s1394_become_bus_mgr(void *arg) IEEE1394_CSR_OFFSET_MASK), S1394_INVALID_NODE_NUM, hal_node_num, &old_value); if (ret != DDI_SUCCESS) { - TNF_PROBE_1(s1394_become_bus_mgr_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "Error in cswap32"); - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_exit, - S1394_TNF_SL_BR_STACK, ""); return; } curr_bus_mgr = IEEE1394_NODE_NUM(old_value); @@ -2382,11 +1870,6 @@ s1394_become_bus_mgr(void *arg) /* Remote */ if (s1394_alloc_cmd(hal, T1394_ALLOC_CMD_NOSLEEP, &cmd) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_become_bus_mgr_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "Error in s1394_alloc_cmd()"); - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_exit, - S1394_TNF_SL_BR_STACK, ""); return; } @@ -2421,11 +1904,6 @@ s1394_become_bus_mgr(void *arg) if (ret != DDI_SUCCESS) { /* Need to free the command */ (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); - TNF_PROBE_1(s1394_become_bus_mgr_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "Error in s1394_setup_asynch_command()"); - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_exit, - S1394_TNF_SL_BR_STACK, ""); return; } @@ -2451,9 +1929,6 @@ s1394_become_bus_mgr(void *arg) (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); } } - - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_exit, S1394_TNF_SL_BR_STACK, - ""); } /* @@ -2474,9 +1949,6 @@ s1394_become_bus_mgr_callback(cmd1394_cmd_t *cmd) uint32_t temp; uint_t curr_bus_mgr; - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_callback_enter, - S1394_TNF_SL_BR_STACK, ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(cmd); @@ -2506,11 +1978,6 @@ s1394_become_bus_mgr_callback(cmd1394_cmd_t *cmd) mutex_exit(&hal->bus_mgr_node_mutex); } else { - TNF_PROBE_2(s1394_become_bus_mgr_callback_error, - S1394_TNF_SL_BR_ERROR, "", tnf_string, msg, - "Error while attempting to become bus manager", - tnf_uint, status, cmd->cmd_result); - mutex_enter(&hal->bus_mgr_node_mutex); /* Don't know who the bus_mgr is */ @@ -2526,9 +1993,6 @@ s1394_become_bus_mgr_callback(cmd1394_cmd_t *cmd) /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - - TNF_PROBE_0_DEBUG(s1394_become_bus_mgr_callback_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -2546,9 +2010,6 @@ s1394_bus_mgr_processing(s1394_hal_t *hal) int ret; int IRM_node_num; - TNF_PROBE_0_DEBUG(s1394_bus_mgr_processing_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); if (s1394_lock_tree(hal) != DDI_SUCCESS) { @@ -2570,8 +2031,6 @@ s1394_bus_mgr_processing(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_bus_mgr_processing_exit, - S1394_TNF_SL_BR_STACK, ""); return (ret); } @@ -2597,9 +2056,6 @@ s1394_do_bus_mgr_processing(s1394_hal_t *hal) uint_t hal_node_num, number_of_nodes; int new_root, new_gap_cnt; - TNF_PROBE_0_DEBUG(s1394_do_bus_mgr_processing_enter, - S1394_TNF_SL_BR_STACK, ""); - ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); /* Wait for Bus Manager to be determined */ @@ -2615,8 +2071,6 @@ s1394_do_bus_mgr_processing(s1394_hal_t *hal) mutex_exit(&hal->br_thread_mutex); mutex_exit(&hal->bus_mgr_node_mutex); - TNF_PROBE_0_DEBUG(s1394_do_bus_mgr_processing_exit, - S1394_TNF_SL_BR_STACK, ""); return (1); } mutex_exit(&hal->br_thread_mutex); @@ -2670,15 +2124,11 @@ s1394_do_bus_mgr_processing(s1394_hal_t *hal) ret = s1394_do_phy_config_pkt(hal, new_root, new_gap_cnt, IRM_flags); } - TNF_PROBE_0_DEBUG(s1394_do_bus_mgr_processing_exit, - S1394_TNF_SL_BR_STACK, ""); return (ret); } s1394_unlock_tree(hal); - TNF_PROBE_0_DEBUG(s1394_do_bus_mgr_processing_exit, - S1394_TNF_SL_BR_STACK, ""); return (ret); } @@ -2691,9 +2141,6 @@ static void s1394_bus_mgr_timers_stop(s1394_hal_t *hal, timeout_id_t *bus_mgr_query_tid, timeout_id_t *bus_mgr_tid) { - TNF_PROBE_0_DEBUG(s1394_bus_mgr_timers_stop_enter, - S1394_TNF_SL_BR_STACK, ""); - /* Cancel the Bus Mgr timeouts (if necessary) */ if (*bus_mgr_tid != 0) { (void) untimeout(*bus_mgr_tid); @@ -2703,9 +2150,6 @@ s1394_bus_mgr_timers_stop(s1394_hal_t *hal, timeout_id_t *bus_mgr_query_tid, (void) untimeout(*bus_mgr_query_tid); *bus_mgr_query_tid = 0; } - - TNF_PROBE_0_DEBUG(s1394_bus_mgr_timers_stop_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -2720,9 +2164,6 @@ s1394_bus_mgr_timers_start(s1394_hal_t *hal, timeout_id_t *bus_mgr_query_tid, uint_t hal_node_num; int IRM_node_num; - TNF_PROBE_0_DEBUG(s1394_bus_mgr_timers_start_enter, - S1394_TNF_SL_BR_STACK, ""); - mutex_enter(&hal->topology_tree_mutex); IRM_node_num = hal->IRM_node; @@ -2740,9 +2181,6 @@ s1394_bus_mgr_timers_start(s1394_hal_t *hal, timeout_id_t *bus_mgr_query_tid, */ if (IRM_node_num == IEEE1394_NODE_NUM(hal_node_num)) { - TNF_PROBE_0_DEBUG(s1394_bus_mgr_timers_625ms, - S1394_TNF_SL_BR_STACK, ""); - mutex_exit(&hal->topology_tree_mutex); /* Wait 625ms, then check bus manager */ @@ -2765,9 +2203,6 @@ s1394_bus_mgr_timers_start(s1394_hal_t *hal, timeout_id_t *bus_mgr_query_tid, } else { hal->abdicate_bus_mgr_bit = 0; - TNF_PROBE_0_DEBUG(s1394_bus_mgr_timers_125ms, - S1394_TNF_SL_BR_STACK, ""); - mutex_exit(&hal->topology_tree_mutex); /* Wait 125ms, then try to become bus manager */ @@ -2785,9 +2220,6 @@ s1394_bus_mgr_timers_start(s1394_hal_t *hal, timeout_id_t *bus_mgr_query_tid, } mutex_exit(&hal->topology_tree_mutex); - - TNF_PROBE_0_DEBUG(s1394_bus_mgr_timers_start_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -2816,9 +2248,6 @@ s1394_get_maxpayload(s1394_target_t *target, uint_t *dev_max_payload, uint_t speed_max_blk; uint_t temp; - TNF_PROBE_0_DEBUG(s1394_get_maxpayload_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - /* Find the HAL this target resides on */ hal = target->on_hal; @@ -2869,9 +2298,6 @@ s1394_get_maxpayload(s1394_target_t *target, uint_t *dev_max_payload, (*dev_max_payload) = local_max_blk; (*current_max_payload) = local_max_blk; } - - TNF_PROBE_0_DEBUG(s1394_get_maxpayload_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -2888,9 +2314,6 @@ s1394_cycle_master_capable(s1394_hal_t *hal) int cycle_master_capable; uint_t hal_node_num; - TNF_PROBE_0_DEBUG(s1394_cycle_master_capable_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); hal_node_num = IEEE1394_NODE_NUM(hal->node_id); @@ -2900,9 +2323,6 @@ s1394_cycle_master_capable(s1394_hal_t *hal) /* Ignore, if we are already root */ if (root == &hal->topology_tree[hal_node_num]) { - TNF_PROBE_2_DEBUG(s1394_cmstr_capable_hal, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, - node_num, hal_node_num, tnf_int, ret, 1); return (1); } @@ -2913,12 +2333,6 @@ s1394_cycle_master_capable(s1394_hal_t *hal) if (LINK_ACTIVE(root) == B_FALSE || root->cfgrom == NULL || CFGROM_BIB_READ(root) == 0) { - TNF_PROBE_4_DEBUG(s1394_cmstr_capable_not_hal, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, - root, root->node_num, tnf_int, link_active, - LINK_ACTIVE(root), tnf_opaque, cfgrom, root->cfgrom, - tnf_int, bib, CFGROM_BIB_READ(root)); - return (0); } @@ -2927,14 +2341,8 @@ s1394_cycle_master_capable(s1394_hal_t *hal) IEEE1394_BIB_CMC_MASK; if (cycle_master_capable) { - TNF_PROBE_1_DEBUG(s1394_cmstr_capable_root, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, - root, root->node_num); return (1); } else { - TNF_PROBE_1(s1394_cmstr_not_capable_root, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, - root, root->node_num); return (0); } } @@ -2962,9 +2370,6 @@ s1394_do_phy_config_pkt(s1394_hal_t *hal, int new_root, int new_gap_cnt, int ret, result; uint_t flags = 0; - TNF_PROBE_0_DEBUG(s1394_do_phy_config_pkt_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - /* Gap count needs to be optimized */ if (IRM_flags & GAP_COUNT) { @@ -2994,19 +2399,12 @@ s1394_do_phy_config_pkt(s1394_hal_t *hal, int new_root, int new_gap_cnt, if (IRM_flags) { if (s1394_alloc_cmd(hal, flags, &cmd) != DDI_SUCCESS) { - TNF_PROBE_1_DEBUG(s1394_do_phy_config_pkt_error, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "Unable to allocate PHY config packet"); - TNF_PROBE_0_DEBUG(s1394_do_phy_config_pkt_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (0); } if (s1394_lock_tree(hal) != DDI_SUCCESS) { /* lock tree failure indicates a bus gen change */ (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); - TNF_PROBE_0_DEBUG(s1394_do_phy_config_pkt_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (1); } @@ -3045,15 +2443,8 @@ s1394_do_phy_config_pkt(s1394_hal_t *hal, int new_root, int new_gap_cnt, (h1394_cmd_priv_t *)&s_priv->hal_cmd_private, &result); if (ret != DDI_SUCCESS) { - TNF_PROBE_2_DEBUG(s1394_do_phy_config_pkt_error, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "Unable to send PHY config packet", - tnf_int, result, result); - (void) s1394_free_cmd(hal, (cmd1394_cmd_t **)&cmd); - TNF_PROBE_0_DEBUG(s1394_do_phy_config_pkt_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (0); } else { @@ -3066,8 +2457,6 @@ s1394_do_phy_config_pkt(s1394_hal_t *hal, int new_root, int new_gap_cnt, } } - TNF_PROBE_0_DEBUG(s1394_do_phy_config_pkt_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (0); } @@ -3085,9 +2474,6 @@ s1394_phy_config_callback(cmd1394_cmd_t *cmd) s1394_hal_t *hal; uint32_t IRM_flags; - TNF_PROBE_0_DEBUG(s1394_phy_config_callback_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(cmd); @@ -3096,10 +2482,6 @@ s1394_phy_config_callback(cmd1394_cmd_t *cmd) IRM_flags = (uint32_t)(uintptr_t)cmd->cmd_callback_arg; if (cmd->cmd_result != CMD1394_CMDSUCCESS) { - TNF_PROBE_2_DEBUG(s1394_do_phy_config_pkt_error, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "Error sending PHY config packet", - tnf_int, result, cmd->cmd_result); (void) s1394_free_cmd(hal, &cmd); } else { (void) s1394_free_cmd(hal, &cmd); @@ -3109,9 +2491,6 @@ s1394_phy_config_callback(cmd1394_cmd_t *cmd) s1394_initiate_hal_reset(hal, NON_CRITICAL); } } - - TNF_PROBE_0_DEBUG(s1394_phy_config_callback_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -3128,32 +2507,16 @@ s1394_lock_tree(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->br_thread_mutex)); ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_lock_tree_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - mutex_enter(&hal->br_thread_mutex); ndi_devi_enter(hal->halinfo.dip, &circular); mutex_enter(&hal->topology_tree_mutex); if ((hal->br_thread_ev_type & BR_THR_GO_AWAY) != 0) { - TNF_PROBE_2(s1394_lock_tree_go_away, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, hal_generation, hal->generation_count, - tnf_int, br_thread_gen, hal->br_cfgrom_read_gen); - TNF_PROBE_0_DEBUG(s1394_lock_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); mutex_exit(&hal->br_thread_mutex); mutex_exit(&hal->topology_tree_mutex); ndi_devi_exit(hal->halinfo.dip, circular); return (DDI_FAILURE); } else if (hal->br_cfgrom_read_gen != hal->generation_count) { - TNF_PROBE_2(s1394_lock_tree_gen_changed, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, hal_generation, hal->generation_count, - tnf_int, br_thread_gen, hal->br_cfgrom_read_gen); - - TNF_PROBE_0_DEBUG(s1394_lock_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); mutex_exit(&hal->br_thread_mutex); mutex_exit(&hal->topology_tree_mutex); ndi_devi_exit(hal->halinfo.dip, circular); @@ -3162,8 +2525,6 @@ s1394_lock_tree(s1394_hal_t *hal) mutex_exit(&hal->br_thread_mutex); - TNF_PROBE_0_DEBUG(s1394_lock_tree_exit, S1394_TNF_SL_HOTPLUG_STACK, ""); - return (DDI_SUCCESS); } @@ -3174,15 +2535,9 @@ s1394_lock_tree(s1394_hal_t *hal) void s1394_unlock_tree(s1394_hal_t *hal) { - TNF_PROBE_0_DEBUG(s1394_unlock_tree_enter, S1394_TNF_SL_HOTPLUG_STACK, - ""); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); mutex_exit(&hal->topology_tree_mutex); ndi_devi_exit(hal->halinfo.dip, 0); - - TNF_PROBE_0_DEBUG(s1394_unlock_tree_exit, S1394_TNF_SL_HOTPLUG_STACK, - ""); } /* @@ -3206,16 +2561,9 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_4_DEBUG(s1394_calc_next_quad_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, node_num, node->node_num, - tnf_uint, quadlet, quadlet, tnf_int, cfgrom_size, node->cfgrom_size, - tnf_uint, hal_gen, hal->generation_count); - if (((quadlet + 1) >= node->cfgrom_size) || (CFGROM_SIZE_IS_CRCSIZE(node) == B_TRUE && (quadlet + 1) >= node->cfgrom_valid_size)) { - TNF_PROBE_0_DEBUG(s1394_calc_next_quad_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (1); } @@ -3223,10 +2571,6 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, B_TRUE) { quadlet++; *nextquadp = quadlet; - TNF_PROBE_3_DEBUG(s1394_calc_next_quad_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "dir stack turned off", tnf_uint, quadlet, quadlet, - tnf_opaque, cfgrom, node->cfgrom); return (0); } @@ -3246,10 +2590,6 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, */ if (node->expected_dir_quad == quadlet) { if (type != 0 || key != 0) { - TNF_PROBE_3_DEBUG(s1394_calc_next_quad, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "bad directory turning off stack", tnf_uint, - quadlet, quadlet, tnf_uint, data, data); SET_CFGROM_DIR_STACK_OFF(node); quadlet = IEEE1212_ROOT_DIR_QUAD; } else { @@ -3278,10 +2618,6 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, if (node->expected_type == IEEE1212_LEAF_TYPE) { node->expected_type = IEEE1212_IMMEDIATE_TYPE; done_with_cur_dir = B_TRUE; - TNF_PROBE_2_DEBUG(s1394_calc_next_quad, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, "done with a leaf", - tnf_uint, quadlet, quadlet); goto donewithcurdir; } @@ -3305,16 +2641,7 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, ((node->cfgrom[0] >> IEEE1394_CFG_ROM_CRC_LEN_SHIFT) & IEEE1394_CFG_ROM_CRC_LEN_MASK); - TNF_PROBE_2(s1394_calc_next_quad, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_string, msg, "crc sz is cfg sz", - tnf_uint, size, - node->cfgrom_valid_size); } - TNF_PROBE_2_DEBUG(s1394_calc_next_quad_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, - msg, "crc error", tnf_uint, quadlet, - quadlet); *nextquadp = IEEE1212_ROOT_DIR_QUAD; return (0); } @@ -3340,26 +2667,12 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, */ top = ++node->dir_stack_top; if (top == S1394_DIR_STACK_SIZE) { - - TNF_PROBE_2_DEBUG( - s1394_calc_next_quad_exit, - S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_string, msg, - "dir stack overflow", - tnf_uint, quadlet, quadlet); SET_CFGROM_DIR_STACK_OFF(node); *nextquadp = IEEE1212_ROOT_DIR_QUAD; return (0); } - TNF_PROBE_3_DEBUG( - s1394_calc_next_quad, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, "push dir stack", - tnf_uint, quadlet, quadlet, - tnf_int, top, top); - node->dir_stack[top].dir_start = node->cur_dir_start; node->dir_stack[top].dir_size = @@ -3383,12 +2696,6 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, * all done with cur dir; pop it off the stack */ if (node->dir_stack_top >= 0) { - TNF_PROBE_3_DEBUG( - s1394_calc_next_quad_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, "pop dir stack", - tnf_uint, quadlet, quadlet, - tnf_int, top, node->dir_stack_top); top = node->dir_stack_top--; node->cur_dir_start = node->dir_stack[top].dir_start; @@ -3401,10 +2708,6 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, * if empty stack, we are at the top * level; declare done. */ - TNF_PROBE_1_DEBUG( - s1394_calc_next_quad_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_string, msg, "all done"); return (1); } } @@ -3415,8 +2718,5 @@ s1394_calc_next_quad(s1394_hal_t *hal, s1394_node_t *node, uint32_t quadlet, } *nextquadp = quadlet; - TNF_PROBE_1_DEBUG(s1394_calc_next_quad_exit, S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_uint, next_quad, quadlet); - return (0); } diff --git a/usr/src/uts/common/io/1394/s1394_fa.c b/usr/src/uts/common/io/1394/s1394_fa.c index 04a6f4ec7f..bb1692df9e 100644 --- a/usr/src/uts/common/io/1394/s1394_fa.c +++ b/usr/src/uts/common/io/1394/s1394_fa.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_fa.c * 1394 Services Layer Fixed Address Support Routines @@ -38,7 +36,6 @@ #include <sys/cmn_err.h> #include <sys/types.h> #include <sys/kmem.h> -#include <sys/tnf_probe.h> #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> @@ -58,12 +55,8 @@ s1394_fa_claim_addr(s1394_hal_t *hal, s1394_fa_type_t type, s1394_fa_hal_t *falp = &hal->hal_fa[type]; int ret; - TNF_PROBE_0_DEBUG(s1394_fa_claim_addr_enter, S1394_TNF_SL_FA_STACK, ""); - /* Might have been claimed already */ if (falp->fal_addr_blk != NULL) { - TNF_PROBE_0_DEBUG(s1394_fa_claim_addr_exit, - S1394_TNF_SL_FA_STACK, ""); return (DDI_SUCCESS); } @@ -78,14 +71,10 @@ s1394_fa_claim_addr(s1394_hal_t *hal, s1394_fa_type_t type, addr.aa_arg = hal; ret = s1394_claim_addr_blk(hal, &addr); - if (ret != DDI_SUCCESS) { - TNF_PROBE_2(s1394_fa_claim_addr_error, S1394_TNF_SL_FA_ERROR, - "", tnf_int, type, type, tnf_int, ret, ret); - } else { + if (ret == DDI_SUCCESS) { falp->fal_addr_blk = (s1394_addr_space_blk_t *)addr.aa_hdl; } - TNF_PROBE_0_DEBUG(s1394_fa_claim_addr_exit, S1394_TNF_SL_FA_STACK, ""); return (ret); } @@ -97,21 +86,12 @@ void s1394_fa_free_addr(s1394_hal_t *hal, s1394_fa_type_t type) { s1394_fa_hal_t *falp = &hal->hal_fa[type]; - int ret; - - TNF_PROBE_0_DEBUG(s1394_fa_free_addr_enter, S1394_TNF_SL_FA_STACK, ""); /* Might have been freed already */ if (falp->fal_addr_blk != NULL) { - ret = s1394_free_addr_blk(hal, falp->fal_addr_blk); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(s1394_fa_free_addr_error, - S1394_TNF_SL_FA_STACK, "", tnf_int, ret, ret); - } + (void) s1394_free_addr_blk(hal, falp->fal_addr_blk); falp->fal_addr_blk = NULL; } - - TNF_PROBE_0_DEBUG(s1394_fa_free_addr_exit, S1394_TNF_SL_FA_STACK, ""); } /* @@ -254,15 +234,9 @@ s1394_fa_completion_cb(cmd1394_cmd_t *cmd) { s1394_hal_t *hal = cmd->cmd_callback_arg; - TNF_PROBE_0_DEBUG(s1394_fa_completion_cb_enter, - S1394_TNF_SL_FA_STACK, ""); - s1394_fa_restore_cmd(hal, cmd); if (cmd->completion_callback) { cmd->completion_callback(cmd); } - - TNF_PROBE_0_DEBUG(s1394_fa_completion_cb_exit, - S1394_TNF_SL_FA_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/s1394_fcp.c b/usr/src/uts/common/io/1394/s1394_fcp.c index 51617043db..f2035d2e6f 100644 --- a/usr/src/uts/common/io/1394/s1394_fcp.c +++ b/usr/src/uts/common/io/1394/s1394_fcp.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_fcp.c * 1394 Services Layer FCP Support Routines @@ -37,7 +35,6 @@ #include <sys/cmn_err.h> #include <sys/types.h> #include <sys/kmem.h> -#include <sys/tnf_probe.h> #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> @@ -83,8 +80,6 @@ s1394_fcp_hal_init(s1394_hal_t *hal) { int ret = DDI_SUCCESS; - TNF_PROBE_0_DEBUG(s1394_fcp_hal_init_enter, S1394_TNF_SL_FCP_STACK, ""); - if ((ddi_prop_exists(DDI_DEV_T_ANY, hal->halinfo.dip, DDI_PROP_DONTPASS, "h1394-fcp-claim-on-demand")) == 0) { /* if not on-demand, claim addresses now */ @@ -99,7 +94,6 @@ s1394_fcp_hal_init(s1394_hal_t *hal) } } - TNF_PROBE_0_DEBUG(s1394_fcp_hal_init_exit, S1394_TNF_SL_FCP_STACK, ""); return (ret); } @@ -170,9 +164,6 @@ s1394_fcp_unregister_common(s1394_target_t *target, s1394_fa_type_t type) if (s1394_fa_list_is_empty(hal, type)) { s1394_fa_free_addr(hal, type); } - } else { - TNF_PROBE_0(s1394_fcp_unregister_common_error_list, - S1394_TNF_SL_FCP_ERROR, ""); } rw_exit(&hal->target_list_rwlock); @@ -195,8 +186,6 @@ s1394_fcp_write_check_cmd(cmd1394_cmd_t *cmd) len = cmd->cmd_u.b.blk_length; if (len == 4) { cmd->cmd_result = CMD1394_ETYPE_ERROR; - TNF_PROBE_0(t1394_write_error_type, - S1394_TNF_SL_FCP_ERROR, ""); return (DDI_FAILURE); } } else { @@ -210,14 +199,12 @@ s1394_fcp_write_check_cmd(cmd1394_cmd_t *cmd) if ((cmd->cmd_addr & IEEE1394_ADDR_OFFSET_MASK) + len > IEC61883_FCP_CMD_SIZE) { cmd->cmd_result = CMD1394_EADDRESS_ERROR; - TNF_PROBE_0(t1394_write_error_addr, S1394_TNF_SL_FCP_ERROR, ""); return (DDI_FAILURE); } /* some options don't make sense for FCP commands */ if (cmd->cmd_options & CMD1394_OVERRIDE_ADDR) { cmd->cmd_result = CMD1394_EINVALID_COMMAND; - TNF_PROBE_0(t1394_write_error_opt, S1394_TNF_SL_FCP_ERROR, ""); return (DDI_FAILURE); } @@ -252,9 +239,6 @@ s1394_fcp_recv_write_request(cmd1394_cmd_t *req, s1394_fa_type_t type) boolean_t restored = B_FALSE; int ret = T1394_REQ_UNCLAIMED; - TNF_PROBE_0_DEBUG(s1394_fcp_recv_write_request_enter, - S1394_TNF_SL_FCP_STACK, ""); - rw_enter(&hal->target_list_rwlock, RW_READER); start: @@ -291,10 +275,6 @@ start: * target than receiving same request more than once */ if (saved_gen != s1394_fa_list_gen(hal, type)) { - TNF_PROBE_2(s1394_fcp_recv_write_request_error, - S1394_TNF_SL_FCP_ERROR, "", - tnf_string, msg, "list gen changed", - tnf_opaque, num_retries, num_retries); num_retries++; if (num_retries <= s1394_fcp_notify_retry_cnt) { goto start; @@ -310,16 +290,11 @@ start: rw_exit(&hal->target_list_rwlock); if (ret != T1394_REQ_CLAIMED) { - TNF_PROBE_0(s1394_fcp_recv_write_request_error_unclaimed, - S1394_TNF_SL_FCP_ERROR, ""); if (restored) { s1394_fa_convert_cmd(hal, req); } s1394_fcp_recv_write_unclaimed(hal, req); } - - TNF_PROBE_0_DEBUG(s1394_fcp_recv_write_request_exit, - S1394_TNF_SL_FCP_STACK, ""); } /* diff --git a/usr/src/uts/common/io/1394/s1394_hotplug.c b/usr/src/uts/common/io/1394/s1394_hotplug.c index 1be480d96a..817d00019f 100644 --- a/usr/src/uts/common/io/1394/s1394_hotplug.c +++ b/usr/src/uts/common/io/1394/s1394_hotplug.c @@ -41,9 +41,6 @@ #include <sys/sunddi.h> #include <sys/ddi_impldefs.h> #include <sys/types.h> - -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -73,18 +70,12 @@ s1394_send_remove_event(s1394_hal_t *hal, dev_info_t *dip, (void) sprintf(name, "%s%d", ddi_driver_name(dip), ddi_get_instance(dip)); - TNF_PROBE_1_DEBUG(s1394_send_remove_event_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, device, - name); - if (ndi_event_retrieve_cookie(hal->hal_ndi_event_hdl, dip, DDI_DEVI_REMOVE_EVENT, &cookie, NDI_EVENT_NOPASS) == NDI_SUCCESS) { (void) ndi_event_run_callbacks(hal->hal_ndi_event_hdl, dip, cookie, localinfo); } - TNF_PROBE_0_DEBUG(s1394_send_remove_event_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -102,18 +93,11 @@ s1394_send_insert_event(s1394_hal_t *hal, dev_info_t *dip, (void) sprintf(name, "%s%d", ddi_driver_name(dip), ddi_get_instance(dip)); - TNF_PROBE_1_DEBUG(s1394_send_insert_event_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, device, - name); - if (ndi_event_retrieve_cookie(hal->hal_ndi_event_hdl, dip, DDI_DEVI_INSERT_EVENT, &cookie, NDI_EVENT_NOPASS) == NDI_SUCCESS) (void) ndi_event_run_callbacks(hal->hal_ndi_event_hdl, dip, cookie, localinfo); - - TNF_PROBE_0_DEBUG(s1394_send_insert_event_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -155,10 +139,6 @@ s1394_create_devinfo(s1394_hal_t *hal, s1394_node_t *node, uint32_t *unit_dir, ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_2_DEBUG(s1394_create_devinfo_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, guid_hi, - node->node_guid_hi, tnf_uint, guid_lo, node->node_guid_lo); - hal_dip = hal->halinfo.dip; /* Allocate and init a new device node instance. */ @@ -169,11 +149,6 @@ s1394_create_devinfo(s1394_hal_t *hal, s1394_node_t *node, uint32_t *unit_dir, cmn_err(CE_NOTE, "!Unable to create devinfo" " (node's GUID %08x%08x)", node->node_guid_hi, node->node_guid_lo); - TNF_PROBE_2(s1394_create_devinfo_fail_alloc, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_uint, guid_hi, - node->node_guid_hi, tnf_uint, guid_lo, node->node_guid_lo); - TNF_PROBE_0_DEBUG(s1394_create_devinfo_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (NULL); } @@ -186,14 +161,8 @@ s1394_create_devinfo(s1394_hal_t *hal, s1394_node_t *node, uint32_t *unit_dir, #if defined(DEBUG) cmn_err(CE_CONT, "!Error code %d", result); #endif - TNF_PROBE_3(s1394_create_devinfo_hp_node, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_uint, guid_hi, - node->node_guid_hi, tnf_uint, guid_lo, node->node_guid_lo, - tnf_int, error, result); ndi_prop_remove_all(target_dip); (void) ndi_devi_free(target_dip); - TNF_PROBE_0_DEBUG(s1394_create_devinfo_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (NULL); } @@ -345,22 +314,9 @@ s1394_create_devinfo(s1394_hal_t *hal, s1394_node_t *node, uint32_t *unit_dir, #endif ndi_prop_remove_all(target_dip); (void) ndi_devi_free(target_dip); - TNF_PROBE_4(s1394_create_devinfo_fail_compat, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_uint, guid_hi, - node->node_guid_hi, tnf_uint, guid_lo, node->node_guid_lo, - tnf_int, error, result, tnf_int, nelements, i); - TNF_PROBE_0_DEBUG(s1394_create_devinfo_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (NULL); } - for (j = 0; j < i; j++) { - TNF_PROBE_2_DEBUG(s1394_create_devinfo_props, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, compat_index, j, - tnf_string, compat_prop, buf[j]); - } - /* GUID,ADDR */ reg[0] = node->node_guid_hi; reg[1] = node->node_guid_lo; @@ -381,19 +337,9 @@ s1394_create_devinfo(s1394_hal_t *hal, s1394_node_t *node, uint32_t *unit_dir, #endif ndi_prop_remove_all(target_dip); (void) ndi_devi_free(target_dip); - TNF_PROBE_3(s1394_create_devinfo_fail_reg, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_uint, guid_hi, - node->node_guid_hi, tnf_uint, guid_lo, node->node_guid_lo, - tnf_int, error, result); - TNF_PROBE_0_DEBUG(s1394_create_devinfo_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (NULL); } - TNF_PROBE_1_DEBUG(s1394_create_devinfo_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_opaque, target_dip, target_dip); - return (target_dip); } @@ -422,9 +368,6 @@ s1394_devi_find(dev_info_t *pdip, char *name, char *caddr) ASSERT((name != NULL) && (caddr != NULL)); - TNF_PROBE_1_DEBUG(s1394_devi_find_enter, S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_string, addr, caddr); - /* * for each child of this parent, find name and addr and match with * name and caddr passed in. @@ -458,13 +401,6 @@ s1394_devi_find(dev_info_t *pdip, char *name, char *caddr) } } - if (cdip == NULL) { - TNF_PROBE_1(s1394_devi_find_no_match, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, addr, caddr); - } - - TNF_PROBE_0_DEBUG(s1394_devi_find_exit, S1394_TNF_SL_HOTPLUG_STACK, ""); - return (cdip); } @@ -500,10 +436,6 @@ s1394_update_devinfo_tree(s1394_hal_t *hal, s1394_node_t *node) ASSERT(CFGROM_PARSED(node) == B_FALSE); ASSERT(node->cfgrom != NULL); - TNF_PROBE_2_DEBUG(s1394_update_devinfo_tree_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, node_num, - node->node_num, tnf_opaque, cfgrom, node->cfgrom); - /* scan through config rom looking for unit dirs */ root_dir = CFGROM_ROOT_DIR(node->cfgrom); @@ -518,10 +450,6 @@ s1394_update_devinfo_tree(s1394_hal_t *hal, s1394_node_t *node) "!Bad root directory in config rom (node's GUID %08x%08x)", node->node_guid_hi, node->node_guid_lo); - TNF_PROBE_1_DEBUG(s1394_update_devinfo_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_string, msg, - "bad directory"); - SET_CFGROM_PARSED(node); CLEAR_CFGROM_GEN_CHANGED(node); /* if set */ CLEAR_CFGROM_NEW_ALLOC(node); @@ -540,10 +468,6 @@ s1394_update_devinfo_tree(s1394_hal_t *hal, s1394_node_t *node) cmn_err(CE_NOTE, "!Bad unit directory in config" " rom (node's GUID %08x%08x)", node->node_guid_hi, node->node_guid_lo); - TNF_PROBE_2(s1394_update_devinfo_tree_bad_dir, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_uint, - guid_hi, node->node_guid_hi, tnf_uint, - guid_lo, node->node_guid_lo); } } } @@ -624,12 +548,6 @@ s1394_update_devinfo_tree(s1394_hal_t *hal, s1394_node_t *node) s1394_unlock_tree(hal); s1394_send_insert_event(hal, devinfo_ptrs[j], &linfo); if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_4(s1394_update_devinfo_tree_lock_fail, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_int, node_num, node->node_num, - tnf_opaque, cfgrom, node->cfgrom, - tnf_int, unit, j, - tnf_opaque, devinfo, devinfo_ptrs[j]); lockfail = 1; break; } @@ -637,8 +555,6 @@ s1394_update_devinfo_tree(s1394_hal_t *hal, s1394_node_t *node) } if (lockfail) { - TNF_PROBE_0_DEBUG(s1394_update_devinfo_tree_exit, - S1394_TNF_SL_HOTPLUG_ERROR, ""); return (DDI_FAILURE); } @@ -646,9 +562,6 @@ s1394_update_devinfo_tree(s1394_hal_t *hal, s1394_node_t *node) CLEAR_CFGROM_GEN_CHANGED(node); /* if set */ CLEAR_CFGROM_NEW_ALLOC(node); - TNF_PROBE_0_DEBUG(s1394_update_devinfo_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (DDI_SUCCESS); } @@ -670,25 +583,16 @@ s1394_offline_node(s1394_hal_t *hal, s1394_node_t *node) uint32_t *unit_dir_ptrs[32]; dev_info_t *devinfo_ptrs[32]; t1394_localinfo_t linfo; - uint_t node_num; uint32_t *ptr, *root_dir, dir_len; uint32_t hi, lo, size_hi, size_lo, type, key, value; char caddr[32]; - node_num = node->node_num; - - TNF_PROBE_1_DEBUG(s1394_offline_node_enter, S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_uint, node_num, node_num); - ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); d = 0; rw_enter(&hal->target_list_rwlock, RW_WRITER); t = node->target_list; while (t != NULL) { - TNF_PROBE_2(s1394_process_old_tree_mark, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, node_num, node_num, - tnf_opaque, target, t); t->target_state |= S1394_TARG_GONE; t->on_node = NULL; t = t->target_sibling; @@ -708,7 +612,7 @@ s1394_offline_node(s1394_hal_t *hal, s1394_node_t *node) for (units = 0, j = 1; j <= dir_len; j++) { CFGROM_TYPE_KEY_VALUE(root_dir[j], type, key, value); if (key == IEEE1212_UNIT_DIRECTORY && type == - IEEE1212_DIRECTORY_TYPE) { + IEEE1212_DIRECTORY_TYPE) { ptr = &root_dir[j] + value; if (s1394_valid_dir(hal, node, key, ptr) == B_TRUE) { unit_dir_ptrs[units++] = ptr; @@ -719,20 +623,20 @@ s1394_offline_node(s1394_hal_t *hal, s1394_node_t *node) for (d = 0, j = 0; j < units; j++) { s1394_cfgrom_parse_unit_dir(unit_dir_ptrs[j], - &hi, &lo, &size_hi, &size_lo); + &hi, &lo, &size_hi, &size_lo); lo = j; if (hi || lo) { (void) sprintf(caddr, "%08x%08x,%04x%08x", - node->node_guid_hi, node->node_guid_lo, hi, lo); + node->node_guid_hi, node->node_guid_lo, hi, lo); } else { (void) sprintf(caddr, "%08x%08x", - node->node_guid_hi, node->node_guid_lo); + node->node_guid_hi, node->node_guid_lo); } if ((tdip = s1394_devi_find(hal->halinfo.dip, "unit", caddr)) != - NULL) + NULL) devinfo_ptrs[d++] = tdip; } @@ -744,26 +648,14 @@ s1394_offline_node(s1394_hal_t *hal, s1394_node_t *node) for (j = 0; j < d; j++) { s1394_unlock_tree(hal); - TNF_PROBE_2(s1394_offline_node, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, node_num, node_num, - tnf_opaque, devinfo, devinfo_ptrs[j]); - s1394_send_remove_event(hal, devinfo_ptrs[j], &linfo); (void) ndi_devi_offline(devinfo_ptrs[j], NDI_DEVI_REMOVE); if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_2(s1394_offline_node, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "unlock to relock tree", tnf_uint, node_num, - node_num); - TNF_PROBE_0_DEBUG(s1394_offline_node_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } } ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_offline_node_exit, S1394_TNF_SL_HOTPLUG_STACK, - ""); return (DDI_SUCCESS); } @@ -792,14 +684,7 @@ s1394_process_topology_tree(s1394_hal_t *hal, int *wait_for_cbs, ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_process_topology_tree_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_0(s1394_process_topology_tree_lock_failed, - S1394_TNF_SL_HOTPLUG_ERROR, ""); - TNF_PROBE_0_DEBUG(s1394_process_topology_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -817,13 +702,6 @@ s1394_process_topology_tree(s1394_hal_t *hal, int *wait_for_cbs, } node = &hal->topology_tree[i]; - TNF_PROBE_4_DEBUG(s1394_process_topology_tree, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, node_num, i, - tnf_int, parsed, CFGROM_PARSED(node), - tnf_int, matched, NODE_MATCHED(node), - tnf_int, visited, NODE_VISITED(node)); - if (LINK_ACTIVE(node) == B_FALSE) { s1394_unlock_tree(hal); continue; @@ -841,14 +719,6 @@ s1394_process_topology_tree(s1394_hal_t *hal, int *wait_for_cbs, * onode->cfgrom != node->cfgrom should have been * handled by s1394_match_GUID()!!! */ - if (onode->cfgrom != node->cfgrom) - TNF_PROBE_5(s1394_process_topology_tree_err, - S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_int, node_num, i, tnf_int, gen_changed, - CFGROM_GEN_CHANGED(node), tnf_int, parsed, - CFGROM_PARSED(node), tnf_opaque, old_cfgrom, - onode->cfgrom, tnf_opaque, new_cfgrom, - node->cfgrom); ASSERT(onode->cfgrom == node->cfgrom); } @@ -864,30 +734,18 @@ s1394_process_topology_tree(s1394_hal_t *hal, int *wait_for_cbs, DDI_FAILURE) { ASSERT(MUTEX_NOT_HELD( &hal->topology_tree_mutex)); - TNF_PROBE_1(s1394_process_topology_tree, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "failure from update devinfo"); - TNF_PROBE_0_DEBUG( - s1394_process_topology_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } } else if (CFGROM_PARSED(node) == B_FALSE && CFGROM_BIB_READ( node) == B_TRUE) { if (s1394_read_rest_of_cfgrom(hal, node, &status) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_process_topology_tree, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "failure reading rest of cfgrom"); if ((status & S1394_LOCK_FAILED) == 0) { ASSERT(MUTEX_HELD(&hal-> topology_tree_mutex)); *wait_for_cbs = 0; s1394_unlock_tree(hal); } - TNF_PROBE_0_DEBUG( - s1394_process_topology_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } else { *wait_for_cbs = 1; @@ -903,20 +761,11 @@ s1394_process_topology_tree(s1394_hal_t *hal, int *wait_for_cbs, * this, we will use tree matching. */ if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_1(s1394_process_topology_tree, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "relock failed while marking tree processed"); - TNF_PROBE_0_DEBUG(s1394_process_topology_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } hal->topology_tree_processed = B_TRUE; s1394_unlock_tree(hal); - TNF_PROBE_1_DEBUG(s1394_process_topology_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, hal_instance, - ddi_get_instance(hal->halinfo.dip)); - return (DDI_SUCCESS); } @@ -937,9 +786,6 @@ s1394_process_old_tree(s1394_hal_t *hal) uint_t hal_node_num_old, old_number_of_nodes; s1394_node_t *onode; - TNF_PROBE_0_DEBUG(s1394_process_old_tree_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - /* * NODE_MATCHED(onode) == 0 indicates this node doesn't exist * any more. @@ -947,10 +793,6 @@ s1394_process_old_tree(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_0(s1394_process_old_tree_lock_failed, - S1394_TNF_SL_HOTPLUG_ERROR, ""); - TNF_PROBE_0_DEBUG(s1394_process_old_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } hal_node_num_old = IEEE1394_NODE_NUM(hal->old_node_id); @@ -962,12 +804,6 @@ s1394_process_old_tree(s1394_hal_t *hal) if (i == hal_node_num_old) continue; if (s1394_lock_tree(hal) != DDI_SUCCESS) { - TNF_PROBE_2(s1394_process_old_tree, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "lock failed while processing node", tnf_uint, - node_num, i); - TNF_PROBE_0_DEBUG(s1394_process_old_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -979,17 +815,6 @@ s1394_process_old_tree(s1394_hal_t *hal) continue; } - TNF_PROBE_1_DEBUG(s1394_process_old_tree, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_opaque, - cfgrom, onode->cfgrom); - - TNF_PROBE_5_DEBUG(s1394_process_old_tree, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_int, - node_num, i, tnf_int, parsed, CFGROM_PARSED(onode), tnf_int, - matched, NODE_MATCHED(onode), tnf_int, visited, - NODE_VISITED(onode), tnf_int, generation_changed, - CFGROM_GEN_CHANGED(onode)); - /* * onode->cur_node == NULL iff we couldn't read cfgrom in the * current generation in non-tree matching case (and thus @@ -1001,28 +826,7 @@ s1394_process_old_tree(s1394_hal_t *hal) (LINK_ACTIVE(onode) == B_TRUE && LINK_ACTIVE(onode-> cur_node) == B_FALSE)))) { - if (onode->cur_node != NULL && CFGROM_VALID(onode) == - B_TRUE && - CFGROM_VALID(onode->cur_node) == B_FALSE) { - TNF_PROBE_1_DEBUG( - s1394_process_old_tree_invalid_cfgrom, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_int, node_num, i); - } - if (onode->cur_node != NULL && LINK_ACTIVE(onode) == - B_TRUE && LINK_ACTIVE(onode->cur_node) == B_FALSE) { - TNF_PROBE_1_DEBUG( - s1394_process_old_tree_link_off, - S1394_TNF_SL_HOTPLUG_STACK, - "", tnf_int, node_num, i); - } if (s1394_offline_node(hal, onode) != DDI_SUCCESS) { - TNF_PROBE_2(s1394_process_old_tree, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, - msg, "failure from offline node", tnf_uint, - node_num, i); - TNF_PROBE_0_DEBUG(s1394_process_old_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } s1394_free_cfgrom(hal, onode, S1394_FREE_CFGROM_OLD); @@ -1033,9 +837,6 @@ s1394_process_old_tree(s1394_hal_t *hal) ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex)); - TNF_PROBE_0_DEBUG(s1394_process_old_tree_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); - return (DDI_SUCCESS); } @@ -1053,12 +854,8 @@ s1394_update_unit_dir_location(s1394_hal_t *hal, dev_info_t *tdip, ASSERT(MUTEX_HELD(&hal->topology_tree_mutex)); ASSERT(tdip != NULL); - TNF_PROBE_1_DEBUG(s1394_update_unit_dir_location_enter, - S1394_TNF_SL_HOTPLUG_STACK, "", tnf_uint, offset, offset); (void) ndi_prop_update_int(DDI_DEV_T_NONE, tdip, "unit-dir-offset", offset); - TNF_PROBE_0_DEBUG(s1394_update_unit_dir_location_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -1078,9 +875,6 @@ s1394_add_target_to_node(s1394_target_t *target) char name[MAXNAMELEN]; char *ptr; - TNF_PROBE_0_DEBUG(s1394_add_target_to_node_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - hal = target->on_hal; ASSERT(hal != NULL); @@ -1091,8 +885,6 @@ s1394_add_target_to_node(s1394_target_t *target) ASSERT(rw_read_locked(&target->on_hal->target_list_rwlock) == 0); if ((ptr = ddi_get_name_addr(target->target_dip)) == NULL) { - TNF_PROBE_0_DEBUG(s1394_add_target_to_node_exit_no_name, - S1394_TNF_SL_HOTPLUG_STACK, ""); return; } @@ -1140,9 +932,6 @@ s1394_add_target_to_node(s1394_target_t *target) } } } - - TNF_PROBE_0_DEBUG(s1394_add_target_to_node_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } /* @@ -1155,9 +944,6 @@ s1394_remove_target_from_node(s1394_target_t *target) s1394_target_t *t, *t1; s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_remove_target_from_node_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - hal = target->on_hal; ASSERT(hal != NULL); @@ -1167,12 +953,6 @@ s1394_remove_target_from_node(s1394_target_t *target) /* target_list_rwlock should be held in write mode */ ASSERT(rw_read_locked(&target->on_hal->target_list_rwlock) == 0); - if (target->on_node == NULL) { - TNF_PROBE_1_DEBUG(s1394_remove_target_from_node_NULL, - S1394_TNF_SL_HOTPLUG_STACK, "", - tnf_uint, target_state, target->target_state); - } - t = target->target_list; t1 = NULL; while (t != NULL) { @@ -1199,7 +979,4 @@ s1394_remove_target_from_node(s1394_target_t *target) target->on_node = NULL; target->target_sibling = NULL; - - TNF_PROBE_0_DEBUG(s1394_remove_target_from_node_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/s1394_isoch.c b/usr/src/uts/common/io/1394/s1394_isoch.c index 2df89157ca..bed4840794 100644 --- a/usr/src/uts/common/io/1394/s1394_isoch.c +++ b/usr/src/uts/common/io/1394/s1394_isoch.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_isoch.c * 1394 Services Layer Isochronous Communication Routines @@ -38,8 +36,6 @@ #include <sys/ddi.h> #include <sys/sunddi.h> #include <sys/types.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -62,9 +58,6 @@ s1394_isoch_rsrc_realloc(s1394_hal_t *hal) int err; int ret; - TNF_PROBE_0_DEBUG(s1394_isoch_rsrc_realloc_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - /* * Get the current generation number - don't need the * topology tree mutex here because it is read-only, and @@ -170,14 +163,6 @@ s1394_isoch_rsrc_realloc(s1394_hal_t *hal) /* Try to free up the bandwidth */ ret = s1394_bandwidth_free(hal, bw_alloc_units, generation, &err); - if ((ret == DDI_FAILURE) && - (err != CMD1394_EBUSRESET)) { - TNF_PROBE_1( - s1394_isoch_rsrc_realloc_error, - S1394_TNF_SL_ISOCH_ERROR, - "", tnf_string, msg, - "Unable to free bandwidth"); - } /* Try the next Isoch CEC */ goto next_isoch_cec; } @@ -194,8 +179,6 @@ next_isoch_cec: /* Unlock the Isoch CEC list */ mutex_exit(&hal->isoch_cec_list_mutex); - TNF_PROBE_0_DEBUG(s1394_isoch_rsrc_realloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -214,9 +197,6 @@ s1394_isoch_rsrc_realloc_notify(s1394_hal_t *hal) void (*rsrc_fail_callback)(t1394_isoch_cec_handle_t, opaque_t, t1394_isoch_rsrc_error_t); - TNF_PROBE_0_DEBUG(s1394_isoch_rsrc_realloc_notify_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - /* Lock the Isoch CEC list */ mutex_enter(&hal->isoch_cec_list_mutex); @@ -297,8 +277,6 @@ s1394_isoch_rsrc_realloc_notify(s1394_hal_t *hal) /* Unlock the Isoch CEC list */ mutex_exit(&hal->isoch_cec_list_mutex); - TNF_PROBE_0_DEBUG(s1394_isoch_rsrc_realloc_notify_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -325,9 +303,6 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, int i; int num_retries = S1394_ISOCH_ALLOC_RETRIES; - TNF_PROBE_0_DEBUG(s1394_channel_alloc_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - /* Lock the topology tree */ mutex_enter(&hal->topology_tree_mutex); @@ -340,11 +315,6 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Make sure there is a valid IRM on the bus */ if (IRM_node == -1) { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "No IRM on the 1394 bus"); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -368,8 +338,6 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Check that the generation has not changed */ if (generation != hal->generation_count) { *result = CMD1394_EBUSRESET; - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -381,21 +349,11 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, offset, compare, swap, &old_value); if (ret != DDI_SUCCESS) { *result = CMD1394_EBUSRESET; - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error in cswap32"); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - "stacktrace 1394 s1394", ""); return (DDI_FAILURE); } if ((~old_value & channel_mask) != 0) { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Channels already taken"); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -403,29 +361,17 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, *result = CMD1394_CMDSUCCESS; *old_channels = old_value; - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } } while (i--); *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Retries exceeded"); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } else { /* Remote */ if (s1394_alloc_cmd(hal, 0, &cmd) != DDI_SUCCESS) { *result = CMD1394_EUNKNOWN_ERROR; - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to allocate command"); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -460,13 +406,6 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, if ((~(*old_channels) & channel_mask) != 0) { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", - tnf_string, msg, - "Channels already taken"); - TNF_PROBE_0_DEBUG( - s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); ret = DDI_FAILURE; } else { *result = cmd->cmd_result; @@ -475,8 +414,6 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (ret); } else { @@ -484,11 +421,6 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error allocating isoch channel"); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } else { @@ -497,11 +429,6 @@ s1394_channel_alloc(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_channel_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Error allocating isoch channel"); - TNF_PROBE_0_DEBUG(s1394_channel_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } @@ -531,9 +458,6 @@ s1394_channel_free(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, int i; int num_retries = S1394_ISOCH_ALLOC_RETRIES; - TNF_PROBE_0_DEBUG(s1394_channel_free_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - /* Lock the topology tree */ mutex_enter(&hal->topology_tree_mutex); @@ -546,11 +470,6 @@ s1394_channel_free(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Make sure there is a valid IRM on the bus */ if (IRM_node == -1) { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_channel_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "No IRM on the 1394 bus"); - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -574,8 +493,6 @@ s1394_channel_free(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Check that the generation has not changed */ if (generation != hal->generation_count) { *result = CMD1394_EBUSRESET; - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -587,40 +504,23 @@ s1394_channel_free(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, offset, compare, swap, &old_value); if (ret != DDI_SUCCESS) { *result = CMD1394_EBUSRESET; - TNF_PROBE_1(s1394_channel_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error in cswap32"); - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - "stacktrace 1394 s1394", ""); return (DDI_FAILURE); } if (old_value == compare) { *result = CMD1394_CMDSUCCESS; *old_channels = old_value; - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } } while (i--); *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_channel_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Retries exceeded"); - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } else { /* Remote */ if (s1394_alloc_cmd(hal, 0, &cmd) != DDI_SUCCESS) { *result = CMD1394_EUNKNOWN_ERROR; - TNF_PROBE_1(s1394_channel_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to allocate command"); - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -658,8 +558,6 @@ s1394_channel_free(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } else { @@ -668,11 +566,6 @@ s1394_channel_free(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_channel_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error freeing isoch channel"); - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } else { @@ -680,11 +573,6 @@ s1394_channel_free(s1394_hal_t *hal, uint32_t channel_mask, uint_t generation, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_channel_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Error freeing isoch channel"); - TNF_PROBE_0_DEBUG(s1394_channel_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } @@ -715,9 +603,6 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, int i; int num_retries = S1394_ISOCH_ALLOC_RETRIES; - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - /* Lock the topology tree */ mutex_enter(&hal->topology_tree_mutex); @@ -730,11 +615,6 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Make sure there is a valid IRM on the bus */ if (IRM_node == -1) { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_bandwidth_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "No IRM on the 1394 bus"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -753,8 +633,6 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, */ if (generation != hal->generation_count) { *result = CMD1394_EBUSRESET; - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -765,11 +643,6 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, swap = (uint32_t)temp_value; } else { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_bandwidth_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Retries exceeded"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -780,39 +653,22 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, &old_value); if (ret != DDI_SUCCESS) { *result = CMD1394_EBUSRESET; - TNF_PROBE_1(s1394_bandwidth_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error in cswap32"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } if (old_value == compare) { *result = CMD1394_CMDSUCCESS; - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } } while (i--); *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_bandwidth_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Too many retries"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } else { /* Remote */ if (s1394_alloc_cmd(hal, 0, &cmd) != DDI_SUCCESS) { *result = CMD1394_EUNKNOWN_ERROR; - TNF_PROBE_1(s1394_bandwidth_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to allocate command"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -837,8 +693,6 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } else { @@ -846,11 +700,6 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_bandwidth_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error allocating isoch bandwidth"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } else { @@ -858,11 +707,6 @@ s1394_bandwidth_alloc(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_bandwidth_alloc_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Error allocating isoch bandwidth"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_alloc_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } @@ -937,9 +781,6 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, int i; int num_retries = S1394_ISOCH_ALLOC_RETRIES; - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - /* Lock the topology tree */ mutex_enter(&hal->topology_tree_mutex); @@ -952,11 +793,6 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Make sure there is a valid IRM on the bus */ if (IRM_node == -1) { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_bandwidth_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "No IRM on the 1394 bus"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -972,8 +808,6 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Check that the generation has not changed */ if (generation != hal->generation_count) { *result = CMD1394_EBUSRESET; - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -984,11 +818,6 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, swap = temp_value; } else { *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_bandwidth_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Too many retries"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -999,39 +828,22 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, &old_value); if (ret != DDI_SUCCESS) { *result = CMD1394_EBUSRESET; - TNF_PROBE_1(s1394_bandwidth_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error in cswap32"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } if (old_value == compare) { *result = CMD1394_CMDSUCCESS; - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } } while (i--); *result = CMD1394_ERETRIES_EXCEEDED; - TNF_PROBE_1(s1394_bandwidth_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Retries exceeded"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } else { /* Remote */ if (s1394_alloc_cmd(hal, 0, &cmd) != DDI_SUCCESS) { *result = CMD1394_EUNKNOWN_ERROR; - TNF_PROBE_1(s1394_bandwidth_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to allocate command"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -1057,8 +869,6 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } else { @@ -1066,11 +876,6 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_bandwidth_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Error freeing isoch bandwidth"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } else { @@ -1078,11 +883,6 @@ s1394_bandwidth_free(s1394_hal_t *hal, uint32_t bw_alloc_units, /* Need to free the command */ (void) s1394_free_cmd(hal, &cmd); - TNF_PROBE_1(s1394_bandwidth_free_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Error freeing isoch bandwidth"); - TNF_PROBE_0_DEBUG(s1394_bandwidth_free_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } @@ -1097,9 +897,6 @@ s1394_isoch_cec_list_insert(s1394_hal_t *hal, s1394_isoch_cec_t *cec) { s1394_isoch_cec_t *cec_temp; - TNF_PROBE_0_DEBUG(s1394_isoch_cec_list_insert_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(MUTEX_HELD(&hal->isoch_cec_list_mutex)); /* Is the Isoch CEC list empty? */ @@ -1120,9 +917,6 @@ s1394_isoch_cec_list_insert(s1394_hal_t *hal, s1394_isoch_cec_t *cec) hal->isoch_cec_list_head = cec; } - - TNF_PROBE_0_DEBUG(s1394_isoch_cec_list_insert_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -1135,9 +929,6 @@ s1394_isoch_cec_list_remove(s1394_hal_t *hal, s1394_isoch_cec_t *cec) s1394_isoch_cec_t *prev_cec; s1394_isoch_cec_t *next_cec; - TNF_PROBE_0_DEBUG(s1394_isoch_cec_list_remove_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(MUTEX_HELD(&hal->isoch_cec_list_mutex)); prev_cec = cec->cec_prev; @@ -1160,9 +951,6 @@ s1394_isoch_cec_list_remove(s1394_hal_t *hal, s1394_isoch_cec_t *cec) if (hal->isoch_cec_list_tail == cec) hal->isoch_cec_list_tail = prev_cec; } - - TNF_PROBE_0_DEBUG(s1394_isoch_cec_list_remove_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -1177,9 +965,6 @@ s1394_isoch_cec_member_list_insert(s1394_hal_t *hal, s1394_isoch_cec_t *cec, { s1394_isoch_cec_member_t *member_temp; - TNF_PROBE_0_DEBUG(s1394_isoch_cec_member_list_insert_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(MUTEX_HELD(&cec->isoch_cec_mutex)); /* Is the Isoch CEC member list empty? */ @@ -1207,9 +992,6 @@ s1394_isoch_cec_member_list_insert(s1394_hal_t *hal, s1394_isoch_cec_t *cec, member_temp->cec_mem_next = member; cec->cec_member_list_tail = member; } - - TNF_PROBE_0_DEBUG(s1394_isoch_cec_member_list_insert_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -1225,9 +1007,6 @@ s1394_isoch_cec_member_list_remove(s1394_hal_t *hal, s1394_isoch_cec_t *cec, s1394_isoch_cec_member_t *prev_member; s1394_isoch_cec_member_t *next_member; - TNF_PROBE_0_DEBUG(s1394_isoch_cec_member_list_remove_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(MUTEX_HELD(&cec->isoch_cec_mutex)); prev_member = member->cec_mem_prev; @@ -1251,7 +1030,4 @@ s1394_isoch_cec_member_list_remove(s1394_hal_t *hal, s1394_isoch_cec_t *cec, if (cec->cec_member_list_tail == member) cec->cec_member_list_tail = prev_member; } - - TNF_PROBE_0_DEBUG(s1394_isoch_cec_member_list_remove_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/s1394_misc.c b/usr/src/uts/common/io/1394/s1394_misc.c index 685d775f3a..44efdadbdd 100644 --- a/usr/src/uts/common/io/1394/s1394_misc.c +++ b/usr/src/uts/common/io/1394/s1394_misc.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394_misc.c * 1394 Services Layer Miscellaneous Routines @@ -40,8 +38,6 @@ #include <sys/types.h> #include <sys/kmem.h> #include <sys/kstat.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -62,9 +58,6 @@ void s1394_cleanup_for_detach(s1394_hal_t *hal, uint_t cleanup_level) { - TNF_PROBE_0_DEBUG(s1394_cleanup_for_detach_enter, S1394_TNF_SL_STACK, - ""); - switch (cleanup_level) { case H1394_CLEANUP_LEVEL7: /* remove HAL from the global HAL list */ @@ -152,14 +145,8 @@ s1394_cleanup_for_detach(s1394_hal_t *hal, uint_t cleanup_level) default: /* Error */ - TNF_PROBE_1(s1394_cleanup_for_detach_error, - S1394_TNF_SL_ERROR, "", tnf_string, msg, - "Invalid cleanup_level"); break; } - - TNF_PROBE_0_DEBUG(s1394_cleanup_for_detach_exit, S1394_TNF_SL_STACK, - ""); } /* @@ -176,8 +163,6 @@ s1394_hal_shutdown(s1394_hal_t *hal, boolean_t disable_hal) ddi_eventcookie_t cookie; t1394_localinfo_t localinfo; - TNF_PROBE_0_DEBUG(s1394_hal_shutdown_enter, S1394_TNF_SL_STACK, ""); - mutex_enter(&hal->topology_tree_mutex); if (hal->hal_state == S1394_HAL_SHUTDOWN) { @@ -185,8 +170,6 @@ s1394_hal_shutdown(s1394_hal_t *hal, boolean_t disable_hal) if (disable_hal == B_TRUE) HAL_CALL(hal).shutdown(hal->halinfo.hal_private); - TNF_PROBE_0_DEBUG(s1394_hal_shutdown_exit_already, - S1394_TNF_SL_STACK, ""); return; } @@ -209,8 +192,6 @@ s1394_hal_shutdown(s1394_hal_t *hal, boolean_t disable_hal) NDI_SUCCESS) (void) ndi_event_run_callbacks(hal->hal_ndi_event_hdl, NULL, cookie, &localinfo); - - TNF_PROBE_0_DEBUG(s1394_hal_shutdown_exit, S1394_TNF_SL_STACK, ""); } /* @@ -222,29 +203,16 @@ s1394_hal_shutdown(s1394_hal_t *hal, boolean_t disable_hal) void s1394_initiate_hal_reset(s1394_hal_t *hal, int reason) { - int ret; - - TNF_PROBE_0_DEBUG(s1394_initiate_hal_reset_enter, S1394_TNF_SL_BR_STACK, - ""); - if (hal->num_bus_reset_till_fail > 0) { hal->initiated_bus_reset = B_TRUE; hal->initiated_br_reason = reason; /* Reset the bus */ - ret = HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(s1394_initiate_hal_reset_error, - S1394_TNF_SL_ERROR, "", tnf_string, msg, - "Error initiating bus reset"); - } + (void) HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); } else { cmn_err(CE_NOTE, "Unable to reenumerate the 1394 bus - If new" " devices have recently been added, remove them."); } - - TNF_PROBE_0_DEBUG(s1394_initiate_hal_reset_exit, S1394_TNF_SL_BR_STACK, - ""); } /* @@ -269,9 +237,6 @@ s1394_on_br_thread(s1394_hal_t *hal) void s1394_destroy_br_thread(s1394_hal_t *hal) { - TNF_PROBE_0_DEBUG(s1394_destroy_br_thread_enter, S1394_TNF_SL_STACK, - ""); - /* Send the signal to the reset thread to go away */ mutex_enter(&hal->br_thread_mutex); hal->br_thread_ev_type |= BR_THR_GO_AWAY; @@ -291,9 +256,6 @@ s1394_destroy_br_thread(s1394_hal_t *hal) /* Wait for the br_thread to be done */ while (hal->br_thread_ev_type & BR_THR_GO_AWAY) delay(drv_usectohz(10)); - - TNF_PROBE_0_DEBUG(s1394_destroy_br_thread_exit, S1394_TNF_SL_STACK, - ""); } /* @@ -333,9 +295,6 @@ s1394_block_on_asynch_cmd(cmd1394_cmd_t *cmd) { s1394_cmd_priv_t *s_priv; - TNF_PROBE_0_DEBUG(s1394_block_on_asynch_cmd_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - /* Get the Services Layer private area */ s_priv = S1394_GET_CMD_PRIV(cmd); @@ -348,9 +307,6 @@ s1394_block_on_asynch_cmd(cmd1394_cmd_t *cmd) s_priv->blocking_flag = B_FALSE; mutex_exit(&s_priv->blocking_mutex); } - - TNF_PROBE_0_DEBUG(s1394_block_on_asynch_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); } /* @@ -399,9 +355,6 @@ s1394_mblk_too_small(cmd1394_cmd_t *cmd) size_t msgb_len; size_t size; - TNF_PROBE_0_DEBUG(s1394_mblk_too_small_enter, S1394_TNF_SL_ATREQ_STACK, - ""); - curr_blk = cmd->cmd_u.b.data_block; msgb_len = 0; flag = B_TRUE; @@ -423,8 +376,6 @@ s1394_mblk_too_small(cmd1394_cmd_t *cmd) curr_blk = curr_blk->b_cont; } - TNF_PROBE_0_DEBUG(s1394_mblk_too_small_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (flag); } @@ -440,9 +391,6 @@ s1394_address_rollover(cmd1394_cmd_t *cmd) uint64_t addr_after; size_t length; - TNF_PROBE_0_DEBUG(s1394_address_rollover_enter, - S1394_TNF_SL_ATREQ_STACK, ""); - switch (cmd->cmd_type) { case CMD1394_ASYNCH_RD_QUAD: case CMD1394_ASYNCH_WR_QUAD: @@ -464,13 +412,9 @@ s1394_address_rollover(cmd1394_cmd_t *cmd) addr_after = (addr_before + length) & IEEE1394_ADDR_OFFSET_MASK; if (addr_after < addr_before) { - TNF_PROBE_0_DEBUG(s1394_address_rollover_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (B_TRUE); } - TNF_PROBE_0_DEBUG(s1394_address_rollover_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (B_FALSE); } @@ -515,8 +459,6 @@ s1394_CRC16(uint_t *d, uint_t crc_length) int shift; int i; - TNF_PROBE_0_DEBUG(s1394_CRC16_enter, S1394_TNF_SL_STACK, ""); - for (i = 0; i < crc_length; i++) { data = d[i]; @@ -529,8 +471,6 @@ s1394_CRC16(uint_t *d, uint_t crc_length) CRC = next & IEEE1394_CRC16_MASK; } - TNF_PROBE_1_DEBUG(s1394_CRC16_exit, S1394_TNF_SL_STACK, "", - tnf_uint, crc, CRC); return (CRC); } @@ -552,8 +492,6 @@ s1394_CRC16_old(uint_t *d, uint_t crc_length) int shift; int i; - TNF_PROBE_0_DEBUG(s1394_CRC16_old_enter, S1394_TNF_SL_STACK, ""); - for (i = 0; i < crc_length; i++) { data = d[i]; for (next = CRC, shift = 28; shift > 0; shift -= 4) { @@ -563,8 +501,6 @@ s1394_CRC16_old(uint_t *d, uint_t crc_length) CRC = next & IEEE1394_CRC16_MASK; } - TNF_PROBE_1_DEBUG(s1394_CRC16_old_exit, S1394_TNF_SL_STACK, "", - tnf_uint, crc, CRC); return (CRC); } @@ -581,9 +517,6 @@ s1394_ioctl(s1394_hal_t *hal, int cmd, intptr_t arg, int mode, cred_t *cred_p, struct devctl_iocdata *dcp; dev_info_t *self; int rv = 0; - int ret; - - TNF_PROBE_0_DEBUG(s1394_ioctl_enter, S1394_TNF_SL_IOCTL_STACK, ""); self = hal->halinfo.dip; @@ -601,8 +534,6 @@ s1394_ioctl(s1394_hal_t *hal, int cmd, intptr_t arg, int mode, cred_t *cred_p, /* Read devctl ioctl data */ if (ndi_dc_allochdl((void *)arg, &dcp) != NDI_SUCCESS) { - TNF_PROBE_0_DEBUG(s1394_ioctl_exit, S1394_TNF_SL_IOCTL_STACK, - ""); return (EFAULT); } @@ -626,20 +557,11 @@ s1394_ioctl(s1394_hal_t *hal, int cmd, intptr_t arg, int mode, cred_t *cred_p, case DEVCTL_BUS_RESET: case DEVCTL_BUS_RESETALL: if (hal->halinfo.phy == H1394_PHY_1394A) { - ret = HAL_CALL(hal).short_bus_reset( + (void) HAL_CALL(hal).short_bus_reset( hal->halinfo.hal_private); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(s1394_ioctl_error, - S1394_TNF_SL_ERROR, "", tnf_string, msg, - "Error initiating short bus reset"); - } } else { - ret = HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(t1394_initiate_bus_reset_error, - S1394_TNF_SL_ERROR, "", tnf_string, msg, - "Error initiating bus reset"); - } + (void) + HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); } break; @@ -649,7 +571,6 @@ s1394_ioctl(s1394_hal_t *hal, int cmd, intptr_t arg, int mode, cred_t *cred_p, ndi_dc_freehdl(dcp); - TNF_PROBE_0_DEBUG(s1394_ioctl_exit, S1394_TNF_SL_IOCTL_STACK, ""); return (rv); } @@ -662,8 +583,6 @@ s1394_kstat_init(s1394_hal_t *hal) { int instance; - TNF_PROBE_0_DEBUG(s1394_kstat_init_enter, S1394_TNF_SL_STACK, ""); - hal->hal_kstats = (s1394_kstat_t *)kmem_zalloc(sizeof (s1394_kstat_t), KM_SLEEP); @@ -676,13 +595,9 @@ s1394_kstat_init(s1394_hal_t *hal) hal->hal_ksp->ks_update = s1394_kstat_update; kstat_install(hal->hal_ksp); - TNF_PROBE_0_DEBUG(s1394_kstat_init_exit, S1394_TNF_SL_STACK, - ""); return (DDI_SUCCESS); } else { kmem_free((void *)hal->hal_kstats, sizeof (s1394_kstat_t)); - TNF_PROBE_0_DEBUG(s1394_kstat_init_exit, S1394_TNF_SL_STACK, - ""); return (DDI_FAILURE); } } @@ -695,12 +610,9 @@ s1394_kstat_init(s1394_hal_t *hal) int s1394_kstat_delete(s1394_hal_t *hal) { - TNF_PROBE_0_DEBUG(s1394_kstat_delete_enter, S1394_TNF_SL_STACK, ""); - kstat_delete(hal->hal_ksp); kmem_free((void *)hal->hal_kstats, sizeof (s1394_kstat_t)); - TNF_PROBE_0_DEBUG(s1394_kstat_delete_exit, S1394_TNF_SL_STACK, ""); return (DDI_SUCCESS); } @@ -714,19 +626,14 @@ s1394_kstat_update(kstat_t *ksp, int rw) { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(s1394_kstat_update_enter, S1394_TNF_SL_STACK, ""); - hal = ksp->ks_private; if (rw == KSTAT_WRITE) { - TNF_PROBE_0_DEBUG(s1394_kstat_update_exit, S1394_TNF_SL_STACK, - ""); return (EACCES); } else { ksp->ks_data = hal->hal_kstats; } - TNF_PROBE_0_DEBUG(s1394_kstat_update_exit, S1394_TNF_SL_STACK, ""); return (0); } @@ -834,9 +741,6 @@ s1394_dip_to_hal(dev_info_t *hal_dip) { s1394_hal_t *current_hal = NULL; - TNF_PROBE_0_DEBUG(s1394_dip_to_hal_enter, - S1394_TNF_SL_HOTPLUG_STACK, ""); - mutex_enter(&s1394_statep->hal_list_mutex); /* Search the HAL list for this dip */ @@ -850,8 +754,6 @@ s1394_dip_to_hal(dev_info_t *hal_dip) mutex_exit(&s1394_statep->hal_list_mutex); - TNF_PROBE_0_DEBUG(s1394_dip_to_hal_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (current_hal); } @@ -869,9 +771,6 @@ s1394_target_from_dip_locked(s1394_hal_t *hal, dev_info_t *tdip) { s1394_target_t *temp; - TNF_PROBE_0_DEBUG(s1394_target_from_dip_locked_enter, - S1394_TNF_SL_STACK, ""); - temp = hal->target_head; while (temp != NULL) { if (temp->target_dip == tdip) { @@ -880,8 +779,6 @@ s1394_target_from_dip_locked(s1394_hal_t *hal, dev_info_t *tdip) temp = temp->target_next; } - TNF_PROBE_0_DEBUG(s1394_target_from_dip_locked_exit, - S1394_TNF_SL_STACK, ""); return (NULL); } /* @@ -894,13 +791,10 @@ s1394_target_from_dip(s1394_hal_t *hal, dev_info_t *tdip) { s1394_target_t *target; - TNF_PROBE_0_DEBUG(s1394_target_from_dip_enter, S1394_TNF_SL_STACK, ""); - rw_enter(&hal->target_list_rwlock, RW_READER); target = s1394_target_from_dip_locked(hal, tdip); rw_exit(&hal->target_list_rwlock); - TNF_PROBE_0_DEBUG(s1394_target_from_dip_exit, S1394_TNF_SL_STACK, ""); return (target); } @@ -954,9 +848,6 @@ s1394_cycle_too_long_callback(void *arg) uint32_t data; uint_t offset; - TNF_PROBE_0_DEBUG(s1394_cycle_too_long_callback_enter, - S1394_TNF_SL_STACK, ""); - hal = (s1394_hal_t *)arg; /* Clear the cm_timer_cet bit */ @@ -977,7 +868,4 @@ s1394_cycle_too_long_callback(void *arg) (void) HAL_CALL(hal).csr_write(hal->halinfo.hal_private, offset, data); } - - TNF_PROBE_0_DEBUG(s1394_cycle_too_long_callback_exit, - S1394_TNF_SL_STACK, ""); } diff --git a/usr/src/uts/common/io/1394/t1394.c b/usr/src/uts/common/io/1394/t1394.c index 4cc56bac29..ea47e59e7d 100644 --- a/usr/src/uts/common/io/1394/t1394.c +++ b/usr/src/uts/common/io/1394/t1394.c @@ -37,8 +37,6 @@ #include <sys/types.h> #include <sys/kmem.h> #include <sys/disp.h> -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/h1394.h> @@ -82,24 +80,14 @@ t1394_attach(dev_info_t *dip, int version, uint_t flags, ASSERT(t1394_hdl != NULL); ASSERT(attachinfo != NULL); - TNF_PROBE_0_DEBUG(t1394_attach_enter, S1394_TNF_SL_HOTPLUG_STACK, ""); - *t1394_hdl = NULL; if (version != T1394_VERSION_V1) { - TNF_PROBE_1(t1394_attach_error, S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_string, msg, "Invalid version"); - TNF_PROBE_0_DEBUG(t1394_attach_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } hal = s1394_dip_to_hal(ddi_get_parent(dip)); if (hal == NULL) { - TNF_PROBE_1(t1394_attach_error, S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_string, msg, "No parent dip found for target"); - TNF_PROBE_0_DEBUG(t1394_attach_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -134,11 +122,6 @@ t1394_attach(dev_info_t *dip, int version, uint_t flags, rw_exit(&target->on_hal->target_list_rwlock); mutex_exit(&hal->topology_tree_mutex); kmem_free(target, sizeof (s1394_target_t)); - TNF_PROBE_1(t1394_attach_error, - S1394_TNF_SL_HOTPLUG_ERROR, "", tnf_string, msg, - "on_node == NULL"); - TNF_PROBE_0_DEBUG(t1394_attach_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -190,7 +173,6 @@ t1394_attach(dev_info_t *dip, int version, uint_t flags, mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_0_DEBUG(t1394_attach_exit, S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_SUCCESS); } @@ -214,8 +196,6 @@ t1394_detach(t1394_handle_t *t1394_hdl, uint_t flags) s1394_target_t *target; uint_t num_cmds; - TNF_PROBE_0_DEBUG(t1394_detach_enter, S1394_TNF_SL_HOTPLUG_STACK, ""); - ASSERT(t1394_hdl != NULL); target = (s1394_target_t *)(*t1394_hdl); @@ -231,10 +211,6 @@ t1394_detach(t1394_handle_t *t1394_hdl, uint_t flags) if (num_cmds != 0) { rw_exit(&target->on_hal->target_list_rwlock); mutex_exit(&target->on_hal->topology_tree_mutex); - TNF_PROBE_1(t1394_detach_error, S1394_TNF_SL_HOTPLUG_ERROR, "", - tnf_string, msg, "Must free all commands before detach()"); - TNF_PROBE_0_DEBUG(t1394_detach_exit, - S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_FAILURE); } @@ -267,7 +243,6 @@ t1394_detach(t1394_handle_t *t1394_hdl, uint_t flags) *t1394_hdl = NULL; - TNF_PROBE_0_DEBUG(t1394_detach_exit, S1394_TNF_SL_HOTPLUG_STACK, ""); return (DDI_SUCCESS); } @@ -296,8 +271,6 @@ t1394_alloc_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) s1394_cmd_priv_t *s_priv; uint_t num_cmds; - TNF_PROBE_0_DEBUG(t1394_alloc_cmd_enter, S1394_TNF_SL_ATREQ_STACK, ""); - ASSERT(t1394_hdl != NULL); target = (s1394_target_t *)t1394_hdl; @@ -312,11 +285,6 @@ t1394_alloc_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) if (num_cmds >= MAX_NUMBER_ALLOC_CMDS) { rw_exit(&hal->target_list_rwlock); - TNF_PROBE_1(t1394_alloc_cmd_error, S1394_TNF_SL_ATREQ_ERROR, - "", tnf_string, msg, "Attempted to alloc > " - "MAX_NUMBER_ALLOC_CMDS"); - TNF_PROBE_0_DEBUG(t1394_alloc_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); /* kstats - cmd alloc failures */ hal->hal_kstats->cmd_alloc_fail++; return (DDI_FAILURE); @@ -328,10 +296,6 @@ t1394_alloc_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) if (s1394_alloc_cmd(hal, flags, cmdp) != DDI_SUCCESS) { target->target_num_cmds = num_cmds; /* Undo increment */ rw_exit(&hal->target_list_rwlock); - TNF_PROBE_1(t1394_alloc_cmd_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Failed to allocate command structure"); - TNF_PROBE_0_DEBUG(t1394_alloc_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); /* kstats - cmd alloc failures */ hal->hal_kstats->cmd_alloc_fail++; return (DDI_FAILURE); @@ -349,7 +313,6 @@ t1394_alloc_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) /* Initialize the command's blocking condition variable */ cv_init(&s_priv->blocking_cv, NULL, CV_DRIVER, NULL); - TNF_PROBE_0_DEBUG(t1394_alloc_cmd_exit, S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } @@ -377,8 +340,6 @@ t1394_free_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) s1394_cmd_priv_t *s_priv; uint_t num_cmds; - TNF_PROBE_0_DEBUG(t1394_free_cmd_enter, S1394_TNF_SL_ATREQ_STACK, ""); - ASSERT(t1394_hdl != NULL); target = (s1394_target_t *)t1394_hdl; @@ -393,11 +354,6 @@ t1394_free_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) if (num_cmds == 0) { rw_exit(&hal->target_list_rwlock); - TNF_PROBE_2(t1394_free_cmd_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "No commands left to be freed " - "(num_cmds <= 0)", tnf_uint, num_cmds, num_cmds); - TNF_PROBE_0_DEBUG(t1394_free_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); ASSERT(num_cmds != 0); return (DDI_FAILURE); } @@ -408,10 +364,6 @@ t1394_free_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) /* Check that command isn't in use */ if (s_priv->cmd_in_use == B_TRUE) { rw_exit(&hal->target_list_rwlock); - TNF_PROBE_1(t1394_free_cmd_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Attempted to free an in-use command"); - TNF_PROBE_0_DEBUG(t1394_free_cmd_exit, - S1394_TNF_SL_ATREQ_STACK, ""); ASSERT(s_priv->cmd_in_use == B_FALSE); return (DDI_FAILURE); } @@ -435,7 +387,6 @@ t1394_free_cmd(t1394_handle_t t1394_hdl, uint_t flags, cmd1394_cmd_t **cmdp) /* kstats - number of cmd frees */ hal->hal_kstats->cmd_free++; - TNF_PROBE_0_DEBUG(t1394_free_cmd_exit, S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } @@ -461,8 +412,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) int ret; int err; - TNF_PROBE_0_DEBUG(t1394_read_enter, S1394_TNF_SL_ATREQ_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(cmd != NULL); @@ -471,10 +420,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) /* Is this command currently in use? */ if (s_priv->cmd_in_use == B_TRUE) { - TNF_PROBE_1(t1394_read_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Attempted to resend an in-use command"); - TNF_PROBE_0_DEBUG(t1394_read_exit, S1394_TNF_SL_ATREQ_STACK, - ""); ASSERT(s_priv->cmd_in_use == B_FALSE); return (DDI_FAILURE); } @@ -491,10 +436,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) if ((cmd->cmd_type != CMD1394_ASYNCH_RD_QUAD) && (cmd->cmd_type != CMD1394_ASYNCH_RD_BLOCK)) { cmd->cmd_result = CMD1394_EINVALID_COMMAND; - TNF_PROBE_1(t1394_read_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Invalid command type specified"); - TNF_PROBE_0_DEBUG(t1394_read_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -502,11 +443,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) if ((cmd->cmd_options & CMD1394_BLOCKING) && (servicing_interrupt())) { cmd->cmd_result = CMD1394_EINVALID_CONTEXT; - TNF_PROBE_1(t1394_read_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Tried to use CMD1394_BLOCKING in " - "intr context"); - TNF_PROBE_0_DEBUG(t1394_read_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -529,10 +465,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) /* Copy error code into result */ cmd->cmd_result = err; mutex_exit(&to_hal->topology_tree_mutex); - TNF_PROBE_1(t1394_read_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Failed in s1394_setup_asynch_command()"); - TNF_PROBE_0_DEBUG(t1394_read_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } @@ -550,12 +482,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) mutex_exit(&to_hal->topology_tree_mutex); s_priv->cmd_in_use = B_FALSE; cmd->cmd_result = CMD1394_EINVALID_CONTEXT; - TNF_PROBE_1(t1394_read_error, - S1394_TNF_SL_ATREQ_ERROR, "", tnf_string, - msg, "CMD1394_BLOCKING in bus reset " - "context"); - TNF_PROBE_0_DEBUG(t1394_read_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } } @@ -590,11 +516,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) /* Copy error code into result */ cmd->cmd_result = err; - TNF_PROBE_1(t1394_read_error, S1394_TNF_SL_ATREQ_ERROR, - "", tnf_string, msg, "Failed in " - "s1394_xfer_asynch_command()"); - TNF_PROBE_0_DEBUG(t1394_read_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } } else { @@ -605,8 +526,6 @@ t1394_read(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) block_on_asynch_cmd: s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(t1394_read_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } @@ -632,8 +551,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) int ret; int err; - TNF_PROBE_0_DEBUG(t1394_write_enter, S1394_TNF_SL_ATREQ_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(cmd != NULL); @@ -642,10 +559,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) /* Is this command currently in use? */ if (s_priv->cmd_in_use == B_TRUE) { - TNF_PROBE_1(t1394_write_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Attempted to resend an in-use command"); - TNF_PROBE_0_DEBUG(t1394_write_exit, S1394_TNF_SL_ATREQ_STACK, - ""); ASSERT(s_priv->cmd_in_use == B_FALSE); return (DDI_FAILURE); } @@ -659,8 +572,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) if (s_priv->cmd_ext_type == S1394_CMD_EXT_FA) { if (S1394_IS_CMD_FCP(s_priv) && (s1394_fcp_write_check_cmd(cmd) != DDI_SUCCESS)) { - TNF_PROBE_0_DEBUG(t1394_write_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } s1394_fa_convert_cmd(to_hal, cmd); @@ -674,10 +585,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) (cmd->cmd_type != CMD1394_ASYNCH_WR_BLOCK)) { cmd->cmd_result = CMD1394_EINVALID_COMMAND; s1394_fa_check_restore_cmd(to_hal, cmd); - TNF_PROBE_1(t1394_write_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Invalid command type specified"); - TNF_PROBE_0_DEBUG(t1394_write_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_FAILURE); } @@ -686,11 +593,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) (servicing_interrupt())) { cmd->cmd_result = CMD1394_EINVALID_CONTEXT; s1394_fa_check_restore_cmd(to_hal, cmd); - TNF_PROBE_1(t1394_write_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Tried to use CMD1394_BLOCKING in intr " - "context"); - TNF_PROBE_0_DEBUG(t1394_write_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_FAILURE); } @@ -715,10 +617,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) cmd->cmd_result = err; mutex_exit(&to_hal->topology_tree_mutex); s1394_fa_check_restore_cmd(to_hal, cmd); - TNF_PROBE_1(t1394_write_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Failed in s1394_setup_asynch_command()"); - TNF_PROBE_0_DEBUG(t1394_write_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_FAILURE); } @@ -737,11 +635,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) s_priv->cmd_in_use = B_FALSE; cmd->cmd_result = CMD1394_EINVALID_CONTEXT; s1394_fa_check_restore_cmd(to_hal, cmd); - TNF_PROBE_1(t1394_write_error, - S1394_TNF_SL_ATREQ_ERROR, "", tnf_string, - msg, "CMD1394_BLOCKING in bus reset cntxt"); - TNF_PROBE_0_DEBUG(t1394_write_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } } @@ -752,8 +645,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) /* Block (if necessary) */ s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(t1394_write_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_SUCCESS); } mutex_exit(&to_hal->topology_tree_mutex); @@ -771,8 +662,6 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) /* Block (if necessary) */ s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(t1394_write_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_SUCCESS); } else { /* Remove cmd from outstanding request Q */ @@ -784,19 +673,12 @@ t1394_write(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) cmd->cmd_result = err; s1394_fa_check_restore_cmd(to_hal, cmd); - TNF_PROBE_1(t1394_write_error, - S1394_TNF_SL_ATREQ_ERROR, "", tnf_string, msg, - "Failed in s1394_xfer_asynch_command()"); - TNF_PROBE_0_DEBUG(t1394_write_exit, - S1394_TNF_SL_ATREQ_STACK, ""); return (DDI_FAILURE); } } else { /* Block (if necessary) */ s1394_block_on_asynch_cmd(cmd); - TNF_PROBE_0_DEBUG(t1394_write_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_SUCCESS); } } @@ -824,8 +706,6 @@ t1394_lock(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) uint_t num_retries; int ret; - TNF_PROBE_0_DEBUG(t1394_lock_enter, S1394_TNF_SL_ATREQ_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(cmd != NULL); @@ -834,10 +714,6 @@ t1394_lock(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) /* Is this command currently in use? */ if (s_priv->cmd_in_use == B_TRUE) { - TNF_PROBE_1(t1394_lock_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Attempted to resend an in-use command"); - TNF_PROBE_0_DEBUG(t1394_lock_exit, S1394_TNF_SL_ATREQ_STACK, - ""); ASSERT(s_priv->cmd_in_use == B_FALSE); return (DDI_FAILURE); } @@ -863,11 +739,6 @@ t1394_lock(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) if ((cmd->cmd_type != CMD1394_ASYNCH_LOCK_32) && (cmd->cmd_type != CMD1394_ASYNCH_LOCK_64)) { cmd->cmd_result = CMD1394_EINVALID_COMMAND; - TNF_PROBE_1(t1394_lock_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Invalid command type sent to " - "t1394_lock()"); - TNF_PROBE_0_DEBUG(t1394_lock_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_FAILURE); } @@ -878,11 +749,6 @@ t1394_lock(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) if ((cmd->cmd_options & CMD1394_BLOCKING) && (servicing_interrupt())) { cmd->cmd_result = CMD1394_EINVALID_CONTEXT; - TNF_PROBE_1(t1394_lock_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Tried to use CMD1394_BLOCKING in intr " - "context"); - TNF_PROBE_0_DEBUG(t1394_lock_exit, S1394_TNF_SL_ATREQ_STACK, - ""); return (DDI_FAILURE); } @@ -922,14 +788,11 @@ t1394_lock(t1394_handle_t t1394_hdl, cmd1394_cmd_t *cmd) break; default: - TNF_PROBE_1(t1394_lock_error, S1394_TNF_SL_ATREQ_ERROR, "", - tnf_string, msg, "Invalid lock_type in command"); cmd->cmd_result = CMD1394_EINVALID_COMMAND; ret = DDI_FAILURE; break; } - TNF_PROBE_0_DEBUG(t1394_lock_exit, S1394_TNF_SL_ATREQ_STACK, ""); return (ret); } @@ -967,9 +830,6 @@ t1394_alloc_addr(t1394_handle_t t1394_hdl, t1394_alloc_addr_t *addr_allocp, uint64_t addr_hi; int err; - TNF_PROBE_0_DEBUG(t1394_alloc_addr_enter, S1394_TNF_SL_ARREQ_STACK, - ""); - ASSERT(t1394_hdl != NULL); ASSERT(addr_allocp != NULL); @@ -996,13 +856,6 @@ t1394_alloc_addr(t1394_handle_t t1394_hdl, t1394_alloc_addr_t *addr_allocp, */ *result = T1394_EINVALID_PARAM; - TNF_PROBE_1(t1394_alloc_addr_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid flags " - "(RDs on, notify off, no backing store)"); - TNF_PROBE_0_DEBUG(t1394_alloc_addr_exit, - S1394_TNF_SL_ARREQ_STACK, ""); - /* kstats - addr alloc failures */ hal->hal_kstats->addr_alloc_fail++; return (DDI_FAILURE); @@ -1024,13 +877,6 @@ t1394_alloc_addr(t1394_handle_t t1394_hdl, t1394_alloc_addr_t *addr_allocp, */ *result = T1394_EINVALID_PARAM; - TNF_PROBE_1(t1394_alloc_addr_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid flags " - "(WRs on, notify off, no backing store)"); - TNF_PROBE_0_DEBUG(t1394_alloc_addr_exit, - S1394_TNF_SL_ARREQ_STACK, ""); - /* kstats - addr alloc failures */ hal->hal_kstats->addr_alloc_fail++; return (DDI_FAILURE); @@ -1052,13 +898,6 @@ t1394_alloc_addr(t1394_handle_t t1394_hdl, t1394_alloc_addr_t *addr_allocp, */ *result = T1394_EINVALID_PARAM; - TNF_PROBE_1(t1394_alloc_addr_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid flags " - "(LKs on, notify off, no backing store)"); - TNF_PROBE_0_DEBUG(t1394_alloc_addr_exit, - S1394_TNF_SL_ARREQ_STACK, ""); - /* kstats - addr alloc failures */ hal->hal_kstats->addr_alloc_fail++; return (DDI_FAILURE); @@ -1078,8 +917,6 @@ t1394_alloc_addr(t1394_handle_t t1394_hdl, t1394_alloc_addr_t *addr_allocp, } else { *result = T1394_NOERROR; } - TNF_PROBE_0_DEBUG(t1394_alloc_addr_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (err); } else { err = s1394_claim_addr_blk((s1394_hal_t *)target->on_hal, @@ -1100,8 +937,6 @@ t1394_alloc_addr(t1394_handle_t t1394_hdl, t1394_alloc_addr_t *addr_allocp, s1394_physical_arreq_set_one(target); } } - TNF_PROBE_0_DEBUG(t1394_alloc_addr_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (err); } } @@ -1129,8 +964,6 @@ t1394_free_addr(t1394_handle_t t1394_hdl, t1394_addr_handle_t *addr_hdl, s1394_hal_t *hal; s1394_target_t *target; - TNF_PROBE_0_DEBUG(t1394_free_addr_enter, S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(addr_hdl != NULL); @@ -1142,8 +975,6 @@ t1394_free_addr(t1394_handle_t t1394_hdl, t1394_addr_handle_t *addr_hdl, curr_blk = (s1394_addr_space_blk_t *)(*addr_hdl); if (s1394_free_addr_blk(hal, curr_blk) != DDI_SUCCESS) { - TNF_PROBE_0_DEBUG(t1394_free_addr_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } @@ -1158,7 +989,6 @@ t1394_free_addr(t1394_handle_t t1394_hdl, t1394_addr_handle_t *addr_hdl, /* kstats - number of addr frees */ hal->hal_kstats->addr_space_free++; - TNF_PROBE_0_DEBUG(t1394_free_addr_exit, S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } @@ -1200,9 +1030,6 @@ t1394_recv_request_done(t1394_handle_t t1394_hdl, cmd1394_cmd_t *resp, boolean_t write_cmd = B_FALSE; boolean_t mblk_too_small; - TNF_PROBE_0_DEBUG(t1394_recv_request_done_enter, - S1394_TNF_SL_ARREQ_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(resp != NULL); @@ -1242,8 +1069,6 @@ t1394_recv_request_done(t1394_handle_t t1394_hdl, cmd1394_cmd_t *resp, /* Free the command - Pass it back to the HAL */ HAL_CALL(hal).response_complete(hal->halinfo.hal_private, resp, h_priv); - TNF_PROBE_0_DEBUG(t1394_recv_request_done_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_SUCCESS); } @@ -1260,11 +1085,6 @@ t1394_recv_request_done(t1394_handle_t t1394_hdl, cmd1394_cmd_t *resp, mblk_too_small = B_TRUE; if (curr_blk == NULL) { - TNF_PROBE_1(t1394_recv_request_done_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, - msg, "mblk_t is NULL in response"); - TNF_PROBE_0_DEBUG(t1394_recv_request_done_exit, - S1394_TNF_SL_ARREQ_STACK, ""); /* * Free the command - Pass it back * to the HAL @@ -1287,11 +1107,6 @@ t1394_recv_request_done(t1394_handle_t t1394_hdl, cmd1394_cmd_t *resp, } if (mblk_too_small == B_TRUE) { - TNF_PROBE_1(t1394_recv_request_done_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, - msg, "mblk_t too small in response"); - TNF_PROBE_0_DEBUG(t1394_recv_request_done_exit, - S1394_TNF_SL_ARREQ_STACK, ""); /* * Free the command - Pass it back * to the HAL @@ -1308,16 +1123,9 @@ t1394_recv_request_done(t1394_handle_t t1394_hdl, cmd1394_cmd_t *resp, case IEEE1394_RESP_TYPE_ERROR: case IEEE1394_RESP_ADDRESS_ERROR: ret = s1394_send_response(hal, resp); - TNF_PROBE_0_DEBUG(t1394_recv_request_done_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (ret); default: - TNF_PROBE_1(t1394_recv_request_done_error, - S1394_TNF_SL_ARREQ_ERROR, "", tnf_string, msg, - "Invalid response code"); - TNF_PROBE_0_DEBUG(t1394_recv_request_done_exit, - S1394_TNF_SL_ARREQ_STACK, ""); return (DDI_FAILURE); } } @@ -1346,15 +1154,10 @@ t1394_fcp_register_controller(t1394_handle_t t1394_hdl, t1394_fcp_evts_t *evts, { int result; - TNF_PROBE_0_DEBUG(t1394_fcp_register_controller_enter, - S1394_TNF_SL_FCP_STACK, ""); - ASSERT(t1394_hdl != NULL); result = s1394_fcp_register_ctl((s1394_target_t *)t1394_hdl, evts); - TNF_PROBE_0_DEBUG(t1394_fcp_register_controller_exit, - S1394_TNF_SL_FCP_STACK, ""); return (result); } @@ -1375,15 +1178,10 @@ t1394_fcp_unregister_controller(t1394_handle_t t1394_hdl) { int result; - TNF_PROBE_0_DEBUG(t1394_fcp_unregister_controller_enter, - S1394_TNF_SL_FCP_STACK, ""); - ASSERT(t1394_hdl != NULL); result = s1394_fcp_unregister_ctl((s1394_target_t *)t1394_hdl); - TNF_PROBE_0_DEBUG(t1394_fcp_unregister_controller_exit, - S1394_TNF_SL_FCP_STACK, ""); return (result); } @@ -1410,15 +1208,10 @@ t1394_fcp_register_target(t1394_handle_t t1394_hdl, t1394_fcp_evts_t *evts, { int result; - TNF_PROBE_0_DEBUG(t1394_fcp_register_target_enter, - S1394_TNF_SL_FCP_STACK, ""); - ASSERT(t1394_hdl != NULL); result = s1394_fcp_register_tgt((s1394_target_t *)t1394_hdl, evts); - TNF_PROBE_0_DEBUG(t1394_fcp_register_target_exit, - S1394_TNF_SL_FCP_STACK, ""); return (result); } @@ -1439,15 +1232,10 @@ t1394_fcp_unregister_target(t1394_handle_t t1394_hdl) { int result; - TNF_PROBE_0_DEBUG(t1394_fcp_unregister_target_enter, - S1394_TNF_SL_FCP_STACK, ""); - ASSERT(t1394_hdl != NULL); result = s1394_fcp_unregister_tgt((s1394_target_t *)t1394_hdl); - TNF_PROBE_0_DEBUG(t1394_fcp_unregister_target_exit, - S1394_TNF_SL_FCP_STACK, ""); return (result); } @@ -1472,13 +1260,10 @@ t1394_cmp_register(t1394_handle_t t1394_hdl, t1394_cmp_evts_t *evts, { int result; - TNF_PROBE_0_DEBUG(t1394_cmp_register_enter, S1394_TNF_SL_CMP_STACK, ""); - ASSERT(t1394_hdl != NULL); result = s1394_cmp_register((s1394_target_t *)t1394_hdl, evts); - TNF_PROBE_0_DEBUG(t1394_cmp_register_exit, S1394_TNF_SL_CMP_STACK, ""); return (result); } @@ -1501,15 +1286,10 @@ t1394_cmp_unregister(t1394_handle_t t1394_hdl) { int result; - TNF_PROBE_0_DEBUG(t1394_cmp_unregister_enter, S1394_TNF_SL_CMP_STACK, - ""); - ASSERT(t1394_hdl != NULL); result = s1394_cmp_unregister((s1394_target_t *)t1394_hdl); - TNF_PROBE_0_DEBUG(t1394_cmp_unregister_exit, S1394_TNF_SL_CMP_STACK, - ""); return (result); } @@ -1531,13 +1311,10 @@ t1394_cmp_read(t1394_handle_t t1394_hdl, t1394_cmp_reg_t reg, uint32_t *valp) { int result; - TNF_PROBE_0_DEBUG(t1394_cmp_read_enter, S1394_TNF_SL_CMP_STACK, ""); - ASSERT(t1394_hdl != NULL); result = s1394_cmp_read((s1394_target_t *)t1394_hdl, reg, valp); - TNF_PROBE_0_DEBUG(t1394_cmp_read_exit, S1394_TNF_SL_CMP_STACK, ""); return (result); } @@ -1562,14 +1339,11 @@ t1394_cmp_cas(t1394_handle_t t1394_hdl, t1394_cmp_reg_t reg, uint32_t arg_val, { int result; - TNF_PROBE_0_DEBUG(t1394_cmp_read_enter, S1394_TNF_SL_CMP_STACK, ""); - ASSERT(t1394_hdl != NULL); result = s1394_cmp_cas((s1394_target_t *)t1394_hdl, reg, arg_val, new_val, old_valp); - TNF_PROBE_0_DEBUG(t1394_cmp_read_exit, S1394_TNF_SL_CMP_STACK, ""); return (result); } @@ -1609,9 +1383,6 @@ t1394_alloc_isoch_single(t1394_handle_t t1394_hdl, int ret; int err; - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_single_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_single_hdl != NULL); ASSERT(sii != NULL); @@ -1620,32 +1391,17 @@ t1394_alloc_isoch_single(t1394_handle_t t1394_hdl, /* Check for invalid channel_mask */ if (sii->si_channel_mask == 0) { - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid channel mask"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_single_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } /* Check for invalid bandwidth */ if ((sii->si_bandwidth <= IEEE1394_BANDWIDTH_MIN) || (sii->si_bandwidth > IEEE1394_BANDWIDTH_MAX)) { - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid bandwidth requirements"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_single_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } /* Verify that rsrc_fail_target() callback is non-NULL */ if (sii->rsrc_fail_target == NULL) { - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid callback specified"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_single_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -1705,25 +1461,16 @@ t1394_alloc_isoch_single(t1394_handle_t t1394_hdl, (t1394_isoch_cec_handle_t)cec_new, 0, &jii); if (ret != DDI_SUCCESS) { - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_join_isoch_cec()"); - ret = t1394_free_isoch_cec(t1394_hdl, flags, (t1394_isoch_cec_handle_t *)&cec_new); if (ret != DDI_SUCCESS) { /* Unable to free the Isoch CEC */ - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_free_isoch_cec()"); ASSERT(0); } /* Handle is nulled out before returning */ *t1394_single_hdl = NULL; - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_single_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -1734,10 +1481,6 @@ t1394_alloc_isoch_single(t1394_handle_t t1394_hdl, (t1394_isoch_cec_handle_t)cec_new, 0, &err); if (ret != DDI_SUCCESS) { - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_setup_isoch_cec()"); - *result = err; /* Leave the Isoch CEC */ @@ -1745,9 +1488,6 @@ t1394_alloc_isoch_single(t1394_handle_t t1394_hdl, (t1394_isoch_cec_handle_t)cec_new, 0); if (ret != DDI_SUCCESS) { /* Unable to leave the Isoch CEC */ - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_leave_isoch_cec()"); ASSERT(0); } @@ -1756,17 +1496,12 @@ t1394_alloc_isoch_single(t1394_handle_t t1394_hdl, (t1394_isoch_cec_handle_t *)&cec_new); if (ret != DDI_SUCCESS) { /* Unable to free the Isoch CEC */ - TNF_PROBE_1(t1394_alloc_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_free_isoch_cec()"); ASSERT(0); } /* Handle is nulled out before returning */ *t1394_single_hdl = NULL; - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_single_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -1778,8 +1513,6 @@ t1394_alloc_isoch_single(t1394_handle_t t1394_hdl, /* Update the handle */ *t1394_single_hdl = (t1394_isoch_single_handle_t)cec_new; - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_single_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -1805,9 +1538,6 @@ t1394_free_isoch_single(t1394_handle_t t1394_hdl, s1394_isoch_cec_t *cec_curr; int ret; - TNF_PROBE_0_DEBUG(t1394_free_isoch_single_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_single_hdl != NULL); @@ -1821,9 +1551,6 @@ t1394_free_isoch_single(t1394_handle_t t1394_hdl, (t1394_isoch_cec_handle_t)cec_curr, 0); if (ret != DDI_SUCCESS) { /* Unable to teardown the Isoch CEC */ - TNF_PROBE_1(t1394_free_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_teardown_isoch_cec()"); ASSERT(0); } @@ -1834,9 +1561,6 @@ t1394_free_isoch_single(t1394_handle_t t1394_hdl, (t1394_isoch_cec_handle_t)cec_curr, 0); if (ret != DDI_SUCCESS) { /* Unable to leave the Isoch CEC */ - TNF_PROBE_1(t1394_free_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_leave_isoch_cec()"); ASSERT(0); } @@ -1847,17 +1571,11 @@ t1394_free_isoch_single(t1394_handle_t t1394_hdl, (t1394_isoch_cec_handle_t *)&cec_curr); if (ret != DDI_SUCCESS) { /* Unable to free the Isoch CEC */ - TNF_PROBE_1(t1394_free_isoch_single_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unexpected error from t1394_free_isoch_cec()"); ASSERT(0); } /* Handle is nulled out before returning */ *t1394_single_hdl = NULL; - - TNF_PROBE_0_DEBUG(t1394_free_isoch_single_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -1885,9 +1603,6 @@ t1394_alloc_isoch_cec(t1394_handle_t t1394_hdl, t1394_isoch_cec_props_t *props, s1394_isoch_cec_t *cec_new; uint64_t temp; - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); ASSERT(props != NULL); @@ -1896,11 +1611,6 @@ t1394_alloc_isoch_cec(t1394_handle_t t1394_hdl, t1394_isoch_cec_props_t *props, /* Check for invalid channel_mask */ if (props->cec_channel_mask == 0) { - TNF_PROBE_1(t1394_alloc_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid channel mask"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -1909,21 +1619,11 @@ t1394_alloc_isoch_cec(t1394_handle_t t1394_hdl, t1394_isoch_cec_props_t *props, if (props->cec_options & T1394_NO_IRM_ALLOC) { /* If T1394_NO_IRM_ALLOC, then only one bit should be set */ if (!ISP2(temp)) { - TNF_PROBE_1(t1394_alloc_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid channel mask"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } /* If T1394_NO_IRM_ALLOC, then speeds should be equal */ if (props->cec_min_speed != props->cec_max_speed) { - TNF_PROBE_1(t1394_alloc_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid speeds (min != max)"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } @@ -1931,11 +1631,6 @@ t1394_alloc_isoch_cec(t1394_handle_t t1394_hdl, t1394_isoch_cec_props_t *props, /* Check for invalid bandwidth */ if ((props->cec_bandwidth <= IEEE1394_BANDWIDTH_MIN) || (props->cec_bandwidth > IEEE1394_BANDWIDTH_MAX)) { - TNF_PROBE_1(t1394_alloc_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid bandwidth requirements"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -1975,8 +1670,6 @@ t1394_alloc_isoch_cec(t1394_handle_t t1394_hdl, t1394_isoch_cec_props_t *props, /* Update the handle and return */ *t1394_isoch_cec_hdl = (t1394_isoch_cec_handle_t)cec_new; - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -2003,9 +1696,6 @@ t1394_free_isoch_cec(t1394_handle_t t1394_hdl, uint_t flags, s1394_hal_t *hal; s1394_isoch_cec_t *cec_curr; - TNF_PROBE_0_DEBUG(t1394_free_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); @@ -2021,11 +1711,6 @@ t1394_free_isoch_cec(t1394_handle_t t1394_hdl, uint_t flags, if (CEC_IN_ANY_CALLBACKS(cec_curr)) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_free_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to free Isoch CEC (in callbacks)"); - TNF_PROBE_0_DEBUG(t1394_free_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2033,11 +1718,6 @@ t1394_free_isoch_cec(t1394_handle_t t1394_hdl, uint_t flags, if (CEC_TRANSITION_LEGAL(cec_curr, ISOCH_CEC_FREE) == 0) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_free_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to free Isoch CEC"); - TNF_PROBE_0_DEBUG(t1394_free_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } mutex_exit(&cec_curr->isoch_cec_mutex); @@ -2059,8 +1739,6 @@ t1394_free_isoch_cec(t1394_handle_t t1394_hdl, uint_t flags, /* Update the handle and return */ *t1394_isoch_cec_hdl = NULL; - TNF_PROBE_0_DEBUG(t1394_free_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -2098,9 +1776,6 @@ t1394_join_isoch_cec(t1394_handle_t t1394_hdl, uint64_t check_mask; uint_t curr_max_speed; - TNF_PROBE_0_DEBUG(t1394_join_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); @@ -2127,11 +1802,6 @@ t1394_join_isoch_cec(t1394_handle_t t1394_hdl, kmem_free(member_new, sizeof (s1394_isoch_cec_member_t)); /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_join_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to join Isoch CEC"); - TNF_PROBE_0_DEBUG(t1394_join_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2142,11 +1812,6 @@ t1394_join_isoch_cec(t1394_handle_t t1394_hdl, kmem_free(member_new, sizeof (s1394_isoch_cec_member_t)); /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_join_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Inconsistent channel mask specified"); - TNF_PROBE_0_DEBUG(t1394_join_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2155,11 +1820,6 @@ t1394_join_isoch_cec(t1394_handle_t t1394_hdl, kmem_free(member_new, sizeof (s1394_isoch_cec_member_t)); /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_join_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Inconsistent speed specified"); - TNF_PROBE_0_DEBUG(t1394_join_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } else if (join_isoch_info->req_max_speed < cec_curr->filter_current_speed) { @@ -2174,11 +1834,6 @@ t1394_join_isoch_cec(t1394_handle_t t1394_hdl, kmem_free(member_new, sizeof (s1394_isoch_cec_member_t)); /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_join_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Multiple talkers specified"); - TNF_PROBE_0_DEBUG(t1394_join_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2191,11 +1846,6 @@ t1394_join_isoch_cec(t1394_handle_t t1394_hdl, (join_isoch_info->isoch_cec_evts.teardown_target == NULL))) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_join_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Invalid callbacks specified"); - TNF_PROBE_0_DEBUG(t1394_join_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2228,8 +1878,6 @@ t1394_join_isoch_cec(t1394_handle_t t1394_hdl, /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_0_DEBUG(t1394_join_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -2264,9 +1912,6 @@ t1394_leave_isoch_cec(t1394_handle_t t1394_hdl, uint64_t temp_channel_mask; uint_t temp_max_speed; - TNF_PROBE_0_DEBUG(t1394_leave_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); @@ -2289,11 +1934,6 @@ t1394_leave_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_TRANSITION_LEGAL(cec_curr, ISOCH_CEC_LEAVE) == 0) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_leave_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to leave Isoch CEC"); - TNF_PROBE_0_DEBUG(t1394_leave_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2320,11 +1960,6 @@ t1394_leave_isoch_cec(t1394_handle_t t1394_hdl, if (found == B_FALSE) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_leave_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Target not found in Isoch CEC member list"); - TNF_PROBE_0_DEBUG(t1394_leave_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } else { /* This member's departure may change filter constraints */ @@ -2358,8 +1993,6 @@ t1394_leave_isoch_cec(t1394_handle_t t1394_hdl, /* Free the Isoch CEC member structure */ kmem_free(member_temp, sizeof (s1394_isoch_cec_member_t)); - TNF_PROBE_0_DEBUG(t1394_leave_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -2403,9 +2036,6 @@ t1394_setup_isoch_cec(t1394_handle_t t1394_hdl, int (*setup_callback)(t1394_isoch_cec_handle_t, opaque_t, t1394_setup_target_args_t *); - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); @@ -2421,11 +2051,6 @@ t1394_setup_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_IN_ANY_CALLBACKS(cec_curr)) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_setup_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to setup Isoch CEC (in callbacks)"); - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2433,11 +2058,6 @@ t1394_setup_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_TRANSITION_LEGAL(cec_curr, ISOCH_CEC_SETUP) == 0) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_setup_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to setup Isoch CEC"); - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2481,11 +2101,6 @@ t1394_setup_isoch_cec(t1394_handle_t t1394_hdl, *result = T1394_ENO_BANDWIDTH; /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_setup_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, - msg, "Unable to allocate isoch bandwidth"); - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } } @@ -2566,21 +2181,11 @@ t1394_setup_isoch_cec(t1394_handle_t t1394_hdl, if (ret == DDI_FAILURE) { if (err == CMD1394_EBUSRESET) { continue; - } else { - TNF_PROBE_1(t1394_setup_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", - tnf_string, msg, - "Unable to free isoch bandwidth"); } } /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_setup_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to allocate isoch channel"); - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2596,11 +2201,6 @@ t1394_setup_isoch_cec(t1394_handle_t t1394_hdl, *result = T1394_ENO_BANDWIDTH; /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_setup_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to allocate isoch channel"); - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2657,16 +2257,9 @@ setup_do_callbacks: /* Return DDI_FAILURE if any targets failed setup */ if (*result != 0) { - TNF_PROBE_1(t1394_setup_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Target returned error in setup_target()"); - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(t1394_setup_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -2698,9 +2291,6 @@ t1394_start_isoch_cec(t1394_handle_t t1394_hdl, boolean_t err; int (*start_callback)(t1394_isoch_cec_handle_t, opaque_t); - TNF_PROBE_0_DEBUG(t1394_start_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); @@ -2714,11 +2304,6 @@ t1394_start_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_IN_ANY_CALLBACKS(cec_curr)) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_start_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to start Isoch CEC (in callbacks)"); - TNF_PROBE_0_DEBUG(t1394_start_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2726,11 +2311,6 @@ t1394_start_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_TRANSITION_LEGAL(cec_curr, ISOCH_CEC_START) == 0) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_start_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to start Isoch CEC"); - TNF_PROBE_0_DEBUG(t1394_start_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2781,16 +2361,9 @@ t1394_start_isoch_cec(t1394_handle_t t1394_hdl, /* Return DDI_FAILURE if any targets failed start */ if (err == B_TRUE) { - TNF_PROBE_1(t1394_start_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Target returned error in start_target()"); - TNF_PROBE_0_DEBUG(t1394_start_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } - TNF_PROBE_0_DEBUG(t1394_start_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -2822,9 +2395,6 @@ t1394_stop_isoch_cec(t1394_handle_t t1394_hdl, s1394_isoch_cec_member_t *member_curr; void (*stop_callback)(t1394_isoch_cec_handle_t, opaque_t); - TNF_PROBE_0_DEBUG(t1394_stop_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); @@ -2838,11 +2408,6 @@ t1394_stop_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_IN_ANY_CALLBACKS(cec_curr)) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_stop_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to stop Isoch CEC (in callbacks)"); - TNF_PROBE_0_DEBUG(t1394_stop_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2850,11 +2415,6 @@ t1394_stop_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_TRANSITION_LEGAL(cec_curr, ISOCH_CEC_STOP) == 0) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_stop_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to stop Isoch CEC"); - TNF_PROBE_0_DEBUG(t1394_stop_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2900,8 +2460,6 @@ t1394_stop_isoch_cec(t1394_handle_t t1394_hdl, /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_0_DEBUG(t1394_stop_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -2941,9 +2499,6 @@ t1394_teardown_isoch_cec(t1394_handle_t t1394_hdl, int err; void (*teardown_callback)(t1394_isoch_cec_handle_t, opaque_t); - TNF_PROBE_0_DEBUG(t1394_teardown_isoch_cec_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_isoch_cec_hdl != NULL); @@ -2959,11 +2514,6 @@ t1394_teardown_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_IN_ANY_CALLBACKS(cec_curr)) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_teardown_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to teardown Isoch CEC (in callbacks)"); - TNF_PROBE_0_DEBUG(t1394_teardown_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -2971,11 +2521,6 @@ t1394_teardown_isoch_cec(t1394_handle_t t1394_hdl, if (CEC_TRANSITION_LEGAL(cec_curr, ISOCH_CEC_TEARDOWN) == 0) { /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_1(t1394_teardown_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Not allowed to teardown Isoch CEC"); - TNF_PROBE_0_DEBUG(t1394_teardown_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_FAILURE); } @@ -3019,10 +2564,6 @@ t1394_teardown_isoch_cec(t1394_handle_t t1394_hdl, if (ret == DDI_FAILURE) { if (err == CMD1394_EBUSRESET) { goto teardown_do_callbacks; - } else { - TNF_PROBE_1(t1394_teardown_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to free allocated bandwidth"); } } @@ -3041,16 +2582,6 @@ t1394_teardown_isoch_cec(t1394_handle_t t1394_hdl, /* Lock the Isoch CEC member list */ mutex_enter(&cec_curr->isoch_cec_mutex); - if (ret == DDI_FAILURE) { - if (err == CMD1394_EBUSRESET) { - goto teardown_do_callbacks; - } else { - TNF_PROBE_1(t1394_teardown_isoch_cec_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "Unable to free allocated bandwidth"); - } - } - teardown_do_callbacks: /* From here on reallocation is unnecessary */ cec_curr->realloc_valid = B_FALSE; @@ -3100,8 +2631,6 @@ teardown_do_callbacks: /* Unlock the Isoch CEC member list */ mutex_exit(&cec_curr->isoch_cec_mutex); - TNF_PROBE_0_DEBUG(t1394_teardown_isoch_cec_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (DDI_SUCCESS); } @@ -3134,9 +2663,6 @@ t1394_alloc_isoch_dma(t1394_handle_t t1394_hdl, s1394_hal_t *hal; int ret; - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_dma_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(idi != NULL); ASSERT(t1394_idma_hdl != NULL); @@ -3147,12 +2673,6 @@ t1394_alloc_isoch_dma(t1394_handle_t t1394_hdl, /* Sanity check dma options. If talk enabled, listen should be off */ if ((idi->idma_options & ID1394_TALK) && (idi->idma_options != ID1394_TALK)) { - TNF_PROBE_1(t1394_alloc_isoch_dma_talk_conflict_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "conflicting idma options; talker and listener"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_dma_exit, - S1394_TNF_SL_ISOCH_STACK, ""); - *result = T1394_EIDMA_CONFLICT; return (DDI_FAILURE); } @@ -3160,12 +2680,6 @@ t1394_alloc_isoch_dma(t1394_handle_t t1394_hdl, /* Only one listen mode allowed */ if ((idi->idma_options & ID1394_LISTEN_PKT_MODE) && (idi->idma_options & ID1394_LISTEN_BUF_MODE)) { - TNF_PROBE_1(t1394_alloc_isoch_dma_listen_conflict_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "conflicting idma options; both listener modes set"); - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_dma_exit, - S1394_TNF_SL_ISOCH_STACK, ""); - *result = T1394_EIDMA_CONFLICT; return (DDI_FAILURE); } @@ -3175,16 +2689,11 @@ t1394_alloc_isoch_dma(t1394_handle_t t1394_hdl, (void **)t1394_idma_hdl, result); if (ret != DDI_SUCCESS) { - TNF_PROBE_1(t1394_alloc_isoch_dma_hal_error, - S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg, - "HAL alloc_isoch_dma error, maybe IXL compilation"); if (*result == IXL1394_ENO_DMA_RESRCS) { *result = T1394_EIDMA_NO_RESRCS; } } - TNF_PROBE_0_DEBUG(t1394_alloc_isoch_dma_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (ret); } @@ -3208,9 +2717,6 @@ t1394_free_isoch_dma(t1394_handle_t t1394_hdl, uint_t flags, { s1394_hal_t *hal; - TNF_PROBE_0_DEBUG(t1394_free_isoch_dma_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(*t1394_idma_hdl != NULL); @@ -3222,9 +2728,6 @@ t1394_free_isoch_dma(t1394_handle_t t1394_hdl, uint_t flags, /* Null out isoch handle */ *t1394_idma_hdl = NULL; - - TNF_PROBE_0_DEBUG(t1394_free_isoch_dma_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -3254,9 +2757,6 @@ t1394_start_isoch_dma(t1394_handle_t t1394_hdl, s1394_hal_t *hal; int ret; - TNF_PROBE_0_DEBUG(t1394_start_isoch_dma_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_idma_hdl != NULL); ASSERT(idma_ctrlinfo != NULL); @@ -3267,8 +2767,6 @@ t1394_start_isoch_dma(t1394_handle_t t1394_hdl, ret = HAL_CALL(hal).start_isoch_dma(hal->halinfo.hal_private, (void *)t1394_idma_hdl, idma_ctrlinfo, flags, result); - TNF_PROBE_0_DEBUG(t1394_start_isoch_dma_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (ret); } @@ -3293,9 +2791,6 @@ t1394_stop_isoch_dma(t1394_handle_t t1394_hdl, s1394_hal_t *hal; int result; - TNF_PROBE_0_DEBUG(t1394_stop_isoch_dma_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_idma_hdl != NULL); @@ -3304,9 +2799,6 @@ t1394_stop_isoch_dma(t1394_handle_t t1394_hdl, HAL_CALL(hal).stop_isoch_dma(hal->halinfo.hal_private, (void *)t1394_idma_hdl, &result); - - TNF_PROBE_0_DEBUG(t1394_stop_isoch_dma_exit, - S1394_TNF_SL_ISOCH_STACK, ""); } /* @@ -3337,9 +2829,6 @@ t1394_update_isoch_dma(t1394_handle_t t1394_hdl, s1394_hal_t *hal; int ret; - TNF_PROBE_0_DEBUG(t1394_update_isoch_dma_enter, - S1394_TNF_SL_ISOCH_STACK, ""); - ASSERT(t1394_hdl != NULL); ASSERT(t1394_idma_hdl != NULL); ASSERT(idma_updateinfo != NULL); @@ -3350,8 +2839,6 @@ t1394_update_isoch_dma(t1394_handle_t t1394_hdl, ret = HAL_CALL(hal).update_isoch_dma(hal->halinfo.hal_private, (void *)t1394_idma_hdl, idma_updateinfo, flags, result); - TNF_PROBE_0_DEBUG(t1394_update_isoch_dma_exit, - S1394_TNF_SL_ISOCH_STACK, ""); return (ret); } @@ -3372,10 +2859,6 @@ void t1394_initiate_bus_reset(t1394_handle_t t1394_hdl, uint_t flags) { s1394_hal_t *hal; - int ret; - - TNF_PROBE_0_DEBUG(t1394_initiate_bus_reset_enter, - S1394_TNF_SL_BR_STACK, ""); ASSERT(t1394_hdl != NULL); @@ -3384,23 +2867,10 @@ t1394_initiate_bus_reset(t1394_handle_t t1394_hdl, uint_t flags) /* Reset the bus */ if (hal->halinfo.phy == H1394_PHY_1394A) { - ret = HAL_CALL(hal).short_bus_reset(hal->halinfo.hal_private); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(t1394_initiate_bus_reset_error, - S1394_TNF_SL_ERROR, "", tnf_string, msg, - "Error initiating short bus reset"); - } + (void) HAL_CALL(hal).short_bus_reset(hal->halinfo.hal_private); } else { - ret = HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(t1394_initiate_bus_reset_error, - S1394_TNF_SL_ERROR, "", tnf_string, msg, - "Error initiating bus reset"); - } + (void) HAL_CALL(hal).bus_reset(hal->halinfo.hal_private); } - - TNF_PROBE_0_DEBUG(t1394_initiate_bus_reset_exit, - S1394_TNF_SL_BR_STACK, ""); } /* @@ -3429,9 +2899,6 @@ t1394_get_topology_map(t1394_handle_t t1394_hdl, uint_t bus_generation, uint32_t *tm_ptr; uint_t length; - TNF_PROBE_0_DEBUG(t1394_get_topology_map_enter, S1394_TNF_SL_CSR_STACK, - ""); - ASSERT(t1394_hdl != NULL); /* Find the HAL this target resides on */ @@ -3444,11 +2911,6 @@ t1394_get_topology_map(t1394_handle_t t1394_hdl, uint_t bus_generation, if (bus_generation != hal->generation_count) { /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_1(t1394_get_topology_map_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "Generation mismatch"); - TNF_PROBE_0_DEBUG(t1394_get_topology_map_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -3461,11 +2923,6 @@ t1394_get_topology_map(t1394_handle_t t1394_hdl, uint_t bus_generation, if (length > (uint_t)tm_length) { /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_1(t1394_get_topology_map_error, - S1394_TNF_SL_CSR_ERROR, "", tnf_string, msg, - "Buffer size too small"); - TNF_PROBE_0_DEBUG(t1394_get_topology_map_exit, - S1394_TNF_SL_CSR_STACK, ""); return (DDI_FAILURE); } @@ -3474,8 +2931,6 @@ t1394_get_topology_map(t1394_handle_t t1394_hdl, uint_t bus_generation, /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_0_DEBUG(t1394_get_topology_map_exit, S1394_TNF_SL_CSR_STACK, - ""); return (DDI_SUCCESS); } @@ -3499,11 +2954,8 @@ t1394_CRC16(uint32_t *d, size_t crc_length, uint_t flags) /* ANSI/IEEE Std 1212, 1994 - 8.1.5 */ uint_t ret; - TNF_PROBE_0_DEBUG(t1394_CRC16_enter, S1394_TNF_SL_STACK, ""); - ret = s1394_CRC16((uint_t *)d, (uint_t)crc_length); - TNF_PROBE_0_DEBUG(t1394_CRC16_exit, S1394_TNF_SL_STACK, ""); return (ret); } @@ -3539,9 +2991,6 @@ t1394_add_cfgrom_entry(t1394_handle_t t1394_hdl, uint_t size; uint32_t *buffer; - TNF_PROBE_0_DEBUG(t1394_add_cfgrom_entry_enter, - S1394_TNF_SL_CFGROM_STACK, ""); - ASSERT(t1394_hdl != NULL); target = (s1394_target_t *)t1394_hdl; @@ -3553,22 +3002,12 @@ t1394_add_cfgrom_entry(t1394_handle_t t1394_hdl, /* Check for a valid size */ if (size == 0) { *result = T1394_EINVALID_PARAM; - TNF_PROBE_1_DEBUG(t1394_add_cfgrom_entry_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Invalid size of Config ROM buffer (== 0)"); - TNF_PROBE_0_DEBUG(t1394_add_cfgrom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } /* Check for a valid key type */ if (((key << IEEE1212_KEY_VALUE_SHIFT) & IEEE1212_KEY_TYPE_MASK) == 0) { *result = T1394_EINVALID_PARAM; - TNF_PROBE_1_DEBUG(t1394_add_cfgrom_entry_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Invalid key_type in Config ROM key"); - TNF_PROBE_0_DEBUG(t1394_add_cfgrom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } @@ -3578,8 +3017,6 @@ t1394_add_cfgrom_entry(t1394_handle_t t1394_hdl, /* Is this on the interrupt stack? */ if (servicing_interrupt()) { *result = T1394_EINVALID_CONTEXT; - TNF_PROBE_0_DEBUG(t1394_add_cfgrom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } @@ -3593,11 +3030,6 @@ t1394_add_cfgrom_entry(t1394_handle_t t1394_hdl, *result = T1394_ECFGROM_FULL; mutex_exit(&hal->local_config_rom_mutex); - TNF_PROBE_1(t1394_add_cfgrom_entry_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Failed in s1394_add_cfgrom_entry()"); - TNF_PROBE_0_DEBUG(t1394_add_cfgrom_entry_exit, - "stacktrace 1394 s1394", ""); return (ret); } @@ -3612,8 +3044,6 @@ t1394_add_cfgrom_entry(t1394_handle_t t1394_hdl, mutex_exit(&hal->local_config_rom_mutex); } - TNF_PROBE_0_DEBUG(t1394_add_cfgrom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (ret); } @@ -3640,9 +3070,6 @@ t1394_rem_cfgrom_entry(t1394_handle_t t1394_hdl, uint_t flags, s1394_target_t *target; int ret; - TNF_PROBE_0_DEBUG(t1394_rem_cfgrom_entry_enter, - S1394_TNF_SL_CFGROM_STACK, ""); - ASSERT(t1394_hdl != NULL); target = (s1394_target_t *)t1394_hdl; @@ -3653,8 +3080,6 @@ t1394_rem_cfgrom_entry(t1394_handle_t t1394_hdl, uint_t flags, /* Is this on the interrupt stack? */ if (servicing_interrupt()) { *result = T1394_EINVALID_CONTEXT; - TNF_PROBE_0_DEBUG(t1394_rem_cfgrom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (DDI_FAILURE); } @@ -3665,11 +3090,6 @@ t1394_rem_cfgrom_entry(t1394_handle_t t1394_hdl, uint_t flags, result); if (ret != DDI_SUCCESS) { mutex_exit(&hal->local_config_rom_mutex); - TNF_PROBE_1(t1394_rem_cfgrom_entry_error, - S1394_TNF_SL_CFGROM_ERROR, "", tnf_string, msg, - "Failed in s1394_remove_cfgrom_entry()"); - TNF_PROBE_0_DEBUG(t1394_rem_cfgrom_entry_exit, - "stacktrace 1394 s1394", ""); return (ret); } @@ -3684,8 +3104,6 @@ t1394_rem_cfgrom_entry(t1394_handle_t t1394_hdl, uint_t flags, mutex_exit(&hal->local_config_rom_mutex); } - TNF_PROBE_0_DEBUG(t1394_rem_cfgrom_entry_exit, - S1394_TNF_SL_CFGROM_STACK, ""); return (ret); } @@ -3715,8 +3133,6 @@ t1394_get_targetinfo(t1394_handle_t t1394_hdl, uint_t bus_generation, uint_t from_node; uint_t to_node; - TNF_PROBE_0_DEBUG(t1394_get_targetinfo_enter, S1394_TNF_SL_STACK, ""); - ASSERT(t1394_hdl != NULL); /* Find the HAL this target resides on */ @@ -3731,10 +3147,6 @@ t1394_get_targetinfo(t1394_handle_t t1394_hdl, uint_t bus_generation, if (bus_generation != hal->generation_count) { /* Unlock the topology tree */ mutex_exit(&hal->topology_tree_mutex); - TNF_PROBE_3(t1394_get_targetinfo_error, S1394_TNF_SL_STACK, "", - tnf_string, msg, "Generation mismatch", - tnf_uint, gen, bus_generation, - tnf_uint, current_gen, hal->generation_count); return (DDI_FAILURE); } @@ -3747,8 +3159,6 @@ t1394_get_targetinfo(t1394_handle_t t1394_hdl, uint_t bus_generation, if (((target->target_state & S1394_TARG_GONE) != 0) || (target->on_node == NULL)) { targetinfo->target_nodeID = T1394_INVALID_NODEID; - TNF_PROBE_1_DEBUG(t1394_get_targetinfo_exit, - S1394_TNF_SL_STACK, "", tnf_string, msg, "No device"); } else { targetinfo->target_nodeID = (target->on_hal->node_id & IEEE1394_BUS_NUM_MASK) | @@ -3763,12 +3173,6 @@ t1394_get_targetinfo(t1394_handle_t t1394_hdl, uint_t bus_generation, /* Get current_max_payload */ s1394_get_maxpayload(target, &dev, &curr); targetinfo->current_max_payload = curr; - - TNF_PROBE_3_DEBUG(t1394_get_targetinfo_exit, - S1394_TNF_SL_STACK, "", - tnf_uint, payload, targetinfo->current_max_payload, - tnf_uint, speed, targetinfo->current_max_speed, - tnf_uint, nodeid, targetinfo->target_nodeID); } rw_exit(&hal->target_list_rwlock); diff --git a/usr/src/uts/common/io/1394/t1394_errmsg.c b/usr/src/uts/common/io/1394/t1394_errmsg.c index 1dc85807d8..4c9632bc05 100644 --- a/usr/src/uts/common/io/1394/t1394_errmsg.c +++ b/usr/src/uts/common/io/1394/t1394_errmsg.c @@ -24,16 +24,12 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * t1394_errmsg.c * Utility function that targets can use to convert an error code into a * printable string. */ -#include <sys/tnf_probe.h> - #include <sys/1394/t1394.h> #include <sys/1394/s1394.h> #include <sys/1394/cmd1394.h> @@ -151,14 +147,7 @@ t1394_errmsg(int result, uint_t flags) int err; const char *msg = T1394_ERRMSG_EMPTY_STRING; - TNF_PROBE_1_DEBUG(t1394_errmsg_enter, S1394_TNF_SL_STACK, "", - tnf_int, argument, result); - if (result > 0) { - TNF_PROBE_2(t1394_errmsg, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "invalid result argument", - tnf_int, result, result); - TNF_PROBE_0_DEBUG(t1394_errmsg_exit, S1394_TNF_SL_STACK, ""); return (T1394_ERRMSG_EMPTY_STRING); } @@ -187,13 +176,7 @@ t1394_errmsg(int result, uint_t flags) (result <= -T1394_ECFG_LAST)) { err = result - (-T1394_ECFG_FIRST); msg = cfgrom_error_string[err]; - } else { - TNF_PROBE_2(t1394_errmsg, S1394_TNF_SL_ERROR, "", - tnf_string, msg, "invalid result argument", - tnf_int, result, result); } - TNF_PROBE_0_DEBUG(t1394_errmsg_exit, S1394_TNF_SL_STACK, ""); - return (msg); } diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394.c b/usr/src/uts/common/io/1394/targets/av1394/av1394.c index 9fd4c9896e..833b190f5f 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394.c @@ -120,21 +120,10 @@ static struct modlinkage av1394_modlinkage = { static void *av1394_statep; -#ifndef NPROBE -extern int tnf_mod_load(void); -extern int tnf_mod_unload(struct modlinkage *mlp); -#endif - #define AV1394_INST2STATE(inst) (ddi_get_soft_state(av1394_statep, inst)) #define AV1394_DEV2STATE(dev) \ (ddi_get_soft_state(av1394_statep, AV1394_DEV2INST(dev))) -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_INST_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_INST_STACK, ""); - /* * * --- DDI/DKI entry points @@ -145,22 +134,13 @@ _init(void) { int error; -#ifndef NPROBE - (void) tnf_mod_load(); -#endif error = ddi_soft_state_init(&av1394_statep, sizeof (av1394_inst_t), 1); if (error != 0) { -#ifndef NPROBE - (void) tnf_mod_unload(&av1394_modlinkage); -#endif return (error); } if ((error = mod_install(&av1394_modlinkage)) != 0) { ddi_soft_state_fini(&av1394_statep); -#ifndef NPROBE - (void) tnf_mod_unload(&av1394_modlinkage); -#endif } return (error); @@ -173,9 +153,6 @@ _fini(void) if ((error = mod_remove(&av1394_modlinkage)) == 0) { ddi_soft_state_fini(&av1394_statep); -#ifndef NPROBE - (void) tnf_mod_unload(&av1394_modlinkage); -#endif } return (error); @@ -196,8 +173,6 @@ av1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) int instance = ddi_get_instance(dip); av1394_inst_t *avp; - AV1394_TNF_ENTER(av1394_attach); - switch (cmd) { case DDI_ATTACH: break; @@ -207,21 +182,16 @@ av1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) } return (av1394_cpr_resume(avp)); default: - AV1394_TNF_EXIT(av1394_attach); return (DDI_FAILURE); } if (ddi_soft_state_zalloc(av1394_statep, instance) != 0) { - TNF_PROBE_0(av1394_attach_error_soft_state_zalloc, - AV1394_TNF_INST_ERROR, ""); - AV1394_TNF_EXIT(av1394_attach); return (DDI_FAILURE); } avp = AV1394_INST2STATE(instance); if (av1394_t1394_attach(avp, dip) != DDI_SUCCESS) { av1394_cleanup(avp, 1); - AV1394_TNF_EXIT(av1394_attach); return (DDI_FAILURE); } @@ -235,19 +205,16 @@ av1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) if (av1394_add_events(avp) != DDI_SUCCESS) { av1394_cleanup(avp, 2); - AV1394_TNF_EXIT(av1394_attach); return (DDI_FAILURE); } if (av1394_isoch_attach(avp) != DDI_SUCCESS) { av1394_cleanup(avp, 3); - AV1394_TNF_EXIT(av1394_attach); return (DDI_FAILURE); } if (av1394_async_attach(avp) != DDI_SUCCESS) { av1394_cleanup(avp, 4); - AV1394_TNF_EXIT(av1394_attach); return (DDI_FAILURE); } @@ -257,7 +224,6 @@ av1394_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) ddi_report_dev(dip); - AV1394_TNF_EXIT(av1394_attach); return (DDI_SUCCESS); } @@ -267,24 +233,17 @@ av1394_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) int instance = ddi_get_instance(dip); av1394_inst_t *avp; - AV1394_TNF_ENTER(av1394_detach); - if ((avp = AV1394_INST2STATE(instance)) == NULL) { - TNF_PROBE_0(av1394_detach_error_instance, - AV1394_TNF_INST_ERROR, ""); - AV1394_TNF_EXIT(av1394_detach); return (DDI_FAILURE); } switch (cmd) { case DDI_DETACH: av1394_cleanup(avp, AV1394_CLEANUP_LEVEL_MAX); - AV1394_TNF_EXIT(av1394_detach); return (DDI_SUCCESS); case DDI_SUSPEND: return (av1394_cpr_suspend(avp)); default: - AV1394_TNF_EXIT(av1394_detach); return (DDI_FAILURE); } } @@ -323,7 +282,6 @@ av1394_open(dev_t *dev, int flag, int otyp, cred_t *cr) av1394_inst_t *avp = AV1394_DEV2STATE(*dev); int ret = ENXIO; - AV1394_TNF_ENTER(av1394_open); if (avp != NULL) { if (AV1394_DEV_IS_ISOCH(*dev)) { ret = 0; @@ -331,7 +289,6 @@ av1394_open(dev_t *dev, int flag, int otyp, cred_t *cr) ret = av1394_async_open(avp, flag); } } - AV1394_TNF_EXIT(av1394_open); return (ret); } @@ -342,7 +299,6 @@ av1394_close(dev_t dev, int flag, int otyp, cred_t *cr) av1394_inst_t *avp = AV1394_DEV2STATE(dev); int ret = ENXIO; - AV1394_TNF_ENTER(av1394_close); if (avp != NULL) { if (AV1394_DEV_IS_ISOCH(dev)) { ret = av1394_isoch_close(avp, flag); @@ -350,7 +306,6 @@ av1394_close(dev_t dev, int flag, int otyp, cred_t *cr) ret = av1394_async_close(avp, flag); } } - AV1394_TNF_EXIT(av1394_close); return (ret); } @@ -361,7 +316,6 @@ av1394_read(dev_t dev, struct uio *uiop, cred_t *cr) av1394_inst_t *avp = AV1394_DEV2STATE(dev); int ret = ENXIO; - AV1394_TNF_ENTER(av1394_read); if (avp != NULL) { if (AV1394_DEV_IS_ISOCH(dev)) { ret = av1394_isoch_read(avp, uiop); @@ -369,7 +323,6 @@ av1394_read(dev_t dev, struct uio *uiop, cred_t *cr) ret = av1394_async_read(avp, uiop); } } - AV1394_TNF_EXIT(av1394_read); return (ret); } @@ -380,7 +333,6 @@ av1394_write(dev_t dev, struct uio *uiop, cred_t *cr) av1394_inst_t *avp = AV1394_DEV2STATE(dev); int ret = ENXIO; - AV1394_TNF_ENTER(av1394_write); if (avp != NULL) { if (AV1394_DEV_IS_ISOCH(dev)) { ret = av1394_isoch_write(avp, uiop); @@ -388,7 +340,6 @@ av1394_write(dev_t dev, struct uio *uiop, cred_t *cr) ret = av1394_async_write(avp, uiop); } } - AV1394_TNF_EXIT(av1394_write); return (ret); } @@ -399,7 +350,6 @@ av1394_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *cr, int *rvalp) av1394_inst_t *avp = AV1394_DEV2STATE(dev); int ret = ENXIO; - AV1394_TNF_ENTER(av1394_ioctl); if (avp != NULL) { if (AV1394_DEV_IS_ISOCH(dev)) { ret = av1394_isoch_ioctl(avp, cmd, arg, mode, rvalp); @@ -407,7 +357,6 @@ av1394_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *cr, int *rvalp) ret = av1394_async_ioctl(avp, cmd, arg, mode, rvalp); } } - AV1394_TNF_EXIT(av1394_ioctl); return (ret); } @@ -419,11 +368,9 @@ av1394_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, av1394_inst_t *avp = AV1394_DEV2STATE(dev); int ret = ENXIO; - AV1394_TNF_ENTER(av1394_devmap); if ((avp != NULL) && (AV1394_DEV_IS_ISOCH(dev))) { ret = av1394_isoch_devmap(avp, dhp, off, len, maplen, model); } - AV1394_TNF_EXIT(av1394_devmap); return (ret); } @@ -434,11 +381,9 @@ av1394_poll(dev_t dev, short events, int anyyet, short *reventsp, av1394_inst_t *avp = AV1394_DEV2STATE(dev); int ret = ENXIO; - AV1394_TNF_ENTER(av1394_poll); if ((avp != NULL) && AV1394_DEV_IS_ASYNC(dev)) { ret = av1394_async_poll(avp, events, anyyet, reventsp, phpp); } - AV1394_TNF_EXIT(av1394_poll); return (ret); } @@ -455,7 +400,6 @@ av1394_cleanup(av1394_inst_t *avp, int level) { ASSERT((level > 0) && (level <= AV1394_CLEANUP_LEVEL_MAX)); - AV1394_TNF_ENTER(av1394_cleanup); switch (level) { default: av1394_async_detach(avp); @@ -473,7 +417,6 @@ av1394_cleanup(av1394_inst_t *avp, int level) case 1: ddi_soft_state_free(av1394_statep, avp->av_instance); } - AV1394_TNF_EXIT(av1394_cleanup); } static int @@ -481,28 +424,16 @@ av1394_t1394_attach(av1394_inst_t *avp, dev_info_t *dip) { int ret; - AV1394_TNF_ENTER(av1394_t1394_attach); - ret = t1394_attach(dip, T1394_VERSION_V1, 0, &avp->av_attachinfo, &avp->av_t1394_hdl); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_t1394_attach_error, AV1394_TNF_INST_ERROR, - "", tnf_int, ret, ret); - } - - AV1394_TNF_EXIT(av1394_t1394_attach); return (ret); } static void av1394_t1394_detach(av1394_inst_t *avp) { - AV1394_TNF_ENTER(av1394_t1394_detach); - (void) t1394_detach(&avp->av_t1394_hdl, 0); - - AV1394_TNF_EXIT(av1394_t1394_detach); } static int @@ -512,29 +443,21 @@ av1394_add_events(av1394_inst_t *avp) if (ddi_get_eventcookie(avp->av_dip, DDI_DEVI_BUS_RESET_EVENT, &br_evc) != DDI_SUCCESS) { - TNF_PROBE_0(av1394_add_events_error_bus_reset_cookie, - AV1394_TNF_INST_ERROR, ""); return (DDI_FAILURE); } if (ddi_add_event_handler(avp->av_dip, br_evc, av1394_bus_reset, avp, &avp->av_reset_cb) != DDI_SUCCESS) { - TNF_PROBE_0(av1394_add_events_error_bus_reset_event, - AV1394_TNF_INST_ERROR, ""); return (DDI_FAILURE); } if (ddi_get_eventcookie(avp->av_dip, DDI_DEVI_REMOVE_EVENT, &rem_evc) != DDI_SUCCESS) { (void) ddi_remove_event_handler(avp->av_reset_cb); - TNF_PROBE_0(av1394_add_events_error_remove_cookie, - AV1394_TNF_INST_ERROR, ""); return (DDI_FAILURE); } if (ddi_add_event_handler(avp->av_dip, rem_evc, av1394_disconnect, avp, &avp->av_remove_cb) != DDI_SUCCESS) { (void) ddi_remove_event_handler(avp->av_reset_cb); - TNF_PROBE_0(av1394_add_events_error_remove_event, - AV1394_TNF_INST_ERROR, ""); return (DDI_FAILURE); } @@ -542,16 +465,12 @@ av1394_add_events(av1394_inst_t *avp) &ins_evc) != DDI_SUCCESS) { (void) ddi_remove_event_handler(avp->av_remove_cb); (void) ddi_remove_event_handler(avp->av_reset_cb); - TNF_PROBE_0(av1394_add_events_error_insert_cookie, - AV1394_TNF_INST_ERROR, ""); return (DDI_FAILURE); } if (ddi_add_event_handler(avp->av_dip, ins_evc, av1394_reconnect, avp, &avp->av_insert_cb) != DDI_SUCCESS) { (void) ddi_remove_event_handler(avp->av_remove_cb); (void) ddi_remove_event_handler(avp->av_reset_cb); - TNF_PROBE_0(av1394_add_events_error_insert_event, - AV1394_TNF_INST_ERROR, ""); return (DDI_FAILURE); } @@ -589,8 +508,6 @@ av1394_cpr_suspend(av1394_inst_t *avp) { int ret; - AV1394_TNF_ENTER(av1394_cpr_suspend); - ret = av1394_isoch_cpr_suspend(avp); if (ret == DDI_SUCCESS) { @@ -600,7 +517,6 @@ av1394_cpr_suspend(av1394_inst_t *avp) mutex_exit(&avp->av_mutex); } - AV1394_TNF_EXIT(av1394_cpr_suspend); return (ret); } @@ -610,15 +526,12 @@ av1394_cpr_suspend(av1394_inst_t *avp) static int av1394_cpr_resume(av1394_inst_t *avp) { - AV1394_TNF_ENTER(av1394_cpr_resume); - mutex_enter(&avp->av_mutex); avp->av_dev_state = avp->av_prev_dev_state; mutex_exit(&avp->av_mutex); (void) av1394_async_cpr_resume(avp); - AV1394_TNF_EXIT(av1394_cpr_resume); return (DDI_SUCCESS); } @@ -633,10 +546,7 @@ av1394_bus_reset(dev_info_t *dip, ddi_eventcookie_t evc, void *arg, void *data) { av1394_inst_t *avp = arg; - AV1394_TNF_ENTER(av1394_bus_reset); - if (avp == NULL) { - AV1394_TNF_EXIT(av1394_bus_reset); return; } @@ -646,8 +556,6 @@ av1394_bus_reset(dev_info_t *dip, ddi_eventcookie_t evc, void *arg, void *data) av1394_async_bus_reset(avp); av1394_cmp_bus_reset(avp); - - AV1394_TNF_EXIT(av1394_bus_reset); } /*ARGSUSED*/ @@ -656,18 +564,13 @@ av1394_disconnect(dev_info_t *dip, ddi_eventcookie_t evc, void *arg, void *data) { av1394_inst_t *avp = arg; - AV1394_TNF_ENTER(av1394_disconnect); - if (avp == NULL) { - AV1394_TNF_EXIT(av1394_disconnect); return; } mutex_enter(&avp->av_mutex); avp->av_dev_state = AV1394_DEV_DISCONNECTED; mutex_exit(&avp->av_mutex); - - AV1394_TNF_EXIT(av1394_disconnect); } /*ARGSUSED*/ @@ -676,10 +579,7 @@ av1394_reconnect(dev_info_t *dip, ddi_eventcookie_t evc, void *arg, void *data) { av1394_inst_t *avp = arg; - AV1394_TNF_ENTER(av1394_disconnect); - if (avp == NULL) { - AV1394_TNF_EXIT(av1394_disconnect); return; } @@ -689,6 +589,4 @@ av1394_reconnect(dev_info_t *dip, ddi_eventcookie_t evc, void *arg, void *data) mutex_exit(&avp->av_mutex); av1394_async_reconnect(avp); - - AV1394_TNF_EXIT(av1394_disconnect); } diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_async.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_async.c index 31b6e33344..86a0f553f0 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_async.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_async.c @@ -48,12 +48,6 @@ static void av1394_async_putbq(av1394_queue_t *, mblk_t *); static int av1394_ioctl_arq_get_ibuf_size(av1394_inst_t *, void *, int); static int av1394_ioctl_arq_set_ibuf_size(av1394_inst_t *, void *, int); -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_ASYNC_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_ASYNC_STACK, ""); - /* tunables */ int av1394_ibuf_size_default = 64 * 1024; /* default ibuf size */ int av1394_ibuf_size_max = 1024 * 1024; /* max ibuf size */ @@ -69,47 +63,36 @@ av1394_async_attach(av1394_inst_t *avp) av1394_async_t *ap = &avp->av_a; ddi_iblock_cookie_t ibc = avp->av_attachinfo.iblock_cookie; - AV1394_TNF_ENTER(av1394_async_attach); - mutex_init(&ap->a_mutex, NULL, MUTEX_DRIVER, ibc); av1394_initq(&ap->a_rq, ibc, av1394_ibuf_size_default); if (av1394_fcp_attach(avp) != DDI_SUCCESS) { av1394_async_cleanup(avp, 1); - AV1394_TNF_EXIT(av1394_async_attach); return (DDI_FAILURE); } if (av1394_cfgrom_init(avp) != DDI_SUCCESS) { av1394_async_cleanup(avp, 2); - AV1394_TNF_EXIT(av1394_async_attach); return (DDI_FAILURE); } if (av1394_async_create_minor_node(avp) != DDI_SUCCESS) { av1394_async_cleanup(avp, 3); - AV1394_TNF_EXIT(av1394_async_attach); return (DDI_FAILURE); } if (av1394_async_update_targetinfo(avp) != DDI_SUCCESS) { av1394_async_cleanup(avp, 4); - AV1394_TNF_EXIT(av1394_async_attach); return (DDI_FAILURE); } - AV1394_TNF_EXIT(av1394_async_attach); return (DDI_SUCCESS); } void av1394_async_detach(av1394_inst_t *avp) { - AV1394_TNF_ENTER(av1394_async_detach); - av1394_async_cleanup(avp, AV1394_CLEANUP_LEVEL_MAX); - - AV1394_TNF_EXIT(av1394_async_detach); } void @@ -118,8 +101,6 @@ av1394_async_bus_reset(av1394_inst_t *avp) av1394_async_t *ap = &avp->av_a; mblk_t *bp; - AV1394_TNF_ENTER(av1394_async_bus_reset); - (void) av1394_async_update_targetinfo(avp); mutex_enter(&ap->a_mutex); @@ -130,15 +111,10 @@ av1394_async_bus_reset(av1394_inst_t *avp) mutex_exit(&ap->a_mutex); /* queue up a bus reset message */ - if ((bp = allocb(1, BPRI_HI)) == NULL) { - TNF_PROBE_0(av1394_async_bus_reset_error_allocb, - AV1394_TNF_ASYNC_ERROR, ""); - } else { + if ((bp = allocb(1, BPRI_HI)) != NULL) { DB_TYPE(bp) = AV1394_M_BUS_RESET; av1394_async_putq_rq(avp, bp); } - - AV1394_TNF_EXIT(av1394_async_bus_reset); } int @@ -146,22 +122,15 @@ av1394_async_cpr_resume(av1394_inst_t *avp) { int ret; - AV1394_TNF_ENTER(av1394_async_cpr_resume); - ret = av1394_async_update_targetinfo(avp); - AV1394_TNF_EXIT(av1394_async_cpr_resume); return (ret); } void av1394_async_reconnect(av1394_inst_t *avp) { - AV1394_TNF_ENTER(av1394_async_reconnect); - (void) av1394_async_update_targetinfo(avp); - - AV1394_TNF_EXIT(av1394_async_reconnect); } int @@ -169,8 +138,6 @@ av1394_async_open(av1394_inst_t *avp, int flag) { av1394_async_t *ap = &avp->av_a; - AV1394_TNF_ENTER(av1394_async_open); - mutex_enter(&ap->a_mutex); if (ap->a_nopen == 0) { ap->a_pollevents = 0; @@ -179,7 +146,6 @@ av1394_async_open(av1394_inst_t *avp, int flag) ap->a_oflag = flag; mutex_exit(&ap->a_mutex); - AV1394_TNF_EXIT(av1394_async_open); return (0); } @@ -189,8 +155,6 @@ av1394_async_close(av1394_inst_t *avp, int flag) { av1394_async_t *ap = &avp->av_a; - AV1394_TNF_ENTER(av1394_async_close); - av1394_cfgrom_close(avp); av1394_flushq(&ap->a_rq); @@ -200,7 +164,6 @@ av1394_async_close(av1394_inst_t *avp, int flag) ap->a_pollevents = 0; mutex_exit(&ap->a_mutex); - AV1394_TNF_EXIT(av1394_async_close); return (0); } @@ -215,8 +178,6 @@ av1394_async_read(av1394_inst_t *avp, struct uio *uiop) int dbtype; int len; - AV1394_TNF_ENTER(av1394_async_read); - /* copyout as much as we can */ while ((uiop->uio_resid > 0) && (ret == 0)) { /* @@ -225,7 +186,6 @@ av1394_async_read(av1394_inst_t *avp, struct uio *uiop) */ if ((mp = av1394_getq(q)) == NULL) { if (ap->a_oflag & FNDELAY) { - AV1394_TNF_EXIT(av1394_async_read); return (EAGAIN); } if (av1394_qwait_sig(q) <= 0) { @@ -285,7 +245,6 @@ av1394_async_read(av1394_inst_t *avp, struct uio *uiop) } } - AV1394_TNF_EXIT(av1394_async_read); return (0); } @@ -295,8 +254,6 @@ av1394_async_write(av1394_inst_t *avp, struct uio *uiop) iec61883_arq_t arq; int ret; - AV1394_TNF_ENTER(av1394_async_write); - /* all data should arrive in ARQ format */ while (uiop->uio_resid >= sizeof (arq)) { if ((ret = uiomove(&arq, sizeof (arq), UIO_WRITE, uiop)) != 0) { @@ -316,7 +273,6 @@ av1394_async_write(av1394_inst_t *avp, struct uio *uiop) } } - AV1394_TNF_EXIT(av1394_async_write); return (ret); } @@ -327,8 +283,6 @@ av1394_async_ioctl(av1394_inst_t *avp, int cmd, intptr_t arg, int mode, { int ret = EINVAL; - AV1394_TNF_ENTER(av1394_async_ioctl); - switch (cmd) { case IEC61883_ARQ_GET_IBUF_SIZE: ret = av1394_ioctl_arq_get_ibuf_size(avp, (void *)arg, mode); @@ -346,7 +300,6 @@ av1394_async_ioctl(av1394_inst_t *avp, int cmd, intptr_t arg, int mode, ret = av1394_ioctl_node_get_text_leaf(avp, (void *)arg, mode); } - AV1394_TNF_EXIT(av1394_async_ioctl); return (ret); } @@ -357,8 +310,6 @@ av1394_async_poll(av1394_inst_t *avp, short events, int anyyet, short *reventsp, av1394_async_t *ap = &avp->av_a; av1394_queue_t *rq = &ap->a_rq; - AV1394_TNF_ENTER(av1394_async_poll); - if (events & (POLLIN | POLLET)) { if ((events & POLLIN) && av1394_peekq(rq)) { *reventsp |= POLLIN; @@ -374,7 +325,6 @@ av1394_async_poll(av1394_inst_t *avp, short events, int anyyet, short *reventsp, } } - AV1394_TNF_EXIT(av1394_async_poll); return (0); } @@ -389,8 +339,6 @@ av1394_async_putq_rq(av1394_inst_t *avp, mblk_t *mp) if (!av1394_putq(&ap->a_rq, mp)) { freemsg(mp); - TNF_PROBE_0(av1394_async_putq_rq_error_putq, - AV1394_TNF_ASYNC_ERROR, ""); } else { mutex_enter(&ap->a_mutex); if (ap->a_pollevents & POLLIN) { @@ -445,10 +393,6 @@ av1394_async_create_minor_node(av1394_inst_t *avp) ret = ddi_create_minor_node(avp->av_dip, "async", S_IFCHR, AV1394_ASYNC_INST2MINOR(avp->av_instance), DDI_NT_AV_ASYNC, 0); - if (ret != DDI_SUCCESS) { - TNF_PROBE_0(av1394_async_create_minor_node_error, - AV1394_TNF_ASYNC_ERROR, ""); - } return (ret); } @@ -511,8 +455,6 @@ av1394_async_putbq(av1394_queue_t *q, mblk_t *mp) { if (!av1394_putbq(q, mp)) { freemsg(mp); - TNF_PROBE_0(av1394_async_putbq_error, - AV1394_TNF_ASYNC_ERROR, ""); } } @@ -524,15 +466,12 @@ av1394_ioctl_arq_get_ibuf_size(av1394_inst_t *avp, void *arg, int mode) int sz; int ret = 0; - AV1394_TNF_ENTER(av1394_ioctl_arq_get_ibuf_size); - sz = av1394_getmaxq(&ap->a_rq); if (ddi_copyout(&sz, arg, sizeof (sz), mode) != 0) { ret = EFAULT; } - AV1394_TNF_EXIT(av1394_ioctl_arq_get_ibuf_size); return (ret); } @@ -544,8 +483,6 @@ av1394_ioctl_arq_set_ibuf_size(av1394_inst_t *avp, void *arg, int mode) int sz; int ret = 0; - AV1394_TNF_ENTER(av1394_ioctl_arq_set_ibuf_size); - sz = (int)(intptr_t)arg; if ((sz < 0) || (sz > av1394_ibuf_size_max)) { @@ -554,6 +491,5 @@ av1394_ioctl_arq_set_ibuf_size(av1394_inst_t *avp, void *arg, int mode) av1394_setmaxq(&ap->a_rq, sz); } - AV1394_TNF_EXIT(av1394_ioctl_arq_set_ibuf_size); return (ret); } diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_cfgrom.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_cfgrom.c index a8804d1f7e..4640010db2 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_cfgrom.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_cfgrom.c @@ -53,23 +53,14 @@ static int av1394_cfgrom_rq(av1394_inst_t *, cmd1394_cmd_t *, goto catch; \ } -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_ASYNC_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_ASYNC_STACK, ""); - int av1394_cfgrom_init(av1394_inst_t *avp) { av1394_cfgrom_t *crp = &avp->av_a.a_cfgrom; ddi_iblock_cookie_t ibc = avp->av_attachinfo.iblock_cookie; - AV1394_TNF_ENTER(av1394_cfgrom_init); - rw_init(&crp->cr_rwlock, NULL, RW_DRIVER, ibc); - AV1394_TNF_EXIT(av1394_cfgrom_init); return (DDI_SUCCESS); } @@ -78,11 +69,7 @@ av1394_cfgrom_fini(av1394_inst_t *avp) { av1394_cfgrom_t *crp = &avp->av_a.a_cfgrom; - AV1394_TNF_ENTER(av1394_cfgrom_fini); - rw_destroy(&crp->cr_rwlock); - - AV1394_TNF_EXIT(av1394_cfgrom_fini); } void @@ -90,15 +77,11 @@ av1394_cfgrom_close(av1394_inst_t *avp) { av1394_cfgrom_t *crp = &avp->av_a.a_cfgrom; - AV1394_TNF_ENTER(av1394_cfgrom_close); - rw_enter(&crp->cr_rwlock, RW_WRITER); if (crp->cr_parsed) { av1394_cfgrom_unparse_rom(avp); } rw_exit(&crp->cr_rwlock); - - AV1394_TNF_EXIT(av1394_cfgrom_close); } int @@ -109,11 +92,8 @@ av1394_ioctl_node_get_bus_name(av1394_inst_t *avp, void *arg, int mode) int err; int ret = 0; - AV1394_TNF_ENTER(av1394_ioctl_node_get_bus_name); - err = t1394_alloc_cmd(avp->av_t1394_hdl, 0, &cmd); if (err != DDI_SUCCESS) { - AV1394_TNF_EXIT(av1394_ioctl_node_get_bus_name); return (ENOMEM); } @@ -127,7 +107,6 @@ av1394_ioctl_node_get_bus_name(av1394_inst_t *avp, void *arg, int mode) err = t1394_free_cmd(avp->av_t1394_hdl, 0, &cmd); ASSERT(err == DDI_SUCCESS); - AV1394_TNF_EXIT(av1394_ioctl_node_get_bus_name); return (ret); } @@ -140,11 +119,8 @@ av1394_ioctl_node_get_uid(av1394_inst_t *avp, void *arg, int mode) int err; int ret = 0; - AV1394_TNF_ENTER(av1394_ioctl_node_get_uid); - err = t1394_alloc_cmd(avp->av_t1394_hdl, 0, &cmd); if (err != DDI_SUCCESS) { - AV1394_TNF_EXIT(av1394_ioctl_node_get_uid); return (ENOMEM); } @@ -160,7 +136,6 @@ catch: err = t1394_free_cmd(avp->av_t1394_hdl, 0, &cmd); ASSERT(err == DDI_SUCCESS); - AV1394_TNF_EXIT(av1394_ioctl_node_get_uid); return (ret); } @@ -180,13 +155,10 @@ av1394_ioctl_node_get_text_leaf(av1394_inst_t *avp, void *arg, int mode) uint32_t spec, lang_id, desc_entry; int ret = 0; - AV1394_TNF_ENTER(av1394_ioctl_node_get_text_leaf); - /* copyin arguments */ #ifdef _MULTI_DATAMODEL if (ddi_model_convert_from(mode & FMODELS) == DDI_MODEL_ILP32) { if (ddi_copyin(arg, &tl32, sizeof (tl32), mode) != 0) { - AV1394_TNF_EXIT(av1394_ioctl_node_get_text_leaf); return (EFAULT); } n = tl32.tl_num; @@ -194,7 +166,6 @@ av1394_ioctl_node_get_text_leaf(av1394_inst_t *avp, void *arg, int mode) } else { #endif if (ddi_copyin(arg, &tl, sizeof (tl), mode) != 0) { - AV1394_TNF_EXIT(av1394_ioctl_node_get_text_leaf); return (EFAULT); } n = tl.tl_num; @@ -214,7 +185,6 @@ av1394_ioctl_node_get_text_leaf(av1394_inst_t *avp, void *arg, int mode) ret = av1394_cfgrom_parse_rom(avp); if (ret != 0) { rw_exit(&crp->cr_rwlock); - AV1394_TNF_EXIT(av1394_ioctl_node_get_text_leaf); return (ret); } } @@ -232,7 +202,6 @@ av1394_ioctl_node_get_text_leaf(av1394_inst_t *avp, void *arg, int mode) ret = av1394_cfgrom_read_leaf(avp, pd->pd_tl[n].tl_addr, &bp); if (ret != 0) { rw_exit(&crp->cr_rwlock); - AV1394_TNF_EXIT(av1394_ioctl_node_get_text_leaf); return (ret); } leaf_len = MBLKL(bp) / 4 - 2; @@ -283,7 +252,6 @@ av1394_ioctl_node_get_text_leaf(av1394_inst_t *avp, void *arg, int mode) freemsg(bp); - AV1394_TNF_EXIT(av1394_ioctl_node_get_text_leaf); return (ret); } @@ -495,7 +463,6 @@ av1394_cfgrom_read_leaf(av1394_inst_t *avp, uint64_t leaf_addr, mblk_t **bpp) err = t1394_alloc_cmd(avp->av_t1394_hdl, 0, &cmd); if (err != DDI_SUCCESS) { - AV1394_TNF_EXIT(av1394_ioctl_node_get_text_leaf); return (ENOMEM); } @@ -510,8 +477,6 @@ av1394_cfgrom_read_leaf(av1394_inst_t *avp, uint64_t leaf_addr, mblk_t **bpp) } if ((bp = allocb(leaf_len * 4, BPRI_HI)) == NULL) { - TNF_PROBE_0(aav1394_cfgrom_read_leaf_error_allocb, - AV1394_TNF_ASYNC_ERROR, ""); return (ENOMEM); } @@ -555,9 +520,6 @@ av1394_cfgrom_rq(av1394_inst_t *avp, cmd1394_cmd_t *cmd, uint64_t addr, *rval = cmd->cmd_u.q.quadlet_data; return (0); } else { - TNF_PROBE_2(av1394_cfgrom_rq_error, - AV1394_TNF_ASYNC_ERROR, "", tnf_int, err, err, - tnf_int, result, cmd->cmd_result); return (EIO); } } diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_cmp.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_cmp.c index 38efe58da5..9ec3fdb897 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_cmp.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_cmp.c @@ -61,13 +61,6 @@ static int av1394_pcr_remote_read(av1394_inst_t *, int, uint32_t *); static int av1394_pcr_remote_cas(av1394_inst_t *, int, uint32_t *, uint32_t, uint32_t); -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_CMP_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_CMP_STACK, ""); - - int av1394_cmp_init(av1394_inst_t *avp) { @@ -75,26 +68,19 @@ av1394_cmp_init(av1394_inst_t *avp) ddi_iblock_cookie_t ibc = avp->av_attachinfo.iblock_cookie; int ret; - AV1394_TNF_ENTER(av1394_cmp_init); - ret = t1394_cmp_register(avp->av_t1394_hdl, NULL, 0); if (ret == DDI_SUCCESS) { rw_init(&cmp->cmp_pcr_rwlock, NULL, RW_DRIVER, ibc); } - AV1394_TNF_EXIT(av1394_cmp_init); return (ret); } void av1394_cmp_fini(av1394_inst_t *avp) { - AV1394_TNF_ENTER(av1394_cmp_fini); - av1394_cmp_cleanup(avp); - - AV1394_TNF_EXIT(av1394_cmp_fini); } void @@ -103,8 +89,6 @@ av1394_cmp_bus_reset(av1394_inst_t *avp) av1394_cmp_t *cmp = &avp->av_i.i_cmp; int i; - AV1394_TNF_ENTER(av1394_cmp_bus_reset); - /* reset PCR values */ rw_enter(&cmp->cmp_pcr_rwlock, RW_WRITER); for (i = 0; i < NELEM(cmp->cmp_pcr); i++) { @@ -122,8 +106,6 @@ av1394_cmp_bus_reset(av1394_inst_t *avp) } } rw_exit(&cmp->cmp_pcr_rwlock); - - AV1394_TNF_EXIT(av1394_cmp_bus_reset); } /* @@ -490,8 +472,6 @@ av1394_pcr_alloc_addr(av1394_inst_t *avp, uint64_t addr, int ret; int result; - AV1394_TNF_ENTER(av1394_pcr_addr_alloc); - bzero(&aa, sizeof (aa)); aa.aa_address = addr; aa.aa_length = 4; @@ -502,14 +482,10 @@ av1394_pcr_alloc_addr(av1394_inst_t *avp, uint64_t addr, aa.aa_arg = avp; ret = t1394_alloc_addr(avp->av_t1394_hdl, &aa, 0, &result); - if (ret != DDI_SUCCESS) { - TNF_PROBE_2(av1394_pcr_alloc_addr_error, AV1394_TNF_CMP_ERROR, - "", tnf_int, ret, ret, tnf_int, result, result); - } else { + if (ret == DDI_SUCCESS) { *hdlp = aa.aa_hdl; } - AV1394_TNF_EXIT(av1394_pcr_addr_alloc); return (ret); } @@ -519,13 +495,7 @@ av1394_pcr_alloc_addr(av1394_inst_t *avp, uint64_t addr, static void av1394_pcr_free_addr(av1394_inst_t *avp, t1394_addr_handle_t *hdlp) { - int ret; - - ret = t1394_free_addr(avp->av_t1394_hdl, hdlp, 0); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_pcr_free_addr_error, AV1394_TNF_CMP_ERROR, - "", tnf_int, ret, ret); - } + (void) t1394_free_addr(avp->av_t1394_hdl, hdlp, 0); } /* @@ -641,9 +611,6 @@ av1394_pcr_recv_read_request(cmd1394_cmd_t *req) av1394_cmp_t *cmp = &avp->av_i.i_cmp; int idx; /* PCR index */ av1394_pcr_t *pcr; - int err; - - AV1394_TNF_ENTER(av1394_pcr_recv_read_request); idx = (req->cmd_addr - AV1394_PCR_ADDR_START) / 4; @@ -661,13 +628,7 @@ av1394_pcr_recv_read_request(cmd1394_cmd_t *req) req->cmd_result = IEEE1394_RESP_COMPLETE; } - err = t1394_recv_request_done(avp->av_t1394_hdl, req, 0); - if (err != DDI_SUCCESS) { - TNF_PROBE_1(av1394_pcr_recv_read_request_done_error, - AV1394_TNF_CMP_ERROR, "", tnf_int, err, err); - } - - AV1394_TNF_EXIT(av1394_pcr_recv_read_request); + (void) t1394_recv_request_done(avp->av_t1394_hdl, req, 0); } static void @@ -677,9 +638,6 @@ av1394_pcr_recv_lock_request(cmd1394_cmd_t *req) av1394_cmp_t *cmp = &avp->av_i.i_cmp; int idx; /* PCR index */ av1394_pcr_t *pcr; - int err; - - AV1394_TNF_ENTER(av1394_pcr_recv_lock_request); idx = (req->cmd_addr - AV1394_PCR_ADDR_START) / 4; @@ -701,14 +659,7 @@ av1394_pcr_recv_lock_request(cmd1394_cmd_t *req) req->cmd_result = IEEE1394_RESP_COMPLETE; } - err = t1394_recv_request_done(avp->av_t1394_hdl, req, 0); - if (err != DDI_SUCCESS) { - TNF_PROBE_2(av1394_pcr_recv_lock_request_done_error, - AV1394_TNF_CMP_ERROR, "", tnf_int, err, err, - tnf_int, result, req->cmd_result); - } - - AV1394_TNF_EXIT(av1394_pcr_recv_lock_request); + (void) t1394_recv_request_done(avp->av_t1394_hdl, req, 0); } @@ -738,8 +689,6 @@ av1394_pcr_remote_read(av1394_inst_t *avp, int ph, uint32_t *valp) (cmd->cmd_result == CMD1394_CMDSUCCESS)) { *valp = cmd->cmd_u.q.quadlet_data; } else { - TNF_PROBE_2(av1394_pcr_remote_read_error, AV1394_TNF_CMP_ERROR, - "", tnf_int, err, err, tnf_int, result, cmd->cmd_result); ret = EIO; } @@ -777,8 +726,6 @@ av1394_pcr_remote_cas(av1394_inst_t *avp, int ph, uint32_t *old_valuep, (cmd->cmd_result == CMD1394_CMDSUCCESS)) { *old_valuep = cmd->cmd_u.l32.old_value; } else { - TNF_PROBE_2(av1394_pcr_remote_cas_error, AV1394_TNF_CMP_ERROR, - "", tnf_int, err, err, tnf_int, result, cmd->cmd_result); ret = EIO; } diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_fcp.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_fcp.c index a551bad1db..090ad0b762 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_fcp.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_fcp.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * av1394 FCP module */ @@ -54,12 +52,6 @@ static void av1394_fcp_common_write_request_cb(cmd1394_cmd_t *, int); static int av1394_fcp_copyin_block(iec61883_arq_t *, mblk_t *, struct uio *); -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_FCP_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_FCP_STACK, ""); - /* * * --- configuration entry points @@ -71,32 +63,26 @@ av1394_fcp_attach(av1394_inst_t *avp) av1394_fcp_t *fcp = &avp->av_a.a_fcp; int ret; - AV1394_TNF_ENTER(av1394_fcp_attach); - /* register FCP controller */ if ((ret = av1394_fcp_ctl_register(avp)) != DDI_SUCCESS) { - AV1394_TNF_EXIT(av1394_fcp_attach); return (ret); } /* allocate FCP controller command */ if ((ret = av1394_fcp_ctl_alloc_cmd(avp)) != DDI_SUCCESS) { av1394_fcp_cleanup(avp, 1); - AV1394_TNF_EXIT(av1394_fcp_attach); return (ret); } /* register FCP target */ if ((ret = av1394_fcp_tgt_register(avp)) != DDI_SUCCESS) { av1394_fcp_cleanup(avp, 2); - AV1394_TNF_EXIT(av1394_fcp_attach); return (ret); } /* allocate FCP target command */ if ((ret = av1394_fcp_tgt_alloc_cmd(avp)) != DDI_SUCCESS) { av1394_fcp_cleanup(avp, 3); - AV1394_TNF_EXIT(av1394_fcp_attach); return (ret); } @@ -105,18 +91,13 @@ av1394_fcp_attach(av1394_inst_t *avp) cv_init(&fcp->fcp_resp.fc_xmit_cv, NULL, CV_DRIVER, NULL); cv_init(&fcp->fcp_resp.fc_busy_cv, NULL, CV_DRIVER, NULL); - AV1394_TNF_EXIT(av1394_fcp_attach); return (ret); } void av1394_fcp_detach(av1394_inst_t *avp) { - AV1394_TNF_ENTER(av1394_fcp_detach); - av1394_fcp_cleanup(avp, AV1394_CLEANUP_LEVEL_MAX); - - AV1394_TNF_EXIT(av1394_fcp_detach); } int @@ -130,29 +111,22 @@ av1394_fcp_write(av1394_inst_t *avp, iec61883_arq_t *arq, struct uio *uiop) mblk_t *mp = NULL; int ret; - AV1394_TNF_ENTER(av1394_fcp_write); - ASSERT((arq->arq_type == IEC61883_ARQ_FCP_CMD) || (arq->arq_type == IEC61883_ARQ_FCP_RESP)); /* check arguments */ if ((len == 0) || (len > AV1394_FCP_ARQ_LEN_MAX) || (len % IEEE1394_QUADLET != 0)) { - TNF_PROBE_1(av1394_fcp_write_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, len, len); - AV1394_TNF_EXIT(av1394_fcp_write); return (EINVAL); } /* block write requires an mblk */ if (len > IEEE1394_QUADLET) { if ((mp = allocb(len, BPRI_HI)) == NULL) { - AV1394_TNF_EXIT(av1394_fcp_write); return (ENOMEM); } if ((ret = av1394_fcp_copyin_block(arq, mp, uiop)) != 0) { freemsg(mp); - AV1394_TNF_EXIT(av1394_fcp_write); return (ret); } } @@ -167,7 +141,6 @@ av1394_fcp_write(av1394_inst_t *avp, iec61883_arq_t *arq, struct uio *uiop) if (cv_wait_sig(&fc->fc_busy_cv, &ap->a_mutex) == 0) { mutex_exit(&ap->a_mutex); freemsg(mp); - AV1394_TNF_EXIT(av1394_fcp_write); return (EINTR); } } @@ -194,7 +167,6 @@ av1394_fcp_write(av1394_inst_t *avp, iec61883_arq_t *arq, struct uio *uiop) freemsg(mp); - AV1394_TNF_EXIT(av1394_fcp_write); return (ret); } @@ -213,10 +185,6 @@ av1394_fcp_ctl_register(av1394_inst_t *avp) evts.fcp_arg = avp; ret = t1394_fcp_register_controller(avp->av_t1394_hdl, &evts, 0); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_fcp_ctl_register_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret); - } return (ret); } @@ -230,10 +198,6 @@ av1394_fcp_tgt_register(av1394_inst_t *avp) evts.fcp_arg = avp; ret = t1394_fcp_register_target(avp->av_t1394_hdl, &evts, 0); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_fcp_tgt_register_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret); - } return (ret); } @@ -245,10 +209,6 @@ av1394_fcp_ctl_alloc_cmd(av1394_inst_t *avp) ret = t1394_alloc_cmd(avp->av_t1394_hdl, T1394_ALLOC_CMD_FCP_COMMAND, &fc->fc_cmd); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_fcp_ctl_alloc_cmd_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret); - } return (ret); } @@ -256,13 +216,8 @@ static void av1394_fcp_ctl_free_cmd(av1394_inst_t *avp) { av1394_fcp_cmd_t *fc = &avp->av_a.a_fcp.fcp_cmd; - int ret; - ret = t1394_free_cmd(avp->av_t1394_hdl, 0, &fc->fc_cmd); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_fcp_ctl_free_cmd_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret); - } + (void) t1394_free_cmd(avp->av_t1394_hdl, 0, &fc->fc_cmd); } static int @@ -273,10 +228,6 @@ av1394_fcp_tgt_alloc_cmd(av1394_inst_t *avp) ret = t1394_alloc_cmd(avp->av_t1394_hdl, T1394_ALLOC_CMD_FCP_RESPONSE, &fc->fc_cmd); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_fcp_tgt_alloc_cmd_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret); - } return (ret); } @@ -284,13 +235,8 @@ static void av1394_fcp_tgt_free_cmd(av1394_inst_t *avp) { av1394_fcp_cmd_t *fc = &avp->av_a.a_fcp.fcp_resp; - int ret; - ret = t1394_free_cmd(avp->av_t1394_hdl, 0, &fc->fc_cmd); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_fcp_tgt_free_cmd_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret); - } + (void) t1394_free_cmd(avp->av_t1394_hdl, 0, &fc->fc_cmd); } static void @@ -346,9 +292,6 @@ av1394_fcp_cmd_write_sync(av1394_inst_t *avp, av1394_fcp_cmd_t *fc) /* immediate error? */ if (ret != DDI_SUCCESS) { fc->fc_xmit = B_FALSE; - TNF_PROBE_2(av1394_fcp_cmd_write_sync_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret, - tnf_int, cmd_result, cmd->cmd_result); return (EIO); } @@ -360,9 +303,6 @@ av1394_fcp_cmd_write_sync(av1394_inst_t *avp, av1394_fcp_cmd_t *fc) } if (cmd->cmd_result != CMD1394_CMDSUCCESS) { - TNF_PROBE_1(av1394_fcp_cmd_write_sync_error, - AV1394_TNF_FCP_ERROR, "", - tnf_int, cmd_result, cmd->cmd_result); if (cmd->cmd_result == CMD1394_EDEVICE_BUSY) { return (EBUSY); } else { @@ -381,8 +321,6 @@ av1394_fcp_cmd_completion_cb(struct cmd1394_cmd *cmd) av1394_fcp_t *fcp = &ap->a_fcp; av1394_fcp_cmd_t *fc; - AV1394_TNF_ENTER(av1394_fcp_cmd_completion_cb); - mutex_enter(&ap->a_mutex); /* is this FCP command or response */ if (cmd == fcp->fcp_cmd.fc_cmd) { @@ -396,8 +334,6 @@ av1394_fcp_cmd_completion_cb(struct cmd1394_cmd *cmd) fc->fc_xmit = B_FALSE; cv_signal(&fc->fc_xmit_cv); mutex_exit(&ap->a_mutex); - - AV1394_TNF_EXIT(av1394_fcp_cmd_completion_cb); } /* @@ -410,22 +346,18 @@ av1394_fcp_resp_write_request_cb(cmd1394_cmd_t *req) av1394_inst_t *avp = req->cmd_callback_arg; av1394_async_t *ap = &avp->av_a; - AV1394_TNF_ENTER(av1394_fcp_resp_write_request_cb); - mutex_enter(&ap->a_mutex); if ((ap->a_nopen == 0) || (req->bus_generation != ap->a_bus_generation) || (req->nodeID != ap->a_targetinfo.target_nodeID)) { mutex_exit(&ap->a_mutex); - AV1394_TNF_EXIT(av1394_fcp_resp_write_request_cb); return (T1394_REQ_UNCLAIMED); } mutex_exit(&ap->a_mutex); av1394_fcp_common_write_request_cb(req, AV1394_M_FCP_RESP); - AV1394_TNF_EXIT(av1394_fcp_resp_write_request_cb); return (T1394_REQ_CLAIMED); } @@ -439,20 +371,16 @@ av1394_fcp_cmd_write_request_cb(cmd1394_cmd_t *req) av1394_inst_t *avp = req->cmd_callback_arg; av1394_async_t *ap = &avp->av_a; - AV1394_TNF_ENTER(av1394_fcp_cmd_write_request_cb); - mutex_enter(&ap->a_mutex); if (ap->a_nopen == 0) { mutex_exit(&ap->a_mutex); - AV1394_TNF_EXIT(av1394_fcp_cmd_write_request_cb); return (T1394_REQ_UNCLAIMED); } mutex_exit(&ap->a_mutex); av1394_fcp_common_write_request_cb(req, AV1394_M_FCP_CMD); - AV1394_TNF_EXIT(av1394_fcp_cmd_write_request_cb); return (T1394_REQ_CLAIMED); } @@ -462,9 +390,6 @@ av1394_fcp_common_write_request_cb(cmd1394_cmd_t *req, int mtype) av1394_inst_t *avp = req->cmd_callback_arg; mblk_t *mp; uint32_t quadlet_data; - int err; - - AV1394_TNF_ENTER(av1394_fcp_common_write_request_cb); ASSERT((req->cmd_type == CMD1394_ASYNCH_WR_QUAD) || (req->cmd_type == CMD1394_ASYNCH_WR_BLOCK)); @@ -480,21 +405,12 @@ av1394_fcp_common_write_request_cb(cmd1394_cmd_t *req, int mtype) /* complete request */ req->cmd_result = IEEE1394_RESP_COMPLETE; - err = t1394_recv_request_done(avp->av_t1394_hdl, req, 0); - if (err != DDI_SUCCESS) { - TNF_PROBE_2(av1394_fcp_common_write_request_cb_done_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, err, err, - tnf_int, result, req->cmd_result); - } + (void) t1394_recv_request_done(avp->av_t1394_hdl, req, 0); /* allocate mblk and copy quadlet into it */ if (req->cmd_type == CMD1394_ASYNCH_WR_QUAD) { mp = allocb(IEEE1394_QUADLET, BPRI_HI); if (mp == NULL) { - TNF_PROBE_0( - av1394_fcp_common_write_request_cb_allocb_error, - AV1394_TNF_FCP_ERROR, ""); - AV1394_TNF_EXIT(av1394_fcp_common_write_request_cb); return; } *(uint32_t *)mp->b_rptr = quadlet_data; @@ -504,8 +420,6 @@ av1394_fcp_common_write_request_cb(cmd1394_cmd_t *req, int mtype) /* queue up the data */ DB_TYPE(mp) = mtype; av1394_async_putq_rq(avp, mp); - - AV1394_TNF_EXIT(av1394_fcp_common_write_request_cb); } /* @@ -532,8 +446,6 @@ av1394_fcp_copyin_block(iec61883_arq_t *arq, mblk_t *mp, struct uio *uiop) if (copylen > 0) { ret = uiomove(mp->b_wptr, copylen, UIO_WRITE, uiop); if (ret != 0) { - TNF_PROBE_1(av1394_fcp_copyin_block_error, - AV1394_TNF_FCP_ERROR, "", tnf_int, ret, ret); return (ret); } mp->b_wptr += copylen; diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch.c index 8e05ffcf9b..9a16a26454 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch.c @@ -72,27 +72,18 @@ int av1394_isoch_autorecv_framesz = 250; int av1394_isoch_autoxmit_nframes = 50; int av1394_isoch_autoxmit_framesz = 250; -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_ISOCH_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_ISOCH_STACK, ""); - int av1394_isoch_attach(av1394_inst_t *avp) { av1394_isoch_t *ip = &avp->av_i; ddi_iblock_cookie_t ibc = avp->av_attachinfo.iblock_cookie; - AV1394_TNF_ENTER(av1394_isoch_attach); - mutex_init(&ip->i_mutex, NULL, MUTEX_DRIVER, ibc); mutex_enter(&ip->i_mutex); if (av1394_isoch_create_minor_node(avp) != DDI_SUCCESS) { mutex_exit(&ip->i_mutex); av1394_isoch_cleanup(avp, 1); - AV1394_TNF_EXIT(av1394_isoch_attach); return (DDI_FAILURE); } @@ -100,32 +91,25 @@ av1394_isoch_attach(av1394_inst_t *avp) 0, 0, av1394_isoch_softintr, (caddr_t)avp) != DDI_SUCCESS) { mutex_exit(&ip->i_mutex); av1394_isoch_cleanup(avp, 2); - AV1394_TNF_EXIT(av1394_isoch_attach); return (DDI_FAILURE); } if (av1394_cmp_init(avp) != DDI_SUCCESS) { mutex_exit(&ip->i_mutex); av1394_isoch_cleanup(avp, 3); - AV1394_TNF_EXIT(av1394_isoch_attach); return (DDI_FAILURE); } av1394_as_init(&ip->i_mmap_as); mutex_exit(&ip->i_mutex); - AV1394_TNF_EXIT(av1394_isoch_attach); return (DDI_SUCCESS); } void av1394_isoch_detach(av1394_inst_t *avp) { - AV1394_TNF_ENTER(av1394_isoch_detach); - av1394_isoch_cleanup(avp, AV1394_CLEANUP_LEVEL_MAX); - - AV1394_TNF_EXIT(av1394_isoch_detach); } int @@ -136,8 +120,6 @@ av1394_isoch_cpr_suspend(av1394_inst_t *avp) int i; int ret = DDI_SUCCESS; - AV1394_TNF_ENTER(av1394_isoch_cpr_suspend); - /* * suspend only if there are no active channels */ @@ -154,7 +136,6 @@ av1394_isoch_cpr_suspend(av1394_inst_t *avp) } mutex_exit(&ip->i_mutex); - AV1394_TNF_EXIT(av1394_isoch_cpr_suspend); return (ret); } @@ -164,12 +145,9 @@ av1394_isoch_close(av1394_inst_t *avp, int flag) { int ret; - AV1394_TNF_ENTER(av1394_isoch_close); - ret = av1394_ic_close(avp, flag); av1394_cmp_close(avp); - AV1394_TNF_EXIT(av1394_isoch_close); return (ret); } @@ -179,13 +157,10 @@ av1394_isoch_read(av1394_inst_t *avp, struct uio *uiop) av1394_ic_t *icp; int ret; - AV1394_TNF_ENTER(av1394_isoch_read); - /* use broadcast channel */ icp = avp->av_i.i_ic[63]; if (icp == NULL) { if ((ret = av1394_isoch_autorecv_init(avp, &icp)) != 0) { - AV1394_TNF_EXIT(av1394_isoch_read); return (ret); } } else if (icp->ic_dir != AV1394_IR) { @@ -197,7 +172,6 @@ av1394_isoch_read(av1394_inst_t *avp, struct uio *uiop) ret = av1394_ir_read(icp, uiop); } - AV1394_TNF_EXIT(av1394_isoch_read); return (ret); } @@ -207,24 +181,19 @@ av1394_isoch_write(av1394_inst_t *avp, struct uio *uiop) av1394_ic_t *icp; int ret; - AV1394_TNF_ENTER(av1394_isoch_write); - /* use broadcast channel */ icp = avp->av_i.i_ic[63]; if (icp == NULL) { if ((ret = av1394_isoch_autoxmit_init(avp, &icp, uiop)) != 0) { - AV1394_TNF_EXIT(av1394_isoch_write); return (ret); } } else if (icp->ic_dir != AV1394_IT) { /* channel already used for recv */ - AV1394_TNF_EXIT(av1394_isoch_write); return (EBUSY); } ret = av1394_it_write(icp, uiop); - AV1394_TNF_EXIT(av1394_isoch_write); return (ret); } @@ -278,14 +247,11 @@ av1394_isoch_devmap(av1394_inst_t *avp, devmap_cookie_t dhp, offset_t off, { av1394_isoch_seg_t *isp; - AV1394_TNF_ENTER(av1394_isoch_devmap); - *maplen = 0; /* find segment */ isp = av1394_isoch_find_seg(avp, off, ptob(btopr(len))); if (isp == NULL) { - AV1394_TNF_EXIT(av1394_isoch_devmap); return (EINVAL); } @@ -293,14 +259,10 @@ av1394_isoch_devmap(av1394_inst_t *avp, devmap_cookie_t dhp, offset_t off, if (devmap_umem_setup(dhp, avp->av_dip, &av1394_isoch_devmap_ops, isp->is_umem_cookie, 0, isp->is_umem_size, PROT_ALL, 0, &avp->av_attachinfo.acc_attr) != 0) { - TNF_PROBE_0(av1394_isoch_devmap_error_umem_setup, - AV1394_TNF_ISOCH_ERROR, ""); - AV1394_TNF_EXIT(av1394_isoch_devmap); return (EINVAL); } *maplen = isp->is_umem_size; - AV1394_TNF_EXIT(av1394_isoch_devmap); return (0); } @@ -319,10 +281,6 @@ av1394_isoch_create_minor_node(av1394_inst_t *avp) ret = ddi_create_minor_node(avp->av_dip, "isoch", S_IFCHR, AV1394_ISOCH_INST2MINOR(avp->av_instance), DDI_NT_AV_ISOCH, 0); - if (ret != DDI_SUCCESS) { - TNF_PROBE_0(av1394_isoch_create_minor_node_error, - AV1394_TNF_ISOCH_ERROR, ""); - } return (ret); } @@ -393,8 +351,6 @@ av1394_isoch_find_seg(av1394_inst_t *avp, offset_t off, size_t len) icp = NULL; } if (icp == NULL) { - TNF_PROBE_0(av1394_isoch_find_seg_error_nochan, - AV1394_TNF_ISOCH_ERROR, ""); return (NULL); } @@ -410,15 +366,11 @@ av1394_isoch_find_seg(av1394_inst_t *avp, offset_t off, size_t len) isp = NULL; } if (isp == NULL) { - TNF_PROBE_0(av1394_isoch_find_seg_error_noseg, - AV1394_TNF_ISOCH_ERROR, ""); return (NULL); } /* only whole segments can be mapped */ if (len != isp->is_umem_size) { - TNF_PROBE_0(av1394_isoch_devmap_error_whole, - AV1394_TNF_ISOCH_ERROR, ""); return (NULL); } return (isp); @@ -433,8 +385,6 @@ av1394_isoch_autorecv_init(av1394_inst_t *avp, av1394_ic_t **icpp) iec61883_isoch_init_t ii; int ret = 0; - AV1394_TNF_ENTER(av1394_isoch_autorecv_init); - bzero(&ii, sizeof (ii)); ii.ii_version = IEC61883_V1_0; ii.ii_pkt_size = 512; @@ -446,7 +396,6 @@ av1394_isoch_autorecv_init(av1394_inst_t *avp, av1394_ic_t **icpp) ret = av1394_ic_init(avp, &ii, icpp); - AV1394_TNF_EXIT(av1394_isoch_autorecv_init); return (ret); } @@ -462,13 +411,9 @@ av1394_isoch_autoxmit_init(av1394_inst_t *avp, av1394_ic_t **icpp, uint_t fmt, dbs, fn, f5060, stype; /* CIP fields */ int ret = 0; - AV1394_TNF_ENTER(av1394_isoch_autoxmit_init); - /* copyin the first CIP header */ axp->ax_copy_ciph = B_FALSE; if (uiop->uio_resid < AV1394_CIPSZ) { - TNF_PROBE_0_DEBUG(av1394_isoch_autoxmit_init_error_cipsz, - AV1394_TNF_ISOCH_ERROR, ""); return (EINVAL); } ret = uiomove(axp->ax_ciph, AV1394_CIPSZ, UIO_WRITE, uiop); @@ -519,7 +464,6 @@ av1394_isoch_autoxmit_init(av1394_inst_t *avp, av1394_ic_t **icpp, ret = av1394_ic_init(avp, &ii, icpp); - AV1394_TNF_EXIT(av1394_isoch_autoxmit_init); return (ret); } @@ -541,17 +485,13 @@ av1394_ioctl_isoch_init(av1394_inst_t *avp, void *arg, int mode) av1394_ic_t *icp; int ret; - AV1394_TNF_ENTER(av1394_ioctl_isoch_init); - if (ddi_copyin(arg, &ii, sizeof (ii), mode) != 0) { - AV1394_TNF_EXIT(av1394_ioctl_isoch_init); return (EFAULT); } ret = av1394_ic_init(avp, &ii, &icp); if (ret != 0) { - AV1394_TNF_EXIT(av1394_ioctl_isoch_init); #ifdef _MULTI_DATAMODEL if (ddi_model_convert_from(mode & FMODELS) == DDI_MODEL_ILP32) { bcopy(&ii, &ii32, sizeof (ii32)); @@ -575,11 +515,9 @@ av1394_ioctl_isoch_init(av1394_inst_t *avp, void *arg, int mode) #endif ret = ddi_copyout(&ii, arg, sizeof (ii), mode); if (ret != 0) { - AV1394_TNF_EXIT(av1394_ioctl_isoch_init); return (ENOMEM); } - AV1394_TNF_EXIT(av1394_ioctl_isoch_init); return (ret); } @@ -590,14 +528,8 @@ av1394_ioctl_isoch_handle2ic(av1394_inst_t *avp, void *arg) av1394_isoch_t *ip = &avp->av_i; if (num >= NELEM(ip->i_ic)) { - TNF_PROBE_0(av1394_ioctl_isoch_handle2ic_error_range, - AV1394_TNF_ISOCH_ERROR, ""); return (NULL); } - if (ip->i_ic[num] == NULL) { - TNF_PROBE_0(av1394_ioctl_isoch_handle2ic_error_null, - AV1394_TNF_ISOCH_ERROR, ""); - } return (ip->i_ic[num]); } @@ -607,13 +539,10 @@ av1394_ioctl_isoch_fini(av1394_inst_t *avp, void *arg, int mode) { av1394_ic_t *icp; - AV1394_TNF_ENTER(av1394_ioctl_isoch_fini); - if ((icp = av1394_ioctl_isoch_handle2ic(avp, arg)) != NULL) { av1394_ic_fini(icp); } - AV1394_TNF_EXIT(av1394_ioctl_isoch_fini); return (0); } @@ -624,13 +553,10 @@ av1394_ioctl_start(av1394_inst_t *avp, void *arg, int mode) av1394_ic_t *icp; int ret = EINVAL; - AV1394_TNF_ENTER(av1394_ioctl_start); - if ((icp = av1394_ioctl_isoch_handle2ic(avp, arg)) != NULL) { ret = av1394_ic_start(icp); } - AV1394_TNF_EXIT(av1394_ioctl_start); return (ret); } @@ -641,13 +567,10 @@ av1394_ioctl_stop(av1394_inst_t *avp, void *arg, int mode) av1394_ic_t *icp; int ret = EINVAL; - AV1394_TNF_ENTER(av1394_ioctl_stop); - if ((icp = av1394_ioctl_isoch_handle2ic(avp, arg)) != NULL) { ret = av1394_ic_stop(icp); } - AV1394_TNF_EXIT(av1394_ioctl_stop); return (ret); } @@ -666,15 +589,9 @@ av1394_ioctl_recv(av1394_inst_t *avp, void *arg, int mode) } num = recv.rx_handle; if (num >= NELEM(ip->i_ic)) { - TNF_PROBE_0(av1394_ioctl_recv_error_range, - AV1394_TNF_ISOCH_ERROR, ""); return (EINVAL); } icp = ip->i_ic[num]; - if (icp == NULL) { - TNF_PROBE_0(av1394_ioctl_recv_error_null, - AV1394_TNF_ISOCH_ERROR, ""); - } /* now call the actual handler */ if (icp->ic_dir != AV1394_IR) { @@ -708,15 +625,9 @@ av1394_ioctl_xmit(av1394_inst_t *avp, void *arg, int mode) } num = xmit.tx_handle; if (num >= NELEM(ip->i_ic)) { - TNF_PROBE_0(av1394_ioctl_xmit_error_range, - AV1394_TNF_ISOCH_ERROR, ""); return (EINVAL); } icp = ip->i_ic[num]; - if (icp == NULL) { - TNF_PROBE_0(av1394_ioctl_xmit_error_null, - AV1394_TNF_ISOCH_ERROR, ""); - } /* now call the actual handler */ if (icp->ic_dir != AV1394_IT) { diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c index e2a85f6c3a..ece9068c4f 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c @@ -53,12 +53,6 @@ static void av1394_ic_rsrc_fail(t1394_isoch_single_handle_t t1394_sii_hdl, uint64_t av1394_ic_bitreverse(uint64_t); boolean_t av1394_ic_onebit(uint64_t); -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_ISOCH_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_ISOCH_STACK, ""); - /* tunables */ extern int av1394_rate_n_dv_ntsc; extern int av1394_rate_d_dv_ntsc; @@ -73,8 +67,6 @@ av1394_ic_close(av1394_inst_t *avp, int flags) av1394_ic_t *icp; int i; - AV1394_TNF_ENTER(av1394_ic_close); - /* cleanup channels in case application didn't */ for (i = 0; i < NELEM(ip->i_ic); i++) { icp = ip->i_ic[i]; @@ -84,7 +76,6 @@ av1394_ic_close(av1394_inst_t *avp, int flags) } } - AV1394_TNF_EXIT(av1394_ic_close); return (0); } @@ -104,14 +95,11 @@ av1394_ic_init(av1394_inst_t *avp, iec61883_isoch_init_t *ii, int ret; ddi_iblock_cookie_t ibc = avp->av_attachinfo.iblock_cookie; - AV1394_TNF_ENTER(av1394_ic_init); - ii->ii_frame_rcnt = 0; ii->ii_rchannel = 0; ii->ii_error = 0; if ((ret = av1394_ic_validate_init_params(ii)) != 0) { - AV1394_TNF_EXIT(av1394_ic_init); return (ret); } @@ -134,7 +122,6 @@ av1394_ic_init(av1394_inst_t *avp, iec61883_isoch_init_t *ii, if (ret != DDI_SUCCESS) { ii->ii_error = IEC61883_ERR_NOCHANNEL; av1394_ic_cleanup(icp, 1); - AV1394_TNF_EXIT(av1394_ic_init); return (EINVAL); } } @@ -149,9 +136,6 @@ av1394_ic_init(av1394_inst_t *avp, iec61883_isoch_init_t *ii, mutex_exit(&ip->i_mutex); ii->ii_error = IEC61883_ERR_NOCHANNEL; av1394_ic_cleanup(icp, 2); - TNF_PROBE_0(av1394_ic_init_error_chan_used, - AV1394_TNF_ISOCH_ERROR, ""); - AV1394_TNF_EXIT(av1394_ic_init); return (EINVAL); } ip->i_ic[num] = icp; @@ -168,7 +152,6 @@ av1394_ic_init(av1394_inst_t *avp, iec61883_isoch_init_t *ii, if (ret != 0) { av1394_ic_cleanup(icp, 3); - AV1394_TNF_EXIT(av1394_ic_init); return (ret); } @@ -188,21 +171,13 @@ av1394_ic_init(av1394_inst_t *avp, iec61883_isoch_init_t *ii, mutex_exit(&icp->ic_mutex); mutex_exit(&ip->i_mutex); - TNF_PROBE_2_DEBUG(av1394_ic_init, AV1394_TNF_ISOCH, "", - tnf_string, msg, "channel allocated", tnf_int, num, icp->ic_num); - - AV1394_TNF_EXIT(av1394_ic_init); return (0); } void av1394_ic_fini(av1394_ic_t *icp) { - AV1394_TNF_ENTER(av1394_ic_fini); - av1394_ic_cleanup(icp, AV1394_CLEANUP_LEVEL_MAX); - - AV1394_TNF_EXIT(av1394_ic_fini); } /* @@ -252,28 +227,20 @@ av1394_ic_validate_init_params(iec61883_isoch_init_t *ii) IEC61883_IMPL_VER_MAJOR(AV1394_IEC61883_VER)) || (IEC61883_IMPL_VER_MINOR(ii->ii_version) > IEC61883_IMPL_VER_MINOR(AV1394_IEC61883_VER))) { - TNF_PROBE_0(av1394_ic_validate_init_params_ver_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_VERSION; return (EINVAL); } if ((ii->ii_pkt_size % 4) || (ii->ii_pkt_size > 512)) { - TNF_PROBE_0(av1394_ic_validate_init_params_pktsz_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_PKT_SIZE; return (EINVAL); } framesz = ii->ii_frame_size * ii->ii_pkt_size; if (framesz > AV1394_IC_FRAME_SIZE_MAX) { - TNF_PROBE_0(av1394_ic_validate_init_params_frsz_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_NOMEM; return (EINVAL); } if ((ii->ii_direction != IEC61883_DIR_RECV) && (ii->ii_direction != IEC61883_DIR_XMIT)) { - TNF_PROBE_0(av1394_ic_validate_init_params_dir_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_INVAL; return (EINVAL); } @@ -281,29 +248,21 @@ av1394_ic_validate_init_params(iec61883_isoch_init_t *ii) (ii->ii_frame_cnt < AV1394_IR_NFRAMES_MIN)) || ((ii->ii_direction == IEC61883_DIR_XMIT) && (ii->ii_frame_cnt < AV1394_IT_NFRAMES_MIN))) { - TNF_PROBE_0(av1394_ic_validate_init_params_frcnt_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_INVAL; return (EINVAL); } if ((ii->ii_bus_speed != IEC61883_S100) && (ii->ii_bus_speed != IEC61883_S200) && (ii->ii_bus_speed != IEC61883_S400)) { - TNF_PROBE_0(av1394_ic_validate_init_params_speed_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_INVAL; return (EINVAL); } if (ii->ii_channel == 0) { - TNF_PROBE_0(av1394_ic_validate_init_params_chan_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_INVAL; return (EINVAL); } if ((ii->ii_flags & IEC61883_PRIV_ISOCH_NOALLOC) && !av1394_ic_onebit(ii->ii_channel)) { - TNF_PROBE_0(av1394_ic_validate_init_params_chan_onebit_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_INVAL; return (EINVAL); } @@ -316,15 +275,11 @@ av1394_ic_validate_init_params(iec61883_isoch_init_t *ii) (ii->ii_rate_n != IEC61883_RATE_N_DV_PAL)) && ((ii->ii_rate_d <= 0) || (ii->ii_rate_n < 0) || ((ii->ii_rate_n != 0) && (ii->ii_rate_d / ii->ii_rate_n < 2)))) { - TNF_PROBE_0(av1394_ic_validate_init_params_rate_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_INVAL; return (EINVAL); } if (AV1394_TS_MODE_GET_OFF(ii->ii_ts_mode) + AV1394_TS_MODE_GET_SIZE(ii->ii_ts_mode) > ii->ii_pkt_size) { - TNF_PROBE_0(av1394_ic_validate_init_params_ts_error, - AV1394_TNF_ISOCH_ERROR, ""); ii->ii_error = IEC61883_ERR_INVAL; return (EINVAL); } @@ -389,10 +344,7 @@ av1394_ic_alloc_channel(av1394_ic_t *icp, uint64_t mask, int *num) ret = t1394_alloc_isoch_single(avp->av_t1394_hdl, &sii, 0, &so, &icp->ic_sii_hdl, &result); - if (ret != DDI_SUCCESS) { - TNF_PROBE_1(av1394_ic_alloc_channel_error, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, result, result); - } else { + if (ret == DDI_SUCCESS) { *num = so.channel_num; } return (ret); @@ -436,16 +388,11 @@ av1394_ic_alloc_pool(av1394_isoch_pool_t *pool, size_t framesz, int cnt, int i; int ret; - AV1394_TNF_ENTER(av1394_ic_alloc_pool); - totalsz = framesz * cnt; ASSERT(totalsz > 0); /* request should be reasonable */ if (btopr(totalsz) > physmem / AV1394_MEM_MAX_PERCENT) { - TNF_PROBE_0(av1394_ic_alloc_pool_error_physmem, - AV1394_TNF_ISOCH_ERROR, ""); - AV1394_TNF_EXIT(av1394_ic_alloc_pool); return (0); } @@ -476,8 +423,6 @@ av1394_ic_alloc_pool(av1394_isoch_pool_t *pool, size_t framesz, int cnt, seg->is_kaddr = ddi_umem_alloc(seg->is_umem_size, DDI_UMEM_SLEEP, &seg->is_umem_cookie); if (seg->is_kaddr == NULL) { - TNF_PROBE_0(av1394_ic_alloc_pool_error_umem_alloc, - AV1394_TNF_ISOCH_ERROR, ""); break; } seg->is_size = segsz; @@ -490,13 +435,10 @@ av1394_ic_alloc_pool(av1394_isoch_pool_t *pool, size_t framesz, int cnt, /* number of frames the pool can hold */ ret = pool->ip_size / framesz; if (ret < mincnt) { - TNF_PROBE_0(av1394_ic_alloc_pool_error_mincnt, - AV1394_TNF_ISOCH_ERROR, ""); av1394_ic_free_pool(pool); ret = 0; } - AV1394_TNF_EXIT(av1394_ic_alloc_pool); return (ret); } @@ -505,8 +447,6 @@ av1394_ic_free_pool(av1394_isoch_pool_t *pool) { int i; - AV1394_TNF_ENTER(av1394_ic_free_pool); - if (pool->ip_seg != NULL) { for (i = 0; i < pool->ip_nsegs; i++) { ddi_umem_free(pool->ip_seg[i].is_umem_cookie); @@ -514,8 +454,6 @@ av1394_ic_free_pool(av1394_isoch_pool_t *pool) kmem_free(pool->ip_seg, pool->ip_alloc_size); pool->ip_seg = NULL; } - - AV1394_TNF_EXIT(av1394_ic_free_pool); } int @@ -528,8 +466,6 @@ av1394_ic_dma_setup(av1394_ic_t *icp, av1394_isoch_pool_t *pool) int i; int j; - AV1394_TNF_ENTER(av1394_ic_dma_setup); - dma_dir = (icp->ic_dir == AV1394_IR) ? DDI_DMA_READ : DDI_DMA_WRITE; /* * Alloc and bind a DMA handle for each segment. @@ -544,10 +480,7 @@ av1394_ic_dma_setup(av1394_ic_t *icp, av1394_isoch_pool_t *pool) &avp->av_attachinfo.dma_attr, DDI_DMA_DONTWAIT, NULL, &isp->is_dma_hdl); if (ret != DDI_SUCCESS) { - TNF_PROBE_0(av1394_ic_dma_setup_error_alloc_hdl, - AV1394_TNF_ISOCH_ERROR, ""); av1394_ic_dma_cleanup(icp, pool); - AV1394_TNF_EXIT(av1394_ic_dma_setup); return (ret); } @@ -557,18 +490,12 @@ av1394_ic_dma_setup(av1394_ic_t *icp, av1394_isoch_pool_t *pool) &isp->is_dma_cookie[0], &isp->is_dma_ncookies); if (ret != DDI_DMA_MAPPED) { - TNF_PROBE_0(av1394_ic_dma_setup_error_bind_hdl, - AV1394_TNF_ISOCH_ERROR, ""); av1394_ic_dma_cleanup(icp, pool); - AV1394_TNF_EXIT(av1394_ic_dma_setup); return (DDI_FAILURE); } if (isp->is_dma_ncookies > COOKIES) { - TNF_PROBE_0(av1394_ic_dma_setup_error_ncookies, - AV1394_TNF_ISOCH_ERROR, ""); av1394_ic_dma_cleanup(icp, pool); - AV1394_TNF_EXIT(av1394_ic_dma_setup); return (DDI_FAILURE); } @@ -577,7 +504,6 @@ av1394_ic_dma_setup(av1394_ic_t *icp, av1394_isoch_pool_t *pool) &isp->is_dma_cookie[j]); } - AV1394_TNF_EXIT(av1394_ic_dma_setup); return (DDI_SUCCESS); } @@ -588,8 +514,6 @@ av1394_ic_dma_cleanup(av1394_ic_t *icp, av1394_isoch_pool_t *pool) av1394_isoch_seg_t *seg; int i; - AV1394_TNF_ENTER(av1394_ic_dma_cleanup); - for (i = 0; i < pool->ip_nsegs; i++) { seg = &pool->ip_seg[i]; if (seg->is_dma_hdl != NULL) { @@ -599,8 +523,6 @@ av1394_ic_dma_cleanup(av1394_ic_t *icp, av1394_isoch_pool_t *pool) ddi_dma_free_handle(&seg->is_dma_hdl); } } - - AV1394_TNF_EXIT(av1394_ic_dma_cleanup); } /* @@ -669,13 +591,9 @@ static void av1394_ic_rsrc_fail(t1394_isoch_single_handle_t t1394_sii_hdl, opaque_t arg, t1394_isoch_rsrc_error_t fail_args) { - AV1394_TNF_ENTER(av1394_ic_rsrc_fail); - /* XXX this could be handled more gracefully */ cmn_err(CE_CONT, "av1394: can't reallocate isochronous resources" " after bus reset\n"); - - AV1394_TNF_EXIT(av1394_ic_rsrc_fail); } /* diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_recv.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_recv.c index fdce717a68..e9c599cea2 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_recv.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_recv.c @@ -62,12 +62,6 @@ int av1394_ir_hiwat_sub = 2; int av1394_ir_lowat_sub = 3; int av1394_ir_dump_ixl = 0; -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_ISOCH_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_ISOCH_STACK, ""); - int av1394_ir_init(av1394_ic_t *icp, int *error) { @@ -75,13 +69,10 @@ av1394_ir_init(av1394_ic_t *icp, int *error) av1394_isoch_pool_t *pool = &irp->ir_data_pool; int nframes; - AV1394_TNF_ENTER(av1394_ir_init); - nframes = av1394_ic_alloc_pool(pool, icp->ic_framesz, icp->ic_nframes, AV1394_IR_NFRAMES_MIN); if (nframes == 0) { *error = IEC61883_ERR_NOMEM; - AV1394_TNF_EXIT(av1394_ir_init); return (EINVAL); } mutex_enter(&icp->ic_mutex); @@ -93,7 +84,6 @@ av1394_ir_init(av1394_ic_t *icp, int *error) mutex_exit(&icp->ic_mutex); *error = IEC61883_ERR_NOMEM; av1394_ir_cleanup(icp, 1); - AV1394_TNF_EXIT(av1394_ir_init); return (EINVAL); } @@ -101,7 +91,6 @@ av1394_ir_init(av1394_ic_t *icp, int *error) mutex_exit(&icp->ic_mutex); *error = IEC61883_ERR_NOMEM; av1394_ir_cleanup(icp, 2); - AV1394_TNF_EXIT(av1394_ir_init); return (EINVAL); } mutex_exit(&icp->ic_mutex); @@ -109,22 +98,16 @@ av1394_ir_init(av1394_ic_t *icp, int *error) if (av1394_ir_alloc_isoch_dma(icp) != DDI_SUCCESS) { *error = IEC61883_ERR_NOMEM; av1394_ir_cleanup(icp, 3); - AV1394_TNF_EXIT(av1394_ir_init); return (EINVAL); } - AV1394_TNF_EXIT(av1394_ir_init); return (0); } void av1394_ir_fini(av1394_ic_t *icp) { - AV1394_TNF_ENTER(av1394_ir_fini); - av1394_ir_cleanup(icp, AV1394_CLEANUP_LEVEL_MAX); - - AV1394_TNF_ENTER(av1394_ir_fini); } int @@ -137,8 +120,6 @@ av1394_ir_start(av1394_ic_t *icp) int err; int ret = 0; - AV1394_TNF_ENTER(av1394_ir_start); - mutex_enter(&icp->ic_mutex); if (icp->ic_state != AV1394_IC_IDLE) { mutex_exit(&icp->ic_mutex); @@ -159,12 +140,9 @@ av1394_ir_start(av1394_ic_t *icp) icp->ic_state = AV1394_IC_DMA; mutex_exit(&icp->ic_mutex); } else { - TNF_PROBE_1(av1394_ir_start_error, AV1394_TNF_ISOCH_ERROR, "", - tnf_int, result, result); ret = EIO; } - AV1394_TNF_EXIT(av1394_ir_start); return (ret); } @@ -173,8 +151,6 @@ av1394_ir_stop(av1394_ic_t *icp) { av1394_inst_t *avp = icp->ic_avp; - AV1394_TNF_ENTER(av1394_ir_stop); - mutex_enter(&icp->ic_mutex); if (icp->ic_state != AV1394_IC_IDLE) { mutex_exit(&icp->ic_mutex); @@ -184,7 +160,6 @@ av1394_ir_stop(av1394_ic_t *icp) } mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_ir_stop); return (0); } @@ -200,8 +175,6 @@ av1394_ir_recv(av1394_ic_t *icp, iec61883_recv_t *recv) /* check arguments */ if ((idx < 0) || (idx >= icp->ic_nframes) || (cnt < 0) || (cnt > icp->ic_nframes)) { - TNF_PROBE_2(av1394_ir_recv_error_args, AV1394_TNF_ISOCH_ERROR, - "", tnf_int, idx, idx, tnf_int, cnt, cnt); return (EINVAL); } @@ -229,8 +202,6 @@ av1394_ir_read(av1394_ic_t *icp, struct uio *uiop) int ret = 0; int empty_cnt; - AV1394_TNF_ENTER(av1394_ir_read); - mutex_enter(&icp->ic_mutex); while (uiop->uio_resid) { /* wait for full frames, if necessary */ @@ -240,7 +211,6 @@ av1394_ir_read(av1394_ic_t *icp, struct uio *uiop) &irp->ir_read_idx, &irp->ir_read_cnt); if (ret != 0) { mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_ir_read); return (ret); } } @@ -260,7 +230,6 @@ av1394_ir_read(av1394_ic_t *icp, struct uio *uiop) } mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_ir_read); return (ret); } @@ -340,8 +309,6 @@ av1394_ir_build_ixl(av1394_ic_t *icp) int fi; /* frame index */ int bi; /* buffer index */ - AV1394_TNF_ENTER(av1394_ir_build_ixl); - /* allocate space for IXL data blocks */ irp->ir_ixl_data = kmem_zalloc(icp->ic_nframes * sizeof (av1394_ir_ixl_data_t), KM_SLEEP); @@ -503,7 +470,6 @@ av1394_ir_build_ixl(av1394_ic_t *icp) av1394_ic_ixl_dump(irp->ir_ixlp); } - AV1394_TNF_EXIT(av1394_ir_build_ixl); return (DDI_SUCCESS); } @@ -557,8 +523,6 @@ av1394_ir_destroy_ixl(av1394_ic_t *icp) { av1394_ir_t *irp = &icp->ic_ir; - AV1394_TNF_ENTER(av1394_ir_destroy_ixl); - mutex_enter(&icp->ic_mutex); kmem_free(irp->ir_ixl_buf, irp->ir_ixl_nbufs * sizeof (ixl1394_xfer_buf_t)); @@ -569,8 +533,6 @@ av1394_ir_destroy_ixl(av1394_ic_t *icp) irp->ir_ixl_buf = NULL; irp->ir_ixl_data = NULL; mutex_exit(&icp->ic_mutex); - - AV1394_TNF_EXIT(av1394_ir_destroy_ixl); } static int @@ -582,8 +544,6 @@ av1394_ir_alloc_isoch_dma(av1394_ic_t *icp) int result; int ret; - AV1394_TNF_ENTER(av1394_ir_alloc_isoch_dma); - di.ixlp = irp->ir_ixlp; di.channel_num = icp->ic_num; di.global_callback_arg = icp; @@ -591,13 +551,9 @@ av1394_ir_alloc_isoch_dma(av1394_ic_t *icp) di.isoch_dma_stopped = av1394_ir_dma_stopped_cb; di.idma_evt_arg = icp; - if ((ret = t1394_alloc_isoch_dma(avp->av_t1394_hdl, &di, 0, - &icp->ic_isoch_hdl, &result)) != DDI_SUCCESS) { - TNF_PROBE_1(av1394_ir_alloc_isoch_dma_error, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, result, result); - } + ret = t1394_alloc_isoch_dma(avp->av_t1394_hdl, &di, 0, + &icp->ic_isoch_hdl, &result); - AV1394_TNF_EXIT(av1394_ir_alloc_isoch_dma); return (ret); } @@ -606,11 +562,7 @@ av1394_ir_free_isoch_dma(av1394_ic_t *icp) { av1394_inst_t *avp = icp->ic_avp; - AV1394_TNF_ENTER(av1394_ir_free_isoch_rsrc); - t1394_free_isoch_dma(avp->av_t1394_hdl, 0, &icp->ic_isoch_hdl); - - AV1394_TNF_EXIT(av1394_ir_free_isoch_rsrc); } static void @@ -633,8 +585,6 @@ av1394_ir_ixl_frame_cb(opaque_t arg, struct ixl1394_callback *cb) av1394_isoch_t *ip = &icp->ic_avp->av_i; av1394_ir_t *irp = &icp->ic_ir; - AV1394_TNF_ENTER(av1394_ir_ixl_frame_cb); - mutex_enter(&ip->i_mutex); mutex_enter(&icp->ic_mutex); if (irp->ir_nfull < icp->ic_nframes) { @@ -653,8 +603,6 @@ av1394_ir_ixl_frame_cb(opaque_t arg, struct ixl1394_callback *cb) } mutex_exit(&icp->ic_mutex); mutex_exit(&ip->i_mutex); - - AV1394_TNF_EXIT(av1394_ir_ixl_frame_cb); } /* @@ -672,8 +620,6 @@ av1394_ir_overflow(av1394_ic_t *icp) int err; int result; - AV1394_TNF_ENTER(av1394_ir_overflow); - /* * in the circular IXL chain overflow means overwriting the least * recent data. to avoid that, we suspend the transfer by NULL'ing @@ -699,13 +645,7 @@ av1394_ir_overflow(av1394_ic_t *icp) if (err == DDI_SUCCESS) { irp->ir_overflow_idx = idx; icp->ic_state = AV1394_IC_SUSPENDED; - } else { - TNF_PROBE_2(av1394_ir_overflow_error_update, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, err, err, - tnf_int, result, result); } - - AV1394_TNF_EXIT(av1394_ir_overflow); } /* @@ -723,8 +663,6 @@ av1394_ir_overflow_resume(av1394_ic_t *icp) int err; int result; - AV1394_TNF_ENTER(av1394_ir_overflow_resume); - /* * restore the jump command we NULL'ed in av1394_ir_overflow() */ @@ -748,13 +686,7 @@ av1394_ir_overflow_resume(av1394_ic_t *icp) if (err == DDI_SUCCESS) { icp->ic_state = AV1394_IC_DMA; - } else { - TNF_PROBE_2(av1394_ir_overflow_resume_error_update, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, err, err, - tnf_int, result, result); } - - AV1394_TNF_EXIT(av1394_ir_overflow_resume); } /*ARGSUSED*/ @@ -764,13 +696,9 @@ av1394_ir_dma_stopped_cb(t1394_isoch_dma_handle_t t1394_idma_hdl, { av1394_ic_t *icp = idma_evt_arg; - AV1394_TNF_ENTER(av1394_ir_dma_stopped_cb); - mutex_enter(&icp->ic_mutex); icp->ic_state = AV1394_IC_IDLE; mutex_exit(&icp->ic_mutex); - - AV1394_TNF_EXIT(av1394_ir_dma_stopped_cb); } @@ -788,8 +716,6 @@ av1394_ir_add_frames(av1394_ic_t *icp, int idx, int cnt) /* can only add to the tail */ if (idx != ((irp->ir_last_empty + 1) % icp->ic_nframes)) { - TNF_PROBE_1(av1394_ir_add_frames_error, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, idx, idx); return (EINVAL); } diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_xmit.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_xmit.c index 8dca362c1c..7d32ff068d 100644 --- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_xmit.c +++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_xmit.c @@ -81,12 +81,6 @@ int av1394_it_start_thre = 3; /* xmit start threshold */ int av1394_it_syt_off = 3; /* SYT offset in cycles */ int av1394_it_dump_ixl = 0; -#define AV1394_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_enter, AV1394_TNF_ISOCH_STACK, ""); - -#define AV1394_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_exit, AV1394_TNF_ISOCH_STACK, ""); - int av1394_it_init(av1394_ic_t *icp, int *error) { @@ -94,13 +88,10 @@ av1394_it_init(av1394_ic_t *icp, int *error) av1394_isoch_pool_t *pool = &itp->it_data_pool; int nframes; - AV1394_TNF_ENTER(av1394_it_init); - nframes = av1394_ic_alloc_pool(pool, icp->ic_framesz, icp->ic_nframes, AV1394_IT_NFRAMES_MIN); if (nframes == 0) { *error = IEC61883_ERR_NOMEM; - AV1394_TNF_EXIT(av1394_it_init); return (EINVAL); } mutex_enter(&icp->ic_mutex); @@ -115,7 +106,6 @@ av1394_it_init(av1394_ic_t *icp, int *error) mutex_exit(&icp->ic_mutex); *error = IEC61883_ERR_NOMEM; av1394_it_cleanup(icp, 1); - AV1394_TNF_EXIT(av1394_it_init); return (EINVAL); } @@ -123,7 +113,6 @@ av1394_it_init(av1394_ic_t *icp, int *error) mutex_exit(&icp->ic_mutex); *error = IEC61883_ERR_NOMEM; av1394_it_cleanup(icp, 2); - AV1394_TNF_EXIT(av1394_it_init); return (EINVAL); } mutex_exit(&icp->ic_mutex); @@ -131,22 +120,16 @@ av1394_it_init(av1394_ic_t *icp, int *error) if (av1394_it_alloc_isoch_dma(icp) != DDI_SUCCESS) { *error = IEC61883_ERR_NOMEM; av1394_it_cleanup(icp, 3); - AV1394_TNF_EXIT(av1394_it_init); return (EINVAL); } - AV1394_TNF_EXIT(av1394_it_init); return (0); } void av1394_it_fini(av1394_ic_t *icp) { - AV1394_TNF_ENTER(av1394_it_fini); - av1394_it_cleanup(icp, AV1394_CLEANUP_LEVEL_MAX); - - AV1394_TNF_ENTER(av1394_it_fini); } int @@ -155,8 +138,6 @@ av1394_it_start(av1394_ic_t *icp) av1394_it_t *itp = &icp->ic_it; int ret = 0; - AV1394_TNF_ENTER(av1394_it_start); - mutex_enter(&icp->ic_mutex); ASSERT(icp->ic_state == AV1394_IC_IDLE); @@ -166,7 +147,6 @@ av1394_it_start(av1394_ic_t *icp) } mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_it_start); return (ret); } @@ -186,8 +166,6 @@ av1394_it_start_common(av1394_ic_t *icp) if (err == DDI_SUCCESS) { icp->ic_state = AV1394_IC_DMA; } else { - TNF_PROBE_1(av1394_it_start_common_error, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, result, result); ret = EIO; } @@ -201,8 +179,6 @@ av1394_it_stop(av1394_ic_t *icp) av1394_inst_t *avp = icp->ic_avp; av1394_it_t *itp = &icp->ic_it; - AV1394_TNF_ENTER(av1394_it_stop); - mutex_enter(&icp->ic_mutex); if (icp->ic_state != AV1394_IC_IDLE) { mutex_exit(&icp->ic_mutex); @@ -217,7 +193,6 @@ av1394_it_stop(av1394_ic_t *icp) } mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_it_stop); return (0); } @@ -235,8 +210,6 @@ av1394_it_xmit(av1394_ic_t *icp, iec61883_xmit_t *xmit) /* check arguments */ if ((idx < 0) || (cnt < 0) || (cnt > itp->it_nempty)) { mutex_exit(&icp->ic_mutex); - TNF_PROBE_2(av1394_it_xmit_error_args, AV1394_TNF_ISOCH_ERROR, - "", tnf_int, idx, idx, tnf_int, cnt, cnt); return (EINVAL); } @@ -275,8 +248,6 @@ av1394_it_write(av1394_ic_t *icp, struct uio *uiop) int full_cnt; int miss_cnt; - AV1394_TNF_ENTER(av1394_it_write); - mutex_enter(&icp->ic_mutex); dv = (axp->ax_fmt & AV1394_ISOCH_AUTOXMIT_DV); @@ -316,14 +287,12 @@ av1394_it_write(av1394_ic_t *icp, struct uio *uiop) (itp->it_nfull >= itp->it_start_thre)) { if ((ret = av1394_it_start_common(icp)) != 0) { mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_it_write); return (ret); } } } mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_it_write); return (ret); } @@ -365,11 +334,8 @@ av1394_it_bld_ixl(av1394_ic_t *icp) av1394_it_t *itp = &icp->ic_it; int ret; - AV1394_TNF_ENTER(av1394_it_bld_ixl); - /* data block */ if ((ret = av1394_it_ixl_bld_data(icp)) != DDI_SUCCESS) { - AV1394_TNF_EXIT(av1394_it_bld_ixl); return (ret); } @@ -387,7 +353,6 @@ av1394_it_bld_ixl(av1394_ic_t *icp) av1394_ic_ixl_dump(itp->it_ixlp); } - AV1394_TNF_EXIT(av1394_it_bld_ixl); return (ret); } @@ -737,8 +702,6 @@ av1394_it_alloc_isoch_dma(av1394_ic_t *icp) int result; int ret; - AV1394_TNF_ENTER(av1394_it_alloc_isoch_dma); - di.ixlp = itp->it_ixlp; di.channel_num = icp->ic_num; di.idma_options = ID1394_TALK; @@ -754,13 +717,9 @@ av1394_it_alloc_isoch_dma(av1394_ic_t *icp) di.isoch_dma_stopped = av1394_it_dma_stopped_cb; di.idma_evt_arg = icp; - if ((ret = t1394_alloc_isoch_dma(avp->av_t1394_hdl, &di, 0, - &icp->ic_isoch_hdl, &result)) != DDI_SUCCESS) { - TNF_PROBE_1(av1394_it_alloc_isoch_dma_error, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, result, result); - } + ret = t1394_alloc_isoch_dma(avp->av_t1394_hdl, &di, 0, + &icp->ic_isoch_hdl, &result); - AV1394_TNF_EXIT(av1394_it_alloc_isoch_dma); return (ret); } @@ -769,11 +728,7 @@ av1394_it_free_isoch_dma(av1394_ic_t *icp) { av1394_inst_t *avp = icp->ic_avp; - AV1394_TNF_ENTER(av1394_it_free_isoch_rsrc); - t1394_free_isoch_dma(avp->av_t1394_hdl, 0, &icp->ic_isoch_hdl); - - AV1394_TNF_EXIT(av1394_it_free_isoch_rsrc); } static void @@ -797,8 +752,6 @@ av1394_it_ixl_begin_cb(opaque_t arg, struct ixl1394_callback *cb) uint16_t syt; int first; - AV1394_TNF_ENTER(av1394_it_ixl_begin_cb); - mutex_enter(&icp->ic_mutex); /* save initial timestamp value */ itp->it_ts_init.ts_syt = av1394_it_ts_cyc2syt(*cycp); @@ -809,7 +762,6 @@ av1394_it_ixl_begin_cb(opaque_t arg, struct ixl1394_callback *cb) if ((itp->it_nfull <= 0) || (AV1394_TS_MODE_GET_SIZE(icp->ic_param.cp_ts_mode) == 0)) { mutex_exit(&icp->ic_mutex); - AV1394_TNF_EXIT(av1394_it_ixl_begin_cb); return; } ASSERT(itp->it_nfull <= icp->ic_nframes); @@ -820,8 +772,6 @@ av1394_it_ixl_begin_cb(opaque_t arg, struct ixl1394_callback *cb) icp->ic_nframes; av1394_it_update_frame_syt(icp, first, itp->it_nfull, syt); mutex_exit(&icp->ic_mutex); - - AV1394_TNF_EXIT(av1394_it_ixl_begin_cb); } /*ARGSUSED*/ @@ -830,11 +780,9 @@ av1394_it_ixl_buf_cb(opaque_t arg, struct ixl1394_callback *cb) { av1394_it_ixl_buf_t *bp = cb->callback_arg; - AV1394_TNF_ENTER(av1394_it_ixl_buf_cb); if (bp->tb_flags & AV1394_IT_IXL_BUF_EOF) { av1394_it_ixl_eof_cb(bp); } - AV1394_TNF_EXIT(av1394_it_ixl_buf_cb); } static void @@ -844,8 +792,6 @@ av1394_it_ixl_eof_cb(av1394_it_ixl_buf_t *bp) av1394_isoch_t *ip = &icp->ic_avp->av_i; av1394_it_t *itp = &icp->ic_it; - AV1394_TNF_ENTER(av1394_it_ixl_eof_cb); - mutex_enter(&ip->i_mutex); mutex_enter(&icp->ic_mutex); if (itp->it_nempty < icp->ic_nframes) { @@ -861,8 +807,6 @@ av1394_it_ixl_eof_cb(av1394_it_ixl_buf_t *bp) } mutex_exit(&icp->ic_mutex); mutex_exit(&ip->i_mutex); - - AV1394_TNF_EXIT(av1394_it_ixl_eof_cb); } void @@ -877,8 +821,6 @@ av1394_it_underrun(av1394_ic_t *icp) int err; int result; - AV1394_TNF_ENTER(av1394_it_underrun); - /* * update the last full frame's jump to NULL */ @@ -904,13 +846,7 @@ av1394_it_underrun(av1394_ic_t *icp) itp->it_underrun_idx = idx; icp->ic_state = AV1394_IC_SUSPENDED; cv_signal(&icp->ic_xfer_cv); - } else { - TNF_PROBE_2(av1394_it_underrun_error_update, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, err, err, - tnf_int, result, result); } - - AV1394_TNF_EXIT(av1394_it_underrun); } /* @@ -929,8 +865,6 @@ av1394_it_underrun_resume(av1394_ic_t *icp) int err; int result; - AV1394_TNF_ENTER(av1394_it_underrun_resume); - /* * resuming the transfer it a lot like starting the transfer: * first the IXL begin block needs to be executed, then the rest @@ -963,10 +897,6 @@ av1394_it_underrun_resume(av1394_ic_t *icp) mutex_enter(&icp->ic_mutex); if (err != DDI_SUCCESS) { - TNF_PROBE_2(av1394_it_underrun_resume_error_update1, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, err, err, - tnf_int, result, result); - AV1394_TNF_EXIT(av1394_it_underrun_resume); return (EIO); } @@ -990,16 +920,11 @@ av1394_it_underrun_resume(av1394_ic_t *icp) mutex_enter(&icp->ic_mutex); if (err != DDI_SUCCESS) { - TNF_PROBE_2(av1394_it_underrun_resume_error_update2, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, err, err, - tnf_int, result, result); - AV1394_TNF_EXIT(av1394_it_underrun_resume); return (EIO); } icp->ic_state = AV1394_IC_DMA; - AV1394_TNF_EXIT(av1394_it_underrun_resume); return (0); } @@ -1010,13 +935,9 @@ av1394_it_dma_stopped_cb(t1394_isoch_dma_handle_t t1394_idma_hdl, { av1394_ic_t *icp = idma_evt_arg; - AV1394_TNF_ENTER(av1394_it_dma_stopped_cb); - mutex_enter(&icp->ic_mutex); icp->ic_state = AV1394_IC_IDLE; mutex_exit(&icp->ic_mutex); - - AV1394_TNF_EXIT(av1394_it_dma_stopped_cb); } @@ -1038,8 +959,6 @@ av1394_it_add_frames(av1394_ic_t *icp, int idx, int cnt) /* can only add to tail */ if (idx != ((itp->it_last_full + 1) % icp->ic_nframes)) { - TNF_PROBE_1(av1394_it_add_frames_error, - AV1394_TNF_ISOCH_ERROR, "", tnf_int, idx, idx); return (EINVAL); } diff --git a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c index c300e987d8..924b6344b4 100644 --- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c +++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c @@ -52,7 +52,6 @@ #include <sys/uio.h> #include <sys/devops.h> #include <sys/1394/t1394.h> -#include <sys/tnf_probe.h> #include <sys/dcam/dcam1394_io.h> #include <sys/1394/targets/dcam1394/dcam.h> @@ -60,12 +59,6 @@ #include <sys/1394/targets/dcam1394/dcam_param.h> #include <sys/1394/targets/dcam1394/dcam_frame.h> -#ifndef NPROBE -extern int tnf_mod_load(void); -extern int tnf_mod_unload(struct modlinkage *mlp); -#endif /* ! NPROBE */ - - /* for power management (we have only one component) */ static char *dcam_pmc[] = { "NAME=dcam1394", @@ -155,18 +148,8 @@ _init(void) return (err); } -#ifndef NPROBE - (void) tnf_mod_load(); -#endif /* ! NPROBE */ - if (err = mod_install(&modlinkage)) { - -#ifndef NPROBE - (void) tnf_mod_unload(&modlinkage); -#endif /* ! NPROBE */ - ddi_soft_state_fini(&dcam_state_p); - } return (err); @@ -192,10 +175,6 @@ _fini(void) return (err); } -#ifndef NPROBE - (void) tnf_mod_unload(&modlinkage); -#endif /* ! NPROBE */ - ddi_soft_state_fini(&dcam_state_p); return (err); diff --git a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_frame.c b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_frame.c index e7caf28a01..056df0b7c8 100644 --- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_frame.c +++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_frame.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * dcam_frame.c * @@ -38,7 +36,6 @@ #include <sys/cmn_err.h> #include <sys/1394/targets/dcam1394/dcam.h> #include <sys/1394/targets/dcam1394/dcam_frame.h> -#include <sys/tnf_probe.h> #include <sys/dcam/dcam1394_io.h> #include <sys/1394/targets/dcam1394/dcam_reg.h> diff --git a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_param.c b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_param.c index 445d3ae04d..1770dca6ac 100644 --- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_param.c +++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_param.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * dcam_param.c * @@ -35,7 +33,6 @@ #include <sys/1394/targets/dcam1394/dcam.h> #include <sys/1394/targets/dcam1394/dcam_param.h> #include <sys/1394/targets/dcam1394/dcam_reg.h> -#include <sys/tnf_probe.h> /* index by vid_mode */ int g_frame_num_bytes[] = { diff --git a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_reg.c b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_reg.c index 096a632291..c35881f1f7 100644 --- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_reg.c +++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_reg.c @@ -24,15 +24,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * dcam_reg.c * * dcam1394 driver. Control register access support. */ -#include <sys/tnf_probe.h> #include <sys/1394/targets/dcam1394/dcam_reg.h> diff --git a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_ring_buff.c b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_ring_buff.c index 0c0fe0aba9..4f1214d5e1 100644 --- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam_ring_buff.c +++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam_ring_buff.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * dcam_ring_buff.c * @@ -37,7 +35,6 @@ #include <sys/ddidmareq.h> #include <sys/types.h> #include <sys/inttypes.h> -#include <sys/tnf_probe.h> #include <sys/cmn_err.h> #include <sys/1394/targets/dcam1394/dcam.h> diff --git a/usr/src/uts/common/io/fibre-channel/ulp/fcip.c b/usr/src/uts/common/io/fibre-channel/ulp/fcip.c index 416bc3cb55..3c14f5ae31 100644 --- a/usr/src/uts/common/io/fibre-channel/ulp/fcip.c +++ b/usr/src/uts/common/io/fibre-channel/ulp/fcip.c @@ -116,13 +116,6 @@ #include <sys/fibre-channel/impl/fc_ulpif.h> #include <sys/fibre-channel/ulp/fcip.h> -/* - * TNF Probe/trace facility include - */ -#if defined(lint) || defined(FCIP_TNF_ENABLED) -#include <sys/tnf_probe.h> -#endif - #define FCIP_ESBALLOC /* @@ -614,8 +607,6 @@ _init(void) { int rval; - FCIP_TNF_LOAD(); - /* * Initialize the mutexs used by port attach and other callbacks. * The transport can call back into our port_attach_callback @@ -665,7 +656,6 @@ _init(void) rval = ENODEV; break; } - FCIP_TNF_UNLOAD(&modlinkage); return (rval); } @@ -675,12 +665,10 @@ _init(void) cv_destroy(&fcip_global_cv); rw_destroy(&fcipstruplock); (void) fc_ulp_remove(&fcip_modinfo); - FCIP_TNF_UNLOAD(&modlinkage); return (rval); } if ((rval = mod_install(&modlinkage)) != 0) { - FCIP_TNF_UNLOAD(&modlinkage); (void) fc_ulp_remove(&fcip_modinfo); mutex_destroy(&fcip_global_mutex); cv_destroy(&fcip_global_cv); @@ -743,8 +731,6 @@ _fini(void) cv_destroy(&fcip_global_cv); ddi_soft_state_fini(&fcip_softp); - FCIP_TNF_UNLOAD(&modlinkage); - return (rval); } @@ -792,9 +778,6 @@ fcip_port_attach(opaque_t ulp_handle, fc_ulp_port_info_t *port_info, */ ww_pn = &port_info->port_pwwn; - FCIP_TNF_PROBE_2((fcip_port_attach, "fcip io", /* CSTYLED */, - tnf_string, msg, "port id bits", - tnf_opaque, nport_id, ww_pn->w.nport_id)); FCIP_DEBUG(FCIP_DEBUG_ATTACH, (CE_NOTE, "port id bits: 0x%x", ww_pn->w.nport_id)); /* @@ -1025,9 +1008,6 @@ fcip_port_attach(opaque_t ulp_handle, fc_ulp_port_info_t *port_info, goto done; default: - FCIP_TNF_PROBE_2((fcip_port_attach, "fcip io", /* CSTYLED */, - tnf_string, msg, "unknown command type", - tnf_uint, cmd, cmd)); FCIP_DEBUG(FCIP_DEBUG_ATTACH, (CE_WARN, "unknown cmd type 0x%x in port_attach", cmd)); rval = FC_FAILURE; @@ -1280,10 +1260,6 @@ fcip_rt_update(struct fcip *fptr, fc_portmap_t *devlist, uint32_t listlen) fc_portmap_t *pmap; char wwn_buf[20]; - FCIP_TNF_PROBE_2((fcip_rt_update, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter", - tnf_int, listlen, listlen)); - ASSERT(!mutex_owned(&fptr->fcip_mutex)); mutex_enter(&fptr->fcip_rt_mutex); @@ -1353,11 +1329,6 @@ add_new_entry: ASSERT(hash_bucket < FCIP_RT_HASH_ELEMS); - FCIP_TNF_PROBE_2((fcip_rt_update, "cfip io", /* CSTYLED */, - tnf_string, msg, - "add new entry", - tnf_int, hashbucket, hash_bucket)); - frp = (struct fcip_routing_table *) kmem_zalloc(sizeof (struct fcip_routing_table), KM_SLEEP); /* insert at beginning of hash bucket */ @@ -1405,9 +1376,6 @@ update_entry: (void) fcip_do_plogi(fptr, frp); } - FCIP_TNF_BYTE_ARRAY(fcip_rt_update, "fcip io", "detail", - "new wwn in rt", pwwn, - &frp->fcipr_pwwn, sizeof (la_wwn_t)); } mutex_exit(&fptr->fcip_rt_mutex); } @@ -1422,35 +1390,18 @@ fcip_lookup_rtable(struct fcip *fptr, la_wwn_t *wwn, int matchflag) struct fcip_routing_table *frp = NULL; int hash_bucket; - - FCIP_TNF_PROBE_1((fcip_lookup_rtable, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); - FCIP_TNF_BYTE_ARRAY(fcip_lookup_rtable, "fcip io", "detail", - "rtable lookup for", wwn, - &wwn->raw_wwn, sizeof (la_wwn_t)); - FCIP_TNF_PROBE_2((fcip_lookup_rtable, "fcip io", /* CSTYLED */, - tnf_string, msg, "match by", - tnf_int, matchflag, matchflag)); - ASSERT(mutex_owned(&fptr->fcip_rt_mutex)); hash_bucket = FCIP_RT_HASH(wwn->raw_wwn); frp = fptr->fcip_rtable[hash_bucket]; while (frp != NULL) { - FCIP_TNF_BYTE_ARRAY(fcip_lookup_rtable, "fcip io", "detail", - "rtable entry", nwwn, - &(frp->fcipr_nwwn.raw_wwn), sizeof (la_wwn_t)); - if (fcip_wwn_compare(&frp->fcipr_pwwn, wwn, matchflag) == 0) { break; } frp = frp->fcipr_next; } - FCIP_TNF_PROBE_2((fcip_lookup_rtable, "fcip io", /* CSTYLED */, - tnf_string, msg, "lookup result", - tnf_opaque, frp, frp)); return (frp); } @@ -1544,11 +1495,6 @@ fcip_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) FCIP_IN_CALLBACK | FCIP_ATTACHING | FCIP_SUSPENDED | FCIP_POWER_DOWN | FCIP_REG_INPROGRESS)) { - FCIP_TNF_PROBE_1((fcip_detach, - "fcip io", /* CSTYLED */, - tnf_string, msg, - "fcip instance busy")); - mutex_exit(&fptr->fcip_mutex); FCIP_DEBUG(FCIP_DEBUG_DETACH, (CE_WARN, "fcip instance busy")); @@ -1641,10 +1587,6 @@ fcip_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) FCIP_DEBUG(FCIP_DEBUG_DETACH, (CE_NOTE, "detaching port")); - - FCIP_TNF_PROBE_1((fcip_detach, - "fcip io", /* CSTYLED */, tnf_string, - msg, "detaching port")); } /* @@ -2277,11 +2219,6 @@ fcip_statec_cb(opaque_t ulp_handle, opaque_t phandle, instance = ddi_get_instance(fport->fcipp_dip); - FCIP_TNF_PROBE_4((fcip_statec_cb, "fcip io", /* CSTYLED */, - tnf_string, msg, "state change callback", - tnf_uint, instance, instance, - tnf_uint, S_ID, sid, - tnf_int, count, listlen)); FCIP_DEBUG(FCIP_DEBUG_ELS, (CE_NOTE, "fcip%d, state change callback: state:0x%x, " "S_ID:0x%x, count:0x%x", instance, port_state, sid, listlen)); @@ -2552,10 +2489,6 @@ fcip_els_cb(opaque_t ulp_handle, opaque_t phandle, fptr->fcip_flags |= FCIP_IN_ELS_CB; mutex_exit(&fptr->fcip_mutex); - FCIP_TNF_PROBE_2((fcip_els_cb, "fcip io", /* CSTYLED */, - tnf_string, msg, "ELS callback", - tnf_uint, instance, instance)); - FCIP_DEBUG(FCIP_DEBUG_ELS, (CE_NOTE, "fcip%d, ELS callback , ", instance)); @@ -2740,10 +2673,6 @@ fcip_handle_farp_request(struct fcip *fptr, la_els_farp_t *fcmd) rval = fc_ulp_issue_els(fport->fcipp_handle, fc_pkt); if (rval != FC_SUCCESS) { - FCIP_TNF_PROBE_2((fcip_handle_farp_request, "fcip io", - /* CSTYLED */, tnf_string, msg, - "fcip_transport of farp reply failed", - tnf_uint, rval, rval)); FCIP_DEBUG(FCIP_DEBUG_ELS, (CE_WARN, "fcip_transport of farp reply failed 0x%x", rval)); } @@ -2864,9 +2793,6 @@ fcip_data_cb(opaque_t ulp_handle, opaque_t phandle, fptr->fcip_flags |= FCIP_IN_DATA_CB; mutex_exit(&fptr->fcip_mutex); - FCIP_TNF_PROBE_2((fcip_data_cb, "fcip io", /* CSTYLED */, - tnf_string, msg, "data callback", - tnf_int, instance, ddi_get_instance(fport->fcipp_dip))); FCIP_DEBUG(FCIP_DEBUG_UPSTREAM, (CE_NOTE, "fcip%d, data callback", ddi_get_instance(fport->fcipp_dip))); @@ -3084,8 +3010,6 @@ fcip_sendup_alloc_enque(struct fcip *fptr, mblk_t *mp, struct fcipstr *(*f)()) struct fcip_sendup_elem *msg_elem; int rval = FC_FAILURE; - FCIP_TNF_PROBE_1((fcip_sendup_alloc_enque, "fcip io", /* CSTYLED */, - tnf_string, msg, "sendup msg enque")); msg_elem = kmem_cache_alloc(fptr->fcip_sendup_cache, KM_NOSLEEP); if (msg_elem == NULL) { /* drop pkt to floor - update stats */ @@ -3196,9 +3120,6 @@ fcip_sendup_thr(void *arg) break; } - FCIP_TNF_PROBE_1((fcip_sendup_thr, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip sendup thr - new msg")); - msg_elem = fptr->fcip_sendup_head; fptr->fcip_sendup_head = msg_elem->fcipsu_next; msg_elem->fcipsu_next = NULL; @@ -3308,8 +3229,6 @@ fcip_sendup(struct fcip *fptr, mblk_t *mp, struct fcipstr *(*acceptfunc)()) fcph_network_hdr_t *nhdr; llc_snap_hdr_t *snaphdr; - FCIP_TNF_PROBE_1((fcip_sendup, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip sendup")); nhdr = (fcph_network_hdr_t *)mp->b_rptr; snaphdr = (llc_snap_hdr_t *)(mp->b_rptr + sizeof (fcph_network_hdr_t)); @@ -3330,8 +3249,6 @@ fcip_sendup(struct fcip *fptr, mblk_t *mp, struct fcipstr *(*acceptfunc)()) if ((slp = (*acceptfunc)(fcipstrup, fptr, type, dhostp)) == NULL) { rw_exit(&fcipstruplock); - FCIP_TNF_PROBE_1((fcip_sendup, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip sendup - no slp")); freemsg(mp); return; } @@ -3373,8 +3290,6 @@ fcip_sendup(struct fcip *fptr, mblk_t *mp, struct fcipstr *(*acceptfunc)()) } else { freemsg(mp); } - FCIP_TNF_PROBE_1((fcip_sendup, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip sendup done")); rw_exit(&fcipstruplock); } @@ -3392,9 +3307,6 @@ fcip_accept(struct fcipstr *slp, struct fcip *fptr, int type, la_wwn_t *dhostp) { t_uscalar_t sap; - FCIP_TNF_PROBE_1((fcip_accept, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip accept")); - for (; slp; slp = slp->sl_nextp) { sap = slp->sl_sap; FCIP_DEBUG(FCIP_DEBUG_UPSTREAM, (CE_CONT, @@ -3427,9 +3339,6 @@ fcip_addudind(struct fcip *fptr, mblk_t *mp, fcph_network_hdr_t *nhdr, hdrlen = (sizeof (llc_snap_hdr_t) + sizeof (fcph_network_hdr_t)); mp->b_rptr += hdrlen; - FCIP_TNF_PROBE_1((fcip_addudind, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip addudind")); - /* * Allocate an M_PROTO mblk for the DL_UNITDATA_IND. */ @@ -3486,8 +3395,6 @@ fcip_open(queue_t *rq, dev_t *devp, int flag, int sflag, cred_t *credp) minor_t minor; FCIP_DEBUG(FCIP_DEBUG_DOWNSTREAM, (CE_NOTE, "in fcip_open")); - FCIP_TNF_PROBE_1((fcip_open, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); /* * We need to ensure that the port driver is loaded before * we proceed @@ -3577,8 +3484,6 @@ fcip_close(queue_t *rq, int flag, cred_t *credp) struct fcipstr **prevslp; FCIP_DEBUG(FCIP_DEBUG_DOWNSTREAM, (CE_NOTE, "in fcip_close")); - FCIP_TNF_PROBE_1((fcip_close, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); ASSERT(rq); /* we should also have the active stream pointer in q_ptr */ ASSERT(rq->q_ptr); @@ -3635,8 +3540,6 @@ fcip_dodetach(struct fcipstr *slp) struct fcip *fptr; FCIP_DEBUG(FCIP_DEBUG_DETACH, (CE_NOTE, "in fcip_dodetach")); - FCIP_TNF_PROBE_1((fcip_dodetach, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); ASSERT(slp->sl_fcip != NULL); fptr = slp->sl_fcip; @@ -3741,8 +3644,6 @@ fcip_ioctl(queue_t *wq, mblk_t *mp) FCIP_DEBUG(FCIP_DEBUG_DOWNSTREAM, (CE_NOTE, "in fcip ioctl : %d", iocp->ioc_cmd)); - FCIP_TNF_PROBE_1((fcip_ioctl, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); switch (iocp->ioc_cmd) { case DLIOCRAW: @@ -3887,110 +3788,77 @@ fcip_proto(queue_t *wq, mblk_t *mp) dlp = (union DL_primitives *)mp->b_rptr; prim = dlp->dl_primitive; /* the DLPI command */ - FCIP_TNF_PROBE_5((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter", - tnf_opaque, wq, wq, - tnf_opaque, mp, mp, - tnf_opaque, MP_DB_TYPE, DB_TYPE(mp), - tnf_opaque, dl_primitive, dlp->dl_primitive)); - FCIP_DEBUG(FCIP_DEBUG_INIT, (CE_NOTE, "dl_primitve : %x", prim)); mutex_enter(&slp->sl_lock); switch (prim) { case DL_UNITDATA_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "unit data request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "unit data request")); fcip_udreq(wq, mp); break; case DL_ATTACH_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Attach request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Attach request")); fcip_areq(wq, mp); break; case DL_DETACH_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Detach request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Detach request")); fcip_dreq(wq, mp); break; case DL_BIND_REQ: FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Bind request")); - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Bind request")); fcip_breq(wq, mp); break; case DL_UNBIND_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "unbind request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "unbind request")); fcip_ubreq(wq, mp); break; case DL_INFO_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Info request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Info request")); fcip_ireq(wq, mp); break; case DL_SET_PHYS_ADDR_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "set phy addr request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "set phy addr request")); fcip_spareq(wq, mp); break; case DL_PHYS_ADDR_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "phy addr request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "phy addr request")); fcip_pareq(wq, mp); break; case DL_ENABMULTI_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Enable Multicast request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Enable Multicast request")); dlerrorack(wq, mp, prim, DL_UNSUPPORTED, 0); break; case DL_DISABMULTI_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Disable Multicast request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Disable Multicast request")); dlerrorack(wq, mp, prim, DL_UNSUPPORTED, 0); break; case DL_PROMISCON_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Promiscuous mode ON request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Promiscuous mode ON request")); dlerrorack(wq, mp, prim, DL_UNSUPPORTED, 0); break; case DL_PROMISCOFF_REQ: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Promiscuous mode OFF request")); FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "Promiscuous mode OFF request")); dlerrorack(wq, mp, prim, DL_UNSUPPORTED, 0); break; default: - FCIP_TNF_PROBE_1((fcip_proto, "fcip io", /* CSTYLED */, - tnf_string, msg, "Unsupported request")); dlerrorack(wq, mp, prim, DL_UNSUPPORTED, 0); break; } @@ -4022,9 +3890,6 @@ fcip_wsrv(queue_t *wq) slp = (struct fcipstr *)wq->q_ptr; fptr = slp->sl_fcip; - FCIP_TNF_PROBE_2((fcip_wsrv, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter", - tnf_opaque, wq, wq)); FCIP_DEBUG(FCIP_DEBUG_DOWNSTREAM, (CE_NOTE, "fcip wsrv")); while (mp = getq(wq)) { @@ -4080,10 +3945,6 @@ fcip_start(queue_t *wq, mblk_t *mp, struct fcip *fptr, fcip_port_info_t *fport = fptr->fcip_port_info; size_t datalen; - FCIP_TNF_PROBE_4((fcip_start, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter", tnf_opaque, wq, wq, - tnf_opaque, mp, mp, - tnf_opaque, MP_DB_TYPE, DB_TYPE(mp))); FCIP_DEBUG(FCIP_DEBUG_DOWNSTREAM, (CE_NOTE, "in fcipstart")); ASSERT(fdestp != NULL); @@ -4225,8 +4086,6 @@ static void fcip_fdestp_enqueue_pkt(struct fcip_dest *fdestp, fcip_pkt_t *fcip_pkt) { ASSERT(mutex_owned(&fdestp->fcipd_mutex)); - FCIP_TNF_PROBE_1((fcip_fdestp_enqueue_pkt, "fcip io", /* CSTYLED */, - tnf_string, msg, "destp enq pkt")); /* * Just hang it off the head of packet list @@ -4325,9 +4184,6 @@ fcip_transport(fcip_pkt_t *fcip_pkt) int rval = FC_FAILURE; struct fcip_routing_table *frp = NULL; - FCIP_TNF_PROBE_1((fcip_transport, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); - fptr = fcip_pkt->fcip_pkt_fptr; fport = fptr->fcip_port_info; fc_pkt = FCIP_PKT_TO_FC_PKT(fcip_pkt); @@ -4346,13 +4202,9 @@ fcip_transport(fcip_pkt_t *fcip_pkt) if ((fc_pkt->pkt_tran_type != FC_PKT_BROADCAST) && (fc_pkt->pkt_pd == NULL)) { mutex_exit(&fptr->fcip_mutex); - FCIP_TNF_PROBE_1((fcip_transport, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip transport no pd")); return (rval); } else if (fptr->fcip_port_state == FCIP_PORT_OFFLINE) { mutex_exit(&fptr->fcip_mutex); - FCIP_TNF_PROBE_1((fcip_transport, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip transport port offline")); return (FC_TRAN_BUSY); } mutex_exit(&fptr->fcip_mutex); @@ -4370,16 +4222,8 @@ fcip_transport(fcip_pkt_t *fcip_pkt) mutex_exit(&fptr->fcip_rt_mutex); if (frp && (frp->fcipr_state == FCIP_RT_INVALID)) { - FCIP_TNF_PROBE_1((fcip_transport, - "fcip io", /* CSTYLED */, - tnf_string, msg, - "fcip transport - TRANBUSY")); return (FC_TRAN_BUSY); } else { - FCIP_TNF_PROBE_1((fcip_transport, - "fcip io", /* CSTYLED */, - tnf_string, msg, - "fcip transport: frp unavailable")); return (rval); } } @@ -4417,8 +4261,6 @@ fcip_transport(fcip_pkt_t *fcip_pkt) } } - FCIP_TNF_PROBE_1((fcip_transport, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip transport done")); return (rval); } @@ -4465,8 +4307,6 @@ fcip_pkt_callback(fc_packet_t *fc_pkt) fcip_pkt_free(fcip_pkt, 1); } - FCIP_TNF_PROBE_1((fcip_pkt_callback, "fcip io", /* CSTYLED */, - tnf_string, msg, "pkt callback done")); FCIP_DEBUG(FCIP_DEBUG_DOWNSTREAM, (CE_NOTE, "pkt callback done")); } @@ -4509,10 +4349,6 @@ fcip_handle_topology(struct fcip *fptr) * topologies - we would probably not have a name server */ - FCIP_TNF_PROBE_3((fcip_handle_topology, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter", - tnf_uint, port_state, fport->fcipp_pstate, - tnf_uint, topology, fport->fcipp_topology)); FCIP_DEBUG(FCIP_DEBUG_INIT, (CE_NOTE, "port state: %x, topology %x", fport->fcipp_pstate, fport->fcipp_topology)); @@ -4688,8 +4524,6 @@ fcip_init_port(struct fcip *fptr) ASSERT(fport != NULL); - FCIP_TNF_PROBE_1((fcip_init_port, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); mutex_enter(&fptr->fcip_mutex); /* @@ -4721,10 +4555,6 @@ fcip_init_port(struct fcip *fptr) fptr->fcip_ub_nbufs = fcip_ub_nbufs; tok_buf_size = sizeof (*fptr->fcip_ub_tokens) * fcip_ub_nbufs; - FCIP_TNF_PROBE_2((fcip_init_port, "fcip io", /* CSTYLED */, - tnf_string, msg, "debug", - tnf_int, tokBufsize, tok_buf_size)); - FCIP_DEBUG(FCIP_DEBUG_INIT, (CE_WARN, "tokBufsize: 0x%lx", tok_buf_size)); @@ -4756,8 +4586,6 @@ fcip_init_port(struct fcip *fptr) goto done; case FC_UB_ERROR: - FCIP_TNF_PROBE_1((fcip_init_port, "fcip io", /* CSTYLED */, - tnf_string, msg, "invalid ub alloc request")); FCIP_DEBUG(FCIP_DEBUG_INIT, (CE_WARN, "invalid ub alloc request !!")); rval = FC_FAILURE; @@ -4800,9 +4628,6 @@ fcip_init_port(struct fcip *fptr) 8, fcip_sendup_constructor, NULL, NULL, (void *)fport, NULL, 0); if (fptr->fcip_xmit_cache == NULL) { - FCIP_TNF_PROBE_2((fcip_init_port, "fcip io", /* CSTYLED */, - tnf_string, msg, "unable to allocate xmit cache", - tnf_int, instance, fptr->fcip_instance)); FCIP_DEBUG(FCIP_DEBUG_INIT, (CE_WARN, "fcip%d unable to allocate xmit cache", fptr->fcip_instance)); @@ -5134,9 +4959,6 @@ fcip_ireq(queue_t *wq, mblk_t *mp) FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "fcip_ireq: info request req rcvd")); - FCIP_TNF_PROBE_1((fcip_ireq, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip ireq entered")); - if (MBLKL(mp) < DL_INFO_REQ_SIZE) { dlerrorack(wq, mp, DL_INFO_REQ, DL_BADPRIM, 0); return; @@ -5199,9 +5021,6 @@ fcip_udreq(queue_t *wq, mblk_t *mp) FCIP_DEBUG(FCIP_DEBUG_DLPI, (CE_NOTE, "inside fcip_udreq")); - FCIP_TNF_PROBE_1((fcip_udreq, "fcip io", /* CSTYLED */, - tnf_string, msg, "fcip udreq entered")); - slp = (struct fcipstr *)wq->q_ptr; if (slp->sl_state != DL_IDLE) { @@ -6915,8 +6734,6 @@ fcip_init_broadcast_pkt(fcip_pkt_t *fcip_pkt, void (*comp) (), int is_els) uint32_t sid; uint32_t did; - FCIP_TNF_PROBE_1((fcip_init_broadcast_pkt, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter")); fc_pkt = FCIP_PKT_TO_FC_PKT(fcip_pkt); fr_hdr = &fc_pkt->pkt_cmd_fhdr; sid = fport->fcipp_sid.port_id; @@ -7103,10 +6920,6 @@ fcip_get_broadcast_did(struct fcip *fptr) uint32_t did = 0; uint32_t sid; - FCIP_TNF_PROBE_2((fcip_get_broadcast_did, "fcip io", /* CSTYLED */, - tnf_string, msg, "enter", - tnf_opaque, fptr, fptr)); - sid = fport->fcipp_sid.port_id; switch (fport->fcipp_topology) { @@ -7172,9 +6985,6 @@ fcip_get_broadcast_did(struct fcip *fptr) fptr->fcip_instance)); break; } - FCIP_TNF_PROBE_2((fcip_get_broadcast_did, "fcip io", /* CSTYLED */, - tnf_string, msg, "return", - tnf_opaque, did, did)); return (did); } @@ -7486,12 +7296,6 @@ fcip_rte_remove_deferred(void *arg) fdestp->fcipd_rtable = NULL; mutex_exit(&fdestp->fcipd_mutex); - FCIP_TNF_PROBE_2((fcip_rte_remove_deferred, - "fcip io", /* CSTYLED */, - tnf_string, msg, - "remove retired routing entry", - tnf_int, index, index)); - if (frtp_prev == NULL) { /* first element */ fptr->fcip_rtable[index] = diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor.c index 6fb110d9e4..ec2f0127ac 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor.c @@ -160,12 +160,6 @@ static struct modlinkage tavor_modlinkage = { */ extern ibc_operations_t tavor_ibc_ops; -#ifndef NPROBE -extern int tnf_mod_load(void); -extern int tnf_mod_unload(struct modlinkage *mlp); -#endif - - /* * _init() */ @@ -174,48 +168,27 @@ _init() { int status; -#ifndef NPROBE - (void) tnf_mod_load(); -#endif - TAVOR_TNF_ENTER(tavor_init); - status = ddi_soft_state_init(&tavor_statep, sizeof (tavor_state_t), (size_t)TAVOR_INITIAL_STATES); if (status != 0) { - TNF_PROBE_0(tavor_init_ssi_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_init); -#ifndef NPROBE - (void) tnf_mod_unload(&tavor_modlinkage); -#endif return (status); } status = ibc_init(&tavor_modlinkage); if (status != 0) { - TNF_PROBE_0(tavor_init_ibc_init_fail, TAVOR_TNF_ERROR, ""); ddi_soft_state_fini(&tavor_statep); - TAVOR_TNF_EXIT(tavor_init); -#ifndef NPROBE - (void) tnf_mod_unload(&tavor_modlinkage); -#endif return (status); } status = mod_install(&tavor_modlinkage); if (status != 0) { - TNF_PROBE_0(tavor_init_modi_fail, TAVOR_TNF_ERROR, ""); ibc_fini(&tavor_modlinkage); ddi_soft_state_fini(&tavor_statep); - TAVOR_TNF_EXIT(tavor_init); -#ifndef NPROBE - (void) tnf_mod_unload(&tavor_modlinkage); -#endif return (status); } /* Initialize the Tavor "userland resources database" */ tavor_umap_db_init(); - TAVOR_TNF_EXIT(tavor_init); return (status); } @@ -228,9 +201,7 @@ _info(struct modinfo *modinfop) { int status; - TAVOR_TNF_ENTER(tavor_info); status = mod_info(&tavor_modlinkage, modinfop); - TAVOR_TNF_EXIT(tavor_info); return (status); } @@ -243,12 +214,8 @@ _fini() { int status; - TAVOR_TNF_ENTER(tavor_fini); - status = mod_remove(&tavor_modlinkage); if (status != 0) { - TNF_PROBE_0(tavor_fini_modr_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_fini); return (status); } @@ -257,10 +224,6 @@ _fini() ibc_fini(&tavor_modlinkage); ddi_soft_state_fini(&tavor_statep); -#ifndef NPROBE - (void) tnf_mod_unload(&tavor_modlinkage); -#endif - TAVOR_TNF_EXIT(tavor_fini); return (status); } @@ -276,17 +239,12 @@ tavor_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd, void *arg, void **result) tavor_state_t *state; minor_t instance; - TAVOR_TNF_ENTER(tavor_getinfo); - switch (cmd) { case DDI_INFO_DEVT2DEVINFO: dev = (dev_t)arg; instance = TAVOR_DEV_INSTANCE(dev); state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_getinfo_gss_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_getinfo); return (DDI_FAILURE); } *result = (void *)state->ts_dip; @@ -299,11 +257,9 @@ tavor_getinfo(dev_info_t *dip, ddi_info_cmd_t cmd, void *arg, void **result) return (DDI_SUCCESS); default: - TNF_PROBE_0(tavor_getinfo_default_fail, TAVOR_TNF_ERROR, ""); break; } - TAVOR_TNF_EXIT(tavor_getinfo); return (DDI_FAILURE); } @@ -324,13 +280,9 @@ tavor_open(dev_t *devp, int flag, int otyp, cred_t *credp) dev_t dev; int status; - TAVOR_TNF_ENTER(tavor_open); - instance = TAVOR_DEV_INSTANCE(*devp); state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_open_gss_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_open); return (ENXIO); } @@ -340,8 +292,6 @@ tavor_open(dev_t *devp, int flag, int otyp, cred_t *credp) */ if ((otyp != OTYP_CHR) || ((flag & FEXCL) && secpolicy_excl_open(credp) != 0)) { - TNF_PROBE_0(tavor_open_invflags_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_open); return (EINVAL); } @@ -398,9 +348,6 @@ tavor_open(dev_t *devp, int flag, int otyp, cred_t *credp) if (status != DDI_SUCCESS) { mutex_exit( &tavor_userland_rsrc_db.tdl_umapdb_lock); - TNF_PROBE_0(tavor_open_rsrcalloc_uarpg_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_open); return (EAGAIN); } @@ -419,9 +366,6 @@ tavor_open(dev_t *devp, int flag, int otyp, cred_t *credp) if (TAVOR_IS_OPERATIONAL(state->ts_operational_mode)) { tavor_rsrc_free(state, &rsrcp); } - TNF_PROBE_0(tavor_open_umap_db_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_open); return (EAGAIN); } @@ -447,9 +391,6 @@ tavor_open(dev_t *devp, int flag, int otyp, cred_t *credp) if (TAVOR_IS_OPERATIONAL(state->ts_operational_mode)) { tavor_rsrc_free(state, &rsrcp); } - TNF_PROBE_0(tavor_open_umap_db_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_open); return (EAGAIN); } @@ -471,7 +412,6 @@ tavor_open(dev_t *devp, int flag, int otyp, cred_t *credp) *devp = dev; - TAVOR_TNF_EXIT(tavor_open); return (0); } @@ -491,13 +431,9 @@ tavor_close(dev_t dev, int flag, int otyp, cred_t *credp) uint64_t key, value; int status; - TAVOR_TNF_ENTER(tavor_close); - instance = TAVOR_DEV_INSTANCE(dev); state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_close_gss_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_close); return (ENXIO); } @@ -566,7 +502,6 @@ tavor_close(dev_t dev, int flag, int otyp, cred_t *credp) } mutex_exit(&tavor_userland_rsrc_db.tdl_umapdb_lock); - TAVOR_TNF_EXIT(tavor_close); return (0); } @@ -584,8 +519,6 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) int instance; int status; - TAVOR_TNF_ENTER(tavor_attach); - #ifdef __lock_lint (void) tavor_quiesce(dip); #endif @@ -595,7 +528,6 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) instance = ddi_get_instance(dip); status = ddi_soft_state_zalloc(tavor_statep, instance); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_attach_ssz_fail, TAVOR_TNF_ERROR, ""); cmn_err(CE_NOTE, "tavor%d: driver failed to attach: " "attach_ssz_fail", instance); goto fail_attach_nomsg; @@ -604,7 +536,6 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { ddi_soft_state_free(tavor_statep, instance); - TNF_PROBE_0(tavor_attach_gss_fail, TAVOR_TNF_ERROR, ""); cmn_err(CE_NOTE, "tavor%d: driver failed to attach: " "attach_gss_fail", instance); goto fail_attach_nomsg; @@ -627,8 +558,6 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) status = tavor_drv_init(state, dip, instance); if ((status != DDI_SUCCESS) && (TAVOR_IS_OPERATIONAL(state->ts_operational_mode))) { - TNF_PROBE_0(tavor_attach_drvinit_fail, - TAVOR_TNF_ERROR, ""); goto fail_attach; } @@ -639,8 +568,6 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) tavor_drv_fini(state); TAVOR_ATTACH_MSG(state->ts_attach_buf, "attach_create_mn_fail"); - TNF_PROBE_0(tavor_attach_create_mn_fail, - TAVOR_TNF_ERROR, ""); goto fail_attach; } @@ -658,8 +585,6 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) if (ibc_status != IBC_SUCCESS) { ddi_remove_minor_node(dip, "devctl"); tavor_drv_fini(state); - TNF_PROBE_0(tavor_attach_ibcattach_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "attach_ibcattach_fail"); goto fail_attach; @@ -686,8 +611,6 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) ibc_detach(tmp_ibtfpriv); ddi_remove_minor_node(dip, "devctl"); tavor_drv_fini(state); - TNF_PROBE_0(tavor_attach_agentinit_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "attach_agentinit_fail"); goto fail_attach; @@ -706,16 +629,13 @@ tavor_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) "(for maintenance mode only)", state->ts_instance); } - TAVOR_TNF_EXIT(tavor_attach); return (DDI_SUCCESS); case DDI_RESUME: /* Add code here for DDI_RESUME XXX */ - TAVOR_TNF_EXIT(tavor_attach); return (DDI_FAILURE); default: - TNF_PROBE_0(tavor_attach_default_fail, TAVOR_TNF_ERROR, ""); break; } @@ -725,7 +645,6 @@ fail_attach: tavor_drv_fini2(state); ddi_soft_state_free(tavor_statep, instance); fail_attach_nomsg: - TAVOR_TNF_EXIT(tavor_attach); return (DDI_FAILURE); } @@ -742,13 +661,9 @@ tavor_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) ibc_status_t ibc_status; int instance, status; - TAVOR_TNF_ENTER(tavor_detach); - instance = ddi_get_instance(dip); state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_detach_gss_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_detach); return (DDI_FAILURE); } @@ -764,9 +679,6 @@ tavor_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) /* Unregister agents from IB Mgmt Framework (IBMF) */ status = tavor_agent_handlers_fini(state); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_detach_agentfini_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_detach); return (DDI_FAILURE); } @@ -785,9 +697,6 @@ tavor_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) TAVOR_WARNING(state, "failed to " "restart Tavor agents"); } - TNF_PROBE_0(tavor_detach_ibcpredetach_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_detach); return (DDI_FAILURE); } @@ -831,20 +740,16 @@ tavor_detach(dev_info_t *dip, ddi_detach_cmd_t cmd) tavor_drv_fini2(state); ddi_soft_state_free(tavor_statep, instance); - TAVOR_TNF_EXIT(tavor_detach); return (DDI_SUCCESS); case DDI_SUSPEND: /* Add code here for DDI_SUSPEND XXX */ - TAVOR_TNF_EXIT(tavor_detach); return (DDI_FAILURE); default: - TNF_PROBE_0(tavor_detach_default_fail, TAVOR_TNF_ERROR, ""); break; } - TAVOR_TNF_EXIT(tavor_detach); return (DDI_FAILURE); } @@ -858,8 +763,6 @@ tavor_drv_init(tavor_state_t *state, dev_info_t *dip, int instance) { int status; - TAVOR_TNF_ENTER(tavor_drv_init); - /* Save away devinfo and instance */ state->ts_dip = dip; state->ts_instance = instance; @@ -885,9 +788,6 @@ tavor_drv_init(tavor_state_t *state, dev_info_t *dip, int instance) } else { state->ts_operational_mode = 0; /* invalid operational mode */ TAVOR_WARNING(state, "unexpected device type detected"); - TNF_PROBE_0(tavor_hw_init_unexpected_dev_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -905,8 +805,6 @@ tavor_drv_init(tavor_state_t *state, dev_info_t *dip, int instance) state->ts_operational_mode = TAVOR_MAINTENANCE_MODE; cmn_err(CE_NOTE, "tavor%d: error during attach: %s", instance, state->ts_attach_buf); - TNF_PROBE_0(tavor_drv_init_hwinit_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_drv_init); return (DDI_FAILURE); } @@ -914,8 +812,6 @@ tavor_drv_init(tavor_state_t *state, dev_info_t *dip, int instance) status = tavor_isr_init(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, TAVOR_DRV_CLEANUP_ALL); - TNF_PROBE_0(tavor_drv_init_isrinit_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_drv_init); return (DDI_FAILURE); } @@ -924,12 +820,9 @@ tavor_drv_init(tavor_state_t *state, dev_info_t *dip, int instance) if (status != DDI_SUCCESS) { tavor_isr_fini(state); tavor_hw_fini(state, TAVOR_DRV_CLEANUP_ALL); - TNF_PROBE_0(tavor_drv_init_ssiinit_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_drv_init); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_drv_init); return (DDI_SUCCESS); } @@ -941,8 +834,6 @@ tavor_drv_init(tavor_state_t *state, dev_info_t *dip, int instance) static void tavor_drv_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_drv_fini); - /* Cleanup Tavor softstate */ tavor_soft_state_fini(state); @@ -951,8 +842,6 @@ tavor_drv_fini(tavor_state_t *state) /* Cleanup Tavor resources and shutdown hardware */ tavor_hw_fini(state, TAVOR_DRV_CLEANUP_ALL); - - TAVOR_TNF_EXIT(tavor_drv_fini); } /* @@ -962,8 +851,6 @@ tavor_drv_fini(tavor_state_t *state) static void tavor_drv_fini2(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_drv_fini2); - /* TAVOR_DRV_CLEANUP_LEVEL1 */ if (state->ts_reg_cmdhdl) { ddi_regs_map_free(&state->ts_reg_cmdhdl); @@ -975,8 +862,6 @@ tavor_drv_fini2(tavor_state_t *state) pci_config_teardown(&state->ts_pci_cfghdl); state->ts_pci_cfghdl = NULL; } - - TAVOR_TNF_EXIT(tavor_drv_fini2); } /* @@ -988,16 +873,12 @@ tavor_isr_init(tavor_state_t *state) { int status; - TAVOR_TNF_ENTER(tavor_isr_init); - /* * Add a handler for the interrupt or MSI */ status = ddi_intr_add_handler(state->ts_intrmsi_hdl, tavor_isr, (caddr_t)state, NULL); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_isr_init_addhndlr_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_isr_init); return (DDI_FAILURE); } @@ -1010,17 +891,11 @@ tavor_isr_init(tavor_state_t *state) if (state->ts_intrmsi_cap & DDI_INTR_FLAG_BLOCK) { status = ddi_intr_block_enable(&state->ts_intrmsi_hdl, 1); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_isr_init_blockenable_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_isr_init); return (DDI_FAILURE); } } else { status = ddi_intr_enable(state->ts_intrmsi_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_isr_init_intrenable_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_isr_init); return (DDI_FAILURE); } } @@ -1031,7 +906,6 @@ tavor_isr_init(tavor_state_t *state) */ tavor_eq_arm_all(state); - TAVOR_TNF_EXIT(tavor_isr_init); return (DDI_SUCCESS); } @@ -1043,8 +917,6 @@ tavor_isr_init(tavor_state_t *state) static void tavor_isr_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_isr_fini); - /* Disable the software interrupt */ if (state->ts_intrmsi_cap & DDI_INTR_FLAG_BLOCK) { (void) ddi_intr_block_disable(&state->ts_intrmsi_hdl, 1); @@ -1056,8 +928,6 @@ tavor_isr_fini(tavor_state_t *state) * Remove the software handler for the interrupt or MSI */ (void) ddi_intr_remove_handler(state->ts_intrmsi_hdl); - - TAVOR_TNF_EXIT(tavor_isr_fini); } @@ -1100,8 +970,6 @@ tavor_hw_init(tavor_state_t *state) int status; int retries; - TAVOR_TNF_ENTER(tavor_hw_init); - /* This is where driver initialization begins */ cleanup = TAVOR_DRV_CLEANUP_LEVEL0; @@ -1126,10 +994,8 @@ tavor_hw_init(tavor_state_t *state) &state->ts_reg_cmdhdl); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_CMD_ddirms_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_CMD_ddirms_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL1; @@ -1139,10 +1005,8 @@ tavor_hw_init(tavor_state_t *state) &state->ts_reg_uarhdl); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_UAR_ddirms_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_UAR_ddirms_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL2; @@ -1152,11 +1016,8 @@ tavor_hw_init(tavor_state_t *state) cmn_err(CE_CONT, "Tavor: ddi_dev_regsize() failed " "(check HCA-attached DIMM memory?)\n"); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_DDR_ddi_regsize_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_DDR_ddi_regsize_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1202,8 +1063,6 @@ tavor_hw_init(tavor_state_t *state) * Set the updated config profile setting here. */ if (status == DDI_SUCCESS) { - TNF_PROBE_0(tavor_hw_init_DDR_128mb_fallback_success, - TAVOR_TNF_TRACE, ""); state->ts_cfg_profile_setting = TAVOR_DDR_SIZE_128; } } @@ -1214,10 +1073,8 @@ tavor_hw_init(tavor_state_t *state) "(check HCA-attached DIMM memory?)\n"); } tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_DDR_ddirms_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_DDR_ddirms_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL3; @@ -1244,9 +1101,7 @@ tavor_hw_init(tavor_state_t *state) status = tavor_cfg_profile_init_phase1(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_cfginit_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_cfginit_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL4; @@ -1255,9 +1110,7 @@ tavor_hw_init(tavor_state_t *state) status = tavor_sw_reset(state); if (status != TAVOR_CMD_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_sw_reset_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_sw_reset_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1275,11 +1128,8 @@ tavor_hw_init(tavor_state_t *state) "0x%" PRIx64 "\n", status, errorcode); } tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_sys_en_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_sys_en_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL5; @@ -1288,10 +1138,8 @@ tavor_hw_init(tavor_state_t *state) status = tavor_rsrc_init_phase1(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_rsrcinit1_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_rsrcinit1_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL6; @@ -1304,11 +1152,8 @@ tavor_hw_init(tavor_state_t *state) cmn_err(CE_CONT, "Tavor: QUERY_DDR command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_query_ddr_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_query_ddr_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1319,21 +1164,15 @@ tavor_hw_init(tavor_state_t *state) cmn_err(CE_CONT, "Tavor: QUERY_FW command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_query_fw_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_query_fw_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } if (tavor_fix_error_buf(state) != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_fixerrorbuf_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_fixerrorbuf_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1368,11 +1207,8 @@ tavor_hw_init(tavor_state_t *state) state->ts_fw.fw_rev_subminor); } tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_checkfwver_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_checkfwver_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1390,11 +1226,8 @@ retry: cmn_err(CE_CONT, "Tavor: MOD_STAT_CFG command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_mod_stat_cfg_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_mod_stat_cfg_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1406,11 +1239,8 @@ retry: cmn_err(CE_CONT, "Tavor: QUERY_DEV_LIM command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_query_devlim_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_query_devlim_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1418,9 +1248,7 @@ retry: status = tavor_cfg_profile_init_phase2(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_cfginit2_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_cfginit2_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1428,10 +1256,8 @@ retry: status = tavor_rsrc_init_phase2(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_rsrcinit2_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_rsrcinit2_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL7; @@ -1444,11 +1270,8 @@ retry: cmn_err(CE_CONT, "Tavor: QUERY_ADAPTER command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_query_adapter_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_query_adapter_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1462,11 +1285,8 @@ retry: cmn_err(CE_CONT, "Tavor: INIT_HCA command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_init_hca_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_init_hca_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL8; @@ -1475,11 +1295,8 @@ retry: status = tavor_pd_alloc(state, &state->ts_pdhdl_internal, TAVOR_SLEEP); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_internal_pd_alloc_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_internal_pd_alloc_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL9; @@ -1488,11 +1305,8 @@ retry: status = tavor_internal_uarpgs_init(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_internal_uarpgs_alloc_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_internal_uarpgs_alloc_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL10; @@ -1501,11 +1315,8 @@ retry: status = tavor_intr_or_msi_init(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_intr_or_msi_init_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "intr_or_msi_init_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL11; @@ -1514,10 +1325,8 @@ retry: status = tavor_eq_init_all(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_eqinitall_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_eqinitall_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL12; @@ -1526,11 +1335,8 @@ retry: status = tavor_special_qp_contexts_reserve(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_reserve_special_qp_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_reserve_special_qp_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL13; @@ -1539,9 +1345,7 @@ retry: status = tavor_mcg_init(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_mcg_init_fail, TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_mcg_init_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_LEVEL14; @@ -1550,11 +1354,8 @@ retry: status = tavor_hca_port_init(state); if (status != DDI_SUCCESS) { tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_hca_port_init_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_hca_port_init_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } cleanup = TAVOR_DRV_CLEANUP_ALL; @@ -1566,11 +1367,8 @@ retry: cmn_err(CE_CONT, "Tavor: GetNodeInfo command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_getnodeinfo_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_getnodeinfo_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } @@ -1619,15 +1417,11 @@ retry: cmn_err(CE_CONT, "Tavor: GetNodeDesc command failed: %08x\n", status); tavor_hw_fini(state, cleanup); - TNF_PROBE_0(tavor_hw_init_getnodedesc_cmd_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "hw_init_getnodedesc_cmd_fail"); - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_hw_init); return (DDI_SUCCESS); } @@ -1642,8 +1436,6 @@ tavor_hw_fini(tavor_state_t *state, tavor_drv_cleanup_level_t cleanup) uint_t num_ports; int status; - TAVOR_TNF_ENTER(tavor_hw_fini); - switch (cleanup) { /* * If we add more driver initialization steps that should be cleaned @@ -1675,9 +1467,6 @@ tavor_hw_fini(tavor_state_t *state, tavor_drv_cleanup_level_t cleanup) status = tavor_eq_fini_all(state); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to teardown EQs"); - TNF_PROBE_0(tavor_hw_fini_eqfiniall_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_hw_fini); return; } /* FALLTHROUGH */ @@ -1686,9 +1475,6 @@ tavor_hw_fini(tavor_state_t *state, tavor_drv_cleanup_level_t cleanup) status = tavor_intr_or_msi_fini(state); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to free intr/MSI"); - TNF_PROBE_0(tavor_hw_fini_intrmsifini_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_hw_fini); return; } /* FALLTHROUGH */ @@ -1707,9 +1493,6 @@ tavor_hw_fini(tavor_state_t *state, tavor_drv_cleanup_level_t cleanup) status = tavor_pd_free(state, &state->ts_pdhdl_internal); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to free internal PD"); - TNF_PROBE_0(tavor_hw_fini_internal_pd_free_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_hw_fini); return; } /* FALLTHROUGH */ @@ -1724,9 +1507,6 @@ tavor_hw_fini(tavor_state_t *state, tavor_drv_cleanup_level_t cleanup) TAVOR_CMD_NOSLEEP_SPIN); if (status != TAVOR_CMD_SUCCESS) { TAVOR_WARNING(state, "failed to shutdown HCA"); - TNF_PROBE_0(tavor_hw_fini_closehcacmd_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_hw_fini); return; } /* FALLTHROUGH */ @@ -1751,9 +1531,6 @@ tavor_hw_fini(tavor_state_t *state, tavor_drv_cleanup_level_t cleanup) status = tavor_sys_dis_cmd_post(state, TAVOR_CMD_NOSLEEP_SPIN); if (status != TAVOR_CMD_SUCCESS) { TAVOR_WARNING(state, "failed to shutdown hardware"); - TNF_PROBE_0(tavor_hw_fini_sys_dis_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_hw_fini); return; } /* FALLTHROUGH */ @@ -1781,12 +1558,8 @@ tavor_hw_fini(tavor_state_t *state, tavor_drv_cleanup_level_t cleanup) default: TAVOR_WARNING(state, "unexpected driver cleanup level"); - TNF_PROBE_0(tavor_hw_fini_default_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_hw_fini); return; } - - TAVOR_TNF_EXIT(tavor_hw_fini); } @@ -1802,8 +1575,6 @@ tavor_soft_state_init(tavor_state_t *state) ibt_hca_flags_t caps = IBT_HCA_NO_FLAGS; int status; - TAVOR_TNF_ENTER(tavor_soft_state_init); - /* * The ibc_hca_info_t struct is passed to the IBTF. This is the * routine where we initialize it. Many of the init values come from @@ -1875,12 +1646,8 @@ tavor_soft_state_init(tavor_state_t *state) val = ((uint64_t)1 << state->ts_cfg_profile->cp_log_max_qp_sz); if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_maxqpsz_toobig_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max QP size " - "exceeds device maximum", tnf_uint, maxsz, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_maxqpsz_toobig_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_qp_sz = val; @@ -1890,12 +1657,8 @@ tavor_soft_state_init(tavor_state_t *state) val = state->ts_cfg_profile->cp_wqe_max_sgl; if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_toomanysgl_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of sgl " - "exceeds device maximum", tnf_uint, maxsgl, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_toomanysgl_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } /* If the rounded value for max SGL is too large, cap it */ @@ -1922,12 +1685,8 @@ tavor_soft_state_init(tavor_state_t *state) val = ((uint64_t)1 << state->ts_cfg_profile->cp_log_max_cq_sz) - 1; if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_maxcqsz_toobig_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max CQ size " - "exceeds device maximum", tnf_uint, maxsz, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_maxcqsz_toobig_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_cq_sz = val; @@ -1946,12 +1705,8 @@ tavor_soft_state_init(tavor_state_t *state) if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_maxsrqsz_toobig_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max SRQ size " - "exceeds device maximum", tnf_uint, maxsz, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_maxsrqsz_toobig_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_srqs_sz = val; @@ -1960,12 +1715,8 @@ tavor_soft_state_init(tavor_state_t *state) maxval = state->ts_devlim.max_sg; if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_toomanysrqsgl_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of srq " - "sgl exceeds device maximum", tnf_uint, maxsgl, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_toomanysrqsgl_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_srq_sgl = val; @@ -1994,12 +1745,8 @@ tavor_soft_state_init(tavor_state_t *state) val = state->ts_cfg_profile->cp_log_max_mrw_sz; if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_maxmrwsz_toobig_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max mrw size " - "exceeds device maximum", tnf_uint, maxsz, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_maxmrwsz_toobig_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_memr_len = ((uint64_t)1 << val); @@ -2036,12 +1783,8 @@ tavor_soft_state_init(tavor_state_t *state) if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_toomanypkey_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of PKeys " - "exceeds device maximum", tnf_uint, maxpkey, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_toomanypkey_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_partitions = val; @@ -2051,12 +1794,8 @@ tavor_soft_state_init(tavor_state_t *state) val = state->ts_cfg_profile->cp_num_ports; if ((val > maxval) || (val == 0)) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_toomanyports_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of ports " - "exceeds device maximum", tnf_uint, maxports, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_toomanyports_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_nports = val; @@ -2082,12 +1821,8 @@ tavor_soft_state_init(tavor_state_t *state) val = ((uint64_t)1 << state->ts_cfg_profile->cp_log_num_pd); if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_toomanypd_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of PD " - "exceeds device maximum", tnf_uint, maxpd, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_toomanypd_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_pd = val; @@ -2097,12 +1832,8 @@ tavor_soft_state_init(tavor_state_t *state) val = ((uint64_t)1 << state->ts_cfg_profile->cp_log_num_ah); if (val > maxval) { kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_2(tavor_soft_state_init_toomanyah_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of AH " - "exceeds device maximum", tnf_uint, maxah, maxval); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_toomanyah_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } hca_attr->hca_max_ah = val; @@ -2135,15 +1866,11 @@ tavor_soft_state_init(tavor_state_t *state) mutex_destroy(&state->ts_fw_flashlock); mutex_destroy(&state->ts_uar_lock); kmem_free(hca_attr, sizeof (ibt_hca_attr_t)); - TNF_PROBE_0(tavor_soft_state_init_kstatinit_fail, - TAVOR_TNF_ERROR, ""); TAVOR_ATTACH_MSG(state->ts_attach_buf, "soft_state_init_kstatinit_fail"); - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_soft_state_init); return (DDI_SUCCESS); } @@ -2155,8 +1882,6 @@ tavor_soft_state_init(tavor_state_t *state) static void tavor_soft_state_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_soft_state_fini); - /* Teardown the kstat info */ tavor_kstat_fini(state); @@ -2174,8 +1899,6 @@ tavor_soft_state_fini(tavor_state_t *state) /* Free up the hca_attr struct */ kmem_free(state->ts_ibtfinfo.hca_attr, sizeof (ibt_hca_attr_t)); - - TAVOR_TNF_EXIT(tavor_soft_state_fini); } @@ -2192,8 +1915,6 @@ tavor_hca_config_setup(tavor_state_t *state, uint64_t offset, addr; uint_t mcg_size; - TAVOR_TNF_ENTER(tavor_hca_config_setup); - /* Set "host endianness". Default is big endian */ #ifdef _LITTLE_ENDIAN inithca->big_endian = 0; @@ -2295,8 +2016,6 @@ tavor_hca_config_setup(tavor_state_t *state, inithca->uar.uarscr_baseaddr = addr; inithca->uar.uar_pg_sz = PAGESHIFT - 0xC; - - TAVOR_TNF_EXIT(tavor_hca_config_setup); } @@ -2314,8 +2033,6 @@ tavor_hca_port_init(tavor_state_t *state) uint64_t maxval, val; uint64_t sysimgguid, nodeguid, portguid; - TAVOR_TNF_ENTER(tavor_hca_port_init); - cfgprof = state->ts_cfg_profile; /* Get number of HCA ports */ @@ -2363,11 +2080,6 @@ tavor_hca_port_init(tavor_state_t *state) maxval = state->ts_devlim.max_mtu; val = cfgprof->cp_max_mtu; if (val > maxval) { - TNF_PROBE_2(tavor_hca_port_init_maxmtu_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max " - "MTU size exceeds device maximum", tnf_uint, - maxmtu, maxval); - TAVOR_TNF_EXIT(tavor_hca_port_init); goto init_ports_fail; } initib->mtu_cap = val; @@ -2376,11 +2088,6 @@ tavor_hca_port_init(tavor_state_t *state) maxval = state->ts_devlim.max_port_width; val = cfgprof->cp_max_port_width; if (val > maxval) { - TNF_PROBE_2(tavor_hca_port_init_maxportwidth_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max " - "port width exceeds device maximum", tnf_uint, - maxportwidth, maxval); - TAVOR_TNF_EXIT(tavor_hca_port_init); goto init_ports_fail; } initib->port_width_cap = val; @@ -2389,11 +2096,6 @@ tavor_hca_port_init(tavor_state_t *state) maxval = state->ts_devlim.max_vl; val = cfgprof->cp_max_vlcap; if (val > maxval) { - TNF_PROBE_2(tavor_hca_port_init_maxvlcap_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max " - "VLcap size exceeds device maximum", tnf_uint, - maxvlcap, maxval); - TAVOR_TNF_EXIT(tavor_hca_port_init); goto init_ports_fail; } initib->vl_cap = val; @@ -2402,11 +2104,6 @@ tavor_hca_port_init(tavor_state_t *state) maxval = ((uint64_t)1 << state->ts_devlim.log_max_gid); val = ((uint64_t)1 << cfgprof->cp_log_max_gidtbl); if (val > maxval) { - TNF_PROBE_2(tavor_hca_port_init_gidtable_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max " - "GID table size exceeds device maximum", tnf_uint, - maxgidtbl, maxval); - TAVOR_TNF_EXIT(tavor_hca_port_init); goto init_ports_fail; } initib->max_gid = val; @@ -2415,11 +2112,6 @@ tavor_hca_port_init(tavor_state_t *state) maxval = ((uint64_t)1 << state->ts_devlim.log_max_pkey); val = ((uint64_t)1 << cfgprof->cp_log_max_pkeytbl); if (val > maxval) { - TNF_PROBE_2(tavor_hca_port_init_pkeytable_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "max " - "PKey table size exceeds device maximum", tnf_uint, - maxpkeytbl, maxval); - TAVOR_TNF_EXIT(tavor_hca_port_init); goto init_ports_fail; } initib->max_pkey = val; @@ -2434,17 +2126,12 @@ tavor_hca_port_init(tavor_state_t *state) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: INIT_IB (port %02d) command " "failed: %08x\n", i + 1, status); - TNF_PROBE_2(tavor_hca_port_init_init_ib_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, port, i + 1); - TAVOR_TNF_EXIT(tavor_hca_port_init); goto init_ports_fail; } } /* Free up the memory for Tavor port init struct(s), return success */ kmem_free(portinits, num_ports * sizeof (tavor_hw_initib_t)); - TAVOR_TNF_EXIT(tavor_hca_port_init); return (DDI_SUCCESS); init_ports_fail: @@ -2455,7 +2142,6 @@ init_ports_fail: kmem_free(portinits, num_ports * sizeof (tavor_hw_initib_t)); (void) tavor_hca_ports_shutdown(state, i); - TAVOR_TNF_EXIT(tavor_hca_port_init); return (DDI_FAILURE); } @@ -2469,31 +2155,22 @@ tavor_hca_ports_shutdown(tavor_state_t *state, uint_t num_init) { int i, status; - TAVOR_TNF_ENTER(tavor_hca_ports_shutdown); - /* * Post commands to shutdown all init'd Tavor HCA ports. Note: if * any of these commands fail for any reason, it would be entirely * unexpected and probably indicative a serious problem (HW or SW). * Although we do return void from this function, this type of failure - * should not go unreported. That is why we have the warning message - * and the detailed TNF information. + * should not go unreported. */ for (i = 0; i < num_init; i++) { status = tavor_close_ib_cmd_post(state, i + 1, TAVOR_CMD_NOSLEEP_SPIN); if (status != TAVOR_CMD_SUCCESS) { TAVOR_WARNING(state, "failed to shutdown HCA port"); - TNF_PROBE_2(tavor_hca_ports_shutdown_close_ib_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, port, i + 1); - TAVOR_TNF_EXIT(tavor_hca_ports_shutdown); return (status); } } - TAVOR_TNF_EXIT(tavor_hca_ports_shutdown); - return (TAVOR_CMD_SUCCESS); } @@ -2507,8 +2184,6 @@ tavor_internal_uarpgs_init(tavor_state_t *state) { int status; - TAVOR_TNF_ENTER(tavor_internal_uarpgs_init); - /* * Save away reserved Tavor UAR page #0. This UAR page is not to * be used by software. @@ -2516,8 +2191,6 @@ tavor_internal_uarpgs_init(tavor_state_t *state) status = tavor_rsrc_alloc(state, TAVOR_UARPG, 1, TAVOR_SLEEP, &state->ts_uarpg0_rsrc_rsrvd); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_uarpg0_rsrcalloc_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_internal_uarpgs_init); return (DDI_FAILURE); } @@ -2530,15 +2203,12 @@ tavor_internal_uarpgs_init(tavor_state_t *state) &state->ts_uarpg1_rsrc); if (status != DDI_SUCCESS) { tavor_rsrc_free(state, &state->ts_uarpg0_rsrc_rsrvd); - TNF_PROBE_0(tavor_uarpg1_rsrcalloc_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_internal_uarpgs_init); return (DDI_FAILURE); } /* Setup pointer to UAR page #1 doorbells */ state->ts_uar = (tavor_hw_uar_t *)state->ts_uarpg1_rsrc->tr_addr; - TAVOR_TNF_EXIT(tavor_internal_uarpgs_init); return (DDI_SUCCESS); } @@ -2550,15 +2220,11 @@ tavor_internal_uarpgs_init(tavor_state_t *state) static void tavor_internal_uarpgs_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_internal_uarpgs_fini); - /* Free up Tavor UAR page #1 (kernel driver doorbells) */ tavor_rsrc_free(state, &state->ts_uarpg1_rsrc); /* Free up Tavor UAR page #0 (reserved) */ tavor_rsrc_free(state, &state->ts_uarpg0_rsrc_rsrvd); - - TAVOR_TNF_EXIT(tavor_internal_uarpgs_fini); } @@ -2572,8 +2238,6 @@ tavor_special_qp_contexts_reserve(tavor_state_t *state) tavor_rsrc_t *qp0_rsrc, *qp1_rsrc; int status; - TAVOR_TNF_ENTER(tavor_special_qp_contexts_reserve); - /* Initialize the lock used for special QP rsrc management */ mutex_init(&state->ts_spec_qplock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); @@ -2587,9 +2251,6 @@ tavor_special_qp_contexts_reserve(tavor_state_t *state) status = tavor_rsrc_alloc(state, TAVOR_QPC, 2, TAVOR_SLEEP, &qp0_rsrc); if (status != DDI_SUCCESS) { mutex_destroy(&state->ts_spec_qplock); - TNF_PROBE_0(tavor_special_qp_contexts_reserve_qp0_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_special_qp_contexts_reserve); return (DDI_FAILURE); } state->ts_spec_qp0 = qp0_rsrc; @@ -2604,14 +2265,10 @@ tavor_special_qp_contexts_reserve(tavor_state_t *state) if (status != DDI_SUCCESS) { tavor_rsrc_free(state, &qp0_rsrc); mutex_destroy(&state->ts_spec_qplock); - TNF_PROBE_0(tavor_special_qp_contexts_reserve_qp1_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_special_qp_contexts_reserve); return (DDI_FAILURE); } state->ts_spec_qp1 = qp1_rsrc; - TAVOR_TNF_EXIT(tavor_special_qp_contexts_reserve); return (DDI_SUCCESS); } @@ -2623,8 +2280,6 @@ tavor_special_qp_contexts_reserve(tavor_state_t *state) static void tavor_special_qp_contexts_unreserve(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_special_qp_contexts_unreserve); - /* Unreserve contexts for QP1 */ tavor_rsrc_free(state, &state->ts_spec_qp1); @@ -2633,8 +2288,6 @@ tavor_special_qp_contexts_unreserve(tavor_state_t *state) /* Destroy the lock used for special QP rsrc management */ mutex_destroy(&state->ts_spec_qplock); - - TAVOR_TNF_EXIT(tavor_special_qp_contexts_unreserve); } @@ -2650,15 +2303,12 @@ tavor_sw_reset(tavor_state_t *state) uint32_t reset_delay; int status, i; - TAVOR_TNF_ENTER(tavor_sw_reset); - /* * If the configured software reset delay is set to zero, then we * will not attempt a software reset of the Tavor device. */ reset_delay = state->ts_cfg_profile->cp_sw_reset_delay; if (reset_delay == 0) { - TAVOR_TNF_EXIT(tavor_sw_reset); return (DDI_SUCCESS); } @@ -2692,9 +2342,6 @@ tavor_sw_reset(tavor_state_t *state) */ status = pci_config_setup(pdip, &phdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_sw_reset_pcicfg_p_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_sw_reset); return (DDI_FAILURE); } @@ -2779,7 +2426,6 @@ tavor_sw_reset(tavor_state_t *state) } } - TAVOR_TNF_EXIT(tavor_sw_reset); return (DDI_SUCCESS); } @@ -2793,8 +2439,6 @@ tavor_mcg_init(tavor_state_t *state) { uint_t mcg_tmp_sz; - TAVOR_TNF_ENTER(tavor_mcg_init); - /* * Allocate space for the MCG temporary copy buffer. This is * used by the Attach/Detach Multicast Group code @@ -2810,7 +2454,6 @@ tavor_mcg_init(tavor_state_t *state) mutex_init(&state->ts_mcglock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_mcg_init); return (DDI_SUCCESS); } @@ -2824,16 +2467,12 @@ tavor_mcg_fini(tavor_state_t *state) { uint_t mcg_tmp_sz; - TAVOR_TNF_ENTER(tavor_mcg_fini); - /* Free up the space used for the MCG temporary copy buffer */ mcg_tmp_sz = TAVOR_MCGMEM_SZ(state); kmem_free(state->ts_mcgtmp, mcg_tmp_sz); /* Destroy the multicast group mutex */ mutex_destroy(&state->ts_mcglock); - - TAVOR_TNF_EXIT(tavor_mcg_fini); } @@ -2931,8 +2570,6 @@ tavor_pci_capability_list(tavor_state_t *state, ddi_acc_handle_t hdl) { uint_t offset, data; - TAVOR_TNF_ENTER(tavor_pci_capability_list); - /* * Check for the "PCI Capabilities" bit in the "Status Register". * Bit 4 in this register indicates the presence of a "PCI @@ -2940,8 +2577,6 @@ tavor_pci_capability_list(tavor_state_t *state, ddi_acc_handle_t hdl) */ data = pci_config_get16(hdl, 0x6); if ((data & 0x10) == 0) { - TNF_PROBE_0(tavor_pci_capab_list_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_pci_capability_list); return; } @@ -2980,8 +2615,6 @@ tavor_pci_capability_list(tavor_state_t *state, ddi_acc_handle_t hdl) /* Get offset of next entry in list */ offset = pci_config_get8(hdl, offset + 1); } - - TAVOR_TNF_EXIT(tavor_pci_capability_list); } /* @@ -2998,8 +2631,6 @@ tavor_pci_read_vpd(ddi_acc_handle_t hdl, uint_t offset, uint32_t addr, int vpd_addr = offset + 2; int vpd_data = offset + 4; - TAVOR_TNF_ENTER(tavor_pci_read_vpd); - /* * In order to read a 32-bit value from VPD, we are to write down * the address (offset in the VPD itself) to the address register. @@ -3013,13 +2644,10 @@ tavor_pci_read_vpd(ddi_acc_handle_t hdl, uint_t offset, uint32_t addr, val = pci_config_get16(hdl, vpd_addr); if ((val >> 15) & 0x01) { *data = pci_config_get32(hdl, vpd_data); - TAVOR_TNF_EXIT(tavor_pci_read_vpd); return (DDI_SUCCESS); } } while (--retry); - TNF_PROBE_0(tavor_pci_read_vpd_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_pci_read_vpd); return (DDI_FAILURE); } @@ -3046,8 +2674,6 @@ tavor_pci_capability_vpd(tavor_state_t *state, ddi_acc_handle_t hdl, uchar_t vpd_char[TAVOR_VPD_HDR_BSIZE]; } vpd; - TAVOR_TNF_ENTER(tavor_pci_capability_vpd); - /* * Read Vital Product Data (VPD) from PCI-X capability. */ @@ -3118,12 +2744,9 @@ tavor_pci_capability_vpd(tavor_state_t *state, ddi_acc_handle_t hdl, vpd.vpd_char[0]); goto out; } - TAVOR_TNF_EXIT(tavor_pci_capability_vpd); return; out: state->ts_hca_pn_len = 0; - TNF_PROBE_0(tavor_pci_capability_vpd_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_pci_capability_vpd); } /* @@ -3138,8 +2761,6 @@ tavor_pci_capability_pcix(tavor_state_t *state, ddi_acc_handle_t hdl, int max_out_splt_trans, max_mem_rd_byte_cnt; int designed_max_out_splt_trans, designed_max_mem_rd_byte_cnt; - TAVOR_TNF_ENTER(tavor_pci_capability_pcix); - /* * Query the current values for the PCI-X Command Register and * the PCI-X Status Register. @@ -3228,8 +2849,6 @@ tavor_pci_capability_pcix(tavor_state_t *state, ddi_acc_handle_t hdl, * values. */ pci_config_put16(hdl, offset + 2, command); - - TAVOR_TNF_EXIT(tavor_pci_capability_pcix); } @@ -3242,15 +2861,10 @@ tavor_intr_or_msi_init(tavor_state_t *state) { int status; - TAVOR_TNF_ENTER(tavor_intr_or_msi_init); - /* Query for the list of supported interrupt event types */ status = ddi_intr_get_supported_types(state->ts_dip, &state->ts_intr_types_avail); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_intr_or_msi_init_gettypes_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_intr_or_msi_init); return (DDI_FAILURE); } @@ -3267,7 +2881,6 @@ tavor_intr_or_msi_init(tavor_state_t *state) status = tavor_add_intrs(state, DDI_INTR_TYPE_MSI); if (status == DDI_SUCCESS) { state->ts_intr_type_chosen = DDI_INTR_TYPE_MSI; - TAVOR_TNF_EXIT(tavor_intr_or_msi_init); return (DDI_SUCCESS); } } @@ -3280,7 +2893,6 @@ tavor_intr_or_msi_init(tavor_state_t *state) status = tavor_add_intrs(state, DDI_INTR_TYPE_FIXED); if (status == DDI_SUCCESS) { state->ts_intr_type_chosen = DDI_INTR_TYPE_FIXED; - TAVOR_TNF_EXIT(tavor_intr_or_msi_init); return (DDI_SUCCESS); } } @@ -3288,7 +2900,6 @@ tavor_intr_or_msi_init(tavor_state_t *state) /* * Neither MSI or legacy interrupts were successful. return failure. */ - TAVOR_TNF_EXIT(tavor_intr_or_msi_setup); return (DDI_FAILURE); } @@ -3301,15 +2912,10 @@ tavor_add_intrs(tavor_state_t *state, int intr_type) { int status; - TAVOR_TNF_ENTER(tavor_add_intrs); - /* Get number of interrupts/MSI supported */ status = ddi_intr_get_nintrs(state->ts_dip, intr_type, &state->ts_intrmsi_count); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_add_intrs_getnintrs_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } @@ -3317,17 +2923,11 @@ tavor_add_intrs(tavor_state_t *state, int intr_type) status = ddi_intr_get_navail(state->ts_dip, intr_type, &state->ts_intrmsi_avail); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_add_intrs_getnavail_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } /* Ensure that we have at least one (1) usable MSI or interrupt */ if ((state->ts_intrmsi_avail < 1) || (state->ts_intrmsi_count < 1)) { - TNF_PROBE_0(tavor_add_intrs_notenoughts_intrmsi_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } @@ -3336,17 +2936,11 @@ tavor_add_intrs(tavor_state_t *state, int intr_type) intr_type, 0, 1, &state->ts_intrmsi_allocd, DDI_INTR_ALLOC_STRICT); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_add_intrs_intralloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } /* Ensure that we have allocated at least one (1) MSI or interrupt */ if (state->ts_intrmsi_allocd < 1) { - TNF_PROBE_0(tavor_add_intrs_noallocts_intrmsi_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } @@ -3360,9 +2954,6 @@ tavor_add_intrs(tavor_state_t *state, int intr_type) /* Free the allocated interrupt/MSI handle */ (void) ddi_intr_free(state->ts_intrmsi_hdl); - TNF_PROBE_0(tavor_add_intrs_getpri_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } @@ -3371,9 +2962,6 @@ tavor_add_intrs(tavor_state_t *state, int intr_type) /* Free the allocated interrupt/MSI handle */ (void) ddi_intr_free(state->ts_intrmsi_hdl); - TNF_PROBE_0(tavor_add_intrs_hilevelpri_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } @@ -3384,13 +2972,9 @@ tavor_add_intrs(tavor_state_t *state, int intr_type) /* Free the allocated interrupt/MSI handle */ (void) ddi_intr_free(state->ts_intrmsi_hdl); - TNF_PROBE_0(tavor_add_intrs_getcap_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_add_intrs); return (DDI_SUCCESS); } @@ -3404,18 +2988,12 @@ tavor_intr_or_msi_fini(tavor_state_t *state) { int status; - TAVOR_TNF_ENTER(tavor_intr_or_msi_fini); - /* Free the allocated interrupt/MSI handle */ status = ddi_intr_free(state->ts_intrmsi_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_intr_or_msi_fini_freehdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_intr_or_msi_fini); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_intr_or_msi_fini); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_agents.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_agents.c index eda0d0c31b..1aae24b050 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_agents.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_agents.c @@ -63,14 +63,11 @@ int tavor_agent_handlers_init(tavor_state_t *state) { int status; - char *errormsg, *rsrc_name; - - TAVOR_TNF_ENTER(tavor_agent_handlers_init); + char *rsrc_name; /* Determine if we need to register any agents with the IBMF */ if ((state->ts_cfg_profile->cp_qp0_agents_in_fw) && (state->ts_cfg_profile->cp_qp1_agents_in_fw)) { - TAVOR_TNF_EXIT(tavor_agent_handlers_init); return (DDI_SUCCESS); } @@ -84,8 +81,6 @@ tavor_agent_handlers_init(tavor_state_t *state) /* Initialize the Tavor IB management agent list */ status = tavor_agent_list_init(state); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed agent list init"); goto agentsinit_fail; } @@ -99,8 +94,6 @@ tavor_agent_handlers_init(tavor_state_t *state) rsrc_name, TAVOR_TASKQ_NTHREADS, TASKQ_DEFAULTPRI, 0); if (state->ts_taskq_agents == NULL) { tavor_agent_list_fini(state); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed task queue"); goto agentsinit_fail; } @@ -109,20 +102,14 @@ tavor_agent_handlers_init(tavor_state_t *state) if (status != DDI_SUCCESS) { ddi_taskq_destroy(state->ts_taskq_agents); tavor_agent_list_fini(state); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed IBMF register"); goto agentsinit_fail; } kmem_free(rsrc_name, TAVOR_RSRC_NAME_MAXLEN); - TAVOR_TNF_EXIT(tavor_agent_handlers_init); return (DDI_SUCCESS); agentsinit_fail: kmem_free(rsrc_name, TAVOR_RSRC_NAME_MAXLEN); - TNF_PROBE_1(tavor_agent_handlers_init_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_agent_handlers_init); return (status); } @@ -136,21 +123,15 @@ tavor_agent_handlers_fini(tavor_state_t *state) { int status; - TAVOR_TNF_ENTER(tavor_agent_handlers_fini); - /* Determine if we need to unregister any agents from the IBMF */ if ((state->ts_cfg_profile->cp_qp0_agents_in_fw) && (state->ts_cfg_profile->cp_qp1_agents_in_fw)) { - TAVOR_TNF_EXIT(tavor_agent_handlers_fini); return (DDI_SUCCESS); } /* Now attempt to unregister all of the agents from the IBMF */ status = tavor_agent_unregister_all(state, state->ts_num_agents); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_agent_handlers_fini_unreg_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_agent_handlers_fini); return (DDI_FAILURE); } @@ -167,7 +148,6 @@ tavor_agent_handlers_fini(tavor_state_t *state) /* Teardown the Tavor IB management agent list */ tavor_agent_list_fini(state); - TAVOR_TNF_EXIT(tavor_agent_handlers_fini); return (DDI_SUCCESS); } @@ -184,9 +164,6 @@ tavor_agent_request_cb(ibmf_handle_t ibmf_handle, ibmf_msg_t *msgp, tavor_agent_list_t *curr; tavor_state_t *state; int status; - int ibmf_status; - - TAVOR_TNF_ENTER(tavor_agent_request_cb); curr = (tavor_agent_list_t *)args; state = curr->agl_state; @@ -200,15 +177,7 @@ tavor_agent_request_cb(ibmf_handle_t ibmf_handle, ibmf_msg_t *msgp, cb_args = (tavor_agent_handler_arg_t *)kmem_zalloc( sizeof (tavor_agent_handler_arg_t), KM_NOSLEEP); if (cb_args == NULL) { - ibmf_status = ibmf_free_msg(ibmf_handle, &msgp); - if (ibmf_status != IBMF_SUCCESS) { - TNF_PROBE_1(tavor_agent_request_cb_ibmf_free_msg_fail, - TAVOR_TNF_ERROR, "", tnf_uint, ibmf_status, - ibmf_status); - } - TNF_PROBE_0(tavor_agent_request_cb_kma_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_agent_request_cb); + (void) ibmf_free_msg(ibmf_handle, &msgp); return; } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cb_args)) @@ -227,16 +196,8 @@ tavor_agent_request_cb(ibmf_handle_t ibmf_handle, ibmf_msg_t *msgp, tavor_agent_handle_req, cb_args, DDI_NOSLEEP); if (status == DDI_FAILURE) { kmem_free(cb_args, sizeof (tavor_agent_handler_arg_t)); - ibmf_status = ibmf_free_msg(ibmf_handle, &msgp); - if (ibmf_status != IBMF_SUCCESS) { - TNF_PROBE_1(tavor_agent_request_cb_ibmf_free_msg_fail, - TAVOR_TNF_ERROR, "", tnf_uint, ibmf_status, - ibmf_status); - } - TNF_PROBE_0(tavor_agent_request_cb_taskq_fail, - TAVOR_TNF_ERROR, ""); + (void) ibmf_free_msg(ibmf_handle, &msgp); } - TAVOR_TNF_EXIT(tavor_agent_request_cb); } /* @@ -257,8 +218,6 @@ tavor_agent_handle_req(void *cb_args) uint_t port; int status; - TAVOR_TNF_ENTER(tavor_agent_handle_req); - /* Extract the necessary info from the callback args parameter */ agent_args = (tavor_agent_handler_arg_t *)cb_args; ibmf_handle = agent_args->ahd_ibmfhdl; @@ -314,9 +273,6 @@ tavor_agent_handle_req(void *cb_args) (status != TAVOR_CMD_INSUFF_RSRC)) { cmn_err(CE_CONT, "Tavor: MAD_IFC (port %02d) " "command failed: %08x\n", port, status); - TNF_PROBE_1(tavor_agent_handle_req_madifc_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, - status); } /* finish cleanup */ @@ -349,27 +305,18 @@ tavor_agent_handle_req(void *cb_args) status = ibmf_msg_transport(ibmf_handle, IBMF_QP_HANDLE_DEFAULT, msgp, &retrans, tavor_agent_response_cb, state, 0); if (status != IBMF_SUCCESS) { - TNF_PROBE_1(tavor_ibmf_send_msg_fail, TAVOR_TNF_ERROR, "", - tnf_uint, ibmf_status, status); goto tavor_agent_handle_req_skip_response; } /* Free up the callback args parameter */ kmem_free(agent_args, sizeof (tavor_agent_handler_arg_t)); - TAVOR_TNF_EXIT(tavor_agent_handle_req); return; tavor_agent_handle_req_skip_response: /* Free up the ibmf message */ status = ibmf_free_msg(ibmf_handle, &msgp); - if (status != IBMF_SUCCESS) { - TNF_PROBE_1(tavor_agent_handle_req_ibmf_free_msg_fail, - TAVOR_TNF_ERROR, "", tnf_uint, ibmf_status, - status); - } /* Free up the callback args parameter */ kmem_free(agent_args, sizeof (tavor_agent_handler_arg_t)); - TAVOR_TNF_EXIT(tavor_agent_handle_req); } @@ -382,22 +329,12 @@ static void tavor_agent_response_cb(ibmf_handle_t ibmf_handle, ibmf_msg_t *msgp, void *args) { - int status; - - TAVOR_TNF_ENTER(tavor_agent_response_cb); - /* * It is the responsibility of each IBMF callback recipient to free * the packets that it has been given. Now that we are in the * response callback, we can be assured that it is safe to do so. */ - status = ibmf_free_msg(ibmf_handle, &msgp); - if (status != IBMF_SUCCESS) { - TNF_PROBE_1(tavor_agent_response_cb_ibmf_free_msg_fail, - TAVOR_TNF_ERROR, "", tnf_uint, ibmf_status, status); - } - - TAVOR_TNF_EXIT(tavor_agent_response_cb); + (void) ibmf_free_msg(ibmf_handle, &msgp); } @@ -416,8 +353,6 @@ tavor_agent_list_init(tavor_state_t *state) uint_t do_qp0, do_qp1; int i, j, indx; - TAVOR_TNF_ENTER(tavor_agent_list_init); - /* * Calculate the number of registered agents for each port * (SMA, PMA, and BMA) and determine whether or not to register @@ -457,9 +392,6 @@ tavor_agent_list_init(tavor_state_t *state) state->ts_agents = (tavor_agent_list_t *)kmem_zalloc(num_agents * sizeof (tavor_agent_list_t), KM_SLEEP); if (state->ts_agents == NULL) { - TNF_PROBE_0(tavor_agent_list_init_kma_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_agent_list_init); return (DDI_FAILURE); } @@ -490,7 +422,6 @@ tavor_agent_list_init(tavor_state_t *state) } } - TAVOR_TNF_EXIT(tavor_agent_list_init); return (DDI_SUCCESS); } @@ -502,13 +433,9 @@ tavor_agent_list_init(tavor_state_t *state) static void tavor_agent_list_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_agent_list_fini); - /* Free up the memory for the agent list entries */ kmem_free(state->ts_agents, state->ts_num_agents * sizeof (tavor_agent_list_t)); - - TAVOR_TNF_EXIT(tavor_agent_list_fini); } @@ -525,8 +452,6 @@ tavor_agent_register_all(tavor_state_t *state) ib_guid_t nodeguid; int i, status, num_registered; - TAVOR_TNF_ENTER(tavor_agent_register_all); - /* Get the Tavor NodeGUID from the softstate */ nodeguid = state->ts_ibtfinfo.hca_attr->hca_node_guid; @@ -548,8 +473,6 @@ tavor_agent_register_all(tavor_state_t *state) status = ibmf_register(&ibmf_reg, IBMF_VERSION, 0, NULL, NULL, &curr->agl_ibmfhdl, &impl_caps); if (status != IBMF_SUCCESS) { - TNF_PROBE_0(tavor_agent_register_all_ibmf_reg_fail, - TAVOR_TNF_ERROR, ""); goto agents_reg_fail; } @@ -558,19 +481,15 @@ tavor_agent_register_all(tavor_state_t *state) IBMF_QP_HANDLE_DEFAULT, tavor_agent_request_cb, curr, 0); if (status != IBMF_SUCCESS) { (void) ibmf_unregister(&curr->agl_ibmfhdl, 0); - TNF_PROBE_0(tavor_agent_register_all_ibmf_cb_fail, - TAVOR_TNF_ERROR, ""); goto agents_reg_fail; } num_registered++; } - TAVOR_TNF_EXIT(tavor_agent_register_all); return (DDI_SUCCESS); agents_reg_fail: (void) tavor_agent_unregister_all(state, num_registered); - TAVOR_TNF_EXIT(tavor_agent_register_all); return (DDI_FAILURE); } @@ -585,8 +504,6 @@ tavor_agent_unregister_all(tavor_state_t *state, int num_reg) tavor_agent_list_t *curr; int i, status; - TAVOR_TNF_ENTER(tavor_agent_unregister_all); - /* * For each registered agent in the agent list, teardown the * callbacks from the IBMF and unregister. @@ -598,23 +515,16 @@ tavor_agent_unregister_all(tavor_state_t *state, int num_reg) status = ibmf_tear_down_async_cb(curr->agl_ibmfhdl, IBMF_QP_HANDLE_DEFAULT, 0); if (status != IBMF_SUCCESS) { - TNF_PROBE_0(tavor_agents_unreg_teardown_cb_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_agent_unregister_all); return (DDI_FAILURE); } /* Unregister the agent from the IBMF */ status = ibmf_unregister(&curr->agl_ibmfhdl, 0); if (status != IBMF_SUCCESS) { - TNF_PROBE_0(tavor_agents_unreg_ibmf_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_agent_unregister_all); return (DDI_FAILURE); } } - TAVOR_TNF_EXIT(tavor_agent_unregister_all); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cfg.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cfg.c index 319e396b88..73ffec621c 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cfg.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cfg.c @@ -268,8 +268,6 @@ tavor_cfg_profile_init_phase1(tavor_state_t *state) { tavor_cfg_profile_t *cp; - TAVOR_TNF_ENTER(tavor_cfg_profile_init_phase1); - /* * Allocate space for the configuration profile structure */ @@ -350,8 +348,6 @@ tavor_cfg_profile_init_phase1(tavor_state_t *state) cp->cp_log_max_srq_sz = TAVOR_SRQ_SZ_SHIFT_MIN; } else { - TNF_PROBE_0(tavor_cfg_profile_invalid_dimmsz_fail, - TAVOR_TNF_ERROR, ""); return (DDI_FAILURE); } @@ -365,8 +361,6 @@ tavor_cfg_profile_init_phase1(tavor_state_t *state) /* Can't do both "streaming" and IOMMU bypass */ if (tavor_iommu_bypass != 0) { - TNF_PROBE_0(tavor_cfg_profile_streamingbypass_fail, - TAVOR_TNF_ERROR, ""); kmem_free(cp, sizeof (tavor_cfg_profile_t)); return (DDI_FAILURE); } @@ -383,7 +377,6 @@ tavor_cfg_profile_init_phase1(tavor_state_t *state) /* Attach the configuration profile to Tavor softstate */ state->ts_cfg_profile = cp; - TAVOR_TNF_EXIT(tavor_cfg_profile_init_phase1); return (DDI_SUCCESS); } @@ -396,8 +389,6 @@ tavor_cfg_profile_init_phase2(tavor_state_t *state) { tavor_cfg_profile_t *cp; - TAVOR_TNF_ENTER(tavor_cfg_profile_init_phase2); - /* Read the configuration profile from Tavor softstate */ cp = state->ts_cfg_profile; @@ -576,8 +567,6 @@ tavor_cfg_profile_init_phase2(tavor_state_t *state) cp->cp_max_mem_rd_byte_cnt = tavor_max_mem_rd_byte_cnt; } else { - TNF_PROBE_0(tavor_cfg_profile_invalid_dimmsz_fail, - TAVOR_TNF_ERROR, ""); return (DDI_FAILURE); } @@ -609,7 +598,6 @@ tavor_cfg_profile_init_phase2(tavor_state_t *state) /* Determine additional configuration from optional properties */ tavor_cfg_prop_lookup(state, cp); - TAVOR_TNF_EXIT(tavor_cfg_profile_init_phase2); return (DDI_SUCCESS); } @@ -621,14 +609,10 @@ tavor_cfg_profile_init_phase2(tavor_state_t *state) void tavor_cfg_profile_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_cfg_profile_fini); - /* * Free up the space for configuration profile */ kmem_free(state->ts_cfg_profile, sizeof (tavor_cfg_profile_t)); - - TAVOR_TNF_EXIT(tavor_cfg_profile_fini); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_ci.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_ci.c index d6278c87b1..002fed8453 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_ci.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_ci.c @@ -368,13 +368,8 @@ tavor_ci_query_hca_ports(ibc_hca_hdl_t hca, uint8_t query_port, uint_t start, end, port; int status, indx; - TAVOR_TNF_ENTER(tavor_ci_query_hca_ports); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_query_hca_ports_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_port); return (IBT_HCA_HDL_INVALID); } @@ -398,14 +393,10 @@ tavor_ci_query_hca_ports(ibc_hca_hdl_t hca, uint8_t query_port, for (port = start, indx = 0; port <= end; port++, indx++) { status = tavor_port_query(state, port, &info_p[indx]); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_port_query_fail, TAVOR_TNF_ERROR, - "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_query_hca_ports); return (status); } } - TAVOR_TNF_EXIT(tavor_ci_query_hca_ports); return (IBT_SUCCESS); } @@ -422,13 +413,8 @@ tavor_ci_modify_ports(ibc_hca_hdl_t hca, uint8_t port, tavor_state_t *state; int status; - TAVOR_TNF_ENTER(tavor_ci_modify_ports); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_modify_ports_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_ports); return (IBT_HCA_HDL_INVALID); } @@ -438,13 +424,9 @@ tavor_ci_modify_ports(ibc_hca_hdl_t hca, uint8_t port, /* Modify the port(s) */ status = tavor_port_modify(state, port, flags, init_type); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_modify_ports_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_modify_ports); return (status); } - TAVOR_TNF_EXIT(tavor_ci_modify_ports); return (IBT_SUCCESS); } @@ -457,8 +439,6 @@ tavor_ci_modify_ports(ibc_hca_hdl_t hca, uint8_t port, static ibt_status_t tavor_ci_modify_system_image(ibc_hca_hdl_t hca, ib_guid_t sys_guid) { - TAVOR_TNF_ENTER(tavor_ci_modify_system_image); - /* * This is an unsupported interface for the Tavor driver. This * interface is necessary to support modification of the System @@ -466,7 +446,6 @@ tavor_ci_modify_system_image(ibc_hca_hdl_t hca, ib_guid_t sys_guid) * once (during driver initialization). */ - TAVOR_TNF_EXIT(tavor_ci_modify_system_image); return (IBT_NOT_SUPPORTED); } @@ -483,15 +462,10 @@ tavor_ci_alloc_pd(ibc_hca_hdl_t hca, ibt_pd_flags_t flags, ibc_pd_hdl_t *pd_p) tavor_pdhdl_t pdhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_pd); - ASSERT(pd_p != NULL); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_pd_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_pd); return (IBT_HCA_HDL_INVALID); } @@ -501,16 +475,12 @@ tavor_ci_alloc_pd(ibc_hca_hdl_t hca, ibt_pd_flags_t flags, ibc_pd_hdl_t *pd_p) /* Allocate the PD */ status = tavor_pd_alloc(state, &pdhdl, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_alloc_pd_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_alloc_pd); return (status); } /* Return the Tavor PD handle */ *pd_p = (ibc_pd_hdl_t)pdhdl; - TAVOR_TNF_EXIT(tavor_ci_alloc_pd); return (IBT_SUCCESS); } @@ -527,21 +497,13 @@ tavor_ci_free_pd(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd) tavor_pdhdl_t pdhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_free_pd); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_free_pd_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_pd); return (IBT_HCA_HDL_INVALID); } /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_ci_free_pd_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_pd); return (IBT_PD_HDL_INVALID); } @@ -552,13 +514,9 @@ tavor_ci_free_pd(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd) /* Free the PD */ status = tavor_pd_free(state, &pdhdl); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_free_pd_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_free_pd); return (status); } - TAVOR_TNF_EXIT(tavor_ci_free_pd); return (IBT_SUCCESS); } @@ -573,15 +531,12 @@ static ibt_status_t tavor_ci_alloc_rdd(ibc_hca_hdl_t hca, ibc_rdd_flags_t flags, ibc_rdd_hdl_t *rdd_p) { - TAVOR_TNF_ENTER(tavor_ci_alloc_rdd); - /* * This is an unsupported interface for the Tavor driver. This * interface is necessary to support Reliable Datagram (RD) * operations. Tavor does not support RD. */ - TAVOR_TNF_EXIT(tavor_ci_alloc_rdd); return (IBT_NOT_SUPPORTED); } @@ -595,15 +550,12 @@ tavor_ci_alloc_rdd(ibc_hca_hdl_t hca, ibc_rdd_flags_t flags, static ibt_status_t tavor_ci_free_rdd(ibc_hca_hdl_t hca, ibc_rdd_hdl_t rdd) { - TAVOR_TNF_ENTER(tavor_ci_free_rdd); - /* * This is an unsupported interface for the Tavor driver. This * interface is necessary to support Reliable Datagram (RD) * operations. Tavor does not support RD. */ - TAVOR_TNF_EXIT(tavor_ci_free_rdd); return (IBT_NOT_SUPPORTED); } @@ -623,21 +575,13 @@ tavor_ci_alloc_ah(ibc_hca_hdl_t hca, ibt_ah_flags_t flags, ibc_pd_hdl_t pd, tavor_pdhdl_t pdhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_ah); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_ah_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_ah); return (IBT_HCA_HDL_INVALID); } /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_ci_alloc_ah_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_ah); return (IBT_PD_HDL_INVALID); } @@ -648,16 +592,12 @@ tavor_ci_alloc_ah(ibc_hca_hdl_t hca, ibt_ah_flags_t flags, ibc_pd_hdl_t pd, /* Allocate the AH */ status = tavor_ah_alloc(state, pdhdl, attr_p, &ahhdl, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_alloc_ah_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_alloc_ah); return (status); } /* Return the Tavor AH handle */ *ah_p = (ibc_ah_hdl_t)ahhdl; - TAVOR_TNF_EXIT(tavor_ci_alloc_ah); return (IBT_SUCCESS); } @@ -674,21 +614,13 @@ tavor_ci_free_ah(ibc_hca_hdl_t hca, ibc_ah_hdl_t ah) tavor_ahhdl_t ahhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_free_ah); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_free_ah_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_ah); return (IBT_HCA_HDL_INVALID); } /* Check for valid address handle pointer */ if (ah == NULL) { - TNF_PROBE_0(tavor_ci_free_ah_invahhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_ah); return (IBT_AH_HDL_INVALID); } @@ -699,13 +631,9 @@ tavor_ci_free_ah(ibc_hca_hdl_t hca, ibc_ah_hdl_t ah) /* Free the AH */ status = tavor_ah_free(state, &ahhdl, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_free_ah_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_free_ah); return (status); } - TAVOR_TNF_EXIT(tavor_ci_free_ah); return (IBT_SUCCESS); } @@ -724,21 +652,13 @@ tavor_ci_query_ah(ibc_hca_hdl_t hca, ibc_ah_hdl_t ah, ibc_pd_hdl_t *pd_p, tavor_pdhdl_t pdhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_query_ah); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_query_ah_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_ah); return (IBT_HCA_HDL_INVALID); } /* Check for valid address handle pointer */ if (ah == NULL) { - TNF_PROBE_0(tavor_ci_query_ah_invahhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_ah); return (IBT_AH_HDL_INVALID); } @@ -749,16 +669,12 @@ tavor_ci_query_ah(ibc_hca_hdl_t hca, ibc_ah_hdl_t ah, ibc_pd_hdl_t *pd_p, /* Query the AH */ status = tavor_ah_query(state, ahhdl, &pdhdl, attr_p); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_query_ah_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_query_ah); return (status); } /* Return the Tavor PD handle */ *pd_p = (ibc_pd_hdl_t)pdhdl; - TAVOR_TNF_EXIT(tavor_ci_query_ah); return (IBT_SUCCESS); } @@ -775,21 +691,13 @@ tavor_ci_modify_ah(ibc_hca_hdl_t hca, ibc_ah_hdl_t ah, ibt_adds_vect_t *attr_p) tavor_ahhdl_t ahhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_modify_ah); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_modify_ah_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_ah); return (IBT_HCA_HDL_INVALID); } /* Check for valid address handle pointer */ if (ah == NULL) { - TNF_PROBE_0(tavor_ci_modify_ah_invahhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_ah); return (IBT_AH_HDL_INVALID); } @@ -800,13 +708,9 @@ tavor_ci_modify_ah(ibc_hca_hdl_t hca, ibc_ah_hdl_t ah, ibt_adds_vect_t *attr_p) /* Modify the AH */ status = tavor_ah_modify(state, ahhdl, attr_p); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_modify_ah_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_modify_ah); return (status); } - TAVOR_TNF_EXIT(tavor_ci_modify_ah); return (IBT_SUCCESS); } @@ -826,16 +730,11 @@ tavor_ci_alloc_qp(ibc_hca_hdl_t hca, ibtl_qp_hdl_t ibt_qphdl, tavor_qp_options_t op; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_qp); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p)) _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*queue_sizes_p)) /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_qp_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_qp); return (IBT_HCA_HDL_INVALID); } @@ -851,16 +750,12 @@ tavor_ci_alloc_qp(ibc_hca_hdl_t hca, ibtl_qp_hdl_t ibt_qphdl, op.qpo_wq_loc = state->ts_cfg_profile->cp_qp_wq_inddr; status = tavor_qp_alloc(state, &qpinfo, TAVOR_NOSLEEP, &op); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_alloc_qp_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_alloc_qp); return (status); } /* Return the Tavor QP handle */ *qp_p = (ibc_qp_hdl_t)qpinfo.qpi_qphdl; - TAVOR_TNF_EXIT(tavor_ci_alloc_qp); return (IBT_SUCCESS); } @@ -881,16 +776,11 @@ tavor_ci_alloc_special_qp(ibc_hca_hdl_t hca, uint8_t port, tavor_qp_options_t op; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_special_qp); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p)) _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*queue_sizes_p)) /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_special_qp_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_special_qp); return (IBT_HCA_HDL_INVALID); } @@ -906,16 +796,12 @@ tavor_ci_alloc_special_qp(ibc_hca_hdl_t hca, uint8_t port, op.qpo_wq_loc = state->ts_cfg_profile->cp_qp_wq_inddr; status = tavor_special_qp_alloc(state, &qpinfo, TAVOR_NOSLEEP, &op); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_alloc_special_qp_fail, TAVOR_TNF_ERROR, - "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_alloc_special_qp); return (status); } /* Return the Tavor QP handle */ *qp_p = (ibc_qp_hdl_t)qpinfo.qpi_qphdl; - TAVOR_TNF_EXIT(tavor_ci_alloc_special_qp); return (IBT_SUCCESS); } @@ -944,21 +830,13 @@ tavor_ci_free_qp(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, tavor_qphdl_t qphdl; int status; - TAVOR_TNF_ENTER(tavor_ci_free_qp); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_free_qp_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_qp); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle pointer */ if (qp == NULL) { - TNF_PROBE_0(tavor_ci_free_qp_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_qp); return (IBT_QP_HDL_INVALID); } @@ -970,13 +848,9 @@ tavor_ci_free_qp(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, status = tavor_qp_free(state, &qphdl, free_qp_flags, qpnh_p, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_free_qp_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_free_qp); return (status); } - TAVOR_TNF_EXIT(tavor_ci_free_qp); return (IBT_SUCCESS); } @@ -992,21 +866,13 @@ tavor_ci_release_qpn(ibc_hca_hdl_t hca, ibc_qpn_hdl_t qpnh) tavor_state_t *state; tavor_qpn_entry_t *entry; - TAVOR_TNF_ENTER(tavor_ci_release_qpn); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_release_qpn_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_release_qpn); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle pointer */ if (qpnh == NULL) { - TNF_PROBE_0(tavor_ci_release_qpn_invqpnhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_release_qpn); return (IBT_QP_HDL_INVALID); } @@ -1017,7 +883,6 @@ tavor_ci_release_qpn(ibc_hca_hdl_t hca, ibc_qpn_hdl_t qpnh) /* Release the QP number */ tavor_qp_release_qpn(state, entry, TAVOR_QPN_RELEASE); - TAVOR_TNF_EXIT(tavor_ci_release_qpn); return (IBT_SUCCESS); } @@ -1035,21 +900,13 @@ tavor_ci_query_qp(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, tavor_qphdl_t qphdl; int status; - TAVOR_TNF_ENTER(tavor_ci_query_qp); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_query_qp_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_qp); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle */ if (qp == NULL) { - TNF_PROBE_0(tavor_ci_query_qp_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_qp); return (IBT_QP_HDL_INVALID); } @@ -1060,13 +917,9 @@ tavor_ci_query_qp(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, /* Query the QP */ status = tavor_qp_query(state, qphdl, attr_p); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_query_qp_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_query_qp); return (status); } - TAVOR_TNF_EXIT(tavor_ci_query_qp); return (IBT_SUCCESS); } @@ -1085,21 +938,13 @@ tavor_ci_modify_qp(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, tavor_qphdl_t qphdl; int status; - TAVOR_TNF_ENTER(tavor_ci_modify_qp); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_modify_qp_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_qp); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle */ if (qp == NULL) { - TNF_PROBE_0(tavor_ci_modify_qp_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_qp); return (IBT_QP_HDL_INVALID); } @@ -1110,13 +955,9 @@ tavor_ci_modify_qp(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, /* Modify the QP */ status = tavor_qp_modify(state, qphdl, flags, info_p, actual_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_modify_qp_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_modify_qp); return (status); } - TAVOR_TNF_EXIT(tavor_ci_modify_qp); return (IBT_SUCCESS); } @@ -1135,13 +976,8 @@ tavor_ci_alloc_cq(ibc_hca_hdl_t hca, ibt_cq_hdl_t ibt_cqhdl, tavor_cqhdl_t cqhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_cq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_cq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_cq); return (IBT_HCA_HDL_INVALID); } @@ -1152,16 +988,12 @@ tavor_ci_alloc_cq(ibc_hca_hdl_t hca, ibt_cq_hdl_t ibt_cqhdl, status = tavor_cq_alloc(state, ibt_cqhdl, attr_p, actual_size, &cqhdl, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_alloc_cq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_alloc_cq); return (status); } /* Return the Tavor CQ handle */ *cq_p = (ibc_cq_hdl_t)cqhdl; - TAVOR_TNF_EXIT(tavor_ci_alloc_cq); return (IBT_SUCCESS); } @@ -1178,22 +1010,13 @@ tavor_ci_free_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq) tavor_cqhdl_t cqhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_free_cq); - - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_free_cq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_cq); return (IBT_HCA_HDL_INVALID); } /* Check for valid CQ handle pointer */ if (cq == NULL) { - TNF_PROBE_0(tavor_ci_free_cq_invcqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_cq); return (IBT_CQ_HDL_INVALID); } @@ -1204,13 +1027,9 @@ tavor_ci_free_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq) /* Free the CQ */ status = tavor_cq_free(state, &cqhdl, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_free_cq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_free_cq); return (status); } - TAVOR_TNF_EXIT(tavor_ci_free_cq); return (IBT_SUCCESS); } @@ -1226,21 +1045,13 @@ tavor_ci_query_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq, uint_t *entries_p, { tavor_cqhdl_t cqhdl; - TAVOR_TNF_ENTER(tavor_ci_query_cq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_query_cq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_cq); return (IBT_HCA_HDL_INVALID); } /* Check for valid CQ handle pointer */ if (cq == NULL) { - TNF_PROBE_0(tavor_ci_query_cq_invcqhdl, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_cq); return (IBT_CQ_HDL_INVALID); } @@ -1255,7 +1066,6 @@ tavor_ci_query_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq, uint_t *entries_p, *usec_p = 0; *hid_p = 0; - TAVOR_TNF_EXIT(tavor_ci_query_cq); return (IBT_SUCCESS); } @@ -1273,21 +1083,13 @@ tavor_ci_resize_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq, uint_t size, tavor_cqhdl_t cqhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_resize_cq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_resize_cq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_resize_cq); return (IBT_HCA_HDL_INVALID); } /* Check for valid CQ handle pointer */ if (cq == NULL) { - TNF_PROBE_0(tavor_ci_resize_cq_invcqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_resize_cq); return (IBT_CQ_HDL_INVALID); } @@ -1299,13 +1101,9 @@ tavor_ci_resize_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq, uint_t size, status = tavor_cq_resize(state, cqhdl, size, actual_size, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_resize_cq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_resize_cq); return (status); } - TAVOR_TNF_EXIT(tavor_ci_resize_cq); return (IBT_SUCCESS); } @@ -1375,15 +1173,12 @@ static ibt_status_t tavor_ci_alloc_eec(ibc_hca_hdl_t hca, ibc_eec_flags_t flags, ibt_eec_hdl_t ibt_eec, ibc_rdd_hdl_t rdd, ibc_eec_hdl_t *eec_p) { - TAVOR_TNF_ENTER(tavor_ci_alloc_eec); - /* * This is an unsupported interface for the Tavor driver. This * interface is necessary to support Reliable Datagram (RD) * operations. Tavor does not support RD. */ - TAVOR_TNF_EXIT(tavor_ci_alloc_eec); return (IBT_NOT_SUPPORTED); } @@ -1397,15 +1192,12 @@ tavor_ci_alloc_eec(ibc_hca_hdl_t hca, ibc_eec_flags_t flags, static ibt_status_t tavor_ci_free_eec(ibc_hca_hdl_t hca, ibc_eec_hdl_t eec) { - TAVOR_TNF_ENTER(tavor_ci_free_eec); - /* * This is an unsupported interface for the Tavor driver. This * interface is necessary to support Reliable Datagram (RD) * operations. Tavor does not support RD. */ - TAVOR_TNF_EXIT(tavor_ci_free_eec); return (IBT_NOT_SUPPORTED); } @@ -1420,15 +1212,12 @@ static ibt_status_t tavor_ci_query_eec(ibc_hca_hdl_t hca, ibc_eec_hdl_t eec, ibt_eec_query_attr_t *attr_p) { - TAVOR_TNF_ENTER(tavor_ci_query_eec); - /* * This is an unsupported interface for the Tavor driver. This * interface is necessary to support Reliable Datagram (RD) * operations. Tavor does not support RD. */ - TAVOR_TNF_EXIT(tavor_ci_query_eec); return (IBT_NOT_SUPPORTED); } @@ -1443,15 +1232,12 @@ static ibt_status_t tavor_ci_modify_eec(ibc_hca_hdl_t hca, ibc_eec_hdl_t eec, ibt_cep_modify_flags_t flags, ibt_eec_info_t *info_p) { - TAVOR_TNF_ENTER(tavor_ci_query_eec); - /* * This is an unsupported interface for the Tavor driver. This * interface is necessary to support Reliable Datagram (RD) * operations. Tavor does not support RD. */ - TAVOR_TNF_EXIT(tavor_ci_query_eec); return (IBT_NOT_SUPPORTED); } @@ -1473,8 +1259,6 @@ tavor_ci_register_mr(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, tavor_mrhdl_t mrhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_register_mr); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc)) ASSERT(mr_attr != NULL); @@ -1483,17 +1267,11 @@ tavor_ci_register_mr(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_register_mr_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_mr); return (IBT_HCA_HDL_INVALID); } /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_ci_register_mr_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_mr); return (IBT_PD_HDL_INVALID); } @@ -1504,9 +1282,6 @@ tavor_ci_register_mr(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, if (((mr_attr->mr_flags & IBT_MR_ENABLE_REMOTE_WRITE) || (mr_attr->mr_flags & IBT_MR_ENABLE_REMOTE_ATOMIC)) && !(mr_attr->mr_flags & IBT_MR_ENABLE_LOCAL_WRITE)) { - TNF_PROBE_0(tavor_ci_register_mr_inv_accflags_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_mr); return (IBT_MR_ACCESS_REQ_INVALID); } @@ -1520,9 +1295,6 @@ tavor_ci_register_mr(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, op.mro_bind_override_addr = 0; status = tavor_mr_register(state, pdhdl, mr_attr, &mrhdl, &op); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_register_mr_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_register_mr); return (status); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl)) @@ -1547,7 +1319,6 @@ tavor_ci_register_mr(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, /* Return the Tavor MR handle */ *mr_p = (ibc_mr_hdl_t)mrhdl; - TAVOR_TNF_EXIT(tavor_ci_register_mr); return (IBT_SUCCESS); } @@ -1570,8 +1341,6 @@ tavor_ci_register_buf(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, int status; ibt_mr_flags_t flags = attrp->mr_flags; - TAVOR_TNF_ENTER(tavor_ci_register_buf); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc)) ASSERT(mr_p != NULL); @@ -1579,17 +1348,11 @@ tavor_ci_register_buf(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_register_buf_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_buf); return (IBT_HCA_HDL_INVALID); } /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_ci_register_buf_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_buf); return (IBT_PD_HDL_INVALID); } @@ -1600,9 +1363,6 @@ tavor_ci_register_buf(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, if (((flags & IBT_MR_ENABLE_REMOTE_WRITE) || (flags & IBT_MR_ENABLE_REMOTE_ATOMIC)) && !(flags & IBT_MR_ENABLE_LOCAL_WRITE)) { - TNF_PROBE_0(tavor_ci_register_buf_accflags_inv, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_buf); return (IBT_MR_ACCESS_REQ_INVALID); } @@ -1616,9 +1376,6 @@ tavor_ci_register_buf(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, op.mro_bind_override_addr = 0; status = tavor_mr_register_buf(state, pdhdl, attrp, buf, &mrhdl, &op); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_register_mr_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_register_mr); return (status); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl)) @@ -1643,7 +1400,6 @@ tavor_ci_register_buf(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, /* Return the Tavor MR handle */ *mr_p = (ibc_mr_hdl_t)mrhdl; - TAVOR_TNF_EXIT(tavor_ci_register_buf); return (IBT_SUCCESS); } @@ -1660,21 +1416,13 @@ tavor_ci_deregister_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr) tavor_mrhdl_t mrhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_deregister_mr); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_deregister_mr_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_deregister_mr); return (IBT_HCA_HDL_INVALID); } /* Check for valid memory region handle */ if (mr == NULL) { - TNF_PROBE_0(tavor_ci_deregister_mr_invmrhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_deregister_mr); return (IBT_MR_HDL_INVALID); } @@ -1688,13 +1436,9 @@ tavor_ci_deregister_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr) status = tavor_mr_deregister(state, &mrhdl, TAVOR_MR_DEREG_ALL, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_deregister_mr_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_deregister_mr); return (status); } - TAVOR_TNF_EXIT(tavor_ci_deregister_mr); return (IBT_SUCCESS); } @@ -1712,23 +1456,15 @@ tavor_ci_query_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, tavor_mrhdl_t mrhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_query_mr); - ASSERT(mr_attr != NULL); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_query_mr_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_mr); return (IBT_HCA_HDL_INVALID); } /* Check for MemRegion handle */ if (mr == NULL) { - TNF_PROBE_0(tavor_ci_query_mr_invmrhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_mr); return (IBT_MR_HDL_INVALID); } @@ -1739,13 +1475,9 @@ tavor_ci_query_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, /* Query the memory region */ status = tavor_mr_query(state, mrhdl, mr_attr); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_query_mr_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_query_mr); return (status); } - TAVOR_TNF_EXIT(tavor_ci_query_mr); return (IBT_SUCCESS); } @@ -1766,8 +1498,6 @@ tavor_ci_register_shared_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, tavor_mrhdl_t mrhdl, mrhdl_new; int status; - TAVOR_TNF_ENTER(tavor_ci_register_shared_mr); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc)) ASSERT(mr_attr != NULL); @@ -1776,25 +1506,16 @@ tavor_ci_register_shared_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_register_shared_mr_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_shared_mr); return (IBT_HCA_HDL_INVALID); } /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_ci_register_shared_mr_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_shared_mr); return (IBT_PD_HDL_INVALID); } /* Check for valid memory region handle */ if (mr == NULL) { - TNF_PROBE_0(tavor_ci_register_shared_mr_invmrhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_shared_mr); return (IBT_MR_HDL_INVALID); } /* @@ -1804,9 +1525,6 @@ tavor_ci_register_shared_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, if (((mr_attr->mr_flags & IBT_MR_ENABLE_REMOTE_WRITE) || (mr_attr->mr_flags & IBT_MR_ENABLE_REMOTE_ATOMIC)) && !(mr_attr->mr_flags & IBT_MR_ENABLE_LOCAL_WRITE)) { - TNF_PROBE_0(tavor_ci_register_shared_mr_accflags_inv, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_register_shared_mr); return (IBT_MR_ACCESS_REQ_INVALID); } @@ -1819,9 +1537,6 @@ tavor_ci_register_shared_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, status = tavor_mr_register_shared(state, mrhdl, pdhdl, mr_attr, &mrhdl_new); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_register_shared_mr_fail, TAVOR_TNF_ERROR, - "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_register_shared_mr); return (status); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new)) @@ -1846,7 +1561,6 @@ tavor_ci_register_shared_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, /* Return the Tavor MR handle */ *mr_p = (ibc_mr_hdl_t)mrhdl_new; - TAVOR_TNF_EXIT(tavor_ci_register_mr); return (IBT_SUCCESS); } @@ -1868,8 +1582,6 @@ tavor_ci_reregister_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, tavor_mrhdl_t mrhdl, mrhdl_new; int status; - TAVOR_TNF_ENTER(tavor_ci_reregister_mr); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc)) ASSERT(mr_attr != NULL); @@ -1878,17 +1590,11 @@ tavor_ci_reregister_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_reregister_mr_hca_inv, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_ci_reregister_mr); return (IBT_HCA_HDL_INVALID); } /* Check for valid memory region handle */ if (mr == NULL) { - TNF_PROBE_0(tavor_ci_reregister_mr_invmrhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_reregister_mr); return (IBT_MR_HDL_INVALID); } @@ -1902,9 +1608,6 @@ tavor_ci_reregister_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, status = tavor_mr_reregister(state, mrhdl, pdhdl, mr_attr, &mrhdl_new, &op); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_reregister_mr_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_reregister_mr); return (status); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new)) @@ -1929,7 +1632,6 @@ tavor_ci_reregister_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, /* Return the Tavor MR handle */ *mr_new = (ibc_mr_hdl_t)mrhdl_new; - TAVOR_TNF_EXIT(tavor_ci_reregister_mr); return (IBT_SUCCESS); } @@ -1952,8 +1654,6 @@ tavor_ci_reregister_buf(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, int status; ibt_mr_flags_t flags = attrp->mr_flags; - TAVOR_TNF_ENTER(tavor_ci_reregister_buf); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc)) ASSERT(mr_new != NULL); @@ -1961,17 +1661,11 @@ tavor_ci_reregister_buf(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_reregister_buf_hca_inv, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_ci_reregister_buf); return (IBT_HCA_HDL_INVALID); } /* Check for valid memory region handle */ if (mr == NULL) { - TNF_PROBE_0(tavor_ci_reregister_buf_invmrhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_reregister_buf); return (IBT_MR_HDL_INVALID); } @@ -1985,9 +1679,6 @@ tavor_ci_reregister_buf(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, status = tavor_mr_reregister_buf(state, mrhdl, pdhdl, attrp, buf, &mrhdl_new, &op); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_reregister_buf_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_reregister_buf); return (status); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new)) @@ -2012,7 +1703,6 @@ tavor_ci_reregister_buf(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, /* Return the Tavor MR handle */ *mr_new = (ibc_mr_hdl_t)mrhdl_new; - TAVOR_TNF_EXIT(tavor_ci_reregister_buf); return (IBT_SUCCESS); } @@ -2027,15 +1717,10 @@ tavor_ci_sync_mr(ibc_hca_hdl_t hca, ibt_mr_sync_t *mr_segs, size_t num_segs) tavor_state_t *state; int status; - TAVOR_TNF_ENTER(tavor_ci_sync_mr); - ASSERT(mr_segs != NULL); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_sync_mr_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_sync_mr); return (IBT_HCA_HDL_INVALID); } @@ -2045,13 +1730,9 @@ tavor_ci_sync_mr(ibc_hca_hdl_t hca, ibt_mr_sync_t *mr_segs, size_t num_segs) /* Sync the memory region */ status = tavor_mr_sync(state, mr_segs, num_segs); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_sync_mr_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_sync_mr); return (status); } - TAVOR_TNF_EXIT(tavor_ci_sync_mr); return (IBT_SUCCESS); } @@ -2070,24 +1751,16 @@ tavor_ci_alloc_mw(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, ibt_mw_flags_t flags, tavor_mwhdl_t mwhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_mw); - ASSERT(mw_p != NULL); ASSERT(rkey_p != NULL); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_mw_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_mw); return (IBT_HCA_HDL_INVALID); } /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_ci_alloc_mw_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_mw); return (IBT_PD_HDL_INVALID); } @@ -2098,9 +1771,6 @@ tavor_ci_alloc_mw(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, ibt_mw_flags_t flags, /* Allocate the memory window */ status = tavor_mw_alloc(state, pdhdl, flags, &mwhdl); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_alloc_mw_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_alloc_mw); return (status); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mwhdl)) @@ -2109,7 +1779,6 @@ tavor_ci_alloc_mw(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, ibt_mw_flags_t flags, *mw_p = (ibc_mw_hdl_t)mwhdl; *rkey_p = mwhdl->mr_rkey; - TAVOR_TNF_EXIT(tavor_ci_alloc_mw); return (IBT_SUCCESS); } @@ -2126,21 +1795,13 @@ tavor_ci_free_mw(ibc_hca_hdl_t hca, ibc_mw_hdl_t mw) tavor_mwhdl_t mwhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_free_mw); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_free_mw_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_mw); return (IBT_HCA_HDL_INVALID); } /* Check for valid MW handle */ if (mw == NULL) { - TNF_PROBE_0(tavor_ci_free_mw_invmwhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_mw); return (IBT_MW_HDL_INVALID); } @@ -2151,13 +1812,9 @@ tavor_ci_free_mw(ibc_hca_hdl_t hca, ibc_mw_hdl_t mw) /* Free the memory window */ status = tavor_mw_free(state, &mwhdl, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_free_mw_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_free_mw); return (status); } - TAVOR_TNF_EXIT(tavor_ci_free_mw); return (IBT_SUCCESS); } @@ -2173,23 +1830,15 @@ tavor_ci_query_mw(ibc_hca_hdl_t hca, ibc_mw_hdl_t mw, { tavor_mwhdl_t mwhdl; - TAVOR_TNF_ENTER(tavor_ci_query_mw); - ASSERT(mw_attr_p != NULL); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_query_mw_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_mw); return (IBT_HCA_HDL_INVALID); } /* Check for valid MemWin handle */ if (mw == NULL) { - TNF_PROBE_0(tavor_ci_query_mw_inc_mwhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_mw); return (IBT_MW_HDL_INVALID); } @@ -2200,7 +1849,6 @@ tavor_ci_query_mw(ibc_hca_hdl_t hca, ibc_mw_hdl_t mw, mw_attr_p->mw_rkey = mwhdl->mr_rkey; mutex_exit(&mwhdl->mr_lock); - TAVOR_TNF_EXIT(tavor_ci_query_mw); return (IBT_SUCCESS); } @@ -2288,21 +1936,13 @@ tavor_ci_attach_mcg(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ib_gid_t gid, tavor_qphdl_t qphdl; int status; - TAVOR_TNF_ENTER(tavor_ci_attach_mcg); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_attach_mcg_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_attach_mcg); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle pointer */ if (qp == NULL) { - TNF_PROBE_0(tavor_ci_attach_mcg_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_attach_mcg); return (IBT_QP_HDL_INVALID); } @@ -2313,13 +1953,9 @@ tavor_ci_attach_mcg(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ib_gid_t gid, /* Attach the QP to the multicast group */ status = tavor_mcg_attach(state, qphdl, gid, lid); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_attach_mcg_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_attach_mcg); return (status); } - TAVOR_TNF_EXIT(tavor_ci_attach_mcg); return (IBT_SUCCESS); } @@ -2337,21 +1973,13 @@ tavor_ci_detach_mcg(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ib_gid_t gid, tavor_qphdl_t qphdl; int status; - TAVOR_TNF_ENTER(tavor_ci_attach_mcg); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_detach_mcg_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_detach_mcg); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle pointer */ if (qp == NULL) { - TNF_PROBE_0(tavor_ci_detach_mcg_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_detach_mcg); return (IBT_QP_HDL_INVALID); } @@ -2362,13 +1990,9 @@ tavor_ci_detach_mcg(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ib_gid_t gid, /* Detach the QP from the multicast group */ status = tavor_mcg_detach(state, qphdl, gid, lid); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_detach_mcg_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_detach_mcg); return (status); } - TAVOR_TNF_EXIT(tavor_ci_detach_mcg); return (IBT_SUCCESS); } @@ -2386,24 +2010,16 @@ tavor_ci_post_send(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ibt_send_wr_t *wr_p, tavor_qphdl_t qphdl; int status; - TAVOR_TNF_ENTER(tavor_ci_post_send); - ASSERT(wr_p != NULL); ASSERT(num_wr != 0); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_post_send_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_post_send); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle pointer */ if (qp == NULL) { - TNF_PROBE_0(tavor_ci_post_send_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_post_send); return (IBT_QP_HDL_INVALID); } @@ -2414,13 +2030,9 @@ tavor_ci_post_send(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ibt_send_wr_t *wr_p, /* Post the send WQEs */ status = tavor_post_send(state, qphdl, wr_p, num_wr, num_posted_p); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_post_send_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_post_send); return (status); } - TAVOR_TNF_EXIT(tavor_ci_post_send); return (IBT_SUCCESS); } @@ -2438,24 +2050,16 @@ tavor_ci_post_recv(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ibt_recv_wr_t *wr_p, tavor_qphdl_t qphdl; int status; - TAVOR_TNF_ENTER(tavor_ci_post_recv); - ASSERT(wr_p != NULL); ASSERT(num_wr != 0); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_post_recv_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_post_recv); return (IBT_HCA_HDL_INVALID); } /* Check for valid QP handle pointer */ if (qp == NULL) { - TNF_PROBE_0(tavor_ci_post_recv_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_post_recv); return (IBT_QP_HDL_INVALID); } @@ -2466,13 +2070,9 @@ tavor_ci_post_recv(ibc_hca_hdl_t hca, ibc_qp_hdl_t qp, ibt_recv_wr_t *wr_p, /* Post the receive WQEs */ status = tavor_post_recv(state, qphdl, wr_p, num_wr, num_posted_p); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_post_recv_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_post_recv); return (status); } - TAVOR_TNF_EXIT(tavor_ci_post_recv); return (IBT_SUCCESS); } @@ -2491,31 +2091,20 @@ tavor_ci_poll_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq, ibt_wc_t *wc_p, uint_t polled; int status; - TAVOR_TNF_ENTER(tavor_ci_poll_cq); - ASSERT(wc_p != NULL); /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_poll_cq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_poll_cq); return (IBT_HCA_HDL_INVALID); } /* Check for valid CQ handle pointer */ if (cq == NULL) { - TNF_PROBE_0(tavor_ci_poll_cq_invcqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_poll_cq); return (IBT_CQ_HDL_INVALID); } /* Check for valid num_wc field */ if (num_wc == 0) { - TNF_PROBE_0(tavor_ci_poll_cq_num_wc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_poll_cq); return (IBT_INVALID_PARAM); } @@ -2538,15 +2127,9 @@ tavor_ci_poll_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq, ibt_wc_t *wc_p, * If success (something was polled), we return success */ if (status != DDI_SUCCESS) { - if (status != IBT_CQ_EMPTY) { - TNF_PROBE_1(tavor_ci_poll_cq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - } - TAVOR_TNF_EXIT(tavor_ci_poll_cq); return (status); } - TAVOR_TNF_EXIT(tavor_ci_poll_cq); return (IBT_SUCCESS); } @@ -2564,21 +2147,13 @@ tavor_ci_notify_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq_hdl, tavor_cqhdl_t cqhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_notify_cq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_notify_cq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_notify_cq); return (IBT_HCA_HDL_INVALID); } /* Check for valid CQ handle pointer */ if (cq_hdl == NULL) { - TNF_PROBE_0(tavor_ci_notify_cq_invcqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_notify_cq); return (IBT_CQ_HDL_INVALID); } @@ -2589,13 +2164,9 @@ tavor_ci_notify_cq(ibc_hca_hdl_t hca, ibc_cq_hdl_t cq_hdl, /* Enable the CQ notification */ status = tavor_cq_notify(state, cqhdl, flags); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_notify_cq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_notify_cq); return (status); } - TAVOR_TNF_EXIT(tavor_ci_notify_cq); return (IBT_SUCCESS); } @@ -2612,13 +2183,8 @@ tavor_ci_ci_data_in(ibc_hca_hdl_t hca, ibt_ci_data_flags_t flags, tavor_state_t *state; int status; - TAVOR_TNF_ENTER(tavor_ci_ci_data_in); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_ci_data_in_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_ci_data_in); return (IBT_HCA_HDL_INVALID); } @@ -2629,13 +2195,9 @@ tavor_ci_ci_data_in(ibc_hca_hdl_t hca, ibt_ci_data_flags_t flags, status = tavor_umap_ci_data_in(state, flags, object, ibc_object_handle, data_p, data_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_ci_data_in_umap_fail, TAVOR_TNF_ERROR, - "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_ci_data_in); return (status); } - TAVOR_TNF_EXIT(tavor_ci_ci_data_in); return (IBT_SUCCESS); } @@ -2652,13 +2214,8 @@ tavor_ci_ci_data_out(ibc_hca_hdl_t hca, ibt_ci_data_flags_t flags, tavor_state_t *state; int status; - TAVOR_TNF_ENTER(tavor_ci_ci_data_out); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_ci_data_out_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_ci_data_out); return (IBT_HCA_HDL_INVALID); } @@ -2669,13 +2226,9 @@ tavor_ci_ci_data_out(ibc_hca_hdl_t hca, ibt_ci_data_flags_t flags, status = tavor_umap_ci_data_out(state, flags, object, ibc_object_handle, data_p, data_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_ci_data_out_umap_fail, TAVOR_TNF_ERROR, - "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_ci_data_out); return (status); } - TAVOR_TNF_EXIT(tavor_ci_ci_data_out); return (IBT_SUCCESS); } @@ -2697,13 +2250,8 @@ tavor_ci_alloc_srq(ibc_hca_hdl_t hca, ibt_srq_flags_t flags, tavor_srq_options_t op; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_srq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_srq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_alloc_srq); return (IBT_HCA_HDL_INVALID); } @@ -2711,17 +2259,11 @@ tavor_ci_alloc_srq(ibc_hca_hdl_t hca, ibt_srq_flags_t flags, /* Check if SRQ is even supported */ if (state->ts_cfg_profile->cp_srq_enable == 0) { - TNF_PROBE_0(tavor_ci_alloc_srq_not_supported_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_srq); return (IBT_NOT_SUPPORTED); } /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_ci_alloc_srq_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_srq); return (IBT_PD_HDL_INVALID); } @@ -2736,13 +2278,11 @@ tavor_ci_alloc_srq(ibc_hca_hdl_t hca, ibt_srq_flags_t flags, op.srqo_wq_loc = state->ts_cfg_profile->cp_srq_wq_inddr; status = tavor_srq_alloc(state, &srqinfo, TAVOR_NOSLEEP, &op); if (status != DDI_SUCCESS) { - TAVOR_TNF_EXIT(tavor_ci_alloc_srq); return (status); } *ibc_srq_p = (ibc_srq_hdl_t)srqhdl; - TAVOR_TNF_EXIT(tavor_ci_alloc_srq); return (IBT_SUCCESS); } @@ -2758,13 +2298,8 @@ tavor_ci_free_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq) tavor_srqhdl_t srqhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_free_srq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_free_srq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_srq); return (IBT_HCA_HDL_INVALID); } @@ -2772,17 +2307,11 @@ tavor_ci_free_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq) /* Check if SRQ is even supported */ if (state->ts_cfg_profile->cp_srq_enable == 0) { - TNF_PROBE_0(tavor_ci_alloc_srq_not_supported_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_srq); return (IBT_NOT_SUPPORTED); } /* Check for valid SRQ handle pointer */ if (srq == NULL) { - TNF_PROBE_0(tavor_ci_free_srq_invsrqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_srq); return (IBT_SRQ_HDL_INVALID); } @@ -2791,13 +2320,9 @@ tavor_ci_free_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq) /* Free the SRQ */ status = tavor_srq_free(state, &srqhdl, TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_free_srq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_free_srq); return (status); } - TAVOR_TNF_EXIT(tavor_ci_free_srq); return (IBT_SUCCESS); } @@ -2813,13 +2338,8 @@ tavor_ci_query_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, ibc_pd_hdl_t *pd_p, tavor_state_t *state; tavor_srqhdl_t srqhdl; - TAVOR_TNF_ENTER(tavor_ci_query_srq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_query_srq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_srq); return (IBT_HCA_HDL_INVALID); } @@ -2827,17 +2347,11 @@ tavor_ci_query_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, ibc_pd_hdl_t *pd_p, /* Check if SRQ is even supported */ if (state->ts_cfg_profile->cp_srq_enable == 0) { - TNF_PROBE_0(tavor_ci_query_srq_not_supported_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_srq); return (IBT_NOT_SUPPORTED); } /* Check for valid SRQ handle pointer */ if (srq == NULL) { - TNF_PROBE_0(tavor_ci_query_srq_invsrqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_srq); return (IBT_SRQ_HDL_INVALID); } @@ -2846,9 +2360,6 @@ tavor_ci_query_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, ibc_pd_hdl_t *pd_p, mutex_enter(&srqhdl->srq_lock); if (srqhdl->srq_state == TAVOR_SRQ_STATE_ERROR) { mutex_exit(&srqhdl->srq_lock); - TNF_PROBE_0(tavor_ci_query_srq_error_state, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_query_srq); return (IBT_SRQ_ERROR_STATE); } @@ -2858,7 +2369,6 @@ tavor_ci_query_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, ibc_pd_hdl_t *pd_p, mutex_exit(&srqhdl->srq_lock); *limit_p = 0; - TAVOR_TNF_EXIT(tavor_ci_query_srq); return (IBT_SUCCESS); } @@ -2877,13 +2387,8 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, uint_t resize_supported, cur_srq_size; int status; - TAVOR_TNF_ENTER(tavor_ci_modify_srq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_modify_srq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_HCA_HDL_INVALID); } @@ -2891,17 +2396,11 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, /* Check if SRQ is even supported */ if (state->ts_cfg_profile->cp_srq_enable == 0) { - TNF_PROBE_0(tavor_ci_modify_srq_not_supported_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_NOT_SUPPORTED); } /* Check for valid SRQ handle pointer */ if (srq == NULL) { - TNF_PROBE_0(tavor_ci_modify_srq_invcqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_SRQ_HDL_INVALID); } @@ -2916,9 +2415,6 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, cur_srq_size = srqhdl->srq_wq_bufsz; if (srqhdl->srq_state == TAVOR_SRQ_STATE_ERROR) { mutex_exit(&srqhdl->srq_lock); - TNF_PROBE_0(tavor_ci_modify_srq_error_state, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_SRQ_ERROR_STATE); } mutex_exit(&srqhdl->srq_lock); @@ -2936,9 +2432,6 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, * function should also be removed at that time. */ if (flags & IBT_SRQ_SET_LIMIT) { - TNF_PROBE_0(tavor_ci_modify_srq_limit_not_supported, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_NOT_SUPPORTED); } @@ -2948,7 +2441,6 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, * do we continue on with our resize processing. */ if (!(flags & IBT_SRQ_SET_SIZE)) { - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_SUCCESS); } @@ -2956,9 +2448,6 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, IBT_HCA_RESIZE_SRQ; if ((flags & IBT_SRQ_SET_SIZE) && !resize_supported) { - TNF_PROBE_0(tavor_ci_modify_srq_resize_not_supp_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_NOT_SUPPORTED); } @@ -2969,7 +2458,6 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, */ if (size <= cur_srq_size) { *ret_size_p = cur_srq_size; - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_SUCCESS); } @@ -2978,13 +2466,9 @@ tavor_ci_modify_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, if (status != DDI_SUCCESS) { /* Set return value to current SRQ size */ *ret_size_p = cur_srq_size; - TNF_PROBE_1(tavor_ci_modify_srq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (status); } - TAVOR_TNF_EXIT(tavor_ci_modify_srq); return (IBT_SUCCESS); } @@ -3001,13 +2485,8 @@ tavor_ci_post_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, tavor_srqhdl_t srqhdl; int status; - TAVOR_TNF_ENTER(tavor_ci_post_srq); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_post_srq_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_post_srq); return (IBT_HCA_HDL_INVALID); } @@ -3015,17 +2494,11 @@ tavor_ci_post_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, /* Check if SRQ is even supported */ if (state->ts_cfg_profile->cp_srq_enable == 0) { - TNF_PROBE_0(tavor_ci_post_srq_not_supported_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_post_srq); return (IBT_NOT_SUPPORTED); } /* Check for valid SRQ handle pointer */ if (srq == NULL) { - TNF_PROBE_0(tavor_ci_post_srq_invsrqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_post_srq); return (IBT_SRQ_HDL_INVALID); } @@ -3033,13 +2506,9 @@ tavor_ci_post_srq(ibc_hca_hdl_t hca, ibc_srq_hdl_t srq, status = tavor_post_srq(state, srqhdl, wr, num_wr, num_posted_p); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_post_srq_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_post_srq); return (status); } - TAVOR_TNF_EXIT(tavor_ci_post_srq); return (IBT_SUCCESS); } @@ -3286,8 +2755,6 @@ tavor_ci_alloc_lkey(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, ibt_lkey_flags_t flags, uint_t phys_buf_list_sz, ibc_mr_hdl_t *mr_p, ibt_pmr_desc_t *mem_desc_p) { - TAVOR_TNF_ENTER(tavor_ci_alloc_lkey); - TAVOR_TNF_EXIT(tavor_ci_alloc_lkey); return (IBT_NOT_SUPPORTED); } @@ -3301,8 +2768,6 @@ tavor_ci_register_physical_mr(ibc_hca_hdl_t hca, ibc_pd_hdl_t pd, ibt_pmr_attr_t *mem_pattrs, void *ibtl_reserved, ibc_mr_hdl_t *mr_p, ibt_pmr_desc_t *mem_desc_p) { - TAVOR_TNF_ENTER(tavor_ci_register_physical_mr); - TAVOR_TNF_EXIT(tavor_ci_register_physical_mr); return (IBT_NOT_SUPPORTED); } @@ -3315,8 +2780,6 @@ tavor_ci_reregister_physical_mr(ibc_hca_hdl_t hca, ibc_mr_hdl_t mr, ibc_pd_hdl_t pd, ibt_pmr_attr_t *mem_pattrs, void *ibtl_reserved, ibc_mr_hdl_t *mr_p, ibt_pmr_desc_t *mr_desc_p) { - TAVOR_TNF_ENTER(tavor_ci_reregister_physical_mr); - TAVOR_TNF_EXIT(tavor_ci_reregister_physical_mr); return (IBT_NOT_SUPPORTED); } @@ -3401,21 +2864,13 @@ tavor_ci_alloc_io_mem( tavor_state_t *state; int status; - TAVOR_TNF_ENTER(tavor_ci_alloc_io_mem); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_alloc_io_mem_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_io_mem); return (IBT_HCA_HDL_INVALID); } /* Check for valid mem_alloc_hdl handle pointer */ if (mem_alloc_hdl == NULL) { - TNF_PROBE_0(tavor_ci_alloc_io_mem_hdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_alloc_io_mem); return (IBT_MEM_ALLOC_HDL_INVALID); } @@ -3427,13 +2882,9 @@ tavor_ci_alloc_io_mem( (tavor_mem_alloc_hdl_t *)mem_alloc_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_ci_alloc_ah_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_ci_alloc_io_mem); return (status); } - TAVOR_TNF_EXIT(tavor_ci_alloc_io_mem); return (IBT_SUCCESS); } @@ -3447,21 +2898,13 @@ tavor_ci_free_io_mem(ibc_hca_hdl_t hca, ibc_mem_alloc_hdl_t mem_alloc_hdl) { tavor_mem_alloc_hdl_t memhdl; - TAVOR_TNF_ENTER(tavor_ci_free_io_mem); - /* Check for valid HCA handle */ if (hca == NULL) { - TNF_PROBE_0(tavor_ci_free_io_mem_invhca_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_io_mem); return (IBT_HCA_HDL_INVALID); } /* Check for valid mem_alloc_hdl handle pointer */ if (mem_alloc_hdl == NULL) { - TNF_PROBE_0(tavor_ci_free_io_mem_hdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ci_free_io_mem); return (IBT_MEM_ALLOC_HDL_INVALID); } @@ -3473,7 +2916,6 @@ tavor_ci_free_io_mem(ibc_hca_hdl_t hca, ibc_mem_alloc_hdl_t mem_alloc_hdl) ddi_dma_free_handle(&memhdl->tavor_dma_hdl); kmem_free(memhdl, sizeof (*memhdl)); - TAVOR_TNF_EXIT(tavor_dma_free); return (IBT_SUCCESS); } @@ -3493,8 +2935,6 @@ tavor_mem_alloc( int status; int (*ddi_cb)(caddr_t); - TAVOR_TNF_ENTER(tavor_mem_alloc); - tavor_dma_attr_init(&dma_attr); ddi_cb = (flags & IBT_MR_NOSLEEP) ? DDI_DMA_DONTWAIT : DDI_DMA_SLEEP; @@ -3503,8 +2943,6 @@ tavor_mem_alloc( status = ddi_dma_alloc_handle(state->ts_dip, &dma_attr, ddi_cb, NULL, &dma_hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_dma_alloc_handle_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mem_alloc); return (DDI_FAILURE); } @@ -3515,8 +2953,6 @@ tavor_mem_alloc( kaddrp, &real_len, &acc_hdl); if (status != DDI_SUCCESS) { ddi_dma_free_handle(&dma_hdl); - TNF_PROBE_0(tavor_dma_alloc_memory_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mem_alloc); return (DDI_FAILURE); } @@ -3526,14 +2962,11 @@ tavor_mem_alloc( if (*mem_hdl == NULL) { ddi_dma_mem_free(&acc_hdl); ddi_dma_free_handle(&dma_hdl); - TNF_PROBE_0(tavor_dma_alloc_memory_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mem_alloc); return (DDI_FAILURE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(**mem_hdl)) (*mem_hdl)->tavor_dma_hdl = dma_hdl; (*mem_hdl)->tavor_acc_hdl = acc_hdl; - TAVOR_TNF_EXIT(tavor_mem_alloc); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c index 4675367af6..8af83be8cc 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cmd.c @@ -73,39 +73,27 @@ tavor_cmd_post(tavor_state_t *state, tavor_cmd_post_t *cmdpost) int status; uint16_t token; - TAVOR_TNF_ENTER(tavor_cmd_post); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cmdpost)) /* Determine if we are going to spin until completion */ if (cmdpost->cp_flags == TAVOR_CMD_NOSLEEP_SPIN) { - TNF_PROBE_0_DEBUG(tavor_cmd_post_spin, TAVOR_TNF_TRACE, ""); - /* Write the command to the HCR */ status = tavor_write_hcr(state, cmdpost, 0); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmd_post_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmd_post); return (status); } - TAVOR_TNF_EXIT(tavor_cmd_post); return (TAVOR_CMD_SUCCESS); } else { /* "TAVOR_CMD_SLEEP_NOSPIN" */ - TNF_PROBE_0_DEBUG(tavor_cmd_post_nospin, TAVOR_TNF_TRACE, ""); - ASSERT(TAVOR_SLEEPFLAG_FOR_CONTEXT() != TAVOR_NOSLEEP); /* NOTE: Expect threads to be waiting in here */ status = tavor_outstanding_cmd_alloc(state, &cmdptr, cmdpost->cp_flags); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmd_alloc_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmd_post); return (status); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cmdptr)) @@ -126,8 +114,6 @@ tavor_cmd_post(tavor_state_t *state, tavor_cmd_post_t *cmdpost) status = tavor_write_hcr(state, cmdpost, token); if (status != TAVOR_CMD_SUCCESS) { tavor_outstanding_cmd_free(state, &cmdptr); - TNF_PROBE_0(tavor_cmd_post_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmd_post); return (status); } @@ -171,12 +157,9 @@ tavor_cmd_post(tavor_state_t *state, tavor_cmd_post_t *cmdpost) tavor_outstanding_cmd_free(state, &cmdptr); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmd_post_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmd_post); return (status); } - TAVOR_TNF_EXIT(tavor_cmd_post); return (TAVOR_CMD_SUCCESS); } } @@ -196,8 +179,6 @@ tavor_mbox_alloc(tavor_state_t *state, tavor_mbox_info_t *mbox_info, int status; uint_t sleep_context; - TAVOR_TNF_ENTER(tavor_mbox_alloc); - sleep_context = TAVOR_SLEEPFLAG_FOR_CONTEXT(); /* Allocate an "In" mailbox */ @@ -215,7 +196,6 @@ tavor_mbox_alloc(tavor_state_t *state, tavor_mbox_info_t *mbox_info, &state->ts_in_mblist, &mbox_info->mbi_in, mbox_wait); if (status != TAVOR_CMD_SUCCESS) { - TAVOR_TNF_EXIT(tavor_mbox_alloc); return (status); } } @@ -244,7 +224,6 @@ tavor_mbox_alloc(tavor_state_t *state, tavor_mbox_info_t *mbox_info, &state->ts_in_mblist, &mbox_info->mbi_in); } - TAVOR_TNF_EXIT(tavor_mbox_alloc); return (status); } } @@ -254,7 +233,6 @@ tavor_mbox_alloc(tavor_state_t *state, tavor_mbox_info_t *mbox_info, _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(mbox_info->mbi_sleep_context)) mbox_info->mbi_sleep_context = sleep_context; - TAVOR_TNF_EXIT(tavor_mbox_alloc); return (TAVOR_CMD_SUCCESS); } @@ -266,8 +244,6 @@ tavor_mbox_alloc(tavor_state_t *state, tavor_mbox_info_t *mbox_info, void tavor_mbox_free(tavor_state_t *state, tavor_mbox_info_t *mbox_info) { - TAVOR_TNF_ENTER(tavor_mbox_free); - /* * The mailbox has to be freed in the same context from which it was * allocated. The context is stored in the mbox_info at @@ -303,8 +279,6 @@ tavor_mbox_free(tavor_state_t *state, tavor_mbox_info_t *mbox_info) &mbox_info->mbi_out); } } - - TAVOR_TNF_EXIT(tavor_mbox_free); } @@ -319,19 +293,14 @@ tavor_cmd_complete_handler(tavor_state_t *state, tavor_eqhdl_t eq, tavor_cmd_t *cmdp; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_cmd_complete_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_COMMAND_INTF_COMP || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_cmd_complete_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_cmd_complete_handler); return (DDI_FAILURE); } @@ -350,7 +319,6 @@ tavor_cmd_complete_handler(tavor_state_t *state, tavor_eqhdl_t eq, cv_signal(&cmdp->cmd_comp_cv); mutex_exit(&cmdp->cmd_comp_lock); - TAVOR_TNF_EXIT(tavor_cmd_complete_handler); return (DDI_SUCCESS); } @@ -365,20 +333,14 @@ tavor_inmbox_list_init(tavor_state_t *state) int status; uint_t num_inmbox; - TAVOR_TNF_ENTER(tavor_inmbox_list_init); - /* Initialize the "In" mailbox list */ num_inmbox = (1 << state->ts_cfg_profile->cp_log_num_inmbox); status = tavor_impl_mboxlist_init(state, &state->ts_in_mblist, num_inmbox, TAVOR_IN_MBOX); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_impl_mboxlist_init_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_inmbox_list_init); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_inmbox_list_init); return (DDI_SUCCESS); } @@ -393,20 +355,14 @@ tavor_intr_inmbox_list_init(tavor_state_t *state) int status; uint_t num_inmbox; - TAVOR_TNF_ENTER(tavor_intr_inmbox_list_init); - /* Initialize the interrupt "In" mailbox list */ num_inmbox = (1 << state->ts_cfg_profile->cp_log_num_intr_inmbox); status = tavor_impl_mboxlist_init(state, &state->ts_in_intr_mblist, num_inmbox, TAVOR_INTR_IN_MBOX); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_impl_mboxlist_init_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_intr_inmbox_list_init); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_intr_inmbox_list_init); return (DDI_SUCCESS); } @@ -421,20 +377,14 @@ tavor_outmbox_list_init(tavor_state_t *state) int status; uint_t num_outmbox; - TAVOR_TNF_ENTER(tavor_outmbox_list_init); - /* Initialize the "Out" mailbox list */ num_outmbox = (1 << state->ts_cfg_profile->cp_log_num_outmbox); status = tavor_impl_mboxlist_init(state, &state->ts_out_mblist, num_outmbox, TAVOR_OUT_MBOX); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_impl_mboxlist_init_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_outmbox_list_init); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_outmbox_list_init); return (DDI_SUCCESS); } @@ -449,20 +399,14 @@ tavor_intr_outmbox_list_init(tavor_state_t *state) int status; uint_t num_outmbox; - TAVOR_TNF_ENTER(tavor_intr_outmbox_list_init); - /* Initialize the interrupts "Out" mailbox list */ num_outmbox = (1 << state->ts_cfg_profile->cp_log_num_intr_outmbox); status = tavor_impl_mboxlist_init(state, &state->ts_out_intr_mblist, num_outmbox, TAVOR_INTR_OUT_MBOX); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_impl_mboxlist_init_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_intr_outmbox_list_init); return (DDI_FAILURE); } - TAVOR_TNF_EXIT(tavor_intr_outmbox_list_init); return (DDI_SUCCESS); } @@ -474,12 +418,8 @@ tavor_intr_outmbox_list_init(tavor_state_t *state) void tavor_inmbox_list_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_inmbox_list_fini); - /* Free up the "In" mailbox list */ tavor_impl_mboxlist_fini(state, &state->ts_in_mblist); - - TAVOR_TNF_EXIT(tavor_inmbox_list_fini); } @@ -490,12 +430,8 @@ tavor_inmbox_list_fini(tavor_state_t *state) void tavor_intr_inmbox_list_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_intr_inmbox_list_fini); - /* Free up the interupts "In" mailbox list */ tavor_impl_mboxlist_fini(state, &state->ts_in_intr_mblist); - - TAVOR_TNF_EXIT(tavor_intr_inmbox_list_fini); } @@ -506,12 +442,8 @@ tavor_intr_inmbox_list_fini(tavor_state_t *state) void tavor_outmbox_list_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_outmbox_list_fini); - /* Free up the "Out" mailbox list */ tavor_impl_mboxlist_fini(state, &state->ts_out_mblist); - - TAVOR_TNF_EXIT(tavor_outmbox_list_fini); } @@ -522,12 +454,8 @@ tavor_outmbox_list_fini(tavor_state_t *state) void tavor_intr_outmbox_list_fini(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_intr_outmbox_list_fini); - /* Free up the interrupt "Out" mailbox list */ tavor_impl_mboxlist_fini(state, &state->ts_out_intr_mblist); - - TAVOR_TNF_EXIT(tavor_intr_outmbox_list_fini); } @@ -543,8 +471,6 @@ tavor_impl_mbox_alloc(tavor_state_t *state, tavor_mboxlist_t *mblist, uint_t index, next, prev; uint_t count, countmax; - TAVOR_TNF_ENTER(tavor_impl_mbox_alloc); - /* * If the mailbox list is empty, then wait (if appropriate in the * current context). Otherwise, grab the next available mailbox. @@ -559,9 +485,6 @@ tavor_impl_mbox_alloc(tavor_state_t *state, tavor_mboxlist_t *mblist, mutex_exit(&mblist->mbl_lock); /* Delay loop polling for an available mbox */ if (++count > countmax) { - TNF_PROBE_0(tavor_impl_mbox_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_impl_mbox_alloc); return (TAVOR_CMD_INSUFF_RSRC); } @@ -613,7 +536,6 @@ tavor_impl_mbox_alloc(tavor_state_t *state, tavor_mboxlist_t *mblist, mutex_exit(&mblist->mbl_lock); - TAVOR_TNF_EXIT(tavor_impl_mbox_alloc); return (TAVOR_CMD_SUCCESS); } @@ -627,8 +549,6 @@ tavor_impl_mbox_free(tavor_mboxlist_t *mblist, tavor_mbox_t **mb) { uint_t mbox_indx; - TAVOR_TNF_ENTER(tavor_impl_mbox_free); - mutex_enter(&mblist->mbl_lock); /* Pull the "index" from mailbox entry */ @@ -696,8 +616,6 @@ tavor_impl_mbox_free(tavor_mboxlist_t *mblist, tavor_mbox_t **mb) *mb = NULL; mutex_exit(&mblist->mbl_lock); - - TAVOR_TNF_EXIT(tavor_impl_mbox_free); } @@ -714,8 +632,6 @@ tavor_impl_mboxlist_init(tavor_state_t *state, tavor_mboxlist_t *mblist, uint_t dma_cookiecnt, flag, sync; int status, i; - TAVOR_TNF_ENTER(tavor_impl_mboxlist_init); - /* Allocate the memory for the mailbox entries list */ mblist->mbl_list_sz = num_mbox; mblist->mbl_mbox = kmem_zalloc(mblist->mbl_list_sz * @@ -746,8 +662,6 @@ tavor_impl_mboxlist_init(tavor_state_t *state, tavor_mboxlist_t *mblist, &rsrc); if (status != DDI_SUCCESS) { /* Jump to cleanup and return error */ - TNF_PROBE_0(tavor_impl_mbox_init_rsrcalloc_fail, - TAVOR_TNF_ERROR, ""); goto mboxlist_init_fail; } @@ -767,8 +681,6 @@ tavor_impl_mboxlist_init(tavor_state_t *state, tavor_mboxlist_t *mblist, if (status != DDI_SUCCESS) { /* Jump to cleanup and return error */ tavor_rsrc_free(state, &rsrc); - TNF_PROBE_0(tavor_impl_mbox_init_dmabind_fail, - TAVOR_TNF_ERROR, ""); goto mboxlist_init_fail; } @@ -791,13 +703,11 @@ tavor_impl_mboxlist_init(tavor_state_t *state, tavor_mboxlist_t *mblist, mblist->mbl_mbox[mblist->mbl_tail_indx].mb_next = mblist->mbl_head_indx; - TAVOR_TNF_EXIT(tavor_impl_mboxlist_init); return (DDI_SUCCESS); mboxlist_init_fail: tavor_impl_mboxlist_fini(state, mblist); - TAVOR_TNF_EXIT(tavor_impl_mboxlist_init); return (DDI_FAILURE); } @@ -812,8 +722,6 @@ tavor_impl_mboxlist_fini(tavor_state_t *state, tavor_mboxlist_t *mblist) tavor_rsrc_t *rsrc; int i, status; - TAVOR_TNF_ENTER(tavor_impl_mboxlist_fini); - /* Release the resources for each of the mailbox list entries */ for (i = 0; i < mblist->mbl_num_alloc; i++) { rsrc = mblist->mbl_mbox[i].mb_rsrcptr; @@ -830,9 +738,6 @@ tavor_impl_mboxlist_fini(tavor_state_t *state, tavor_mboxlist_t *mblist) status = ddi_dma_unbind_handle(rsrc->tr_dmahdl); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to unbind DMA mapping"); - TNF_PROBE_0(tavor_impl_mboxlist_fini_dmaunbind_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_impl_mboxlist_fini); return; } @@ -847,8 +752,6 @@ tavor_impl_mboxlist_fini(tavor_state_t *state, tavor_mboxlist_t *mblist) /* Free up the memory for tracking the mailbox list */ kmem_free(mblist->mbl_mbox, mblist->mbl_list_sz * sizeof (tavor_mbox_t)); - - TAVOR_TNF_EXIT(tavor_impl_mboxlist_fini); } @@ -863,8 +766,6 @@ tavor_outstanding_cmd_alloc(tavor_state_t *state, tavor_cmd_t **cmd_ptr, tavor_cmdlist_t *cmd_list; uint_t next, prev, head; - TAVOR_TNF_ENTER(tavor_outstanding_cmd_alloc); - cmd_list = &state->ts_cmd_list; mutex_enter(&cmd_list->cml_lock); @@ -880,9 +781,6 @@ tavor_outstanding_cmd_alloc(tavor_state_t *state, tavor_cmd_t **cmd_ptr, /* No free commands */ if (cmd_wait == TAVOR_NOSLEEP) { mutex_exit(&cmd_list->cml_lock); - TNF_PROBE_0(tavor_outstanding_cmd_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_outstanding_cmd_alloc); return (TAVOR_CMD_INSUFF_RSRC); } @@ -920,7 +818,6 @@ tavor_outstanding_cmd_alloc(tavor_state_t *state, tavor_cmd_t **cmd_ptr, mutex_exit(&cmd_list->cml_lock); - TAVOR_TNF_EXIT(tavor_outstanding_cmd_alloc); return (TAVOR_CMD_SUCCESS); } @@ -935,8 +832,6 @@ tavor_outstanding_cmd_free(tavor_state_t *state, tavor_cmd_t **cmd_ptr) tavor_cmdlist_t *cmd_list; uint_t cmd_indx; - TAVOR_TNF_ENTER(tavor_outstanding_cmd_free); - cmd_list = &state->ts_cmd_list; mutex_enter(&cmd_list->cml_lock); @@ -980,8 +875,6 @@ tavor_outstanding_cmd_free(tavor_state_t *state, tavor_cmd_t **cmd_ptr) *cmd_ptr = NULL; mutex_exit(&cmd_list->cml_lock); - - TAVOR_TNF_EXIT(tavor_outstanding_cmd_free); } @@ -997,8 +890,6 @@ tavor_write_hcr(tavor_state_t *state, tavor_cmd_post_t *cmdpost, uint_t status, count, countmax; uint64_t hcrreg; - TAVOR_TNF_ENTER(tavor_write_hcr); - /* * Grab the "HCR access" lock if the driver is not in * fastreboot. In fastreboot, this function is called @@ -1026,9 +917,6 @@ tavor_write_hcr(tavor_state_t *state, tavor_cmd_post_t *cmdpost, /* If "go" bit is clear, then done */ if ((hcrreg & TAVOR_HCR_CMD_GO_MASK) == 0) { - TNF_PROBE_1_DEBUG(tavor_write_hcr_loop_count, - TAVOR_TNF_ERROR, "", tnf_uint, nospinloopcount, - count); break; } /* Delay before polling the "go" bit again */ @@ -1046,9 +934,6 @@ tavor_write_hcr(tavor_state_t *state, tavor_cmd_post_t *cmdpost, mutex_exit(&state->ts_cmd_regs.hcr_lock); } #endif - TNF_PROBE_0(tavor_write_hcr_timeout1, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_write_hcr); return (TAVOR_CMD_TIMEOUT); } } @@ -1093,9 +978,6 @@ tavor_write_hcr(tavor_state_t *state, tavor_cmd_post_t *cmdpost, /* If "go" bit is clear, then done */ if ((hcrreg & TAVOR_HCR_CMD_GO_MASK) == 0) { - TNF_PROBE_1_DEBUG(tavor_write_hcr_loop_count, - TAVOR_TNF_ERROR, "", tnf_uint, - spinloopcount, count); break; } /* Delay before polling the "go" bit again */ @@ -1114,9 +996,6 @@ tavor_write_hcr(tavor_state_t *state, tavor_cmd_post_t *cmdpost, ts_cmd_regs.hcr_lock); } #endif - TNF_PROBE_0(tavor_write_hcr_timeout2, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_write_hcr); return (TAVOR_CMD_TIMEOUT); } } @@ -1148,7 +1027,6 @@ tavor_write_hcr(tavor_state_t *state, tavor_cmd_post_t *cmdpost, } #endif - TAVOR_TNF_EXIT(tavor_write_hcr); return (status); } @@ -1163,8 +1041,6 @@ tavor_outstanding_cmdlist_init(tavor_state_t *state) uint_t num_outstanding_cmds, head, tail; int i; - TAVOR_TNF_ENTER(tavor_outstanding_cmdlist_init); - /* * Determine the number of the outstanding commands supported * by the Tavor device (obtained from the QUERY_FW command). Note: @@ -1215,7 +1091,6 @@ tavor_outstanding_cmdlist_init(tavor_state_t *state) state->ts_cmd_list.cml_head_indx; } - TAVOR_TNF_EXIT(tavor_outstanding_cmdlist_init); return (DDI_SUCCESS); } @@ -1229,8 +1104,6 @@ tavor_outstanding_cmdlist_fini(tavor_state_t *state) { int i; - TAVOR_TNF_ENTER(tavor_outstanding_cmdlist_fini); - /* Destroy the outstanding command list entries */ for (i = 0; i < state->ts_cmd_list.cml_num_alloc; i++) { mutex_destroy(&state->ts_cmd_list.cml_cmd[i].cmd_comp_lock); @@ -1245,7 +1118,6 @@ tavor_outstanding_cmdlist_fini(tavor_state_t *state) state->ts_cmd_list.cml_list_sz * sizeof (tavor_cmd_t)); } - TAVOR_TNF_EXIT(tavor_outstanding_cmdlist_fini); } @@ -1259,11 +1131,8 @@ tavor_mbox_sync(tavor_mbox_t *mbox, uint_t offset, uint_t length, ddi_dma_handle_t dmahdl; int status; - TAVOR_TNF_ENTER(tavor_mbox_sync); - /* Determine if mailbox needs to be synced or not */ if (mbox->mb_sync == 0) { - TAVOR_TNF_EXIT(tavor_mbox_sync); return; } @@ -1273,12 +1142,8 @@ tavor_mbox_sync(tavor_mbox_t *mbox, uint_t offset, uint_t length, /* Calculate offset into mailbox */ status = ddi_dma_sync(dmahdl, (off_t)offset, (size_t)length, flag); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_mbox_sync_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mbox_sync); return; } - - TAVOR_TNF_EXIT(tavor_mbox_sync); } @@ -1294,8 +1159,6 @@ tavor_sys_en_cmd_post(tavor_state_t *state, uint_t flags, tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_sys_en_cmd_post); - /* Make sure we are called with the correct flag */ ASSERT(sleepflag == TAVOR_CMD_NOSLEEP_SPIN); @@ -1308,7 +1171,6 @@ tavor_sys_en_cmd_post(tavor_state_t *state, uint_t flags, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_sys_en_cmd_post_fail, TAVOR_TNF_ERROR, ""); /* * When the SYS_EN command fails, the "outparam" field may * contain more detailed information about what caused the @@ -1317,7 +1179,6 @@ tavor_sys_en_cmd_post(tavor_state_t *state, uint_t flags, *errorcode = cmd.cp_outparm; } - TAVOR_TNF_EXIT(tavor_sys_en_cmd_post); return (status); } @@ -1333,8 +1194,6 @@ tavor_sys_dis_cmd_post(tavor_state_t *state, uint_t sleepflag) tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_sys_dis_cmd_post); - /* Make sure we are called with the correct flag */ ASSERT(sleepflag == TAVOR_CMD_NOSLEEP_SPIN); @@ -1346,12 +1205,7 @@ tavor_sys_dis_cmd_post(tavor_state_t *state, uint_t sleepflag) cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_sys_dis_cmd_post_fail, - TAVOR_TNF_ERROR, ""); - } - TAVOR_TNF_EXIT(tavor_sys_dis_cmd_post); return (status); } @@ -1371,8 +1225,6 @@ tavor_init_hca_cmd_post(tavor_state_t *state, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_init_hca_cmd_post); - /* Make sure we are called with the correct flag */ ASSERT(sleepflag == TAVOR_CMD_NOSLEEP_SPIN); @@ -1380,8 +1232,6 @@ tavor_init_hca_cmd_post(tavor_state_t *state, mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_init_hca_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_init_hca_cmd_post); return (status); } @@ -1404,15 +1254,10 @@ tavor_init_hca_cmd_post(tavor_state_t *state, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_init_hca_cmd_post_fail, - TAVOR_TNF_ERROR, ""); - } /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_init_hca_cmd_post); return (status); } @@ -1428,8 +1273,6 @@ tavor_close_hca_cmd_post(tavor_state_t *state, uint_t sleepflag) tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_close_hca_cmd_post); - /* Make sure we are called with the correct flag */ ASSERT(sleepflag == TAVOR_CMD_NOSLEEP_SPIN); @@ -1441,12 +1284,7 @@ tavor_close_hca_cmd_post(tavor_state_t *state, uint_t sleepflag) cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_close_hca_cmd_post_fail, - TAVOR_TNF_ERROR, ""); - } - TAVOR_TNF_EXIT(tavor_close_hca_cmd_post); return (status); } @@ -1466,8 +1304,6 @@ tavor_init_ib_cmd_post(tavor_state_t *state, tavor_hw_initib_t *initib, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_init_ib_cmd_post); - /* Make sure we are called with the correct flag */ ASSERT(sleepflag == TAVOR_CMD_NOSLEEP_SPIN); @@ -1475,8 +1311,6 @@ tavor_init_ib_cmd_post(tavor_state_t *state, tavor_hw_initib_t *initib, mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_init_ib_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_init_ib_cmd_post); return (status); } @@ -1499,15 +1333,10 @@ tavor_init_ib_cmd_post(tavor_state_t *state, tavor_hw_initib_t *initib, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_init_ib_cmd_post_fail, - TAVOR_TNF_ERROR, ""); - } /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_init_ib_cmd_post); return (status); } @@ -1523,8 +1352,6 @@ tavor_close_ib_cmd_post(tavor_state_t *state, uint_t port, uint_t sleepflag) tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_close_ib_cmd_post); - /* Setup and post the Tavor "CLOSE_IB" command */ cmd.cp_inparm = 0; cmd.cp_outparm = 0; @@ -1533,11 +1360,7 @@ tavor_close_ib_cmd_post(tavor_state_t *state, uint_t port, uint_t sleepflag) cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_close_ib_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } - TAVOR_TNF_EXIT(tavor_close_ib_cmd_post); return (status); } @@ -1554,14 +1377,10 @@ tavor_set_ib_cmd_post(tavor_state_t *state, uint32_t capmask, uint_t port, tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_set_ib_cmd_post); - /* Get an "In" mailbox for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_set_ib_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_set_ib_cmd_post); return (status); } @@ -1583,14 +1402,10 @@ tavor_set_ib_cmd_post(tavor_state_t *state, uint32_t capmask, uint_t port, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_set_ib_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_set_ib_cmd_post); return (status); } @@ -1609,8 +1424,6 @@ tavor_mod_stat_cfg_cmd_post(tavor_state_t *state) uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_mod_stat_cfg_cmd_post); - /* * "MOD_STAT_CFG" needs an INMBOX parameter, to specify what operations * to do. However, at the point in time that we call this command, the @@ -1622,8 +1435,6 @@ tavor_mod_stat_cfg_cmd_post(tavor_state_t *state) mbox_info.mbi_alloc_flags = TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, TAVOR_NOSLEEP); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_mod_stat_cfg_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mod_stat_cfg_cmd_post); return (status); } @@ -1664,10 +1475,6 @@ tavor_mod_stat_cfg_cmd_post(tavor_state_t *state) cmd.cp_opmod = 0; cmd.cp_flags = TAVOR_CMD_NOSLEEP_SPIN; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_mod_stat_cfg_cmd_post_fail, TAVOR_TNF_ERROR, - ""); - } /* Free "MOD_STAT_CFG" struct */ kmem_free(mod, sizeof (tavor_hw_mod_stat_cfg_t)); @@ -1675,7 +1482,6 @@ tavor_mod_stat_cfg_cmd_post(tavor_state_t *state) /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_mod_stat_cfg_cmd_post); return (status); } @@ -1693,14 +1499,10 @@ tavor_mad_ifc_cmd_post(tavor_state_t *state, uint_t port, uint_t size; int status; - TAVOR_TNF_ENTER(tavor_mad_ifc_cmd_post); - /* Get "In" and "Out" mailboxes for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX | TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_mad_ifc_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mad_ifc_cmd_post); return (status); } @@ -1720,8 +1522,6 @@ tavor_mad_ifc_cmd_post(tavor_state_t *state, uint_t port, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_mad_ifc_cmd_post_fail, - TAVOR_TNF_ERROR, ""); goto mad_ifc_fail; } @@ -1735,7 +1535,6 @@ mad_ifc_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_mad_ifc_cmd_post); return (status); } @@ -1754,15 +1553,10 @@ tavor_getportinfo_cmd_post(tavor_state_t *state, uint_t port, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_getportinfo_cmd_post); - /* Get "In" and "Out" mailboxes for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX | TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getportinfo_mbox_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_getportinfo_cmd_post); return (status); } @@ -1791,8 +1585,6 @@ tavor_getportinfo_cmd_post(tavor_state_t *state, uint_t port, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getportinfo_cmd_post_fail, - TAVOR_TNF_ERROR, ""); goto getportinfo_fail; } @@ -1816,7 +1608,6 @@ getportinfo_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_getportinfo_cmd_post); return (status); } @@ -1836,8 +1627,6 @@ tavor_getnodeinfo_cmd_post(tavor_state_t *state, uint_t sleepflag, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_getnodeinfo_cmd_post); - /* Make sure we are called with the correct flag */ ASSERT(sleepflag == TAVOR_CMD_NOSLEEP_SPIN); @@ -1845,9 +1634,6 @@ tavor_getnodeinfo_cmd_post(tavor_state_t *state, uint_t sleepflag, mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX | TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getnodeinfo_mbox_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_getnodeinfo_cmd_post); return (status); } @@ -1875,8 +1661,6 @@ tavor_getnodeinfo_cmd_post(tavor_state_t *state, uint_t sleepflag, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getnodeinfo_cmd_post_fail, - TAVOR_TNF_ERROR, ""); goto getnodeinfo_fail; } @@ -1898,7 +1682,6 @@ getnodeinfo_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_getnodeinfo_cmd_post); return (status); } @@ -1918,14 +1701,10 @@ tavor_getnodedesc_cmd_post(tavor_state_t *state, uint_t sleepflag, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_getnodedesc_cmd_post); - /* Get "In" and "Out" mailboxes for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX | TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getnodedesc_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_getnodedesc_cmd_post); return (status); } @@ -1953,8 +1732,6 @@ tavor_getnodedesc_cmd_post(tavor_state_t *state, uint_t sleepflag, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getnodedesc_cmd_post_fail, - TAVOR_TNF_ERROR, ""); goto getnodedesc_fail; } @@ -1971,7 +1748,6 @@ getnodedesc_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_getnodedesc_cmd_post); return (status); } @@ -1990,14 +1766,10 @@ tavor_getguidinfo_cmd_post(tavor_state_t *state, uint_t port, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_getguidinfo_cmd_post); - /* Get "In" and "Out" mailboxes for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX | TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getguidinfo_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_getguidinfo_cmd_post); return (status); } @@ -2026,8 +1798,6 @@ tavor_getguidinfo_cmd_post(tavor_state_t *state, uint_t port, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getguidinfo_cmd_post_fail, - TAVOR_TNF_ERROR, ""); goto getguidinfo_fail; } @@ -2050,7 +1820,6 @@ getguidinfo_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_getguidinfo_cmd_post); return (status); } @@ -2069,14 +1838,10 @@ tavor_getpkeytable_cmd_post(tavor_state_t *state, uint_t port, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_getpkeytable_cmd_post); - /* Get "In" and "Out" mailboxes for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX | TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getpkeytable_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_getpkeytable_cmd_post); return (status); } @@ -2105,8 +1870,6 @@ tavor_getpkeytable_cmd_post(tavor_state_t *state, uint_t port, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_getpkeytable_cmd_post_fail, - TAVOR_TNF_ERROR, ""); goto getpkeytable_fail; } @@ -2129,7 +1892,6 @@ getpkeytable_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_getpkeytable_cmd_post); return (status); } @@ -2146,8 +1908,6 @@ tavor_write_mtt_cmd_post(tavor_state_t *state, tavor_mbox_info_t *mbox_info, uint_t size; int status; - TAVOR_TNF_ENTER(tavor_write_mtt_cmd_post); - /* * The WRITE_MTT command is unlike the other commands we use, in that * we have intentionally separated the mailbox allocation step from @@ -2170,11 +1930,7 @@ tavor_write_mtt_cmd_post(tavor_state_t *state, tavor_mbox_info_t *mbox_info, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_write_mtt_cmd_fail, TAVOR_TNF_ERROR, ""); - } - TAVOR_TNF_EXIT(tavor_write_mtt_cmd_post); return (status); } @@ -2189,8 +1945,6 @@ tavor_sync_tpt_cmd_post(tavor_state_t *state, uint_t sleepflag) tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_sync_tpt_cmd_post); - /* Setup and post the Tavor "SYNC_TPT" command */ cmd.cp_inparm = 0; cmd.cp_outparm = 0; @@ -2199,11 +1953,7 @@ tavor_sync_tpt_cmd_post(tavor_state_t *state, uint_t sleepflag) cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_sync_tpt_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } - TAVOR_TNF_EXIT(tavor_sync_tpt_cmd_post); return (status); } @@ -2219,8 +1969,6 @@ tavor_map_eq_cmd_post(tavor_state_t *state, uint_t map, uint_t eqcindx, tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_map_eq_cmd_post); - /* Setup and post Tavor "MAP_EQ" command */ cmd.cp_inparm = eqmapmask; cmd.cp_outparm = 0; @@ -2232,11 +1980,7 @@ tavor_map_eq_cmd_post(tavor_state_t *state, uint_t map, uint_t eqcindx, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_map_eq_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } - TAVOR_TNF_EXIT(tavor_map_eq_cmd_post); return (status); } @@ -2255,14 +1999,10 @@ tavor_resize_cq_cmd_post(tavor_state_t *state, tavor_hw_cqc_t *cqc, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_resize_cq_cmd_post); - /* Get an "In" mailbox for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_resize_cq_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_resize_cq_cmd_post); return (status); } @@ -2285,9 +2025,6 @@ tavor_resize_cq_cmd_post(tavor_state_t *state, tavor_hw_cqc_t *cqc, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_resize_cq_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } /* * New "producer index" is returned in the upper 32 bits of @@ -2298,7 +2035,6 @@ tavor_resize_cq_cmd_post(tavor_state_t *state, tavor_hw_cqc_t *cqc, /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_resize_cq_cmd_post); return (status); } @@ -2328,8 +2064,6 @@ tavor_cmn_qp_cmd_post(tavor_state_t *state, uint_t opcode, uint_t size, flags, opmod; int status, i; - TAVOR_TNF_ENTER(tavor_cmn_qp_cmd_post); - /* * Use the specified opcode type to set the appropriate parameters. * Specifically, we need to set in_mapaddr, out_mapaddr, flags, and @@ -2390,9 +2124,6 @@ tavor_cmn_qp_cmd_post(tavor_state_t *state, uint_t opcode, mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmn_qp_mbox_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmn_qp_cmd_post); return (status); } in_mapaddr = mbox_info.mbi_in->mb_mapaddr; @@ -2428,9 +2159,6 @@ tavor_cmn_qp_cmd_post(tavor_state_t *state, uint_t opcode, cmd.cp_opmod = opmod; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmn_qp_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } /* * If we allocated a mailbox (either an "In" or an "Out") above, @@ -2442,7 +2170,6 @@ tavor_cmn_qp_cmd_post(tavor_state_t *state, uint_t opcode, tavor_mbox_free(state, &mbox_info); } - TAVOR_TNF_EXIT(tavor_cmn_qp_cmd_post); return (status); } @@ -2469,14 +2196,10 @@ tavor_cmn_query_cmd_post(tavor_state_t *state, uint_t opcode, uint_t offset; int status, i; - TAVOR_TNF_ENTER(tavor_cmn_query_cmd_post); - /* Get an "Out" mailbox for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmn_query_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmn_query_cmd_post); return (status); } @@ -2489,7 +2212,6 @@ tavor_cmn_query_cmd_post(tavor_state_t *state, uint_t opcode, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmn_query_cmd_post_fail, TAVOR_TNF_ERROR, ""); goto cmn_query_fail; } @@ -2514,7 +2236,6 @@ cmn_query_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_cmn_query_cmd_post); return (status); } @@ -2545,8 +2266,6 @@ tavor_cmn_ownership_cmd_post(tavor_state_t *state, uint_t opcode, uint_t direction, opmod; int status, i; - TAVOR_TNF_ENTER(tavor_cmn_ownership_cmd_post); - /* * Determine the direction of the ownership transfer based on the * provided opcode @@ -2560,9 +2279,6 @@ tavor_cmn_ownership_cmd_post(tavor_state_t *state, uint_t opcode, direction = TAVOR_CMD_RSRC_SW2HW; } else { - TNF_PROBE_0(tavor_cmn_ownership_dir_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmn_ownership_cmd_post); return (TAVOR_CMD_INVALID_STATUS); } @@ -2595,9 +2311,6 @@ tavor_cmn_ownership_cmd_post(tavor_state_t *state, uint_t opcode, status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmn_ownership_mbox_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cmn_ownership_cmd_post); return (status); } in_mapaddr = 0; @@ -2612,9 +2325,6 @@ tavor_cmn_ownership_cmd_post(tavor_state_t *state, uint_t opcode, mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmn_ownership_mbox_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_sw2hw_mpt_cmd_post); return (status); } @@ -2645,8 +2355,6 @@ tavor_cmn_ownership_cmd_post(tavor_state_t *state, uint_t opcode, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_cmn_ownership_cmd_post_fail, - TAVOR_TNF_ERROR, ""); goto cmn_ownership_fail; } @@ -2674,7 +2382,6 @@ cmn_ownership_fail: tavor_mbox_free(state, &mbox_info); } - TAVOR_TNF_EXIT(tavor_cmn_ownership_cmd_post); return (status); } @@ -2690,8 +2397,6 @@ tavor_conf_special_qp_cmd_post(tavor_state_t *state, uint_t qpindx, tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_conf_special_qp_cmd_post); - /* Setup and post Tavor "CONF_SPECIAL_QP" command */ cmd.cp_inparm = 0; cmd.cp_outparm = 0; @@ -2700,12 +2405,7 @@ tavor_conf_special_qp_cmd_post(tavor_state_t *state, uint_t qpindx, cmd.cp_opmod = qptype; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_conf_special_qp_cmd_post_fail, - TAVOR_TNF_ERROR, ""); - } - TAVOR_TNF_EXIT(tavor_conf_special_qp_cmd_post); return (status); } @@ -2722,14 +2422,10 @@ tavor_mgid_hash_cmd_post(tavor_state_t *state, uint64_t mgid_h, tavor_cmd_post_t cmd; int status; - TAVOR_TNF_ENTER(tavor_mgid_hash_cmd_post); - /* Get an "In" mailbox for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_mgid_hash_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mgid_hash_cmd_post); return (status); } @@ -2751,9 +2447,6 @@ tavor_mgid_hash_cmd_post(tavor_state_t *state, uint64_t mgid_h, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_mgid_hash_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } /* MGID hash value is returned in command "outparam" */ *mgid_hash = cmd.cp_outparm; @@ -2761,7 +2454,6 @@ tavor_mgid_hash_cmd_post(tavor_state_t *state, uint64_t mgid_h, /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_mgid_hash_cmd_post); return (status); } @@ -2785,14 +2477,10 @@ tavor_read_mgm_cmd_post(tavor_state_t *state, tavor_hw_mcg_t *mcg, uint_t size, hdrsz, qplistsz; int status, i; - TAVOR_TNF_ENTER(tavor_read_mgm_cmd_post); - /* Get an "Out" mailbox for the results */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_OUTMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_read_mgm_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_read_mgm_cmd_post); return (status); } @@ -2805,7 +2493,6 @@ tavor_read_mgm_cmd_post(tavor_state_t *state, tavor_hw_mcg_t *mcg, cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_read_mgm_cmd_post_fail, TAVOR_TNF_ERROR, ""); goto read_mgm_fail; } @@ -2831,7 +2518,6 @@ read_mgm_fail: /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_read_mgm_cmd_post); return (status); } @@ -2855,14 +2541,10 @@ tavor_write_mgm_cmd_post(tavor_state_t *state, tavor_hw_mcg_t *mcg, uint_t size, hdrsz, qplistsz; int status, i; - TAVOR_TNF_ENTER(tavor_write_mgm_cmd_post); - /* Get an "In" mailbox for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_write_mcg_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_write_mgm_cmd_post); return (status); } @@ -2892,14 +2574,10 @@ tavor_write_mgm_cmd_post(tavor_state_t *state, tavor_hw_mcg_t *mcg, cmd.cp_opmod = 0; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_write_mgm_cmd_post_fail, TAVOR_TNF_ERROR, ""); - } /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_write_mgm_cmd_post); return (status); } @@ -2919,14 +2597,10 @@ tavor_modify_mpt_cmd_post(tavor_state_t *state, tavor_hw_mpt_t *mpt, uint_t size; int status, i; - TAVOR_TNF_ENTER(tavor_modify_mpt_cmd_post); - /* Get an "In" mailbox for the command */ mbox_info.mbi_alloc_flags = TAVOR_ALLOC_INMBOX; status = tavor_mbox_alloc(state, &mbox_info, sleepflag); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_modify_mpt_mbox_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_modify_mpt_cmd_post); return (status); } @@ -2949,15 +2623,10 @@ tavor_modify_mpt_cmd_post(tavor_state_t *state, tavor_hw_mpt_t *mpt, cmd.cp_opmod = flags; cmd.cp_flags = sleepflag; status = tavor_cmd_post(state, &cmd); - if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_0(tavor_modify_mpt_cmd_post_fail, - TAVOR_TNF_ERROR, ""); - } /* Free the mailbox */ tavor_mbox_free(state, &mbox_info); - TAVOR_TNF_EXIT(tavor_modify_mpt_cmd_post); return (status); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cq.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cq.c index a31591dbbc..ef0892c6f2 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_cq.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_cq.c @@ -77,9 +77,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, uint32_t log_cq_size, lkey, uarpg; uint_t dma_xfer_mode, cq_sync, cq_is_umap; int status, i, flag; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_cq_alloc); _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cq_attr)) @@ -96,8 +93,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, status = tavor_umap_db_find(state->ts_instance, ddi_get_pid(), MLNX_UMAP_UARPG_RSRC, &value, 0, NULL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "failed UAR page"); goto cqalloc_fail; } uarpg = ((tavor_rsrc_t *)(uintptr_t)value)->tr_indx; @@ -118,8 +113,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, */ status = tavor_rsrc_alloc(state, TAVOR_CQC, 1, sleepflag, &cqc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed CQ context"); goto cqalloc_fail1; } @@ -131,8 +124,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, */ status = tavor_rsrc_alloc(state, TAVOR_CQHDL, 1, sleepflag, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed CQ handle"); goto cqalloc_fail2; } cq = (tavor_cqhdl_t)rsrc->tr_addr; @@ -153,8 +144,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, umapdb = tavor_umap_db_alloc(state->ts_instance, cq->cq_cqnum, MLNX_UMAP_CQMEM_RSRC, (uint64_t)(uintptr_t)rsrc); if (umapdb == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed umap add"); goto cqalloc_fail3; } } @@ -173,8 +162,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, * with the device limits and/or software-configured limits) */ if (log_cq_size > state->ts_cfg_profile->cp_log_max_cq_sz) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_CQ_EXCEEDED, "max CQ size"); goto cqalloc_fail4; } @@ -203,8 +190,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, } status = tavor_queue_alloc(state, &cq->cq_cqinfo, sleepflag); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed completion queue"); goto cqalloc_fail4; } buf = (tavor_hw_cqe_t *)cq->cq_cqinfo.qa_buf_aligned; @@ -244,8 +229,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, op.mro_bind_override_addr = 0; status = tavor_mr_register(state, pd, &mr_attr, &mr, &op); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed register mr"); goto cqalloc_fail5; } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr)) @@ -300,10 +283,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: SW2HW_CQ command failed: %08x\n", status); - TNF_PROBE_1(tavor_cq_alloc_sw2hw_cq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), "tavor SW2HW_CQ command"); goto cqalloc_fail6; } @@ -356,7 +335,6 @@ tavor_cq_alloc(tavor_state_t *state, ibt_cq_hdl_t ibt_cqhdl, } *cqhdl = cq; - TAVOR_TNF_EXIT(tavor_cq_alloc); return (DDI_SUCCESS); /* @@ -380,9 +358,6 @@ cqalloc_fail2: cqalloc_fail1: tavor_pd_refcnt_dec(pd); cqalloc_fail: - TNF_PROBE_1(tavor_cq_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_cq_alloc); return (status); } @@ -406,8 +381,6 @@ tavor_cq_free(tavor_state_t *state, tavor_cqhdl_t *cqhdl, uint_t sleepflag) uint_t maxprot; int status; - TAVOR_TNF_ENTER(tavor_cq_free); - /* * Pull all the necessary information from the Tavor Completion Queue * handle. This is necessary here because the resource for the @@ -427,9 +400,6 @@ tavor_cq_free(tavor_state_t *state, tavor_cqhdl_t *cqhdl, uint_t sleepflag) */ if (cq->cq_refcnt != 0) { mutex_exit(&cq->cq_lock); - TNF_PROBE_1(tavor_cq_free_refcnt_fail, TAVOR_TNF_ERROR, "", - tnf_int, refcnt, cq->cq_refcnt); - TAVOR_TNF_EXIT(tavor_cq_free); return (IBT_CQ_BUSY); } @@ -448,7 +418,6 @@ tavor_cq_free(tavor_state_t *state, tavor_cqhdl_t *cqhdl, uint_t sleepflag) if (status != DDI_SUCCESS) { mutex_exit(&cq->cq_lock); TAVOR_WARNING(state, "failed to find in database"); - TAVOR_TNF_EXIT(tavor_cq_free); return (ibc_get_ci_failure(0)); } tavor_umap_db_free(umapdb); @@ -461,7 +430,6 @@ tavor_cq_free(tavor_state_t *state, tavor_cqhdl_t *cqhdl, uint_t sleepflag) mutex_exit(&cq->cq_lock); TAVOR_WARNING(state, "failed in CQ memory " "devmap_devmem_remap()"); - TAVOR_TNF_EXIT(tavor_cq_free); return (ibc_get_ci_failure(0)); } cq->cq_umap_dhp = (devmap_cookie_t)NULL; @@ -498,9 +466,6 @@ tavor_cq_free(tavor_state_t *state, tavor_cqhdl_t *cqhdl, uint_t sleepflag) TAVOR_WARNING(state, "failed to reclaim CQC ownership"); cmn_err(CE_CONT, "Tavor: HW2SW_CQ command failed: %08x\n", status); - TNF_PROBE_1(tavor_cq_free_hw2sw_cq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_cq_free); return (ibc_get_ci_failure(0)); } @@ -514,8 +479,6 @@ tavor_cq_free(tavor_state_t *state, tavor_cqhdl_t *cqhdl, uint_t sleepflag) sleepflag); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to deregister CQ memory"); - TNF_PROBE_0(tavor_cq_free_dereg_mr_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cq_free); return (ibc_get_ci_failure(0)); } @@ -534,7 +497,6 @@ tavor_cq_free(tavor_state_t *state, tavor_cqhdl_t *cqhdl, uint_t sleepflag) /* Set the cqhdl pointer to NULL and return success */ *cqhdl = NULL; - TAVOR_TNF_EXIT(tavor_cq_free); return (DDI_SUCCESS); } @@ -557,9 +519,6 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, uint32_t new_prod_indx, old_cons_indx; uint_t dma_xfer_mode, cq_sync, log_cq_size, maxprot; int status, i, flag; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_cq_resize); /* Use the internal protection domain (PD) for CQs */ pd = state->ts_pdhdl_internal; @@ -578,8 +537,6 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, * with the device limits and/or software-configured limits) */ if (log_cq_size > state->ts_cfg_profile->cp_log_max_cq_sz) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_CQ_EXCEEDED, "max CQ size"); goto cqresize_fail; } @@ -609,8 +566,6 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, } status = tavor_queue_alloc(state, &new_cqinfo, sleepflag); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed completion queue"); goto cqresize_fail; } buf = (tavor_hw_cqe_t *)new_cqinfo.qa_buf_aligned; @@ -649,8 +604,6 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, status = tavor_mr_register(state, pd, &mr_attr, &mr, &op); if (status != DDI_SUCCESS) { tavor_queue_free(state, &new_cqinfo); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed register mr"); goto cqresize_fail; } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr)) @@ -707,9 +660,6 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, tavor_queue_free(state, &new_cqinfo); TAVOR_WARNING(state, "failed to find in database"); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "failed umap lookup"); goto cqresize_fail; } old_cons_indx = cqc_entry.cons_indx; @@ -748,14 +698,10 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, } tavor_queue_free(state, &new_cqinfo); if (status == TAVOR_CMD_BAD_SIZE) { - TAVOR_TNF_EXIT(tavor_cq_resize); return (IBT_CQ_SZ_INSUFFICIENT); } else { cmn_err(CE_CONT, "Tavor: RESIZE_CQ command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_cq_resize_cq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_cq_resize); return (ibc_get_ci_failure(0)); } } @@ -806,7 +752,6 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, mutex_exit(&cq->cq_lock); TAVOR_WARNING(state, "failed in CQ memory " "devmap_devmem_remap()"); - TAVOR_TNF_EXIT(tavor_cq_free); return (ibc_get_ci_failure(0)); } cq->cq_umap_dhp = (devmap_cookie_t)NULL; @@ -830,9 +775,6 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, sleepflag); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to deregister old CQ memory"); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "failed deregister mr (old)"); goto cqresize_fail; } @@ -847,13 +789,9 @@ tavor_cq_resize(tavor_state_t *state, tavor_cqhdl_t cq, uint_t req_size, *actual_size = (1 << log_cq_size) - 1; } - TAVOR_TNF_EXIT(tavor_cq_resize); return (DDI_SUCCESS); cqresize_fail: - TNF_PROBE_1(tavor_cq_resize_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_cq_resize); return (status); } @@ -868,8 +806,6 @@ tavor_cq_notify(tavor_state_t *state, tavor_cqhdl_t cq, { uint_t cqnum; - TAVOR_TNF_ENTER(tavor_cq_notify); - /* * Determine if we are trying to get the next completion or the next * "solicited" completion. Then hit the appropriate doorbell. @@ -888,13 +824,9 @@ tavor_cq_notify(tavor_state_t *state, tavor_cqhdl_t cq, cqnum, TAVOR_CQDB_DEFAULT_PARAM); } else { - TNF_PROBE_1(tavor_cq_notify_invflags_fail, TAVOR_TNF_ERROR, "", - tnf_int, flags, flags); - TAVOR_TNF_EXIT(tavor_cq_notify); return (IBT_CQ_NOTIFY_TYPE_INVALID); } - TAVOR_TNF_EXIT(tavor_cq_notify); return (DDI_SUCCESS); } @@ -912,17 +844,12 @@ tavor_cq_poll(tavor_state_t *state, tavor_cqhdl_t cq, ibt_wc_t *wc_p, uint32_t polled_cnt, num_to_increment; int status; - TAVOR_TNF_ENTER(tavor_cq_poll); - /* * Check for user-mappable CQ memory. Note: We do not allow kernel * clients to poll CQ memory that is accessible directly by the user. * If the CQ memory is user accessible, then return an error. */ if (cq->cq_is_umap) { - TNF_PROBE_0(tavor_cq_poll_inv_usrmapped_type, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cq_poll); return (IBT_CQ_HDL_INVALID); } @@ -1039,7 +966,6 @@ tavor_cq_poll(tavor_state_t *state, tavor_cqhdl_t cq, ibt_wc_t *wc_p, (void) tavor_isr((caddr_t)state, (caddr_t)NULL); } - TAVOR_TNF_EXIT(tavor_cq_poll); return (status); } @@ -1056,19 +982,14 @@ tavor_cq_handler(tavor_state_t *state, tavor_eqhdl_t eq, uint_t cqnum; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_cq_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_COMPLETION || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_cq_handler_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_cq_handler); return (DDI_FAILURE); } @@ -1107,13 +1028,8 @@ tavor_cq_handler(tavor_state_t *state, tavor_eqhdl_t eq, if ((cq != NULL) && (cq->cq_cqnum == cqnum) && (state->ts_ibtfpriv != NULL)) { TAVOR_DO_IBTF_CQ_CALLB(state, cq); - } else { - TNF_PROBE_2(tavor_cq_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_cqnum, cqnum, - tnf_uint, hdl_cqnum, cqnum); } - TAVOR_TNF_EXIT(tavor_cq_handler); return (DDI_SUCCESS); } @@ -1132,19 +1048,14 @@ tavor_cq_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_cq_err_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_CQ_ERRORS || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_cq_err_handler_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_cq_err_handler); return (DDI_FAILURE); } @@ -1180,13 +1091,8 @@ tavor_cq_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_ERROR_CQ; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_cq_err_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_cqnum, cqnum, - tnf_uint, hdl_cqnum, cqnum); } - TAVOR_TNF_EXIT(tavor_cq_err_handler); return (DDI_SUCCESS); } @@ -1206,8 +1112,6 @@ tavor_cq_refcnt_inc(tavor_cqhdl_t cq, uint_t is_special) * CQ is being used. */ mutex_enter(&cq->cq_lock); - TNF_PROBE_1_DEBUG(tavor_cq_refcnt_inc, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, cq->cq_refcnt); if (cq->cq_refcnt == 0) { cq->cq_is_special = is_special; } else { @@ -1232,8 +1136,6 @@ tavor_cq_refcnt_dec(tavor_cqhdl_t cq) /* Decrement the completion queue's reference count */ mutex_enter(&cq->cq_lock); cq->cq_refcnt--; - TNF_PROBE_1_DEBUG(tavor_cq_refcnt_dec, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, cq->cq_refcnt); mutex_exit(&cq->cq_lock); } @@ -1252,9 +1154,6 @@ tavor_cq_doorbell(tavor_state_t *state, uint32_t cq_cmd, uint32_t cqn, doorbell = ((uint64_t)cq_cmd << TAVOR_CQDB_CMD_SHIFT) | ((uint64_t)cqn << TAVOR_CQDB_CQN_SHIFT) | cq_param; - TNF_PROBE_1_DEBUG(tavor_cq_doorbell, TAVOR_TNF_TRACE, "", - tnf_ulong, doorbell, doorbell); - /* Write the doorbell to UAR */ TAVOR_UAR_DOORBELL(state, (uint64_t *)&state->ts_uar->cq, doorbell); @@ -1303,8 +1202,6 @@ tavor_cq_cqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, uint_t flags, type, opcode, qpnum, qp1_indx; int status; - TAVOR_TNF_ENTER(tavor_cq_cqe_consume); - /* * Determine if this is an "error" CQE by examining "opcode". If it * is an error CQE, then call tavor_cq_errcqe_consume() and return @@ -1315,7 +1212,6 @@ tavor_cq_cqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, if ((opcode == TAVOR_CQE_SEND_ERR_OPCODE) || (opcode == TAVOR_CQE_RECV_ERR_OPCODE)) { status = tavor_cq_errcqe_consume(state, cq, cqe, wc); - TAVOR_TNF_EXIT(tavor_cq_cqe_consume); return (status); } @@ -1368,9 +1264,6 @@ tavor_cq_cqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, default: TAVOR_WARNING(state, "unknown send CQE type"); wc->wc_status = IBT_WC_LOCAL_QP_OP_ERR; - TNF_PROBE_1(tavor_cq_cqe_consume_unknown_send_type, - TAVOR_TNF_ERROR, "", tnf_uint, opcode, opcode); - TAVOR_TNF_EXIT(tavor_cq_cqe_consume); return (TAVOR_CQ_SYNC_AND_DB); } } else { @@ -1409,9 +1302,6 @@ tavor_cq_cqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, default: TAVOR_WARNING(state, "unknown recv CQE type"); wc->wc_status = IBT_WC_LOCAL_QP_OP_ERR; - TNF_PROBE_1(tavor_cq_cqe_consume_unknown_rcv_type, - TAVOR_TNF_ERROR, "", tnf_uint, opcode, opcode); - TAVOR_TNF_EXIT(tavor_cq_cqe_consume); return (TAVOR_CQ_SYNC_AND_DB); } } @@ -1459,7 +1349,6 @@ tavor_cq_cqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, wc->wc_bytes_xfer = TAVOR_CQE_BYTECNT_GET(cq, cqe); } - TAVOR_TNF_EXIT(tavor_cq_cqe_consume); return (TAVOR_CQ_SYNC_AND_DB); } @@ -1478,8 +1367,6 @@ tavor_cq_errcqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, uint_t doorbell_cnt, status; tavor_wrid_entry_t wre; - TAVOR_TNF_ENTER(tavor_cq_errcqe_consume); - /* * Fetch the Work Request ID using the information in the CQE. * See tavor_wr.c for more details. @@ -1556,8 +1443,6 @@ tavor_cq_errcqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, default: TAVOR_WARNING(state, "unknown error CQE status"); status = IBT_WC_LOCAL_QP_OP_ERR; - TNF_PROBE_1(tavor_cq_errcqe_consume_unknown_status, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); break; } wc->wc_status = status; @@ -1599,7 +1484,6 @@ tavor_cq_errcqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, * Return status to indicate that doorbell and sync may be * necessary. */ - TAVOR_TNF_EXIT(tavor_cq_errcqe_consume); return (TAVOR_CQ_SYNC_AND_DB); } else { @@ -1622,7 +1506,6 @@ tavor_cq_errcqe_consume(tavor_state_t *state, tavor_cqhdl_t cq, TAVOR_CQE_WQEADDRSZ_SET(cq, cqe, TAVOR_QP_WQEADDRSZ(next_wqeaddr, nextwqesize)); - TAVOR_TNF_EXIT(tavor_cq_errcqe_consume); return (TAVOR_CQ_RECYCLE_ENTRY); } } @@ -1637,30 +1520,17 @@ tavor_cqe_sync(tavor_cqhdl_t cq, tavor_hw_cqe_t *cqe, uint_t flag) { ddi_dma_handle_t dmahdl; off_t offset; - int status; - - TAVOR_TNF_ENTER(tavor_cqe_sync); /* Determine if CQ needs to be synced or not */ - if (cq->cq_sync == 0) { - TAVOR_TNF_EXIT(tavor_cqe_sync); + if (cq->cq_sync == 0) return; - } /* Get the DMA handle from CQ context */ dmahdl = cq->cq_mrhdl->mr_bindinfo.bi_dmahdl; /* Calculate offset of next CQE */ offset = (off_t)((uintptr_t)cqe - (uintptr_t)&cq->cq_buf[0]); - status = ddi_dma_sync(dmahdl, offset, sizeof (tavor_hw_cqe_t), flag); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_cqe_sync_getnextentry_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_cqe_sync); - return; - } - - TAVOR_TNF_EXIT(tavor_cqe_sync); + (void) ddi_dma_sync(dmahdl, offset, sizeof (tavor_hw_cqe_t), flag); } @@ -1676,8 +1546,6 @@ tavor_cq_resize_helper(tavor_cqhdl_t cq, tavor_hw_cqe_t *new_cqbuf, uint32_t new_cons_indx, wrap_around_mask; int i; - TAVOR_TNF_ENTER(tavor_cq_resize_helper); - ASSERT(MUTEX_HELD(&cq->cq_lock)); /* Get the consumer index */ @@ -1720,8 +1588,6 @@ tavor_cq_resize_helper(tavor_cqhdl_t cq, tavor_hw_cqe_t *new_cqbuf, old_cqe = &cq->cq_buf[old_cons_indx]; new_cqe = &new_cqbuf[new_cons_indx]; } - - TAVOR_TNF_EXIT(tavor_cq_resize_helper); } /* diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_event.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_event.c index e253fea14d..4c690d3f0d 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_event.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_event.c @@ -91,9 +91,6 @@ tavor_eq_init_all(tavor_state_t *state) uint_t log_eq_size, intr_num; uint_t num_eq, num_eq_init, num_eq_unmap; int status, i; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_eq_init_all); /* * For now, all Event Queues default to the same size (pulled from @@ -140,8 +137,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_alloc(state, log_eq_size, intr_num, &state->ts_eqhdl[i]); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed EQ alloc"); num_eq_init = i; goto all_eq_init_fail; } @@ -172,8 +167,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[32], TAVOR_EVT_MSK_CQ_ERRORS, tavor_cq_err_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "completion queue error event"); goto all_eq_init_fail; } num_eq_unmap = 33; @@ -190,8 +183,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[33], TAVOR_EVT_MSK_PORT_STATE_CHANGE, tavor_port_state_change_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "port state change event"); goto all_eq_init_fail; } num_eq_unmap = 34; @@ -208,8 +199,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[34], TAVOR_EVT_MSK_COMM_ESTABLISHED, tavor_comm_estbl_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "communication established event"); goto all_eq_init_fail; } num_eq_unmap = 35; @@ -228,8 +217,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[35], TAVOR_EVT_MSK_COMMAND_INTF_COMP, tavor_cmd_complete_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "command completion event"); goto all_eq_init_fail; } num_eq_unmap = 36; @@ -246,8 +233,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[36], TAVOR_EVT_MSK_LOCAL_WQ_CAT_ERROR, tavor_local_wq_cat_err_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "local WQ catastrophic error event"); goto all_eq_init_fail; } num_eq_unmap = 37; @@ -265,8 +250,6 @@ tavor_eq_init_all(tavor_state_t *state) TAVOR_EVT_MSK_INV_REQ_LOCAL_WQ_ERROR, tavor_invreq_local_wq_err_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "invalid req local WQ error event"); goto all_eq_init_fail; } num_eq_unmap = 38; @@ -284,8 +267,6 @@ tavor_eq_init_all(tavor_state_t *state) TAVOR_EVT_MSK_LOCAL_ACC_VIO_WQ_ERROR, tavor_local_acc_vio_wq_err_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "local access violation WQ error event"); goto all_eq_init_fail; } num_eq_unmap = 39; @@ -303,8 +284,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[39], TAVOR_EVT_MSK_SEND_QUEUE_DRAINED, tavor_sendq_drained_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "send queue drained event"); goto all_eq_init_fail; } num_eq_unmap = 40; @@ -322,8 +301,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[40], TAVOR_EVT_MSK_PATH_MIGRATED, tavor_path_mig_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "path migration succeeded event"); goto all_eq_init_fail; } num_eq_unmap = 41; @@ -341,8 +318,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[41], TAVOR_EVT_MSK_PATH_MIGRATE_FAILED, tavor_path_mig_err_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "path migration failed event"); goto all_eq_init_fail; } num_eq_unmap = 42; @@ -365,8 +340,6 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[42], TAVOR_EVT_MSK_LOCAL_CAT_ERROR, NULL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "local catastrophic error event"); goto all_eq_init_fail; } num_eq_unmap = 43; @@ -384,8 +357,6 @@ tavor_eq_init_all(tavor_state_t *state) TAVOR_EVT_MSK_SRQ_CATASTROPHIC_ERROR, tavor_srq_catastrophic_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "srq catastrophic error event"); goto all_eq_init_fail; } num_eq_unmap = 44; @@ -403,8 +374,6 @@ tavor_eq_init_all(tavor_state_t *state) TAVOR_EVT_MSK_SRQ_LAST_WQE_REACHED, tavor_srq_last_wqe_reached_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "srq last wqe reached event"); goto all_eq_init_fail; } num_eq_unmap = 45; @@ -422,8 +391,6 @@ tavor_eq_init_all(tavor_state_t *state) TAVOR_EVT_MSK_ECC_DETECTION, tavor_ecc_detection_handler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "ecc detection event"); goto all_eq_init_fail; } num_eq_unmap = 46; @@ -440,14 +407,9 @@ tavor_eq_init_all(tavor_state_t *state) status = tavor_eq_handler_init(state, state->ts_eqhdl[46], TAVOR_EVT_CATCHALL_MASK, tavor_no_eqhandler); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "all other events"); - TNF_PROBE_0(tavor_eq_init_all_allothershdlr_fail, - TAVOR_TNF_ERROR, ""); goto all_eq_init_fail; } - TAVOR_TNF_EXIT(tavor_eq_init_all); return (DDI_SUCCESS); all_eq_init_fail: @@ -460,9 +422,6 @@ all_eq_init_fail: for (i = 0; i < num_eq_init; i++) { (void) tavor_eq_free(state, &state->ts_eqhdl[i]); } - TNF_PROBE_1(tavor_eq_init_all_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_eq_init_all); return (status); } @@ -477,8 +436,6 @@ tavor_eq_fini_all(tavor_state_t *state) uint_t num_eq; int status, i; - TAVOR_TNF_ENTER(tavor_eq_fini_all); - /* * Grab the total number of supported EQs again. This is the same * hardcoded value that was used above (during the event queue @@ -493,9 +450,6 @@ tavor_eq_fini_all(tavor_state_t *state) for (i = 0; i < num_eq; i++) { status = tavor_eq_handler_fini(state, state->ts_eqhdl[i]); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_eq_fini_all_eqhdlfini_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_eq_fini_all); return (DDI_FAILURE); } } @@ -507,14 +461,10 @@ tavor_eq_fini_all(tavor_state_t *state) for (i = 0; i < num_eq; i++) { status = tavor_eq_free(state, &state->ts_eqhdl[i]); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_eq_fini_all_eqfree_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_eq_fini_all); return (DDI_FAILURE); } } - TAVOR_TNF_EXIT(tavor_eq_fini_all); return (DDI_SUCCESS); } @@ -529,8 +479,6 @@ tavor_eq_arm_all(tavor_state_t *state) uint_t num_eq; int i; - TAVOR_TNF_ENTER(tavor_eq_arm_all); - /* * Grab the total number of supported EQs again. This is the same * hardcoded value that was used above (during the event queue @@ -545,8 +493,6 @@ tavor_eq_arm_all(tavor_state_t *state) for (i = 0; i < num_eq; i++) { tavor_eq_doorbell(state, TAVOR_EQDB_REARM_EQ, i, 0); } - - TAVOR_TNF_EXIT(tavor_eq_arm_all); } @@ -564,8 +510,6 @@ tavor_isr(caddr_t arg1, caddr_t arg2) uint_t status; int i; - TAVOR_TNF_ENTER(tavor_isr); - /* * Grab the Tavor softstate pointer from the input parameter */ @@ -620,7 +564,6 @@ tavor_isr(caddr_t arg1, caddr_t arg2) } while (ecrreg != 0x0); - TAVOR_TNF_EXIT(tavor_isr); return (status); } @@ -639,9 +582,6 @@ tavor_eq_doorbell(tavor_state_t *state, uint32_t eq_cmd, uint32_t eqn, doorbell = ((uint64_t)eq_cmd << TAVOR_EQDB_CMD_SHIFT) | ((uint64_t)eqn << TAVOR_EQDB_EQN_SHIFT) | eq_param; - TNF_PROBE_1_DEBUG(tavor_eq_doorbell, TAVOR_TNF_TRACE, "", - tnf_ulong, doorbell, doorbell); - /* Write the doorbell to UAR */ TAVOR_UAR_DOORBELL(state, (uint64_t *)&state->ts_uar->eq, doorbell); @@ -661,8 +601,6 @@ tavor_eq_poll(tavor_state_t *state, tavor_eqhdl_t eq) int (*eqfunction)(tavor_state_t *state, tavor_eqhdl_t eq, tavor_hw_eqe_t *eqe); - TAVOR_TNF_ENTER(tavor_eq_poll); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*eq)) /* Find the pointer to the clr_ECR register */ @@ -687,7 +625,6 @@ tavor_eq_poll(tavor_state_t *state, tavor_eqhdl_t eq) ecr_mask = ((uint64_t)1 << eq->eq_eqnum); ddi_put64(state->ts_reg_cmdhdl, clr_ecr, ecr_mask); - TAVOR_TNF_EXIT(tavor_eq_poll); return; } @@ -797,8 +734,6 @@ tavor_eq_poll(tavor_state_t *state, tavor_eqhdl_t eq) TAVOR_EQ_SYNC_NORMAL); } while (TAVOR_EQE_OWNER_IS_SW(eq, eqe)); - - TAVOR_TNF_EXIT(tavor_eq_poll); } @@ -818,8 +753,6 @@ tavor_eq_catastrophic(tavor_state_t *state) uint32_t err_buf; int i; - TAVOR_TNF_ENTER(tavor_eq_catastrophic); - bzero(&event, sizeof (ibc_async_event_t)); base_addr = (uint32_t *)(uintptr_t)( @@ -890,8 +823,6 @@ tavor_eq_catastrophic(tavor_state_t *state) if (state->ts_ibtfpriv != NULL) { TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); } - - TAVOR_TNF_EXIT(tavor_eq_catastrophic); } @@ -915,9 +846,6 @@ tavor_eq_alloc(tavor_state_t *state, uint32_t log_eq_size, uint_t intr, uint32_t lkey; uint_t dma_xfer_mode; int status, i; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_eq_alloc); /* Use the internal protection domain (PD) for setting up EQs */ pd = state->ts_pdhdl_internal; @@ -934,8 +862,6 @@ tavor_eq_alloc(tavor_state_t *state, uint32_t log_eq_size, uint_t intr, */ status = tavor_rsrc_alloc(state, TAVOR_EQC, 1, TAVOR_SLEEP, &eqc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed EQ context"); goto eqalloc_fail1; } @@ -947,8 +873,6 @@ tavor_eq_alloc(tavor_state_t *state, uint32_t log_eq_size, uint_t intr, */ status = tavor_rsrc_alloc(state, TAVOR_EQHDL, 1, TAVOR_SLEEP, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed EQ handler"); goto eqalloc_fail2; } eq = (tavor_eqhdl_t)rsrc->tr_addr; @@ -970,8 +894,6 @@ tavor_eq_alloc(tavor_state_t *state, uint32_t log_eq_size, uint_t intr, eq->eq_eqinfo.qa_location = TAVOR_QUEUE_LOCATION_NORMAL; status = tavor_queue_alloc(state, &eq->eq_eqinfo, TAVOR_SLEEP); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed event queue"); goto eqalloc_fail3; } buf = (tavor_hw_eqe_t *)eq->eq_eqinfo.qa_buf_aligned; @@ -1008,8 +930,6 @@ tavor_eq_alloc(tavor_state_t *state, uint32_t log_eq_size, uint_t intr, op.mro_bind_override_addr = 0; status = tavor_mr_register(state, pd, &mr_attr, &mr, &op); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed register mr"); goto eqalloc_fail4; } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr)) @@ -1057,10 +977,6 @@ tavor_eq_alloc(tavor_state_t *state, uint32_t log_eq_size, uint_t intr, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: SW2HW_EQ command failed: %08x\n", status); - TNF_PROBE_1(tavor_eq_alloc_sw2hw_eq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), "tavor SW2HW_EQ command"); goto eqalloc_fail5; } @@ -1078,7 +994,6 @@ tavor_eq_alloc(tavor_state_t *state, uint32_t log_eq_size, uint_t intr, eq->eq_mrhdl = mr; *eqhdl = eq; - TAVOR_TNF_EXIT(tavor_eq_alloc); return (DDI_SUCCESS); /* @@ -1098,9 +1013,6 @@ eqalloc_fail2: eqalloc_fail1: tavor_pd_refcnt_dec(pd); eqalloc_fail: - TNF_PROBE_1(tavor_eq_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_eq_alloc); return (status); } @@ -1120,8 +1032,6 @@ tavor_eq_free(tavor_state_t *state, tavor_eqhdl_t *eqhdl) uint32_t eqnum; int status; - TAVOR_TNF_ENTER(tavor_eq_free); - /* * Pull all the necessary information from the Tavor Event Queue * handle. This is necessary here because the resource for the @@ -1146,9 +1056,6 @@ tavor_eq_free(tavor_state_t *state, tavor_eqhdl_t *eqhdl) TAVOR_WARNING(state, "failed to reclaim EQC ownership"); cmn_err(CE_CONT, "Tavor: HW2SW_EQ command failed: %08x\n", status); - TNF_PROBE_1(tavor_eq_free_hw2sw_eq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_eq_free); return (DDI_FAILURE); } @@ -1162,8 +1069,6 @@ tavor_eq_free(tavor_state_t *state, tavor_eqhdl_t *eqhdl) TAVOR_NOSLEEP); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to deregister EQ memory"); - TNF_PROBE_0(tavor_eq_free_dereg_mr_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_eq_free); } /* Free the memory for the EQ */ @@ -1181,7 +1086,6 @@ tavor_eq_free(tavor_state_t *state, tavor_eqhdl_t *eqhdl) /* Set the eqhdl pointer to NULL and return success */ *eqhdl = NULL; - TAVOR_TNF_EXIT(tavor_eq_free); return (DDI_SUCCESS); } @@ -1197,8 +1101,6 @@ tavor_eq_handler_init(tavor_state_t *state, tavor_eqhdl_t eq, { int status; - TAVOR_TNF_ENTER(tavor_eq_handler_init); - /* * Save away the EQ handler function and the event type mask. These * will be used later during interrupt and event queue processing. @@ -1223,14 +1125,10 @@ tavor_eq_handler_init(tavor_state_t *state, tavor_eqhdl_t eq, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: MAP_EQ command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_eq_handler_init_map_eq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_eq_handler_init); return (DDI_FAILURE); } } - TAVOR_TNF_EXIT(tavor_eq_handler_init); return (DDI_SUCCESS); } @@ -1244,8 +1142,6 @@ tavor_eq_handler_fini(tavor_state_t *state, tavor_eqhdl_t eq) { int status; - TAVOR_TNF_ENTER(tavor_eq_handler_fini); - /* * Unmap the EQ from the event class to which it had been previously * mapped. The unmapping is done using the Tavor MAP_EQ (in much @@ -1265,14 +1161,10 @@ tavor_eq_handler_fini(tavor_state_t *state, tavor_eqhdl_t eq) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: MAP_EQ command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_eq_handler_fini_map_eq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_eq_handler_fini); return (DDI_FAILURE); } } - TAVOR_TNF_EXIT(tavor_eq_handler_fini); return (DDI_SUCCESS); } @@ -1294,13 +1186,9 @@ tavor_eqe_sync(tavor_eqhdl_t eq, tavor_hw_eqe_t *eqe, uint_t flag, { ddi_dma_handle_t dmahdl; off_t offset; - int status; - - TAVOR_TNF_ENTER(tavor_eqe_sync); /* Determine if EQ needs to be synced or not */ if ((eq->eq_sync == 0) && (force_sync == TAVOR_EQ_SYNC_NORMAL)) { - TAVOR_TNF_EXIT(tavor_eqe_sync); return; } @@ -1309,15 +1197,7 @@ tavor_eqe_sync(tavor_eqhdl_t eq, tavor_hw_eqe_t *eqe, uint_t flag, /* Calculate offset of next EQE */ offset = (off_t)((uintptr_t)eqe - (uintptr_t)&eq->eq_buf[0]); - status = ddi_dma_sync(dmahdl, offset, sizeof (tavor_hw_eqe_t), flag); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_eqe_sync_getnextentry_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_eqe_sync); - return; - } - - TAVOR_TNF_EXIT(tavor_eqe_sync); + (void) ddi_dma_sync(dmahdl, offset, sizeof (tavor_hw_eqe_t), flag); } @@ -1335,19 +1215,14 @@ tavor_port_state_change_handler(tavor_state_t *state, tavor_eqhdl_t eq, uint_t eqe_evttype; char link_msg[24]; - TAVOR_TNF_ENTER(tavor_port_state_change_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_PORT_STATE_CHANGE || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_port_state_change_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_port_state_change_handler); return (DDI_FAILURE); } @@ -1362,7 +1237,6 @@ tavor_port_state_change_handler(tavor_state_t *state, tavor_eqhdl_t eq, TAVOR_WARNING(state, "Unexpected port number in port state " "change event"); cmn_err(CE_CONT, " Port number: %02x\n", port); - TAVOR_TNF_EXIT(tavor_port_state_change_handler); return (DDI_FAILURE); } @@ -1386,7 +1260,6 @@ tavor_port_state_change_handler(tavor_state_t *state, tavor_eqhdl_t eq, "event"); cmn_err(CE_CONT, " Event type: %02x, subtype: %02x\n", TAVOR_EQE_EVTTYPE_GET(eq, eqe), subtype); - TAVOR_TNF_EXIT(tavor_port_state_change_handler); return (DDI_FAILURE); } @@ -1400,7 +1273,6 @@ tavor_port_state_change_handler(tavor_state_t *state, tavor_eqhdl_t eq, TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); } - TAVOR_TNF_EXIT(tavor_port_state_change_handler); return (DDI_SUCCESS); } @@ -1419,19 +1291,14 @@ tavor_comm_estbl_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_comm_estbl_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_COMM_ESTABLISHED || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_comm_estbl_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_comm_estbl_handler); return (DDI_FAILURE); } @@ -1465,13 +1332,8 @@ tavor_comm_estbl_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_EVENT_COM_EST_QP; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_comm_estbl_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_comm_estbl_handler); return (DDI_SUCCESS); } @@ -1490,19 +1352,14 @@ tavor_local_wq_cat_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_local_wq_cat_err_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_LOCAL_WQ_CAT_ERROR || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_local_wq_cat_err_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_local_wq_cat_err_handler); return (DDI_FAILURE); } @@ -1536,13 +1393,8 @@ tavor_local_wq_cat_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_ERROR_CATASTROPHIC_QP; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_local_wq_cat_err_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_local_wq_cat_err_handler); return (DDI_SUCCESS); } @@ -1561,19 +1413,14 @@ tavor_invreq_local_wq_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_invreq_local_wq_err_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_INV_REQ_LOCAL_WQ_ERROR || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_invreq_local_wq_err_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_port_state_change_handler); return (DDI_FAILURE); } @@ -1607,13 +1454,8 @@ tavor_invreq_local_wq_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_ERROR_INVALID_REQUEST_QP; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_invreq_local_wq_err_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_invreq_local_wq_err_handler); return (DDI_SUCCESS); } @@ -1632,19 +1474,14 @@ tavor_local_acc_vio_wq_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_local_acc_vio_wq_err_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_LOCAL_ACC_VIO_WQ_ERROR || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_local_acc_vio_wq_err_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_local_acc_vio_wq_err_handler); return (DDI_FAILURE); } @@ -1678,13 +1515,8 @@ tavor_local_acc_vio_wq_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_ERROR_ACCESS_VIOLATION_QP; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_local_acc_vio_wq_err_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_local_acc_vio_wq_err_handler); return (DDI_SUCCESS); } @@ -1704,19 +1536,14 @@ tavor_sendq_drained_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_sendq_drained_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_SEND_QUEUE_DRAINED || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_sendq_drained_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_sendq_drained_handler); return (DDI_FAILURE); } @@ -1765,13 +1592,8 @@ tavor_sendq_drained_handler(tavor_state_t *state, tavor_eqhdl_t eq, if (forward_sqd_event != 0) { TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); } - } else { - TNF_PROBE_2(tavor_sendq_drained_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_sendq_drained_handler); return (DDI_SUCCESS); } @@ -1790,19 +1612,14 @@ tavor_path_mig_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_path_mig_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_PATH_MIGRATED || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_path_mig_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_path_mig_handler); return (DDI_FAILURE); } @@ -1836,13 +1653,8 @@ tavor_path_mig_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_EVENT_PATH_MIGRATED_QP; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_path_mig_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_path_mig_handler); return (DDI_SUCCESS); } @@ -1861,19 +1673,14 @@ tavor_path_mig_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_path_mig_err_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_PATH_MIGRATE_FAILED || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_path_mig_err_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_path_mig_err_handler); return (DDI_FAILURE); } @@ -1907,13 +1714,8 @@ tavor_path_mig_err_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_ERROR_PATH_MIGRATE_REQ_QP; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_path_mig_err_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_path_mig_err_handler); return (DDI_SUCCESS); } @@ -1932,19 +1734,14 @@ tavor_srq_catastrophic_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_srq_catastrophic_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_SRQ_CATASTROPHIC_ERROR || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_srq_catastrophic_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_srq_catastrophic_handler); return (DDI_FAILURE); } @@ -1982,13 +1779,8 @@ tavor_srq_catastrophic_handler(tavor_state_t *state, tavor_eqhdl_t eq, mutex_exit(&qp->qp_srqhdl->srq_lock); TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_srq_catastrophic_handler_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_srq_catastrophic_handler); return (DDI_SUCCESS); } @@ -2007,19 +1799,14 @@ tavor_srq_last_wqe_reached_handler(tavor_state_t *state, tavor_eqhdl_t eq, ibt_async_code_t type; uint_t eqe_evttype; - TAVOR_TNF_ENTER(tavor_srq_last_wqe_reached_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_SRQ_LAST_WQE_REACHED || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_srq_last_wqe_reached_over_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_srq_last_wqe_reached_handler); return (DDI_FAILURE); } @@ -2053,13 +1840,8 @@ tavor_srq_last_wqe_reached_handler(tavor_state_t *state, tavor_eqhdl_t eq, type = IBT_EVENT_EMPTY_CHAN; TAVOR_DO_IBTF_ASYNC_CALLB(state, type, &event); - } else { - TNF_PROBE_2(tavor_srq_last_wqe_reached_dropped_event, - TAVOR_TNF_ERROR, "", tnf_uint, ev_qpnum, qpnum, - tnf_uint, hdl_qpnum, qpnum); } - TAVOR_TNF_EXIT(tavor_srq_last_wqe_reached_handler); return (DDI_SUCCESS); } @@ -2076,19 +1858,14 @@ tavor_ecc_detection_handler(tavor_state_t *state, tavor_eqhdl_t eq, uint_t data; int i; - TAVOR_TNF_ENTER(tavor_ecc_detection_handler); - eqe_evttype = TAVOR_EQE_EVTTYPE_GET(eq, eqe); ASSERT(eqe_evttype == TAVOR_EVT_ECC_DETECTION || eqe_evttype == TAVOR_EVT_EQ_OVERFLOW); if (eqe_evttype == TAVOR_EVT_EQ_OVERFLOW) { - TNF_PROBE_0(tavor_ecc_detection_eq_overflow_condition, - TAVOR_TNF_ERROR, ""); tavor_eq_overflow_handler(state, eq, eqe); - TAVOR_TNF_EXIT(tavor_ecc_detection_handler); return (DDI_FAILURE); } @@ -2104,7 +1881,6 @@ tavor_ecc_detection_handler(tavor_state_t *state, tavor_eqhdl_t eq, cmn_err(CE_CONT, "! EQE[%02x]: %08x\n", i, data); } - TAVOR_TNF_EXIT(tavor_ecc_detection_handler); return (DDI_SUCCESS); } @@ -2119,8 +1895,6 @@ tavor_eq_overflow_handler(tavor_state_t *state, tavor_eqhdl_t eq, { uint_t error_type, data; - TAVOR_TNF_ENTER(tavor_eq_overflow_handler); - ASSERT(TAVOR_EQE_EVTTYPE_GET(eq, eqe) == TAVOR_EVT_EQ_OVERFLOW); /* @@ -2135,8 +1909,6 @@ tavor_eq_overflow_handler(tavor_state_t *state, tavor_eqhdl_t eq, TAVOR_WARNING(state, "Event Queue overflow"); cmn_err(CE_CONT, " Error type: %02x, data: %08x\n", error_type, data); - - TAVOR_TNF_EXIT(tavor_eq_overflow_handler); } @@ -2152,8 +1924,6 @@ tavor_no_eqhandler(tavor_state_t *state, tavor_eqhdl_t eq, uint_t data; int i; - TAVOR_TNF_ENTER(tavor_no_eqhandler); - /* * This "unexpected event" handler (or "catch-all" handler) will * receive all events for which no other handler has been registered. @@ -2171,6 +1941,5 @@ tavor_no_eqhandler(tavor_state_t *state, tavor_eqhdl_t eq, cmn_err(CE_CONT, " EQE[%02x]: %08x\n", i, data); } - TAVOR_TNF_EXIT(tavor_no_eqhandler); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_ioctl.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_ioctl.c index 0719ad84e8..cbbe3c511d 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_ioctl.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_ioctl.c @@ -138,25 +138,17 @@ tavor_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, minor_t instance; int status; - TAVOR_TNF_ENTER(tavor_ioctl); - if (drv_priv(credp) != 0) { - TNF_PROBE_0(tavor_ioctl_priv_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl); return (EPERM); } instance = TAVOR_DEV_INSTANCE(dev); if (instance == -1) { - TNF_PROBE_0(tavor_ioctl_inst_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl); return (EBADF); } state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_ioctl_gss_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl); return (EBADF); } @@ -211,12 +203,10 @@ tavor_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, default: status = ENOTTY; - TNF_PROBE_0(tavor_ioctl_default_fail, TAVOR_TNF_ERROR, ""); break; } *rvalp = status; - TAVOR_TNF_EXIT(tavor_ioctl); return (status); } @@ -229,8 +219,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) tavor_flash_ioctl_t ioctl_info; int status = 0; - TAVOR_TNF_ENTER(tavor_ioctl_flash_read); - /* * Check that flash init ioctl has been called first. And check * that the same dev_t that called init is the one calling read now. @@ -239,8 +227,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if ((state->ts_fw_flashdev != dev) || (state->ts_fw_flashstarted == 0)) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_bad_state, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EIO); } @@ -252,9 +238,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &info32, sizeof (tavor_flash_ioctl32_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_read_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EFAULT); } ioctl_info.tf_type = info32.tf_type; @@ -266,9 +249,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &ioctl_info, sizeof (tavor_flash_ioctl_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_read_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EFAULT); } @@ -281,9 +261,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ioctl_info.tf_sector_num >= (state->ts_fw_device_sz >> state->ts_fw_log_sector_sz)) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_read_sector_num_too_large, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EFAULT); } @@ -296,9 +273,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) &ioctl_info.tf_sector[0], 1 << state->ts_fw_log_sector_sz, mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_read_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EFAULT); } break; @@ -307,9 +281,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) /* Check if addr is too large for flash device */ if (ioctl_info.tf_addr >= state->ts_fw_device_sz) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_read_quad_addr_too_large, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EFAULT); } @@ -320,8 +291,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) break; default: - TNF_PROBE_0(tavor_ioctl_flash_read_invalid_type, - TAVOR_TNF_ERROR, ""); status = EIO; break; } @@ -340,9 +309,6 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyout(&info32, (void *)arg, sizeof (tavor_flash_ioctl32_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_read_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EFAULT); } } else @@ -350,14 +316,10 @@ tavor_ioctl_flash_read(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyout(&ioctl_info, (void *)arg, sizeof (tavor_flash_ioctl_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_read_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (EFAULT); } mutex_exit(&state->ts_fw_flashlock); - TAVOR_TNF_EXIT(tavor_ioctl_flash_read); return (status); } @@ -370,8 +332,6 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) tavor_flash_ioctl_t ioctl_info; int status = 0; - TAVOR_TNF_ENTER(tavor_ioctl_flash_write); - /* * Check that flash init ioctl has been called first. And check * that the same dev_t that called init is the one calling write now. @@ -380,8 +340,6 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if ((state->ts_fw_flashdev != dev) || (state->ts_fw_flashstarted == 0)) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_bad_state, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (EIO); } @@ -393,9 +351,6 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &info32, sizeof (tavor_flash_ioctl32_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_write_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (EFAULT); } ioctl_info.tf_type = info32.tf_type; @@ -408,9 +363,6 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &ioctl_info, sizeof (tavor_flash_ioctl_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_write_ci_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (EFAULT); } @@ -423,9 +375,6 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ioctl_info.tf_sector_num >= (state->ts_fw_device_sz >> state->ts_fw_log_sector_sz)) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_write_sector_num_too_large, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (EFAULT); } @@ -434,9 +383,6 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) &state->ts_fw_sector[0], 1 << state->ts_fw_log_sector_sz, mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_write_fw_sector_ci_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (EFAULT); } @@ -449,9 +395,6 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) /* Check if addr is too large for flash device */ if (ioctl_info.tf_addr >= state->ts_fw_device_sz) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_write_byte_addr_too_large, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (EFAULT); } @@ -464,14 +407,11 @@ tavor_ioctl_flash_write(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) break; default: - TNF_PROBE_0(tavor_ioctl_flash_write_invalid_type, - TAVOR_TNF_ERROR, ""); status = EIO; break; } mutex_exit(&state->ts_fw_flashlock); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (status); } @@ -484,8 +424,6 @@ tavor_ioctl_flash_erase(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) tavor_flash_ioctl_t ioctl_info; int status = 0; - TAVOR_TNF_ENTER(tavor_ioctl_flash_erase); - /* * Check that flash init ioctl has been called first. And check * that the same dev_t that called init is the one calling erase now. @@ -494,8 +432,6 @@ tavor_ioctl_flash_erase(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if ((state->ts_fw_flashdev != dev) || (state->ts_fw_flashstarted == 0)) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_bad_state, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_erase); return (EIO); } @@ -507,9 +443,6 @@ tavor_ioctl_flash_erase(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &info32, sizeof (tavor_flash_ioctl32_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_read_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_erase); return (EFAULT); } ioctl_info.tf_type = info32.tf_type; @@ -519,9 +452,6 @@ tavor_ioctl_flash_erase(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &ioctl_info, sizeof (tavor_flash_ioctl_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_erase_ci_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_erase); return (EFAULT); } @@ -534,9 +464,6 @@ tavor_ioctl_flash_erase(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ioctl_info.tf_sector_num >= (state->ts_fw_device_sz >> state->ts_fw_log_sector_sz)) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_erase_sector_num_too_large, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_write); return (EFAULT); } @@ -551,14 +478,11 @@ tavor_ioctl_flash_erase(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) break; default: - TNF_PROBE_0(tavor_ioctl_flash_erase_invalid_type, - TAVOR_TNF_ERROR, ""); status = EIO; break; } mutex_exit(&state->ts_fw_flashlock); - TAVOR_TNF_EXIT(tavor_ioctl_flash_erase); return (status); } @@ -572,8 +496,6 @@ tavor_ioctl_flash_init(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) int ret; int intel_xcmd = 0; - TAVOR_TNF_ENTER(tavor_ioctl_flash_init); - /* * init cannot be called more than once. If we have already init'd the * flash, return directly. @@ -581,9 +503,6 @@ tavor_ioctl_flash_init(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) mutex_enter(&state->ts_fw_flashlock); if (state->ts_fw_flashstarted == 1) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_init_already_started, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_init); return (EIO); } @@ -591,9 +510,6 @@ tavor_ioctl_flash_init(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &init_info, sizeof (tavor_flash_init_ioctl_t), mode) != 0) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_init_ioctl_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_init); return (EFAULT); } @@ -608,10 +524,6 @@ tavor_ioctl_flash_init(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) */ if (state->ts_fw_cmdset == TAVOR_FLASH_UNKNOWN_CMDSET) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_1(tavor_ioctl_flash_init_cmdset_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, - "UNKNOWN flash command set"); - TAVOR_TNF_EXIT(tavor_ioctl_flash_init); return (EFAULT); } @@ -642,9 +554,6 @@ tavor_ioctl_flash_init(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) tavor_ioctl_flash_cleanup_nolock(state); mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_ioctl_flash_init_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_init); return (EFAULT); } @@ -665,13 +574,9 @@ tavor_ioctl_flash_init(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (ret != DDI_SUCCESS) { (void) tavor_ioctl_flash_fini(state, dev); - TNF_PROBE_0(tavor_ioctl_flash_init_set_cb_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_init); return (EFAULT); } - TAVOR_TNF_EXIT(tavor_ioctl_flash_init); return (0); } @@ -683,8 +588,6 @@ tavor_ioctl_flash_fini(tavor_state_t *state, dev_t dev) { int ret; - TAVOR_TNF_ENTER(tavor_ioctl_flash_fini); - /* * Check that flash init ioctl has been called first. And check * that the same dev_t that called init is the one calling fini now. @@ -693,8 +596,6 @@ tavor_ioctl_flash_fini(tavor_state_t *state, dev_t dev) if ((state->ts_fw_flashdev != dev) || (state->ts_fw_flashstarted == 0)) { mutex_exit(&state->ts_fw_flashlock); - TNF_PROBE_0(tavor_flash_bad_state, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_fini); return (EIO); } @@ -709,13 +610,9 @@ tavor_ioctl_flash_fini(tavor_state_t *state, dev_t dev) ret = tavor_umap_db_clear_onclose_cb(dev, TAVOR_ONCLOSE_FLASH_INPROGRESS); if (ret != DDI_SUCCESS) { - TNF_PROBE_0(tavor_flash_fini_clear_cb_fail, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_ioctl_flash_fini); return (EFAULT); } - TAVOR_TNF_EXIT(tavor_ioctl_flash_fini); return (0); } @@ -726,13 +623,9 @@ tavor_ioctl_flash_fini(tavor_state_t *state, dev_t dev) static void tavor_ioctl_flash_cleanup(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_ioctl_flash_cleanup); - mutex_enter(&state->ts_fw_flashlock); tavor_ioctl_flash_cleanup_nolock(state); mutex_exit(&state->ts_fw_flashlock); - - TAVOR_TNF_EXIT(tavor_ioctl_flash_cleanup); } @@ -742,8 +635,6 @@ tavor_ioctl_flash_cleanup(tavor_state_t *state) static void tavor_ioctl_flash_cleanup_nolock(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_ioctl_flash_cleanup_nolock); - ASSERT(MUTEX_HELD(&state->ts_fw_flashlock)); /* free flash mem */ @@ -755,8 +646,6 @@ tavor_ioctl_flash_cleanup_nolock(tavor_state_t *state) /* Set flash state to fini */ state->ts_fw_flashstarted = 0; state->ts_fw_flashdev = 0; - - TAVOR_TNF_EXIT(tavor_ioctl_flash_cleanup_nolock); } @@ -769,23 +658,16 @@ tavor_ioctl_info(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) tavor_info_ioctl_t info; tavor_flash_init_ioctl_t init_info; - TAVOR_TNF_ENTER(tavor_ioctl_info); - /* * Access to Tavor VTS ioctls is not allowed in "maintenance mode". */ if (state->ts_operational_mode == TAVOR_MAINTENANCE_MODE) { - TNF_PROBE_0(tavor_ioctl_info_maintenance_mode_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_info); return (EFAULT); } /* copyin the user struct to kernel */ if (ddi_copyin((void *)arg, &info, sizeof (tavor_info_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_info_copyin_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_info); return (EFAULT); } @@ -793,8 +675,6 @@ tavor_ioctl_info(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) * Check ioctl revision */ if (info.ti_revision != TAVOR_VTS_IOCTL_REVISION) { - TNF_PROBE_0(tavor_ioctl_info_bad_rev, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_info); return (EINVAL); } @@ -810,9 +690,6 @@ tavor_ioctl_info(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) if (tavor_ioctl_flash_init(state, dev, (intptr_t)&init_info, (FKIOCTL | mode)) != 0) { mutex_exit(&state->ts_info_lock); - TNF_PROBE_0(tavor_ioctl_info_flash_init_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_info); return (EFAULT); } (void) tavor_ioctl_flash_fini(state, dev); @@ -831,12 +708,9 @@ tavor_ioctl_info(tavor_state_t *state, dev_t dev, intptr_t arg, int mode) /* Copy ioctl results back to user struct */ if (ddi_copyout(&info, (void *)arg, sizeof (tavor_info_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_info_copyout_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_info); return (EFAULT); } - TAVOR_TNF_EXIT(tavor_ioctl_info); return (0); } @@ -854,15 +728,10 @@ tavor_ioctl_ports(tavor_state_t *state, intptr_t arg, int mode) ib_pkey_t *pkey_tbl; int i; - TAVOR_TNF_ENTER(tavor_ioctl_ports); - /* * Access to Tavor VTS ioctls is not allowed in "maintenance mode". */ if (state->ts_operational_mode == TAVOR_MAINTENANCE_MODE) { - TNF_PROBE_0(tavor_ioctl_ports_maintenance_mode_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ports); return (EFAULT); } @@ -873,9 +742,6 @@ tavor_ioctl_ports(tavor_state_t *state, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &info32, sizeof (tavor_ports_ioctl32_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_ports_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ports); return (EFAULT); } info.tp_revision = info32.tp_revision; @@ -887,8 +753,6 @@ tavor_ioctl_ports(tavor_state_t *state, intptr_t arg, int mode) #endif /* _MULTI_DATAMODEL */ if (ddi_copyin((void *)arg, &info, sizeof (tavor_ports_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_ports_copyin_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ports); return (EFAULT); } @@ -896,8 +760,6 @@ tavor_ioctl_ports(tavor_state_t *state, intptr_t arg, int mode) * Check ioctl revision */ if (info.tp_revision != TAVOR_VTS_IOCTL_REVISION) { - TNF_PROBE_0(tavor_ioctl_ports_bad_rev, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ports); return (EINVAL); } @@ -925,10 +787,7 @@ tavor_ioctl_ports(tavor_state_t *state, intptr_t arg, int mode) bzero(&pi, sizeof (ibt_hca_portinfo_t)); pi.p_sgid_tbl = sgid_tbl; pi.p_pkey_tbl = pkey_tbl; - if (tavor_port_query(state, i + 1, &pi) != 0) { - TNF_PROBE_0(tavor_ioctl_ports_query_failed, - TAVOR_TNF_ERROR, ""); - } + (void) tavor_port_query(state, i + 1, &pi); portstat.tsp_port_num = pi.p_port_num; portstat.tsp_state = pi.p_linkstate; @@ -964,22 +823,15 @@ tavor_ioctl_ports(tavor_state_t *state, intptr_t arg, int mode) if (ddi_copyout(&info32, (void *)arg, sizeof (tavor_ports_ioctl32_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_ports_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ports); return (EFAULT); } } else #endif /* _MULTI_DATAMODEL */ if (ddi_copyout(&info, (void *)arg, sizeof (tavor_ports_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_ports_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ports); return (EFAULT); } - TAVOR_TNF_EXIT(tavor_ioctl_ports); return (0); } @@ -997,17 +849,12 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) ib_pkey_t *pkey_tbl; int j, iter, ret; - TAVOR_TNF_ENTER(tavor_ioctl_loopback); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(lstate)) /* * Access to Tavor VTS ioctls is not allowed in "maintenance mode". */ if (state->ts_operational_mode == TAVOR_MAINTENANCE_MODE) { - TNF_PROBE_0(tavor_ioctl_loopback_maintenance_mode_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1018,9 +865,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) if (ddi_copyin((void *)arg, &lb32, sizeof (tavor_loopback_ioctl32_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_loopback_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } lb.tlb_revision = lb32.tlb_revision; @@ -1037,9 +881,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) #endif /* _MULTI_DATAMODEL */ if (ddi_copyin((void *)arg, &lb, sizeof (tavor_loopback_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_loopback_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1052,9 +893,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) if (lb.tlb_revision != TAVOR_VTS_IOCTL_REVISION) { lb.tlb_error_type = TAVOR_LOOPBACK_INVALID_REVISION; (void) tavor_loopback_copyout(&lb, arg, mode); - TNF_PROBE_0(tavor_ioctl_loopback_bad_rev, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EINVAL); } @@ -1062,9 +900,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) if (!tavor_portnum_is_valid(state, lb.tlb_port_num)) { lb.tlb_error_type = TAVOR_LOOPBACK_INVALID_PORT; (void) tavor_loopback_copyout(&lb, arg, mode); - TNF_PROBE_0(tavor_ioctl_loopback_inv_port, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EINVAL); } @@ -1092,9 +927,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = TAVOR_LOOPBACK_INVALID_PORT; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_bad_port, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EINVAL); } @@ -1133,9 +965,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = TAVOR_LOOPBACK_SEND_BUF_INVALID; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_buf_null, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EINVAL); } @@ -1144,7 +973,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = lstate.tls_err; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1155,9 +983,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) TAVOR_LOOPBACK_SEND_BUF_MEM_REGION_ALLOC_FAIL; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_txbuf_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1168,9 +993,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) TAVOR_LOOPBACK_RECV_BUF_MEM_REGION_ALLOC_FAIL; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_rxbuf_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1180,9 +1002,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = TAVOR_LOOPBACK_SEND_BUF_COPY_FAIL; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_tx_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1192,9 +1011,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = lstate.tls_err; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_txqp_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1204,9 +1020,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = lstate.tls_err; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_rxqp_alloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1217,9 +1030,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = lstate.tls_err; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_txqp_init_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1230,9 +1040,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = lstate.tls_err; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_rxqp_init_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1248,9 +1055,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) lb.tlb_error_type = TAVOR_LOOPBACK_WQE_POST_FAIL; (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_wqe_post_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } @@ -1265,17 +1069,10 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) if (ddi_copyout(lstate.tls_rx.tlc_buf, lb.tlb_fail_buf, lstate.tls_tx.tlc_buf_sz, mode) != 0) { - TNF_PROBE_0( - tavor_ioctl_loopback_xfer_co_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_xfer_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } else if (ret == IBT_CQ_EMPTY) { continue; @@ -1291,17 +1088,10 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) if (ddi_copyout(lstate.tls_rx.tlc_buf, lb.tlb_fail_buf, lstate.tls_tx.tlc_buf_sz, mode) != 0) { - TNF_PROBE_0( - tavor_ioctl_loopback_bcmp_co_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } (void) tavor_loopback_copyout(&lb, arg, mode); tavor_loopback_free_state(&lstate); - TNF_PROBE_0(tavor_ioctl_loopback_bcmp_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (EFAULT); } } @@ -1318,7 +1108,6 @@ tavor_ioctl_loopback(tavor_state_t *state, intptr_t arg, int mode) /* Free up everything and release all consumed resources */ tavor_loopback_free_state(&lstate); - TAVOR_TNF_EXIT(tavor_ioctl_loopback); return (ret); } @@ -1333,24 +1122,16 @@ tavor_ioctl_ddr_read(tavor_state_t *state, intptr_t arg, int mode) uintptr_t baseaddr; uint64_t ddr_size; - TAVOR_TNF_ENTER(tavor_ioctl_ddr_read); - /* * Access to Tavor VTS ioctls is not allowed in "maintenance mode". */ if (state->ts_operational_mode == TAVOR_MAINTENANCE_MODE) { - TNF_PROBE_0(tavor_ioctl_ddr_read_maintenance_mode_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ddr_read); return (EFAULT); } /* copyin the user struct to kernel */ if (ddi_copyin((void *)arg, &rdreg, sizeof (tavor_ddr_read_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_ddr_read_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ddr_read); return (EFAULT); } @@ -1358,8 +1139,6 @@ tavor_ioctl_ddr_read(tavor_state_t *state, intptr_t arg, int mode) * Check ioctl revision */ if (rdreg.tdr_revision != TAVOR_VTS_IOCTL_REVISION) { - TNF_PROBE_0(tavor_ioctl_ddr_read_bad_rev, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ddr_read); return (EINVAL); } @@ -1368,9 +1147,6 @@ tavor_ioctl_ddr_read(tavor_state_t *state, intptr_t arg, int mode) */ ddr_size = (state->ts_ddr.ddr_endaddr - state->ts_ddr.ddr_baseaddr + 1); if ((uint64_t)rdreg.tdr_offset >= ddr_size) { - TNF_PROBE_0(tavor_ioctl_ddr_read_bad_offset, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ddr_read); return (EINVAL); } @@ -1386,13 +1162,9 @@ tavor_ioctl_ddr_read(tavor_state_t *state, intptr_t arg, int mode) /* Copy ioctl results back to user struct */ if (ddi_copyout(&rdreg, (void *)arg, sizeof (tavor_ddr_read_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_ddr_read_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_ddr_read); return (EFAULT); } - TAVOR_TNF_EXIT(tavor_ioctl_ddr_read); return (0); } @@ -1409,16 +1181,11 @@ tavor_ioctl_reg_read(tavor_state_t *state, intptr_t arg, int mode) uintptr_t baseaddr; int status; - TAVOR_TNF_ENTER(tavor_ioctl_reg_read); - /* * Access to Tavor registers is not allowed in "maintenance mode". * This is primarily because the device may not have BARs to access */ if (state->ts_operational_mode == TAVOR_MAINTENANCE_MODE) { - TNF_PROBE_0(tavor_ioctl_reg_read_maintence_mode_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_reg_read); return (EFAULT); } @@ -1426,9 +1193,6 @@ tavor_ioctl_reg_read(tavor_state_t *state, intptr_t arg, int mode) status = ddi_copyin((void *)arg, &rdreg, sizeof (tavor_reg_ioctl_t), mode); if (status != 0) { - TNF_PROBE_0(tavor_ioctl_reg_read_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_reg_read); return (EFAULT); } @@ -1447,9 +1211,6 @@ tavor_ioctl_reg_read(tavor_state_t *state, intptr_t arg, int mode) break; default: - TNF_PROBE_0(tavor_ioctl_reg_read_invregset_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_reg_read); return (EFAULT); } @@ -1463,13 +1224,9 @@ tavor_ioctl_reg_read(tavor_state_t *state, intptr_t arg, int mode) status = ddi_copyout(&rdreg, (void *)arg, sizeof (tavor_reg_ioctl_t), mode); if (status != 0) { - TNF_PROBE_0(tavor_ioctl_reg_read_copyout_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_reg_read); return (EFAULT); } - TAVOR_TNF_EXIT(tavor_ioctl_reg_read); return (0); } @@ -1485,16 +1242,11 @@ tavor_ioctl_reg_write(tavor_state_t *state, intptr_t arg, int mode) uintptr_t baseaddr; int status; - TAVOR_TNF_ENTER(tavor_ioctl_reg_write); - /* * Access to Tavor registers is not allowed in "maintenance mode". * This is primarily because the device may not have BARs to access */ if (state->ts_operational_mode == TAVOR_MAINTENANCE_MODE) { - TNF_PROBE_0(tavor_ioctl_reg_write_maintence_mode_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_reg_write); return (EFAULT); } @@ -1502,9 +1254,6 @@ tavor_ioctl_reg_write(tavor_state_t *state, intptr_t arg, int mode) status = ddi_copyin((void *)arg, &wrreg, sizeof (tavor_reg_ioctl_t), mode); if (status != 0) { - TNF_PROBE_0(tavor_ioctl_reg_write_copyin_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_reg_write); return (EFAULT); } @@ -1523,9 +1272,6 @@ tavor_ioctl_reg_write(tavor_state_t *state, intptr_t arg, int mode) break; default: - TNF_PROBE_0(tavor_ioctl_reg_write_invregset_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ioctl_reg_write); return (EFAULT); } @@ -1535,7 +1281,6 @@ tavor_ioctl_reg_write(tavor_state_t *state, intptr_t arg, int mode) /* Write the data to the register pointed to by addr */ ddi_put32(state->ts_reg_cmdhdl, addr, wrreg.trg_data); - TAVOR_TNF_EXIT(tavor_ioctl_reg_write); return (0); } #endif /* DEBUG */ @@ -1546,8 +1291,6 @@ tavor_ioctl_reg_write(tavor_state_t *state, intptr_t arg, int mode) static void tavor_flash_reset(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_flash_reset); - /* * Performs a reset to the flash device. After a reset the flash will * be operating in normal mode (capable of read/write, etc.). @@ -1564,8 +1307,6 @@ tavor_flash_reset(tavor_state_t *state) default: break; } - - TAVOR_TNF_EXIT(tavor_flash_reset); } /* @@ -1579,8 +1320,6 @@ tavor_flash_read_sector(tavor_state_t *state, uint32_t sector_num) uint32_t *image; int i; - TAVOR_TNF_ENTER(tavor_flash_read_sector); - image = (uint32_t *)&state->ts_fw_sector[0]; /* @@ -1597,8 +1336,6 @@ tavor_flash_read_sector(tavor_state_t *state, uint32_t sector_num) for (i = 0; addr < end_addr; i++, addr += 4) { image[i] = tavor_flash_read(state, addr); } - - TAVOR_TNF_EXIT(tavor_flash_read_sector); } /* @@ -1608,15 +1345,11 @@ static void tavor_flash_read_quadlet(tavor_state_t *state, uint32_t *data, uint32_t addr) { - TAVOR_TNF_ENTER(tavor_flash_read_quadlet); - /* Set the flash bank correctly for the given address */ tavor_flash_bank(state, addr); /* Read one quadlet of data */ *data = tavor_flash_read(state, addr); - - TAVOR_TNF_EXIT(tavor_flash_read_quadlet); } /* @@ -1631,8 +1364,6 @@ tavor_flash_write_sector(tavor_state_t *state, uint32_t sector_num) int status = 0; int i; - TAVOR_TNF_ENTER(tavor_flash_write_sector); - sector = (uchar_t *)&state->ts_fw_sector[0]; /* @@ -1649,7 +1380,6 @@ tavor_flash_write_sector(tavor_state_t *state, uint32_t sector_num) tavor_flash_reset(state); status = tavor_flash_erase_sector(state, sector_num); if (status != 0) { - TAVOR_TNF_EXIT(tavor_flash_write_sector); return (status); } @@ -1662,7 +1392,6 @@ tavor_flash_write_sector(tavor_state_t *state, uint32_t sector_num) } tavor_flash_reset(state); - TAVOR_TNF_EXIT(tavor_flash_write_sector); return (status); } @@ -1676,8 +1405,6 @@ tavor_flash_write_byte(tavor_state_t *state, uint32_t addr, uchar_t data) int status = 0; int i; - TAVOR_TNF_ENTER(tavor_flash_write_byte); - switch (state->ts_fw_cmdset) { case TAVOR_FLASH_AMD_CMDSET: /* Issue Flash Byte program command */ @@ -1752,7 +1479,6 @@ tavor_flash_write_byte(tavor_state_t *state, uint32_t addr, uchar_t data) break; } - TAVOR_TNF_EXIT(tavor_flash_write_byte); return (status); } @@ -1767,8 +1493,6 @@ tavor_flash_erase_sector(tavor_state_t *state, uint32_t sector_num) int status = 0; int i; - TAVOR_TNF_ENTER(tavor_flash_erase_sector); - /* Get address from sector num */ addr = sector_num << state->ts_fw_log_sector_sz; @@ -1849,7 +1573,6 @@ tavor_flash_erase_sector(tavor_state_t *state, uint32_t sector_num) tavor_flash_reset(state); - TAVOR_TNF_EXIT(tavor_flash_erase_sector); return (status); } @@ -1865,8 +1588,6 @@ tavor_flash_erase_chip(tavor_state_t *state) int num_sect; int i; - TAVOR_TNF_ENTER(tavor_flash_erase_chip); - switch (state->ts_fw_cmdset) { case TAVOR_FLASH_AMD_CMDSET: /* Issue Flash Chip Erase Command */ @@ -1930,7 +1651,6 @@ tavor_flash_erase_chip(tavor_state_t *state) break; } - TAVOR_TNF_EXIT(tavor_flash_erase_chip); return (status); } @@ -1943,8 +1663,6 @@ tavor_flash_bank(tavor_state_t *state, uint32_t addr) ddi_acc_handle_t hdl; uint32_t bank; - TAVOR_TNF_ENTER(tavor_flash_bank); - /* Set handle */ hdl = state->ts_pci_cfghdl; @@ -1968,8 +1686,6 @@ tavor_flash_bank(tavor_state_t *state, uint32_t addr) /* Save the bank state */ state->ts_fw_flashbank = bank; } - - TAVOR_TNF_EXIT(tavor_flash_bank); } /* @@ -1982,8 +1698,6 @@ tavor_flash_read(tavor_state_t *state, uint32_t addr) uint32_t data; int timeout; - TAVOR_TNF_ENTER(tavor_flash_read); - /* Set handle */ hdl = state->ts_pci_cfghdl; @@ -2011,7 +1725,6 @@ tavor_flash_read(tavor_state_t *state, uint32_t addr) data = tavor_flash_read_cfg(hdl, TAVOR_HW_FLASH_DATA); - TAVOR_TNF_EXIT(tavor_flash_read); return (data); } @@ -2025,8 +1738,6 @@ tavor_flash_write(tavor_state_t *state, uint32_t addr, uchar_t data) int cmd; int timeout; - TAVOR_TNF_ENTER(tavor_flash_write); - /* Set handle */ hdl = state->ts_pci_cfghdl; @@ -2051,8 +1762,6 @@ tavor_flash_write(tavor_state_t *state, uint32_t addr, uchar_t data) if (timeout == tavor_hw_flash_timeout_config) { cmn_err(CE_WARN, "tavor_flash_write: config cmd timeout.\n"); } - - TAVOR_TNF_EXIT(tavor_flash_write); } /* @@ -2066,8 +1775,6 @@ tavor_flash_init(tavor_state_t *state) int sema_cnt; int gpio; - TAVOR_TNF_ENTER(tavor_flash_init); - /* Set handle */ hdl = state->ts_pci_cfghdl; @@ -2122,8 +1829,6 @@ tavor_flash_init(tavor_state_t *state) /* Initialize to bank 0 */ tavor_flash_bank(state, 0); - - TAVOR_TNF_EXIT(tavor_flash_init); } /* @@ -2139,8 +1844,6 @@ tavor_flash_cfi_init(tavor_state_t *state, uint32_t *cfi_info, int *intel_xcmd) uint8_t cfi_ch_info[TAVOR_CFI_INFO_SIZE]; int i; - TAVOR_TNF_ENTER(tavor_flash_cfi_init); - /* * Determine if the user command supports the Intel Extended * Command Set. The query string is contained in the fourth @@ -2181,7 +1884,7 @@ tavor_flash_cfi_init(tavor_state_t *state, uint32_t *cfi_info, int *intel_xcmd) cmn_err(CE_WARN, "tavor_flash_cfi_init: UNKNOWN chip cmd set\n"); state->ts_fw_cmdset = TAVOR_FLASH_UNKNOWN_CMDSET; - goto out; + return; } /* Determine total bytes in one sector size */ @@ -2223,8 +1926,6 @@ tavor_flash_cfi_init(tavor_state_t *state, uint32_t *cfi_info, int *intel_xcmd) } cfi_ch_info[0x13] = state->ts_fw_cmdset; tavor_flash_cfi_dword(&cfi_info[0x4], cfi_ch_info, 0x10); -out: - TAVOR_TNF_EXIT(tavor_flash_cfi_init); } /* @@ -2235,8 +1936,6 @@ tavor_flash_fini(tavor_state_t *state) { ddi_acc_handle_t hdl; - TAVOR_TNF_ENTER(tavor_flash_fini); - /* Set handle */ hdl = state->ts_pci_cfghdl; @@ -2252,8 +1951,6 @@ tavor_flash_fini(tavor_state_t *state) /* Give up semaphore */ tavor_flash_write_cfg(hdl, TAVOR_HW_FLASH_GPIO_SEMA, 0); - - TAVOR_TNF_EXIT(tavor_flash_fini); } /* @@ -2264,8 +1961,6 @@ tavor_flash_read_cfg(ddi_acc_handle_t pci_config_hdl, uint32_t addr) { uint32_t read; - TAVOR_TNF_ENTER(tavor_flash_read_cfg); - /* * Perform flash read operation: * 1) Place addr to read from on the TAVOR_HW_FLASH_CFG_ADDR register @@ -2274,8 +1969,6 @@ tavor_flash_read_cfg(ddi_acc_handle_t pci_config_hdl, uint32_t addr) pci_config_put32(pci_config_hdl, TAVOR_HW_FLASH_CFG_ADDR, addr); read = pci_config_get32(pci_config_hdl, TAVOR_HW_FLASH_CFG_DATA); - TAVOR_TNF_EXIT(tavor_flash_read_cfg); - return (read); } @@ -2286,8 +1979,6 @@ static void tavor_flash_write_cfg(ddi_acc_handle_t pci_config_hdl, uint32_t addr, uint32_t data) { - TAVOR_TNF_ENTER(tavor_flash_write_cfg); - /* * Perform flash write operation: * 1) Place addr to write to on the TAVOR_HW_FLASH_CFG_ADDR register @@ -2295,8 +1986,6 @@ tavor_flash_write_cfg(ddi_acc_handle_t pci_config_hdl, uint32_t addr, */ pci_config_put32(pci_config_hdl, TAVOR_HW_FLASH_CFG_ADDR, addr); pci_config_put32(pci_config_hdl, TAVOR_HW_FLASH_CFG_DATA, data); - - TAVOR_TNF_EXIT(tavor_flash_write_cfg); } /* @@ -2401,8 +2090,6 @@ tavor_loopback_init(tavor_state_t *state, tavor_loopback_state_t *lstate) &lstate->tls_pd_hdl, TAVOR_NOSLEEP); if (lstate->tls_status != IBT_SUCCESS) { lstate->tls_err = TAVOR_LOOPBACK_PROT_DOMAIN_ALLOC_FAIL; - TNF_PROBE_0(tavor_ioctl_loopback_alloc_pd_fail, - TAVOR_TNF_ERROR, ""); return (EFAULT); } @@ -2612,16 +2299,12 @@ tavor_loopback_copyout(tavor_loopback_ioctl_t *lb, intptr_t arg, int mode) if (ddi_copyout(&lb32, (void *)arg, sizeof (tavor_loopback_ioctl32_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_loopback_copyout_fail, - TAVOR_TNF_ERROR, ""); return (EFAULT); } } else #endif /* _MULTI_DATAMODEL */ if (ddi_copyout(lb, (void *)arg, sizeof (tavor_loopback_ioctl_t), mode) != 0) { - TNF_PROBE_0(tavor_ioctl_loopback_copyout_fail, - TAVOR_TNF_ERROR, ""); return (EFAULT); } return (0); diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_misc.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_misc.c index f8eb3c3551..41be4c0aca 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_misc.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_misc.c @@ -83,9 +83,6 @@ tavor_ah_alloc(tavor_state_t *state, tavor_pdhdl_t pd, uint64_t data; uint32_t size; int status, i, flag; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_ah_alloc); /* * Someday maybe the "ibt_adds_vect_t *attr_p" will be NULL to @@ -95,8 +92,6 @@ tavor_ah_alloc(tavor_state_t *state, tavor_pdhdl_t pd, /* Validate that specified port number is legal */ if (!tavor_portnum_is_valid(state, attr_p->av_port_num)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_PORT_INVALID, "invalid port num"); goto ahalloc_fail; } @@ -108,8 +103,6 @@ tavor_ah_alloc(tavor_state_t *state, tavor_pdhdl_t pd, */ status = tavor_rsrc_alloc(state, TAVOR_UDAV, 1, sleepflag, &udav); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed UDAV"); goto ahalloc_fail; } @@ -120,8 +113,6 @@ tavor_ah_alloc(tavor_state_t *state, tavor_pdhdl_t pd, */ status = tavor_rsrc_alloc(state, TAVOR_AHHDL, 1, sleepflag, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed AH handler"); goto ahalloc_fail1; } ah = (tavor_ahhdl_t)rsrc->tr_addr; @@ -144,8 +135,6 @@ tavor_ah_alloc(tavor_state_t *state, tavor_pdhdl_t pd, tavor_pd_refcnt_dec(pd); tavor_rsrc_free(state, &rsrc); tavor_rsrc_free(state, &udav); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed in tavor_set_addr_path"); goto ahalloc_fail; } udav_entry.pd = pd->pd_pdnum; @@ -168,8 +157,6 @@ tavor_ah_alloc(tavor_state_t *state, tavor_pdhdl_t pd, op.mro_bind_override_addr = 0; status = tavor_mr_register(state, pd, &mr_attr, &mr, &op); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed register mr"); goto ahalloc_fail2; } @@ -220,7 +207,6 @@ tavor_ah_alloc(tavor_state_t *state, tavor_pdhdl_t pd, /* Sync the UDAV for use by the hardware */ tavor_udav_sync(ah, udav->tr_addr, DDI_DMA_SYNC_FORDEV); - TAVOR_TNF_EXIT(tavor_ah_alloc); return (DDI_SUCCESS); ahalloc_fail2: @@ -229,9 +215,6 @@ ahalloc_fail2: ahalloc_fail1: tavor_rsrc_free(state, &udav); ahalloc_fail: - TNF_PROBE_1(tavor_ah_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_ah_alloc); return (status); } @@ -250,8 +233,6 @@ tavor_ah_free(tavor_state_t *state, tavor_ahhdl_t *ahhdl, uint_t sleepflag) tavor_ahhdl_t ah; int status; - TAVOR_TNF_ENTER(tavor_ah_free); - /* * Pull all the necessary information from the Tavor Address Handle * struct. This is necessary here because the resource for the @@ -275,8 +256,6 @@ tavor_ah_free(tavor_state_t *state, tavor_ahhdl_t *ahhdl, uint_t sleepflag) status = tavor_mr_deregister(state, &mr, TAVOR_MR_DEREG_ALL, sleepflag); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_ah_free_dereg_mr_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ah_free); return (ibc_get_ci_failure(0)); } @@ -303,7 +282,6 @@ tavor_ah_free(tavor_state_t *state, tavor_ahhdl_t *ahhdl, uint_t sleepflag) /* Set the ahhdl pointer to NULL and return success */ *ahhdl = NULL; - TAVOR_TNF_EXIT(tavor_ah_free); return (DDI_SUCCESS); } @@ -323,8 +301,6 @@ tavor_ah_query(tavor_state_t *state, tavor_ahhdl_t ah, tavor_pdhdl_t *pd, uint32_t size; int i; - TAVOR_TNF_ENTER(tavor_ah_query); - mutex_enter(&ah->ah_lock); _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p)) @@ -363,7 +339,6 @@ tavor_ah_query(tavor_state_t *state, tavor_ahhdl_t ah, tavor_pdhdl_t *pd, attr_p->av_srate = ah->ah_save_srate; mutex_exit(&ah->ah_lock); - TAVOR_TNF_EXIT(tavor_ah_query); return (DDI_SUCCESS); } @@ -383,13 +358,8 @@ tavor_ah_modify(tavor_state_t *state, tavor_ahhdl_t ah, uint32_t udav_pd, size, portnum_new; int i, status; - TAVOR_TNF_ENTER(tavor_ah_modify); - /* Validate that specified port number is legal */ if (!tavor_portnum_is_valid(state, attr_p->av_port_num)) { - TNF_PROBE_1(tavor_ah_modify_inv_portnum, - TAVOR_TNF_ERROR, "", tnf_uint, port, attr_p->av_port_num); - TAVOR_TNF_EXIT(tavor_ah_modify); return (IBT_HCA_PORT_INVALID); } @@ -421,9 +391,6 @@ tavor_ah_modify(tavor_state_t *state, tavor_ahhdl_t ah, (tavor_hw_addr_path_t *)&udav_entry, TAVOR_ADDRPATH_UDAV, NULL); if (status != DDI_SUCCESS) { mutex_exit(&ah->ah_lock); - TNF_PROBE_0(tavor_ah_modify_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_ah_modify); return (status); } ah->ah_save_guid = attr_p->av_dgid.gid_guid; @@ -498,7 +465,6 @@ tavor_ah_modify(tavor_state_t *state, tavor_ahhdl_t ah, tavor_udav_sync(ah, udav->tr_addr, DDI_DMA_SYNC_FORDEV); mutex_exit(&ah->ah_lock); - TAVOR_TNF_EXIT(tavor_ah_modify); return (DDI_SUCCESS); } @@ -515,13 +481,10 @@ tavor_udav_sync(tavor_ahhdl_t ah, tavor_hw_udav_t *udav, uint_t flag) off_t offset; int status; - TAVOR_TNF_ENTER(tavor_udav_sync); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ah)) /* Determine if AH needs to be synced or not */ if (ah->ah_sync == 0) { - TAVOR_TNF_EXIT(tavor_udav_sync); return; } @@ -532,13 +495,8 @@ tavor_udav_sync(tavor_ahhdl_t ah, tavor_hw_udav_t *udav, uint_t flag) offset = (off_t)0; status = ddi_dma_sync(dmahdl, offset, sizeof (tavor_hw_udav_t), flag); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_udav_sync_getnextentry_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_udav_sync); return; } - - TAVOR_TNF_EXIT(tavor_udav_sync); } @@ -558,17 +516,12 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, uint32_t end_indx; int status; uint_t qp_found; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mcg_attach); /* * It is only allowed to attach MCG to UD queue pairs. Verify * that the intended QP is of the appropriate transport type */ if (qp->qp_serv_type != TAVOR_QP_UD) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_SRV_TYPE_INVALID, "invalid service type"); goto mcgattach_fail; } @@ -578,8 +531,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, * is outside of that range, then return an error. */ if (tavor_mlid_is_valid(lid) == 0) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MC_MLID_INVALID, "invalid MLID"); goto mcgattach_fail; } /* @@ -588,8 +539,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, * the specified GID does not meet the criteria, then return an error. */ if (tavor_mgid_is_valid(gid) == 0) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MC_MGID_INVALID, "invalid MGID"); goto mcgattach_fail; } @@ -606,9 +555,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: MGID_HASH command failed: %08x\n", status); - TNF_PROBE_1(tavor_mcg_attach_mgid_hash_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -665,8 +611,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, if (status != DDI_SUCCESS) { bzero(mcg, sizeof (struct tavor_sw_mcg_list_s)); mutex_exit(&state->ts_mcglock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed qplist add"); goto mcgattach_fail; } @@ -688,10 +632,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: " "%08x\n", status); - TNF_PROBE_2(tavor_mcg_attach_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, end_indx); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -719,7 +659,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, * We drop the lock and return success. */ mutex_exit(&state->ts_mcglock); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (DDI_SUCCESS); } @@ -747,10 +686,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to read MCG entry"); cmn_err(CE_CONT, "Tavor: READ_MGM command failed: " "%08x\n", status); - TNF_PROBE_2(tavor_mcg_attach_read_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, end_indx); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -771,7 +706,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, if (status != DDI_SUCCESS) { mutex_exit(&state->ts_mcglock); /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed qplist add"); goto mcgattach_fail; } @@ -790,10 +724,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: " "%08x\n", status); - TNF_PROBE_2(tavor_mcg_attach_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, end_indx); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -821,7 +751,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, * We drop the lock and return success. */ mutex_exit(&state->ts_mcglock); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (DDI_SUCCESS); } @@ -840,8 +769,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, status = tavor_rsrc_alloc(state, TAVOR_MCG, 1, TAVOR_NOSLEEP, &rsrc); if (status != DDI_SUCCESS) { mutex_exit(&state->ts_mcglock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MCG"); goto mcgattach_fail; } @@ -872,8 +799,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, bzero(newmcg, sizeof (struct tavor_sw_mcg_list_s)); tavor_rsrc_free(state, &rsrc); mutex_exit(&state->ts_mcglock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed qplist add"); goto mcgattach_fail; } @@ -894,10 +819,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: %08x\n", status); - TNF_PROBE_2(tavor_mcg_attach_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, rsrc->tr_indx); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -921,10 +842,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to read MCG entry"); cmn_err(CE_CONT, "Tavor: READ_MGM command failed: %08x\n", status); - TNF_PROBE_2(tavor_mcg_attach_read_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, end_indx); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -950,10 +867,6 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: %08x\n", status); - TNF_PROBE_2(tavor_mcg_attach_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, end_indx); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } mcg = &state->ts_mcghdl[end_indx]; @@ -975,13 +888,9 @@ tavor_mcg_attach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, tavor_qp_mcg_refcnt_inc(qp); mutex_exit(&state->ts_mcglock); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (DDI_SUCCESS); mcgattach_fail: - TNF_PROBE_1(tavor_mcg_attach_fail, TAVOR_TNF_ERROR, "", tnf_string, - msg, errormsg); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (status); } @@ -1001,16 +910,12 @@ tavor_mcg_detach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, uint32_t end_indx, prev_indx; int status; - TAVOR_TNF_ENTER(tavor_mcg_detach); - /* * Check for invalid Multicast DLID. Specifically, all Multicast * LIDs should be within a well defined range. If the specified LID * is outside of that range, then return an error. */ if (tavor_mlid_is_valid(lid) == 0) { - TNF_PROBE_0(tavor_mcg_detach_invmlid_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mcg_detach); return (IBT_MC_MLID_INVALID); } @@ -1028,9 +933,6 @@ tavor_mcg_detach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: MGID_HASH command failed: %08x\n", status); - TNF_PROBE_1(tavor_mcg_detach_mgid_hash_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -1064,8 +966,6 @@ tavor_mcg_detach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, ((mcg->mcg_mgid_h != gid.gid_prefix) || (mcg->mcg_mgid_l != gid.gid_guid))) { mutex_exit(&state->ts_mcglock); - TNF_PROBE_0(tavor_mcg_detach_invmgid_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mcg_detach); return (IBT_MC_MGID_INVALID); } @@ -1082,10 +982,6 @@ tavor_mcg_detach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to read MCG entry"); cmn_err(CE_CONT, "Tavor: READ_MGM command failed: %08x\n", status); - TNF_PROBE_2(tavor_mcg_detach_read_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, end_indx); - TAVOR_TNF_EXIT(tavor_mcg_attach); return (ibc_get_ci_failure(0)); } @@ -1097,7 +993,6 @@ tavor_mcg_detach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, status = tavor_mcg_qplist_remove(mcg, mcg_entry_qplist, qp); if (status != DDI_SUCCESS) { mutex_exit(&state->ts_mcglock); - TAVOR_TNF_EXIT(tavor_mcg_detach); return (status); } @@ -1125,7 +1020,6 @@ tavor_mcg_detach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, mcg_entry); if (status != DDI_SUCCESS) { mutex_exit(&state->ts_mcglock); - TAVOR_TNF_EXIT(tavor_mcg_detach); return (status); } @@ -1146,17 +1040,12 @@ tavor_mcg_detach(tavor_state_t *state, tavor_qphdl_t qp, ib_gid_t gid, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: " "%08x\n", status); - TNF_PROBE_2(tavor_mcg_detach_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, end_indx); - TAVOR_TNF_EXIT(tavor_mcg_detach); return (ibc_get_ci_failure(0)); } mcg->mcg_num_qps--; } mutex_exit(&state->ts_mcglock); - TAVOR_TNF_EXIT(tavor_mcg_detach); return (DDI_SUCCESS); } @@ -1170,8 +1059,6 @@ tavor_qp_mcg_refcnt_inc(tavor_qphdl_t qp) /* Increment the QP's MCG reference count */ mutex_enter(&qp->qp_lock); qp->qp_mcg_refcnt++; - TNF_PROBE_1_DEBUG(tavor_qp_mcg_refcnt_inc, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, qp->qp_mcg_refcnt); mutex_exit(&qp->qp_lock); } @@ -1186,8 +1073,6 @@ tavor_qp_mcg_refcnt_dec(tavor_qphdl_t qp) /* Decrement the QP's MCG reference count */ mutex_enter(&qp->qp_lock); qp->qp_mcg_refcnt--; - TNF_PROBE_1_DEBUG(tavor_qp_mcg_refcnt_dec, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, qp->qp_mcg_refcnt); mutex_exit(&qp->qp_lock); } @@ -1203,8 +1088,6 @@ tavor_mcg_qplist_add(tavor_state_t *state, tavor_mcghdl_t mcg, { uint_t qplist_indx; - TAVOR_TNF_ENTER(tavor_mcg_qplist_add); - ASSERT(MUTEX_HELD(&state->ts_mcglock)); qplist_indx = mcg->mcg_num_qps; @@ -1214,9 +1097,6 @@ tavor_mcg_qplist_add(tavor_state_t *state, tavor_mcghdl_t mcg, * multicast group. If we have, then return an error */ if (qplist_indx >= state->ts_cfg_profile->cp_num_qp_per_mcg) { - TNF_PROBE_0(tavor_mcg_qplist_add_too_many_qps, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mcg_qplist_add); return (IBT_HCA_MCG_QP_EXCEEDED); } @@ -1254,7 +1134,6 @@ tavor_mcg_qplist_add(tavor_state_t *state, tavor_mcghdl_t mcg, *qp_found = 0; } - TAVOR_TNF_EXIT(tavor_mcg_qplist_add); return (DDI_SUCCESS); } @@ -1270,8 +1149,6 @@ tavor_mcg_qplist_remove(tavor_mcghdl_t mcg, tavor_hw_mcg_qp_list_t *mcg_qplist, { uint_t i, qplist_indx; - TAVOR_TNF_ENTER(tavor_mcg_qplist_remove); - /* * Search the MCG QP list for a matching QPN. When * it's found, we swap the last entry with the current @@ -1286,13 +1163,10 @@ tavor_mcg_qplist_remove(tavor_mcghdl_t mcg, tavor_hw_mcg_qp_list_t *mcg_qplist, mcg_qplist[qplist_indx - 1].q = TAVOR_MCG_QPN_INVALID; mcg_qplist[qplist_indx - 1].qpn = 0; - TAVOR_TNF_EXIT(tavor_mcg_qplist_remove); return (DDI_SUCCESS); } } - TNF_PROBE_0(tavor_mcg_qplist_remove_invqphdl_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mcg_qplist_remove); return (IBT_QP_HDL_INVALID); } @@ -1308,8 +1182,6 @@ tavor_mcg_walk_mgid_hash(tavor_state_t *state, uint64_t start_indx, tavor_mcghdl_t curr_mcghdl; uint_t curr_indx, prev_indx; - TAVOR_TNF_ENTER(tavor_mcg_walk_mgid_hash); - ASSERT(MUTEX_HELD(&state->ts_mcglock)); /* Start at the head of the hash chain */ @@ -1351,7 +1223,6 @@ end_mgid_hash_walk: if (p_indx != NULL) { *p_indx = prev_indx; } - TAVOR_TNF_EXIT(tavor_mcg_walk_mgid_hash); return (curr_indx); } @@ -1364,8 +1235,6 @@ static void tavor_mcg_setup_new_hdr(tavor_mcghdl_t mcg, tavor_hw_mcg_t *mcg_hdr, ib_gid_t mgid, tavor_rsrc_t *mcg_rsrc) { - TAVOR_TNF_ENTER(tavor_mcg_setup_new_hdr); - /* * Fill in the fields of the "shadow" entry used by software * to track MCG hardware entry @@ -1382,8 +1251,6 @@ tavor_mcg_setup_new_hdr(tavor_mcghdl_t mcg, tavor_hw_mcg_t *mcg_hdr, mcg_hdr->mgid_h = mgid.gid_prefix; mcg_hdr->mgid_l = mgid.gid_guid; mcg_hdr->next_gid_indx = 0; - - TAVOR_TNF_EXIT(tavor_mcg_setup_new_hdr); } @@ -1423,7 +1290,6 @@ tavor_mcg_hash_list_remove(tavor_state_t *state, uint_t curr_indx, status = tavor_mcg_entry_invalidate(state, mcg_entry, curr_indx); bzero(curr_mcg, sizeof (struct tavor_sw_mcg_list_s)); - TAVOR_TNF_EXIT(tavor_mcg_hash_list_remove); return (status); } @@ -1445,10 +1311,6 @@ tavor_mcg_hash_list_remove(tavor_state_t *state, uint_t curr_indx, TAVOR_WARNING(state, "failed to read MCG entry"); cmn_err(CE_CONT, "Tavor: READ_MGM command failed: " "%08x\n", status); - TNF_PROBE_2(tavor_mcg_hash_list_rem_read_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, next_indx); - TAVOR_TNF_EXIT(tavor_mcg_hash_list_remove); return (ibc_get_ci_failure(0)); } @@ -1470,10 +1332,6 @@ tavor_mcg_hash_list_remove(tavor_state_t *state, uint_t curr_indx, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: " "%08x\n", status); - TNF_PROBE_2(tavor_mcg_hash_list_rem_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, curr_indx); - TAVOR_TNF_EXIT(tavor_mcg_hash_list_remove); return (ibc_get_ci_failure(0)); } @@ -1494,7 +1352,6 @@ tavor_mcg_hash_list_remove(tavor_state_t *state, uint_t curr_indx, */ tavor_rsrc_free(state, &curr_mcg->mcg_rsrcp); - TAVOR_TNF_EXIT(tavor_mcg_hash_list_remove); return (DDI_SUCCESS); } @@ -1521,10 +1378,6 @@ tavor_mcg_hash_list_remove(tavor_state_t *state, uint_t curr_indx, TAVOR_WARNING(state, "failed to read MCG entry"); cmn_err(CE_CONT, "Tavor: READ_MGM command failed: %08x\n", status); - TNF_PROBE_2(tavor_mcg_hash_list_rem_read_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, prev_indx); - TAVOR_TNF_EXIT(tavor_mcg_hash_list_remove); return (ibc_get_ci_failure(0)); } @@ -1545,10 +1398,6 @@ tavor_mcg_hash_list_remove(tavor_state_t *state, uint_t curr_indx, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: %08x\n", status); - TNF_PROBE_2(tavor_mcg_hash_list_rem_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, prev_indx); - TAVOR_TNF_EXIT(tavor_mcg_hash_list_remove); return (ibc_get_ci_failure(0)); } @@ -1570,7 +1419,6 @@ tavor_mcg_hash_list_remove(tavor_state_t *state, uint_t curr_indx, tavor_rsrc_free(state, &curr_mcg->mcg_rsrcp); bzero(curr_mcg, sizeof (struct tavor_sw_mcg_list_s)); - TAVOR_TNF_EXIT(tavor_mcg_hash_list_remove); return (DDI_SUCCESS); } @@ -1585,8 +1433,6 @@ tavor_mcg_entry_invalidate(tavor_state_t *state, tavor_hw_mcg_t *mcg_entry, { int status; - TAVOR_TNF_ENTER(tavor_mcg_entry_invalidate); - /* * Invalidate the hardware MCG entry by zeroing out this temporary * MCG and writing it the the hardware. Note: In general, this @@ -1601,14 +1447,9 @@ tavor_mcg_entry_invalidate(tavor_state_t *state, tavor_hw_mcg_t *mcg_entry, TAVOR_WARNING(state, "failed to write MCG entry"); cmn_err(CE_CONT, "Tavor: WRITE_MGM command failed: %08x\n", status); - TNF_PROBE_2(tavor_mcg_entry_invalidate_write_mgm_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status, - tnf_uint, indx, indx); - TAVOR_TNF_EXIT(tavor_mcg_entry_invalidate); return (ibc_get_ci_failure(0)); } - TAVOR_TNF_EXIT(tavor_mcg_entry_invalidate); return (DDI_SUCCESS); } @@ -1622,8 +1463,6 @@ tavor_mgid_is_valid(ib_gid_t gid) { uint_t topbits, flags, scope; - TAVOR_TNF_ENTER(tavor_mgid_is_valid); - /* * According to IBA 1.1 specification (section 4.1.1) a valid * "multicast GID" must have its top eight bits set to all ones @@ -1631,9 +1470,6 @@ tavor_mgid_is_valid(ib_gid_t gid) topbits = (gid.gid_prefix >> TAVOR_MCG_TOPBITS_SHIFT) & TAVOR_MCG_TOPBITS_MASK; if (topbits != TAVOR_MCG_TOPBITS) { - TNF_PROBE_0(tavor_mgid_is_valid_invbits_fail, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_mgid_is_valid); return (0); } @@ -1647,9 +1483,6 @@ tavor_mgid_is_valid(ib_gid_t gid) TAVOR_MCG_FLAGS_MASK; if (!((flags == TAVOR_MCG_FLAGS_PERM) || (flags == TAVOR_MCG_FLAGS_NONPERM))) { - TNF_PROBE_1(tavor_mgid_is_valid_invflags_fail, TAVOR_TNF_ERROR, - "", tnf_uint, flags, flags); - TAVOR_TNF_EXIT(tavor_mgid_is_valid); return (0); } @@ -1665,9 +1498,6 @@ tavor_mgid_is_valid(ib_gid_t gid) (scope == TAVOR_MCG_SCOPE_SITELOC) || (scope == TAVOR_MCG_SCOPE_ORGLOC) || (scope == TAVOR_MCG_SCOPE_GLOBAL))) { - TNF_PROBE_1(tavor_mgid_is_valid_invscope_fail, TAVOR_TNF_ERROR, - "", tnf_uint, scope, scope); - TAVOR_TNF_EXIT(tavor_mgid_is_valid); return (0); } @@ -1675,7 +1505,6 @@ tavor_mgid_is_valid(ib_gid_t gid) * If it passes all of the above checks, then we will consider it * a valid multicast GID. */ - TAVOR_TNF_EXIT(tavor_mgid_is_valid); return (1); } @@ -1687,20 +1516,14 @@ tavor_mgid_is_valid(ib_gid_t gid) static int tavor_mlid_is_valid(ib_lid_t lid) { - TAVOR_TNF_ENTER(tavor_mlid_is_valid); - /* * According to IBA 1.1 specification (section 4.1.1) a valid * "multicast DLID" must be between 0xC000 and 0xFFFE. */ if ((lid < IB_LID_MC_FIRST) || (lid > IB_LID_MC_LAST)) { - TNF_PROBE_1(tavor_mlid_is_valid_invdlid_fail, TAVOR_TNF_ERROR, - "", tnf_uint, mlid, lid); - TAVOR_TNF_EXIT(tavor_mlid_is_valid); return (0); } - TAVOR_TNF_EXIT(tavor_mlid_is_valid); return (1); } @@ -1716,8 +1539,6 @@ tavor_pd_alloc(tavor_state_t *state, tavor_pdhdl_t *pdhdl, uint_t sleepflag) tavor_pdhdl_t pd; int status; - TAVOR_TNF_ENTER(tavor_pd_alloc); - /* * Allocate the software structure for tracking the protection domain * (i.e. the Tavor Protection Domain handle). By default each PD @@ -1727,8 +1548,6 @@ tavor_pd_alloc(tavor_state_t *state, tavor_pdhdl_t *pdhdl, uint_t sleepflag) */ status = tavor_rsrc_alloc(state, TAVOR_PDHDL, 1, sleepflag, &rsrc); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_pd_alloc_rsrcalloc_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_pd_alloc); return (IBT_INSUFF_RESOURCE); } pd = (tavor_pdhdl_t)rsrc->tr_addr; @@ -1737,7 +1556,6 @@ tavor_pd_alloc(tavor_state_t *state, tavor_pdhdl_t *pdhdl, uint_t sleepflag) pd->pd_refcnt = 0; *pdhdl = pd; - TAVOR_TNF_EXIT(tavor_pd_alloc); return (DDI_SUCCESS); } @@ -1752,8 +1570,6 @@ tavor_pd_free(tavor_state_t *state, tavor_pdhdl_t *pdhdl) tavor_rsrc_t *rsrc; tavor_pdhdl_t pd; - TAVOR_TNF_ENTER(tavor_pd_free); - /* * Pull all the necessary information from the Tavor Protection Domain * handle. This is necessary here because the resource for the @@ -1771,9 +1587,6 @@ tavor_pd_free(tavor_state_t *state, tavor_pdhdl_t *pdhdl) * Tavor resource and return success. */ if (pd->pd_refcnt != 0) { - TNF_PROBE_1(tavor_pd_free_refcnt_fail, TAVOR_TNF_ERROR, "", - tnf_int, refcnt, pd->pd_refcnt); - TAVOR_TNF_EXIT(tavor_pd_free); return (IBT_PD_IN_USE); } @@ -1783,7 +1596,6 @@ tavor_pd_free(tavor_state_t *state, tavor_pdhdl_t *pdhdl) /* Set the pdhdl pointer to NULL and return success */ *pdhdl = (tavor_pdhdl_t)NULL; - TAVOR_TNF_EXIT(tavor_pd_free); return (DDI_SUCCESS); } @@ -1797,8 +1609,6 @@ tavor_pd_refcnt_inc(tavor_pdhdl_t pd) { /* Increment the protection domain's reference count */ mutex_enter(&pd->pd_lock); - TNF_PROBE_1_DEBUG(tavor_pd_refcnt_inc, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, pd->pd_refcnt); pd->pd_refcnt++; mutex_exit(&pd->pd_lock); @@ -1815,8 +1625,6 @@ tavor_pd_refcnt_dec(tavor_pdhdl_t pd) /* Decrement the protection domain's reference count */ mutex_enter(&pd->pd_lock); pd->pd_refcnt--; - TNF_PROBE_1_DEBUG(tavor_pd_refcnt_dec, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, pd->pd_refcnt); mutex_exit(&pd->pd_lock); } @@ -1836,15 +1644,10 @@ tavor_port_query(tavor_state_t *state, uint_t port, ibt_hca_portinfo_t *pi) uint_t sgid_max, pkey_max, tbl_size; int i, j, indx, status; - TAVOR_TNF_ENTER(tavor_port_query); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pi)) /* Validate that specified port number is legal */ if (!tavor_portnum_is_valid(state, port)) { - TNF_PROBE_1(tavor_port_query_inv_portnum_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, port); - TAVOR_TNF_EXIT(tavor_port_query); return (IBT_HCA_PORT_INVALID); } @@ -1860,9 +1663,6 @@ tavor_port_query(tavor_state_t *state, uint_t port, ibt_hca_portinfo_t *pi) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: GetPortInfo (port %02d) command " "failed: %08x\n", port, status); - TNF_PROBE_1(tavor_port_query_getportinfo_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status); - TAVOR_TNF_EXIT(tavor_port_query); return (ibc_get_ci_failure(0)); } @@ -1923,9 +1723,6 @@ tavor_port_query(tavor_state_t *state, uint_t port, ibt_hca_portinfo_t *pi) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: GetGUIDInfo (port %02d) " "command failed: %08x\n", port, status); - TNF_PROBE_1(tavor_port_query_getguidinfo_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status); - TAVOR_TNF_EXIT(tavor_port_query); return (ibc_get_ci_failure(0)); } @@ -1954,9 +1751,6 @@ tavor_port_query(tavor_state_t *state, uint_t port, ibt_hca_portinfo_t *pi) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: GetPKeyTable (port %02d) " "command failed: %08x\n", port, status); - TNF_PROBE_1(tavor_port_query_getpkeytable_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status); - TAVOR_TNF_EXIT(tavor_port_query); return (ibc_get_ci_failure(0)); } @@ -1968,7 +1762,6 @@ tavor_port_query(tavor_state_t *state, uint_t port, ibt_hca_portinfo_t *pi) } } - TAVOR_TNF_EXIT(tavor_port_query); return (DDI_SUCCESS); } @@ -1986,16 +1779,11 @@ tavor_port_modify(tavor_state_t *state, uint8_t port, uint32_t capmask, reset_qkey; int status; - TAVOR_TNF_ENTER(tavor_port_modify); - /* * Return an error if either of the unsupported flags are set */ if ((flags & IBT_PORT_SHUTDOWN) || (flags & IBT_PORT_SET_INIT_TYPE)) { - TNF_PROBE_1(tavor_port_modify_inv_flags_fail, - TAVOR_TNF_ERROR, "", tnf_uint, flags, flags); - TAVOR_TNF_EXIT(tavor_port_modify); return (IBT_NOT_SUPPORTED); } @@ -2006,9 +1794,6 @@ tavor_port_modify(tavor_state_t *state, uint8_t port, /* Validate that specified port number is legal */ if (!tavor_portnum_is_valid(state, port)) { - TNF_PROBE_1(tavor_port_modify_inv_portnum_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, port); - TAVOR_TNF_EXIT(tavor_port_modify); return (IBT_HCA_PORT_INVALID); } @@ -2023,9 +1808,6 @@ tavor_port_modify(tavor_state_t *state, uint8_t port, status = tavor_getportinfo_cmd_post(state, port, TAVOR_SLEEPFLAG_FOR_CONTEXT(), &portinfo); if (status != TAVOR_CMD_SUCCESS) { - TNF_PROBE_1(tavor_port_modify_getportinfo_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status); - TAVOR_TNF_EXIT(tavor_port_modify); return (ibc_get_ci_failure(0)); } @@ -2069,13 +1851,9 @@ tavor_port_modify(tavor_state_t *state, uint8_t port, TAVOR_WARNING(state, "failed to modify port capabilities"); cmn_err(CE_CONT, "Tavor: SET_IB (port %02d) command failed: " "%08x\n", port, status); - TNF_PROBE_1(tavor_port_modify_set_ib_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, cmd_status, status); - TAVOR_TNF_EXIT(tavor_port_modify); return (ibc_get_ci_failure(0)); } - TAVOR_TNF_EXIT(tavor_port_modify); return (DDI_SUCCESS); } @@ -2096,8 +1874,6 @@ tavor_set_addr_path(tavor_state_t *state, ibt_adds_vect_t *av, { uint_t gidtbl_sz; - TAVOR_TNF_ENTER(tavor_set_addr_path); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*av)) _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*path)) @@ -2128,9 +1904,6 @@ tavor_set_addr_path(tavor_state_t *state, ibt_adds_vect_t *av, } else if (av->av_srate == IBT_SRATE_NOT_SPECIFIED) { path->max_stat_rate = 0; /* Max */ } else { - TNF_PROBE_1(tavor_set_addr_path_inv_srate_fail, - TAVOR_TNF_ERROR, "", tnf_uint, srate, av->av_srate); - TAVOR_TNF_EXIT(tavor_set_addr_path); return (IBT_STATIC_RATE_INVALID); } } else { @@ -2141,9 +1914,6 @@ tavor_set_addr_path(tavor_state_t *state, ibt_adds_vect_t *av, } else if (av->av_srate == IBT_SRATE_NOT_SPECIFIED) { path->max_stat_rate = 0; /* Max */ } else { - TNF_PROBE_1(tavor_set_addr_path_inv_srate_fail, - TAVOR_TNF_ERROR, "", tnf_uint, srate, av->av_srate); - TAVOR_TNF_EXIT(tavor_set_addr_path); return (IBT_STATIC_RATE_INVALID); } } @@ -2159,9 +1929,6 @@ tavor_set_addr_path(tavor_state_t *state, ibt_adds_vect_t *av, /* If "grh" flag is set, then check for valid SGID index too */ gidtbl_sz = (1 << state->ts_devlim.log_max_gid); if ((av->av_send_grh) && (av->av_sgid_ix > gidtbl_sz)) { - TNF_PROBE_1(tavor_set_addr_path_inv_sgid_ix_fail, - TAVOR_TNF_ERROR, "", tnf_uint, sgid_ix, av->av_sgid_ix); - TAVOR_TNF_EXIT(tavor_set_addr_path); return (IBT_SGID_INVALID); } @@ -2207,7 +1974,6 @@ tavor_set_addr_path(tavor_state_t *state, ibt_adds_vect_t *av, path->rgid_l = 0x2; } - TAVOR_TNF_EXIT(tavor_set_addr_path); return (DDI_SUCCESS); } @@ -2349,8 +2115,6 @@ tavor_queue_alloc(tavor_state_t *state, tavor_qalloc_info_t *qa_info, uint_t dma_xfer_mode, type; int flag, status; - TAVOR_TNF_ENTER(tavor_queue_alloc); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*qa_info)) /* Set the callback flag appropriately */ @@ -2373,8 +2137,6 @@ tavor_queue_alloc(tavor_state_t *state, tavor_qalloc_info_t *qa_info, status = ddi_dma_alloc_handle(state->ts_dip, &dma_attr, callback, NULL, &qa_info->qa_dmahdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_queue_alloc_dmahdl_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_queue_alloc); return (DDI_FAILURE); } @@ -2421,9 +2183,6 @@ tavor_queue_alloc(tavor_state_t *state, tavor_qalloc_info_t *qa_info, (size_t *)&qa_info->qa_buf_realsz, &qa_info->qa_acchdl); if (status != DDI_SUCCESS) { ddi_dma_free_handle(&qa_info->qa_dmahdl); - TNF_PROBE_0(tavor_queue_alloc_dma_memalloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_queue_alloc); return (DDI_FAILURE); } @@ -2442,9 +2201,6 @@ tavor_queue_alloc(tavor_state_t *state, tavor_qalloc_info_t *qa_info, &qa_info->qa_umemcookie); if (qa_info->qa_buf_real == NULL) { ddi_dma_free_handle(&qa_info->qa_dmahdl); - TNF_PROBE_0(tavor_queue_alloc_umem_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_queue_alloc); return (DDI_FAILURE); } @@ -2463,9 +2219,6 @@ tavor_queue_alloc(tavor_state_t *state, tavor_qalloc_info_t *qa_info, NULL, NULL, flag); if (qa_info->qa_buf_real == NULL) { ddi_dma_free_handle(&qa_info->qa_dmahdl); - TNF_PROBE_0(tavor_queue_alloc_vmxa_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_queue_alloc); return (DDI_FAILURE); } @@ -2493,7 +2246,6 @@ tavor_queue_alloc(tavor_state_t *state, tavor_qalloc_info_t *qa_info, qa_info->qa_buf_aligned + alloc_mask) & ~alloc_mask); } - TAVOR_TNF_EXIT(tavor_queue_alloc); return (DDI_SUCCESS); } @@ -2505,8 +2257,6 @@ tavor_queue_alloc(tavor_state_t *state, tavor_qalloc_info_t *qa_info, void tavor_queue_free(tavor_state_t *state, tavor_qalloc_info_t *qa_info) { - TAVOR_TNF_ENTER(tavor_queue_free); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*qa_info)) /* @@ -2530,8 +2280,6 @@ tavor_queue_free(tavor_state_t *state, tavor_qalloc_info_t *qa_info) /* Always free the dma handle */ ddi_dma_free_handle(&qa_info->qa_dmahdl); - - TAVOR_TNF_EXIT(tavor_queue_free); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_mr.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_mr.c index fd2c41abfc..d3eb9e2bd8 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_mr.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_mr.c @@ -93,8 +93,6 @@ tavor_mr_register(tavor_state_t *state, tavor_pdhdl_t pd, tavor_bind_info_t bind; int status; - TAVOR_TNF_ENTER(tavor_mr_register); - /* * Fill in the "bind" struct. This struct provides the majority * of the information that will be used to distinguish between an @@ -109,15 +107,8 @@ tavor_mr_register(tavor_state_t *state, tavor_pdhdl_t pd, bind.bi_as = mr_attr->mr_as; bind.bi_flags = mr_attr->mr_flags; status = tavor_mr_common_reg(state, pd, &bind, mrhdl, op); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_mr_register_cmnreg_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mr_register); - return (status); - } - TAVOR_TNF_EXIT(tavor_mr_register); - return (DDI_SUCCESS); + return (status); } @@ -133,8 +124,6 @@ tavor_mr_register_buf(tavor_state_t *state, tavor_pdhdl_t pd, tavor_bind_info_t bind; int status; - TAVOR_TNF_ENTER(tavor_mr_register_buf); - /* * Fill in the "bind" struct. This struct provides the majority * of the information that will be used to distinguish between an @@ -158,15 +147,8 @@ tavor_mr_register_buf(tavor_state_t *state, tavor_pdhdl_t pd, bind.bi_len = (uint64_t)buf->b_bcount; bind.bi_flags = mr_attr->mr_flags; status = tavor_mr_common_reg(state, pd, &bind, mrhdl, op); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_mr_register_buf_cmnreg_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mr_register_buf); - return (status); - } - TAVOR_TNF_EXIT(tavor_mr_register_buf); - return (DDI_SUCCESS); + return (status); } @@ -190,9 +172,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, uint64_t mtt_addr, mtt_ddrbaseaddr, pgsize_msk; uint_t sleep, mr_is_umem; int status, umem_flags; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mr_register_shared); /* * Check the sleep flag. Ensure that it is consistent with the @@ -203,8 +182,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, TAVOR_SLEEP; if ((sleep == TAVOR_SLEEP) && (sleep != TAVOR_SLEEPFLAG_FOR_CONTEXT())) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid flags"); goto mrshared_fail; } @@ -221,8 +198,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, */ status = tavor_rsrc_alloc(state, TAVOR_MPT, 1, sleep, &mpt); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MPT"); goto mrshared_fail1; } @@ -234,8 +209,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, */ status = tavor_rsrc_alloc(state, TAVOR_MRHDL, 1, sleep, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MR handle"); goto mrshared_fail2; } mr = (tavor_mrhdl_t)rsrc->tr_addr; @@ -284,8 +257,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, */ if ((mrhdl->mr_is_umem) && (mrhdl->mr_umemcookie == NULL)) { mutex_exit(&mrhdl->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_HDL_INVALID, "invalid mrhdl"); goto mrshared_fail3; } @@ -310,8 +281,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, &umem_cookie, &tavor_umem_cbops, NULL); if (status != 0) { mutex_exit(&mrhdl->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed umem pin"); goto mrshared_fail3; } @@ -320,8 +289,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, (uint64_t)(uintptr_t)rsrc); if (umapdb == NULL) { mutex_exit(&mrhdl->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed umap add"); goto mrshared_fail4; } } @@ -403,11 +370,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: SW2HW_MPT command failed: %08x\n", status); - TNF_PROBE_1(tavor_mr_register_shared_sw2hw_mpt_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "tavor SW2HW_MPT command"); goto mrshared_fail5; } @@ -438,7 +400,6 @@ tavor_mr_register_shared(tavor_state_t *state, tavor_mrhdl_t mrhdl, *mrhdl_new = mr; - TAVOR_TNF_EXIT(tavor_mr_register_shared); return (DDI_SUCCESS); /* @@ -460,9 +421,6 @@ mrshared_fail2: mrshared_fail1: tavor_pd_refcnt_dec(pd); mrshared_fail: - TNF_PROBE_1(tavor_mr_register_shared_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mr_register_shared); return (status); } @@ -483,9 +441,6 @@ tavor_mr_deregister(tavor_state_t *state, tavor_mrhdl_t *mrhdl, uint_t level, tavor_bind_info_t *bind; uint64_t value; int status, shared_mtt; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mr_deregister); /* * Check the sleep flag. Ensure that it is consistent with the @@ -494,11 +449,6 @@ tavor_mr_deregister(tavor_state_t *state, tavor_mrhdl_t *mrhdl, uint_t level, */ if ((sleep == TAVOR_SLEEP) && (sleep != TAVOR_SLEEPFLAG_FOR_CONTEXT())) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid sleep flags"); - TNF_PROBE_1(tavor_mr_deregister_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mr_deregister); return (status); } @@ -551,15 +501,10 @@ tavor_mr_deregister(tavor_state_t *state, tavor_mrhdl_t *mrhdl, uint_t level, NULL, 0, mpt->tr_indx, sleep); if (status != TAVOR_CMD_SUCCESS) { if (status == TAVOR_CMD_REG_BOUND) { - TAVOR_TNF_EXIT(tavor_mr_deregister); return (IBT_MR_IN_USE); } else { cmn_err(CE_CONT, "Tavor: HW2SW_MPT command " "failed: %08x\n", status); - TNF_PROBE_1(tavor_hw2sw_mpt_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, - status); - TAVOR_TNF_EXIT(tavor_mr_deregister); return (IBT_INVALID_PARAM); } } @@ -632,7 +577,6 @@ tavor_mr_deregister(tavor_state_t *state, tavor_mrhdl_t *mrhdl, uint_t level, */ if ((mr->mr_is_umem) && (mr->mr_umemcookie == NULL)) { mutex_exit(&mr->mr_lock); - TAVOR_TNF_EXIT(tavor_mr_deregister); return (DDI_SUCCESS); } @@ -651,7 +595,6 @@ mrdereg_finish_cleanup: /* Set the mrhdl pointer to NULL and return success */ *mrhdl = NULL; - TAVOR_TNF_EXIT(tavor_mr_deregister); return (DDI_SUCCESS); } @@ -665,8 +608,6 @@ int tavor_mr_query(tavor_state_t *state, tavor_mrhdl_t mr, ibt_mr_query_attr_t *attr) { - TAVOR_TNF_ENTER(tavor_mr_query); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr)) mutex_enter(&mr->mr_lock); @@ -678,8 +619,6 @@ tavor_mr_query(tavor_state_t *state, tavor_mrhdl_t mr, */ if ((mr->mr_is_umem) && (mr->mr_umemcookie == NULL)) { mutex_exit(&mr->mr_lock); - TNF_PROBE_0(tavor_mr_query_inv_mrhdl_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mr_query); return (IBT_MR_HDL_INVALID); } @@ -713,7 +652,6 @@ tavor_mr_query(tavor_state_t *state, tavor_mrhdl_t mr, IBT_MR_NONCOHERENT) ? B_TRUE : B_FALSE; mutex_exit(&mr->mr_lock); - TAVOR_TNF_EXIT(tavor_mr_query); return (DDI_SUCCESS); } @@ -730,8 +668,6 @@ tavor_mr_reregister(tavor_state_t *state, tavor_mrhdl_t mr, tavor_bind_info_t bind; int status; - TAVOR_TNF_ENTER(tavor_mr_reregister); - /* * Fill in the "bind" struct. This struct provides the majority * of the information that will be used to distinguish between an @@ -746,15 +682,8 @@ tavor_mr_reregister(tavor_state_t *state, tavor_mrhdl_t mr, bind.bi_as = mr_attr->mr_as; bind.bi_flags = mr_attr->mr_flags; status = tavor_mr_common_rereg(state, mr, pd, &bind, mrhdl_new, op); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_mr_reregister_cmnreg_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mr_reregister); - return (status); - } - TAVOR_TNF_EXIT(tavor_mr_reregister); - return (DDI_SUCCESS); + return (status); } @@ -770,8 +699,6 @@ tavor_mr_reregister_buf(tavor_state_t *state, tavor_mrhdl_t mr, tavor_bind_info_t bind; int status; - TAVOR_TNF_ENTER(tavor_mr_reregister_buf); - /* * Fill in the "bind" struct. This struct provides the majority * of the information that will be used to distinguish between an @@ -795,15 +722,8 @@ tavor_mr_reregister_buf(tavor_state_t *state, tavor_mrhdl_t mr, bind.bi_flags = mr_attr->mr_flags; bind.bi_as = NULL; status = tavor_mr_common_rereg(state, mr, pd, &bind, mrhdl_new, op); - if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_mr_reregister_buf_cmnreg_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mr_reregister_buf); - return (status); - } - TAVOR_TNF_EXIT(tavor_mr_reregister_buf); - return (DDI_SUCCESS); + return (status); } @@ -820,9 +740,6 @@ tavor_mr_sync(tavor_state_t *state, ibt_mr_sync_t *mr_segs, size_t num_segs) uint64_t mr_start, mr_end; uint_t type; int status, i; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mr_sync); /* Process each of the ibt_mr_sync_t's */ for (i = 0; i < num_segs; i++) { @@ -830,8 +747,6 @@ tavor_mr_sync(tavor_state_t *state, ibt_mr_sync_t *mr_segs, size_t num_segs) /* Check for valid memory region handle */ if (mrhdl == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_HDL_INVALID, "invalid mrhdl"); goto mrsync_fail; } @@ -845,8 +760,6 @@ tavor_mr_sync(tavor_state_t *state, ibt_mr_sync_t *mr_segs, size_t num_segs) */ if ((mrhdl->mr_is_umem) && (mrhdl->mr_umemcookie == NULL)) { mutex_exit(&mrhdl->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_HDL_INVALID, "invalid mrhdl2"); goto mrsync_fail; } @@ -858,14 +771,10 @@ tavor_mr_sync(tavor_state_t *state, ibt_mr_sync_t *mr_segs, size_t num_segs) mr_end = mr_start + mrhdl->mr_bindinfo.bi_len - 1; if ((seg_vaddr < mr_start) || (seg_vaddr > mr_end)) { mutex_exit(&mrhdl->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_VA_INVALID, "invalid vaddr"); goto mrsync_fail; } if ((seg_end < mr_start) || (seg_end > mr_end)) { mutex_exit(&mrhdl->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_LEN_INVALID, "invalid length"); goto mrsync_fail; } @@ -876,8 +785,6 @@ tavor_mr_sync(tavor_state_t *state, ibt_mr_sync_t *mr_segs, size_t num_segs) type = DDI_DMA_SYNC_FORCPU; } else { mutex_exit(&mrhdl->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid sync type"); goto mrsync_fail; } @@ -886,13 +793,9 @@ tavor_mr_sync(tavor_state_t *state, ibt_mr_sync_t *mr_segs, size_t num_segs) mutex_exit(&mrhdl->mr_lock); } - TAVOR_TNF_EXIT(tavor_mr_sync); return (DDI_SUCCESS); mrsync_fail: - TNF_PROBE_1(tavor_mr_sync_fail, TAVOR_TNF_ERROR, "", tnf_string, msg, - errormsg); - TAVOR_TNF_EXIT(tavor_mr_sync); return (status); } @@ -910,9 +813,6 @@ tavor_mw_alloc(tavor_state_t *state, tavor_pdhdl_t pd, ibt_mw_flags_t flags, tavor_mwhdl_t mw; uint_t sleep; int status; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mw_alloc); /* * Check the sleep flag. Ensure that it is consistent with the @@ -922,8 +822,6 @@ tavor_mw_alloc(tavor_state_t *state, tavor_pdhdl_t pd, ibt_mw_flags_t flags, sleep = (flags & IBT_MW_NOSLEEP) ? TAVOR_NOSLEEP : TAVOR_SLEEP; if ((sleep == TAVOR_SLEEP) && (sleep != TAVOR_SLEEPFLAG_FOR_CONTEXT())) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid flags"); goto mwalloc_fail; } @@ -941,8 +839,6 @@ tavor_mw_alloc(tavor_state_t *state, tavor_pdhdl_t pd, ibt_mw_flags_t flags, */ status = tavor_rsrc_alloc(state, TAVOR_MPT, 1, sleep, &mpt); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MPT"); goto mwalloc_fail1; } @@ -956,8 +852,6 @@ tavor_mw_alloc(tavor_state_t *state, tavor_pdhdl_t pd, ibt_mw_flags_t flags, */ status = tavor_rsrc_alloc(state, TAVOR_MRHDL, 1, sleep, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MR handle"); goto mwalloc_fail2; } mw = (tavor_mwhdl_t)rsrc->tr_addr; @@ -994,11 +888,6 @@ tavor_mw_alloc(tavor_state_t *state, tavor_pdhdl_t pd, ibt_mw_flags_t flags, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: SW2HW_MPT command failed: %08x\n", status); - TNF_PROBE_1(tavor_mw_alloc_sw2hw_mpt_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "tavor SW2HW_MPT command"); goto mwalloc_fail3; } @@ -1012,7 +901,6 @@ tavor_mw_alloc(tavor_state_t *state, tavor_pdhdl_t pd, ibt_mw_flags_t flags, mw->mr_rsrcp = rsrc; *mwhdl = mw; - TAVOR_TNF_EXIT(tavor_mw_alloc); return (DDI_SUCCESS); mwalloc_fail3: @@ -1022,9 +910,6 @@ mwalloc_fail2: mwalloc_fail1: tavor_pd_refcnt_dec(pd); mwalloc_fail: - TNF_PROBE_1(tavor_mw_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mw_alloc); return (status); } @@ -1039,11 +924,8 @@ tavor_mw_free(tavor_state_t *state, tavor_mwhdl_t *mwhdl, uint_t sleep) tavor_rsrc_t *mpt, *rsrc; tavor_mwhdl_t mw; int status; - char *errormsg; tavor_pdhdl_t pd; - TAVOR_TNF_ENTER(tavor_mw_free); - /* * Check the sleep flag. Ensure that it is consistent with the * current thread context (i.e. if we are currently in the interrupt @@ -1051,11 +933,6 @@ tavor_mw_free(tavor_state_t *state, tavor_mwhdl_t *mwhdl, uint_t sleep) */ if ((sleep == TAVOR_SLEEP) && (sleep != TAVOR_SLEEPFLAG_FOR_CONTEXT())) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid sleep flags"); - TNF_PROBE_1(tavor_mw_free_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mw_free); return (status); } @@ -1081,9 +958,6 @@ tavor_mw_free(tavor_state_t *state, tavor_mwhdl_t *mwhdl, uint_t sleep) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: HW2SW_MPT command failed: %08x\n", status); - TNF_PROBE_1(tavor_hw2sw_mpt_cmd_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_mw_free); return (IBT_INVALID_PARAM); } @@ -1099,7 +973,6 @@ tavor_mw_free(tavor_state_t *state, tavor_mwhdl_t *mwhdl, uint_t sleep) /* Set the mwhdl pointer to NULL and return success */ *mwhdl = NULL; - TAVOR_TNF_EXIT(tavor_mw_free); return (DDI_SUCCESS); } @@ -1155,9 +1028,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, uint64_t mtt_addr, mtt_ddrbaseaddr, max_sz; uint_t sleep, mtt_pgsize_bits, bind_type, mr_is_umem; int status, umem_flags, bind_override_addr; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mr_common_reg); /* * Check the "options" flag. Currently this flag tells the driver @@ -1187,8 +1057,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, */ max_sz = ((uint64_t)1 << state->ts_cfg_profile->cp_log_max_mrw_sz); if ((bind->bi_len == 0) || (bind->bi_len > max_sz)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_LEN_INVALID, "invalid length"); goto mrcommon_fail; } @@ -1200,8 +1068,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, sleep = (flags & IBT_MR_NOSLEEP) ? TAVOR_NOSLEEP: TAVOR_SLEEP; if ((sleep == TAVOR_SLEEP) && (sleep != TAVOR_SLEEPFLAG_FOR_CONTEXT())) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid flags"); goto mrcommon_fail; } @@ -1224,8 +1090,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, */ status = tavor_rsrc_alloc(state, TAVOR_MPT, 1, sleep, &mpt); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MPT"); goto mrcommon_fail1; } @@ -1237,8 +1101,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, */ status = tavor_rsrc_alloc(state, TAVOR_MRHDL, 1, sleep, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MR handle"); goto mrcommon_fail2; } mr = (tavor_mrhdl_t)rsrc->tr_addr; @@ -1296,8 +1158,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, status = umem_lockmemory(umem_addr, umem_len, umem_flags, &umem_cookie, &tavor_umem_cbops, NULL); if (status != 0) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed umem pin"); goto mrcommon_fail3; } @@ -1307,8 +1167,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, bind->bi_buf = ddi_umem_iosetup(umem_cookie, 0, umem_len, B_WRITE, 0, 0, NULL, DDI_UMEM_SLEEP); if (bind->bi_buf == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed iosetup"); goto mrcommon_fail3; } bind->bi_type = TAVOR_BINDHDL_UBUF; @@ -1321,8 +1179,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, (uint64_t)(uintptr_t)umem_cookie, MLNX_UMAP_MRMEM_RSRC, (uint64_t)(uintptr_t)rsrc); if (umapdb == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed umap add"); goto mrcommon_fail4; } } @@ -1337,8 +1193,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, status = tavor_mr_mtt_bind(state, bh, bind_dmahdl, &mtt, &mtt_pgsize_bits); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed mtt bind"); /* * When mtt_bind fails, freerbuf has already been done, * so make sure not to call it again. @@ -1358,8 +1212,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, status = tavor_rsrc_alloc(state, TAVOR_REFCNT, 1, sleep, &mtt_refcnt); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed refence count"); goto mrcommon_fail6; } mr->mr_mttrefcntp = mtt_refcnt; @@ -1408,11 +1260,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: SW2HW_MPT command failed: %08x\n", status); - TNF_PROBE_1(tavor_mr_common_reg_sw2hw_mpt_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "tavor SW2HW_MPT command"); goto mrcommon_fail7; } @@ -1443,7 +1290,6 @@ tavor_mr_common_reg(tavor_state_t *state, tavor_pdhdl_t pd, *mrhdl = mr; - TAVOR_TNF_EXIT(tavor_mr_common_reg); return (DDI_SUCCESS); /* @@ -1480,9 +1326,6 @@ mrcommon_fail2: mrcommon_fail1: tavor_pd_refcnt_dec(pd); mrcommon_fail: - TNF_PROBE_1(tavor_mr_common_reg_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mr_common_reg); return (status); } @@ -1669,9 +1512,6 @@ tavor_mr_mtt_bind(tavor_state_t *state, tavor_bind_info_t *bind, uint64_t nummtt; uint_t sleep; int status; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mr_common_reg); /* * Check the sleep flag. Ensure that it is consistent with the @@ -1681,8 +1521,6 @@ tavor_mr_mtt_bind(tavor_state_t *state, tavor_bind_info_t *bind, sleep = (bind->bi_flags & IBT_MR_NOSLEEP) ? TAVOR_NOSLEEP: TAVOR_SLEEP; if ((sleep == TAVOR_SLEEP) && (sleep != TAVOR_SLEEPFLAG_FOR_CONTEXT())) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid flags"); goto mrmttbind_fail; } @@ -1699,8 +1537,6 @@ tavor_mr_mtt_bind(tavor_state_t *state, tavor_bind_info_t *bind, */ status = tavor_mr_mem_bind(state, bind, bind_dmahdl, sleep); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed mem bind"); goto mrmttbind_fail; } @@ -1724,8 +1560,6 @@ tavor_mr_mtt_bind(tavor_state_t *state, tavor_bind_info_t *bind, status = tavor_rsrc_alloc(state, TAVOR_MTT, TAVOR_NUMMTT_TO_MTTSEG(nummtt), sleep, mtt); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MTT"); goto mrmttbind_fail2; } @@ -1737,11 +1571,8 @@ tavor_mr_mtt_bind(tavor_state_t *state, tavor_bind_info_t *bind, */ status = tavor_mr_fast_mtt_write(*mtt, bind, *mtt_pgsize_bits); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), "failed write mtt"); goto mrmttbind_fail3; } - TAVOR_TNF_EXIT(tavor_mr_mtt_bind); return (DDI_SUCCESS); /* @@ -1752,9 +1583,6 @@ mrmttbind_fail3: mrmttbind_fail2: tavor_mr_mem_unbind(state, bind); mrmttbind_fail: - TNF_PROBE_1(tavor_mr_mtt_bind_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mr_mtt_bind); return (status); } @@ -1767,8 +1595,6 @@ int tavor_mr_mtt_unbind(tavor_state_t *state, tavor_bind_info_t *bind, tavor_rsrc_t *mtt) { - TAVOR_TNF_ENTER(tavor_mr_mtt_unbind); - /* * Free up the MTT entries and unbind the memory. Here, as above, we * attempt to free these resources only if it is appropriate to do so. @@ -1776,7 +1602,6 @@ tavor_mr_mtt_unbind(tavor_state_t *state, tavor_bind_info_t *bind, tavor_mr_mem_unbind(state, bind); tavor_rsrc_free(state, &mtt); - TAVOR_TNF_EXIT(tavor_mr_mtt_unbind); return (DDI_SUCCESS); } @@ -1798,9 +1623,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, uint64_t mtt_addr_to_use, vaddr_to_use, len_to_use; uint_t sleep, dereg_level; int status; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mr_common_rereg); _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*bind)) @@ -1810,8 +1632,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, * currently supported. Return failure. XXX */ if (mr->mr_is_umem) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_HDL_INVALID, "invalid mrhdl"); goto mrrereg_fail; } @@ -1832,8 +1652,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, if ((sleep == TAVOR_SLEEP) && (sleep != TAVOR_SLEEPFLAG_FOR_CONTEXT())) { mutex_exit(&mr->mr_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid flags"); goto mrrereg_fail; } @@ -1855,7 +1673,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, if (status != TAVOR_CMD_SUCCESS) { mutex_exit(&mr->mr_lock); if (status == TAVOR_CMD_REG_BOUND) { - TAVOR_TNF_EXIT(tavor_mr_common_rereg); return (IBT_MR_IN_USE); } else { cmn_err(CE_CONT, "Tavor: HW2SW_MPT command failed: " @@ -1870,9 +1687,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, TAVOR_WARNING(state, "failed to deregister " "memory region"); } - TNF_PROBE_1(tavor_mr_common_rereg_hw2sw_mpt_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_mr_common_rereg); return (ibc_get_ci_failure(0)); } } @@ -1898,8 +1712,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, TAVOR_WARNING(state, "failed to deregister " "memory region"); } - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_PD_HDL_INVALID, "invalid PD handle"); goto mrrereg_fail; } @@ -1936,9 +1748,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, TAVOR_WARNING(state, "failed to deregister " "memory region"); } - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_ACCESS_REQ_INVALID, - "invalid access flags"); goto mrrereg_fail; } @@ -1992,8 +1801,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, "memory region"); } - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed rereg helper"); goto mrrereg_fail; } vaddr_to_use = mr->mr_bindinfo.bi_addr; @@ -2060,9 +1867,6 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, TAVOR_WARNING(state, "failed to deregister memory " "region"); } - TNF_PROBE_1(tavor_mr_common_rereg_sw2hw_mpt_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_mr_common_rereg); return (ibc_get_ci_failure(0)); } @@ -2089,13 +1893,9 @@ tavor_mr_common_rereg(tavor_state_t *state, tavor_mrhdl_t mr, *mrhdl_new = mr; mutex_exit(&mr->mr_lock); - TAVOR_TNF_EXIT(tavor_mr_common_rereg); return (DDI_SUCCESS); mrrereg_fail: - TNF_PROBE_1(tavor_mr_common_rereg_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mr_common_rereg); return (status); } @@ -2120,9 +1920,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, uint64_t mtt_ddrbaseaddr; uint_t mtt_pgsize_bits, bind_type, reuse_dmahdl; int status; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_mr_rereg_xlat_helper); ASSERT(MUTEX_HELD(&mr->mr_lock)); @@ -2154,8 +1951,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, */ *dereg_level = TAVOR_MR_DEREG_NO_HW2SW_MPT; - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_MR_LEN_INVALID, "invalid length"); goto mrrereghelp_fail; } @@ -2237,8 +2032,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, */ *dereg_level = TAVOR_MR_DEREG_NO_HW2SW_MPT_OR_UNBIND; - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed mem bind"); goto mrrereghelp_fail; } if (reuse_dmahdl) { @@ -2267,9 +2060,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, tavor_mr_mem_unbind(state, bind); *dereg_level = TAVOR_MR_DEREG_NO_HW2SW_MPT_OR_UNBIND; - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "failed write mtt"); goto mrrereghelp_fail; } @@ -2338,8 +2128,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, */ *dereg_level = TAVOR_MR_DEREG_NO_HW2SW_MPT_OR_UNBIND; - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed mem bind"); goto mrrereghelp_fail; } if (reuse_dmahdl) { @@ -2367,8 +2155,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, tavor_mr_mem_unbind(state, bind); *dereg_level = TAVOR_MR_DEREG_NO_HW2SW_MPT_OR_UNBIND; - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed MTT"); goto mrrereghelp_fail; } @@ -2405,9 +2191,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, *dereg_level = TAVOR_MR_DEREG_NO_HW2SW_MPT_OR_UNBIND; - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, - "failed reference count"); goto mrrereghelp_fail; } swrc_new = (tavor_sw_refcnt_t *)mtt_refcnt->tr_addr; @@ -2444,8 +2227,6 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, tavor_rsrc_free(state, &mtt); *dereg_level = TAVOR_MR_DEREG_NO_HW2SW_MPT_OR_UNBIND; - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed write mtt"); goto mrrereghelp_fail; } @@ -2480,13 +2261,9 @@ tavor_mr_rereg_xlat_helper(tavor_state_t *state, tavor_mrhdl_t mr, *mtt_addr = mtt_ddrbaseaddr + (mtt->tr_indx << TAVOR_MTT_SIZE_SHIFT); - TAVOR_TNF_EXIT(tavor_mr_rereg_xlat_helper); return (DDI_SUCCESS); mrrereghelp_fail: - TNF_PROBE_1(tavor_mr_rereg_xlat_helper_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_mr_rereg_xlat_helper); return (status); } @@ -2535,8 +2312,6 @@ tavor_mr_mem_bind(tavor_state_t *state, tavor_bind_info_t *bind, bind->bi_type == TAVOR_BINDHDL_BUF || bind->bi_type == TAVOR_BINDHDL_UBUF); - TAVOR_TNF_ENTER(tavor_mr_mem_bind); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*bind)) /* Set the callback flag appropriately */ @@ -2576,9 +2351,6 @@ tavor_mr_mem_bind(tavor_state_t *state, tavor_bind_info_t *bind, status = ddi_dma_alloc_handle(state->ts_dip, &dma_attr, callback, NULL, &bind->bi_dmahdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_mr_mem_bind_dmahdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mr_mem_bind); return (status); } bind->bi_free_dmahdl = 1; @@ -2609,13 +2381,9 @@ tavor_mr_mem_bind(tavor_state_t *state, tavor_bind_info_t *bind, if (bind->bi_free_dmahdl != 0) { ddi_dma_free_handle(&bind->bi_dmahdl); } - TNF_PROBE_0(tavor_mr_mem_bind_dmabind_fail, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_mr_mem_bind); return (status); } - TAVOR_TNF_EXIT(tavor_mr_mem_bind); return (DDI_SUCCESS); } @@ -2629,8 +2397,6 @@ tavor_mr_mem_unbind(tavor_state_t *state, tavor_bind_info_t *bind) { int status; - TAVOR_TNF_ENTER(tavor_mr_mem_unbind); - /* * In case of TAVOR_BINDHDL_UBUF, the memory bi_buf points to * is actually allocated by ddi_umem_iosetup() internally, then @@ -2656,9 +2422,6 @@ tavor_mr_mem_unbind(tavor_state_t *state, tavor_bind_info_t *bind) status = ddi_dma_unbind_handle(bind->bi_dmahdl); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to unbind DMA mapping"); - TNF_PROBE_0(tavor_mr_mem_unbind_dmaunbind_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_mr_mem_unbind); return; } @@ -2666,8 +2429,6 @@ tavor_mr_mem_unbind(tavor_state_t *state, tavor_bind_info_t *bind) if (bind->bi_free_dmahdl != 0) { ddi_dma_free_handle(&bind->bi_dmahdl); } - - TAVOR_TNF_EXIT(tavor_mr_mem_unbind); } @@ -2687,8 +2448,6 @@ tavor_mr_fast_mtt_write(tavor_rsrc_t *mtt, tavor_bind_info_t *bind, uint64_t pagesize; int i; - TAVOR_TNF_ENTER(tavor_mr_fast_mtt_write); - /* Calculate page size from the suggested value passed in */ pagesize = ((uint64_t)1 << mtt_pgsize_bits); @@ -2735,7 +2494,6 @@ tavor_mr_fast_mtt_write(tavor_rsrc_t *mtt, tavor_bind_info_t *bind, } } - TAVOR_TNF_EXIT(tavor_mr_fast_mtt_write); return (DDI_SUCCESS); } @@ -2753,8 +2511,6 @@ tavor_mtt_refcnt_inc(tavor_rsrc_t *rsrc) /* Increment the MTT's reference count */ mutex_enter(&rc->swrc_lock); - TNF_PROBE_1_DEBUG(tavor_mtt_refcnt_inc, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, rc->swrc_refcnt); cnt = rc->swrc_refcnt++; mutex_exit(&rc->swrc_lock); @@ -2777,8 +2533,6 @@ tavor_mtt_refcnt_dec(tavor_rsrc_t *rsrc) /* Decrement the MTT's reference count */ mutex_enter(&rc->swrc_lock); cnt = --rc->swrc_refcnt; - TNF_PROBE_1_DEBUG(tavor_mtt_refcnt_dec, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, rc->swrc_refcnt); mutex_exit(&rc->swrc_lock); return (cnt); diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_qp.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_qp.c index 7cf907a846..f80e0082b8 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_qp.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_qp.c @@ -86,9 +86,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, uint_t wq_location, dma_xfer_mode, qp_is_umap; uint_t qp_srq_en; int status, flag; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_qp_alloc); _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p, *queuesz_p)) @@ -126,8 +123,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, status = tavor_umap_db_find(state->ts_instance, ddi_get_pid(), MLNX_UMAP_UARPG_RSRC, &value, 0, NULL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "failed UAR page"); goto qpalloc_fail; } uarpg = ((tavor_rsrc_t *)(uintptr_t)value)->tr_indx; @@ -142,9 +137,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, * Check for valid SRQ handle pointers */ if (attr_p->qp_ibc_srq_hdl == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_SRQ_HDL_INVALID, - "invalid SRQ handle"); goto qpalloc_fail; } srq = (tavor_srqhdl_t)attr_p->qp_ibc_srq_hdl; @@ -155,8 +147,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ if (((type != IBT_UD_RQP) && (type != IBT_RC_RQP) && (type != IBT_UC_RQP))) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_SRV_TYPE_INVALID, "invalid serv type"); goto qpalloc_fail; } @@ -165,8 +155,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, * limitation. Arbel native mode will not have this shortcoming. */ if (qp_srq_en && type != IBT_RC_RQP) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "invalid serv type with SRQ"); goto qpalloc_fail; } @@ -174,8 +162,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, * Check for valid PD handle pointer */ if (attr_p->qp_pd_hdl == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_PD_HDL_INVALID, "invalid PD handle"); goto qpalloc_fail; } pd = (tavor_pdhdl_t)attr_p->qp_pd_hdl; @@ -184,8 +170,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, * If on an SRQ, check to make sure the PD is the same */ if (qp_srq_en && (pd->pd_pdnum != srq->srq_pdhdl->pd_pdnum)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_PD_HDL_INVALID, "invalid PD handle"); goto qpalloc_fail; } @@ -197,8 +181,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ if ((attr_p->qp_ibc_scq_hdl == NULL) || (attr_p->qp_ibc_rcq_hdl == NULL)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_CQ_HDL_INVALID, "invalid CQ handle"); goto qpalloc_fail1; } sq_cq = (tavor_cqhdl_t)attr_p->qp_ibc_scq_hdl; @@ -211,14 +193,10 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ status = tavor_cq_refcnt_inc(sq_cq, TAVOR_CQ_IS_NORMAL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_CQ_HDL_INVALID, "invalid CQ handle"); goto qpalloc_fail1; } status = tavor_cq_refcnt_inc(rq_cq, TAVOR_CQ_IS_NORMAL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_CQ_HDL_INVALID, "invalid CQ handle"); goto qpalloc_fail2; } @@ -233,8 +211,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ status = tavor_rsrc_alloc(state, TAVOR_QPC, 1, sleepflag, &qpc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed QP context"); goto qpalloc_fail3; } @@ -245,8 +221,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ status = tavor_rsrc_alloc(state, TAVOR_QPHDL, 1, sleepflag, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed QP handle"); goto qpalloc_fail4; } qp = (tavor_qphdl_t)rsrc->tr_addr; @@ -259,8 +233,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ status = tavor_qp_create_qpn(state, qp, qpc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed QPN create"); goto qpalloc_fail5; } @@ -275,8 +247,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, umapdb = tavor_umap_db_alloc(state->ts_instance, qp->qp_qpnum, MLNX_UMAP_QPMEM_RSRC, (uint64_t)(uintptr_t)rsrc); if (umapdb == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed umap add"); goto qpalloc_fail6; } } @@ -297,8 +267,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, status = tavor_rsrc_alloc(state, TAVOR_RDB, max_rdb, sleepflag, &rdb); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed RDB"); goto qpalloc_fail7; } qp->qp_rdbrsrcp = rdb; @@ -333,8 +301,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, if ((log_qp_sq_size > state->ts_cfg_profile->cp_log_max_qp_sz) || (!qp_srq_en && (log_qp_rq_size > state->ts_cfg_profile->cp_log_max_qp_sz))) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_WR_EXCEEDED, "max QP size"); goto qpalloc_fail8; } @@ -346,8 +312,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, max_sgl = state->ts_cfg_profile->cp_wqe_real_max_sgl; if ((attr_p->qp_sizes.cs_sq_sgl > max_sgl) || (!qp_srq_en && (attr_p->qp_sizes.cs_rq_sgl > max_sgl))) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_SGL_EXCEEDED, "max QP SGL"); goto qpalloc_fail8; } @@ -419,8 +383,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, } status = tavor_queue_alloc(state, &qp->qp_wqinfo, sleepflag); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed work queue"); goto qpalloc_fail8; } if (sq_wqe_size > rq_wqe_size) { @@ -479,8 +441,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, mr_op.mro_bind_override_addr = 1; status = tavor_mr_register(state, pd, &mr_attr, &mr, &mr_op); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed register mr"); goto qpalloc_fail9; } @@ -595,7 +555,6 @@ tavor_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, *qphdl = qp; - TAVOR_TNF_EXIT(tavor_qp_alloc); return (DDI_SUCCESS); /* @@ -631,9 +590,6 @@ qpalloc_fail2: qpalloc_fail1: tavor_pd_refcnt_dec(pd); qpalloc_fail: - TNF_PROBE_1(tavor_qp_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_qp_alloc); return (status); } @@ -667,9 +623,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, uint32_t sq_wqe_size, rq_wqe_size; uint_t wq_location, dma_xfer_mode; int status, flag; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_special_qp_alloc); /* * Check the "options" flag. Currently this flag tells the driver @@ -696,8 +649,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, * Check for valid special QP type (only SMI & GSI supported) */ if ((type != IBT_SMI_SQP) && (type != IBT_GSI_SQP)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_SPECIAL_TYPE_INVALID, "invalid QP type"); goto spec_qpalloc_fail; } @@ -705,8 +656,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, * Check for valid port number */ if (!tavor_portnum_is_valid(state, port)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_PORT_INVALID, "invalid port num"); goto spec_qpalloc_fail; } port = port - 1; @@ -715,8 +664,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, * Check for valid PD handle pointer */ if (attr_p->qp_pd_hdl == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_PD_HDL_INVALID, "invalid PD handle"); goto spec_qpalloc_fail; } pd = (tavor_pdhdl_t)attr_p->qp_pd_hdl; @@ -729,8 +676,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ if ((attr_p->qp_ibc_scq_hdl == NULL) || (attr_p->qp_ibc_rcq_hdl == NULL)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_CQ_HDL_INVALID, "invalid CQ handle"); goto spec_qpalloc_fail1; } sq_cq = (tavor_cqhdl_t)attr_p->qp_ibc_scq_hdl; @@ -743,14 +688,10 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ status = tavor_cq_refcnt_inc(sq_cq, TAVOR_CQ_IS_SPECIAL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_CQ_HDL_INVALID, "invalid CQ handle"); goto spec_qpalloc_fail1; } status = tavor_cq_refcnt_inc(rq_cq, TAVOR_CQ_IS_SPECIAL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_CQ_HDL_INVALID, "invalid CQ handle"); goto spec_qpalloc_fail2; } @@ -768,8 +709,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ status = tavor_special_qp_rsrc_alloc(state, type, port, &qpc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed special QP rsrc"); goto spec_qpalloc_fail3; } @@ -780,8 +719,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ status = tavor_rsrc_alloc(state, TAVOR_QPHDL, 1, sleepflag, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed QP handle"); goto spec_qpalloc_fail4; } qp = (tavor_qphdl_t)rsrc->tr_addr; @@ -818,8 +755,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, */ if ((log_qp_sq_size > state->ts_cfg_profile->cp_log_max_qp_sz) || (log_qp_rq_size > state->ts_cfg_profile->cp_log_max_qp_sz)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_WR_EXCEEDED, "max QP size"); goto spec_qpalloc_fail5; } @@ -831,8 +766,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, max_sgl = state->ts_cfg_profile->cp_wqe_real_max_sgl; if ((attr_p->qp_sizes.cs_sq_sgl > max_sgl) || (attr_p->qp_sizes.cs_rq_sgl > max_sgl)) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_SGL_EXCEEDED, "max QP SGL"); goto spec_qpalloc_fail5; } @@ -889,8 +822,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, qp->qp_wqinfo.qa_location = wq_location; status = tavor_queue_alloc(state, &qp->qp_wqinfo, sleepflag); if (status != 0) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed work queue"); goto spec_qpalloc_fail5; } if (sq_wqe_size > rq_wqe_size) { @@ -936,8 +867,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, mr_op.mro_bind_override_addr = 1; status = tavor_mr_register(state, pd, &mr_attr, &mr, &mr_op); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed register mr"); goto spec_qpalloc_fail6; } @@ -1010,7 +939,6 @@ tavor_special_qp_alloc(tavor_state_t *state, tavor_qp_info_t *qpinfo, *qphdl = qp; - TAVOR_TNF_EXIT(tavor_special_qp_alloc); return (DDI_SUCCESS); /* @@ -1031,9 +959,6 @@ spec_qpalloc_fail2: spec_qpalloc_fail1: tavor_pd_refcnt_dec(pd); spec_qpalloc_fail: - TNF_PROBE_1(tavor_special_qp_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_special_qp_alloc); return (status); } @@ -1065,9 +990,6 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, uint_t maxprot; uint_t qp_srq_en; int status; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_qp_free); /* * Pull all the necessary information from the Tavor Queue Pair @@ -1092,7 +1014,6 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, */ if (qp->qp_mcg_refcnt != 0) { mutex_exit(&qp->qp_lock); - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), "QP part of MCG on free"); goto qpfree_fail; } @@ -1108,9 +1029,6 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, if (tavor_qp_to_reset(state, qp) != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); TAVOR_WARNING(state, "failed to reset QP context"); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "reset QP context"); goto qpfree_fail; } qp->qp_state = TAVOR_QP_RESET; @@ -1137,7 +1055,6 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); TAVOR_WARNING(state, "failed to find in database"); - TAVOR_TNF_EXIT(tavor_qp_free); return (ibc_get_ci_failure(0)); } tavor_umap_db_free(umapdb); @@ -1150,7 +1067,6 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, mutex_exit(&qp->qp_lock); TAVOR_WARNING(state, "failed in QP memory " "devmap_devmem_remap()"); - TAVOR_TNF_EXIT(tavor_qp_free); return (ibc_get_ci_failure(0)); } qp->qp_umap_dhp = (devmap_cookie_t)NULL; @@ -1194,8 +1110,6 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, sleepflag); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to deregister QP memory"); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), "failed deregister mr"); goto qpfree_fail; } @@ -1218,9 +1132,6 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, status = tavor_special_qp_rsrc_free(state, type, port); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to free special QP rsrc"); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "failed special QP rsrc"); goto qpfree_fail; } @@ -1261,13 +1172,9 @@ tavor_qp_free(tavor_state_t *state, tavor_qphdl_t *qphdl, /* Set the qphdl pointer to NULL and return success */ *qphdl = NULL; - TAVOR_TNF_EXIT(tavor_qp_free); return (DDI_SUCCESS); qpfree_fail: - TNF_PROBE_1(tavor_qp_free_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_qp_free); return (status); } @@ -1290,8 +1197,6 @@ tavor_qp_query(tavor_state_t *state, tavor_qphdl_t qp, tavor_hw_qpc_t *qpc; int status; - TAVOR_TNF_ENTER(tavor_qp_query); - mutex_enter(&qp->qp_lock); /* @@ -1328,9 +1233,6 @@ tavor_qp_query(tavor_state_t *state, tavor_qphdl_t qp, break; default: mutex_exit(&qp->qp_lock); - TNF_PROBE_1(tavor_qp_query_inv_qpstate_fail, - TAVOR_TNF_ERROR, "", tnf_uint, qpstate, qp->qp_state); - TAVOR_TNF_EXIT(tavor_qp_query); return (ibc_get_ci_failure(0)); } attr_p->qp_info.qp_state = qp_state; @@ -1361,7 +1263,6 @@ tavor_qp_query(tavor_state_t *state, tavor_qphdl_t qp, */ if (qp_state == IBT_STATE_RESET) { mutex_exit(&qp->qp_lock); - TAVOR_TNF_EXIT(tavor_qp_query); return (DDI_SUCCESS); } @@ -1379,9 +1280,6 @@ tavor_qp_query(tavor_state_t *state, tavor_qphdl_t qp, mutex_exit(&qp->qp_lock); cmn_err(CE_CONT, "Tavor: QUERY_QP command failed: %08x\n", status); - TNF_PROBE_1(tavor_qp_query_cmd_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_query); return (ibc_get_ci_failure(0)); } @@ -1524,7 +1422,6 @@ tavor_qp_query(tavor_state_t *state, tavor_qphdl_t qp, } mutex_exit(&qp->qp_lock); - TAVOR_TNF_EXIT(tavor_qp_query); return (DDI_SUCCESS); } @@ -1540,8 +1437,6 @@ tavor_qp_create_qpn(tavor_state_t *state, tavor_qphdl_t qp, tavor_rsrc_t *qpc) tavor_qpn_entry_t *entry; avl_index_t where; - TAVOR_TNF_ENTER(tavor_qp_create_qpn); - /* * Build a query (for the AVL tree lookup) and attempt to find * a previously added entry that has a matching QPC index. If @@ -1563,7 +1458,6 @@ tavor_qp_create_qpn(tavor_state_t *state, tavor_qphdl_t qp, tavor_rsrc_t *qpc) sizeof (tavor_qpn_entry_t), KM_NOSLEEP); if (entry == NULL) { mutex_exit(&state->ts_qpn_avl_lock); - TAVOR_TNF_EXIT(tavor_qp_create_qpn); return (DDI_FAILURE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*entry)) @@ -1599,7 +1493,6 @@ tavor_qp_create_qpn(tavor_state_t *state, tavor_qphdl_t qp, tavor_rsrc_t *qpc) entry->qpn_refcnt++; mutex_exit(&state->ts_qpn_avl_lock); - TAVOR_TNF_EXIT(tavor_qp_create_qpn); return (DDI_SUCCESS); } @@ -1611,8 +1504,6 @@ tavor_qp_create_qpn(tavor_state_t *state, tavor_qphdl_t qp, tavor_rsrc_t *qpc) void tavor_qp_release_qpn(tavor_state_t *state, tavor_qpn_entry_t *entry, int flags) { - TAVOR_TNF_ENTER(tavor_qp_release_qpn); - ASSERT(entry != NULL); mutex_enter(&state->ts_qpn_avl_lock); @@ -1676,8 +1567,6 @@ tavor_qp_release_qpn(tavor_state_t *state, tavor_qpn_entry_t *entry, int flags) } } mutex_exit(&state->ts_qpn_avl_lock); - - TAVOR_TNF_EXIT(tavor_qp_release_qpn); } @@ -1690,19 +1579,14 @@ tavor_qpn_avl_compare(const void *q, const void *e) { tavor_qpn_entry_t *entry, *query; - TAVOR_TNF_ENTER(tavor_qpn_avl_compare); - entry = (tavor_qpn_entry_t *)e; query = (tavor_qpn_entry_t *)q; if (query->qpn_indx < entry->qpn_indx) { - TAVOR_TNF_EXIT(tavor_qpn_avl_compare); return (-1); } else if (query->qpn_indx > entry->qpn_indx) { - TAVOR_TNF_EXIT(tavor_qpn_avl_compare); return (+1); } else { - TAVOR_TNF_EXIT(tavor_qpn_avl_compare); return (0); } } @@ -1715,8 +1599,6 @@ tavor_qpn_avl_compare(const void *q, const void *e) void tavor_qpn_avl_init(tavor_state_t *state) { - TAVOR_TNF_ENTER(tavor_qpn_avl_init); - /* Initialize the lock used for QP number (QPN) AVL tree access */ mutex_init(&state->ts_qpn_avl_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); @@ -1725,8 +1607,6 @@ tavor_qpn_avl_init(tavor_state_t *state) avl_create(&state->ts_qpn_avl, tavor_qpn_avl_compare, sizeof (tavor_qpn_entry_t), offsetof(tavor_qpn_entry_t, qpn_avlnode)); - - TAVOR_TNF_EXIT(tavor_qpn_avl_init); } @@ -1740,8 +1620,6 @@ tavor_qpn_avl_fini(tavor_state_t *state) tavor_qpn_entry_t *entry; void *cookie; - TAVOR_TNF_ENTER(tavor_qpn_avl_fini); - /* * Empty all entries (if necessary) and destroy the AVL tree * that was used for QP number (QPN) tracking. @@ -1755,8 +1633,6 @@ tavor_qpn_avl_fini(tavor_state_t *state) /* Destroy the lock used for QP number (QPN) AVL tree access */ mutex_destroy(&state->ts_qpn_avl_lock); - - TAVOR_TNF_EXIT(tavor_qpn_avl_fini); } @@ -1802,8 +1678,6 @@ tavor_special_qp_rsrc_alloc(tavor_state_t *state, ibt_sqp_type_t type, uint_t mask, flags; int status; - TAVOR_TNF_ENTER(tavor_special_qp_rsrc_alloc); - mutex_enter(&state->ts_spec_qplock); flags = state->ts_spec_qpflags; if (type == IBT_SMI_SQP) { @@ -1818,9 +1692,6 @@ tavor_special_qp_rsrc_alloc(tavor_state_t *state, ibt_sqp_type_t type, */ if (state->ts_cfg_profile->cp_qp0_agents_in_fw != 0) { mutex_exit(&state->ts_spec_qplock); - TNF_PROBE_0(tavor_special_qp0_alloc_already_in_fw, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_alloc); return (IBT_QP_IN_USE); } @@ -1836,10 +1707,6 @@ tavor_special_qp_rsrc_alloc(tavor_state_t *state, ibt_sqp_type_t type, mutex_exit(&state->ts_spec_qplock); cmn_err(CE_CONT, "Tavor: CONF_SPECIAL_QP " "command failed: %08x\n", status); - TNF_PROBE_1(tavor_conf_special_qp_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, - status); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_alloc); return (IBT_INSUFF_RESOURCE); } } @@ -1851,9 +1718,6 @@ tavor_special_qp_rsrc_alloc(tavor_state_t *state, ibt_sqp_type_t type, mask = (1 << (TAVOR_SPECIAL_QP0_RSRC + port)); if (flags & mask) { mutex_exit(&state->ts_spec_qplock); - TNF_PROBE_1(tavor_ts_spec_qp0_alloc_already, - TAVOR_TNF_ERROR, "", tnf_uint, port, port); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_alloc); return (IBT_QP_IN_USE); } state->ts_spec_qpflags |= mask; @@ -1872,10 +1736,6 @@ tavor_special_qp_rsrc_alloc(tavor_state_t *state, ibt_sqp_type_t type, mutex_exit(&state->ts_spec_qplock); cmn_err(CE_CONT, "Tavor: CONF_SPECIAL_QP " "command failed: %08x\n", status); - TNF_PROBE_1(tavor_conf_special_qp_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, - status); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_alloc); return (IBT_INSUFF_RESOURCE); } } @@ -1887,9 +1747,6 @@ tavor_special_qp_rsrc_alloc(tavor_state_t *state, ibt_sqp_type_t type, mask = (1 << (TAVOR_SPECIAL_QP1_RSRC + port)); if (flags & mask) { mutex_exit(&state->ts_spec_qplock); - TNF_PROBE_0(tavor_ts_spec_qp1_alloc_already, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_alloc); return (IBT_QP_IN_USE); } state->ts_spec_qpflags |= mask; @@ -1897,7 +1754,6 @@ tavor_special_qp_rsrc_alloc(tavor_state_t *state, ibt_sqp_type_t type, } mutex_exit(&state->ts_spec_qplock); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_alloc); return (DDI_SUCCESS); } @@ -1913,8 +1769,6 @@ tavor_special_qp_rsrc_free(tavor_state_t *state, ibt_sqp_type_t type, uint_t mask, flags; int status; - TAVOR_TNF_ENTER(tavor_special_qp_rsrc_free); - mutex_enter(&state->ts_spec_qplock); if (type == IBT_SMI_SQP) { mask = (1 << (TAVOR_SPECIAL_QP0_RSRC + port)); @@ -1932,10 +1786,6 @@ tavor_special_qp_rsrc_free(tavor_state_t *state, ibt_sqp_type_t type, mutex_exit(&state->ts_spec_qplock); cmn_err(CE_CONT, "Tavor: CONF_SPECIAL_QP " "command failed: %08x\n", status); - TNF_PROBE_1(tavor_conf_special_qp_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, - status); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_free); return (ibc_get_ci_failure(0)); } } @@ -1955,17 +1805,12 @@ tavor_special_qp_rsrc_free(tavor_state_t *state, ibt_sqp_type_t type, mutex_exit(&state->ts_spec_qplock); cmn_err(CE_CONT, "Tavor: CONF_SPECIAL_QP " "command failed: %08x\n", status); - TNF_PROBE_1(tavor_conf_special_qp_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, - status); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_free); return (ibc_get_ci_failure(0)); } } } mutex_exit(&state->ts_spec_qplock); - TAVOR_TNF_EXIT(tavor_special_qp_rsrc_free); return (DDI_SUCCESS); } @@ -1980,8 +1825,6 @@ tavor_qp_sgl_to_logwqesz(tavor_state_t *state, uint_t num_sgl, { uint_t max_size, log2, actual_sgl; - TAVOR_TNF_ENTER(tavor_qp_sgl_to_logwqesz); - switch (wq_type) { case TAVOR_QP_WQ_TYPE_SENDQ: /* @@ -2063,14 +1906,10 @@ tavor_qp_sgl_to_logwqesz(tavor_state_t *state, uint_t num_sgl, default: TAVOR_WARNING(state, "unexpected work queue type"); - TNF_PROBE_0(tavor_qp_sgl_to_logwqesz_inv_wqtype_fail, - TAVOR_TNF_ERROR, ""); break; } /* Fill in the return values */ *logwqesz = log2; *max_sgl = min(state->ts_cfg_profile->cp_wqe_real_max_sgl, actual_sgl); - - TAVOR_TNF_EXIT(tavor_qp_sgl_to_logwqesz); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_qpmod.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_qpmod.c index 3553f70d01..8e99020ebb 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_qpmod.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_qpmod.c @@ -86,9 +86,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, ibt_cep_state_t cur_state, mod_state; ibt_cep_modify_flags_t okflags; int status; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_qp_modify); /* * Lock the QP so that we can modify it atomically. After grabbing @@ -119,10 +116,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (!(TAVOR_QP_TYPE_VALID(info_p->qp_trans, qp->qp_serv_type))) { mutex_exit(&qp->qp_lock); - TNF_PROBE_1(tavor_qp_modify_inv_qp_trans_fail, - TAVOR_TNF_ERROR, "", tnf_uint, qptrans, - info_p->qp_trans); - TAVOR_TNF_EXIT(tavor_qp_modify); return (IBT_QP_SRV_TYPE_INVALID); } @@ -158,10 +151,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, break; default: mutex_exit(&qp->qp_lock); - TNF_PROBE_1(tavor_qp_modify_inv_currqpstate_fail, - TAVOR_TNF_ERROR, "", tnf_uint, qpstate, - info_p->qp_current_state); - TAVOR_TNF_EXIT(tavor_qp_modify); return (IBT_QP_STATE_INVALID); } } else { @@ -181,8 +170,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (flags & ~okflags) { mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_ATTR_RO, "reset: invalid flag"); goto qpmod_fail; } @@ -195,9 +182,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, (mod_state != IBT_STATE_INIT)) { /* Invalid transition - ambiguous flags */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "reset: ambiguous flags"); goto qpmod_fail; } else if ((flags & IBT_CEP_SET_RESET_INIT) || @@ -209,8 +193,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_reset2init(state, qp, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "reset to init"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_INIT; @@ -229,9 +211,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, * _out_ of the "Reset" state. */ mutex_exit(&qp->qp_lock); - TNF_PROBE_0_DEBUG(tavor_qp_modify_rst2rst, - TAVOR_TNF_TRACE, ""); - TAVOR_TNF_EXIT(tavor_qp_modify); return (DDI_SUCCESS); } else if ((flags & IBT_CEP_SET_STATE) && @@ -242,8 +221,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_reset2err(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "reset to error"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_ERR; @@ -251,9 +228,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, } else { /* Invalid transition - return error */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "reset: invalid transition"); goto qpmod_fail; } @@ -274,8 +248,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, qp->qp_state = TAVOR_QP_RESET; mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "reset: wrid_from_reset hdl"); goto qpmod_fail; } break; @@ -294,8 +266,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (flags & ~okflags) { mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_ATTR_RO, "init: invalid flag"); goto qpmod_fail; } @@ -308,9 +278,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, (mod_state != IBT_STATE_RTR)) { /* Invalid transition - ambiguous flags */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "init: ambiguous flags"); goto qpmod_fail; } else if ((flags & IBT_CEP_SET_INIT_RTR) || @@ -322,8 +289,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_init2rtr(state, qp, flags, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "init to rtr"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RTR; @@ -336,8 +301,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_init2init(state, qp, flags, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "init to init"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_INIT; @@ -350,8 +313,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_reset(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "init to reset"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RESET; @@ -371,8 +332,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_error(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "init to error"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_ERR; @@ -380,9 +339,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, } else { /* Invalid transition - return error */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "init: invalid transition"); goto qpmod_fail; } break; @@ -402,8 +358,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (flags & ~okflags) { mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_ATTR_RO, "rtr: invalid flag"); goto qpmod_fail; } @@ -416,9 +370,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, (mod_state != IBT_STATE_RTS)) { /* Invalid transition - ambiguous flags */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "reset: ambiguous flags"); goto qpmod_fail; } else if ((flags & IBT_CEP_SET_RTR_RTS) || @@ -430,8 +381,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_rtr2rts(state, qp, flags, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "rtr to rts"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RTS; @@ -444,8 +393,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_reset(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "rtr to reset"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RESET; @@ -465,8 +412,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_error(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "rtr to error"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_ERR; @@ -474,9 +419,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, } else { /* Invalid transition - return error */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "rtr: invalid transition"); goto qpmod_fail; } break; @@ -494,8 +436,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (flags & ~okflags) { mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_ATTR_RO, "rts: invalid flag"); goto qpmod_fail; } @@ -511,8 +451,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_rts2rts(state, qp, flags, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "rts to rts"); goto qpmod_fail; } /* qp->qp_state = TAVOR_QP_RTS; */ @@ -525,8 +463,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_rts2sqd(state, qp, flags); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "rts to sqd"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_SQD; @@ -539,8 +475,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_reset(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "rts to reset"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RESET; @@ -560,8 +494,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_error(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "rts to error"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_ERR; @@ -569,9 +501,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, } else { /* Invalid transition - return error */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "rts: invalid transition"); goto qpmod_fail; } break; @@ -587,8 +516,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (flags & ~okflags) { mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_ATTR_RO, "sqerr: invalid flag"); goto qpmod_fail; } @@ -604,8 +531,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_sqerr2rts(state, qp, flags, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "sqerr to rts"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RTS; @@ -618,8 +543,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_reset(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "sqerr to reset"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RESET; @@ -639,8 +562,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_error(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "sqerr to error"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_ERR; @@ -648,9 +569,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, } else { /* Invalid transition - return error */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "sqerr: invalid transition"); goto qpmod_fail; } break; @@ -671,8 +589,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (flags & ~okflags) { mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_ATTR_RO, "sqd: invalid flag"); goto qpmod_fail; } @@ -689,8 +605,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_sqd2sqd(state, qp, flags, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "sqd to sqd"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_SQD; @@ -703,9 +617,7 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ if (qp->qp_sqd_still_draining) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ status = IBT_QP_STATE_INVALID; - TAVOR_TNF_FAIL(status, "sqd to rts; draining"); goto qpmod_fail; } @@ -715,8 +627,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_sqd2rts(state, qp, flags, info_p); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "sqd to rts"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RTS; @@ -729,8 +639,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_reset(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "sqd to reset"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RESET; @@ -750,8 +658,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_error(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "sqd to error"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_ERR; @@ -759,9 +665,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, } else { /* Invalid transition - return error */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "sqd: invalid transition"); goto qpmod_fail; } break; @@ -779,8 +682,6 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_qp_to_reset(state, qp); if (status != DDI_SUCCESS) { mutex_exit(&qp->qp_lock); - /* Set "status"/"errormsg", goto failure */ - TAVOR_TNF_FAIL(status, "error to reset"); goto qpmod_fail; } qp->qp_state = TAVOR_QP_RESET; @@ -802,17 +703,11 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, * */ mutex_exit(&qp->qp_lock); - TNF_PROBE_0_DEBUG(tavor_qp_modify_err2err, - TAVOR_TNF_TRACE, ""); - TAVOR_TNF_EXIT(tavor_qp_modify); return (DDI_SUCCESS); } else { /* Invalid transition - return error */ mutex_exit(&qp->qp_lock); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, - "error: invalid transition"); goto qpmod_fail; } break; @@ -825,19 +720,13 @@ tavor_qp_modify(tavor_state_t *state, tavor_qphdl_t qp, */ mutex_exit(&qp->qp_lock); TAVOR_WARNING(state, "unknown QP state in modify"); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_QP_STATE_INVALID, "invalid curr QP state"); goto qpmod_fail; } mutex_exit(&qp->qp_lock); - TAVOR_TNF_EXIT(tavor_qp_modify); return (DDI_SUCCESS); qpmod_fail: - TNF_PROBE_1(tavor_qp_modify_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_qp_modify); return (status); } @@ -857,8 +746,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, uint_t portnum, pkeyindx; int status; - TAVOR_TNF_ENTER(tavor_qp_reset2init); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -911,9 +798,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->pri_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_reset2init_inv_port_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, portnum); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (IBT_HCA_PORT_INVALID); } @@ -923,9 +807,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, qpc->pri_addr_path.pkey_indx = pkeyindx; qp->qp_pkeyindx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_reset2init_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (IBT_PKEY_IX_ILLEGAL); } @@ -942,9 +823,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->pri_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_reset2init_inv_port_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, portnum); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (IBT_HCA_PORT_INVALID); } @@ -953,9 +831,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->pri_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_reset2init_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (IBT_PKEY_IX_ILLEGAL); } @@ -973,9 +848,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->pri_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_reset2init_inv_port_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, portnum); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (IBT_HCA_PORT_INVALID); } @@ -984,9 +856,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->pri_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_reset2init_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (IBT_PKEY_IX_ILLEGAL); } } else { @@ -996,9 +865,6 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in rst2init"); - TNF_PROBE_0(tavor_qp_reset2init_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (ibc_get_ci_failure(0)); } @@ -1015,13 +881,9 @@ tavor_qp_reset2init(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: RST2INIT_QP command failed: %08x\n", status); - TNF_PROBE_1(tavor_qp_reset2init_cmd_fail, TAVOR_TNF_ERROR, "", - tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (ibc_get_ci_failure(0)); } - TAVOR_TNF_EXIT(tavor_qp_reset2init); return (DDI_SUCCESS); } @@ -1042,8 +904,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, uint32_t opmask = 0; int status; - TAVOR_TNF_ENTER(tavor_qp_init2init); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -1069,10 +929,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->pri_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_init2init_inv_port_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, - portnum); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (IBT_HCA_PORT_INVALID); } opmask |= TAVOR_CMD_OP_PRIM_PORT; @@ -1090,10 +946,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, opmask |= TAVOR_CMD_OP_PKEYINDX; qp->qp_pkeyindx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_init2init_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (IBT_PKEY_IX_ILLEGAL); } } @@ -1121,10 +973,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->pri_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_init2init_inv_port_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, - portnum); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (IBT_HCA_PORT_INVALID); } opmask |= TAVOR_CMD_OP_PRIM_PORT; @@ -1141,10 +989,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, qpc->pri_addr_path.pkey_indx = pkeyindx; opmask |= TAVOR_CMD_OP_PKEYINDX; } else { - TNF_PROBE_1(tavor_qp_init2init_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (IBT_PKEY_IX_ILLEGAL); } } @@ -1169,10 +1013,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->pri_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_init2init_inv_port_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, - portnum); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (IBT_HCA_PORT_INVALID); } opmask |= TAVOR_CMD_OP_PRIM_PORT; @@ -1189,10 +1029,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, qpc->pri_addr_path.pkey_indx = pkeyindx; opmask |= TAVOR_CMD_OP_PKEYINDX; } else { - TNF_PROBE_1(tavor_qp_init2init_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (IBT_PKEY_IX_ILLEGAL); } } @@ -1214,9 +1050,6 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in init2init"); - TNF_PROBE_0(tavor_qp_init2init_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (ibc_get_ci_failure(0)); } @@ -1234,19 +1067,12 @@ tavor_qp_init2init(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: INIT2INIT_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_init2init_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_init2init_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2init); return (IBT_QP_STATE_INVALID); } } - TAVOR_TNF_EXIT(tavor_qp_init2init); return (DDI_SUCCESS); } @@ -1265,13 +1091,11 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, ibt_qp_uc_attr_t *uc; tavor_hw_addr_path_t *qpc_path; ibt_adds_vect_t *adds_vect; - uint_t portnum, pkeyindx, rdma_ra_in, rra_max; + uint_t portnum, pkeyindx, rra_max; uint_t mtu; uint32_t opmask = 0; int status; - TAVOR_TNF_ENTER(tavor_qp_init2rtr); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -1322,10 +1146,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, opmask |= TAVOR_CMD_OP_PKEYINDX; qp->qp_pkeyindx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_init2rtr_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_PKEY_IX_ILLEGAL); } } @@ -1351,9 +1171,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_init2rtr_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (status); } @@ -1384,9 +1201,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, qpc->ric = (qp->qp_srq_en == TAVOR_QP_SRQ_ENABLED) ? 1 : 0; mtu = rc->rc_path_mtu; if (tavor_qp_validate_mtu(state, mtu) != DDI_SUCCESS) { - TNF_PROBE_1(tavor_qp_init2rtr_inv_mtu_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mtu, mtu); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_HCA_PORT_MTU_EXCEEDED); } qpc->mtu = mtu; @@ -1412,13 +1226,8 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, * "ra_buf_index" fields in the QPC to point to the * pre-allocated RDB resources (in DDR) */ - rdma_ra_in = rc->rc_rdma_ra_in; if (tavor_qp_validate_resp_rsrc(state, rc, &rra_max) != DDI_SUCCESS) { - TNF_PROBE_1(tavor_qp_init2rtr_inv_rdma_in_fail, - TAVOR_TNF_ERROR, "", tnf_uint, rdma_ra_in, - rdma_ra_in); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_INVALID_PARAM); } qpc->rra_max = rra_max; @@ -1435,10 +1244,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, qpc->pri_addr_path.pkey_indx = pkeyindx; opmask |= TAVOR_CMD_OP_PKEYINDX; } else { - TNF_PROBE_1(tavor_qp_init2rtr_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_PKEY_IX_ILLEGAL); } } @@ -1462,9 +1267,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_init2rtr_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (status); } qpc_path->ack_timeout = rc->rc_alt_path.cep_timeout; @@ -1484,10 +1286,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_init2rtr_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_HCA_PORT_INVALID); } @@ -1499,10 +1297,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_init2rtr_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_PKEY_IX_ILLEGAL); } opmask |= (TAVOR_CMD_OP_ALT_PATH | @@ -1520,9 +1314,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_init2rtr_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (status); } @@ -1537,9 +1328,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, qpc->msg_max = TAVOR_QP_LOG_MAX_MSGSZ; mtu = uc->uc_path_mtu; if (tavor_qp_validate_mtu(state, mtu) != DDI_SUCCESS) { - TNF_PROBE_1(tavor_qp_init2rtr_inv_mtu_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mtu, mtu); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_HCA_PORT_MTU_EXCEEDED); } qpc->mtu = mtu; @@ -1562,10 +1350,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, qpc->pri_addr_path.pkey_indx = pkeyindx; opmask |= TAVOR_CMD_OP_PKEYINDX; } else { - TNF_PROBE_1(tavor_qp_init2rtr_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_PKEY_IX_ILLEGAL); } } @@ -1593,9 +1377,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_init2rtr_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (status); } @@ -1607,10 +1388,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_init2rtr_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_HCA_PORT_INVALID); } @@ -1622,10 +1399,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_init2rtr_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -1637,9 +1410,6 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in init2rtr"); - TNF_PROBE_0(tavor_qp_init2rtr_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (ibc_get_ci_failure(0)); } @@ -1657,19 +1427,12 @@ tavor_qp_init2rtr(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: INIT2RTR_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_init2rtr_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_init2rtr_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (IBT_QP_STATE_INVALID); } } - TAVOR_TNF_EXIT(tavor_qp_init2rtr); return (DDI_SUCCESS); } @@ -1688,12 +1451,10 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, ibt_qp_uc_attr_t *uc; tavor_hw_addr_path_t *qpc_path; ibt_adds_vect_t *adds_vect; - uint_t portnum, pkeyindx, rdma_ra_out, sra_max; + uint_t portnum, pkeyindx, sra_max; uint32_t opmask = 0; int status; - TAVOR_TNF_ENTER(tavor_qp_rtr2rts); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -1747,13 +1508,8 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, * is valid. And if it is, then setup the "sra_max" * appropriately */ - rdma_ra_out = rc->rc_rdma_ra_out; if (tavor_qp_validate_init_depth(state, rc, &sra_max) != DDI_SUCCESS) { - TNF_PROBE_1(tavor_qp_rtr2rts_inv_rdma_out_fail, - TAVOR_TNF_ERROR, "", tnf_uint, rdma_ra_out, - rdma_ra_out); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_INVALID_PARAM); } qpc->sra_max = sra_max; @@ -1785,10 +1541,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, } else if (rc->rc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_rtr2rts_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - rc->rc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -1816,9 +1568,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_rtr2rts_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (status); } @@ -1839,10 +1588,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_rtr2rts_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_HCA_PORT_INVALID); } @@ -1854,10 +1599,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_rtr2rts_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_PKEY_IX_ILLEGAL); } opmask |= (TAVOR_CMD_OP_ALT_PATH | @@ -1898,10 +1639,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, } else if (uc->uc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_rtr2rts_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - uc->uc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -1919,9 +1656,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_rtr2rts_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (status); } @@ -1933,10 +1667,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_rtr2rts_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_HCA_PORT_INVALID); } @@ -1948,10 +1678,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_rtr2rts_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -1963,9 +1689,6 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in rtr2rts"); - TNF_PROBE_0(tavor_qp_rtr2rts_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (ibc_get_ci_failure(0)); } @@ -1983,19 +1706,12 @@ tavor_qp_rtr2rts(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: RTR2RTS_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_rtr2rts_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_rtr2rts_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (IBT_QP_STATE_INVALID); } } - TAVOR_TNF_EXIT(tavor_qp_rtr2rts); return (DDI_SUCCESS); } @@ -2018,8 +1734,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, uint32_t opmask = 0; int status; - TAVOR_TNF_ENTER(tavor_qp_rts2rts); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -2066,10 +1780,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, } else if (rc->rc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_rts2rts_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - rc->rc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -2097,9 +1807,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_rts2rts_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (status); } qpc_path->ack_timeout = rc->rc_alt_path.cep_timeout; @@ -2112,10 +1819,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_rts2rts_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (IBT_HCA_PORT_INVALID); } @@ -2127,10 +1830,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_rts2rts_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -2161,10 +1860,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, } else if (uc->uc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_rts2rts_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - uc->uc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -2182,9 +1877,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_rts2rts_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (status); } @@ -2196,10 +1888,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_rts2rts_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (IBT_HCA_PORT_INVALID); } @@ -2211,10 +1899,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_rts2rts_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -2226,9 +1910,6 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in rts2rts"); - TNF_PROBE_0(tavor_qp_rts2rts_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (ibc_get_ci_failure(0)); } @@ -2246,19 +1927,12 @@ tavor_qp_rts2rts(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: RTS2RTS_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_rts2rts_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_rts2rts_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (IBT_QP_STATE_INVALID); } } - TAVOR_TNF_EXIT(tavor_qp_rts2rts); return (DDI_SUCCESS); } @@ -2273,8 +1947,6 @@ tavor_qp_rts2sqd(tavor_state_t *state, tavor_qphdl_t qp, { int status; - TAVOR_TNF_ENTER(tavor_qp_rts2sqd); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -2300,14 +1972,8 @@ tavor_qp_rts2sqd(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: RTS2SQD_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_rts2sqd_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_rts2sqd); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_rts2sqd_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_rts2sqd); return (IBT_QP_STATE_INVALID); } } @@ -2319,7 +1985,6 @@ tavor_qp_rts2sqd(tavor_state_t *state, tavor_qphdl_t qp, */ qp->qp_sqd_still_draining = 1; - TAVOR_TNF_EXIT(tavor_qp_rts2sqd); return (DDI_SUCCESS); } @@ -2342,8 +2007,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, uint32_t opmask = 0; int status; - TAVOR_TNF_ENTER(tavor_qp_sqd2rts); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -2390,10 +2053,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, } else if (rc->rc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_sqd2rts_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - rc->rc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -2411,9 +2070,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_sqd2rts_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (status); } qpc_path->ack_timeout = rc->rc_alt_path.cep_timeout; @@ -2426,10 +2082,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_sqd2rts_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (IBT_HCA_PORT_INVALID); } @@ -2441,10 +2093,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_sqd2rts_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -2485,10 +2133,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, } else if (uc->uc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_sqd2rts_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - uc->uc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -2506,9 +2150,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_sqd2rts_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (status); } @@ -2520,10 +2161,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_sqd2rts_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (IBT_HCA_PORT_INVALID); } @@ -2535,10 +2172,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_sqd2rts_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -2550,9 +2183,6 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in sqd2rts"); - TNF_PROBE_0(tavor_qp_sqd2rts_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (ibc_get_ci_failure(0)); } @@ -2570,19 +2200,12 @@ tavor_qp_sqd2rts(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: SQD2RTS_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_sqd2rts_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_sqd2rts_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (IBT_QP_STATE_INVALID); } } - TAVOR_TNF_EXIT(tavor_qp_sqd2rts); return (DDI_SUCCESS); } @@ -2601,13 +2224,11 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, ibt_qp_uc_attr_t *uc; tavor_hw_addr_path_t *qpc_path; ibt_adds_vect_t *adds_vect; - uint_t portnum, pkeyindx, rdma_ra_out, rdma_ra_in; + uint_t portnum, pkeyindx; uint_t rra_max, sra_max; uint32_t opmask = 0; int status; - TAVOR_TNF_ENTER(tavor_qp_sqd2sqd); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -2635,10 +2256,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, opmask |= TAVOR_CMD_OP_PKEYINDX; qp->qp_pkeyindx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_PKEY_IX_ILLEGAL); } } @@ -2675,9 +2292,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_sqd2sqd_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (status); } qpc_path->rnr_retry = rc->rc_rnr_retry_cnt; @@ -2707,10 +2321,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, } else if (rc->rc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - rc->rc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -2727,10 +2337,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, qpc->pri_addr_path.pkey_indx = pkeyindx; opmask |= TAVOR_CMD_OP_PKEYINDX; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_pkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_PKEY_IX_ILLEGAL); } } @@ -2745,10 +2351,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->pri_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_port_fail, - TAVOR_TNF_ERROR, "", tnf_uint, port, - portnum); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_HCA_PORT_INVALID); } opmask |= TAVOR_CMD_OP_PRIM_PORT; @@ -2766,9 +2368,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_sqd2sqd_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (status); } qpc_path->ack_timeout = rc->rc_alt_path.cep_timeout; @@ -2781,10 +2380,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_HCA_PORT_INVALID); } @@ -2796,10 +2391,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -2812,13 +2403,8 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, * parameter. */ if (flags & IBT_CEP_SET_RDMARA_OUT) { - rdma_ra_out = rc->rc_rdma_ra_out; if (tavor_qp_validate_init_depth(state, rc, &sra_max) != DDI_SUCCESS) { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_rdma_out_fail, - TAVOR_TNF_ERROR, "", tnf_uint, rdma_ra_out, - rdma_ra_out); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_INVALID_PARAM); } qpc->sra_max = sra_max; @@ -2833,13 +2419,8 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, * the appropriate flag in the "opmask" parameter. */ if (flags & IBT_CEP_SET_RDMARA_IN) { - rdma_ra_in = rc->rc_rdma_ra_in; if (tavor_qp_validate_resp_rsrc(state, rc, &rra_max) != DDI_SUCCESS) { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_rdma_in_fail, - TAVOR_TNF_ERROR, "", tnf_uint, rdma_ra_in, - rdma_ra_in); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_INVALID_PARAM); } qpc->rra_max = rra_max; @@ -2916,9 +2497,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_sqd2sqd_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (status); } @@ -2943,10 +2521,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, } else if (uc->uc_mig_state == IBT_STATE_REARMED) { qpc->pm_state = TAVOR_QP_PMSTATE_REARM; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_mig_state_fail, - TAVOR_TNF_ERROR, "", tnf_uint, mig_state, - uc->uc_mig_state); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_QP_APM_STATE_INVALID); } opmask |= TAVOR_CMD_OP_PM_STATE; @@ -2963,10 +2537,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, qpc->pri_addr_path.pkey_indx = pkeyindx; opmask |= TAVOR_CMD_OP_PKEYINDX; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_pkey, - TAVOR_TNF_ERROR, "", tnf_uint, pkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_PKEY_IX_ILLEGAL); } } @@ -2983,9 +2553,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_set_addr_path(state, adds_vect, qpc_path, TAVOR_ADDRPATH_QP, qp); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_qp_sqd2sqd_setaddrpath_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (status); } @@ -2997,10 +2564,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_portnum_is_valid(state, portnum)) { qpc->alt_addr_path.portnum = portnum; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_altport_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altport, - portnum); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_HCA_PORT_INVALID); } @@ -3012,10 +2575,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, if (tavor_pkeyindex_is_valid(state, pkeyindx)) { qpc->alt_addr_path.pkey_indx = pkeyindx; } else { - TNF_PROBE_1(tavor_qp_sqd2sqd_inv_altpkey_fail, - TAVOR_TNF_ERROR, "", tnf_uint, altpkeyindx, - pkeyindx); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_PKEY_IX_ILLEGAL); } opmask |= TAVOR_CMD_OP_ALT_PATH; @@ -3027,9 +2586,6 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in sqd2sqd"); - TNF_PROBE_0(tavor_qp_sqd2sqd_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (ibc_get_ci_failure(0)); } @@ -3047,19 +2603,12 @@ tavor_qp_sqd2sqd(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: SQD2SQD_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_sqd2sqd_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_sqd2sqd_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (IBT_QP_STATE_INVALID); } } - TAVOR_TNF_EXIT(tavor_qp_sqd2sqd); return (DDI_SUCCESS); } @@ -3077,8 +2626,6 @@ tavor_qp_sqerr2rts(tavor_state_t *state, tavor_qphdl_t qp, uint32_t opmask = 0; int status; - TAVOR_TNF_ENTER(tavor_qp_sqerr2rts); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -3123,9 +2670,6 @@ tavor_qp_sqerr2rts(tavor_state_t *state, tavor_qphdl_t qp, * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in sqerr2rts"); - TNF_PROBE_0(tavor_qp_sqerr2rts_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqerr2rts); return (ibc_get_ci_failure(0)); } @@ -3143,19 +2687,12 @@ tavor_qp_sqerr2rts(tavor_state_t *state, tavor_qphdl_t qp, if (status != TAVOR_CMD_BAD_QP_STATE) { cmn_err(CE_CONT, "Tavor: SQERR2RTS_QP command failed: " "%08x\n", status); - TNF_PROBE_1(tavor_qp_sqerr2rts_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_sqerr2rts); return (ibc_get_ci_failure(0)); } else { - TNF_PROBE_0(tavor_qp_sqerr2rts_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_sqerr2rts); return (IBT_QP_STATE_INVALID); } } - TAVOR_TNF_EXIT(tavor_qp_sqerr2rts); return (DDI_SUCCESS); } @@ -3169,8 +2706,6 @@ tavor_qp_to_error(tavor_state_t *state, tavor_qphdl_t qp) { int status; - TAVOR_TNF_ENTER(tavor_qp_to_error); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -3186,13 +2721,9 @@ tavor_qp_to_error(tavor_state_t *state, tavor_qphdl_t qp) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: TOERR_QP command failed: %08x\n", status); - TNF_PROBE_1(tavor_qp_to_error_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_to_error); return (ibc_get_ci_failure(0)); } - TAVOR_TNF_EXIT(tavor_qp_to_error); return (DDI_SUCCESS); } @@ -3207,8 +2738,6 @@ tavor_qp_to_reset(tavor_state_t *state, tavor_qphdl_t qp) tavor_hw_qpc_t *qpc; int status; - TAVOR_TNF_ENTER(tavor_qp_to_reset); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -3229,13 +2758,9 @@ tavor_qp_to_reset(tavor_state_t *state, tavor_qphdl_t qp) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: TORST_QP command failed: %08x\n", status); - TNF_PROBE_1(tavor_qp_to_reset_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_to_reset); return (ibc_get_ci_failure(0)); } - TAVOR_TNF_EXIT(tavor_qp_to_reset); return (DDI_SUCCESS); } @@ -3250,8 +2775,6 @@ tavor_qp_reset2err(tavor_state_t *state, tavor_qphdl_t qp) tavor_hw_qpc_t *qpc; int status; - TAVOR_TNF_ENTER(tavor_qp_reset2err); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* @@ -3331,9 +2854,6 @@ tavor_qp_reset2err(tavor_state_t *state, tavor_qphdl_t qp) * and return failure */ TAVOR_WARNING(state, "unknown QP transport type in rst2err"); - TNF_PROBE_0(tavor_qp_reset2err_inv_transtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_qp_reset2err); return (ibc_get_ci_failure(0)); } @@ -3350,9 +2870,6 @@ tavor_qp_reset2err(tavor_state_t *state, tavor_qphdl_t qp) if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: RST2INIT_QP command failed: %08x\n", status); - TNF_PROBE_1(tavor_qp_reset2err_rst2init_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_reset2err); return (ibc_get_ci_failure(0)); } @@ -3373,13 +2890,9 @@ tavor_qp_reset2err(tavor_state_t *state, tavor_qphdl_t qp) if (tavor_qp_to_reset(state, qp) != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to reset QP context"); } - TNF_PROBE_1(tavor_qp_reset2err_toerr_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_qp_reset2err); return (ibc_get_ci_failure(0)); } - TAVOR_TNF_EXIT(tavor_qp_reset2err); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_rsrc.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_rsrc.c index a79340442d..318845fc68 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_rsrc.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_rsrc.c @@ -182,8 +182,6 @@ tavor_rsrc_alloc(tavor_state_t *state, tavor_rsrc_type_t rsrc, uint_t num, tavor_rsrc_t *tmp_rsrc_hdl; int flag, status = DDI_FAILURE; - TAVOR_TNF_ENTER(tavor_rsrc_alloc); - ASSERT(state != NULL); ASSERT(hdl != NULL); @@ -197,8 +195,6 @@ tavor_rsrc_alloc(tavor_state_t *state, tavor_rsrc_type_t rsrc, uint_t num, tmp_rsrc_hdl = (tavor_rsrc_t *)kmem_cache_alloc(state->ts_rsrc_cache, flag); if (tmp_rsrc_hdl == NULL) { - TNF_PROBE_0(tavor_rsrc_alloc_kmca_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_alloc); return (DDI_FAILURE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*tmp_rsrc_hdl)) @@ -300,8 +296,6 @@ tavor_rsrc_alloc(tavor_state_t *state, tavor_rsrc_type_t rsrc, uint_t num, default: TAVOR_WARNING(state, "unexpected resource type in alloc"); - TNF_PROBE_0(tavor_rsrc_alloc_inv_rsrctype_fail, - TAVOR_TNF_ERROR, ""); break; } @@ -313,13 +307,9 @@ tavor_rsrc_alloc(tavor_state_t *state, tavor_rsrc_type_t rsrc, uint_t num, if (status != DDI_SUCCESS) { kmem_cache_free(state->ts_rsrc_cache, tmp_rsrc_hdl); tmp_rsrc_hdl = NULL; - TNF_PROBE_1(tavor_rsrc_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_uint, rsrc_type, rsrc_pool->rsrc_type); - TAVOR_TNF_EXIT(tavor_rsrc_alloc); return (DDI_FAILURE); } else { *hdl = tmp_rsrc_hdl; - TAVOR_TNF_EXIT(tavor_rsrc_alloc); return (DDI_SUCCESS); } } @@ -334,8 +324,6 @@ tavor_rsrc_free(tavor_state_t *state, tavor_rsrc_t **hdl) { tavor_rsrc_pool_info_t *rsrc_pool; - TAVOR_TNF_ENTER(tavor_rsrc_free); - ASSERT(state != NULL); ASSERT(hdl != NULL); @@ -382,8 +370,6 @@ tavor_rsrc_free(tavor_state_t *state, tavor_rsrc_t **hdl) default: TAVOR_WARNING(state, "unexpected resource type in free"); - TNF_PROBE_0(tavor_rsrc_free_inv_rsrctype_fail, - TAVOR_TNF_ERROR, ""); break; } @@ -393,8 +379,6 @@ tavor_rsrc_free(tavor_state_t *state, tavor_rsrc_t **hdl) */ kmem_cache_free(state->ts_rsrc_cache, *hdl); *hdl = NULL; - - TAVOR_TNF_EXIT(tavor_rsrc_free); } @@ -424,9 +408,7 @@ tavor_rsrc_init_phase1(tavor_state_t *state) tavor_cfg_profile_t *cfgprof; uint64_t num, size; int status; - char *errormsg, *rsrc_name; - - TAVOR_TNF_ENTER(tavor_rsrc_init_phase1); + char *rsrc_name; ASSERT(state != NULL); @@ -478,8 +460,6 @@ tavor_rsrc_init_phase1(tavor_state_t *state) status = tavor_rsrc_mbox_init(state, &mbox_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "out mailboxes"); goto rsrcinitp1_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL1; @@ -494,8 +474,6 @@ tavor_rsrc_init_phase1(tavor_state_t *state) status = tavor_outmbox_list_init(state); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "out mailbox list"); goto rsrcinitp1_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL2; @@ -525,8 +503,6 @@ tavor_rsrc_init_phase1(tavor_state_t *state) status = tavor_rsrc_mbox_init(state, &mbox_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "out intr mailboxes"); goto rsrcinitp1_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL3; @@ -541,21 +517,15 @@ tavor_rsrc_init_phase1(tavor_state_t *state) status = tavor_intr_outmbox_list_init(state); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "out intr mailbox list"); goto rsrcinitp1_fail; } cleanup = TAVOR_RSRC_CLEANUP_PHASE1_COMPLETE; kmem_free(rsrc_name, TAVOR_RSRC_NAME_MAXLEN); - TAVOR_TNF_EXIT(tavor_rsrc_init_phase1); return (DDI_SUCCESS); rsrcinitp1_fail: kmem_free(rsrc_name, TAVOR_RSRC_NAME_MAXLEN); - TNF_PROBE_1(tavor_rsrc_init_phase1_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_rsrc_init_phase1); return (status); } @@ -578,9 +548,7 @@ tavor_rsrc_init_phase2(tavor_state_t *state) uint_t mcg_size, mcg_size_shift; uint_t uarscr_size, mttsegment_sz; int status; - char *errormsg, *rsrc_name; - - TAVOR_TNF_ENTER(tavor_rsrc_init_phase2); + char *rsrc_name; ASSERT(state != NULL); @@ -611,8 +579,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) sizeof (uint64_t), NULL, NULL, NULL, 0, VM_SLEEP); if (state->ts_ddrvmem == NULL) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "DDR vmem"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL5; @@ -652,8 +618,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "MPT table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL6; @@ -687,8 +651,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "MTT table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL7; @@ -721,8 +683,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "QPC table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL8; @@ -754,8 +714,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "RDB table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL9; @@ -788,8 +746,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "CQC table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL10; @@ -826,8 +782,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "Extended QPC table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL11; @@ -859,8 +813,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "UDAV table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL12; @@ -899,8 +851,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "UAR scratch table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL13; @@ -944,8 +894,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "SRQC table"); goto rsrcinitp2_fail; } } @@ -976,8 +924,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_mbox_init(state, &mbox_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "in mailboxes"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL15; @@ -992,8 +938,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_inmbox_list_init(state); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "in mailbox list"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL16; @@ -1023,8 +967,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_mbox_init(state, &mbox_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "in intr mailboxes"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL17; @@ -1039,8 +981,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_intr_inmbox_list_init(state); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "in intr mailbox list"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL18; @@ -1053,8 +993,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_outstanding_cmdlist_init(state); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "outstanding cmd list"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL19; @@ -1065,8 +1003,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_mcg_entry_get_size(state, &mcg_size_shift); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "failed get MCG size"); goto rsrcinitp2_fail; } mcg_size = TAVOR_MCGMEM_SZ(state); @@ -1101,8 +1037,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "MCG table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL20; @@ -1134,8 +1068,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "EQC table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL21; @@ -1170,8 +1102,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_pd_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "PD handle"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL22; @@ -1198,8 +1128,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "MR handle"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL23; @@ -1226,8 +1154,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "EQ handle"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL24; @@ -1257,8 +1183,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "CQ handle"); goto rsrcinitp2_fail; } @@ -1308,8 +1232,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "SRQ handle"); goto rsrcinitp2_fail; } @@ -1347,8 +1269,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "AH handle"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL27; @@ -1378,8 +1298,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "QP handle"); goto rsrcinitp2_fail; } @@ -1417,8 +1335,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "reference count handle"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_LEVEL29; @@ -1436,8 +1352,6 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_sw_handles_init(state, &hdl_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "MCG handle"); goto rsrcinitp2_fail; } state->ts_mcghdl = hdl_info.swi_table_ptr; @@ -1481,21 +1395,15 @@ tavor_rsrc_init_phase2(tavor_state_t *state) status = tavor_rsrc_hw_entries_init(state, &entry_info); if (status != DDI_SUCCESS) { tavor_rsrc_fini(state, cleanup); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(DDI_FAILURE, "UAR page table"); goto rsrcinitp2_fail; } cleanup = TAVOR_RSRC_CLEANUP_ALL; kmem_free(rsrc_name, TAVOR_RSRC_NAME_MAXLEN); - TAVOR_TNF_EXIT(tavor_rsrc_init_phase2); return (DDI_SUCCESS); rsrcinitp2_fail: kmem_free(rsrc_name, TAVOR_RSRC_NAME_MAXLEN); - TNF_PROBE_1(tavor_rsrc_init_phase2_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_rsrc_init_phase2); return (status); } @@ -1512,8 +1420,6 @@ tavor_rsrc_fini(tavor_state_t *state, tavor_rsrc_cleanup_level_t clean) tavor_rsrc_mbox_info_t mbox_info; tavor_cfg_profile_t *cfgprof; - TAVOR_TNF_ENTER(tavor_rsrc_fini); - ASSERT(state != NULL); cfgprof = state->ts_cfg_profile; @@ -1756,12 +1662,7 @@ tavor_rsrc_fini(tavor_state_t *state, tavor_rsrc_cleanup_level_t clean) default: TAVOR_WARNING(state, "unexpected resource cleanup level"); - TNF_PROBE_0(tavor_rsrc_fini_default_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_fini); - return; } - - TAVOR_TNF_EXIT(tavor_rsrc_fini); } @@ -1778,8 +1679,6 @@ tavor_rsrc_mbox_init(tavor_state_t *state, tavor_rsrc_mbox_info_t *info) uint64_t offset; uint_t dma_xfer_mode; - TAVOR_TNF_ENTER(tavor_rsrc_mbox_init); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -1813,9 +1712,6 @@ tavor_rsrc_mbox_init(tavor_state_t *state, tavor_rsrc_mbox_info_t *info) if (rsrc_pool->rsrc_ddr_offset == NULL) { /* Unable to alloc space for mailboxes */ kmem_free(priv, sizeof (tavor_rsrc_priv_mbox_t)); - TNF_PROBE_0(tavor_rsrc_mbox_init_vma_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_mbox_init); return (DDI_FAILURE); } @@ -1836,9 +1732,6 @@ tavor_rsrc_mbox_init(tavor_state_t *state, tavor_rsrc_mbox_info_t *info) rsrc_pool->rsrc_ddr_offset, rsrc_pool->rsrc_pool_size); kmem_free(priv, sizeof (tavor_rsrc_priv_mbox_t)); - TNF_PROBE_0(tavor_rsrc_mbox_init_vmem_create_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_mbox_init); return (DDI_FAILURE); } rsrc_pool->rsrc_vmp = vmp; @@ -1848,7 +1741,6 @@ tavor_rsrc_mbox_init(tavor_state_t *state, tavor_rsrc_mbox_info_t *info) rsrc_pool->rsrc_vmp = NULL; } - TAVOR_TNF_EXIT(tavor_rsrc_mbox_init); return (DDI_SUCCESS); } @@ -1862,8 +1754,6 @@ tavor_rsrc_mbox_fini(tavor_state_t *state, tavor_rsrc_mbox_info_t *info) { tavor_rsrc_pool_info_t *rsrc_pool; - TAVOR_TNF_ENTER(tavor_rsrc_mbox_fini); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -1883,8 +1773,6 @@ tavor_rsrc_mbox_fini(tavor_state_t *state, tavor_rsrc_mbox_info_t *info) /* Free up the private struct */ kmem_free(rsrc_pool->rsrc_private, sizeof (tavor_rsrc_priv_mbox_t)); - - TAVOR_TNF_EXIT(tavor_rsrc_mbox_fini); } @@ -1903,8 +1791,6 @@ tavor_rsrc_hw_entries_init(tavor_state_t *state, uint64_t offset; int status; - TAVOR_TNF_ENTER(tavor_rsrc_hw_entries_init); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -1916,11 +1802,6 @@ tavor_rsrc_hw_entries_init(tavor_state_t *state, /* Make sure number of HW entries makes sense */ if (num_hwentry > max_hwentry) { - TNF_PROBE_2(tavor_rsrc_hw_entries_init_toomany_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of HW " - "entries exceeds device maximum", tnf_uint, maxhw, - max_hwentry); - TAVOR_TNF_EXIT(tavor_rsrc_hw_entries_init); return (DDI_FAILURE); } @@ -1936,9 +1817,6 @@ tavor_rsrc_hw_entries_init(tavor_state_t *state, 0, 0, NULL, NULL, VM_NOSLEEP | VM_FIRSTFIT); if (rsrc_pool->rsrc_ddr_offset == NULL) { /* Unable to alloc space for aligned HW table */ - TNF_PROBE_0(tavor_rsrc_hw_entry_table_vmxalloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_hw_entries_init); return (DDI_FAILURE); } @@ -1972,9 +1850,6 @@ tavor_rsrc_hw_entries_init(tavor_state_t *state, rsrc_pool->rsrc_ddr_offset, rsrc_pool->rsrc_pool_size); } - TNF_PROBE_0(tavor_rsrc_hw_entries_init_vmemcreate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_hw_entries_init); return (DDI_FAILURE); } rsrc_pool->rsrc_vmp = vmp; @@ -1997,15 +1872,11 @@ tavor_rsrc_hw_entries_init(tavor_state_t *state, rsrc_pool->rsrc_ddr_offset, rsrc_pool->rsrc_pool_size); } - TNF_PROBE_0(tavor_rsrc_hw_entries_init_pre_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_hw_entries_init); return (DDI_FAILURE); } } rsrc_pool->rsrc_private = rsvd_rsrc; - TAVOR_TNF_EXIT(tavor_rsrc_hw_entries_init); return (DDI_SUCCESS); } @@ -2021,8 +1892,6 @@ tavor_rsrc_hw_entries_fini(tavor_state_t *state, tavor_rsrc_pool_info_t *rsrc_pool; tavor_rsrc_t *rsvd_rsrc; - TAVOR_TNF_ENTER(tavor_rsrc_hw_entries_fini); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -2051,8 +1920,6 @@ tavor_rsrc_hw_entries_fini(tavor_state_t *state, vmem_xfree(state->ts_ddrvmem, rsrc_pool->rsrc_ddr_offset, rsrc_pool->rsrc_pool_size); } - - TAVOR_TNF_EXIT(tavor_rsrc_hw_entries_fini); } @@ -2067,8 +1934,6 @@ tavor_rsrc_sw_handles_init(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) tavor_rsrc_pool_info_t *rsrc_pool; uint64_t num_swhdl, max_swhdl, prealloc_sz; - TAVOR_TNF_ENTER(tavor_rsrc_sw_handles_init); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -2080,10 +1945,6 @@ tavor_rsrc_sw_handles_init(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) /* Make sure number of SW handles makes sense */ if (num_swhdl > max_swhdl) { - TNF_PROBE_2(tavor_rsrc_sw_handles_init_toomany_fail, - TAVOR_TNF_ERROR, "", tnf_string, errmsg, "number of SW " - "handles exceeds maximum", tnf_uint, maxsw, max_swhdl); - TAVOR_TNF_EXIT(tavor_rsrc_sw_handles_init); return (DDI_FAILURE); } @@ -2105,7 +1966,6 @@ tavor_rsrc_sw_handles_init(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) KM_SLEEP); } - TAVOR_TNF_EXIT(tavor_rsrc_sw_handles_init); return (DDI_SUCCESS); } @@ -2121,8 +1981,6 @@ tavor_rsrc_sw_handles_fini(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) tavor_rsrc_pool_info_t *rsrc_pool; uint64_t num_swhdl, prealloc_sz; - TAVOR_TNF_ENTER(tavor_rsrc_sw_handles_fini); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -2142,8 +2000,6 @@ tavor_rsrc_sw_handles_fini(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) if (info->swi_table_ptr != NULL) { kmem_free(info->swi_table_ptr, num_swhdl * prealloc_sz); } - - TAVOR_TNF_EXIT(tavor_rsrc_sw_handles_fini); } @@ -2159,8 +2015,6 @@ tavor_rsrc_pd_handles_init(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) char vmem_name[TAVOR_RSRC_NAME_MAXLEN]; int status; - TAVOR_TNF_ENTER(tavor_rsrc_pd_handles_init); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -2170,8 +2024,6 @@ tavor_rsrc_pd_handles_init(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) /* Initialize the resource pool for software handle table */ status = tavor_rsrc_sw_handles_init(state, info); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_rsrc_pdhdl_alloc_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_pdhdl_alloc); return (DDI_FAILURE); } @@ -2185,14 +2037,10 @@ tavor_rsrc_pd_handles_init(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) /* Unable to create vmem arena */ info->swi_table_ptr = NULL; tavor_rsrc_sw_handles_fini(state, info); - TNF_PROBE_0(tavor_rsrc_pd_handles_init_vmem_create_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_pd_handles_init); return (DDI_FAILURE); } rsrc_pool->rsrc_vmp = vmp; - TAVOR_TNF_EXIT(tavor_rsrc_pd_handles_init); return (DDI_SUCCESS); } @@ -2206,8 +2054,6 @@ tavor_rsrc_pd_handles_fini(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) { tavor_rsrc_pool_info_t *rsrc_pool; - TAVOR_TNF_ENTER(tavor_rsrc_pd_handles_fini); - ASSERT(state != NULL); ASSERT(info != NULL); @@ -2218,8 +2064,6 @@ tavor_rsrc_pd_handles_fini(tavor_state_t *state, tavor_rsrc_sw_hdl_info_t *info) /* Destroy the "tavor_sw_pd_t" kmem_cache */ tavor_rsrc_sw_handles_fini(state, info); - - TAVOR_TNF_EXIT(tavor_rsrc_pd_handles_fini); } @@ -2238,8 +2082,6 @@ tavor_rsrc_mbox_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t num, size_t real_len, temp_len; int status; - TAVOR_TNF_ENTER(tavor_rsrc_mbox_alloc); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); @@ -2257,9 +2099,6 @@ tavor_rsrc_mbox_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t num, status = ddi_dma_alloc_handle(priv->pmb_dip, &priv->pmb_dmaattr, DDI_DMA_SLEEP, NULL, &hdl->tr_dmahdl); if (status != DDI_SUCCESS) { - TNF_PROBE_1(tavor_rsrc_mbox_alloc_dmahdl_fail, TAVOR_TNF_ERROR, - "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_rsrc_mbox_alloc); return (DDI_FAILURE); } @@ -2272,9 +2111,6 @@ tavor_rsrc_mbox_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t num, if (addr == NULL) { /* No more DDR available for mailbox entries */ ddi_dma_free_handle(&hdl->tr_dmahdl); - TNF_PROBE_0(tavor_rsrc_mbox_alloc_vma_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_mbox_alloc); return (DDI_FAILURE); } hdl->tr_acchdl = priv->pmb_acchdl; @@ -2295,16 +2131,12 @@ tavor_rsrc_mbox_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t num, if (status != DDI_SUCCESS) { /* No more sys memory available for mailbox entries */ ddi_dma_free_handle(&hdl->tr_dmahdl); - TNF_PROBE_0(tavor_rsrc_mbox_alloc_dma_memalloc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_mbox_alloc); return (DDI_FAILURE); } hdl->tr_addr = (void *)kaddr; hdl->tr_len = real_len; } - TAVOR_TNF_EXIT(tavor_rsrc_mbox_alloc); return (DDI_SUCCESS); } @@ -2319,8 +2151,6 @@ tavor_rsrc_mbox_free(tavor_rsrc_pool_info_t *pool_info, tavor_rsrc_t *hdl) void *addr; uint64_t offset; - TAVOR_TNF_ENTER(tavor_rsrc_mbox_free); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); @@ -2344,8 +2174,6 @@ tavor_rsrc_mbox_free(tavor_rsrc_pool_info_t *pool_info, tavor_rsrc_t *hdl) /* Free the DMA handle for the mailbox */ ddi_dma_free_handle(&hdl->tr_dmahdl); - - TAVOR_TNF_EXIT(tavor_rsrc_mbox_free); } @@ -2363,8 +2191,6 @@ tavor_rsrc_hw_entry_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t num, uint32_t align; int flag; - TAVOR_TNF_ENTER(tavor_rsrc_hw_entry_alloc); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); @@ -2389,9 +2215,6 @@ tavor_rsrc_hw_entry_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t num, align, 0, 0, NULL, NULL, flag | VM_FIRSTFIT); if (addr == NULL) { /* No more HW entries available */ - TNF_PROBE_0(tavor_rsrc_hw_entry_alloc_vmxa_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_hw_entry_alloc); return (DDI_FAILURE); } @@ -2406,7 +2229,6 @@ tavor_rsrc_hw_entry_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t num, (uintptr_t)pool_info->rsrc_start); hdl->tr_indx = (offset >> pool_info->rsrc_shift); - TAVOR_TNF_EXIT(tavor_rsrc_hw_entry_alloc); return (DDI_SUCCESS); } @@ -2421,8 +2243,6 @@ tavor_rsrc_hw_entry_free(tavor_rsrc_pool_info_t *pool_info, tavor_rsrc_t *hdl) void *addr; uint64_t offset; - TAVOR_TNF_ENTER(tavor_rsrc_hw_entry_free); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); @@ -2433,8 +2253,6 @@ tavor_rsrc_hw_entry_free(tavor_rsrc_pool_info_t *pool_info, tavor_rsrc_t *hdl) /* Use vmem_xfree() to free up the HW table entry */ vmem_xfree(pool_info->rsrc_vmp, addr, hdl->tr_len); - - TAVOR_TNF_EXIT(tavor_rsrc_hw_entry_free); } @@ -2449,8 +2267,6 @@ tavor_rsrc_swhdl_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t sleepflag, void *addr; int flag; - TAVOR_TNF_ENTER(tavor_rsrc_swhdl_alloc); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); @@ -2458,15 +2274,11 @@ tavor_rsrc_swhdl_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t sleepflag, flag = (sleepflag == TAVOR_SLEEP) ? KM_SLEEP : KM_NOSLEEP; addr = kmem_cache_alloc(pool_info->rsrc_private, flag); if (addr == NULL) { - TNF_PROBE_0(tavor_rsrc_swhdl_alloc_kmca_fail, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_rsrc_swhdl_alloc); return (DDI_FAILURE); } hdl->tr_len = pool_info->rsrc_quantum; hdl->tr_addr = addr; - TAVOR_TNF_EXIT(tavor_rsrc_swhdl_alloc); return (DDI_SUCCESS); } @@ -2478,15 +2290,11 @@ tavor_rsrc_swhdl_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t sleepflag, static void tavor_rsrc_swhdl_free(tavor_rsrc_pool_info_t *pool_info, tavor_rsrc_t *hdl) { - TAVOR_TNF_ENTER(tavor_rsrc_swhdl_free); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); /* Free the software handle structure */ kmem_cache_free(pool_info->rsrc_private, hdl->tr_addr); - - TAVOR_TNF_EXIT(tavor_rsrc_swhdl_free); } @@ -2502,16 +2310,12 @@ tavor_rsrc_pdhdl_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t sleepflag, void *tmpaddr; int flag, status; - TAVOR_TNF_ENTER(tavor_rsrc_pdhdl_alloc); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); /* Allocate the software handle */ status = tavor_rsrc_swhdl_alloc(pool_info, sleepflag, hdl); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_rsrc_pdhdl_alloc_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_pdhdl_alloc); return (DDI_FAILURE); } addr = (tavor_pdhdl_t)hdl->tr_addr; @@ -2523,16 +2327,12 @@ tavor_rsrc_pdhdl_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t sleepflag, if (tmpaddr == NULL) { /* No more PD number entries available */ tavor_rsrc_swhdl_free(pool_info, hdl); - TNF_PROBE_0(tavor_rsrc_pdhdl_alloc_vma_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_rsrc_pdhdl_alloc); return (DDI_FAILURE); } addr->pd_pdnum = (uint32_t)(uintptr_t)tmpaddr; addr->pd_rsrcp = hdl; hdl->tr_indx = addr->pd_pdnum; - TAVOR_TNF_EXIT(tavor_rsrc_pdhdl_alloc); return (DDI_SUCCESS); } @@ -2544,8 +2344,6 @@ tavor_rsrc_pdhdl_alloc(tavor_rsrc_pool_info_t *pool_info, uint_t sleepflag, static void tavor_rsrc_pdhdl_free(tavor_rsrc_pool_info_t *pool_info, tavor_rsrc_t *hdl) { - TAVOR_TNF_ENTER(tavor_rsrc_pdhdl_free); - ASSERT(pool_info != NULL); ASSERT(hdl != NULL); @@ -2554,8 +2352,6 @@ tavor_rsrc_pdhdl_free(tavor_rsrc_pool_info_t *pool_info, tavor_rsrc_t *hdl) /* Free the software handle structure */ tavor_rsrc_swhdl_free(pool_info, hdl); - - TAVOR_TNF_EXIT(tavor_rsrc_pdhdl_free); } @@ -2570,15 +2366,12 @@ tavor_rsrc_pdhdl_constructor(void *pd, void *priv, int flags) tavor_pdhdl_t pdhdl; tavor_state_t *state; - TAVOR_TNF_ENTER(tavor_rsrc_pdhdl_constructor); - pdhdl = (tavor_pdhdl_t)pd; state = (tavor_state_t *)priv; mutex_init(&pdhdl->pd_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_rsrc_pdhdl_constructor); return (DDI_SUCCESS); } @@ -2593,13 +2386,9 @@ tavor_rsrc_pdhdl_destructor(void *pd, void *priv) { tavor_pdhdl_t pdhdl; - TAVOR_TNF_ENTER(tavor_rsrc_pdhdl_destructor); - pdhdl = (tavor_pdhdl_t)pd; mutex_destroy(&pdhdl->pd_lock); - - TAVOR_TNF_EXIT(tavor_rsrc_pdhdl_destructor); } @@ -2614,8 +2403,6 @@ tavor_rsrc_cqhdl_constructor(void *cq, void *priv, int flags) tavor_cqhdl_t cqhdl; tavor_state_t *state; - TAVOR_TNF_ENTER(tavor_rsrc_cqhdl_constructor); - cqhdl = (tavor_cqhdl_t)cq; state = (tavor_state_t *)priv; @@ -2624,7 +2411,6 @@ tavor_rsrc_cqhdl_constructor(void *cq, void *priv, int flags) mutex_init(&cqhdl->cq_wrid_wqhdr_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_rsrc_cqhdl_constructor); return (DDI_SUCCESS); } @@ -2639,14 +2425,10 @@ tavor_rsrc_cqhdl_destructor(void *cq, void *priv) { tavor_cqhdl_t cqhdl; - TAVOR_TNF_ENTER(tavor_rsrc_cqhdl_destructor); - cqhdl = (tavor_cqhdl_t)cq; mutex_destroy(&cqhdl->cq_wrid_wqhdr_lock); mutex_destroy(&cqhdl->cq_lock); - - TAVOR_TNF_EXIT(tavor_rsrc_cqhdl_destructor); } @@ -2661,15 +2443,12 @@ tavor_rsrc_qphdl_constructor(void *qp, void *priv, int flags) tavor_qphdl_t qphdl; tavor_state_t *state; - TAVOR_TNF_ENTER(tavor_rsrc_qphdl_constructor); - qphdl = (tavor_qphdl_t)qp; state = (tavor_state_t *)priv; mutex_init(&qphdl->qp_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_rsrc_qphdl_constructor); return (DDI_SUCCESS); } @@ -2684,13 +2463,9 @@ tavor_rsrc_qphdl_destructor(void *qp, void *priv) { tavor_qphdl_t qphdl; - TAVOR_TNF_ENTER(tavor_rsrc_qphdl_destructor); - qphdl = (tavor_qphdl_t)qp; mutex_destroy(&qphdl->qp_lock); - - TAVOR_TNF_ENTER(tavor_rsrc_qphdl_destructor); } @@ -2705,15 +2480,12 @@ tavor_rsrc_srqhdl_constructor(void *srq, void *priv, int flags) tavor_srqhdl_t srqhdl; tavor_state_t *state; - TAVOR_TNF_ENTER(tavor_rsrc_srqhdl_constructor); - srqhdl = (tavor_srqhdl_t)srq; state = (tavor_state_t *)priv; mutex_init(&srqhdl->srq_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_rsrc_srqhdl_constructor); return (DDI_SUCCESS); } @@ -2728,13 +2500,9 @@ tavor_rsrc_srqhdl_destructor(void *srq, void *priv) { tavor_srqhdl_t srqhdl; - TAVOR_TNF_ENTER(tavor_rsrc_srqhdl_destructor); - srqhdl = (tavor_srqhdl_t)srq; mutex_destroy(&srqhdl->srq_lock); - - TAVOR_TNF_EXIT(tavor_rsrc_srqhdl_destructor); } @@ -2749,15 +2517,12 @@ tavor_rsrc_refcnt_constructor(void *rc, void *priv, int flags) tavor_sw_refcnt_t *refcnt; tavor_state_t *state; - TAVOR_TNF_ENTER(tavor_rsrc_refcnt_constructor); - refcnt = (tavor_sw_refcnt_t *)rc; state = (tavor_state_t *)priv; mutex_init(&refcnt->swrc_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_rsrc_refcnt_constructor); return (DDI_SUCCESS); } @@ -2772,13 +2537,9 @@ tavor_rsrc_refcnt_destructor(void *rc, void *priv) { tavor_sw_refcnt_t *refcnt; - TAVOR_TNF_ENTER(tavor_rsrc_refcnt_destructor); - refcnt = (tavor_sw_refcnt_t *)rc; mutex_destroy(&refcnt->swrc_lock); - - TAVOR_TNF_ENTER(tavor_rsrc_refcnt_destructor); } @@ -2793,15 +2554,12 @@ tavor_rsrc_ahhdl_constructor(void *ah, void *priv, int flags) tavor_ahhdl_t ahhdl; tavor_state_t *state; - TAVOR_TNF_ENTER(tavor_rsrc_ahhdl_constructor); - ahhdl = (tavor_ahhdl_t)ah; state = (tavor_state_t *)priv; mutex_init(&ahhdl->ah_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_rsrc_ahhdl_constructor); return (DDI_SUCCESS); } @@ -2816,13 +2574,9 @@ tavor_rsrc_ahhdl_destructor(void *ah, void *priv) { tavor_ahhdl_t ahhdl; - TAVOR_TNF_ENTER(tavor_rsrc_ahhdl_destructor); - ahhdl = (tavor_ahhdl_t)ah; mutex_destroy(&ahhdl->ah_lock); - - TAVOR_TNF_ENTER(tavor_rsrc_ahhdl_destructor); } @@ -2837,15 +2591,12 @@ tavor_rsrc_mrhdl_constructor(void *mr, void *priv, int flags) tavor_mrhdl_t mrhdl; tavor_state_t *state; - TAVOR_TNF_ENTER(tavor_rsrc_mrhdl_constructor); - mrhdl = (tavor_mrhdl_t)mr; state = (tavor_state_t *)priv; mutex_init(&mrhdl->mr_lock, NULL, MUTEX_DRIVER, DDI_INTR_PRI(state->ts_intrmsi_pri)); - TAVOR_TNF_EXIT(tavor_rsrc_mrhdl_constructor); return (DDI_SUCCESS); } @@ -2860,13 +2611,9 @@ tavor_rsrc_mrhdl_destructor(void *mr, void *priv) { tavor_mrhdl_t mrhdl; - TAVOR_TNF_ENTER(tavor_rsrc_mrhdl_destructor); - mrhdl = (tavor_mrhdl_t)mr; mutex_destroy(&mrhdl->mr_lock); - - TAVOR_TNF_ENTER(tavor_rsrc_mrhdl_destructor); } @@ -2878,8 +2625,6 @@ tavor_rsrc_mcg_entry_get_size(tavor_state_t *state, uint_t *mcg_size_shift) { uint_t num_qp_per_mcg, max_qp_per_mcg, log2; - TAVOR_TNF_ENTER(tavor_rsrc_mcg_entry_get_size); - /* * Round the configured number of QP per MCG to next larger * power-of-2 size and update. @@ -2895,15 +2640,11 @@ tavor_rsrc_mcg_entry_get_size(tavor_state_t *state, uint_t *mcg_size_shift) num_qp_per_mcg = state->ts_cfg_profile->cp_num_qp_per_mcg; max_qp_per_mcg = (1 << state->ts_devlim.log_max_qp_mcg); if (num_qp_per_mcg > max_qp_per_mcg) { - TNF_PROBE_1(tavor_rsrc_mcg_getsz_toomany_qppermcg_fail, - TAVOR_TNF_ERROR, "", tnf_uint, maxqpmcg, max_qp_per_mcg); - TAVOR_TNF_EXIT(tavor_rsrc_mcg_entry_get_size); return (DDI_FAILURE); } /* Return the (shift) size of an individual MCG HW entry */ *mcg_size_shift = log2 + 2; - TAVOR_TNF_EXIT(tavor_rsrc_mcg_entry_get_size); return (DDI_SUCCESS); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_srq.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_srq.c index 3f1e40d0ee..da0aecfb12 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_srq.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_srq.c @@ -74,14 +74,11 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, uint32_t uarpg; uint_t wq_location, dma_xfer_mode, srq_is_umap; int flag, status; - char *errormsg; uint_t max_sgl; uint_t wqesz; _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sizes)) - TAVOR_TNF_ENTER(tavor_srq_alloc); - /* * Check the "options" flag. Currently this flag tells the driver * whether or not the SRQ's work queues should be come from normal @@ -116,8 +113,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, status = tavor_umap_db_find(state->ts_instance, ddi_get_pid(), MLNX_UMAP_UARPG_RSRC, &value, 0, NULL); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INVALID_PARAM, "failed UAR page"); goto srqalloc_fail3; } uarpg = ((tavor_rsrc_t *)(uintptr_t)value)->tr_indx; @@ -129,16 +124,12 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, /* Allocate an SRQ context entry */ status = tavor_rsrc_alloc(state, TAVOR_SRQC, 1, sleepflag, &srqc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed SRQ context"); goto srqalloc_fail1; } /* Allocate the SRQ Handle entry */ status = tavor_rsrc_alloc(state, TAVOR_SRQHDL, 1, sleepflag, &rsrc); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed SRQ handle"); goto srqalloc_fail2; } @@ -159,8 +150,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, srq->srq_srqnum, MLNX_UMAP_SRQMEM_RSRC, (uint64_t)(uintptr_t)rsrc); if (umapdb == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed umap add"); goto srqalloc_fail3; } } @@ -183,8 +172,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, * then obviously we have a lot of cleanup to do before returning. */ if (log_srq_size > state->ts_cfg_profile->cp_log_max_srq_sz) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_WR_EXCEEDED, "max SRQ size"); goto srqalloc_fail4; } @@ -195,8 +182,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, */ max_sgl = state->ts_cfg_profile->cp_srq_max_sgl; if (sizes->srq_sgl_sz > max_sgl) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_SGL_EXCEEDED, "max SRQ SGL"); goto srqalloc_fail4; } @@ -252,8 +237,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, } status = tavor_queue_alloc(state, &srq->srq_wqinfo, sleepflag); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed srq"); goto srqalloc_fail4; } buf = (uint32_t *)srq->srq_wqinfo.qa_buf_aligned; @@ -297,8 +280,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, mr_op.mro_bind_override_addr = 1; status = tavor_mr_register(state, pd, &mr_attr, &mr, &mr_op); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed register mr"); goto srqalloc_fail5; } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr)) @@ -318,16 +299,12 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, */ srq->srq_wrid_wql = tavor_wrid_wql_create(state); if (srq->srq_wrid_wql == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed wql create"); goto srqalloc_fail6; } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*(srq->srq_wrid_wql))) srq->srq_wridlist = tavor_wrid_get_list(1 << log_srq_size); if (srq->srq_wridlist == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed wridlist create"); goto srqalloc_fail7; } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*(srq->srq_wridlist))) @@ -379,10 +356,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: SW2HW_SRQ command failed: %08x\n", status); - TNF_PROBE_1(tavor_srq_alloc_sw2hw_srq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_FAILURE, "tavor SW2HW_SRQ command"); goto srqalloc_fail8; } @@ -433,7 +406,6 @@ tavor_srq_alloc(tavor_state_t *state, tavor_srq_info_t *srqinfo, *srqhdl = srq; - TAVOR_TNF_EXIT(tavor_srq_alloc); return (status); /* @@ -463,9 +435,6 @@ srqalloc_fail2: srqalloc_fail1: tavor_pd_refcnt_dec(pd); srqalloc_fail: - TNF_PROBE_1(tavor_srq_alloc_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_srq_alloc); return (status); } @@ -490,8 +459,6 @@ tavor_srq_free(tavor_state_t *state, tavor_srqhdl_t *srqhdl, uint_t sleepflag) uint_t maxprot; int status; - TAVOR_TNF_ENTER(tavor_srq_free); - /* * Pull all the necessary information from the Tavor Shared Receive * Queue handle. This is necessary here because the resource for the @@ -511,9 +478,6 @@ tavor_srq_free(tavor_state_t *state, tavor_srqhdl_t *srqhdl, uint_t sleepflag) */ if (srq->srq_refcnt != 0) { mutex_exit(&srq->srq_lock); - TNF_PROBE_1(tavor_srq_free_refcnt_fail, TAVOR_TNF_ERROR, "", - tnf_int, refcnt, srq->srq_refcnt); - TAVOR_TNF_EXIT(tavor_srq_free); return (IBT_SRQ_IN_USE); } @@ -532,7 +496,6 @@ tavor_srq_free(tavor_state_t *state, tavor_srqhdl_t *srqhdl, uint_t sleepflag) if (status != DDI_SUCCESS) { mutex_exit(&srq->srq_lock); TAVOR_WARNING(state, "failed to find in database"); - TAVOR_TNF_EXIT(tavor_srq_free); return (ibc_get_ci_failure(0)); } tavor_umap_db_free(umapdb); @@ -545,7 +508,6 @@ tavor_srq_free(tavor_state_t *state, tavor_srqhdl_t *srqhdl, uint_t sleepflag) mutex_exit(&srq->srq_lock); TAVOR_WARNING(state, "failed in SRQ memory " "devmap_devmem_remap()"); - TAVOR_TNF_EXIT(tavor_srq_free); return (ibc_get_ci_failure(0)); } srq->srq_umap_dhp = (devmap_cookie_t)NULL; @@ -575,9 +537,6 @@ tavor_srq_free(tavor_state_t *state, tavor_srqhdl_t *srqhdl, uint_t sleepflag) TAVOR_WARNING(state, "failed to reclaim SRQC ownership"); cmn_err(CE_CONT, "Tavor: HW2SW_SRQ command failed: %08x\n", status); - TNF_PROBE_1(tavor_srq_free_hw2sw_srq_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_EXIT(tavor_srq_free); return (IBT_FAILURE); } @@ -591,8 +550,6 @@ tavor_srq_free(tavor_state_t *state, tavor_srqhdl_t *srqhdl, uint_t sleepflag) sleepflag); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to deregister SRQ memory"); - TNF_PROBE_0(tavor_srq_free_dereg_mr_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_srq_free); return (IBT_FAILURE); } @@ -626,7 +583,6 @@ tavor_srq_free(tavor_state_t *state, tavor_srqhdl_t *srqhdl, uint_t sleepflag) /* Set the srqhdl pointer to NULL and return success */ *srqhdl = NULL; - TAVOR_TNF_EXIT(tavor_srq_free); return (DDI_SUCCESS); } @@ -656,9 +612,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, uint_t srq_sync, log_srq_size, maxprot; uint_t wq_location; int status; - char *errormsg; - - TAVOR_TNF_ENTER(tavor_srq_modify); /* * Check the "inddr" flag. This flag tells the driver whether or not @@ -673,9 +626,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, */ max_srq_size = (1 << state->ts_cfg_profile->cp_log_max_srq_sz); if (size > max_srq_size) { - TNF_PROBE_0(tavor_srq_modify_size_larger_than_maxsize, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_srq_modify); return (IBT_HCA_WR_EXCEEDED); } @@ -696,8 +646,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, * with the device limits and/or software-configured limits). */ if (log_srq_size > state->ts_cfg_profile->cp_log_max_srq_sz) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_HCA_WR_EXCEEDED, "max SRQ size"); goto srqmodify_fail; } @@ -724,8 +672,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, } status = tavor_queue_alloc(state, &new_srqinfo, sleepflag); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed srq"); goto srqmodify_fail; } buf = (uint32_t *)new_srqinfo.qa_buf_aligned; @@ -738,9 +684,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, wre_new = (tavor_wrid_entry_t *)kmem_zalloc((1 << log_srq_size) * sizeof (tavor_wrid_entry_t), sleepflag); if (wre_new == NULL) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, - "failed wre_new alloc"); goto srqmodify_fail; } @@ -778,8 +721,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, status = tavor_mr_mtt_bind(state, &bind, new_srqinfo.qa_dmahdl, &mtt, &mtt_pgsize_bits); if (status != DDI_SUCCESS) { - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(status, "failed mtt bind"); kmem_free(wre_new, srq->srq_wq_bufsz * sizeof (tavor_wrid_entry_t)); tavor_queue_free(state, &new_srqinfo); @@ -863,9 +804,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, if (status != TAVOR_CMD_SUCCESS) { cmn_err(CE_CONT, "Tavor: MODIFY_MPT command failed: %08x\n", status); - TNF_PROBE_1(tavor_mr_common_reg_sw2hw_mpt_cmd_fail, - TAVOR_TNF_ERROR, "", tnf_uint, status, status); - TAVOR_TNF_FAIL(status, "MODIFY_MPT command failed"); (void) tavor_mr_mtt_unbind(state, &srq->srq_mrhdl->mr_bindinfo, srq->srq_mrhdl->mr_mttrsrcp); kmem_free(wre_new, srq->srq_wq_bufsz * @@ -966,7 +904,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, kmem_free(wre_old, srq_old_bufsz * sizeof (tavor_wrid_entry_t)); } - TAVOR_TNF_EXIT(tavor_srq_modify); return (ibc_get_ci_failure(0)); } srq->srq_umap_dhp = (devmap_cookie_t)NULL; @@ -984,9 +921,6 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, status = tavor_mr_mtt_unbind(state, &old_bind, old_mtt); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed to unbind old SRQ memory"); - /* Set "status" and "errormsg" and goto failure */ - TAVOR_TNF_FAIL(ibc_get_ci_failure(0), - "failed to unbind (old)"); goto srqmodify_fail; } @@ -1007,13 +941,9 @@ tavor_srq_modify(tavor_state_t *state, tavor_srqhdl_t srq, uint_t size, *real_size = (1 << log_srq_size); } - TAVOR_TNF_EXIT(tavor_srq_modify); return (DDI_SUCCESS); srqmodify_fail: - TNF_PROBE_1(tavor_srq_modify_fail, TAVOR_TNF_ERROR, "", - tnf_string, msg, errormsg); - TAVOR_TNF_EXIT(tavor_srq_modify); return (status); } @@ -1026,8 +956,6 @@ void tavor_srq_refcnt_inc(tavor_srqhdl_t srq) { mutex_enter(&srq->srq_lock); - TNF_PROBE_1_DEBUG(tavor_srq_refcnt_inc, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, srq->srq_refcnt); srq->srq_refcnt++; mutex_exit(&srq->srq_lock); } @@ -1042,8 +970,6 @@ tavor_srq_refcnt_dec(tavor_srqhdl_t srq) { mutex_enter(&srq->srq_lock); srq->srq_refcnt--; - TNF_PROBE_1_DEBUG(tavor_srq_refcnt_dec, TAVOR_TNF_TRACE, "", - tnf_uint, refcnt, srq->srq_refcnt); mutex_exit(&srq->srq_lock); } @@ -1089,8 +1015,6 @@ tavor_srq_sgl_to_logwqesz(tavor_state_t *state, uint_t num_sgl, { uint_t max_size, log2, actual_sgl; - TAVOR_TNF_ENTER(tavor_srq_sgl_to_logwqesz); - switch (wq_type) { case TAVOR_QP_WQ_TYPE_RECVQ: /* @@ -1113,14 +1037,10 @@ tavor_srq_sgl_to_logwqesz(tavor_state_t *state, uint_t num_sgl, default: TAVOR_WARNING(state, "unexpected work queue type"); - TNF_PROBE_0(tavor_srq_sgl_to_logwqesz_inv_wqtype_fail, - TAVOR_TNF_ERROR, ""); break; } /* Fill in the return values */ *logwqesz = log2; *max_sgl = min(state->ts_cfg_profile->cp_srq_max_sgl, actual_sgl); - - TAVOR_TNF_EXIT(tavor_qp_sgl_to_logwqesz); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c index aa9e0889ae..971c880518 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_stats.c @@ -119,14 +119,10 @@ tavor_kstat_init(tavor_state_t *state) uint_t numports; int i; - TAVOR_TNF_ENTER(tavor_kstat_init); - /* Allocate a kstat info structure */ ksi = (tavor_ks_info_t *)kmem_zalloc(sizeof (tavor_ks_info_t), KM_SLEEP); if (ksi == NULL) { - TNF_PROBE_0(tavor_kstat_init_kma_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_kstat_init); return (DDI_FAILURE); } state->ts_ks_info = ksi; @@ -141,8 +137,6 @@ tavor_kstat_init(tavor_state_t *state) ksi->tki_picN_ksp[i] = tavor_kstat_picN_create(state, i, TAVOR_CNTR_NUMENTRIES, tavor_ib_perfcnt_list); if (ksi->tki_picN_ksp[i] == NULL) { - TNF_PROBE_0(tavor_kstat_init_picN_fail, - TAVOR_TNF_ERROR, ""); goto kstat_init_fail; } @@ -156,7 +150,6 @@ tavor_kstat_init(tavor_state_t *state) ksi->tki_cntr_ksp = tavor_kstat_cntr_create(state, numports, tavor_kstat_cntr_update); if (ksi->tki_cntr_ksp == NULL) { - TNF_PROBE_0(tavor_kstat_init_cntr_fail, TAVOR_TNF_ERROR, ""); goto kstat_init_fail; } @@ -176,7 +169,6 @@ tavor_kstat_init(tavor_state_t *state) mutex_init(&ksi->tki_perfcntr64_lock, NULL, MUTEX_DRIVER, NULL); cv_init(&ksi->tki_perfcntr64_cv, NULL, CV_DRIVER, NULL); - TAVOR_TNF_EXIT(tavor_kstat_init); return (DDI_SUCCESS); @@ -198,7 +190,6 @@ kstat_init_fail: /* Free the kstat info structure */ kmem_free(ksi, sizeof (tavor_ks_info_t)); - TAVOR_TNF_EXIT(tavor_kstat_init); return (DDI_FAILURE); } @@ -214,8 +205,6 @@ tavor_kstat_fini(tavor_state_t *state) uint_t numports; int i; - TAVOR_TNF_ENTER(tavor_kstat_fini); - /* Get pointer to kstat info */ ksi = state->ts_ks_info; @@ -246,8 +235,6 @@ tavor_kstat_fini(tavor_state_t *state) /* Free the kstat info structure */ kmem_free(ksi, sizeof (tavor_ks_info_t)); - - TAVOR_TNF_EXIT(tavor_kstat_fini); } @@ -265,8 +252,6 @@ tavor_kstat_picN_create(tavor_state_t *state, int num_pic, int num_evt, char *drv_name; char pic_name[16]; - TAVOR_TNF_ENTER(tavor_kstat_picN_create); - /* * Create the "picN" kstat. In the steps, below we will attach * all of our named event types to it. @@ -277,9 +262,6 @@ tavor_kstat_picN_create(tavor_state_t *state, int num_pic, int num_evt, picN_ksp = kstat_create(drv_name, drv_instance, pic_name, "bus", KSTAT_TYPE_NAMED, num_evt, 0); if (picN_ksp == NULL) { - TNF_PROBE_0(tavor_kstat_picN_create_kstat_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_kstat_picN_create); return (NULL); } pic_named_data = (struct kstat_named *)(picN_ksp->ks_data); @@ -305,7 +287,6 @@ tavor_kstat_picN_create(tavor_state_t *state, int num_pic, int num_evt, /* Install the kstat */ kstat_install(picN_ksp); - TAVOR_TNF_EXIT(tavor_kstat_picN_create); return (picN_ksp); } @@ -324,8 +305,6 @@ tavor_kstat_cntr_create(tavor_state_t *state, int num_pic, char *drv_name; char pic_str[16]; - TAVOR_TNF_ENTER(tavor_kstat_cntr_create); - /* * Create the "counters" kstat. In the steps, below we will attach * all of our "pic" to it. Note: The size of this kstat is @@ -336,9 +315,6 @@ tavor_kstat_cntr_create(tavor_state_t *state, int num_pic, cntr_ksp = kstat_create(drv_name, drv_instance, "counters", "bus", KSTAT_TYPE_NAMED, num_pic + 1, KSTAT_FLAG_WRITABLE); if (cntr_ksp == NULL) { - TNF_PROBE_0(tavor_kstat_picN_create_kstat_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_kstat_cntr_create); return (NULL); } cntr_named_data = (struct kstat_named *)(cntr_ksp->ks_data); @@ -364,7 +340,6 @@ tavor_kstat_cntr_create(tavor_state_t *state, int num_pic, /* Install the kstat */ kstat_install(cntr_ksp); - TAVOR_TNF_ENTER(tavor_kstat_cntr_create); return (cntr_ksp); } @@ -385,8 +360,6 @@ tavor_kstat_cntr_update(kstat_t *ksp, int rw) uint32_t shift, mask, oldval; uint_t numports, indx; - TAVOR_TNF_ENTER(tavor_kstat_cntr_update); - /* * Extract the Tavor softstate pointer, kstat data, pointer to the * kstat info structure, and pointer to the tki_ib_perfcnt[] array @@ -420,7 +393,6 @@ tavor_kstat_cntr_update(kstat_t *ksp, int rw) if (rw == KSTAT_WRITE) { /* Update the stored "pcr" value */ ksi->tki_pcr = data[0].value.ui64; - TAVOR_TNF_EXIT(tavor_kstat_cntr_update); return (0); } else { /* @@ -479,7 +451,6 @@ tavor_kstat_cntr_update(kstat_t *ksp, int rw) data[2].value.ui64 = ksi->tki_pic1; } - TAVOR_TNF_EXIT(tavor_kstat_cntr_update); return (0); } } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_umap.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_umap.c index fc07c44aa5..86edf1f5cc 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_umap.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_umap.c @@ -123,14 +123,10 @@ tavor_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, uint_t type; int err, status; - TAVOR_TNF_ENTER(tavor_devmap); - /* Get Tavor softstate structure from instance */ instance = TAVOR_DEV_INSTANCE(dev); state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_devmap_gss_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (ENXIO); } @@ -139,9 +135,6 @@ tavor_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, * "maintenance mode". */ if (state->ts_operational_mode == TAVOR_MAINTENANCE_MODE) { - TNF_PROBE_0(tavor_devmap_maintenance_mode_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (EFAULT); } @@ -166,9 +159,6 @@ tavor_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, * same process attempting to mmap() UAR page. */ if (key != ddi_get_pid()) { - TNF_PROBE_0(tavor_devmap_uarpg_invpid_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (EINVAL); } @@ -176,9 +166,6 @@ tavor_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, status = tavor_umap_uarpg(state, dhp, rsrcp, maplen, &err); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_devmap_uarpg_map_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (err); } break; @@ -188,9 +175,6 @@ tavor_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, status = tavor_umap_cqmem(state, dhp, rsrcp, off, maplen, &err); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_devmap_cqmem_map_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (err); } break; @@ -200,9 +184,6 @@ tavor_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, status = tavor_umap_qpmem(state, dhp, rsrcp, off, maplen, &err); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_devmap_qpmem_map_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (err); } break; @@ -212,27 +193,18 @@ tavor_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, status = tavor_umap_srqmem(state, dhp, rsrcp, off, maplen, &err); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_devmap_srqmem_map_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (err); } break; default: TAVOR_WARNING(state, "unexpected rsrc type in devmap"); - TNF_PROBE_0(tavor_devmap_invrsrc_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (EINVAL); } } else { - TNF_PROBE_0(tavor_devmap_umap_lookup_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_devmap); return (EINVAL); } - TAVOR_TNF_EXIT(tavor_devmap); return (0); } @@ -248,8 +220,6 @@ tavor_umap_uarpg(tavor_state_t *state, devmap_cookie_t dhp, int status; uint_t maxprot; - TAVOR_TNF_ENTER(tavor_umap_uarpg); - /* Map out the UAR page (doorbell page) */ maxprot = (PROT_READ | PROT_WRITE | PROT_USER); status = devmap_devmem_setup(dhp, state->ts_dip, @@ -258,13 +228,10 @@ tavor_umap_uarpg(tavor_state_t *state, devmap_cookie_t dhp, &state->ts_reg_accattr); if (status < 0) { *err = status; - TNF_PROBE_0(tavor_umap_uarpg_devmap_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_uarpg); return (DDI_FAILURE); } *maplen = PAGESIZE; - TAVOR_TNF_EXIT(tavor_umap_uarpg); return (DDI_SUCCESS); } @@ -283,8 +250,6 @@ tavor_umap_cqmem(tavor_state_t *state, devmap_cookie_t dhp, uint_t maxprot; int status; - TAVOR_TNF_ENTER(tavor_umap_cqmem); - /* Extract the Tavor CQ handle pointer from the tavor_rsrc_t */ cq = (tavor_cqhdl_t)rsrcp->tr_addr; @@ -298,13 +263,10 @@ tavor_umap_cqmem(tavor_state_t *state, devmap_cookie_t dhp, maxprot, (DEVMAP_ALLOW_REMAP | DEVMAP_DEFAULTS), NULL); if (status < 0) { *err = status; - TNF_PROBE_0(tavor_umap_cqmem_devmap_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_cqmem); return (DDI_FAILURE); } *maplen = size; - TAVOR_TNF_EXIT(tavor_umap_cqmem); return (DDI_SUCCESS); } @@ -324,8 +286,6 @@ tavor_umap_qpmem(tavor_state_t *state, devmap_cookie_t dhp, uint_t maxprot; int status; - TAVOR_TNF_ENTER(tavor_umap_qpmem); - /* Extract the Tavor QP handle pointer from the tavor_rsrc_t */ qp = (tavor_qphdl_t)rsrcp->tr_addr; @@ -346,13 +306,10 @@ tavor_umap_qpmem(tavor_state_t *state, devmap_cookie_t dhp, size, maxprot, (DEVMAP_ALLOW_REMAP | DEVMAP_DEFAULTS), NULL); if (status < 0) { *err = status; - TNF_PROBE_0(tavor_umap_qpmem_devmap_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_qpmem); return (DDI_FAILURE); } *maplen = size; - TAVOR_TNF_EXIT(tavor_umap_qpmem); return (DDI_SUCCESS); } @@ -372,8 +329,6 @@ tavor_umap_srqmem(tavor_state_t *state, devmap_cookie_t dhp, uint_t maxprot; int status; - TAVOR_TNF_ENTER(tavor_umap_srqmem); - /* Extract the Tavor SRQ handle pointer from the tavor_rsrc_t */ srq = (tavor_srqhdl_t)rsrcp->tr_addr; @@ -394,13 +349,10 @@ tavor_umap_srqmem(tavor_state_t *state, devmap_cookie_t dhp, size, maxprot, (DEVMAP_ALLOW_REMAP | DEVMAP_DEFAULTS), NULL); if (status < 0) { *err = status; - TNF_PROBE_0(tavor_umap_srqmem_devmap_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_srqmem); return (DDI_FAILURE); } *maplen = size; - TAVOR_TNF_EXIT(tavor_umap_srqmem); return (DDI_SUCCESS); } @@ -423,15 +375,10 @@ tavor_devmap_umem_map(devmap_cookie_t dhp, dev_t dev, uint_t flags, uint64_t key; uint_t type; - TAVOR_TNF_ENTER(tavor_devmap_umem_map); - /* Get Tavor softstate structure from instance */ instance = TAVOR_DEV_INSTANCE(dev); state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_devmap_umem_map_gss_fail, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_devmap_umem_map); return (ENXIO); } @@ -536,13 +483,11 @@ tavor_devmap_umem_map(devmap_cookie_t dhp, dev_t dev, uint_t flags, */ *pvtp = dvm_track; - TAVOR_TNF_EXIT(tavor_devmap_umem_map); return (DDI_SUCCESS); umem_map_fail: mutex_destroy(&dvm_track->tdt_lock); kmem_free(dvm_track, sizeof (tavor_devmap_track_t)); - TAVOR_TNF_EXIT(tavor_devmap_umem_map); return (DDI_FAILURE); } @@ -561,8 +506,6 @@ tavor_devmap_umem_dup(devmap_cookie_t dhp, void *pvtp, devmap_cookie_t new_dhp, uint_t maxprot; int status; - TAVOR_TNF_ENTER(tavor_devmap_umem_dup); - /* * Extract the Tavor softstate pointer from "Tavor devmap tracking * structure" (in "pvtp"). @@ -584,7 +527,6 @@ tavor_devmap_umem_dup(devmap_cookie_t dhp, void *pvtp, devmap_cookie_t new_dhp, dvm_track->tdt_size, maxprot, DEVMAP_MAPPING_INVALID, NULL); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed in tavor_devmap_umem_dup()"); - TAVOR_TNF_EXIT(tavor_devmap_umem_dup); return (status); } @@ -607,7 +549,6 @@ tavor_devmap_umem_dup(devmap_cookie_t dhp, void *pvtp, devmap_cookie_t new_dhp, DDI_INTR_PRI(state->ts_intrmsi_pri)); *new_pvtp = new_dvm_track; - TAVOR_TNF_EXIT(tavor_devmap_umem_dup); return (DDI_SUCCESS); } @@ -633,8 +574,6 @@ tavor_devmap_umem_unmap(devmap_cookie_t dhp, void *pvtp, offset_t off, uint_t size; int status; - TAVOR_TNF_ENTER(tavor_devmap_umem_unmap); - /* * Extract the Tavor softstate pointer from "Tavor devmap tracking * structure" (in "pvtp"). @@ -712,11 +651,9 @@ tavor_devmap_umem_unmap(devmap_cookie_t dhp, void *pvtp, offset_t off, * no further processing is necessary. */ if (size == 0) { - TAVOR_TNF_EXIT(tavor_devmap_umem_unmap); return; } } else { - TAVOR_TNF_EXIT(tavor_devmap_umem_unmap); return; } @@ -802,8 +739,6 @@ tavor_devmap_umem_unmap(devmap_cookie_t dhp, void *pvtp, offset_t off, mutex_exit(&srq->srq_lock); } } - - TAVOR_TNF_EXIT(tavor_devmap_umem_unmap); } @@ -820,15 +755,10 @@ tavor_devmap_devmem_map(devmap_cookie_t dhp, dev_t dev, uint_t flags, tavor_devmap_track_t *dvm_track; minor_t instance; - TAVOR_TNF_ENTER(tavor_devmap_devmem_map); - /* Get Tavor softstate structure from instance */ instance = TAVOR_DEV_INSTANCE(dev); state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { - TNF_PROBE_0(tavor_devmap_devmem_map_gss_fail, TAVOR_TNF_ERROR, - ""); - TAVOR_TNF_EXIT(tavor_devmap_devmem_map); return (ENXIO); } @@ -852,7 +782,6 @@ tavor_devmap_devmem_map(devmap_cookie_t dhp, dev_t dev, uint_t flags, */ *pvtp = dvm_track; - TAVOR_TNF_EXIT(tavor_devmap_devmem_map); return (DDI_SUCCESS); } @@ -871,8 +800,6 @@ tavor_devmap_devmem_dup(devmap_cookie_t dhp, void *pvtp, uint_t maxprot; int status; - TAVOR_TNF_ENTER(tavor_devmap_devmem_dup); - /* * Extract the Tavor softstate pointer from "Tavor devmap tracking * structure" (in "pvtp"). Note: If the tracking structure is NULL @@ -882,7 +809,6 @@ tavor_devmap_devmem_dup(devmap_cookie_t dhp, void *pvtp, dvm_track = (tavor_devmap_track_t *)pvtp; if (dvm_track == NULL) { *new_pvtp = NULL; - TAVOR_TNF_EXIT(tavor_devmap_devmem_dup); return (DDI_SUCCESS); } @@ -902,7 +828,6 @@ tavor_devmap_devmem_dup(devmap_cookie_t dhp, void *pvtp, dvm_track->tdt_size, maxprot, DEVMAP_MAPPING_INVALID, NULL); if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "failed in tavor_devmap_devmem_dup()"); - TAVOR_TNF_EXIT(tavor_devmap_devmem_dup); return (status); } @@ -915,7 +840,6 @@ tavor_devmap_devmem_dup(devmap_cookie_t dhp, void *pvtp, */ *new_pvtp = NULL; - TAVOR_TNF_EXIT(tavor_devmap_devmem_dup); return (DDI_SUCCESS); } @@ -932,8 +856,6 @@ tavor_devmap_devmem_unmap(devmap_cookie_t dhp, void *pvtp, offset_t off, { tavor_devmap_track_t *dvm_track; - TAVOR_TNF_ENTER(tavor_devmap_devmem_unmap); - /* * Free up the "Tavor devmap tracking structure" (in "pvtp"). * There cannot be "partial" unmappings here because all UAR pages @@ -944,12 +866,10 @@ tavor_devmap_devmem_unmap(devmap_cookie_t dhp, void *pvtp, offset_t off, dvm_track = (tavor_devmap_track_t *)pvtp; _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*dvm_track)) if (dvm_track == NULL) { - TAVOR_TNF_EXIT(tavor_devmap_devmem_unmap); return; } kmem_free(dvm_track, sizeof (tavor_devmap_track_t)); - TAVOR_TNF_EXIT(tavor_devmap_devmem_unmap); } @@ -964,8 +884,6 @@ tavor_umap_ci_data_in(tavor_state_t *state, ibt_ci_data_flags_t flags, { int status; - TAVOR_TNF_ENTER(tavor_umap_ci_data_in); - /* * Depending on the type of object about which additional information * is being provided (currently only MR is supported), we call the @@ -976,9 +894,6 @@ tavor_umap_ci_data_in(tavor_state_t *state, ibt_ci_data_flags_t flags, status = tavor_umap_mr_data_in((tavor_mrhdl_t)hdl, (ibt_mr_data_in_t *)data_p, data_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_umap_mr_data_in_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_in); return (status); } break; @@ -997,22 +912,15 @@ tavor_umap_ci_data_in(tavor_state_t *state, ibt_ci_data_flags_t flags, case IBT_HDL_EEC: case IBT_HDL_RDD: case IBT_HDL_SRQ: - TNF_PROBE_0(tavor_umap_ci_data_in_unsupp_type, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_in); return (IBT_NOT_SUPPORTED); /* * Any other types are invalid. */ default: - TNF_PROBE_0(tavor_umap_ci_data_in_invtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_in); return (IBT_INVALID_PARAM); } - TAVOR_TNF_EXIT(tavor_umap_ci_data_in); return (DDI_SUCCESS); } @@ -1025,28 +933,17 @@ static ibt_status_t tavor_umap_mr_data_in(tavor_mrhdl_t mr, ibt_mr_data_in_t *data, size_t data_sz) { - TAVOR_TNF_ENTER(tavor_umap_mr_data_in); - if (data->mr_rev != IBT_MR_DATA_IN_IF_VERSION) { - TNF_PROBE_0(tavor_umap_mr_data_in_ver_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_mr_data_in); return (IBT_NOT_SUPPORTED); } /* Check for valid MR handle pointer */ if (mr == NULL) { - TNF_PROBE_0(tavor_umap_mr_data_in_invmrhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_mr_data_in); return (IBT_MR_HDL_INVALID); } /* Check for valid MR input structure size */ if (data_sz < sizeof (ibt_mr_data_in_t)) { - TNF_PROBE_0(tavor_umap_mr_data_in_invdatasz_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_mr_data_in); return (IBT_INSUFF_RESOURCE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data)) @@ -1058,9 +955,6 @@ tavor_umap_mr_data_in(tavor_mrhdl_t mr, ibt_mr_data_in_t *data, mutex_enter(&mr->mr_lock); if ((mr->mr_is_umem == 0) || (mr->mr_umemcookie == NULL)) { mutex_exit(&mr->mr_lock); - TNF_PROBE_0(tavor_umap_mr_data_in_invumem_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_mr_data_in); return (IBT_MR_HDL_INVALID); } @@ -1075,7 +969,6 @@ tavor_umap_mr_data_in(tavor_mrhdl_t mr, ibt_mr_data_in_t *data, mr->mr_umem_cbarg2 = data->mr_arg2; mutex_exit(&mr->mr_lock); - TAVOR_TNF_EXIT(tavor_umap_cq_data_out); return (DDI_SUCCESS); } @@ -1091,8 +984,6 @@ tavor_umap_ci_data_out(tavor_state_t *state, ibt_ci_data_flags_t flags, { int status; - TAVOR_TNF_ENTER(tavor_umap_ci_data_out); - /* * Depending on the type of object about which additional information * is being requested (CQ or QP), we call the appropriate resource- @@ -1103,9 +994,6 @@ tavor_umap_ci_data_out(tavor_state_t *state, ibt_ci_data_flags_t flags, status = tavor_umap_cq_data_out((tavor_cqhdl_t)hdl, (mlnx_umap_cq_data_out_t *)data_p, data_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_umap_cq_data_out_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_out); return (status); } break; @@ -1114,9 +1002,6 @@ tavor_umap_ci_data_out(tavor_state_t *state, ibt_ci_data_flags_t flags, status = tavor_umap_qp_data_out((tavor_qphdl_t)hdl, (mlnx_umap_qp_data_out_t *)data_p, data_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_umap_qp_data_out_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_out); return (status); } break; @@ -1125,9 +1010,6 @@ tavor_umap_ci_data_out(tavor_state_t *state, ibt_ci_data_flags_t flags, status = tavor_umap_srq_data_out((tavor_srqhdl_t)hdl, (mlnx_umap_srq_data_out_t *)data_p, data_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_umap_srq_data_out_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_out); return (status); } break; @@ -1140,9 +1022,6 @@ tavor_umap_ci_data_out(tavor_state_t *state, ibt_ci_data_flags_t flags, status = tavor_umap_pd_data_out((tavor_pdhdl_t)hdl, (mlnx_umap_pd_data_out_t *)data_p, data_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_umap_pd_data_out_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_out); return (status); } break; @@ -1154,22 +1033,15 @@ tavor_umap_ci_data_out(tavor_state_t *state, ibt_ci_data_flags_t flags, case IBT_HDL_SCHED: case IBT_HDL_EEC: case IBT_HDL_RDD: - TNF_PROBE_0(tavor_umap_ci_data_out_unsupp_type, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_out); return (IBT_NOT_SUPPORTED); /* * Any other types are invalid. */ default: - TNF_PROBE_0(tavor_umap_ci_data_out_invtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_ci_data_out); return (IBT_INVALID_PARAM); } - TAVOR_TNF_EXIT(tavor_umap_ci_data_out); return (DDI_SUCCESS); } @@ -1182,21 +1054,13 @@ static ibt_status_t tavor_umap_cq_data_out(tavor_cqhdl_t cq, mlnx_umap_cq_data_out_t *data, size_t data_sz) { - TAVOR_TNF_ENTER(tavor_umap_cq_data_out); - /* Check for valid CQ handle pointer */ if (cq == NULL) { - TNF_PROBE_0(tavor_umap_cq_data_out_invcqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_cq_data_out); return (IBT_CQ_HDL_INVALID); } /* Check for valid CQ mapping structure size */ if (data_sz < sizeof (mlnx_umap_cq_data_out_t)) { - TNF_PROBE_0(tavor_umap_cq_data_out_invdatasz_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_cq_data_out); return (IBT_INSUFF_RESOURCE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data)) @@ -1225,7 +1089,6 @@ tavor_umap_cq_data_out(tavor_cqhdl_t cq, mlnx_umap_cq_data_out_t *data, data->mcq_numcqe = cq->cq_bufsz; data->mcq_cqesz = sizeof (tavor_hw_cqe_t); - TAVOR_TNF_EXIT(tavor_umap_cq_data_out); return (DDI_SUCCESS); } @@ -1238,21 +1101,13 @@ static ibt_status_t tavor_umap_qp_data_out(tavor_qphdl_t qp, mlnx_umap_qp_data_out_t *data, size_t data_sz) { - TAVOR_TNF_ENTER(tavor_umap_qp_data_out); - /* Check for valid QP handle pointer */ if (qp == NULL) { - TNF_PROBE_0(tavor_umap_qp_data_out_invqphdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_qp_data_out); return (IBT_QP_HDL_INVALID); } /* Check for valid QP mapping structure size */ if (data_sz < sizeof (mlnx_umap_qp_data_out_t)) { - TNF_PROBE_0(tavor_umap_qp_data_out_invdatasz_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_qp_data_out); return (IBT_INSUFF_RESOURCE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data)) @@ -1310,7 +1165,6 @@ tavor_umap_qp_data_out(tavor_qphdl_t qp, mlnx_umap_qp_data_out_t *data, data->mqp_sq_numwqe = qp->qp_sq_bufsz; data->mqp_sq_wqesz = (1 << qp->qp_sq_log_wqesz); - TAVOR_TNF_EXIT(tavor_umap_qp_data_out); return (DDI_SUCCESS); } @@ -1323,21 +1177,13 @@ static ibt_status_t tavor_umap_srq_data_out(tavor_srqhdl_t srq, mlnx_umap_srq_data_out_t *data, size_t data_sz) { - TAVOR_TNF_ENTER(tavor_umap_srq_data_out); - /* Check for valid SRQ handle pointer */ if (srq == NULL) { - TNF_PROBE_0(tavor_umap_srq_data_out_invsrqhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_srq_data_out); return (IBT_SRQ_HDL_INVALID); } /* Check for valid SRQ mapping structure size */ if (data_sz < sizeof (mlnx_umap_srq_data_out_t)) { - TNF_PROBE_0(tavor_umap_srq_data_out_invdatasz_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_srq_data_out); return (IBT_INSUFF_RESOURCE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data)) @@ -1374,7 +1220,6 @@ tavor_umap_srq_data_out(tavor_srqhdl_t srq, mlnx_umap_srq_data_out_t *data, data->msrq_numwqe = srq->srq_wq_bufsz; data->msrq_wqesz = (1 << srq->srq_wq_log_wqesz); - TAVOR_TNF_EXIT(tavor_umap_srq_data_out); return (DDI_SUCCESS); } @@ -1386,21 +1231,13 @@ static ibt_status_t tavor_umap_pd_data_out(tavor_pdhdl_t pd, mlnx_umap_pd_data_out_t *data, size_t data_sz) { - TAVOR_TNF_ENTER(tavor_umap_pd_data_out); - /* Check for valid PD handle pointer */ if (pd == NULL) { - TNF_PROBE_0(tavor_umap_pd_data_out_invpdhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_pd_data_out); return (IBT_PD_HDL_INVALID); } /* Check for valid PD mapping structure size */ if (data_sz < sizeof (mlnx_umap_pd_data_out_t)) { - TNF_PROBE_0(tavor_umap_pd_data_out_invdatasz_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_pd_data_out); return (IBT_INSUFF_RESOURCE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*data)) @@ -1412,7 +1249,6 @@ tavor_umap_pd_data_out(tavor_pdhdl_t pd, mlnx_umap_pd_data_out_t *data, data->mpd_rev = MLNX_UMAP_IF_VERSION; data->mpd_pdnum = pd->pd_pdnum; - TAVOR_TNF_EXIT(tavor_umap_pd_data_out); return (DDI_SUCCESS); } @@ -1423,8 +1259,6 @@ tavor_umap_pd_data_out(tavor_pdhdl_t pd, mlnx_umap_pd_data_out_t *data, void tavor_umap_db_init(void) { - TAVOR_TNF_ENTER(tavor_umap_db_init); - /* * Initialize the lock used by the Tavor "userland resources database" * This is used to ensure atomic access to add, remove, and find @@ -1444,8 +1278,6 @@ tavor_umap_db_init(void) avl_create(&tavor_userland_rsrc_db.tdl_umapdb_avl, tavor_umap_db_compare, sizeof (tavor_umap_db_entry_t), offsetof(tavor_umap_db_entry_t, tdbe_avlnode)); - - TAVOR_TNF_EXIT(tavor_umap_db_init); } @@ -1456,15 +1288,11 @@ tavor_umap_db_init(void) void tavor_umap_db_fini(void) { - TAVOR_TNF_ENTER(tavor_umap_db_fini); - /* Destroy the AVL tree for the "userland resources database" */ avl_destroy(&tavor_userland_rsrc_db.tdl_umapdb_avl); /* Destroy the lock for the "userland resources database" */ mutex_destroy(&tavor_userland_rsrc_db.tdl_umapdb_lock); - - TAVOR_TNF_EXIT(tavor_umap_db_fini); } @@ -1477,13 +1305,9 @@ tavor_umap_db_alloc(uint_t instance, uint64_t key, uint_t type, uint64_t value) { tavor_umap_db_entry_t *umapdb; - TAVOR_TNF_ENTER(tavor_umap_db_alloc); - /* Allocate an entry to add to the "userland resources database" */ umapdb = kmem_zalloc(sizeof (tavor_umap_db_entry_t), KM_NOSLEEP); if (umapdb == NULL) { - TNF_PROBE_0(tavor_umap_db_alloc_kmz_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_db_alloc); return (NULL); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb)) @@ -1494,7 +1318,6 @@ tavor_umap_db_alloc(uint_t instance, uint64_t key, uint_t type, uint64_t value) umapdb->tdbe_common.tdb_key = key; umapdb->tdbe_common.tdb_value = value; - TAVOR_TNF_EXIT(tavor_umap_db_alloc); return (umapdb); } @@ -1506,12 +1329,8 @@ tavor_umap_db_alloc(uint_t instance, uint64_t key, uint_t type, uint64_t value) void tavor_umap_db_free(tavor_umap_db_entry_t *umapdb) { - TAVOR_TNF_ENTER(tavor_umap_db_free); - /* Free the database entry */ kmem_free(umapdb, sizeof (tavor_umap_db_entry_t)); - - TAVOR_TNF_EXIT(tavor_umap_db_free); } @@ -1522,13 +1341,9 @@ tavor_umap_db_free(tavor_umap_db_entry_t *umapdb) void tavor_umap_db_add(tavor_umap_db_entry_t *umapdb) { - TAVOR_TNF_ENTER(tavor_umap_db_add); - mutex_enter(&tavor_userland_rsrc_db.tdl_umapdb_lock); tavor_umap_db_add_nolock(umapdb); mutex_exit(&tavor_userland_rsrc_db.tdl_umapdb_lock); - - TAVOR_TNF_EXIT(tavor_umap_db_add); } @@ -1542,8 +1357,6 @@ tavor_umap_db_add_nolock(tavor_umap_db_entry_t *umapdb) tavor_umap_db_query_t query; avl_index_t where; - TAVOR_TNF_ENTER(tavor_umap_db_add_nolock); - ASSERT(MUTEX_HELD(&tavor_userland_rsrc_db.tdl_umapdb_lock)); _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*umapdb)) @@ -1568,8 +1381,6 @@ tavor_umap_db_add_nolock(tavor_umap_db_entry_t *umapdb) */ avl_insert(&tavor_userland_rsrc_db.tdl_umapdb_avl, umapdb, where); - - TAVOR_TNF_EXIT(tavor_umap_db_add_nolock); } @@ -1583,14 +1394,11 @@ tavor_umap_db_find(uint_t instance, uint64_t key, uint_t type, { int status; - TAVOR_TNF_ENTER(tavor_umap_db_find); - mutex_enter(&tavor_userland_rsrc_db.tdl_umapdb_lock); status = tavor_umap_db_find_nolock(instance, key, type, value, flag, umapdb); mutex_exit(&tavor_userland_rsrc_db.tdl_umapdb_lock); - TAVOR_TNF_EXIT(tavor_umap_db_find); return (status); } @@ -1607,8 +1415,6 @@ tavor_umap_db_find_nolock(uint_t instance, uint64_t key, uint_t type, tavor_umap_db_entry_t *entry; avl_index_t where; - TAVOR_TNF_ENTER(tavor_umap_db_find_nolock); - ASSERT(MUTEX_HELD(&tavor_userland_rsrc_db.tdl_umapdb_lock)); /* @@ -1628,7 +1434,6 @@ tavor_umap_db_find_nolock(uint_t instance, uint64_t key, uint_t type, entry = (tavor_umap_db_entry_t *)avl_find( &tavor_userland_rsrc_db.tdl_umapdb_avl, &query, &where); if (entry == NULL) { - TAVOR_TNF_EXIT(tavor_umap_db_find_nolock); return (DDI_FAILURE); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*entry)) @@ -1664,7 +1469,6 @@ tavor_umap_db_find_nolock(uint_t instance, uint64_t key, uint_t type, /* Extract value field from database entry and return success */ *value = entry->tdbe_common.tdb_value; - TAVOR_TNF_EXIT(tavor_umap_db_find_nolock); return (DDI_SUCCESS); } @@ -1686,8 +1490,6 @@ tavor_umap_umemlock_cb(ddi_umem_cookie_t *umem_cookie) void (*mr_callback)(void *, void *); void *mr_cbarg1, *mr_cbarg2; - TAVOR_TNF_ENTER(tavor_umap_umemlock_cb); - /* * If this was userland memory, then we need to remove its entry * from the "userland resources database". Note: We use the @@ -1704,9 +1506,6 @@ tavor_umap_umemlock_cb(ddi_umem_cookie_t *umem_cookie) state = ddi_get_soft_state(tavor_statep, instance); if (state == NULL) { cmn_err(CE_WARN, "Unable to match Tavor instance\n"); - TNF_PROBE_0(tavor_umap_umemlock_cb_gss_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_umemlock_cb); return; } @@ -1745,13 +1544,8 @@ tavor_umap_umemlock_cb(ddi_umem_cookie_t *umem_cookie) if (status != DDI_SUCCESS) { TAVOR_WARNING(state, "Unexpected failure in " "deregister from callback\n"); - TNF_PROBE_0(tavor_umap_umemlock_cb_dereg_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_umemlock_cb); } } - - TAVOR_TNF_EXIT(tavor_umap_umemlock_cb); } @@ -1765,8 +1559,6 @@ tavor_umap_db_compare(const void *q, const void *e) tavor_umap_db_common_t *entry_common, *query_common; uint_t query_flags; - TAVOR_TNF_ENTER(tavor_umap_db_compare); - _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((tavor_umap_db_query_t *)q))) entry_common = &((tavor_umap_db_entry_t *)e)->tdbe_common; @@ -1780,10 +1572,8 @@ tavor_umap_db_compare(const void *q, const void *e) * comparing "type". */ if (query_common->tdb_key < entry_common->tdb_key) { - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (-1); } else if (query_common->tdb_key > entry_common->tdb_key) { - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (+1); } @@ -1795,10 +1585,8 @@ tavor_umap_db_compare(const void *q, const void *e) * by comparing "instance". */ if (query_common->tdb_type < entry_common->tdb_type) { - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (-1); } else if (query_common->tdb_type > entry_common->tdb_type) { - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (+1); } @@ -1812,7 +1600,6 @@ tavor_umap_db_compare(const void *q, const void *e) * instance values and returning the appropriate search direction. */ if (query_flags & TAVOR_UMAP_DB_IGNORE_INSTANCE) { - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (0); } @@ -1823,15 +1610,12 @@ tavor_umap_db_compare(const void *q, const void *e) * Else, we return success (0). */ if (query_common->tdb_instance < entry_common->tdb_instance) { - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (-1); } else if (query_common->tdb_instance > entry_common->tdb_instance) { - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (+1); } /* Everything matches... so return success */ - TAVOR_TNF_EXIT(tavor_umap_db_compare); return (0); } @@ -1850,20 +1634,12 @@ tavor_umap_db_set_onclose_cb(dev_t dev, uint64_t flag, uint64_t value; int status; - TAVOR_TNF_ENTER(tavor_umap_db_set_onclose_cb); - instance = TAVOR_DEV_INSTANCE(dev); if (instance == -1) { - TNF_PROBE_0(tavor_umap_db_set_onclose_cb_inst_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_db_set_onclose_cb); return (DDI_FAILURE); } if (flag != TAVOR_ONCLOSE_FLASH_INPROGRESS) { - TNF_PROBE_0(tavor_umap_db_set_onclose_cb_invflag_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_db_set_onclose_cb); return (DDI_FAILURE); } @@ -1878,10 +1654,7 @@ tavor_umap_db_set_onclose_cb(dev_t dev, uint64_t flag, status = tavor_umap_db_find_nolock(instance, dev, MLNX_UMAP_PID_RSRC, &value, 0, &umapdb); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_umap_db_set_onclose_cb_find_fail, - TAVOR_TNF_ERROR, ""); mutex_exit(&tavor_userland_rsrc_db.tdl_umapdb_lock); - TAVOR_TNF_EXIT(tavor_umap_db_set_onclose_cb); return (DDI_FAILURE); } @@ -1890,10 +1663,7 @@ tavor_umap_db_set_onclose_cb(dev_t dev, uint64_t flag, priv = (tavor_umap_db_priv_t *)kmem_zalloc( sizeof (tavor_umap_db_priv_t), KM_NOSLEEP); if (priv == NULL) { - TNF_PROBE_0(tavor_umap_db_set_onclose_cb_kmz_fail, - TAVOR_TNF_ERROR, ""); mutex_exit(&tavor_userland_rsrc_db.tdl_umapdb_lock); - TAVOR_TNF_EXIT(tavor_umap_db_set_onclose_cb); return (DDI_FAILURE); } } @@ -1908,7 +1678,6 @@ tavor_umap_db_set_onclose_cb(dev_t dev, uint64_t flag, umapdb->tdbe_common.tdb_priv = (void *)priv; mutex_exit(&tavor_userland_rsrc_db.tdl_umapdb_lock); - TAVOR_TNF_EXIT(tavor_umap_db_set_onclose_cb); return (DDI_SUCCESS); } @@ -1926,20 +1695,12 @@ tavor_umap_db_clear_onclose_cb(dev_t dev, uint64_t flag) uint64_t value; int status; - TAVOR_TNF_ENTER(tavor_umap_db_set_onclose_cb); - instance = TAVOR_DEV_INSTANCE(dev); if (instance == -1) { - TNF_PROBE_0(tavor_umap_db_clear_onclose_cb_inst_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_db_clear_onclose_cb); return (DDI_FAILURE); } if (flag != TAVOR_ONCLOSE_FLASH_INPROGRESS) { - TNF_PROBE_0(tavor_umap_db_clear_onclose_cb_invflag_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_umap_db_clear_onclose_cb); return (DDI_FAILURE); } @@ -1954,10 +1715,7 @@ tavor_umap_db_clear_onclose_cb(dev_t dev, uint64_t flag) status = tavor_umap_db_find_nolock(instance, dev, MLNX_UMAP_PID_RSRC, &value, 0, &umapdb); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_umap_db_clear_onclose_cb_find_fail, - TAVOR_TNF_ERROR, ""); mutex_exit(&tavor_userland_rsrc_db.tdl_umapdb_lock); - TAVOR_TNF_EXIT(tavor_umap_db_clear_onclose_cb); return (DDI_FAILURE); } diff --git a/usr/src/uts/common/io/ib/adapters/tavor/tavor_wr.c b/usr/src/uts/common/io/ib/adapters/tavor/tavor_wr.c index fd103b3eed..d33c99219b 100644 --- a/usr/src/uts/common/io/ib/adapters/tavor/tavor_wr.c +++ b/usr/src/uts/common/io/ib/adapters/tavor/tavor_wr.c @@ -109,17 +109,12 @@ tavor_post_send(tavor_state_t *state, tavor_qphdl_t qp, uint_t maxdb = TAVOR_QP_MAXDESC_PER_DB; int status; - TAVOR_TNF_ENTER(tavor_post_send); - /* * Check for user-mappable QP memory. Note: We do not allow kernel * clients to post to QP memory that is accessible directly by the * user. If the QP memory is user accessible, then return an error. */ if (qp->qp_is_umap) { - TNF_PROBE_0(tavor_post_send_inv_usrmapped_type, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_post_send); return (IBT_QP_HDL_INVALID); } @@ -136,9 +131,6 @@ tavor_post_send(tavor_state_t *state, tavor_qphdl_t qp, (qp->qp_state == TAVOR_QP_INIT) || (qp->qp_state == TAVOR_QP_RTR)) { mutex_exit(&qp->qp_lock); - TNF_PROBE_0(tavor_post_send_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_post_send); return (IBT_QP_STATE_INVALID); } @@ -197,8 +189,6 @@ tavor_post_send(tavor_state_t *state, tavor_qphdl_t qp, */ if (qp->qp_sq_wqhdr->wq_full != 0) { status = IBT_QP_FULL; - TNF_PROBE_0_DEBUG(tavor_post_send_sqfull, - TAVOR_TNF_TRACE, ""); break; } @@ -228,8 +218,6 @@ tavor_post_send(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_wqe_send_build(state, qp, &wr[wrindx], desc, &desc_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_post_send_bldwqe_fail, - TAVOR_TNF_ERROR, ""); break; } @@ -383,7 +371,6 @@ tavor_post_send(tavor_state_t *state, tavor_qphdl_t qp, mutex_exit(&qp->qp_sq_wqhdr->wq_wrid_wql->wql_lock); mutex_exit(&qp->qp_lock); - TAVOR_TNF_EXIT(tavor_post_send); return (status); } @@ -406,17 +393,12 @@ tavor_post_recv(tavor_state_t *state, tavor_qphdl_t qp, uint_t maxdb = TAVOR_QP_MAXDESC_PER_DB; int status; - TAVOR_TNF_ENTER(tavor_post_recv); - /* * Check for user-mappable QP memory. Note: We do not allow kernel * clients to post to QP memory that is accessible directly by the * user. If the QP memory is user accessible, then return an error. */ if (qp->qp_is_umap) { - TNF_PROBE_0(tavor_post_recv_inv_usrmapped_type, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_post_recv); return (IBT_QP_HDL_INVALID); } @@ -430,9 +412,6 @@ tavor_post_recv(tavor_state_t *state, tavor_qphdl_t qp, */ if (qp->qp_srq_en == TAVOR_QP_SRQ_ENABLED) { mutex_exit(&qp->qp_lock); - TNF_PROBE_0(tavor_post_recv_fail_qp_on_srq, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_post_recv); return (IBT_SRQ_IN_USE); } @@ -441,9 +420,6 @@ tavor_post_recv(tavor_state_t *state, tavor_qphdl_t qp, */ if (qp->qp_state == TAVOR_QP_RESET) { mutex_exit(&qp->qp_lock); - TNF_PROBE_0(tavor_post_recv_inv_qpstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_post_recv); return (IBT_QP_STATE_INVALID); } @@ -500,8 +476,6 @@ tavor_post_recv(tavor_state_t *state, tavor_qphdl_t qp, */ if (qp->qp_rq_wqhdr->wq_full != 0) { status = IBT_QP_FULL; - TNF_PROBE_0_DEBUG(tavor_post_recv_rqfull, - TAVOR_TNF_TRACE, ""); break; } @@ -531,8 +505,6 @@ tavor_post_recv(tavor_state_t *state, tavor_qphdl_t qp, status = tavor_wqe_recv_build(state, qp, &wr[wrindx], desc, &desc_sz); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_post_recv_bldwqe_fail, - TAVOR_TNF_ERROR, ""); break; } @@ -639,7 +611,6 @@ tavor_post_recv(tavor_state_t *state, tavor_qphdl_t qp, mutex_exit(&qp->qp_rq_wqhdr->wq_wrid_wql->wql_lock); mutex_exit(&qp->qp_lock); - TAVOR_TNF_EXIT(tavor_post_recv); return (status); } @@ -659,17 +630,12 @@ tavor_post_srq(tavor_state_t *state, tavor_srqhdl_t srq, uint_t maxdb = TAVOR_QP_MAXDESC_PER_DB; int status; - TAVOR_TNF_ENTER(tavor_post_srq); - /* * Check for user-mappable QP memory. Note: We do not allow kernel * clients to post to QP memory that is accessible directly by the * user. If the QP memory is user accessible, then return an error. */ if (srq->srq_is_umap) { - TNF_PROBE_0(tavor_post_srq_inv_usrmapped_type, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_post_srq); return (IBT_SRQ_HDL_INVALID); } @@ -683,9 +649,6 @@ tavor_post_srq(tavor_state_t *state, tavor_srqhdl_t srq, */ if (srq->srq_state == TAVOR_SRQ_STATE_ERROR) { mutex_exit(&srq->srq_lock); - TNF_PROBE_0(tavor_post_srq_inv_srqstate_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_post_srq); return (IBT_QP_STATE_INVALID); } @@ -736,8 +699,6 @@ tavor_post_srq(tavor_state_t *state, tavor_srqhdl_t srq, */ if (srq->srq_wridlist->wl_free_list_indx == -1) { status = IBT_QP_FULL; - TNF_PROBE_0_DEBUG(tavor_post_srq_wqfull, - TAVOR_TNF_TRACE, ""); break; } @@ -771,8 +732,6 @@ tavor_post_srq(tavor_state_t *state, tavor_srqhdl_t srq, status = tavor_wqe_srq_build(state, srq, &wr[wrindx], desc); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_post_recv_bldwqe_fail, - TAVOR_TNF_ERROR, ""); break; } @@ -879,7 +838,6 @@ tavor_post_srq(tavor_state_t *state, tavor_srqhdl_t srq, mutex_exit(&srq->srq_wrid_wql->wql_lock); mutex_exit(&srq->srq_lock); - TAVOR_TNF_EXIT(tavor_post_srq); return (status); } @@ -901,9 +859,6 @@ tavor_qp_send_doorbell(tavor_state_t *state, uint32_t nda, uint32_t nds, ((uint64_t)nopcode << TAVOR_QPSNDDB_NOPCODE_SHIFT) | ((uint64_t)qpn << TAVOR_QPSNDDB_QPN_SHIFT) | nds; - TNF_PROBE_1_DEBUG(tavor_qp_send_doorbell, TAVOR_TNF_TRACE, "", - tnf_ulong, doorbell, doorbell); - /* Write the doorbell to UAR */ TAVOR_UAR_DOORBELL(state, (uint64_t *)&state->ts_uar->send, doorbell); @@ -926,9 +881,6 @@ tavor_qp_recv_doorbell(tavor_state_t *state, uint32_t nda, uint32_t nds, ((uint64_t)nds << TAVOR_QPRCVDB_NDS_SHIFT) | ((uint64_t)qpn << TAVOR_QPRCVDB_QPN_SHIFT) | credits; - TNF_PROBE_1_DEBUG(tavor_qp_recv_doorbell, TAVOR_TNF_TRACE, "", - tnf_ulong, doorbell, doorbell); - /* Write the doorbell to UAR */ TAVOR_UAR_DOORBELL(state, (uint64_t *)&state->ts_uar->recv, doorbell); @@ -954,8 +906,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, uint32_t nds; int i, num_ds, status; - TAVOR_TNF_ENTER(tavor_wqe_send_build); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* Initialize the information for the Data Segments */ @@ -973,9 +923,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, case IBT_UD_SRV: /* Ensure that work request transport type matches QP type */ if (qp->qp_serv_type != TAVOR_QP_UD) { - TNF_PROBE_0(tavor_wqe_send_build_inv_servtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_SRV_TYPE_INVALID); } @@ -984,9 +931,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, * "Send" operation is valid */ if (wr->wr_opcode != IBT_WRC_SEND) { - TNF_PROBE_0(tavor_wqe_send_build_inv_optype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_OP_TYPE_INVALID); } @@ -997,7 +941,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, */ if (qp->qp_is_special) { status = tavor_wqe_mlx_build(state, qp, wr, desc, size); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (status); } @@ -1011,9 +954,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, sizeof (tavor_hw_snd_wqe_nextctrl_t)); ah = (tavor_ahhdl_t)wr->wr.ud.udwr_dest->ud_ah; if (ah == NULL) { - TNF_PROBE_0(tavor_wqe_send_build_invahhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_AH_HDL_INVALID); } @@ -1034,9 +974,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, case IBT_RC_SRV: /* Ensure that work request transport type matches QP type */ if (qp->qp_serv_type != TAVOR_QP_RC) { - TNF_PROBE_0(tavor_wqe_send_build_inv_servtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_SRV_TYPE_INVALID); } @@ -1051,9 +988,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, (wr->wr_opcode != IBT_WRC_CSWAP) && (wr->wr_opcode != IBT_WRC_FADD) && (wr->wr_opcode != IBT_WRC_BIND)) { - TNF_PROBE_0(tavor_wqe_send_build_inv_optype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_OP_TYPE_INVALID); } @@ -1129,9 +1063,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, if (wr->wr_opcode == IBT_WRC_BIND) { status = tavor_wr_bind_check(state, wr); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_wqe_send_build_bind_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (status); } @@ -1160,9 +1091,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, case IBT_UC_SRV: /* Ensure that work request transport type matches QP type */ if (qp->qp_serv_type != TAVOR_QP_UC) { - TNF_PROBE_0(tavor_wqe_send_build_inv_servtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_SRV_TYPE_INVALID); } @@ -1175,9 +1103,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, if ((wr->wr_opcode != IBT_WRC_SEND) && (wr->wr_opcode != IBT_WRC_RDMAW) && (wr->wr_opcode != IBT_WRC_BIND)) { - TNF_PROBE_0(tavor_wqe_send_build_inv_optype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_OP_TYPE_INVALID); } @@ -1218,9 +1143,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, if (wr->wr_opcode == IBT_WRC_BIND) { status = tavor_wr_bind_check(state, wr); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_wqe_send_build_bind_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (status); } @@ -1247,9 +1169,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, break; default: - TNF_PROBE_0(tavor_wqe_send_build_inv_tranport_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_SRV_TYPE_INVALID); } @@ -1259,9 +1178,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, * Start by checking for a valid number of SGL entries */ if (nds > qp->qp_sq_sgl) { - TNF_PROBE_0(tavor_wqe_send_build_toomanysgl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (IBT_QP_SGL_LEN_INVALID); } @@ -1291,7 +1207,6 @@ tavor_wqe_send_build(tavor_state_t *state, tavor_qphdl_t qp, /* Return the size of descriptor (in 16-byte chunks) */ *size = ((uintptr_t)&ds[num_ds] - (uintptr_t)desc) >> 4; - TAVOR_TNF_EXIT(tavor_wqe_send_build); return (DDI_SUCCESS); } @@ -1447,8 +1362,6 @@ tavor_wqe_mlx_build(tavor_state_t *state, tavor_qphdl_t qp, uint32_t desc_sz, udav_sz; int i, num_ds; - TAVOR_TNF_ENTER(tavor_wqe_mlx_build); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* Initialize the information for the Data Segments */ @@ -1462,9 +1375,6 @@ tavor_wqe_mlx_build(tavor_state_t *state, tavor_qphdl_t qp, */ ah = (tavor_ahhdl_t)wr->wr.ud.udwr_dest->ud_ah; if (ah == NULL) { - TNF_PROBE_0(tavor_wqe_mlx_build_invahhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_mlx_build); return (IBT_AH_HDL_INVALID); } mutex_enter(&ah->ah_lock); @@ -1483,9 +1393,6 @@ tavor_wqe_mlx_build(tavor_state_t *state, tavor_qphdl_t qp, */ if ((udav.rlid == IB_LID_PERMISSIVE) && (qp->qp_is_special == TAVOR_QP_GSI)) { - TNF_PROBE_0(tavor_wqe_mlx_build_permissiveLIDonQP1_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_mlx_build); return (IBT_AH_HDL_INVALID); } @@ -1545,9 +1452,6 @@ tavor_wqe_mlx_build(tavor_state_t *state, tavor_qphdl_t qp, * combination of global routine (GRH) and QP0 is not allowed. */ if (qp->qp_is_special == TAVOR_QP_SMI) { - TNF_PROBE_0(tavor_wqe_mlx_build_GRHonQP0_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_mlx_build); return (IBT_AH_HDL_INVALID); } grh = (ib_grh_t *)((uintptr_t)lrh + sizeof (ib_lrh_hdr_t)); @@ -1586,9 +1490,6 @@ tavor_wqe_mlx_build(tavor_state_t *state, tavor_qphdl_t qp, * Start by checking for a valid number of SGL entries */ if (nds > qp->qp_sq_sgl) { - TNF_PROBE_0(tavor_wqe_mlx_build_toomanysgl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_mlx_build); return (IBT_QP_SGL_LEN_INVALID); } @@ -1660,7 +1561,6 @@ tavor_wqe_mlx_build(tavor_state_t *state, tavor_qphdl_t qp, /* Return the size of descriptor (in 16-byte chunks) */ *size = ((uintptr_t)&ds[num_ds] - (uintptr_t)desc) >> 0x4; - TAVOR_TNF_EXIT(tavor_wqe_mlx_build); return (DDI_SUCCESS); } @@ -1808,17 +1708,12 @@ tavor_wqe_recv_build(tavor_state_t *state, tavor_qphdl_t qp, tavor_hw_wqe_sgl_t *ds; int i, num_ds; - TAVOR_TNF_ENTER(tavor_wqe_recv_build); - ASSERT(MUTEX_HELD(&qp->qp_lock)); /* Check that work request transport type is valid */ if ((qp->qp_serv_type != TAVOR_QP_UD) && (qp->qp_serv_type != TAVOR_QP_RC) && (qp->qp_serv_type != TAVOR_QP_UC)) { - TNF_PROBE_0(tavor_build_recv_wqe_inv_servtype_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_build_recv_wqe); return (IBT_QP_SRV_TYPE_INVALID); } @@ -1829,9 +1724,6 @@ tavor_wqe_recv_build(tavor_state_t *state, tavor_qphdl_t qp, /* Check for valid number of SGL entries */ if (wr->wr_nds > qp->qp_rq_sgl) { - TNF_PROBE_0(tavor_wqe_recv_build_toomanysgl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_recv_build); return (IBT_QP_SGL_LEN_INVALID); } @@ -1861,7 +1753,6 @@ tavor_wqe_recv_build(tavor_state_t *state, tavor_qphdl_t qp, /* Return the size of descriptor (in 16-byte chunks) */ *size = ((uintptr_t)&ds[num_ds] - (uintptr_t)desc) >> 0x4; - TAVOR_TNF_EXIT(tavor_wqe_recv_build); return (DDI_SUCCESS); } @@ -1925,8 +1816,6 @@ tavor_wqe_srq_build(tavor_state_t *state, tavor_srqhdl_t srq, ibt_wr_ds_t end_sgl; int i, num_ds; - TAVOR_TNF_ENTER(tavor_wqe_recv_build); - ASSERT(MUTEX_HELD(&srq->srq_lock)); /* Fill in the Data Segments (SGL) for the Recv WQE */ @@ -1936,9 +1825,6 @@ tavor_wqe_srq_build(tavor_state_t *state, tavor_srqhdl_t srq, /* Check for valid number of SGL entries */ if (wr->wr_nds > srq->srq_wq_sgl) { - TNF_PROBE_0(tavor_wqe_srq_build_toomanysgl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_srq_build); return (IBT_QP_SGL_LEN_INVALID); } @@ -1978,7 +1864,6 @@ tavor_wqe_srq_build(tavor_state_t *state, tavor_srqhdl_t srq, TAVOR_WQE_BUILD_DATA_SEG_SRQ(srq, &ds[num_ds], &end_sgl); } - TAVOR_TNF_EXIT(tavor_wqe_srq_build); return (DDI_SUCCESS); } @@ -2087,8 +1972,6 @@ tavor_wqe_sync(void *hdl, uint_t sync_from, uint_t sync_to, uint32_t qsize; int status; - TAVOR_TNF_ENTER(tavor_wqe_sync); - if (sync_type == TAVOR_WR_SRQ) { srq = (tavor_srqhdl_t)hdl; is_sync_req = srq->srq_sync; @@ -2103,7 +1986,6 @@ tavor_wqe_sync(void *hdl, uint_t sync_from, uint_t sync_to, /* Determine if the work queues need to be synced or not */ if (is_sync_req == 0) { - TAVOR_TNF_EXIT(tavor_wqe_sync); return; } @@ -2155,8 +2037,6 @@ tavor_wqe_sync(void *hdl, uint_t sync_from, uint_t sync_to, status = ddi_dma_sync(dmahdl, offset, length, flag); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_wqe_sync_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_sync); return; } } else { @@ -2166,9 +2046,6 @@ tavor_wqe_sync(void *hdl, uint_t sync_from, uint_t sync_to, if (length) { status = ddi_dma_sync(dmahdl, offset, length, flag); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_wqe_sync_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_sync); return; } } @@ -2178,13 +2055,9 @@ tavor_wqe_sync(void *hdl, uint_t sync_from, uint_t sync_to, length = (size_t)((uintptr_t)wqe_top - (uintptr_t)wqe_from); status = ddi_dma_sync(dmahdl, offset, length, flag); if (status != DDI_SUCCESS) { - TNF_PROBE_0(tavor_wqe_sync_fail, TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wqe_sync); return; } } - - TAVOR_TNF_EXIT(tavor_wqe_sync); } @@ -2203,23 +2076,15 @@ tavor_wr_bind_check(tavor_state_t *state, ibt_send_wr_t *wr) tavor_rsrc_t *mpt; uint32_t new_rkey; - TAVOR_TNF_ENTER(tavor_wr_bind_check); - /* Check for a valid Memory Window handle in the WR */ mw = (tavor_mwhdl_t)wr->wr.rc.rcwr.bind->bind_ibt_mw_hdl; if (mw == NULL) { - TNF_PROBE_0(tavor_wr_bind_check_invmwhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MW_HDL_INVALID); } /* Check for a valid Memory Region handle in the WR */ mr = (tavor_mrhdl_t)wr->wr.rc.rcwr.bind->bind_ibt_mr_hdl; if (mr == NULL) { - TNF_PROBE_0(tavor_wr_bind_check_invmrhdl_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MR_HDL_INVALID); } @@ -2234,9 +2099,6 @@ tavor_wr_bind_check(tavor_state_t *state, ibt_send_wr_t *wr) if ((mr->mr_is_umem) && (mr->mr_umemcookie == NULL)) { mutex_exit(&mr->mr_lock); mutex_exit(&mw->mr_lock); - TNF_PROBE_0(tavor_wr_bind_check_invmrhdl2_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MR_HDL_INVALID); } @@ -2244,9 +2106,6 @@ tavor_wr_bind_check(tavor_state_t *state, ibt_send_wr_t *wr) if (mw->mr_rkey != wr->wr.rc.rcwr.bind->bind_rkey) { mutex_exit(&mr->mr_lock); mutex_exit(&mw->mr_lock); - TNF_PROBE_0(tavor_wr_bind_check_invrkey_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MR_RKEY_INVALID); } @@ -2254,9 +2113,6 @@ tavor_wr_bind_check(tavor_state_t *state, ibt_send_wr_t *wr) if (mr->mr_lkey != wr->wr.rc.rcwr.bind->bind_lkey) { mutex_exit(&mr->mr_lock); mutex_exit(&mw->mr_lock); - TNF_PROBE_0(tavor_wr_bind_check_invlkey_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MR_LKEY_INVALID); } @@ -2273,18 +2129,12 @@ tavor_wr_bind_check(tavor_state_t *state, ibt_send_wr_t *wr) if ((vaddr < reg_start_addr) || (vaddr > reg_end_addr)) { mutex_exit(&mr->mr_lock); mutex_exit(&mw->mr_lock); - TNF_PROBE_0(tavor_wr_bind_check_inv_vaddr_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MR_VA_INVALID); } vaddr = (vaddr + len) - 1; if (vaddr > reg_end_addr) { mutex_exit(&mr->mr_lock); mutex_exit(&mw->mr_lock); - TNF_PROBE_0(tavor_wr_bind_check_invlen_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MR_LEN_INVALID); } } @@ -2300,9 +2150,6 @@ tavor_wr_bind_check(tavor_state_t *state, ibt_send_wr_t *wr) !(mr->mr_accflag & IBT_MR_LOCAL_WRITE)) { mutex_exit(&mr->mr_lock); mutex_exit(&mw->mr_lock); - TNF_PROBE_0(tavor_wr_bind_check_invflags_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (IBT_MR_ACCESS_REQ_INVALID); } @@ -2315,7 +2162,6 @@ tavor_wr_bind_check(tavor_state_t *state, ibt_send_wr_t *wr) mutex_exit(&mr->mr_lock); mutex_exit(&mw->mr_lock); - TAVOR_TNF_EXIT(tavor_wr_bind_check); return (DDI_SUCCESS); } @@ -2333,8 +2179,6 @@ tavor_wrid_from_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) uint_t create_wql = 0; uint_t qp_srq_en; - TAVOR_TNF_ENTER(tavor_wrid_from_reset_handling); - /* * For each of this QP's Work Queues, make sure we have a (properly * initialized) Work Request ID list attached to the relevant @@ -2355,9 +2199,6 @@ tavor_wrid_from_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) * header, then drop the lock(s) and return failure. */ tavor_wrid_wqhdr_unlock_both(qp); - TNF_PROBE_0(tavor_wrid_from_reset_handling_wqhdr_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wrid_from_reset_handling); return (ibc_get_ci_failure(0)); } } @@ -2384,9 +2225,6 @@ tavor_wrid_from_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) } tavor_wrid_wqhdr_unlock_both(qp); - TNF_PROBE_0(tavor_wrid_from_reset_handling_wridlist_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wrid_from_reset_handling); return (ibc_get_ci_failure(0)); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*s_wridlist)) @@ -2456,9 +2294,6 @@ tavor_wrid_from_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) #endif tavor_wrid_wqhdr_unlock_both(qp); - TNF_PROBE_0(tavor_wrid_from_reset_handling_wqhdr_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wrid_from_reset_handling); return (ibc_get_ci_failure(0)); } } @@ -2540,9 +2375,6 @@ tavor_wrid_from_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) #endif tavor_wrid_wqhdr_unlock_both(qp); - TNF_PROBE_0(tavor_wrid_from_reset_handling_wridlist_fail, - TAVOR_TNF_ERROR, ""); - TAVOR_TNF_EXIT(tavor_wrid_from_reset_handling); return (ibc_get_ci_failure(0)); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*r_wridlist)) @@ -2600,7 +2432,6 @@ tavor_wrid_from_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*swq)) tavor_wrid_wqhdr_unlock_both(qp); - TAVOR_TNF_EXIT(tavor_wrid_from_reset_handling); return (DDI_SUCCESS); } @@ -2614,8 +2445,6 @@ tavor_wrid_to_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) { uint_t free_wqhdr = 0; - TAVOR_TNF_ENTER(tavor_wrid_to_reset_handling); - /* * For each of this QP's Work Queues, move the WRID "container" to * the "reapable" list. Although there may still be unpolled @@ -2668,8 +2497,6 @@ tavor_wrid_to_reset_handling(tavor_state_t *state, tavor_qphdl_t qp) } tavor_wrid_wqhdr_unlock_both(qp); mutex_exit(&qp->qp_rq_cqhdl->cq_lock); - - TAVOR_TNF_EXIT(tavor_wrid_to_reset_handling); } @@ -2684,8 +2511,6 @@ tavor_wrid_add_entry(tavor_workq_hdr_t *wq, uint64_t wrid, uint32_t wqeaddrsz, tavor_wrid_entry_t *wre_tmp; uint32_t head, tail, size; - TAVOR_TNF_ENTER(tavor_wrid_add_entry); - ASSERT(MUTEX_HELD(&wq->wq_wrid_wql->wql_lock)); /* @@ -2725,7 +2550,6 @@ tavor_wrid_add_entry(tavor_workq_hdr_t *wq, uint64_t wrid, uint32_t wqeaddrsz, if (head == tail) { wq->wq_wrid_post->wl_full = 1; } - TAVOR_TNF_EXIT(tavor_wrid_add_entry); } /* @@ -2739,8 +2563,6 @@ tavor_wrid_add_entry_srq(tavor_srqhdl_t srq, uint64_t wrid, uint_t signaled_dbd) uint64_t *wl_wqe; uint32_t wqe_index; - TAVOR_TNF_ENTER(tavor_wrid_add_entry_srq); - /* * Find the next available WQE from the SRQ free_list. Then update the * free_list to point to the next entry @@ -2766,8 +2588,6 @@ tavor_wrid_add_entry_srq(tavor_srqhdl_t srq, uint64_t wrid, uint_t signaled_dbd) /* Update the free list index */ srq->srq_wridlist->wl_free_list_indx = ddi_get32( srq->srq_wridlist->wl_acchdl, (uint32_t *)wl_wqe); - - TAVOR_TNF_EXIT(tavor_wrid_add_entry_srq); } @@ -2784,8 +2604,6 @@ tavor_wrid_get_entry(tavor_cqhdl_t cq, tavor_hw_cqe_t *cqe, uint64_t wrid; uint_t send_or_recv, qpnum, error, opcode; - TAVOR_TNF_ENTER(tavor_wrid_get_entry); - /* Lock the list of work queues associated with this CQ */ mutex_enter(&cq->cq_wrid_wqhdr_lock); @@ -2847,7 +2665,6 @@ tavor_wrid_get_entry(tavor_cqhdl_t cq, tavor_hw_cqe_t *cqe, mutex_exit(&wq->wq_wrid_wql->wql_lock); mutex_exit(&cq->cq_wrid_wqhdr_lock); - TAVOR_TNF_EXIT(tavor_wrid_get_entry); return (wrid); } @@ -2866,8 +2683,6 @@ tavor_wrid_find_match(tavor_workq_hdr_t *wq, tavor_cqhdl_t cq, uint32_t head, tail, size; int found = 0, last_container; - TAVOR_TNF_ENTER(tavor_wrid_find_match); - ASSERT(MUTEX_HELD(&wq->wq_wrid_wql->wql_lock)); /* Pull the "wqeaddrsz" information from the CQE */ @@ -2985,7 +2800,6 @@ tavor_wrid_find_match(tavor_workq_hdr_t *wq, tavor_cqhdl_t cq, /* Ensure that we've actually found what we were searching for */ ASSERT(curr != NULL); - TAVOR_TNF_EXIT(tavor_wrid_find_match); return (curr); } @@ -3058,8 +2872,6 @@ tavor_wrid_cq_reap(tavor_cqhdl_t cq) ASSERT(MUTEX_HELD(&cq->cq_lock)); - TAVOR_TNF_ENTER(tavor_wrid_cq_reap); - /* Lock the list of work queues associated with this CQ */ mutex_enter(&cq->cq_wrid_wqhdr_lock); @@ -3083,7 +2895,6 @@ tavor_wrid_cq_reap(tavor_cqhdl_t cq) cq->cq_wrid_reap_head = cq->cq_wrid_reap_tail = NULL; mutex_exit(&cq->cq_wrid_wqhdr_lock); - TAVOR_TNF_EXIT(tavor_wrid_cq_reap); } @@ -3101,8 +2912,6 @@ tavor_wrid_cq_force_reap(tavor_cqhdl_t cq) ASSERT(MUTEX_HELD(&cq->cq_lock)); - TAVOR_TNF_ENTER(tavor_wrid_cq_reap); - /* * The first step is to walk the "reapable" list and free up those * containers. This is necessary because the containers on the @@ -3150,7 +2959,6 @@ tavor_wrid_cq_force_reap(tavor_cqhdl_t cq) avl_destroy(treep); mutex_exit(&cq->cq_wrid_wqhdr_lock); - TAVOR_TNF_EXIT(tavor_wrid_cq_reap); } @@ -3262,8 +3070,6 @@ tavor_wrid_reaplist_add(tavor_cqhdl_t cq, tavor_workq_hdr_t *wq) { ASSERT(MUTEX_HELD(&cq->cq_wrid_wqhdr_lock)); - TAVOR_TNF_ENTER(tavor_wrid_reaplist_add); - mutex_enter(&wq->wq_wrid_wql->wql_lock); /* @@ -3315,8 +3121,6 @@ tavor_wrid_wqhdr_find(tavor_cqhdl_t cq, uint_t qpn, uint_t wq_type) tavor_workq_hdr_t *curr; tavor_workq_compare_t cmp; - TAVOR_TNF_ENTER(tavor_wrid_wqhdr_find); - ASSERT(MUTEX_HELD(&cq->cq_wrid_wqhdr_lock)); /* @@ -3332,7 +3136,6 @@ tavor_wrid_wqhdr_find(tavor_cqhdl_t cq, uint_t qpn, uint_t wq_type) #endif curr = avl_find(&cq->cq_wrid_wqhdr_avl_tree, &cmp, NULL); - TAVOR_TNF_EXIT(tavor_wrid_wqhdr_find); return (curr); } @@ -3347,8 +3150,6 @@ tavor_wrid_wqhdr_create(tavor_state_t *state, tavor_cqhdl_t cq, uint_t qpn, { tavor_workq_hdr_t *wqhdr_tmp; - TAVOR_TNF_ENTER(tavor_wrid_wqhdr_create); - ASSERT(MUTEX_HELD(&cq->cq_wrid_wqhdr_lock)); /* @@ -3361,7 +3162,6 @@ tavor_wrid_wqhdr_create(tavor_state_t *state, tavor_cqhdl_t cq, uint_t qpn, wqhdr_tmp = (tavor_workq_hdr_t *)kmem_zalloc( sizeof (tavor_workq_hdr_t), KM_NOSLEEP); if (wqhdr_tmp == NULL) { - TAVOR_TNF_EXIT(tavor_wrid_wqhdr_create); return (NULL); } _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*wqhdr_tmp)) @@ -3372,7 +3172,6 @@ tavor_wrid_wqhdr_create(tavor_state_t *state, tavor_cqhdl_t cq, uint_t qpn, wqhdr_tmp->wq_wrid_wql = tavor_wrid_wql_create(state); if (wqhdr_tmp->wq_wrid_wql == NULL) { kmem_free(wqhdr_tmp, sizeof (tavor_workq_hdr_t)); - TAVOR_TNF_EXIT(tavor_wrid_wqhdr_create); return (NULL); } } @@ -3383,7 +3182,6 @@ tavor_wrid_wqhdr_create(tavor_state_t *state, tavor_cqhdl_t cq, uint_t qpn, /* Chain the newly allocated work queue header to the CQ's list */ tavor_cq_wqhdr_add(cq, wqhdr_tmp); - TAVOR_TNF_EXIT(tavor_wrid_wqhdr_create); return (wqhdr_tmp); } @@ -3397,14 +3195,11 @@ tavor_wrid_wql_create(tavor_state_t *state) { tavor_wq_lock_t *wql; - TAVOR_TNF_ENTER(tavor_wrid_wql_create); - /* * Allocate the WQL and initialize it. */ wql = kmem_zalloc(sizeof (tavor_wq_lock_t), KM_NOSLEEP); if (wql == NULL) { - TAVOR_TNF_EXIT(tavor_wrid_wqhdr_create); return (NULL); } @@ -3414,7 +3209,6 @@ tavor_wrid_wql_create(tavor_state_t *state) /* Add refcount to WQL */ tavor_wql_refcnt_inc(wql); - TAVOR_TNF_EXIT(tavor_wrid_wql_create); return (wql); } @@ -3529,8 +3323,6 @@ tavor_wrid_list_reap(tavor_wrid_list_hdr_t *wridlist) tavor_wrid_list_hdr_t *prev, *next; uint32_t size; - TAVOR_TNF_ENTER(tavor_wrid_list_reap); - /* Get the back pointer to the work queue header (see below) */ wqhdr = wridlist->wl_wqhdr; mutex_enter(&wqhdr->wq_wrid_wql->wql_lock); @@ -3570,7 +3362,6 @@ tavor_wrid_list_reap(tavor_wrid_list_hdr_t *wridlist) mutex_exit(&wqhdr->wq_wrid_wql->wql_lock); - TAVOR_TNF_EXIT(tavor_wrid_list_reap); return (consume_wqhdr); } diff --git a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_mod.c b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_mod.c index 10a202ce81..b4e510e151 100644 --- a/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_mod.c +++ b/usr/src/uts/common/io/ib/mgt/ibmf/ibmf_mod.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file implements the _init(9e), _info(9e) and _fini(9e) functions. */ @@ -53,11 +51,6 @@ extern int ibmf_fini(); extern int ibmf_saa_impl_init(); extern int ibmf_saa_impl_fini(); -#ifndef NPROBE -extern int tnf_mod_load(void); -extern int tnf_mod_unload(struct modlinkage *mlp); -#endif - int _init() { @@ -66,9 +59,6 @@ _init() /* CONSTCOND */ ASSERT(NO_COMPETING_THREADS); -#ifndef NPROBE - (void) tnf_mod_load(); -#endif ibmf_statep = &ibmf_state; /* @@ -77,39 +67,20 @@ _init() */ status = ibmf_saa_impl_init(); if (status != IBMF_SUCCESS) { - TNF_PROBE_1(_init_error, IBMF_TNF_ERROR, "", tnf_string, msg, - "ibmf_saa_impl_init failed"); - -#ifndef NPROBE - (void) tnf_mod_unload(&ibmf_modlinkage); -#endif return (EACCES); } - - status = ibmf_init(); if (status != 0) { - TNF_PROBE_1(_init_error, IBMF_TNF_ERROR, "", tnf_string, msg, - "ibmf_init failed"); - (void) ibmf_saa_impl_fini(); -#ifndef NPROBE - (void) tnf_mod_unload(&ibmf_modlinkage); -#endif return (EACCES); } status = mod_install(&ibmf_modlinkage); if (status != 0) { - TNF_PROBE_2(_init_error, IBMF_TNF_ERROR, "", tnf_string, msg, - "mod_install failed", tnf_uint, status, status); -#ifndef NPROBE - (void) tnf_mod_unload(&ibmf_modlinkage); -#endif (void) ibmf_fini(); - ibmf_statep = (ibmf_state_t *)NULL; + ibmf_statep = NULL; } return (status); @@ -127,23 +98,15 @@ _fini() int status; status = mod_remove(&ibmf_modlinkage); if (status != 0) { - TNF_PROBE_2(_fini_error, IBMF_TNF_ERROR, "", tnf_string, msg, - "mod_remove failed", tnf_uint, status, status); return (status); } status = ibmf_saa_impl_fini(); if (status != 0) { - - TNF_PROBE_2(_fini_error, IBMF_TNF_ERROR, "", tnf_string, msg, - "ibmf_saa fini failed", tnf_uint, status, status); return (status); } (void) ibmf_fini(); - ibmf_statep = (ibmf_state_t *)NULL; -#ifndef NPROBE - (void) tnf_mod_unload(&ibmf_modlinkage); -#endif + ibmf_statep = NULL; return (status); } diff --git a/usr/src/uts/common/krtld/kobj.c b/usr/src/uts/common/krtld/kobj.c index 6c36cd5e95..7d034d37a0 100644 --- a/usr/src/uts/common/krtld/kobj.c +++ b/usr/src/uts/common/krtld/kobj.c @@ -67,7 +67,6 @@ #include <sys/fs/decomp.h> #include <sys/callb.h> #include <sys/cmn_err.h> -#include <sys/tnf_probe.h> #include <sys/zmod.h> #include <krtld/reloc.h> @@ -139,10 +138,6 @@ extern int alloc_gottable(struct module *, caddr_t *, caddr_t *); extern int kobj_boot_mountroot(void); #endif -static void tnf_unsplice_probes(uint_t, struct modctl *); -extern tnf_probe_control_t *__tnf_probe_list_head; -extern tnf_tag_data_t *__tnf_tag_list_head; - extern int modrootloaded; extern int swaploaded; extern int bop_io_quiesced; @@ -259,13 +254,6 @@ static char *suppress_sym_list[] = static kobj_notify_list_t *kobj_notifiers[KOBJ_NOTIFY_MAX + 1]; /* - * TNF probe management globals - */ -tnf_probe_control_t *__tnf_probe_list_head = NULL; -tnf_tag_data_t *__tnf_tag_list_head = NULL; -int tnf_changed_probe_list = 0; - -/* * Prefix for statically defined tracing (SDT) DTrace probes. */ const char *sdt_prefix = "__dtrace_probe_"; @@ -433,9 +421,8 @@ kobj_init( * about the executable. In particular, it does not read in, map or * otherwise look at the program headers. We fake all that up now. * - * We do this early as DTrace static probes and tnf probes both call - * undefined references. We have to process those relocations before - * calling any of them. + * We do this early as DTrace static probes call undefined references. + * We have to process those relocations before calling any of them. * * OBP tells kobj_start() where the ELF image is in memory, so it * synthesized bootaux before kobj_init() was called @@ -4473,87 +4460,6 @@ expand_libmacro(char *tail, char *path, char *pathend) return (NULL); } -static void -tnf_add_notifyunload(kobj_notify_f *fp) -{ - kobj_notify_list_t *entry; - - entry = kobj_alloc(sizeof (kobj_notify_list_t), KM_WAIT); - entry->kn_type = KOBJ_NOTIFY_MODUNLOADING; - entry->kn_func = fp; - (void) kobj_notify_add(entry); -} - -/* ARGSUSED */ -static void -tnf_unsplice_probes(uint_t what, struct modctl *mod) -{ - tnf_probe_control_t **p; - tnf_tag_data_t **q; - struct module *mp = mod->mod_mp; - - if (!(mp->flags & KOBJ_TNF_PROBE)) - return; - - for (p = &__tnf_probe_list_head; *p; ) - if (kobj_addrcheck(mp, (char *)*p) == 0) - *p = (*p)->next; - else - p = &(*p)->next; - - for (q = &__tnf_tag_list_head; *q; ) - if (kobj_addrcheck(mp, (char *)*q) == 0) - *q = (tnf_tag_data_t *)(*q)->tag_version; - else - q = (tnf_tag_data_t **)&(*q)->tag_version; - - tnf_changed_probe_list = 1; -} - -int -tnf_splice_probes(int boot_load, tnf_probe_control_t *plist, - tnf_tag_data_t *tlist) -{ - int result = 0; - static int add_notify = 1; - - if (plist) { - tnf_probe_control_t *pl; - - for (pl = plist; pl->next; ) - pl = pl->next; - - if (!boot_load) - mutex_enter(&mod_lock); - tnf_changed_probe_list = 1; - pl->next = __tnf_probe_list_head; - __tnf_probe_list_head = plist; - if (!boot_load) - mutex_exit(&mod_lock); - result = 1; - } - - if (tlist) { - tnf_tag_data_t *tl; - - for (tl = tlist; tl->tag_version; ) - tl = (tnf_tag_data_t *)tl->tag_version; - - if (!boot_load) - mutex_enter(&mod_lock); - tl->tag_version = (tnf_tag_version_t *)__tnf_tag_list_head; - __tnf_tag_list_head = tlist; - if (!boot_load) - mutex_exit(&mod_lock); - result = 1; - } - if (!boot_load && result && add_notify) { - tnf_add_notifyunload(tnf_unsplice_probes); - add_notify = 0; - } - return (result); -} - char *kobj_file_buf; int kobj_file_bufsize; diff --git a/usr/src/uts/common/krtld/kobj_stubs.c b/usr/src/uts/common/krtld/kobj_stubs.c index 3ef581f1c3..0e75bf12c6 100644 --- a/usr/src/uts/common/krtld/kobj_stubs.c +++ b/usr/src/uts/common/krtld/kobj_stubs.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/kobj.h> #include <sys/kobj_impl.h> #include <sys/errno.h> @@ -249,7 +247,4 @@ kobj_boot_unmountroot(void) * Dummy declarations for variables in * the stand-alone linker/loader. */ -void *__tnf_probe_list_head; -void *__tnf_tag_list_head; -int tnf_changed_probe_list; char *boot_cpu_compatible_list; diff --git a/usr/src/uts/common/os/aio_subr.c b/usr/src/uts/common/os/aio_subr.c index c857026a27..02068a6267 100644 --- a/usr/src/uts/common/os/aio_subr.c +++ b/usr/src/uts/common/os/aio_subr.c @@ -42,7 +42,6 @@ #include <sys/fs/snode.h> #include <sys/siginfo.h> #include <sys/cpuvar.h> -#include <sys/tnf_probe.h> #include <sys/conf.h> #include <sys/sdt.h> @@ -100,13 +99,6 @@ aphysio( return (EINVAL); #endif /* _ILP32 */ - TNF_PROBE_5(aphysio_start, "kaio", /* CSTYLED */, - tnf_opaque, bp, bp, - tnf_device, device, dev, - tnf_offset, blkno, btodt(uio->uio_loffset), - tnf_size, size, uio->uio_iov->iov_len, - tnf_bioflags, rw, rw); - if (rw == B_READ) { CPU_STATS_ADD_K(sys, phread, 1); } else { @@ -214,13 +206,6 @@ aio_done(struct buf *bp) reqp = (aio_req_t *)bp->b_forw; fd = reqp->aio_req_fd; - TNF_PROBE_5(aphysio_end, "kaio", /* CSTYLED */, - tnf_opaque, bp, bp, - tnf_device, device, bp->b_edev, - tnf_offset, blkno, btodt(reqp->aio_req_uio.uio_loffset), - tnf_size, size, reqp->aio_req_uio.uio_iov->iov_len, - tnf_bioflags, rw, (bp->b_flags & (B_READ|B_WRITE))); - /* * mapout earlier so that more kmem is available when aio is * heavily used. bug #1262082 diff --git a/usr/src/uts/common/os/bio.c b/usr/src/uts/common/os/bio.c index daf3b638a6..14151186e1 100644 --- a/usr/src/uts/common/os/bio.c +++ b/usr/src/uts/common/os/bio.c @@ -60,7 +60,6 @@ #include <vm/page.h> #include <vm/pvn.h> #include <sys/vtrace.h> -#include <sys/tnf_probe.h> #include <sys/fs/ufs_inode.h> #include <sys/fs/ufs_bio.h> #include <sys/fs/ufs_log.h> @@ -1238,16 +1237,6 @@ biowait(struct buf *bp) return (error); } -static void -biodone_tnf_probe(struct buf *bp) -{ - /* Kernel probe */ - TNF_PROBE_3(biodone, "io blockio", /* CSTYLED */, - tnf_device, device, bp->b_edev, - tnf_diskaddr, block, bp->b_lblkno, - tnf_opaque, buf, bp); -} - /* * Mark I/O complete on a buffer, release it if I/O is asynchronous, * and wake up anyone waiting for it. @@ -1260,12 +1249,6 @@ biodone(struct buf *bp) bp->b_flags &= ~B_STARTED; } - /* - * Call the TNF probe here instead of the inline code - * to force our compiler to use the tail call optimization. - */ - biodone_tnf_probe(bp); - if (bp->b_iodone != NULL) { (*(bp->b_iodone))(bp); return; @@ -1330,10 +1313,6 @@ pageio_setup(struct page *pp, size_t len, struct vnode *vp, int flags) if (lwp != NULL) lwp->lwp_ru.majflt++; CPU_STATS_ADDQ(cpup, vm, maj_fault, 1); - /* Kernel probe */ - TNF_PROBE_2(major_fault, "vm pagefault", /* CSTYLED */, - tnf_opaque, vnode, pp->p_vnode, - tnf_offset, offset, pp->p_offset); } /* * Update statistics for pages being paged in @@ -1360,11 +1339,6 @@ pageio_setup(struct page *pp, size_t len, struct vnode *vp, int flags) CPU_STATS_EXIT_K(); TRACE_1(TR_FAC_VM, TR_PAGE_WS_IN, "page_ws_in:pp %p", pp); - /* Kernel probe */ - TNF_PROBE_3(pagein, "vm pageio io", /* CSTYLED */, - tnf_opaque, vnode, pp->p_vnode, - tnf_offset, offset, pp->p_offset, - tnf_size, size, len); } bp = kmem_zalloc(sizeof (struct buf), KM_SLEEP); diff --git a/usr/src/uts/common/os/driver.c b/usr/src/uts/common/os/driver.c index c6ef9ee367..e64f4d1345 100644 --- a/usr/src/uts/common/os/driver.c +++ b/usr/src/uts/common/os/driver.c @@ -43,7 +43,6 @@ #include <sys/kmem.h> #include <sys/file.h> #include <sys/debug.h> -#include <sys/tnf_probe.h> /* Don't #include <sys/ddi.h> - it #undef's getmajor() */ @@ -435,18 +434,6 @@ dev_to_instance(dev_t dev) return ((int)(uintptr_t)vinstance); } -static void -bdev_strategy_tnf_probe(struct buf *bp) -{ - /* Kernel probe */ - TNF_PROBE_5(strategy, "io blockio", /* CSTYLED */, - tnf_device, device, bp->b_edev, - tnf_diskaddr, block, bp->b_lblkno, - tnf_size, size, bp->b_bcount, - tnf_opaque, buf, bp, - tnf_bioflags, flags, bp->b_flags); -} - int bdev_strategy(struct buf *bp) { @@ -466,12 +453,6 @@ bdev_strategy(struct buf *bp) DTRACE_IO1(start, struct buf *, bp); bp->b_flags |= B_STARTED; - /* - * Call the TNF probe here instead of the inline code - * to force our compiler to use the tail call optimization. - */ - bdev_strategy_tnf_probe(bp); - return (ops->devo_cb_ops->cb_strategy(bp)); } diff --git a/usr/src/uts/common/os/dtrace_subr.c b/usr/src/uts/common/os/dtrace_subr.c index a6af6ff4ce..a7ac2fc3b7 100644 --- a/usr/src/uts/common/os/dtrace_subr.c +++ b/usr/src/uts/common/os/dtrace_subr.c @@ -27,7 +27,6 @@ #include <sys/dtrace.h> #include <sys/cmn_err.h> -#include <sys/tnf.h> #include <sys/atomic.h> #include <sys/prsystm.h> #include <sys/modctl.h> @@ -195,12 +194,7 @@ dtrace_vtime_enable(void) nstate = DTRACE_VTIME_ACTIVE; break; - case DTRACE_VTIME_INACTIVE_TNF: - nstate = DTRACE_VTIME_ACTIVE_TNF; - break; - case DTRACE_VTIME_ACTIVE: - case DTRACE_VTIME_ACTIVE_TNF: panic("DTrace virtual time already enabled"); /*NOTREACHED*/ } @@ -223,12 +217,7 @@ dtrace_vtime_disable(void) nstate = DTRACE_VTIME_INACTIVE; break; - case DTRACE_VTIME_ACTIVE_TNF: - nstate = DTRACE_VTIME_INACTIVE_TNF; - break; - case DTRACE_VTIME_INACTIVE: - case DTRACE_VTIME_INACTIVE_TNF: panic("DTrace virtual time already disabled"); /*NOTREACHED*/ } @@ -238,74 +227,11 @@ dtrace_vtime_disable(void) } void -dtrace_vtime_enable_tnf(void) -{ - dtrace_vtime_state_t state, nstate; - - nstate = DTRACE_VTIME_INACTIVE; - do { - state = dtrace_vtime_active; - - switch (state) { - case DTRACE_VTIME_ACTIVE: - nstate = DTRACE_VTIME_ACTIVE_TNF; - break; - - case DTRACE_VTIME_INACTIVE: - nstate = DTRACE_VTIME_INACTIVE_TNF; - break; - - case DTRACE_VTIME_ACTIVE_TNF: - case DTRACE_VTIME_INACTIVE_TNF: - panic("TNF already active"); - /*NOTREACHED*/ - } - - } while (atomic_cas_32((uint32_t *)&dtrace_vtime_active, - state, nstate) != state); -} - -void -dtrace_vtime_disable_tnf(void) -{ - dtrace_vtime_state_t state, nstate; - - nstate = DTRACE_VTIME_INACTIVE; - do { - state = dtrace_vtime_active; - - switch (state) { - case DTRACE_VTIME_ACTIVE_TNF: - nstate = DTRACE_VTIME_ACTIVE; - break; - - case DTRACE_VTIME_INACTIVE_TNF: - nstate = DTRACE_VTIME_INACTIVE; - break; - - case DTRACE_VTIME_ACTIVE: - case DTRACE_VTIME_INACTIVE: - panic("TNF already inactive"); - /*NOTREACHED*/ - } - - } while (atomic_cas_32((uint32_t *)&dtrace_vtime_active, - state, nstate) != state); -} - -void dtrace_vtime_switch(kthread_t *next) { dtrace_icookie_t cookie; hrtime_t ts; - if (tnf_tracing_active) { - tnf_thread_switch(next); - - if (dtrace_vtime_active == DTRACE_VTIME_INACTIVE_TNF) - return; - } - cookie = dtrace_interrupt_disable(); ts = dtrace_gethrtime(); diff --git a/usr/src/uts/common/os/lwp.c b/usr/src/uts/common/os/lwp.c index 341e4ae356..f487760e68 100644 --- a/usr/src/uts/common/os/lwp.c +++ b/usr/src/uts/common/os/lwp.c @@ -48,7 +48,6 @@ #include <sys/door.h> #include <vm/seg_kp.h> #include <sys/debug.h> -#include <sys/tnf.h> #include <sys/schedctl.h> #include <sys/poll.h> #include <sys/copyops.h> @@ -1052,12 +1051,6 @@ lwp_exit(void) t->t_proc_flag |= TP_LWPEXIT; term_mstate(t); -#ifndef NPROBE - /* Kernel probe */ - if (t->t_tnf_tpdp) - tnf_thread_exit(); -#endif /* NPROBE */ - t->t_forw->t_back = t->t_back; t->t_back->t_forw = t->t_forw; if (t == p->p_tlist) diff --git a/usr/src/uts/common/os/sched.c b/usr/src/uts/common/os/sched.c index 6eb1194af3..a54ab28751 100644 --- a/usr/src/uts/common/os/sched.c +++ b/usr/src/uts/common/os/sched.c @@ -49,7 +49,6 @@ #include <sys/modctl.h> #include <sys/debug.h> #include <sys/sdt.h> -#include <sys/tnf_probe.h> #include <sys/procfs.h> #include <vm/seg.h> @@ -575,11 +574,6 @@ top: /* Kernel probe */ DTRACE_SCHED1(swapin__lwp, kthread_t *, tp); - TNF_PROBE_4(swapin_lwp, "vm swap swapin", /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_lwpid, lwpid, tp->t_tid, - tnf_kthread_id, tid, tp, - tnf_ulong, page_count, stack_pages); rw_enter(&kas.a_lock, RW_READER); err = segkp_fault(segkp->s_as->a_hat, segkp, @@ -715,14 +709,6 @@ top: /* Kernel probe */ DTRACE_SCHED1(swapout__lwp, kthread_t *, tp); - TNF_PROBE_4(swapout_lwp, - "vm swap swapout", - /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_lwpid, lwpid, tp->t_tid, - tnf_kthread_id, tid, tp, - tnf_ulong, page_count, - stack_pages); rw_enter(&kas.a_lock, RW_READER); err = segkp_fault(segkp->s_as->a_hat, @@ -771,11 +757,9 @@ top: TRACE_2(TR_FAC_SCHED, TR_SWAPOUT, "swapout: pp %p pages_pushed %lu", pp, ws_pages); + /* Kernel probe */ DTRACE_SCHED1(swapout__process, proc_t *, pp); - TNF_PROBE_2(swapout_process, "vm swap swapout", /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_ulong, page_count, ws_pages); } *swrss = ws_pages; return (swapped_lwps); @@ -891,11 +875,6 @@ process_swap_queue(void) /* Kernel probe */ DTRACE_SCHED1(swapout__lwp, kthread_t *, tp); - TNF_PROBE_4(swapout_lwp, "vm swap swapout", /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_lwpid, lwpid, tp->t_tid, - tnf_kthread_id, tid, tp, - tnf_ulong, page_count, stack_pages); rw_enter(&kas.a_lock, RW_READER); err = segkp_fault(segkp->s_as->a_hat, segkp, tp->t_swap, @@ -939,12 +918,9 @@ process_swap_queue(void) TRACE_2(TR_FAC_SCHED, TR_SWAPQ_PROC, "swaplist_proc: pp %p pages_pushed: %lu", pp, ws_pages); + /* Kernel probe */ DTRACE_SCHED1(swapout__process, proc_t *, pp); - TNF_PROBE_2(swapout_process, "vm swap swapout", - /* CSTYLED */, - tnf_pid, pid, pp->p_pid, - tnf_ulong, page_count, ws_pages); } pp->p_swrss += ws_pages; disp_lock_enter(&swapped_lock); diff --git a/usr/src/uts/common/os/vm_pageout.c b/usr/src/uts/common/os/vm_pageout.c index 1df2f479a5..0cfcf80d62 100644 --- a/usr/src/uts/common/os/vm_pageout.c +++ b/usr/src/uts/common/os/vm_pageout.c @@ -62,7 +62,6 @@ #include <sys/kmem.h> #include <sys/debug.h> #include <sys/callb.h> -#include <sys/tnf_probe.h> #include <sys/mem_cage.h> #include <sys/time.h> #include <sys/zone.h> diff --git a/usr/src/uts/common/os/vm_subr.c b/usr/src/uts/common/os/vm_subr.c index 537ddb6908..7163852fd6 100644 --- a/usr/src/uts/common/os/vm_subr.c +++ b/usr/src/uts/common/os/vm_subr.c @@ -59,7 +59,6 @@ #include <sys/swap.h> #include <sys/vtrace.h> -#include <sys/tnf_probe.h> #include <sys/fs/snode.h> #include <sys/copyops.h> #include <sys/conf.h> @@ -142,13 +141,6 @@ default_physio(int (*strat)(struct buf *), struct buf *bp, dev_t dev, TRACE_1(TR_FAC_PHYSIO, TR_PHYSIO_START, "physio_start: bp %p", bp); - /* Kernel probe */ - TNF_PROBE_4(physio_start, "io rawio", /* CSTYLED */, - tnf_device, device, dev, - tnf_offset, offset, uio->uio_loffset, - tnf_size, size, uio->uio_resid, - tnf_bioflags, rw, rw); - if (rw == B_READ) { CPU_STATS_ADD_K(sys, phread, 1); } else { @@ -290,10 +282,6 @@ default_physio(int (*strat)(struct buf *), struct buf *bp, dev_t dev, kmem_cache_free(physio_buf_cache, bp); } - /* Kernel probe */ - TNF_PROBE_1(physio_end, "io rawio", /* CSTYLED */, - tnf_device, device, dev); - TRACE_1(TR_FAC_PHYSIO, TR_PHYSIO_END, "physio_end: bp %p", bp); return (error); diff --git a/usr/src/uts/common/sys/1394/adapters/hci1394.h b/usr/src/uts/common/sys/1394/adapters/hci1394.h index 7598d203b3..a75625b0fb 100644 --- a/usr/src/uts/common/sys/1394/adapters/hci1394.h +++ b/usr/src/uts/common/sys/1394/adapters/hci1394.h @@ -46,7 +46,6 @@ extern "C" { #include <sys/1394/h1394.h> #include <sys/1394/adapters/hci1394_def.h> -#include <sys/1394/adapters/hci1394_tnf.h> #include <sys/1394/adapters/hci1394_drvinfo.h> #include <sys/1394/adapters/hci1394_tlist.h> #include <sys/1394/adapters/hci1394_tlabel.h> diff --git a/usr/src/uts/common/sys/1394/adapters/hci1394_tnf.h b/usr/src/uts/common/sys/1394/adapters/hci1394_tnf.h deleted file mode 100644 index 6dc0826916..0000000000 --- a/usr/src/uts/common/sys/1394/adapters/hci1394_tnf.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1999-2000 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#ifndef _SYS_1394_ADAPTERS_HCI1394_TNF_H -#define _SYS_1394_ADAPTERS_HCI1394_TNF_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * hci1394_tnf.h - * Keys used for TNF_PROBE_* routines - */ - -#ifdef __cplusplus -extern "C" { -#endif - -#include <sys/tnf_probe.h> - - -#define HCI1394_TNF_HAL " 1394 hci1394 " -#define HCI1394_TNF_HAL_STACK " 1394 hci1394 stacktrace " -#define HCI1394_TNF_HAL_STACK_ISOCH " 1394 hci1394 stacktrace isoch" -#define HCI1394_TNF_HAL_ERROR " 1394 hci1394 error " -#define HCI1394_TNF_HAL_ERROR_ISOCH " 1394 hci1394 error isoch" -#define HCI1394_TNF_HAL_INFO " 1394 hci1394 info " -#define HCI1394_TNF_HAL_INFO_ISOCH " 1394 hci1394 info isoch" -#define HCI1394_TNF_HAL_TLABEL " 1394 hci1394 tlabel " - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_1394_ADAPTERS_HCI1394_TNF_H */ diff --git a/usr/src/uts/common/sys/1394/s1394.h b/usr/src/uts/common/sys/1394/s1394.h index bb59cb18d9..a45e5b36d7 100644 --- a/usr/src/uts/common/sys/1394/s1394.h +++ b/usr/src/uts/common/sys/1394/s1394.h @@ -27,8 +27,6 @@ #ifndef _SYS_1394_S1394_H #define _SYS_1394_S1394_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * s1394.h * Contains all of the structures used (internally) by the 1394 @@ -172,40 +170,6 @@ extern "C" { #define ISOCH_SPEED_FACTOR_S200 8 #define ISOCH_SPEED_FACTOR_S400 4 -/* TNF probes */ -#define S1394_TNF_SL "1394 s1394 " -#define S1394_TNF_SL_ERROR "1394 s1394 error " -#define S1394_TNF_SL_STACK "1394 s1394 stacktrace " -#define S1394_TNF_SL_ARREQ_STACK "1394 s1394 arreq stacktrace " -#define S1394_TNF_SL_ARREQ_ERROR "1394 s1394 arreq error " -#define S1394_TNF_SL_ATREQ_STACK "1394 s1394 atreq stacktrace " -#define S1394_TNF_SL_ATREQ_ERROR "1394 s1394 atreq error " -#define S1394_TNF_SL_ATRESP_STACK "1394 s1394 atresp stacktrace " -#define S1394_TNF_SL_ATRESP_ERROR "1394 s1394 atresp error " -#define S1394_TNF_SL_ATREQ_ATRESP_STACK "1394 s1394 atreq atresp stacktrace " -#define S1394_TNF_SL_ATREQ_ATRESP_ERROR "1394 s1394 atreq atresp error " -#define S1394_TNF_SL_BR_STACK "1394 s1394 bus_reset stacktrace " -#define S1394_TNF_SL_BR_ERROR "1394 s1394 bus_reset error " -#define S1394_TNF_SL_IOCTL_STACK "1394 s1394 ioctl stacktrace " -#define S1394_TNF_SL_HOTPLUG_STACK "1394 s1394 hotplug stacktrace " -#define S1394_TNF_SL_HOTPLUG_ERROR "1394 s1394 hotplug error " -#define S1394_TNF_SL_NX1394_STACK "1394 s1394 nx1394 stacktrace " -#define S1394_TNF_SL_CSR_ERROR "1394 s1394 csr error " -#define S1394_TNF_SL_CSR_STACK "1394 s1394 csr stacktrace " -#define S1394_TNF_SL_BR_CSR_STACK "1394 s1394 bus_reset csr stacktrace " -#define S1394_TNF_SL_CFGROM_ERROR "1394 s1394 cfgrom error " -#define S1394_TNF_SL_CFGROM_STACK "1394 s1394 cfgrom stacktrace " -#define S1394_TNF_SL_ISOCH_ERROR "1394 s1394 isoch error " -#define S1394_TNF_SL_ISOCH_STACK "1394 s1394 isoch stacktrace " -#define S1394_TNF_SL_NEXUS_ERROR "1394 s1394 nexus error " -#define S1394_TNF_SL_NEXUS_STACK "1394 s1394 nexus stacktrace " -#define S1394_TNF_SL_FA_STACK "1394 s1394 FA stacktrace " -#define S1394_TNF_SL_FA_ERROR "1394 s1394 FA error " -#define S1394_TNF_SL_FCP_STACK "1394 s1394 FCP stacktrace " -#define S1394_TNF_SL_FCP_ERROR "1394 s1394 FCP error " -#define S1394_TNF_SL_CMP_STACK "1394 s1394 CMP stacktrace " -#define S1394_TNF_SL_CMP_ERROR "1394 s1394 CMP error " - /* s1394_hal_state_t */ typedef enum { S1394_HAL_INIT, diff --git a/usr/src/uts/common/sys/1394/targets/av1394/av1394_impl.h b/usr/src/uts/common/sys/1394/targets/av1394/av1394_impl.h index c6f6715492..d40b832633 100644 --- a/usr/src/uts/common/sys/1394/targets/av1394/av1394_impl.h +++ b/usr/src/uts/common/sys/1394/targets/av1394/av1394_impl.h @@ -35,7 +35,6 @@ #include <sys/sunddi.h> #include <sys/strsun.h> #include <sys/mkdev.h> -#include <sys/tnf_probe.h> #include <sys/av/iec61883.h> #include <sys/1394/t1394.h> #include <sys/1394/targets/av1394/av1394_isoch.h> @@ -296,17 +295,6 @@ enum { /* current interface version */ #define AV1394_IEC61883_VER IEC61883_V1_0 -/* TNF probes */ -#define AV1394_TNF_FCP "1394 av1394 fcp " -#define AV1394_TNF_FCP_STACK "1394 av1394 fcp stacktrace " -#define AV1394_TNF_FCP_ERROR "1394 av1394 fcp error " -#define AV1394_TNF_ASYNC "1394 av1394 async " -#define AV1394_TNF_ASYNC_STACK "1394 av1394 async stacktrace " -#define AV1394_TNF_ASYNC_ERROR "1394 av1394 async error " -#define AV1394_TNF_INST "1394 av1394 inst " -#define AV1394_TNF_INST_STACK "1394 av1394 inst stacktrace " -#define AV1394_TNF_INST_ERROR "1394 av1394 inst error " - /* misc */ #define NELEM(a) (sizeof (a) / sizeof (*(a))) diff --git a/usr/src/uts/common/sys/1394/targets/av1394/av1394_isoch.h b/usr/src/uts/common/sys/1394/targets/av1394/av1394_isoch.h index 75c6e33f80..33131d4a63 100644 --- a/usr/src/uts/common/sys/1394/targets/av1394/av1394_isoch.h +++ b/usr/src/uts/common/sys/1394/targets/av1394/av1394_isoch.h @@ -441,16 +441,6 @@ enum { AV1394_PREQ_IT_UNDERRUN = 0x02 }; - -/* TNF probes */ -#define AV1394_TNF_CMP "1394 av1394 cmp " -#define AV1394_TNF_CMP_STACK "1394 av1394 cmp stacktrace " -#define AV1394_TNF_CMP_ERROR "1394 av1394 cmp error " -#define AV1394_TNF_ISOCH "1394 av1394 isoch " -#define AV1394_TNF_ISOCH_STACK "1394 av1394 isoch stacktrace " -#define AV1394_TNF_ISOCH_ERROR "1394 av1394 isoch error " - - /* isoch channel */ int av1394_ic_open(struct av1394_inst_s *, int); int av1394_ic_close(struct av1394_inst_s *, int); diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile index 3c22bb04ce..258aec975e 100644 --- a/usr/src/uts/common/sys/Makefile +++ b/usr/src/uts/common/sys/Makefile @@ -619,10 +619,6 @@ CHKHDRS= \ tirdwr.h \ tiuser.h \ tl.h \ - tnf.h \ - tnf_com.h \ - tnf_probe.h \ - tnf_writer.h \ todio.h \ tpicommon.h \ ts.h \ diff --git a/usr/src/uts/common/sys/crypto/impl.h b/usr/src/uts/common/sys/crypto/impl.h index 7d9c959ecd..c3cb03f3c3 100644 --- a/usr/src/uts/common/sys/crypto/impl.h +++ b/usr/src/uts/common/sys/crypto/impl.h @@ -37,7 +37,6 @@ #include <sys/crypto/api.h> #include <sys/crypto/spi.h> #include <sys/crypto/ioctl.h> -#include <sys/tnf_probe.h> #include <sys/atomic.h> #include <sys/project.h> #include <sys/taskq.h> diff --git a/usr/src/uts/common/sys/dtrace.h b/usr/src/uts/common/sys/dtrace.h index f554fb0e58..dbd3775207 100644 --- a/usr/src/uts/common/sys/dtrace.h +++ b/usr/src/uts/common/sys/dtrace.h @@ -2254,16 +2254,12 @@ extern int dtrace_meta_unregister(dtrace_meta_provider_id_t); */ typedef enum dtrace_vtime_state { - DTRACE_VTIME_INACTIVE = 0, /* No DTrace, no TNF */ - DTRACE_VTIME_ACTIVE, /* DTrace virtual time, no TNF */ - DTRACE_VTIME_INACTIVE_TNF, /* No DTrace, TNF active */ - DTRACE_VTIME_ACTIVE_TNF /* DTrace virtual time _and_ TNF */ + DTRACE_VTIME_INACTIVE = 0, /* No DTrace */ + DTRACE_VTIME_ACTIVE, /* DTrace virtual time */ } dtrace_vtime_state_t; extern dtrace_vtime_state_t dtrace_vtime_active; extern void dtrace_vtime_switch(kthread_t *next); -extern void dtrace_vtime_enable_tnf(void); -extern void dtrace_vtime_disable_tnf(void); extern void dtrace_vtime_enable(void); extern void dtrace_vtime_disable(void); diff --git a/usr/src/uts/common/sys/fibre-channel/ulp/fcip.h b/usr/src/uts/common/sys/fibre-channel/ulp/fcip.h index f87d9acc09..7546e9ca28 100644 --- a/usr/src/uts/common/sys/fibre-channel/ulp/fcip.h +++ b/usr/src/uts/common/sys/fibre-channel/ulp/fcip.h @@ -572,75 +572,6 @@ struct fcip_sendup_elem { struct fcipstr *(*fcipsu_func)(); }; - -/* - * Having TNF probe points can be lethal during reconfiguration boot. Enable - * TNF using a compile time define. - */ - -#ifdef __lint -#define FCIP_TNF_ENABLED -#else -#undef FCIP_TNF_ENABLED -#endif - -#ifdef FCIP_TNF_ENABLED - -extern int tnf_mod_load(void); -extern int tnf_mod_unload(struct modlinkage *e); - -#define FCIP_TNF_LOAD() (void) tnf_mod_load() -#define FCIP_TNF_UNLOAD(x) (void) tnf_mod_unload(x) -#define FCIP_TNF_PROBE_0(x) TNF_PROBE_0 x -#define FCIP_TNF_PROBE_1(x) TNF_PROBE_1 x -#define FCIP_TNF_PROBE_2(x) TNF_PROBE_2 x -#define FCIP_TNF_PROBE_3(x) TNF_PROBE_3 x -#define FCIP_TNF_PROBE_4(x) TNF_PROBE_4 x -#define FCIP_TNF_PROBE_5(x) TNF_PROBE_5 x - -#else - -#define FCIP_TNF_LOAD() -#define FCIP_TNF_UNLOAD(x) -#define FCIP_TNF_PROBE_0(x) -#define FCIP_TNF_PROBE_1(x) -#define FCIP_TNF_PROBE_2(x) -#define FCIP_TNF_PROBE_3(x) -#define FCIP_TNF_PROBE_4(x) -#define FCIP_TNF_PROBE_5(x) - -#endif /* FCIP_TNF_ENABLED */ - -/* - * Macros to help with complex TNF output - */ - -#ifdef FCIP_TNF_ENABLED - -#define FCIP_TNF_BYTE_ARRAY(name, keys, detail, mesg, barray_name, \ -barray, len) \ -{ \ - TNF_PROBE_1(name, keys, detail, tnf_string, msg, mesg); \ - { \ - int i = 0; \ - char str[65] = ""; \ - char *strp = str; \ - while (i < 32 && i < len) { \ - (void) sprintf(strp, "%02x", \ - ((char *)(barray))[i++] & 0xff); \ - strp += 2; \ - } \ - TNF_PROBE_1(name, keys, "", \ - tnf_string, barray_name, str); \ - } \ -} - -#else - -#define FCIP_TNF_BYTE_ARRAY(name, keys, detail, mesg, barray_name, barray, len) - -#endif /* FCIP_TNF_ENABLED */ - /* * FC4 type setttings for Name Server registration. */ diff --git a/usr/src/uts/common/sys/ib/adapters/hermon/hermon.h b/usr/src/uts/common/sys/ib/adapters/hermon/hermon.h index 88496c21df..1982dd2384 100644 --- a/usr/src/uts/common/sys/ib/adapters/hermon/hermon.h +++ b/usr/src/uts/common/sys/ib/adapters/hermon/hermon.h @@ -40,7 +40,6 @@ #include <sys/conf.h> #include <sys/ddi.h> #include <sys/sunddi.h> -#include <sys/tnf_probe.h> #include <sys/taskq.h> #include <sys/atomic.h> #ifdef FMA_TEST diff --git a/usr/src/uts/common/sys/ib/adapters/tavor/tavor.h b/usr/src/uts/common/sys/ib/adapters/tavor/tavor.h index fa8182befd..adda40c724 100644 --- a/usr/src/uts/common/sys/ib/adapters/tavor/tavor.h +++ b/usr/src/uts/common/sys/ib/adapters/tavor/tavor.h @@ -34,8 +34,6 @@ * structure and for proper attach() and detach() processing. Also * includes all the other Tavor header files (and so is the only header * file that is directly included by the Tavor source files). - * Additionally, this file contains some defines and macros used by - * Tavor TNF tracing mechanism. * Lastly, this file includes everything necessary for implementing the * devmap interface and for maintaining the "mapped resource database". */ @@ -44,7 +42,6 @@ #include <sys/conf.h> #include <sys/ddi.h> #include <sys/sunddi.h> -#include <sys/tnf_probe.h> #include <sys/taskq.h> #include <sys/ib/ibtl/ibci.h> @@ -75,25 +72,6 @@ extern "C" { #endif -/* - * The following defines and macros are used for Tavor TNF tracing - * Note: TAVOR_TNF_FAIL is used in routines which has many failure cases. - * It will initialize the "errormsg" and "status" variables (both of which - * must be declared locally in the routines where this macro is used) for use - * in a later TNF probe and return from routine. - */ -#define TAVOR_TNF_ERROR "tavor tavor_error " -#define TAVOR_TNF_TRACE "tavor tavor_trace " -#define TAVOR_TNF_ENTER(func) \ - TNF_PROBE_0_DEBUG(func##_start, TAVOR_TNF_TRACE, "") -#define TAVOR_TNF_EXIT(func) \ - TNF_PROBE_0_DEBUG(func##_end, TAVOR_TNF_TRACE, "") -#define TAVOR_TNF_FAIL(s, e) \ -{ \ - errormsg = (e); \ - status = (s); \ -} - #define TAVOR_VPD_HDR_DWSIZE 0x10 /* 16 Dwords */ #define TAVOR_VPD_HDR_BSIZE 0x40 /* 64 Bytes */ @@ -739,7 +717,7 @@ typedef struct tavor_umap_db_query_s { tavor_umap_db_common_t tqdb_common; } tavor_umap_db_query_t; _NOTE(MUTEX_PROTECTS_DATA(tavor_umap_db_s::tdl_umapdb_lock, - tavor_umap_db_entry_s::tdbe_avlnode + tavor_umap_db_entry_s::tdbe_avlnode tavor_umap_db_entry_s::tdbe_common.tdb_key tavor_umap_db_entry_s::tdbe_common.tdb_value tavor_umap_db_entry_s::tdbe_common.tdb_type diff --git a/usr/src/uts/common/sys/ib/mgt/ibmf/ibmf_trace.h b/usr/src/uts/common/sys/ib/mgt/ibmf/ibmf_trace.h index fe47f3afc8..6b2094745f 100644 --- a/usr/src/uts/common/sys/ib/mgt/ibmf/ibmf_trace.h +++ b/usr/src/uts/common/sys/ib/mgt/ibmf/ibmf_trace.h @@ -27,8 +27,6 @@ #ifndef _SYS_IB_MGT_IBMF_IBMF_TRACE_H #define _SYS_IB_MGT_IBMF_IBMF_TRACE_H -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This file contains the IBMF trace/debug macros. */ @@ -37,11 +35,6 @@ extern "C" { #endif -#include <sys/tnf_probe.h> - -#define IBMF_TNF_ERROR "ibmf ibmf_error" -#define IBMF_TNF_TRACE "ibmf ibmf_trace" - /* * Trace levels for printing */ @@ -54,10 +47,6 @@ extern "C" { /* * Trace probe macros */ -#define IBMF_TNF_NODEBUG 0 -#define IBMF_TNF_DEBUG 1 - -#ifdef NPROBE /* NPROBE */ #define IBMF_TRACE_0(debug, trlevel, arg01, arg02, arg03, arg04) \ if (ibmf_trace_level > 0) { \ @@ -95,105 +84,6 @@ extern "C" { arg43, arg53); \ } -#else - -#define IBMF_TRACE_0(debug, trlevel, arg01, arg02, arg03, arg04) \ -{ \ - boolean_t use_debug = debug; \ - if (use_debug) { \ - TNF_PROBE_0_DEBUG(arg01, arg02, arg03); \ - } else { \ - TNF_PROBE_0(arg01, arg02, arg03); \ - } \ - if (ibmf_trace_level > 0) { \ - ibmf_dprintf(trlevel, arg04); \ - } \ -} - -/* CSTYLED */ -#define IBMF_TRACE_1(debug, trlevel, arg01, arg02, arg03, arg04, arg11, arg12, arg13) \ -{ \ - boolean_t use_debug = debug; \ - if (use_debug) { \ - TNF_PROBE_1_DEBUG(arg01, arg02, arg03, arg11, arg12, arg13);\ - } else { \ - TNF_PROBE_1(arg01, arg02, arg03, arg11, arg12, arg13); \ - } \ - if (ibmf_trace_level > 0) { \ - ibmf_dprintf(trlevel, arg04, arg13); \ - } \ -} - -/* CSTYLED */ -#define IBMF_TRACE_2(debug, trlevel, arg01, arg02, arg03, arg04, arg11, arg12, arg13, arg21, arg22, arg23) \ -{ \ - boolean_t use_debug = debug; \ - if (use_debug) { \ - TNF_PROBE_2_DEBUG(arg01, arg02, arg03, arg11, arg12, \ - arg13, arg21, arg22, arg23); \ - } else { \ - TNF_PROBE_2(arg01, arg02, arg03, arg11, arg12, arg13, \ - arg21, arg22, arg23); \ - } \ - if (ibmf_trace_level > 0) { \ - ibmf_dprintf(trlevel, arg04, arg13, arg23); \ - } \ -} - -/* CSTYLED */ -#define IBMF_TRACE_3(debug, trlevel, arg01, arg02, arg03, arg04, arg11, arg12, arg13, arg21, arg22, arg23, arg31, arg32, arg33) \ -{ \ - boolean_t use_debug = debug; \ - if (use_debug) { \ - TNF_PROBE_3_DEBUG(arg01, arg02, arg03, arg11, arg12, arg13, \ - arg21, arg22, arg23, arg31, arg32, arg33); \ - } else { \ - TNF_PROBE_3(arg01, arg02, arg03, arg11, arg12, arg13, arg21, \ - arg22, arg23, arg31, arg32, arg33); \ - } \ - if (ibmf_trace_level > 0) { \ - ibmf_dprintf(trlevel, arg04, arg13, arg23, arg33); \ - } \ -} - -/* CSTYLED */ -#define IBMF_TRACE_4(debug, trlevel, arg01, arg02, arg03, arg04, arg11, arg12, arg13, arg21, arg22, arg23, arg31, arg32, arg33, arg41, arg42, arg43) \ -{ \ - boolean_t use_debug = debug; \ - if (use_debug) { \ - TNF_PROBE_4_DEBUG(arg01, arg02, arg03, arg11, arg12, arg13, \ - arg21, arg22, arg23, arg31, arg32, arg33, arg41, arg42, \ - arg43); \ - } else { \ - TNF_PROBE_4(arg01, arg02, arg03, arg11, arg12, arg13, arg21, \ - arg22, arg23, arg31, arg32, arg33, arg41, arg42, arg43); \ - } \ - if (ibmf_trace_level > 0) { \ - ibmf_dprintf(trlevel, arg04, arg13, arg23, arg33, arg43);\ - } \ -} - -/* CSTYLED */ -#define IBMF_TRACE_5(debug, trlevel, arg01, arg02, arg03, arg04, arg11, arg12, arg13, arg21, arg22, arg23, arg31, arg32, arg33, arg41, arg42, arg43, arg51, arg52, arg53) \ -{ \ - boolean_t use_debug = debug; \ - if (use_debug) { \ - TNF_PROBE_5_DEBUG(arg01, arg02, arg03, arg11, arg12, arg13, \ - arg21, arg22, arg23, arg31, arg32, arg33, arg41, arg42, \ - arg43, arg51, arg52, arg53); \ - } else { \ - TNF_PROBE_5(arg01, arg02, arg03, arg11, arg12, arg13, arg21, \ - arg22, arg23, arg31, arg32, arg33, arg41, arg42, arg43, \ - arg51, arg52, arg53); \ - } \ - if (ibmf_trace_level > 0) { \ - ibmf_dprintf(trlevel, arg04, arg13, arg23, arg33, arg43, \ - arg53); \ - } \ -} - -#endif - void ibmf_dprintf(int l, const char *fmt, ...); diff --git a/usr/src/uts/common/sys/kobj_impl.h b/usr/src/uts/common/sys/kobj_impl.h index 752217b5cf..10b0724b0e 100644 --- a/usr/src/uts/common/sys/kobj_impl.h +++ b/usr/src/uts/common/sys/kobj_impl.h @@ -82,7 +82,7 @@ struct proginfo { #define KOBJ_INTERP 0x0008 /* the interpreter module */ #define KOBJ_PRIM 0x0010 /* a primary kernel module */ #define KOBJ_RESOLVED 0x0020 /* fully resolved */ -#define KOBJ_TNF_PROBE 0x0040 /* Contains TNF probe(s) */ +/* 0x0040 unused. */ #define KOBJ_RELOCATED 0x0080 /* relocation completed */ #define KOBJ_NOPARENTS 0x0200 /* nothing can depend on this module */ #define KOBJ_IGNMULDEF 0x0400 /* ignore dups during sym resolution */ diff --git a/usr/src/uts/common/sys/proc.h b/usr/src/uts/common/sys/proc.h index 74c6d46781..d05886d1fc 100644 --- a/usr/src/uts/common/sys/proc.h +++ b/usr/src/uts/common/sys/proc.h @@ -292,11 +292,6 @@ typedef struct proc { char p_unref_thread; /* unref thread created */ /* - * Kernel probes - */ - uchar_t p_tnf_flags; - - /* * Solaris Audit */ struct p_audit_data *p_audit_data; /* per process audit structure */ diff --git a/usr/src/uts/common/sys/thread.h b/usr/src/uts/common/sys/thread.h index 3ca82366a0..76e6835349 100644 --- a/usr/src/uts/common/sys/thread.h +++ b/usr/src/uts/common/sys/thread.h @@ -158,7 +158,6 @@ typedef struct _kthread { struct _kthread *t_intr; /* interrupted (pinned) thread */ uint64_t t_intr_start; /* timestamp when time slice began */ kt_did_t t_did; /* thread id for kernel debuggers */ - caddr_t t_tnf_tpdp; /* Trace facility data pointer */ struct _kcpc_ctx *t_cpc_ctx; /* performance counter context */ struct _kcpc_set *t_cpc_set; /* set this thread has bound */ diff --git a/usr/src/uts/common/sys/tnf.h b/usr/src/uts/common/sys/tnf.h deleted file mode 100644 index 9061ed1fae..0000000000 --- a/usr/src/uts/common/sys/tnf.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - * All rights reserved. - */ - -#ifndef _SYS_TNF_H -#define _SYS_TNF_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifndef NPROBE - -#include <sys/types.h> -#include <sys/thread.h> -#include <sys/proc.h> -#include <sys/cpuvar.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * - */ - -typedef struct { - ulong_t probenum; - int enabled; - int traced; - int attrsize; -} tnf_probevals_t; - -/* - * - */ - -typedef struct { - enum { - TIFIOCBUF_NONE, - TIFIOCBUF_UNINIT, - TIFIOCBUF_OK, - TIFIOCBUF_BROKEN - } buffer_state; - int buffer_size; - int trace_stopped; - int pidfilter_mode; - int pidfilter_size; -} tifiocstate_t; - -typedef struct { - char *dst_addr; - int block_num; -} tifiocgblock_t; - -typedef struct { - long *dst_addr; - int start; - int slots; -} tifiocgfw_t; - -/* - * ioctl codes - */ - -#define TIFIOCGMAXPROBE (('t' << 8) | 1) /* get max probe number */ -#define TIFIOCGPROBEVALS (('t' << 8) | 2) /* get probe info */ -#define TIFIOCGPROBESTRING (('t' << 8) | 3) /* get probe string */ -#define TIFIOCSPROBEVALS (('t' << 8) | 4) /* set probe info */ -#define TIFIOCGSTATE (('t' << 8) | 5) /* get tracing system state */ -#define TIFIOCALLOCBUF (('t' << 8) | 6) /* allocate trace buffer */ -#define TIFIOCDEALLOCBUF (('t' << 8) | 7) /* dealloc trace buffer */ -#define TIFIOCSTRACING (('t' << 8) | 8) /* set ktrace mode */ -#define TIFIOCSPIDFILTER (('t' << 8) | 9) /* set pidfilter mode */ -#define TIFIOCGPIDSTATE (('t' << 8) | 10) /* check pid filter member */ -#define TIFIOCSPIDON (('t' << 8) | 11) /* add pid to filter */ -#define TIFIOCSPIDOFF (('t' << 8) | 12) /* drop pid from filter */ -#define TIFIOCPIDFILTERGET (('t' << 8) | 13) /* return pid filter set */ -#define TIFIOCGHEADER (('t' << 8) | 14) /* copy out tnf header blk */ -#define TIFIOCGBLOCK (('t' << 8) | 15) /* copy out tnf block */ -#define TIFIOCGFWZONE (('t' << 8) | 16) /* copy out forwarding ptrs */ - -#ifdef _KERNEL - -extern volatile int tnf_tracing_active; - -extern void tnf_thread_create(kthread_t *); -extern void tnf_thread_queue(kthread_t *, cpu_t *, pri_t); -extern void tnf_thread_switch(kthread_t *); -extern void tnf_thread_exit(void); -extern void tnf_thread_free(kthread_t *); - -#endif /* _KERNEL */ - -#ifdef __cplusplus -} -#endif - -#endif /* NPROBE */ - -#endif /* _SYS_TNF_H */ diff --git a/usr/src/uts/common/sys/tnf_com.h b/usr/src/uts/common/sys/tnf_com.h deleted file mode 100644 index a562bc2538..0000000000 --- a/usr/src/uts/common/sys/tnf_com.h +++ /dev/null @@ -1,326 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - */ - -#ifndef _SYS_TNF_COM_H -#define _SYS_TNF_COM_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * NOTE: All types are in host (not necessarily file) format. - * Readers are responsible for endian or other transformation. - */ - -/* - * Magic number(s): first word of TNF file. - * - * A writer stores the native unsigned 32-bit integer TNF_MAGIC. - * A same-endian reader will load it as TNF_MAGIC. - * A different-endian reader will load it as TNF_MAGIC_1. - */ - -#define TNF_MAGIC 0x544e4600 -#define TNF_MAGIC_1 0x00464e54 - -/* - * Fundamental types. Machine dependent. - */ - -typedef char tnf_char_t; -typedef signed char tnf_int8_t; -typedef unsigned char tnf_uint8_t; -typedef short tnf_int16_t; -typedef unsigned short tnf_uint16_t; -typedef int tnf_int32_t; -typedef unsigned int tnf_uint32_t; -typedef longlong_t tnf_int64_t; -typedef u_longlong_t tnf_uint64_t; -typedef float tnf_float32_t; -typedef double tnf_float64_t; - -/* - * TNF references - */ - -typedef tnf_int32_t tnf_ref32_t; /* self-relative, 32 bits */ -typedef tnf_int16_t tnf_ref16_t; /* self-relative, 16 bits */ -typedef tnf_uint16_t tnf_abs16_t; /* absolute, 16 bits */ - -/* Generation number for tag blocks */ -#define TNF_TAG_GENERATION_NUM 0xffffffff - -/* definition of space values */ -#define TNF_SPACE_MASK 0x80000000 -#define TNF_SPACE_PERMANENT 0x80000000 -#define TNF_SPACE_RECLAIMABLE 0x0 -#define TNF_SPACE_SIGN_BIT 0x40000000 - -/* Macros on setting or checking space values */ -#define TNF_REF32_MAKE_PERMANENT(x) ((x) | TNF_SPACE_PERMANENT) -#define TNF_REF32_MAKE_RECLAIMABLE(x) ((x) & ~TNF_SPACE_MASK) -#define TNF_REF32_SPACE(x) \ - ((tnf_uint32_t)(x) & TNF_SPACE_MASK) -#define TNF_REF32_IS_PERMANENT(x) \ - (TNF_REF32_SPACE(x) == TNF_SPACE_PERMANENT) -#define TNF_REF32_IS_RECLAIMABLE(x) \ - (TNF_REF32_SPACE(x) == TNF_SPACE_RECLAIMABLE) -#define TNF_REF32_SIGN_EXTEND(x) \ - ((((tnf_uint32_t)(x) & TNF_SPACE_SIGN_BIT) == TNF_SPACE_SIGN_BIT) ? \ - ((tnf_ref32_t)((tnf_uint32_t)(x) | TNF_SPACE_MASK)) : \ - (x)) - -/* definition of references */ -#define TNF_REF32_TYPE_MASK 0x3 -#define TNF_REF32_T_FULL 0x0 -#define TNF_REF32_T_FWD TNF_REF32_T_FULL -#define TNF_REF32_T_PAIR 0x1 -#define TNF_REF32_T_TAG 0x2 -#define TNF_REF32_T_RSVD 0x3 - -#define TNF_REF32_REF16_MASK 0xffff - -#define TNF_REF32_TAG16_SHIFT 16 -#define TNF_REF32_TAG16_MASK 0xffff - -#define TNF_REF16_TYPE_MASK 0x3 - -#define TNF_TAG16_TYPE_MASK 0x3 -#define TNF_TAG16_T_ABS TNF_REF32_T_PAIR -#define TNF_TAG16_T_REL TNF_REF32_T_FWD - -#define TNF_NULL 0 - -/* Macros on tnf_ref32_t values: */ - -#define TNF_REF32_TYPE(x) \ - ((tnf_uint32_t)(x) & TNF_REF32_TYPE_MASK) -#define TNF_REF32_VALUE(x) \ - ((tnf_ref32_t)(((tnf_uint32_t)(x) & ~TNF_REF32_TYPE_MASK) & \ - ~TNF_SPACE_MASK)) - -#define TNF_REF32_IS_FULL(x) (TNF_REF32_TYPE(x) == TNF_REF32_T_FULL) -#define TNF_REF32_IS_FWD(x) (TNF_REF32_TYPE(x) == TNF_REF32_T_FWD) -#define TNF_REF32_IS_PAIR(x) (TNF_REF32_TYPE(x) == TNF_REF32_T_PAIR) -#define TNF_REF32_IS_TAG(x) (TNF_REF32_TYPE(x) == TNF_REF32_T_TAG) -#define TNF_REF32_IS_RSVD(x) (TNF_REF32_TYPE(x) == TNF_REF32_T_RSVD) -#define TNF_REF32_IS_NULL(x) ((x) == TNF_NULL) - -#define TNF_REF32_REF16(x) \ - ((tnf_ref16_t)((tnf_uint32_t)(x) & TNF_REF32_REF16_MASK)) - -#define TNF_REF32_TAG16(x) \ - ((tnf_ref16_t)(((tnf_uint32_t)(x) >> TNF_REF32_TAG16_SHIFT) \ - & TNF_REF32_TAG16_MASK)) - -/* Macros on tnf_ref16_t values: */ - -#define TNF_REF16_TYPE(x) \ - ((tnf_uint32_t)(x) & TNF_REF16_TYPE_MASK) -#define TNF_REF16_VALUE(x) \ - ((tnf_ref16_t)((tnf_uint32_t)(x) & ~TNF_REF16_TYPE_MASK)) - -#define TNF_TAG16_TYPE(x) \ - ((tnf_uint32_t)(x) & TNF_TAG16_TYPE_MASK) - -#define TNF_TAG16_IS_REL(x) (TNF_TAG16_TYPE(x) == TNF_TAG16_T_REL) -#define TNF_TAG16_IS_ABS(x) (TNF_TAG16_TYPE(x) == TNF_TAG16_T_ABS) - -/* The two kinds of values a tag16 can have: */ - -#define TNF_TAG16_REF16(x) \ - ((tnf_ref16_t)((tnf_uint32_t)(x) & ~TNF_TAG16_TYPE_MASK)) -#define TNF_TAG16_ABS16(x) \ - ((tnf_abs16_t)((tnf_uint32_t)(x) & ~TNF_TAG16_TYPE_MASK)) - -/* - * TNF binary layouts - */ - -struct tnf_tagged_hdr { - tnf_ref32_t tag; /* type record */ -}; - -struct tnf_array_hdr { - tnf_ref32_t tag; /* type record */ - tnf_uint32_t self_size; /* total size */ -}; - -struct tnf_type_hdr { - tnf_ref32_t tag; /* type record */ - tnf_ref32_t name; /* string record */ - tnf_ref32_t properties; /* array of type records */ -}; - -struct tnf_struct_type_hdr { - tnf_ref32_t tag; /* type record */ - tnf_ref32_t name; /* string record */ - tnf_ref32_t properties; /* array of type records */ - tnf_ref32_t slot_types; /* array of type records */ - tnf_uint32_t type_size; /* size of struct */ -}; - -struct tnf_array_type_hdr { - tnf_ref32_t tag; /* type record */ - tnf_ref32_t name; /* string record */ - tnf_ref32_t properties; /* array of type records */ - tnf_ref32_t slot_types; /* array of type records */ - tnf_uint32_t header_size; /* size of array header */ -}; - -struct tnf_derived_type_hdr { - tnf_ref32_t tag; /* type record */ - tnf_ref32_t name; /* string record */ - tnf_ref32_t properties; /* array of type records */ - tnf_ref32_t derived_base; /* type record */ -}; - -/* - * File header, after magic # - */ - -#define TNF_FILE_VERSION 1 - -typedef struct tnf_file_header { - tnf_ref32_t tag; - tnf_uint32_t file_version; /* TNF_FILE_VERSION */ - tnf_uint32_t file_header_size; - tnf_uint32_t file_log_size; - tnf_uint32_t block_header_size; - tnf_uint32_t block_size; - tnf_uint32_t directory_size; - tnf_uint32_t block_count; - tnf_uint32_t blocks_valid; - /* writer-specific information after this */ - /* zero padding to end of block */ -} tnf_file_header_t; - -/* - * Block header - */ - -typedef unsigned char tnf_byte_lock_t; - -typedef struct tnf_block_header { - tnf_ref32_t tag; - tnf_uint32_t generation; /* (-1) => tag block */ - tnf_uint16_t bytes_valid; - tnf_byte_lock_t A_lock; - tnf_byte_lock_t B_lock; - struct tnf_block_header *next_block; /* release list */ -} tnf_block_header_t; - -/* - * TNF type names - */ - -#define TNF_N_INLINE "tnf_inline" -#define TNF_N_TAGGED "tnf_tagged" - -#define TNF_N_SCALAR "tnf_scalar" -#define TNF_N_CHAR "tnf_char" -#define TNF_N_INT8 "tnf_int8" -#define TNF_N_UINT8 "tnf_uint8" -#define TNF_N_INT16 "tnf_int16" -#define TNF_N_UINT16 "tnf_uint16" -#define TNF_N_INT32 "tnf_int32" -#define TNF_N_UINT32 "tnf_uint32" -#define TNF_N_INT64 "tnf_int64" -#define TNF_N_UINT64 "tnf_uint64" -#define TNF_N_FLOAT32 "tnf_float32" -#define TNF_N_FLOAT64 "tnf_float64" - -#define TNF_N_ARRAY "tnf_array" -#define TNF_N_STRING "tnf_string" -#define TNF_N_TYPE_ARRAY "tnf_type_array" -#define TNF_N_NAME_ARRAY "tnf_name_array" - -#define TNF_N_ALIGN "tnf_align" -#define TNF_N_DERIVED "tnf_derived" -#define TNF_N_DERIVED_BASE "tnf_derived_base" -#define TNF_N_ELEMENT_TYPE "tnf_element_type" -#define TNF_N_HEADER_SIZE "tnf_header_size" -#define TNF_N_NAME "tnf_name" -#define TNF_N_OPAQUE "tnf_opaque" -#define TNF_N_PROPERTIES "tnf_properties" -#define TNF_N_SELF_SIZE "tnf_self_size" -#define TNF_N_SIZE "tnf_size" -#define TNF_N_SLOT_NAMES "tnf_slot_names" -#define TNF_N_SLOT_TYPES "tnf_slot_types" -#define TNF_N_TAG "tnf_tag" -#define TNF_N_TAG_ARG "tnf_tag_arg" -#define TNF_N_TYPE_SIZE "tnf_type_size" - -#define TNF_N_STRUCT "tnf_struct" - -#define TNF_N_ARRAY_TYPE "tnf_array_type" -#define TNF_N_DERIVED_TYPE "tnf_derived_type" -#define TNF_N_SCALAR_TYPE "tnf_scalar_type" -#define TNF_N_STRUCT_TYPE "tnf_struct_type" -#define TNF_N_TYPE "tnf_type" - -/* - * Reserved names for block and file header information - */ - -#define TNF_N_FILE_HEADER "tnf_file_header" -#define TNF_N_FILE_VERSION "file_version" -#define TNF_N_FILE_HEADER_SIZE "file_header_size" -#define TNF_N_FILE_LOGICAL_SIZE "file_logical_size" -#define TNF_N_BLOCK_HEADER_SIZE "block_header_size" -#define TNF_N_BLOCK_SIZE "block_size" -#define TNF_N_DIRECTORY_SIZE "directory_size" -#define TNF_N_BLOCK_COUNT "block_count" -#define TNF_N_BLOCKS_VALID "blocks_valid" - -#define TNF_N_BLOCK_HEADER "tnf_block_header" -#define TNF_N_GENERATION "generation" -#define TNF_N_BYTES_VALID "bytes_valid" - -/* - * Reserved names for schedule record information - */ - -#define TNF_N_USER_SCHEDULE "tnf_user_schedule" -#define TNF_N_KERNEL_SCHEDULE "tnf_kernel_schedule" - -#define TNF_N_PID "pid" -#define TNF_N_LWPID "lwpid" -#define TNF_N_TID "tid" -#define TNF_N_TIME_BASE "time_base" -#define TNF_N_TIME_DELTA "time_delta" - -/* XXX TODO: kernel type names */ - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_TNF_COM_H */ diff --git a/usr/src/uts/common/sys/tnf_probe.h b/usr/src/uts/common/sys/tnf_probe.h deleted file mode 100644 index f15daaf63e..0000000000 --- a/usr/src/uts/common/sys/tnf_probe.h +++ /dev/null @@ -1,990 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - */ - -#ifndef _SYS_TNF_PROBE_H -#define _SYS_TNF_PROBE_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/tnf_writer.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * These macros are used to convert the __LINE__ directive to a - * string in the probe macros below. - */ - -#define TNF_STRINGIFY(x) #x -#define TNF_STRINGVALUE(x) TNF_STRINGIFY(x) - -/* - * Alignment of tnf_ref32_t - */ - -struct _tnf_ref32_align { - char c; - tnf_ref32_t t; -}; -#define TNF_REF32_ALIGN TNF_OFFSETOF(struct _tnf_ref32_align, t) - -/* - * Probe versioning - */ - -struct tnf_probe_version { - size_t version_size; /* sizeof(struct tnf_probe_version) */ - size_t probe_control_size; /* sizeof(tnf_probe_control_t) */ -}; - -extern struct tnf_probe_version __tnf_probe_version_1; -#pragma weak __tnf_probe_version_1 - -/* - * Typedefs - */ - -typedef struct tnf_probe_control tnf_probe_control_t; -typedef struct tnf_probe_setup tnf_probe_setup_t; - -/* returns pointer to buffer */ -typedef void * (*tnf_probe_test_func_t)(void *, - tnf_probe_control_t *, - tnf_probe_setup_t *); - -/* returns buffer pointer */ -typedef void * (*tnf_probe_alloc_func_t)(tnf_ops_t *, /* tpd */ - tnf_probe_control_t *, - tnf_probe_setup_t *); - -typedef void (*tnf_probe_func_t)(tnf_probe_setup_t *); - -/* - * Probe argument block - */ - -struct tnf_probe_setup { - tnf_ops_t *tpd_p; - void *buffer_p; - tnf_probe_control_t *probe_p; -}; - -/* - * Probe control block - */ - -struct tnf_probe_control { - const struct tnf_probe_version *version; - tnf_probe_control_t *next; - tnf_probe_test_func_t test_func; - tnf_probe_alloc_func_t alloc_func; - tnf_probe_func_t probe_func; - tnf_probe_func_t commit_func; - uintptr_t index; - const char *attrs; - tnf_tag_data_t ***slot_types; - unsigned long tnf_event_size; -}; - -#ifdef _KERNEL - -#define TNF_NEXT_INIT 0 - -#else - -#define TNF_NEXT_INIT -1 - -#endif /* _KERNEL */ - -/* - * TNF Type extension - */ - -#ifdef NPROBE - -#define TNF_DECLARE_RECORD(ctype, record) \ - typedef tnf_reference_t record##_t - -#else - -#define TNF_DECLARE_RECORD(ctype, record) \ - typedef tnf_reference_t record##_t; \ - extern tnf_tag_data_t *record##_tag_data; \ - extern record##_t record(tnf_ops_t *, ctype *, tnf_record_p) - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_1(ctype, ctype_record, t1, n1) - -#else - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_1(ctype, ctype_record, t1, n1) \ -typedef struct { \ - tnf_tag_t tag; \ - t1##_t data_1; \ -} ctype_record##_prototype_t; \ -static tnf_tag_data_t **ctype_record##_type_slots[] = { \ - &tnf_tag_tag_data, \ - &t1##_tag_data, \ - 0 }; \ -static char *ctype_record##_slot_names[] = { \ - "tnf_tag", \ - ""#n1, \ - 0 }; \ -static tnf_tag_data_t ctype_record##_tag_data_rec = { \ - TNF_TAG_VERSION, &tnf_struct_tag_1, \ - 0, #ctype_record, &tnf_user_struct_properties, \ - sizeof (ctype_record##_prototype_t), \ - TNF_REF32_ALIGN, \ - sizeof (ctype_record##_t), TNF_STRUCT, 0, \ - ctype_record##_type_slots, ctype_record##_slot_names \ -}; \ -tnf_tag_data_t *ctype_record##_tag_data = \ - &ctype_record##_tag_data_rec; \ -ctype_record##_t \ -ctype_record(tnf_ops_t *ops, ctype * the_ctype, \ - tnf_record_p reference) \ -{ \ - tnf_tag_data_t *metatag_data; \ - tnf_record_p metatag_index; \ - ctype_record##_prototype_t *buffer; \ - \ - if (the_ctype == NULL) \ - return (0); \ - buffer = (ctype_record##_prototype_t *) tnf_allocate(ops, \ - sizeof (ctype_record##_prototype_t)); \ - if (buffer == NULL) \ - return (0); \ - \ - metatag_data = ctype_record##_tag_data; \ - metatag_index = metatag_data->tag_index ? \ - metatag_data->tag_index: \ - metatag_data->tag_desc(ops, metatag_data); \ - buffer->tag = tnf_tag(ops, metatag_index, \ - (tnf_record_p) &buffer->tag); \ - buffer->data_1 = t1(ops, the_ctype->n1, \ - (tnf_record_p) &(buffer->data_1)); \ - return (tnf_ref32(ops, (tnf_record_p) buffer, reference)); \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_2(ctype, ctype_record, t1, n1, t2, n2) - -#else - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_2(ctype, ctype_record, t1, n1, t2, n2) \ -typedef struct { \ - tnf_tag_t tag; \ - t1##_t data_1; \ - t2##_t data_2; \ -} ctype_record##_prototype_t; \ -static tnf_tag_data_t **ctype_record##_type_slots[] = { \ - &tnf_tag_tag_data, \ - &t1##_tag_data, \ - &t2##_tag_data, \ - 0 }; \ -static char *ctype_record##_slot_names[] = { \ - "tnf_tag", \ - ""#n1, \ - ""#n2, \ - 0 }; \ -static tnf_tag_data_t ctype_record##_tag_data_rec = { \ - TNF_TAG_VERSION, &tnf_struct_tag_1, \ - 0, #ctype_record, &tnf_user_struct_properties, \ - sizeof (ctype_record##_prototype_t), \ - TNF_REF32_ALIGN, \ - sizeof (ctype_record##_t), TNF_STRUCT, 0, \ - ctype_record##_type_slots, ctype_record##_slot_names \ -}; \ -tnf_tag_data_t *ctype_record##_tag_data = \ - &ctype_record##_tag_data_rec; \ -ctype_record##_t \ -ctype_record(tnf_ops_t *ops, ctype * the_ctype, \ - tnf_record_p reference) \ -{ \ - tnf_tag_data_t *metatag_data; \ - tnf_record_p metatag_index; \ - ctype_record##_prototype_t *buffer; \ - \ - if (the_ctype == NULL) \ - return (0); \ - buffer = (ctype_record##_prototype_t *) tnf_allocate(ops, \ - sizeof (ctype_record##_prototype_t)); \ - if (buffer == NULL) \ - return (0); \ - \ - metatag_data = ctype_record##_tag_data; \ - metatag_index = metatag_data->tag_index ? \ - metatag_data->tag_index: \ - metatag_data->tag_desc(ops, metatag_data); \ - buffer->tag = tnf_tag(ops, metatag_index, \ - (tnf_record_p) &buffer->tag); \ - buffer->data_1 = t1(ops, the_ctype->n1, \ - (tnf_record_p) &(buffer->data_1)); \ - buffer->data_2 = t2(ops, the_ctype->n2, \ - (tnf_record_p) &(buffer->data_2)); \ - return (tnf_ref32(ops, (tnf_record_p) buffer, reference)); \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_3(ctype, ctype_record, t1, n1, t2, n2, t3, n3) - -#else - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_3(ctype, ctype_record, t1, n1, t2, n2, t3, n3) \ -typedef struct { \ - tnf_tag_t tag; \ - t1##_t data_1; \ - t2##_t data_2; \ - t3##_t data_3; \ -} ctype_record##_prototype_t; \ -static tnf_tag_data_t **ctype_record##_type_slots[] = { \ - &tnf_tag_tag_data, \ - &t1##_tag_data, \ - &t2##_tag_data, \ - &t3##_tag_data, \ - 0 }; \ -static char *ctype_record##_slot_names[] = { \ - "tnf_tag", \ - ""#n1, \ - ""#n2, \ - ""#n3, \ - 0 }; \ -static tnf_tag_data_t ctype_record##_tag_data_rec = { \ - TNF_TAG_VERSION, &tnf_struct_tag_1, \ - 0, #ctype_record, &tnf_user_struct_properties, \ - sizeof (ctype_record##_prototype_t), \ - TNF_REF32_ALIGN, \ - sizeof (ctype_record##_t), TNF_STRUCT, 0, \ - ctype_record##_type_slots, ctype_record##_slot_names \ -}; \ -tnf_tag_data_t *ctype_record##_tag_data = \ - &ctype_record##_tag_data_rec; \ -ctype_record##_t \ -ctype_record(tnf_ops_t *ops, ctype * the_ctype, \ - tnf_record_p reference) \ -{ \ - tnf_tag_data_t *metatag_data; \ - tnf_record_p metatag_index; \ - ctype_record##_prototype_t *buffer; \ - \ - if (the_ctype == NULL) \ - return (0); \ - buffer = (ctype_record##_prototype_t *) tnf_allocate(ops, \ - sizeof (ctype_record##_prototype_t)); \ - if (buffer == NULL) \ - return (0); \ - \ - metatag_data = ctype_record##_tag_data; \ - metatag_index = metatag_data->tag_index ? \ - metatag_data->tag_index: \ - metatag_data->tag_desc(ops, metatag_data); \ - buffer->tag = tnf_tag(ops, metatag_index, \ - (tnf_record_p) &buffer->tag); \ - buffer->data_1 = t1(ops, the_ctype->n1, \ - (tnf_record_p) &(buffer->data_1)); \ - buffer->data_2 = t2(ops, the_ctype->n2, \ - (tnf_record_p) &(buffer->data_2)); \ - buffer->data_3 = t3(ops, the_ctype->n3, \ - (tnf_record_p) &(buffer->data_3)); \ - return (tnf_ref32(ops, (tnf_record_p) buffer, reference)); \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_4(ctype, ctype_record, t1, n1, t2, n2, t3, n3, t4, n4) - -#else - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_4(ctype, ctype_record, t1, n1, t2, n2, t3, n3, t4, n4) \ -typedef struct { \ - tnf_tag_t tag; \ - t1##_t data_1; \ - t2##_t data_2; \ - t3##_t data_3; \ - t4##_t data_4; \ -} ctype_record##_prototype_t; \ -static tnf_tag_data_t **ctype_record##_type_slots[] = { \ - &tnf_tag_tag_data, \ - &t1##_tag_data, \ - &t2##_tag_data, \ - &t3##_tag_data, \ - &t4##_tag_data, \ - 0 }; \ -static char *ctype_record##_slot_names[] = { \ - "tnf_tag", \ - ""#n1, \ - ""#n2, \ - ""#n3, \ - ""#n4, \ - 0 }; \ -static tnf_tag_data_t ctype_record##_tag_data_rec = { \ - TNF_TAG_VERSION, &tnf_struct_tag_1, \ - 0, #ctype_record, &tnf_user_struct_properties, \ - sizeof (ctype_record##_prototype_t), \ - TNF_REF32_ALIGN, \ - sizeof (ctype_record##_t), TNF_STRUCT, 0, \ - ctype_record##_type_slots, ctype_record##_slot_names \ -}; \ -tnf_tag_data_t *ctype_record##_tag_data = \ - &ctype_record##_tag_data_rec; \ -ctype_record##_t \ -ctype_record(tnf_ops_t *ops, ctype * the_ctype, \ - tnf_record_p reference) \ -{ \ - tnf_tag_data_t *metatag_data; \ - tnf_record_p metatag_index; \ - ctype_record##_prototype_t *buffer; \ - \ - if (the_ctype == NULL) \ - return (0); \ - buffer = (ctype_record##_prototype_t *) tnf_allocate(ops, \ - sizeof (ctype_record##_prototype_t)); \ - if (buffer == NULL) \ - return (0); \ - \ - metatag_data = ctype_record##_tag_data; \ - metatag_index = metatag_data->tag_index ? \ - metatag_data->tag_index: \ - metatag_data->tag_desc(ops, metatag_data); \ - buffer->tag = tnf_tag(ops, metatag_index, \ - (tnf_record_p) &buffer->tag); \ - buffer->data_1 = t1(ops, the_ctype->n1, \ - (tnf_record_p) &(buffer->data_1)); \ - buffer->data_2 = t2(ops, the_ctype->n2, \ - (tnf_record_p) &(buffer->data_2)); \ - buffer->data_3 = t3(ops, the_ctype->n3, \ - (tnf_record_p) &(buffer->data_3)); \ - buffer->data_4 = t4(ops, the_ctype->n4, \ - (tnf_record_p) &(buffer->data_4)); \ - return (tnf_ref32(ops, (tnf_record_p) buffer, reference)); \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_5(ctype, ctype_record, t1, n1, t2, n2, t3, n3, t4, n4, t5, n5) - -#else - -/* CSTYLED */ -#define TNF_DEFINE_RECORD_5(ctype, ctype_record, t1, n1, t2, n2, t3, n3, t4, n4, t5, n5) \ -typedef struct { \ - tnf_tag_t tag; \ - t1##_t data_1; \ - t2##_t data_2; \ - t3##_t data_3; \ - t4##_t data_4; \ - t5##_t data_5; \ -} ctype_record##_prototype_t; \ -static tnf_tag_data_t **ctype_record##_type_slots[] = { \ - &tnf_tag_tag_data, \ - &t1##_tag_data, \ - &t2##_tag_data, \ - &t3##_tag_data, \ - &t4##_tag_data, \ - &t5##_tag_data, \ - 0 }; \ -static char *ctype_record##_slot_names[] = { \ - "tnf_tag", \ - ""#n1, \ - ""#n2, \ - ""#n3, \ - ""#n4, \ - ""#n5, \ - 0 }; \ -static tnf_tag_data_t ctype_record##_tag_data_rec = { \ - TNF_TAG_VERSION, &tnf_struct_tag_1, \ - 0, #ctype_record, &tnf_user_struct_properties, \ - sizeof (ctype_record##_prototype_t), \ - TNF_REF32_ALIGN, \ - sizeof (ctype_record##_t), TNF_STRUCT, 0, \ - ctype_record##_type_slots, ctype_record##_slot_names \ -}; \ -tnf_tag_data_t *ctype_record##_tag_data = \ - &ctype_record##_tag_data_rec; \ -ctype_record##_t \ -ctype_record(tnf_ops_t *ops, ctype * the_ctype, \ - tnf_record_p reference) \ -{ \ - tnf_tag_data_t *metatag_data; \ - tnf_record_p metatag_index; \ - ctype_record##_prototype_t *buffer; \ - \ - if (the_ctype == NULL) \ - return (0); \ - buffer = (ctype_record##_prototype_t *) tnf_allocate(ops, \ - sizeof (ctype_record##_prototype_t)); \ - if (buffer == NULL) \ - return (0); \ - \ - metatag_data = ctype_record##_tag_data; \ - metatag_index = metatag_data->tag_index ? \ - metatag_data->tag_index: \ - metatag_data->tag_desc(ops, metatag_data); \ - buffer->tag = tnf_tag(ops, metatag_index, \ - (tnf_record_p) &buffer->tag); \ - buffer->data_1 = t1(ops, the_ctype->n1, \ - (tnf_record_p) &(buffer->data_1)); \ - buffer->data_2 = t2(ops, the_ctype->n2, \ - (tnf_record_p) &(buffer->data_2)); \ - buffer->data_3 = t3(ops, the_ctype->n3, \ - (tnf_record_p) &(buffer->data_3)); \ - buffer->data_4 = t4(ops, the_ctype->n4, \ - (tnf_record_p) &(buffer->data_4)); \ - buffer->data_5 = t5(ops, the_ctype->n5, \ - (tnf_record_p) &(buffer->data_5)); \ - return (tnf_ref32(ops, (tnf_record_p) buffer, reference)); \ -} - -#endif /* NPROBE */ - -/* - * Probe Macros - */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_PROBE_0(namearg, keysarg, detail) \ - ((void)0) - -#else - -/* CSTYLED */ -#define TNF_PROBE_0(namearg, keysarg, detail) \ -{ \ - struct tnf_v_buf_0 { \ - tnf_probe_event_t probe_event; \ - tnf_time_delta_t time_delta; \ - }; \ - static tnf_tag_data_t ** tnf_v_##namearg##_info[] = { \ - &tnf_probe_event_tag_data, \ - &tnf_time_delta_tag_data, \ - 0 }; \ - static struct tnf_probe_control tnf_v_##namearg##_probe = { \ - &__tnf_probe_version_1, \ - (tnf_probe_control_t *) TNF_NEXT_INIT, \ - (tnf_probe_test_func_t) 0, \ - (tnf_probe_alloc_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_uint32_t) 0, \ - /* attribute string */ \ - "name " TNF_STRINGVALUE(namearg) ";" \ - "slots " \ - ";" \ - "keys " keysarg ";" \ - "file " __FILE__ ";" \ - "line " TNF_STRINGVALUE(__LINE__) ";" \ - detail, \ - tnf_v_##namearg##_info, \ - sizeof (struct tnf_v_buf_0) \ - }; \ - tnf_probe_control_t *tnf_v_probe_p = &tnf_v_##namearg##_probe; \ - tnf_probe_test_func_t tnf_v_probe_test = tnf_v_probe_p->test_func; \ - tnf_probe_setup_t tnf_v_set_p; \ - struct tnf_v_buf_0 *tnf_v_probe_buffer; \ - \ - if (tnf_v_probe_test) { \ - tnf_v_probe_buffer = (struct tnf_v_buf_0 *) \ - tnf_v_probe_test(0, tnf_v_probe_p, &tnf_v_set_p); \ - if (tnf_v_probe_buffer) { \ - (tnf_v_probe_p->probe_func)(&tnf_v_set_p); \ - } \ - } \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_PROBE_1(namearg, keysarg, detail, type_1, namearg_1, valarg_1) \ - ((void)0) - -#else - -/* CSTYLED */ -#define TNF_PROBE_1(namearg, keysarg, detail, type_1, namearg_1, valarg_1) \ -{ \ - struct tnf_v_buf_1 { \ - tnf_probe_event_t probe_event; \ - tnf_time_delta_t time_delta; \ - type_1##_t data_1; \ - }; \ - static tnf_tag_data_t ** tnf_v_##namearg##_info[] = { \ - &tnf_probe_event_tag_data, \ - &tnf_time_delta_tag_data, \ - &type_1##_tag_data, \ - 0 }; \ - static struct tnf_probe_control tnf_v_##namearg##_probe = { \ - &__tnf_probe_version_1, \ - (tnf_probe_control_t *) TNF_NEXT_INIT, \ - (tnf_probe_test_func_t) 0, \ - (tnf_probe_alloc_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_uint32_t) 0, \ - /* attribute string */ \ - "name " TNF_STRINGVALUE(namearg) ";" \ - "slots " \ - ""#namearg_1" " \ - ";" \ - "keys " keysarg ";" \ - "file " __FILE__ ";" \ - "line " TNF_STRINGVALUE(__LINE__) ";" \ - detail, \ - tnf_v_##namearg##_info, \ - sizeof (struct tnf_v_buf_1) \ - }; \ - tnf_probe_control_t *tnf_v_probe_p = &tnf_v_##namearg##_probe; \ - tnf_probe_test_func_t tnf_v_probe_test = tnf_v_probe_p->test_func; \ - tnf_probe_setup_t tnf_v_set_p; \ - struct tnf_v_buf_1 *tnf_v_probe_buffer; \ - \ - if (tnf_v_probe_test) { \ - tnf_v_probe_buffer = (struct tnf_v_buf_1 *) \ - tnf_v_probe_test(0, tnf_v_probe_p, &tnf_v_set_p); \ - if (tnf_v_probe_buffer) { \ - tnf_v_probe_buffer->data_1 = type_1( \ - tnf_v_set_p.tpd_p, valarg_1, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_1)); \ - (tnf_v_probe_p->probe_func)(&tnf_v_set_p); \ - } \ - } \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_PROBE_2(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2) \ - ((void)0) - -#else - -/* CSTYLED */ -#define TNF_PROBE_2(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2) \ -{ \ - struct tnf_v_buf_2 { \ - tnf_probe_event_t probe_event; \ - tnf_time_delta_t time_delta; \ - type_1##_t data_1; \ - type_2##_t data_2; \ - }; \ - static tnf_tag_data_t ** tnf_v_##namearg##_info[] = { \ - &tnf_probe_event_tag_data, \ - &tnf_time_delta_tag_data, \ - &type_1##_tag_data, \ - &type_2##_tag_data, \ - 0 }; \ - static struct tnf_probe_control tnf_v_##namearg##_probe = { \ - &__tnf_probe_version_1, \ - (tnf_probe_control_t *) TNF_NEXT_INIT, \ - (tnf_probe_test_func_t) 0, \ - (tnf_probe_alloc_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_uint32_t) 0, \ - /* attribute string */ \ - "name " TNF_STRINGVALUE(namearg) ";" \ - "slots " \ - ""#namearg_1" " \ - ""#namearg_2" " \ - ";" \ - "keys " keysarg ";" \ - "file " __FILE__ ";" \ - "line " TNF_STRINGVALUE(__LINE__) ";" \ - detail, \ - tnf_v_##namearg##_info, \ - sizeof (struct tnf_v_buf_2) \ - }; \ - tnf_probe_control_t *tnf_v_probe_p = &tnf_v_##namearg##_probe; \ - tnf_probe_test_func_t tnf_v_probe_test = tnf_v_probe_p->test_func; \ - tnf_probe_setup_t tnf_v_set_p; \ - struct tnf_v_buf_2 *tnf_v_probe_buffer; \ - \ - if (tnf_v_probe_test) { \ - tnf_v_probe_buffer = (struct tnf_v_buf_2 *) \ - tnf_v_probe_test(0, tnf_v_probe_p, &tnf_v_set_p); \ - if (tnf_v_probe_buffer) { \ - tnf_v_probe_buffer->data_1 = type_1( \ - tnf_v_set_p.tpd_p, valarg_1, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_1)); \ - tnf_v_probe_buffer->data_2 = type_2( \ - tnf_v_set_p.tpd_p, valarg_2, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_2)); \ - (tnf_v_probe_p->probe_func)(&tnf_v_set_p); \ - } \ - } \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_PROBE_3(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3) \ - ((void)0) - -#else - -/* CSTYLED */ -#define TNF_PROBE_3(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3) \ -{ \ - struct tnf_v_buf_3 { \ - tnf_probe_event_t probe_event; \ - tnf_time_delta_t time_delta; \ - type_1##_t data_1; \ - type_2##_t data_2; \ - type_3##_t data_3; \ - }; \ - static tnf_tag_data_t ** tnf_v_##namearg##_info[] = { \ - &tnf_probe_event_tag_data, \ - &tnf_time_delta_tag_data, \ - &type_1##_tag_data, \ - &type_2##_tag_data, \ - &type_3##_tag_data, \ - 0 }; \ - static struct tnf_probe_control tnf_v_##namearg##_probe = { \ - &__tnf_probe_version_1, \ - (tnf_probe_control_t *) TNF_NEXT_INIT, \ - (tnf_probe_test_func_t) 0, \ - (tnf_probe_alloc_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_uint32_t) 0, \ - /* attribute string */ \ - "name " TNF_STRINGVALUE(namearg) ";" \ - "slots " \ - ""#namearg_1" " \ - ""#namearg_2" " \ - ""#namearg_3" " \ - ";" \ - "keys " keysarg ";" \ - "file " __FILE__ ";" \ - "line " TNF_STRINGVALUE(__LINE__) ";" \ - detail, \ - tnf_v_##namearg##_info, \ - sizeof (struct tnf_v_buf_3) \ - }; \ - tnf_probe_control_t *tnf_v_probe_p = &tnf_v_##namearg##_probe; \ - tnf_probe_test_func_t tnf_v_probe_test = tnf_v_probe_p->test_func; \ - tnf_probe_setup_t tnf_v_set_p; \ - struct tnf_v_buf_3 *tnf_v_probe_buffer; \ - \ - if (tnf_v_probe_test) { \ - tnf_v_probe_buffer = (struct tnf_v_buf_3 *) \ - tnf_v_probe_test(0, tnf_v_probe_p, &tnf_v_set_p); \ - if (tnf_v_probe_buffer) { \ - tnf_v_probe_buffer->data_1 = type_1( \ - tnf_v_set_p.tpd_p, valarg_1, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_1)); \ - tnf_v_probe_buffer->data_2 = type_2( \ - tnf_v_set_p.tpd_p, valarg_2, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_2)); \ - tnf_v_probe_buffer->data_3 = type_3( \ - tnf_v_set_p.tpd_p, valarg_3, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_3)); \ - (tnf_v_probe_p->probe_func)(&tnf_v_set_p); \ - } \ - } \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_PROBE_4(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4) \ - ((void)0) - -#else - -/* CSTYLED */ -#define TNF_PROBE_4(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4) \ -{ \ - struct tnf_v_buf_4 { \ - tnf_probe_event_t probe_event; \ - tnf_time_delta_t time_delta; \ - type_1##_t data_1; \ - type_2##_t data_2; \ - type_3##_t data_3; \ - type_4##_t data_4; \ - }; \ - static tnf_tag_data_t ** tnf_v_##namearg##_info[] = { \ - &tnf_probe_event_tag_data, \ - &tnf_time_delta_tag_data, \ - &type_1##_tag_data, \ - &type_2##_tag_data, \ - &type_3##_tag_data, \ - &type_4##_tag_data, \ - 0 }; \ - static struct tnf_probe_control tnf_v_##namearg##_probe = { \ - &__tnf_probe_version_1, \ - (tnf_probe_control_t *) TNF_NEXT_INIT, \ - (tnf_probe_test_func_t) 0, \ - (tnf_probe_alloc_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_uint32_t) 0, \ - /* attribute string */ \ - "name " TNF_STRINGVALUE(namearg) ";" \ - "slots " \ - ""#namearg_1" " \ - ""#namearg_2" " \ - ""#namearg_3" " \ - ""#namearg_4" " \ - ";" \ - "keys " keysarg ";" \ - "file " __FILE__ ";" \ - "line " TNF_STRINGVALUE(__LINE__) ";" \ - detail, \ - tnf_v_##namearg##_info, \ - sizeof (struct tnf_v_buf_4) \ - }; \ - tnf_probe_control_t *tnf_v_probe_p = &tnf_v_##namearg##_probe; \ - tnf_probe_test_func_t tnf_v_probe_test = tnf_v_probe_p->test_func; \ - tnf_probe_setup_t tnf_v_set_p; \ - struct tnf_v_buf_4 *tnf_v_probe_buffer; \ - \ - if (tnf_v_probe_test) { \ - tnf_v_probe_buffer = (struct tnf_v_buf_4 *) \ - tnf_v_probe_test(0, tnf_v_probe_p, &tnf_v_set_p); \ - if (tnf_v_probe_buffer) { \ - tnf_v_probe_buffer->data_1 = type_1( \ - tnf_v_set_p.tpd_p, valarg_1, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_1)); \ - tnf_v_probe_buffer->data_2 = type_2( \ - tnf_v_set_p.tpd_p, valarg_2, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_2)); \ - tnf_v_probe_buffer->data_3 = type_3( \ - tnf_v_set_p.tpd_p, valarg_3, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_3)); \ - tnf_v_probe_buffer->data_4 = type_4( \ - tnf_v_set_p.tpd_p, valarg_4, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_4)); \ - (tnf_v_probe_p->probe_func)(&tnf_v_set_p); \ - } \ - } \ -} - -#endif /* NPROBE */ - -#ifdef NPROBE - -/* CSTYLED */ -#define TNF_PROBE_5(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4, type_5, namearg_5, valarg_5) \ - ((void)0) - -#else - -/* CSTYLED */ -#define TNF_PROBE_5(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4, type_5, namearg_5, valarg_5) \ -{ \ - struct tnf_v_buf_5 { \ - tnf_probe_event_t probe_event; \ - tnf_time_delta_t time_delta; \ - type_1##_t data_1; \ - type_2##_t data_2; \ - type_3##_t data_3; \ - type_4##_t data_4; \ - type_5##_t data_5; \ - }; \ - static tnf_tag_data_t ** tnf_v_##namearg##_info[] = { \ - &tnf_probe_event_tag_data, \ - &tnf_time_delta_tag_data, \ - &type_1##_tag_data, \ - &type_2##_tag_data, \ - &type_3##_tag_data, \ - &type_4##_tag_data, \ - &type_5##_tag_data, \ - 0 }; \ - static struct tnf_probe_control tnf_v_##namearg##_probe = { \ - &__tnf_probe_version_1, \ - (tnf_probe_control_t *) TNF_NEXT_INIT, \ - (tnf_probe_test_func_t) 0, \ - (tnf_probe_alloc_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_probe_func_t) 0, \ - (tnf_uint32_t) 0, \ - /* attribute string */ \ - "name " TNF_STRINGVALUE(namearg) ";" \ - "slots " \ - ""#namearg_1" " \ - ""#namearg_2" " \ - ""#namearg_3" " \ - ""#namearg_4" " \ - ""#namearg_5" " \ - ";" \ - "keys " keysarg ";" \ - "file " __FILE__ ";" \ - "line " TNF_STRINGVALUE(__LINE__) ";" \ - detail, \ - tnf_v_##namearg##_info, \ - sizeof (struct tnf_v_buf_5) \ - }; \ - tnf_probe_control_t *tnf_v_probe_p = &tnf_v_##namearg##_probe; \ - tnf_probe_test_func_t tnf_v_probe_test = tnf_v_probe_p->test_func; \ - tnf_probe_setup_t tnf_v_set_p; \ - struct tnf_v_buf_5 *tnf_v_probe_buffer; \ - \ - if (tnf_v_probe_test) { \ - tnf_v_probe_buffer = (struct tnf_v_buf_5 *) \ - tnf_v_probe_test(0, tnf_v_probe_p, &tnf_v_set_p); \ - if (tnf_v_probe_buffer) { \ - tnf_v_probe_buffer->data_1 = type_1( \ - tnf_v_set_p.tpd_p, valarg_1, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_1)); \ - tnf_v_probe_buffer->data_2 = type_2( \ - tnf_v_set_p.tpd_p, valarg_2, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_2)); \ - tnf_v_probe_buffer->data_3 = type_3( \ - tnf_v_set_p.tpd_p, valarg_3, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_3)); \ - tnf_v_probe_buffer->data_4 = type_4( \ - tnf_v_set_p.tpd_p, valarg_4, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_4)); \ - tnf_v_probe_buffer->data_5 = type_5( \ - tnf_v_set_p.tpd_p, valarg_5, \ - (tnf_record_p) &(tnf_v_probe_buffer->data_5)); \ - (tnf_v_probe_p->probe_func)(&tnf_v_set_p); \ - } \ - } \ -} - -#endif /* NPROBE */ - -/* - * Debug Probe Macros (contain an additional "debug" attribute) - */ - -#if defined(TNF_DEBUG) - -/* CSTYLED */ -#define TNF_PROBE_0_DEBUG(namearg, keysarg, detail) TNF_PROBE_0(namearg, keysarg, "debug;" detail) - -#else - -/* CSTYLED */ -#define TNF_PROBE_0_DEBUG(namearg, keysarg, detail) \ - ((void)0) - -#endif /* defined(TNF_DEBUG) */ - -#if defined(TNF_DEBUG) - -/* CSTYLED */ -#define TNF_PROBE_1_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1) TNF_PROBE_1(namearg, keysarg, "debug;" detail, type_1, namearg_1, valarg_1) - -#else - -/* CSTYLED */ -#define TNF_PROBE_1_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1) \ - ((void)0) - -#endif /* defined(TNF_DEBUG) */ - -#if defined(TNF_DEBUG) - -/* CSTYLED */ -#define TNF_PROBE_2_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2) TNF_PROBE_2(namearg, keysarg, "debug;" detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2) - -#else - -/* CSTYLED */ -#define TNF_PROBE_2_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2) \ - ((void)0) - -#endif /* defined(TNF_DEBUG) */ - -#if defined(TNF_DEBUG) - -/* CSTYLED */ -#define TNF_PROBE_3_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3) TNF_PROBE_3(namearg, keysarg, "debug;" detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3) - -#else - -/* CSTYLED */ -#define TNF_PROBE_3_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3) \ - ((void)0) - -#endif /* defined(TNF_DEBUG) */ - -#if defined(TNF_DEBUG) - -/* CSTYLED */ -#define TNF_PROBE_4_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4) TNF_PROBE_4(namearg, keysarg, "debug;" detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4) - -#else - -/* CSTYLED */ -#define TNF_PROBE_4_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4) \ - ((void)0) - -#endif /* defined(TNF_DEBUG) */ - -#if defined(TNF_DEBUG) - -/* CSTYLED */ -#define TNF_PROBE_5_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4, type_5, namearg_5, valarg_5) TNF_PROBE_5(namearg, keysarg, "debug;" detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4, type_5, namearg_5, valarg_5) - -#else - -/* CSTYLED */ -#define TNF_PROBE_5_DEBUG(namearg, keysarg, detail, type_1, namearg_1, valarg_1, type_2, namearg_2, valarg_2, type_3, namearg_3, valarg_3, type_4, namearg_4, valarg_4, type_5, namearg_5, valarg_5) \ - ((void)0) - -#endif /* defined(TNF_DEBUG) */ - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_TNF_PROBE_H */ diff --git a/usr/src/uts/common/sys/tnf_writer.h b/usr/src/uts/common/sys/tnf_writer.h deleted file mode 100644 index d1e64f8406..0000000000 --- a/usr/src/uts/common/sys/tnf_writer.h +++ /dev/null @@ -1,476 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 1994,2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ifndef _SYS_TNF_WRITER_H -#define _SYS_TNF_WRITER_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * Public interface for writing predefined TNF types - */ -#include <sys/types.h> -#include <sys/tnf_com.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Defines - */ - -#define TNF_OFFSETOF(s, m) ((size_t)(&(((s *)0)->m))) -#define TNF_ALIGN(type) TNF_OFFSETOF(struct { char _c; type _t; }, _t) - -/* - * Typedefs - */ - -typedef char *tnf_record_p; /* trace buffer memory ptr */ -typedef tnf_ref32_t tnf_reference_t; /* generic reference */ - -typedef struct _tnf_ops tnf_ops_t; /* opaque */ -typedef struct _tnf_tag_version tnf_tag_version_t; -typedef struct _tnf_tag_data tnf_tag_data_t; - -/* - * In-memory reader's classification of TNF types - */ - -typedef enum { - TNF_UNKNOWN = 0, - TNF_INT32, - TNF_UINT32, - TNF_INT64, - TNF_UINT64, - TNF_FLOAT32, - TNF_FLOAT64, - TNF_STRING, - TNF_ARRAY, - TNF_STRUCT, - TNF_OPAQUE, -#ifdef _LP64 - TNF_ULONG = TNF_UINT64, - TNF_LONG = TNF_INT64 -#else - TNF_ULONG = TNF_UINT32, - TNF_LONG = TNF_INT32 -#endif -} tnf_arg_kind_t; - -/* - * Structures - */ - -struct _tnf_tag_version { - size_t version_size; /* sizeof(tnf_tag_version_t) */ - size_t tag_data_size; /* sizeof(tnf_tag_data_t) */ -}; - -struct _tnf_tag_data { - tnf_tag_version_t *tag_version; /* TNF_TAG_VERSION */ - tnf_record_p (*tag_desc)(tnf_ops_t *, tnf_tag_data_t *); - tnf_record_p tag_index; /* trace buffer address */ - const char *tag_name; /* name */ - tnf_tag_data_t ****tag_props; /* properties */ - size_t tag_size; /* type_size, header_size */ - size_t tag_align; /* alignment */ - size_t tag_ref_size; /* reference size */ - tnf_arg_kind_t tag_kind; /* type of object */ - tnf_tag_data_t **tag_base; /* element_type, derived_base */ - tnf_tag_data_t ***tag_slots; /* slot_types, header_types */ - char **tag_slot_names; /* slot_names */ -}; - -/* - * TNF tag version - * A client can scan a binary's relocation table for data relocation - * entries corresponding to __tnf_tag_version_1. These identify - * tags. The actual version information is stored in an associated - * structure called __tnf_tag_version_1_info - */ - -extern tnf_tag_version_t __tnf_tag_version_1_info; - -extern tnf_tag_version_t __tnf_tag_version_1; -#pragma weak __tnf_tag_version_1 /* placeholder: never defined */ -#define TNF_TAG_VERSION &__tnf_tag_version_1 - -/* - * TNF primitive types - */ - -extern tnf_tag_data_t *tnf_char_tag_data; -#define tnf_char(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_int8_tag_data; -#define tnf_int8(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_uint8_tag_data; -#define tnf_uint8(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_int16_tag_data; -#define tnf_int16(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_uint16_tag_data; -#define tnf_uint16(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_int32_tag_data; -#define tnf_int32(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_uint32_tag_data; -#define tnf_uint32(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_int64_tag_data; -#define tnf_int64(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_uint64_tag_data; -#define tnf_uint64(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_float32_tag_data; -#define tnf_float32(ops, item, ref) (item) - -extern tnf_tag_data_t *tnf_float64_tag_data; -#define tnf_float64(ops, item, ref) (item) - -/* - * ``Portable'' primitive types - * These are defined as the well-defined TNF types they map into. - * XXX Machine-dependent - */ - -typedef tnf_uint8_t tnf_uchar_t; -#define tnf_uchar(ops, item, ref) tnf_uint8(ops, item, ref) -#define tnf_uchar_tag_data tnf_uint8_tag_data - -typedef tnf_int16_t tnf_short_t; -#define tnf_short(ops, item, ref) tnf_int16(ops, item, ref) -#define tnf_short_tag_data tnf_int16_tag_data - -typedef tnf_uint16_t tnf_ushort_t; -#define tnf_ushort(ops, item, ref) tnf_uint16(ops, item, ref) -#define tnf_ushort_tag_data tnf_uint16_tag_data - -typedef tnf_int32_t tnf_int_t; -#define tnf_int(ops, item, ref) tnf_int32(ops, item, ref) -#define tnf_int_tag_data tnf_int32_tag_data - -typedef tnf_uint32_t tnf_uint_t; -#define tnf_uint(ops, item, ref) tnf_uint32(ops, item, ref) -#define tnf_uint_tag_data tnf_uint32_tag_data - -#if defined(_LP64) - -typedef tnf_int64_t tnf_long_t; -#define tnf_long(ops, item, ref) tnf_int64(ops, item, ref) -#define tnf_long_tag_data tnf_int64_tag_data - -typedef tnf_uint64_t tnf_ulong_t; -#define tnf_ulong(ops, item, ref) tnf_uint64(ops, item, ref) -#define tnf_ulong_tag_data tnf_uint64_tag_data - -#else - -typedef tnf_int32_t tnf_long_t; -#define tnf_long(ops, item, ref) tnf_int32(ops, item, ref) -#define tnf_long_tag_data tnf_int32_tag_data - -typedef tnf_uint32_t tnf_ulong_t; -#define tnf_ulong(ops, item, ref) tnf_uint32(ops, item, ref) -#define tnf_ulong_tag_data tnf_uint32_tag_data - -#endif /* defined(_LP64) */ - -typedef tnf_int64_t tnf_longlong_t; -#define tnf_longlong(ops, item, ref) tnf_int64(ops, item, ref) -#define tnf_longlong_tag_data tnf_int64_tag_data - -typedef tnf_uint64_t tnf_ulonglong_t; -#define tnf_ulonglong(ops, item, ref) tnf_uint64(ops, item, ref) -#define tnf_ulonglong_tag_data tnf_uint64_tag_data - -typedef tnf_float32_t tnf_float_t; -#define tnf_float(ops, item, ref) tnf_float32(ops, item, ref) -#define tnf_float_tag_data tnf_float32_tag_data - -typedef tnf_float64_t tnf_double_t; -#define tnf_double(ops, item, ref) tnf_float64(ops, item, ref) -#define tnf_double_tag_data tnf_float64_tag_data - -/* - * Derived and aggregate TNF types - */ - -/* Not explicitly represented in type system */ -#define tnf_ref32(ops, item, ref) \ - tnf_ref32_1(ops, item, ref) - -extern tnf_tag_data_t *tnf_tag_tag_data; -typedef tnf_ref32_t tnf_tag_t; -#define tnf_tag(ops, item, ref) \ - (tnf_ref32(ops, item, ref) | TNF_REF32_T_TAG) - -extern tnf_tag_data_t *tnf_string_tag_data; -typedef tnf_reference_t tnf_string_t; -#define tnf_string(ops, item, ref) \ - tnf_string_1(ops, item, ref, tnf_string_tag_data) - -extern tnf_tag_data_t *tnf_name_tag_data; -typedef tnf_string_t tnf_name_t; -#define tnf_name(ops, item, ref) \ - tnf_string_1(ops, item, ref, tnf_name_tag_data) - -extern tnf_tag_data_t *tnf_size_tag_data; -typedef tnf_ulong_t tnf_size_t; -#define tnf_size(ops, item, ref) \ - tnf_ulong(ops, item, ref) - -extern tnf_tag_data_t *tnf_opaque_tag_data; - -#if defined(_LP64) - -typedef tnf_uint64_t tnf_opaque_t; -#define tnf_opaque(ops, item, ref) \ - ((tnf_uint64_t)(item)) - -#else - -typedef tnf_uint32_t tnf_opaque_t; -#define tnf_opaque(ops, item, ref) \ - ((tnf_uint32_t)(item)) - -#endif /* defined(_LP64) */ - -/* - * TNF types for tracing - */ - -extern tnf_tag_data_t *tnf_time_base_tag_data; -typedef tnf_int64_t tnf_time_base_t; -#define tnf_time_base(ops, item, ref) \ - tnf_int64(ops, item, ref) - -extern tnf_tag_data_t *tnf_time_delta_tag_data; -typedef tnf_uint32_t tnf_time_delta_t; -#define tnf_time_delta(ops, item, ref) \ - tnf_uint32(ops, item, ref) - -extern tnf_tag_data_t *tnf_probe_event_tag_data; -typedef tnf_ref32_t tnf_probe_event_t; -#define tnf_probe_event(ops, item, ref) \ - ((tnf_ref32_t)(item) | TNF_REF32_T_PAIR) - -/* process ID */ -extern tnf_tag_data_t *tnf_pid_tag_data; -typedef tnf_int32_t tnf_pid_t; -#define tnf_pid(ops, item, ref) \ - tnf_int32(ops, item, ref) - -/* LWP ID */ -extern tnf_tag_data_t *tnf_lwpid_tag_data; -typedef tnf_uint32_t tnf_lwpid_t; -#define tnf_lwpid(ops, item, ref) \ - tnf_uint32(ops, item, ref) - -#ifdef _KERNEL - -/* kernel thread ID */ -extern tnf_tag_data_t *tnf_kthread_id_tag_data; -typedef tnf_opaque_t tnf_kthread_id_t; -#define tnf_kthread_id(ops, item, ref) \ - tnf_opaque(ops, item, ref) - -/* processor ID */ -extern tnf_tag_data_t *tnf_cpuid_tag_data; -typedef tnf_int32_t tnf_cpuid_t; -#define tnf_cpuid(ops, item, ref) \ - tnf_int32(ops, item, ref) - -/* device ID */ -extern tnf_tag_data_t *tnf_device_tag_data; -typedef tnf_ulong_t tnf_device_t; -#define tnf_device(ops, item, ref) \ - tnf_ulong(ops, item, ref) - -/* kernel symbol */ -extern tnf_tag_data_t *tnf_symbol_tag_data; -typedef tnf_opaque_t tnf_symbol_t; -#define tnf_symbol(ops, item, ref) \ - tnf_opaque(ops, item, ref) - -/* array of symbols */ -extern tnf_tag_data_t *tnf_symbols_tag_data; -typedef tnf_ref32_t tnf_symbols_t; - -#if defined(__sparc) -#define tnf_symbols(ops, item, ref) \ - tnf_opaque32_array_1(ops, item, ref, tnf_symbols_tag_data) -#else /* defined(__sparc) */ -#define tnf_symbols(ops, item, ref) \ - tnf_opaque_array_1(ops, item, ref, tnf_symbols_tag_data) -#endif /* defined(__sparc) */ - -/* system call number */ -extern tnf_tag_data_t *tnf_sysnum_tag_data; -typedef tnf_int16_t tnf_sysnum_t; -#define tnf_sysnum(ops, item, ref) \ - tnf_int16(ops, item, ref) - -/* thread microstate XXX enum */ -/* XXX should have a new type tnf_enum of appropriate size to map C enum's */ -/* XXX cast below is to avoid lint warnings */ -extern tnf_tag_data_t *tnf_microstate_tag_data; -typedef tnf_int32_t tnf_microstate_t; -#define tnf_microstate(ops, item, ref) \ - tnf_int32(ops, (tnf_int32_t)(item), ref) - -/* file offset */ -extern tnf_tag_data_t *tnf_offset_tag_data; -typedef tnf_int64_t tnf_offset_t; -#define tnf_offset(ops, item, ref) \ - tnf_int64(ops, item, ref) - -/* address fault type XXX enum */ -/* XXX should have a new type tnf_enum of appropriate size to map C enum's */ -/* XXX cast below is to avoid lint warnings */ -extern tnf_tag_data_t *tnf_fault_type_tag_data; -typedef tnf_int32_t tnf_fault_type_t; -#define tnf_fault_type(ops, item, ref) \ - tnf_int32(ops, (tnf_int32_t)(item), ref) - -/* segment access type XXX enum */ -/* XXX should have a new type tnf_enum of appropriate size to map C enum's */ -/* XXX cast below is to avoid lint warnings */ -extern tnf_tag_data_t *tnf_seg_access_tag_data; -typedef tnf_int32_t tnf_seg_access_t; -#define tnf_seg_access(ops, item, ref) \ - tnf_int32(ops, (tnf_int32_t)(item), ref) - -/* buffered I/O flags */ -extern tnf_tag_data_t *tnf_bioflags_tag_data; -typedef tnf_int32_t tnf_bioflags_t; -#define tnf_bioflags(ops, item, ref) \ - tnf_int32(ops, item, ref) - -/* disk block addresses */ -extern tnf_tag_data_t *tnf_diskaddr_tag_data; -typedef tnf_int64_t tnf_diskaddr_t; -#define tnf_diskaddr(ops, item, ref) \ - tnf_int64(ops, item, ref) - -#endif /* _KERNEL */ - -/* - * Type extension interface - */ - -extern tnf_tag_data_t ***tnf_user_struct_properties; - -/* - * Data encoders - */ - -extern tnf_ref32_t tnf_ref32_1(tnf_ops_t *, - tnf_record_p, - tnf_record_p); - -extern tnf_reference_t tnf_string_1(tnf_ops_t *, - const char *, - tnf_record_p, - tnf_tag_data_t *); - -#ifdef _KERNEL - -extern tnf_reference_t tnf_opaque_array_1(tnf_ops_t *, - tnf_opaque_t *, - tnf_record_p, - tnf_tag_data_t *); - -#ifdef __sparc -extern tnf_reference_t tnf_opaque32_array_1(tnf_ops_t *, - tnf_uint32_t *, - tnf_record_p, - tnf_tag_data_t *); -#endif /* __sparc */ - -#endif /* _KERNEL */ - -/* - * Tag descriptors - */ - -extern tnf_record_p tnf_struct_tag_1(tnf_ops_t *, tnf_tag_data_t *); - -/* - * Buffer memory allocator - */ - -extern void *tnf_allocate(tnf_ops_t *, size_t); - -/* - * Weak symbol definitions to allow unprobed operation - */ - -#if !defined(_KERNEL) && !defined(_TNF_LIBRARY) - -#pragma weak __tnf_tag_version_1_info - -#pragma weak tnf_char_tag_data -#pragma weak tnf_int8_tag_data -#pragma weak tnf_uint8_tag_data -#pragma weak tnf_int16_tag_data -#pragma weak tnf_uint16_tag_data -#pragma weak tnf_int32_tag_data -#pragma weak tnf_uint32_tag_data -#pragma weak tnf_int64_tag_data -#pragma weak tnf_uint64_tag_data -#pragma weak tnf_float32_tag_data -#pragma weak tnf_float64_tag_data - -#pragma weak tnf_tag_tag_data -#pragma weak tnf_string_tag_data -#pragma weak tnf_name_tag_data -#pragma weak tnf_opaque_tag_data -#pragma weak tnf_size_tag_data - -#pragma weak tnf_probe_event_tag_data -#pragma weak tnf_time_delta_tag_data - -#pragma weak tnf_user_struct_properties - -#pragma weak tnf_ref32_1 -#pragma weak tnf_string_1 -#pragma weak tnf_struct_tag_1 -#pragma weak tnf_allocate - -#endif /* !defined(_KERNEL) || !defined(_TNF_LIBRARY) */ - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_TNF_WRITER_H */ diff --git a/usr/src/uts/common/syscall/lwp_sobj.c b/usr/src/uts/common/syscall/lwp_sobj.c index a87aa05cdd..25e0c49a60 100644 --- a/usr/src/uts/common/syscall/lwp_sobj.c +++ b/usr/src/uts/common/syscall/lwp_sobj.c @@ -54,7 +54,6 @@ #include <sys/schedctl.h> #include <sys/sleepq.h> #include <sys/policy.h> -#include <sys/tnf_probe.h> #include <sys/lwpchan_impl.h> #include <sys/turnstile.h> #include <sys/atomic.h> diff --git a/usr/src/uts/common/tnf/mkprobehdr.sh b/usr/src/uts/common/tnf/mkprobehdr.sh deleted file mode 100644 index d5499ea28e..0000000000 --- a/usr/src/uts/common/tnf/mkprobehdr.sh +++ /dev/null @@ -1,367 +0,0 @@ -#!/usr/bin/sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 1994-2000 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "%Z%%M% %I% %E% SMI" - -cat <<ENDSTR -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - */ - -#ifndef _SYS_TNF_PROBE_H -#define _SYS_TNF_PROBE_H - -#pragma ident "%Z%tnf_probe.h %I% %E% SMI" - -#include <sys/tnf_writer.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * These macros are used to convert the __LINE__ directive to a - * string in the probe macros below. - */ - -#define TNF_STRINGIFY(x) #x -#define TNF_STRINGVALUE(x) TNF_STRINGIFY(x) - -/* - * Alignment of tnf_ref32_t - */ - -struct _tnf_ref32_align { - char c; - tnf_ref32_t t; -}; -#define TNF_REF32_ALIGN TNF_OFFSETOF(struct _tnf_ref32_align, t) - -/* - * Probe versioning - */ - -struct tnf_probe_version { - size_t version_size; /* sizeof(struct tnf_probe_version) */ - size_t probe_control_size; /* sizeof(tnf_probe_control_t) */ -}; - -extern struct tnf_probe_version __tnf_probe_version_1; -#pragma weak __tnf_probe_version_1 - -/* - * Typedefs - */ - -typedef struct tnf_probe_control tnf_probe_control_t; -typedef struct tnf_probe_setup tnf_probe_setup_t; - -/* returns pointer to buffer */ -typedef void * (*tnf_probe_test_func_t)(void *, - tnf_probe_control_t *, - tnf_probe_setup_t *); - -/* returns buffer pointer */ -typedef void * (*tnf_probe_alloc_func_t)(tnf_ops_t *, /* tpd */ - tnf_probe_control_t *, - tnf_probe_setup_t *); - -typedef void (*tnf_probe_func_t)(tnf_probe_setup_t *); - -/* - * Probe argument block - */ - -struct tnf_probe_setup { - tnf_ops_t *tpd_p; - void *buffer_p; - tnf_probe_control_t *probe_p; -}; - -/* - * Probe control block - */ - -struct tnf_probe_control { - const struct tnf_probe_version *version; - tnf_probe_control_t *next; - tnf_probe_test_func_t test_func; - tnf_probe_alloc_func_t alloc_func; - tnf_probe_func_t probe_func; - tnf_probe_func_t commit_func; - tnf_uint32_t index; - const char *attrs; - tnf_tag_data_t ***slot_types; - unsigned long tnf_event_size; -}; - -#ifdef _KERNEL - -#define TNF_NEXT_INIT 0 - -#else - -#define TNF_NEXT_INIT -1 - -#endif /* _KERNEL */ - -/* - * TNF Type extension - */ - -#ifdef NPROBE - -#define TNF_DECLARE_RECORD(ctype, record) \\ - typedef tnf_reference_t record##_t - -#else - -#define TNF_DECLARE_RECORD(ctype, record) \\ - typedef tnf_reference_t record##_t; \\ - extern tnf_tag_data_t *record##_tag_data; \\ - extern record##_t record(tnf_ops_t *, ctype *, tnf_reference_t) - -#endif /* NPROBE */ - -ENDSTR - -# -# The following code generates the five type extension macros -# -for i in 1 2 3 4 5; do - echo "#ifdef NPROBE\n" - echo "/* CSTYLED */" - echo "#define TNF_DEFINE_RECORD_$i(ctype, ctype_record\c" - j=1; while [ $j -le $i ]; do - echo ", t$j, n$j\c" - j=`expr $j + 1` - done - echo ")\n" - echo "#else\n" - echo "/* CSTYLED */" - echo "#define TNF_DEFINE_RECORD_$i(ctype, ctype_record\c" - j=1; while [ $j -le $i ]; do - echo ", t$j, n$j\c" - j=`expr $j + 1` - done - echo ") \\" - echo "typedef struct { \\" - echo " tnf_tag_t tag; \\" - j=1; while [ $j -le $i ]; do - echo " t$j##_t data_$j; \\" - j=`expr $j + 1` - done - echo "} ctype_record##_prototype_t; \\" - echo "static tnf_tag_data_t **ctype_record##_type_slots[] = { \\" - echo " &tnf_tag_tag_data, \\" - j=1; while [ $j -le $i ]; do - echo " &t$j##_tag_data, \\" - j=`expr $j + 1` - done - echo " 0 }; \\"; - echo "static char *ctype_record##_slot_names[] = { \\"; - echo " \"tnf_tag\", \\" - j=1; while [ $j -le $i ]; do - echo " \"\"#n$j, \\" - j=`expr $j + 1` - done - echo " 0 }; \\" - echo "static tnf_tag_data_t ctype_record##_tag_data_rec = { \\" - echo " TNF_TAG_VERSION, &tnf_struct_tag_1, \\" - echo " 0, #ctype_record, &tnf_user_struct_properties, \\" - echo " sizeof (ctype_record##_prototype_t), \\" - echo " TNF_REF32_ALIGN, \\" - echo " sizeof (ctype_record##_t), TNF_STRUCT, 0, \\" - echo " ctype_record##_type_slots, ctype_record##_slot_names \\" - echo "}; \\" - echo "tnf_tag_data_t *ctype_record##_tag_data = \\" - echo " &ctype_record##_tag_data_rec; \\" - echo "ctype_record##_t \\" - echo "ctype_record(tnf_ops_t *ops, ctype * the_ctype, \\" - echo " tnf_reference_t reference) \\" - echo "{ \\" - echo " tnf_tag_data_t *metatag_data; \\" - echo " tnf_record_p metatag_index; \\" - echo " ctype_record##_prototype_t *buffer; \\" - echo " \\" - echo " if (the_ctype == NULL) \\" - echo " return (0); \\" - echo " buffer = (ctype_record##_prototype_t *) tnf_allocate(ops, \\" - echo " sizeof (ctype_record##_prototype_t)); \\" - echo " if (buffer == NULL) \\" - echo " return (0); \\" - echo " \\" - echo " metatag_data = ctype_record##_tag_data; \\" - echo " metatag_index = metatag_data->tag_index ? \\" - echo " metatag_data->tag_index: \\" - echo " metatag_data->tag_desc(ops, metatag_data); \\" - echo " buffer->tag = tnf_tag(ops, metatag_index, \\" - echo " (tnf_reference_t) &buffer->tag); \\" - j=1; while [ $j -le $i ]; do - echo " buffer->data_$j = t$j(ops, the_ctype->n$j, \\" - echo " (tnf_reference_t) &(buffer->data_$j)); \\" - j=`expr $j + 1` - done - echo " return (tnf_ref32(ops, (tnf_record_p) buffer, reference)); \\" - echo "}\n" - echo "#endif /* NPROBE */" - echo "" -done - -echo "/*" -echo " * Probe Macros" -echo " */" -echo "" - -# -# The following code generates the six probe macros ... -# -for i in 0 1 2 3 4 5; do - echo "#ifdef NPROBE\n" - echo "/* CSTYLED */" - echo "#define TNF_PROBE_$i(namearg, keysarg, detail\c" - j=1; while [ $j -le $i ]; do - echo ", type_$j, namearg_$j, valarg_$j\c" - j=`expr $j + 1` - done - echo ") \\" - echo "\t\t((void)0)\n" - echo "#else\n" - echo "/* CSTYLED */" - echo "#define TNF_PROBE_$i(namearg, keysarg, detail\c" - j=1; while [ $j -le $i ]; do - echo ", type_$j, namearg_$j, valarg_$j\c"; - j=`expr $j + 1` - done - echo ") \\" - echo "{ \\" - echo " struct tnf_v_buf_$i { \\" - echo " tnf_probe_event_t probe_event; \\" - echo " tnf_time_delta_t time_delta; \\" - j=1; while [ $j -le $i ]; do - echo " type_$j##_t data_$j; \\" - j=`expr $j + 1` - done - echo " }; \\" - echo " static tnf_tag_data_t ** tnf_v_##namearg##_info[] = { \\" - echo " &tnf_probe_event_tag_data, \\" - echo " &tnf_time_delta_tag_data, \\" - j=1; while [ $j -le $i ]; do - echo " &type_$j##_tag_data, \\" - j=`expr $j + 1` - done - echo " 0 }; \\" - echo " static struct tnf_probe_control tnf_v_##namearg##_probe = { \\" - echo " &__tnf_probe_version_1, \\" - echo " (tnf_probe_control_t *) TNF_NEXT_INIT, \\" - echo " (tnf_probe_test_func_t) 0, \\" - echo " (tnf_probe_alloc_func_t) 0, \\" - echo " (tnf_probe_func_t) 0, \\" - echo " (tnf_probe_func_t) 0, \\" - echo " (tnf_uint32_t) 0, \\" - echo " /* attribute string */ \\" - echo " \"name \" TNF_STRINGVALUE(namearg) \";\" \\" -# echo " \"slots \"\c" -# j=1; while [ $j -le $i ]; do -# echo " #namearg_$j \" \"\c" -# j=`expr $j + 1` - echo " \"slots \" \\" - j=1; while [ $j -le $i ]; do - echo " \"\"#namearg_$j\" \" \\" - j=`expr $j + 1` - done - echo " \";\" \\" - echo " \"keys \" keysarg \";\" \\" - echo " \"file \" __FILE__ \";\" \\" - echo " \"line \" TNF_STRINGVALUE(__LINE__) \";\" \\" - echo " detail, \\" - echo " tnf_v_##namearg##_info, \\" - echo " sizeof (struct tnf_v_buf_$i) \\" - echo " }; \\" - echo " tnf_probe_control_t *tnf_v_probe_p = &tnf_v_##namearg##_probe; \\" - echo " tnf_probe_test_func_t tnf_v_probe_test = tnf_v_probe_p->test_func; \\" - echo " tnf_probe_setup_t tnf_v_set_p; \\" - echo " struct tnf_v_buf_$i *tnf_v_probe_buffer; \\" - echo " \\" - echo " if (tnf_v_probe_test) { \\" - echo " tnf_v_probe_buffer = (struct tnf_v_buf_$i *) \\" - echo " tnf_v_probe_test(0, tnf_v_probe_p, &tnf_v_set_p); \\" - echo " if (tnf_v_probe_buffer) { \\" - j=1; while [ $j -le $i ]; do - echo " tnf_v_probe_buffer->data_$j = type_$j( \\" - echo " tnf_v_set_p.tpd_p, valarg_$j, \\" - echo " (tnf_reference_t) &(tnf_v_probe_buffer->data_$j)); \\" - j=`expr $j + 1` - done - echo " (tnf_v_probe_p->probe_func)(&tnf_v_set_p); \\" - echo " } \\" - echo " } \\" - echo "}\n" - echo "#endif /* NPROBE */" - echo "" - done - -echo "/*" -echo " * Debug Probe Macros (contain an additional \"debug\" attribute)" -echo " */" -echo "" - -# -# The following code generates the six debug probe macros ... -# -for i in 0 1 2 3 4 5; do - echo "#if defined(TNF_DEBUG)\n" - echo "/* CSTYLED */" - echo "#define TNF_PROBE_${i}_DEBUG(namearg, keysarg, detail\c" - j=1; while [ $j -le $i ]; do - echo ", type_$j, namearg_$j, valarg_$j\c"; - j=`expr $j + 1` - done - echo ")\t\c" - echo "TNF_PROBE_$i(namearg, keysarg, \"debug;\" detail\c" - j=1; while [ $j -le $i ]; do - echo ", type_$j, namearg_$j, valarg_$j\c" - j=`expr $j + 1` - done - echo ")\n" - echo "#else\n" - echo "/* CSTYLED */" - echo "#define TNF_PROBE_${i}_DEBUG(namearg, keysarg, detail\c" - j=1; while [ $j -le $i ]; do - echo ", type_$j, namearg_$j, valarg_$j\c" - j=`expr $j + 1` - done - echo ") \\" - echo "\t\t((void)0)\n" - echo "#endif /* defined(TNF_DEBUG) */" - echo "" - done - - echo "#ifdef __cplusplus" - echo "}" - echo "#endif" - echo "" - echo "#endif /* _SYS_TNF_PROBE_H */" diff --git a/usr/src/uts/common/tnf/tnf.c b/usr/src/uts/common/tnf/tnf.c deleted file mode 100644 index d5aa17236f..0000000000 --- a/usr/src/uts/common/tnf/tnf.c +++ /dev/null @@ -1,949 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - - -/* - * tnf driver - provides probe control and kernel trace buffer access - * to the user programs prex and tnfxtract. - */ - -#include <sys/types.h> -#include <sys/param.h> -#include <sys/sysmacros.h> -#include <sys/file.h> -#include <sys/cmn_err.h> -#include <sys/fcntl.h> -#include <sys/uio.h> -#include <sys/kmem.h> -#include <sys/cred.h> -#include <sys/mman.h> -#include <sys/errno.h> -#include <sys/stat.h> -#include <sys/conf.h> -#include <sys/ddi.h> -#include <sys/sunddi.h> -#include <sys/modctl.h> -#include <sys/tnf.h> -#include <sys/debug.h> -#include <sys/devops.h> -#include <vm/as.h> -#include <vm/seg_kp.h> -#include <sys/tnf_probe.h> -#include <sys/kobj.h> - -#include "tnf_buf.h" -#include "tnf_types.h" -#include "tnf_trace.h" - -#ifndef NPROBE - -/* - * Each probe is independently put in the kernel, prex uses - * __tnf_probe_list_head and __tnf_tag_list_head as pointers to linked list - * for probes and static tnf_tag_data_t, respectively. - * tnf used the elf relocation record to build a separate linked list for - * the probes and tnf_tag_data_t. We will describe how the linked list for - * __tnf_tag_list_head is made, the probe list is very similar. - * During the dynamic relocation(in uts/sparc/krtld/kobj_reloc.c), - * the &__tnf_tag_version_1(the first member in tnf_tag_data_t data struct) - * (and since it is a global variable which was never defined) will be filled - * with 0. The following code in kobj_reloc.c will get the address of current - * __tnf_tag_list_head and put it in value_p: - * #define TAG_MARKER_SYMBOL "__tnf_tag_version_1" - * if (strcmp(symname, TAG_MARKER_SYMBOL) == 0) { - * *addend_p = 0; - * *value_p = (Addr) __tnf_tag_list_head; (value_p points to list head) - * __tnf_tag_list_head = (void *)*offset_p;(list head is the next record) - * return (0); - * } - * - * the function do_reloc(in the kobj_reloc.c) will put vlaue_p into - * &__tnf_tag_version_1 - * Now the &__tnf_tag_version_1 points to the last list head - * and __tnf_tag_list_head points to the new list head. - * This is equivalent to attatch a node at the beginning of the list. - * - */ -extern tnf_probe_control_t *__tnf_probe_list_head; -extern tnf_tag_data_t *__tnf_tag_list_head; -extern int tnf_changed_probe_list; - -static int tnf_attach(dev_info_t *, ddi_attach_cmd_t); -static int tnf_detach(dev_info_t *, ddi_detach_cmd_t); -static int tnf_info(dev_info_t *, ddi_info_cmd_t, void *, void **); -static int tnf_open(dev_t *, int, int, struct cred *); -static int tnf_close(dev_t, int, int, struct cred *); -#ifdef UNUSED -static int tnf_mmap(dev_t, off_t, int); -#endif -static int tnf_ioctl(dev_t, int, intptr_t, int, struct cred *, int *); -#ifdef UNUSED -static int tnf_prop_op(dev_t, dev_info_t *, ddi_prop_op_t, - int, char *, caddr_t, int *); -#endif -static dev_info_t *tnf_devi; - -static struct { - int tnf_probe_count; - boolean_t tnf_pidfilter_mode; - boolean_t ctldev_is_open; - int mapdev_open_count; - kmutex_t tnf_mtx; -} tnf_drv_state = { 0, B_FALSE, B_FALSE, 0 }; - -static int tnf_getmaxprobe(caddr_t, int); -static int tnf_getprobevals(caddr_t, int); -static int tnf_getprobestring(caddr_t, int); -static int tnf_setprobevals(caddr_t, int); -static int tnf_getstate(caddr_t, int); -static int tnf_allocbuf(intptr_t); -static int tnf_deallocbuf(void); -static int tnf_settracing(int); -static int tnf_pidfilterset(int); -static int tnf_pidfilterget(caddr_t, int); -static int tnf_getpidstate(caddr_t, int); -static int tnf_setpidstate(int, pid_t, int); -static int tnf_getheader(caddr_t, int); -static int tnf_getblock(caddr_t, int); -static int tnf_getfwzone(caddr_t, int); - -static void *tnf_test_1(void *, tnf_probe_control_t *, tnf_probe_setup_t *); -static void *tnf_test_2(void *, tnf_probe_control_t *, tnf_probe_setup_t *); - -#define TNFCTL_MINOR 0 -#define TNFMAP_MINOR 1 - -struct cb_ops tnf_cb_ops = { - tnf_open, /* open */ - tnf_close, /* close */ - nodev, /* strategy */ - nodev, /* print */ - nodev, /* dump */ - nodev, /* read */ - nodev, /* write */ - tnf_ioctl, /* ioctl */ - nodev, /* devmap */ - nodev, /* mmap */ - nodev, /* segmap */ - nochpoll, /* poll */ - ddi_prop_op, /* prop_op */ - 0, /* streamtab */ - D_NEW | D_MP /* Driver compatibility flag */ -}; - -struct dev_ops tnf_ops = { - DEVO_REV, /* devo_rev, */ - 0, /* refcnt */ - tnf_info, /* info */ - nulldev, /* identify */ - nulldev, /* probe */ - tnf_attach, /* attach */ - tnf_detach, /* detach */ - nodev, /* reset */ - &tnf_cb_ops, /* driver operations */ - (struct bus_ops *)0, /* no bus operations */ - NULL, /* power */ - ddi_quiesce_not_needed, /* quiesce */ -}; - -extern struct mod_ops mod_driverops; - -static struct modldrv modldrv = { - &mod_driverops, - "kernel probes driver", - &tnf_ops, -}; - -static struct modlinkage modlinkage = { - MODREV_1, - (void *)&modldrv, - NULL -}; - -int -_init() -{ - register int error; - - mutex_init(&tnf_drv_state.tnf_mtx, NULL, MUTEX_DEFAULT, NULL); - - if ((error = mod_install(&modlinkage)) != 0) { - mutex_destroy(&tnf_drv_state.tnf_mtx); - return (error); - } - - /* Give t0 a tpdp */ - if (!t0.t_tnf_tpdp) - t0.t_tnf_tpdp = kmem_zalloc(sizeof (tnf_ops_t), KM_SLEEP); - /* Initialize tag system */ - tnf_tag_core_init(); - tnf_tag_trace_init(); - tnf_changed_probe_list = 1; - return (0); -} - -int -_fini() -{ - /* Not safe to unload this module, currently */ - return (EBUSY); -} - -int -_info(struct modinfo *modinfop) -{ - return (mod_info(&modlinkage, modinfop)); -} - -/* ARGSUSED */ -static int -tnf_info(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, void **result) -{ - register int error; - - switch (infocmd) { - case DDI_INFO_DEVT2DEVINFO: - *result = (void *)tnf_devi; - error = DDI_SUCCESS; - break; - case DDI_INFO_DEVT2INSTANCE: - *result = (void *)0; - error = DDI_SUCCESS; - break; - default: - error = DDI_FAILURE; - } - return (error); -} - -static int -tnf_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) -{ - if (cmd != DDI_ATTACH) - return (DDI_FAILURE); - if ((ddi_create_minor_node(devi, "tnfctl", S_IFCHR, TNFCTL_MINOR, - DDI_PSEUDO, 0) == DDI_FAILURE) || - (ddi_create_minor_node(devi, "tnfmap", S_IFCHR, TNFMAP_MINOR, - DDI_PSEUDO, 0) == DDI_FAILURE)) { - ddi_remove_minor_node(devi, NULL); - return (DDI_FAILURE); - } - tnf_devi = devi; - return (DDI_SUCCESS); -} - -static int -tnf_detach(dev_info_t *devi, ddi_detach_cmd_t cmd) -{ - if (cmd != DDI_DETACH) - return (DDI_FAILURE); - ddi_remove_minor_node(devi, NULL); - return (DDI_SUCCESS); -} - -/* - * property operations. Return the size of the kernel trace buffer. We - * only handle size property requests. Others are passed on. - */ -#ifdef UNUSED -static int -tnf_prop_op(dev_t dev, dev_info_t *di, ddi_prop_op_t prop, - int m, char *name, caddr_t valuep, int *lengthp) -{ - int length, *retbuf, size; - - if (strcmp(name, "size") == 0) { - - /* Don't need tnf_mtx, since mapdev_open_count > 0 */ - size = tnf_trace_file_size; - - length = *lengthp; /* get caller's length */ - *lengthp = sizeof (int); /* set caller's length */ - - switch (prop) { - - case PROP_LEN: - return (DDI_PROP_SUCCESS); - - case PROP_LEN_AND_VAL_ALLOC: - retbuf = kmem_alloc(sizeof (int), - (m & DDI_PROP_CANSLEEP) ? KM_SLEEP : KM_NOSLEEP); - if (retbuf == NULL) - return (DDI_PROP_NO_MEMORY); - *(int **)valuep = retbuf; /* set caller's buf */ - *retbuf = size; - return (DDI_PROP_SUCCESS); - - case PROP_LEN_AND_VAL_BUF: - if (length < sizeof (int)) - return (DDI_PROP_BUF_TOO_SMALL); - *(int *)valuep = size; - return (DDI_PROP_SUCCESS); - } - } - return (ddi_prop_op(dev, dip, prop, m, name, valuep, lengthp)); -} -#endif - -/* ARGSUSED */ -static int -tnf_open(dev_t *devp, int flag, int otyp, struct cred *cred) -{ - int err = 0; - mutex_enter(&tnf_drv_state.tnf_mtx); - if (getminor(*devp) == TNFCTL_MINOR) { - if (tnf_drv_state.ctldev_is_open) - err = EBUSY; - else { - tnf_drv_state.ctldev_is_open = B_TRUE; - /* stop autounloading -- XXX temporary */ - modunload_disable(); - } - } else { - /* ASSERT(getminor(*devp) == TNFMAP_MINOR) */ - ++tnf_drv_state.mapdev_open_count; - } - mutex_exit(&tnf_drv_state.tnf_mtx); - return (err); -} - -/* ARGSUSED */ -static int -tnf_close(dev_t dev, int flag, int otyp, struct cred *cred) -{ - if (getminor(dev) == TNFCTL_MINOR) { - /* - * Request the reenablement of autounloading - */ - modunload_enable(); - tnf_drv_state.ctldev_is_open = B_FALSE; - } else { - /* ASSERT(getminor(dev) == TNFMAP_MINOR) */ - /* - * Unconditionally zero the open count since close() - * is called when last client closes the device. - */ - tnf_drv_state.mapdev_open_count = 0; - } - return (0); -} - -/* - * return the address of the image referenced by dev. - * - * 1191344: aliasing problem on VAC machines. It could be made to - * work by ensuring that tnf_buf is allocated on a vac_size boundary. - */ -#ifdef UNUSED -/*ARGSUSED*/ -static int -tnf_mmap(dev_t dev, off_t off, int prot) -{ - register caddr_t addr; - register caddr_t pg_offset; - - if (getminor(dev) != TNFMAP_MINOR) - return (-1); - if (tnf_buf == 0 || off >= tnf_trace_file_size) { - return (-1); - } - - addr = tnf_buf; - pg_offset = (caddr_t)((ulong_t)addr + (ulong_t)off); - return ((int)hat_getpfnum(kas.a_hat, pg_offset)); -} -#endif - -/*ARGSUSED4*/ -static int -tnf_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, - cred_t *credp, int *rvalp) -{ - int filterval = 1; - - if ((mode & FMODELS) != FNATIVE) - return (ENOTSUP); - - if (getminor(dev) != TNFCTL_MINOR && - cmd != TIFIOCGSTATE && - cmd != TIFIOCGHEADER && - cmd != TIFIOCGBLOCK && - cmd != TIFIOCGFWZONE) - return (EINVAL); - - switch (cmd) { - case TIFIOCGMAXPROBE: - return (tnf_getmaxprobe((caddr_t)arg, mode)); - case TIFIOCGPROBEVALS: - return (tnf_getprobevals((caddr_t)arg, mode)); - case TIFIOCGPROBESTRING: - return (tnf_getprobestring((caddr_t)arg, mode)); - case TIFIOCSPROBEVALS: - return (tnf_setprobevals((caddr_t)arg, mode)); - case TIFIOCGSTATE: - return (tnf_getstate((caddr_t)arg, mode)); - case TIFIOCALLOCBUF: - return (tnf_allocbuf(arg)); - case TIFIOCDEALLOCBUF: - return (tnf_deallocbuf()); - case TIFIOCSTRACING: - /* LINTED cast from 64-bit integer to 32-bit integer */ - return (tnf_settracing((int)arg)); - case TIFIOCSPIDFILTER: - /* LINTED cast from 64-bit integer to 32-bit integer */ - return (tnf_pidfilterset((int)arg)); - case TIFIOCGPIDSTATE: - return (tnf_getpidstate((caddr_t)arg, mode)); - case TIFIOCSPIDOFF: - filterval = 0; - /*FALLTHROUGH*/ - case TIFIOCSPIDON: - /* LINTED cast from 64-bit integer to 32-bit integer */ - return (tnf_setpidstate(filterval, (pid_t)arg, mode)); - case TIFIOCPIDFILTERGET: - return (tnf_pidfilterget((caddr_t)arg, mode)); - case TIFIOCGHEADER: - return (tnf_getheader((caddr_t)arg, mode)); - case TIFIOCGBLOCK: - return (tnf_getblock((caddr_t)arg, mode)); - case TIFIOCGFWZONE: - return (tnf_getfwzone((caddr_t)arg, mode)); - default: - return (EINVAL); - } -} - -/* - * ioctls - */ - -static int -tnf_getmaxprobe(caddr_t arg, int mode) -{ - tnf_probe_control_t *p; - /* - * XXX Still not right for module unload -- just counting - * the probes is not enough - */ - if (tnf_changed_probe_list) { - mutex_enter(&mod_lock); - tnf_changed_probe_list = 0; - tnf_drv_state.tnf_probe_count = 0; - for (p = (tnf_probe_control_t *)__tnf_probe_list_head; - p != 0; p = p->next) - ++tnf_drv_state.tnf_probe_count; - mutex_exit(&mod_lock); - } - if (ddi_copyout((caddr_t)&tnf_drv_state.tnf_probe_count, - arg, sizeof (tnf_drv_state.tnf_probe_count), mode)) - return (EFAULT); - return (0); -} - -static int -tnf_getprobevals(caddr_t arg, int mode) -{ - tnf_probevals_t probebuf; - tnf_probe_control_t *p; - int i, retval = 0; - - if (ddi_copyin(arg, (caddr_t)&probebuf, sizeof (probebuf), mode)) - return (EFAULT); - - mutex_enter(&mod_lock); - for (i = 1, p = (tnf_probe_control_t *)__tnf_probe_list_head; - p != NULL && i != probebuf.probenum; - ++i, p = p->next) - ; - if (p == NULL) - retval = ENOENT; - else { - probebuf.enabled = (p->test_func != NULL); - probebuf.traced = (p->probe_func == tnf_trace_commit); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - probebuf.attrsize = strlen(p->attrs) + 1; - if (ddi_copyout((caddr_t)&probebuf, - arg, sizeof (probebuf), mode)) - retval = EFAULT; - } - mutex_exit(&mod_lock); - return (retval); -} - -static int -tnf_getprobestring(caddr_t arg, int mode) -{ - tnf_probevals_t probebuf; - tnf_probe_control_t *p; - int i, retval = 0; - - if (ddi_copyin(arg, (caddr_t)&probebuf, sizeof (probebuf), mode)) - return (EFAULT); - - mutex_enter(&mod_lock); - for (i = 1, p = (tnf_probe_control_t *)__tnf_probe_list_head; - p != NULL && i != probebuf.probenum; - ++i, p = p->next) - ; - if (p == NULL) - retval = ENOENT; - else if (ddi_copyout((caddr_t)p->attrs, - arg, strlen(p->attrs) + 1, mode)) - retval = EFAULT; - mutex_exit(&mod_lock); - return (retval); -} - -static int -tnf_setprobevals(caddr_t arg, int mode) -{ - tnf_probevals_t probebuf; - tnf_probe_control_t *p; - int i, retval = 0; - - if (ddi_copyin(arg, (caddr_t)&probebuf, sizeof (probebuf), mode)) - return (EFAULT); - - mutex_enter(&mod_lock); - for (i = 1, p = (tnf_probe_control_t *)__tnf_probe_list_head; - p != NULL && i != probebuf.probenum; - ++i, p = p->next) - ; - if (p == NULL) - retval = ENOENT; - else { - /* - * First do trace, then enable. - * Set test_func last. - */ - if (probebuf.traced) - p->probe_func = tnf_trace_commit; - else - p->probe_func = tnf_trace_rollback; - if (probebuf.enabled) { - p->alloc_func = tnf_trace_alloc; - /* this must be set last */ - if (tnf_drv_state.tnf_pidfilter_mode) - p->test_func = tnf_test_2; - else - p->test_func = tnf_test_1; - } else - p->test_func = NULL; - } - mutex_exit(&mod_lock); - return (retval); -} - -static int -tnf_getstate(caddr_t arg, int mode) -{ - tifiocstate_t tstate; - proc_t *procp; - - if (tnf_buf == NULL) { - tstate.buffer_state = TIFIOCBUF_NONE; - tstate.buffer_size = 0; - } else { - switch (tnfw_b_state & ~TNFW_B_STOPPED) { - case TNFW_B_RUNNING: - tstate.buffer_state = TIFIOCBUF_OK; - break; - case TNFW_B_NOBUFFER: - tstate.buffer_state = TIFIOCBUF_UNINIT; - break; - case TNFW_B_BROKEN: - tstate.buffer_state = TIFIOCBUF_BROKEN; - break; - } - /* LINTED assignment of 64-bit integer to 32-bit integer */ - tstate.buffer_size = tnf_trace_file_size; - } - tstate.trace_stopped = tnfw_b_state & TNFW_B_STOPPED; - tstate.pidfilter_mode = tnf_drv_state.tnf_pidfilter_mode; - tstate.pidfilter_size = 0; - - mutex_enter(&pidlock); - for (procp = practive; procp != NULL; procp = procp->p_next) - if (PROC_IS_FILTER(procp)) - tstate.pidfilter_size++; - mutex_exit(&pidlock); - - if (ddi_copyout((caddr_t)&tstate, arg, sizeof (tstate), mode)) - return (EFAULT); - return (0); -} - -static int -tnf_allocbuf(intptr_t arg) -{ - size_t bufsz; - - if (tnf_buf != NULL) - return (EBUSY); - - bufsz = roundup((size_t)arg, PAGESIZE); - /* - * Validate size - * XXX Take kernel VM into consideration as well - */ - /* bug fix #4057599 if (bufsz > (physmem << PAGESHIFT) / 2) */ - if (btop(bufsz) > (physmem / 2)) - return (ENOMEM); - if (bufsz < TNF_TRACE_FILE_MIN) - bufsz = TNF_TRACE_FILE_MIN; - -#if TNF_USE_KMA - tnf_buf = kmem_zalloc(bufsz, KM_SLEEP); -#else - /* LINTED cast from 64-bit integer to 32-bit intege */ - tnf_buf = segkp_get(segkp, (int)bufsz, - KPD_ZERO | KPD_LOCKED | KPD_NO_ANON); -#endif - if (tnf_buf == NULL) - return (ENOMEM); - - tnf_trace_file_size = bufsz; - tnf_trace_init(); - return (0); -} - -/* - * Process a "deallocate buffer" ioctl request. Tracing must be turned - * off. We must clear references to the buffer from the tag sites; - * invalidate all threads' notions of block ownership; make sure nobody - * is executing a probe (they might have started before tracing was - * turned off); and free the buffer. - */ -static int -tnf_deallocbuf(void) -{ - tnf_ops_t *tpdp; - kthread_t *t; - tnf_probe_control_t *probep; - tnf_tag_data_t *tagp; - - if (tnf_drv_state.mapdev_open_count > 0 || tnf_tracing_active) - return (EBUSY); - if (tnf_buf == NULL) - return (ENOMEM); - - /* - * Make sure nobody is executing a probe. - * (They could be if they got started while - * tnf_tracing_active was still on.) Grab - * pidlock, and check the busy flag in all - * TPDP's. - */ - mutex_enter(&pidlock); - t = curthread; - do { - if (t->t_tnf_tpdp != NULL) { - /* LINTED pointer cast may result in improper alignment */ - tpdp = (tnf_ops_t *)t->t_tnf_tpdp; - if (LOCK_HELD(&tpdp->busy)) { - mutex_exit(&pidlock); - return (EBUSY); - } - tpdp->wcb.tnfw_w_pos.tnfw_w_block = NULL; - tpdp->wcb.tnfw_w_tag_pos.tnfw_w_block = NULL; - tpdp->schedule.record_p = NULL; - } - t = t->t_next; - } while (t != curthread); - mutex_exit(&pidlock); - - /* - * Zap all references to the buffer we're freeing. - * Grab mod_lock while walking list to keep it - * consistent. - */ - mutex_enter(&mod_lock); - tagp = (tnf_tag_data_t *)__tnf_tag_list_head; - while (tagp != NULL) { - tagp->tag_index = 0; - tagp = (tnf_tag_data_t *)tagp->tag_version; - } - probep = (tnf_probe_control_t *)__tnf_probe_list_head; - while (probep != NULL) { - probep->index = 0; - probep = probep->next; - } - mutex_exit(&mod_lock); - - tnfw_b_state = TNFW_B_NOBUFFER | TNFW_B_STOPPED; -#if TNF_USE_KMA - kmem_free(tnf_buf, tnf_trace_file_size); -#else - segkp_release(segkp, tnf_buf); -#endif - tnf_buf = NULL; - - return (0); -} - -static int -tnf_settracing(int arg) -{ - if (arg) - if (tnf_buf == NULL) - return (ENOMEM); - else - tnf_trace_on(); - else - tnf_trace_off(); - -#ifdef _TNF_SPEED_TEST -#define NITER 255 - { - int i; - - for (i = 0; i < NITER; i++) - TNF_PROBE_0(tnf_speed_0, "tnf", /* CSTYLED */); - for (i = 0; i < NITER; i++) - TNF_PROBE_1(tnf_speed_1, "tnf", /* CSTYLED */, - tnf_long, long, i); - for (i = 0; i < NITER; i++) - TNF_PROBE_2(tnf_speed_2, "tnf", /* CSTYLED */, - tnf_long, long1, i, - tnf_long, long2, i); - } -#endif /* _TNF_SPEED_TEST */ - - return (0); -} - -static int -tnf_getpidstate(caddr_t arg, int mode) -{ - int err = 0; - pid_t pid; - proc_t *procp; - int result; - - if (ddi_copyin(arg, (caddr_t)&pid, sizeof (pid), mode)) - return (EFAULT); - - mutex_enter(&pidlock); - if ((procp = prfind(pid)) != NULL) - result = PROC_IS_FILTER(procp); - else - err = ESRCH; - mutex_exit(&pidlock); - - if (!err) - if (ddi_copyout((caddr_t)&result, (caddr_t)arg, - sizeof (result), mode)) - return (EFAULT); - return (err); -} - -/*ARGSUSED*/ -static int -tnf_setpidstate(int filterval, pid_t pid, int mode) -{ - int err = 0; - proc_t *procp; - - mutex_enter(&pidlock); - if ((procp = prfind(pid)) != NULL) - if (filterval) - PROC_FILTER_SET(procp); - else - PROC_FILTER_CLR(procp); - else - err = ESRCH; - mutex_exit(&pidlock); - - return (err); -} - -static int -tnf_pidfilterset(int mode) -{ - tnf_probe_control_t *p; - tnf_probe_test_func_t func; - - tnf_drv_state.tnf_pidfilter_mode = mode; - - /* Establish correct test func for each probe */ - if (mode) - func = tnf_test_2; - else - func = tnf_test_1; - - mutex_enter(&mod_lock); - p = (tnf_probe_control_t *)__tnf_probe_list_head; - while (p != NULL) { - if (p->test_func != NULL) - p->test_func = func; - p = p->next; - } - mutex_exit(&mod_lock); - - return (0); -} - -static int -tnf_pidfilterget(caddr_t dest, int mode) -{ - int err = 0; - int filtercount = 0; - size_t sz; - pid_t *filterbuf, *bufp; - proc_t *procp; - - /* Count how many processes in filter set (upper bound) */ - mutex_enter(&pidlock); - for (procp = practive; procp != NULL; procp = procp->p_next) - if (PROC_IS_FILTER(procp)) - filtercount++; - mutex_exit(&pidlock); - - /* Allocate temp space to hold filter set (upper bound) */ - sz = sizeof (pid_t) * (filtercount + 1); - filterbuf = kmem_zalloc(sz, KM_SLEEP); - - /* - * NOTE: The filter set cannot grow between the first and - * second acquisitions of pidlock. This is currently true - * because: - * 1. /dev/tnfctl is exclusive open, so all driver - * control operations, including changing the filter - * set and this code, are effectively single-threaded. - * 2. There is no in-kernel API to manipulate the filter - * set (i.e. toggle the on/off bit in a proc struct). - * 3. The proc filter bit is not inherited across a fork() - * operation; the child starts with the bit off. - * If any of these assumptions is invalidated, a possible - * solution is to check whether we're overflowing the allocated - * filterbuf below, and back out and restart from the beginning - * if so. - * - * The code below handles the case when the filter set shrinks - * due to processes exiting. - */ - - /* Fill in filter set */ - bufp = filterbuf + 1; /* first word is for count */ - filtercount = 0; /* recomputed below */ - mutex_enter(&pidlock); - for (procp = practive; procp != NULL; procp = procp->p_next) { - if (PROC_IS_FILTER(procp)) { - filtercount++; - *bufp++ = procp->p_pid; - } - } - mutex_exit(&pidlock); - - /* Set filtercount */ - *filterbuf = (pid_t)filtercount; - - /* Copy out result */ - if (ddi_copyout((caddr_t)filterbuf, dest, sz, mode)) - err = EFAULT; - - /* Free temp space */ - kmem_free(filterbuf, sz); - - return (err); -} - -static int -tnf_getheader(caddr_t arg, int mode) -{ - if (tnf_buf == NULL) - return (ENOMEM); - if (ddi_copyout(tnf_buf, arg, TNF_BLOCK_SIZE, mode)) - return (EFAULT); - return (0); -} - -static int -tnf_getblock(caddr_t arg, int mode) -{ - int err = 0; - tifiocgblock_t parms; - caddr_t area; - tnf_block_header_t *blk; - - if (tnf_buf == NULL) - return (ENOMEM); - if (ddi_copyin(arg, (caddr_t)&parms, sizeof (parms), mode)) - return (EFAULT); - area = tnf_buf + TNF_DIRECTORY_SIZE + - parms.block_num * TNF_BLOCK_SIZE; - if (area < tnf_buf + TNF_DIRECTORY_SIZE || - area >= tnf_buf + tnf_trace_file_size) - return (EFAULT); - /* LINTED pointer cast */ - blk = (tnf_block_header_t *)area; - /* - * B-lock the block while we're reading - */ - if (!lock_try(&blk->B_lock)) - return (EBUSY); - if (ddi_copyout(area, parms.dst_addr, TNF_BLOCK_SIZE, mode)) - err = EFAULT; - lock_clear(&blk->B_lock); - return (err); -} - -static int -tnf_getfwzone(caddr_t arg, int mode) -{ - tifiocgfw_t parms; - - if (tnf_buf == NULL) - return (ENOMEM); - if (ddi_copyin(arg, (caddr_t)&parms, sizeof (parms), mode)) - return (EFAULT); - if (ddi_copyout(tnf_buf + TNF_BLOCK_SIZE + parms.start * - sizeof (tnf_ref32_t), (caddr_t)parms.dst_addr, - parms.slots * (int)(sizeof (tnf_ref32_t)), mode)) - return (EFAULT); - return (0); -} - -/*ARGSUSED*/ -static void * -tnf_test_1(void *tpdp, tnf_probe_control_t *probe_p, tnf_probe_setup_t *sp) -{ - tpdp = (void *)curthread->t_tnf_tpdp; - if (tpdp != NULL) - return (tnf_trace_alloc((tnf_ops_t *)tpdp, probe_p, sp)); - return (NULL); -} - -/*ARGSUSED*/ -static void * -tnf_test_2(void *tpdp, tnf_probe_control_t *probe_p, tnf_probe_setup_t *sp) -{ - tpdp = (void *)curthread->t_tnf_tpdp; - if (tpdp != NULL && PROC_IS_FILTER(curproc)) - return (tnf_trace_alloc((tnf_ops_t *)tpdp, probe_p, sp)); - return (NULL); -} - -#endif /* !NPROBE */ diff --git a/usr/src/uts/common/tnf/tnf.conf b/usr/src/uts/common/tnf/tnf.conf deleted file mode 100644 index 65c0219345..0000000000 --- a/usr/src/uts/common/tnf/tnf.conf +++ /dev/null @@ -1,26 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 1992, by Sun Microsystems, Inc. -# -#ident "%Z%%M% %I% %E% SMI" -name="tnf" parent="pseudo" instance=0; diff --git a/usr/src/uts/common/tnf/tnf_buf.c b/usr/src/uts/common/tnf/tnf_buf.c deleted file mode 100644 index 039a1c0b24..0000000000 --- a/usr/src/uts/common/tnf/tnf_buf.c +++ /dev/null @@ -1,409 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994-2000 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> -#include <sys/param.h> -#include <sys/systm.h> /* for bzero */ -#include <sys/machlock.h> -#include <sys/spl.h> -#include <sys/promif.h> -#include <sys/debug.h> - -#include "tnf_buf.h" - -/* - * Defines - */ - -#define TNFW_B_ALLOC_LO 0x1 -#define TNFW_B_MAXALLOCTRY 32 - -#define TNF_MAXALLOC (TNF_BLOCK_SIZE - sizeof (tnf_block_header_t)) - -/* - * Globals - */ - -TNFW_B_STATE tnfw_b_state = TNFW_B_NOBUFFER | TNFW_B_STOPPED; - -/* - * Locals - */ - -static int spinlock_spl; - -/* - * Declarations - */ - -static tnf_block_header_t *tnfw_b_alloc_block(tnf_buf_file_header_t *, - enum tnf_alloc_mode); - -/* - * (Private) Allocate a new block. Return NULL on failure and mark - * tracing as broken. 'istag' is non-zero if the block is to be - * non-reclaimable. All blocks are returned A-locked. - */ - -static tnf_block_header_t * -tnfw_b_alloc_block(tnf_buf_file_header_t *fh, enum tnf_alloc_mode istag) -{ - tnf_block_header_t *block; - ulong_t bcount; - ulong_t tmp_bn, bn, new_bn; - ulong_t tmp_gen, gen, new_gen; - ulong_t next; - int i; - lock_t *lp; - ushort_t spl; - - if (tnfw_b_state != TNFW_B_RUNNING) - return (NULL); - - lp = &fh->lock; - - /* - * Check reserved area first for tag block allocations - * Tag allocations are rare, so we move the code out of line - */ - if (istag) - goto try_reserved; - -try_loop: - /* - * Search for a block, using hint as starting point. - */ - - bcount = fh->com.block_count; /* total block count */ - - gen = fh->next_alloc.gen; - bn = fh->next_alloc.block[gen & TNFW_B_ALLOC_LO]; - - for (i = 0; i < TNFW_B_MAXALLOCTRY; i++) { - - /* - * Calculate next (not this) block to look for. - * Needed for updating the hint. - */ - if ((new_bn = bn + 1) >= bcount) { - new_bn = TNFW_B_DATA_BLOCK_BEGIN >> TNF_BLOCK_SHIFT; - new_gen = gen + 1; - } else - new_gen = gen; - - /* - * Try to reserve candidate block - */ - /* LINTED pointer cast may result in improper alignment */ - block = (tnf_block_header_t *) - ((char *)fh + (bn << TNF_BLOCK_SHIFT)); - - if (lock_try(&block->A_lock)) - if (block->generation < gen && - lock_try(&block->B_lock)) - goto update_hint; - else - lock_clear(&block->A_lock); - - /* Reload hint values */ - gen = fh->next_alloc.gen; - bn = fh->next_alloc.block[gen & TNFW_B_ALLOC_LO]; - - /* adjust if we know a little better than the hint */ - if ((new_bn > bn && new_gen == gen) || new_gen > gen) { - gen = new_gen; - bn = new_bn; - } - } - - goto loop_fail; - -update_hint: - /* - * Re-read the hint and update it only if we'll be increasing it. - */ - lock_set_spl(lp, spinlock_spl, &spl); - tmp_gen = fh->next_alloc.gen; - tmp_bn = fh->next_alloc.block[tmp_gen & TNFW_B_ALLOC_LO]; - - if ((new_gen == tmp_gen && new_bn > tmp_bn) || new_gen > tmp_gen) { - /* - * Order is important here! It is the write to - * next_alloc.gen that atomically records the new - * value. - */ - fh->next_alloc.block[new_gen & TNFW_B_ALLOC_LO] = new_bn; - fh->next_alloc.gen = new_gen; - } - lock_clear_splx(lp, spl); - -got_block: - /* - * Initialize and return the block - */ - /* ASSERT(block->tag == TNF_BLOCK_HEADER_TAG); */ - block->bytes_valid = sizeof (tnf_block_header_t); - block->next_block = NULL; - /* LINTED assignment of 64-bit integer to 32-bit integer */ - block->generation = istag ? TNF_TAG_GENERATION_NUM : gen; - /* ASSERT(LOCK_HELD(&block->A_lock); */ - lock_clear(&block->B_lock); - return (block); - -try_reserved: - /* - * Look for a free tag block in reserved area - */ - next = fh->next_tag_alloc; - while (next < (TNFW_B_DATA_BLOCK_BEGIN >> TNF_BLOCK_SHIFT)) { - /* LINTED pointer cast may result in improper alignment */ - block = (tnf_block_header_t *) - ((char *)fh + (next << TNF_BLOCK_SHIFT)); - next++; - /* - * See if block is unclaimed. - * Don't bother clearing the A-lock if the - * block was claimed and released, since it - * will never be reallocated anyway. - */ - if (lock_try(&block->A_lock) && - block->generation == 0) { - lock_set_spl(lp, spinlock_spl, &spl); - if (next > fh->next_tag_alloc) - fh->next_tag_alloc = next; - lock_clear_splx(lp, spl); - goto got_block; - } - } - goto try_loop; - -loop_fail: - /* - * Only get here if we failed the for loop - */ - ASSERT(i == TNFW_B_MAXALLOCTRY); - tnfw_b_state = TNFW_B_BROKEN; -#ifdef DEBUG - prom_printf("kernel probes: alloc_block failed\n"); -#endif - return (NULL); - -} - -/* - * Allocate size bytes from the trace buffer. Return NULL on failure, - * and mark tracing as broken. We're guaranteed that the buffer will - * not be deallocated while we're in this routine. - * Allocation requests must be word-sized and are word-aligned. - */ - -void * -tnfw_b_alloc(TNFW_B_WCB *wcb, size_t size, enum tnf_alloc_mode istag) -{ - TNFW_B_POS *pos; - ushort_t offset; - void *destp; - tnf_block_header_t *block, *new_block; - - pos = &wcb->tnfw_w_pos; /* common case */ - if (istag) - pos = &wcb->tnfw_w_tag_pos; - block = pos->tnfw_w_block; - offset = pos->tnfw_w_write_off; - /* Round size up to a multiple of 8. */ - size = (size + 7) & ~7; - - if (block == NULL || offset + size > TNF_BLOCK_SIZE) { - - /* Get a new block */ - /* LINTED pointer cast may result in improper alignment */ - new_block = tnfw_b_alloc_block(TNF_FILE_HEADER(), istag); - if (new_block == NULL) - /* tracing has been marked as broken at this point */ - return (NULL); - - /* ASSERT(size <= TNF_MAXALLOC); */ - - /* - * If the old block is clean (i.e., we're in a new - * transaction), just release it. Else, pad it out - * and attach it to the list of uncommitted blocks. - */ - if (block != NULL) { - if (block->bytes_valid == offset && - !pos->tnfw_w_dirty) { - /* block is clean: release it */ - lock_clear(&block->A_lock); - } else { - /* block is dirty */ - ulong_t *p, *q; - - /* LINTED pointer cast */ - p = (ulong_t *)((char *)block + offset); - /* LINTED pointer cast */ - q = (ulong_t *)((char *)block + TNF_BLOCK_SIZE); - while (p < q) - *p++ = TNF_NULL; - - /* append block to release list */ - new_block->next_block = block; - - /* we have at least one dirty block */ - pos->tnfw_w_dirty = 1; - } - } - - /* make new_block the current block */ - pos->tnfw_w_block = block = new_block; - /* write_off is updated below */ - offset = sizeof (tnf_block_header_t); - /* ASSERT(new_block->bytes_valid == offset); */ - } - - destp = (char *)block + offset; - /* update write_off */ - pos->tnfw_w_write_off = offset + size; - /* - * Unconditionally write a 0 into the last word allocated, - * in case we left an alignment gap. (Assume that doing an - * unconditional write is cheaper than testing and branching - * around the write half the time.) - */ - /* LINTED pointer cast may result in improper alignment */ - *((int *)((char *)destp + size - sizeof (int))) = 0; - return (destp); -} - -/* - * Allocate a directory entry. - */ - -/*ARGSUSED0*/ -void * -tnfw_b_fw_alloc(TNFW_B_WCB *wcb) -{ - tnf_buf_file_header_t *fh; - lock_t *lp; - ushort_t spl; - caddr_t cell; - ulong_t next; - - /* LINTED pointer cast may result in improper alignment */ - fh = TNF_FILE_HEADER(); - lp = &fh->lock; - - lock_set_spl(lp, spinlock_spl, &spl); - next = fh->next_fw_alloc; - if (next < TNFW_B_FW_ZONE) { - cell = (caddr_t)fh + next; - fh->next_fw_alloc = next + sizeof (tnf_ref32_t); - } else - cell = NULL; - lock_clear_splx(lp, spl); - - return (cell); -} - -/* - * Initialize a buffer. - */ - -void -tnfw_b_init_buffer(caddr_t buf, size_t size) -{ - int gen_shift; - int i; - ulong_t b; - ulong_t blocks; - tnf_block_header_t *block; - tnf_buf_file_header_t *fh; - - /* Compute platform-specific spinlock_spl */ - spinlock_spl = __ipltospl(LOCK_LEVEL + 1); - - /* LINTED pointer cast may result in improper alignment */ - fh = (tnf_buf_file_header_t *)buf; - - /* LINTED logical expression always true: op "||" */ - ASSERT(TNF_DIRECTORY_SIZE > TNF_BLOCK_SIZE); - - /* - * This assertion is needed because we cannot change - * sys/tnf_com.h this late in the release cycle, but we need the - * interface in sys/machlock.h for locking operations. - */ - /* LINTED logical expression always true: op "||" */ - ASSERT(sizeof (tnf_byte_lock_t) == sizeof (lock_t)); - - /* Calculate number of blocks */ - blocks = size >> TNF_BLOCK_SHIFT; - - /* Calculate generation shift */ - gen_shift = 0; - b = 1; - while (b < blocks) { - b <<= 1; - ++gen_shift; - } - ASSERT(gen_shift < 32); - - /* fill in file header */ - /* magic number comes last */ - /* LINTED constant truncated by assignment */ - fh->com.tag = TNF_FILE_HEADER_TAG; - fh->com.file_version = TNF_FILE_VERSION; - fh->com.file_header_size = sizeof (tnf_file_header_t); - fh->com.file_log_size = gen_shift + TNF_BLOCK_SHIFT; - fh->com.block_header_size = sizeof (tnf_block_header_t); - fh->com.block_size = TNF_BLOCK_SIZE; - fh->com.directory_size = TNF_DIRECTORY_SIZE; - /* LINTED assignment of 64-bit integer to 32-bit integer */ - fh->com.block_count = blocks; - /* com.blocks_valid is unused */ - fh->next_alloc.gen = 1; - fh->next_alloc.block[0] = 0; - fh->next_alloc.block[1] = TNFW_B_DATA_BLOCK_BEGIN >> TNF_BLOCK_SHIFT; - fh->next_tag_alloc = TNF_DIRECTORY_SIZE >> TNF_BLOCK_SHIFT; - fh->next_fw_alloc = TNF_DIRENT_LAST + 4; - LOCK_INIT_CLEAR(&fh->lock); - - (void) bzero(buf + sizeof (*fh), TNF_DIRECTORY_SIZE - sizeof (*fh)); - i = TNF_DIRECTORY_SIZE >> TNF_BLOCK_SHIFT; - for (; i < blocks; ++i) { - /* LINTED pointer cast may result in improper alignment */ - block = (tnf_block_header_t *)(buf + (i << TNF_BLOCK_SHIFT)); - block->tag = (tnf_ref32_t)TNF_BLOCK_HEADER_TAG; - block->generation = 0; - block->bytes_valid = sizeof (tnf_block_header_t); - LOCK_INIT_CLEAR(&block->A_lock); - LOCK_INIT_CLEAR(&block->B_lock); - } - - /* snap in magic number */ - fh->magic = TNF_MAGIC; -} diff --git a/usr/src/uts/common/tnf/tnf_buf.h b/usr/src/uts/common/tnf/tnf_buf.h deleted file mode 100644 index 4fc40cb510..0000000000 --- a/usr/src/uts/common/tnf/tnf_buf.h +++ /dev/null @@ -1,250 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994,1997-1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#ifndef _TNF_BUF_H -#define _TNF_BUF_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/tnf_com.h> -#include <sys/machlock.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Size of a TNF buffer block - */ - -#define TNF_BLOCK_SIZE 512 -#define TNF_BLOCK_SHIFT 9 -#define TNF_BLOCK_MASK ~(TNF_BLOCK_SIZE - 1) - -/* - * Size of the file header and forwarding pointer (directory) area combined. - * Tag and data blocks start this many bytes into the file. - * The maximum size of this area is 64KB. - */ - -#define TNF_DIRECTORY_SIZE (4 * 1024) -#define TNFW_B_FW_ZONE TNF_DIRECTORY_SIZE - -/* - * Reserved space for tag blocks, after directory area. - */ - -#define TNFW_B_TAG_RESERVE (28 * 1024) - -#define TNFW_B_DATA_BLOCK_BEGIN (TNFW_B_FW_ZONE + TNFW_B_TAG_RESERVE) - -/* - * Reserved directory entries, and their precomputed tags. These are byte - * offsets from start of file. - */ - -#define TNF_DIRENT_FILE_HEADER (TNF_BLOCK_SIZE + 0) -#define TNF_DIRENT_BLOCK_HEADER (TNF_BLOCK_SIZE + 4) -#define TNF_DIRENT_ROOT (TNF_BLOCK_SIZE + 8) -#define TNF_DIRENT_LAST TNF_DIRENT_ROOT - -#define TNF_FILE_HEADER_TAG \ - (TNF_REF32_MAKE_PERMANENT(TNF_DIRENT_FILE_HEADER) | TNF_REF32_T_TAG) - -#define TNF_BLOCK_HEADER_TAG \ - (TNF_REF32_MAKE_PERMANENT(TNF_DIRENT_BLOCK_HEADER) | TNF_REF32_T_TAG) - -#define TNF_ROOT_TAG \ - (TNF_REF32_MAKE_PERMANENT(TNF_DIRENT_ROOT) | TNF_REF32_T_TAG) - -/* - * Allocation type: permanent or reusable - */ - -enum tnf_alloc_mode { - TNF_ALLOC_REUSABLE = 0, - TNF_ALLOC_FIXED = 1 -}; - -/* - * Buffer status - */ - -typedef enum { - TNFW_B_RUNNING = 0, - TNFW_B_NOBUFFER, - TNFW_B_BROKEN -} TNFW_B_STATE; - -/* - * The STOPPED bit may be or-ed into the state field. - */ -#define TNFW_B_STOPPED 16 -#define TNFW_B_SET_STOPPED(state) ((state) |= TNFW_B_STOPPED) -#define TNFW_B_UNSET_STOPPED(state) ((state) &= ~TNFW_B_STOPPED) -#define TNFW_B_IS_STOPPED(state) ((state) & TNFW_B_STOPPED) - -/* - * Layout of the first block of TNF file (file header) - */ - -typedef struct { - tnf_uint32_t magic; /* magic number */ - tnf_file_header_t com; /* common header */ - struct { - volatile ulong_t gen; /* generation */ - volatile ulong_t block[2]; /* block number */ - } next_alloc; - ulong_t next_tag_alloc; /* block counter */ - ulong_t next_fw_alloc; /* byte offset */ - lock_t lock; /* protects hint updates */ - /* Padding to end of block */ -} tnf_buf_file_header_t; - -/* - * Per-thread write-control information - */ - -typedef struct tnfw_b_pos { - tnf_block_header_t *tnfw_w_block; - ushort_t tnfw_w_write_off; - uchar_t tnfw_w_dirty; -} TNFW_B_POS; - -typedef struct tnfw_b_wcb { - struct tnfw_b_pos tnfw_w_pos; - struct tnfw_b_pos tnfw_w_tag_pos; -} TNFW_B_WCB; - -/* - * Global tracing state - */ - -extern TNFW_B_STATE tnfw_b_state; - -/* - * Global trace buffer - */ - -extern caddr_t tnf_buf; - -#define TNF_FILE_HEADER() ((tnf_buf_file_header_t *)tnf_buf) - -/* - * External interface - */ - -/* - * Allocate 'size' data bytes using 'wcb'; store result into 'buf'. - * This inlines the common trace case. - */ -#define TNFW_B_ALLOC(wcb, size, buf, typ) \ -{ \ - TNFW_B_POS *xx_pos; \ - ushort_t xx_off, xx_nof; \ - tnf_block_header_t *xx_blk; \ - size_t xx_size; \ - \ - /* Round size up to a multiple of 8. */ \ - xx_size = (size + 7) & ~7; \ - xx_pos = &(wcb)->tnfw_w_pos; \ - xx_blk = xx_pos->tnfw_w_block; \ - xx_off = xx_pos->tnfw_w_write_off; \ - xx_nof = xx_off + xx_size; \ - if (xx_blk != NULL && xx_nof <= TNF_BLOCK_SIZE) { \ - buf = (typ)((char *)xx_blk + xx_off); \ - xx_pos->tnfw_w_write_off = xx_nof; \ - /* LINTED */ \ - *((int *)((char *)buf + xx_size - sizeof (int))) = 0; \ - } else \ - buf = tnfw_b_alloc((wcb), xx_size, TNF_ALLOC_REUSABLE);\ -} - -/* - * Giveback words after new_pos. - */ -#define TNFW_B_GIVEBACK(wcb, new_pos) \ - ((wcb)->tnfw_w_pos.tnfw_w_write_off = \ - (((char *)(new_pos) \ - - (char *)((wcb)->tnfw_w_pos.tnfw_w_block) + 7) \ - & ~7), *(int *)(new_pos) = 0) - -/* - * Commit transaction bytes allocated via 'pos' - */ -#define TNFW_B_COMMIT(pos) \ -{ \ - tnf_block_header_t *xx_blk, *xx_nxt; \ - \ - xx_blk = (pos)->tnfw_w_block; \ - if (xx_blk != NULL) { \ - xx_blk->bytes_valid = (pos)->tnfw_w_write_off; \ - if ((pos)->tnfw_w_dirty) { \ - xx_nxt = xx_blk->next_block; \ - while (xx_nxt != NULL) { \ - xx_blk->next_block = NULL; \ - xx_blk = xx_nxt; \ - xx_nxt = xx_blk->next_block; \ - xx_blk->bytes_valid = TNF_BLOCK_SIZE;\ - lock_clear(&xx_blk->A_lock); \ - } \ - (pos)->tnfw_w_dirty = 0; \ - } \ - } \ -} - -/* - * Rollback transaction bytes allocated via 'pos' - */ -#define TNFW_B_ROLLBACK(pos) \ -{ \ - tnf_block_header_t *xx_blk, *xx_nxt; \ - \ - xx_blk = (pos)->tnfw_w_block; \ - if (xx_blk != NULL) { \ - (pos)->tnfw_w_write_off = xx_blk->bytes_valid; \ - if ((pos)->tnfw_w_dirty) { \ - xx_nxt = xx_blk->next_block; \ - while (xx_nxt != NULL) { \ - xx_blk->next_block = NULL; \ - xx_blk = xx_nxt; \ - xx_nxt = xx_blk->next_block; \ - lock_clear(&xx_blk->A_lock); \ - } \ - (pos)->tnfw_w_dirty = 0; \ - } \ - } \ -} - -extern void tnfw_b_init_buffer(caddr_t, size_t); -extern void *tnfw_b_alloc(TNFW_B_WCB *, size_t, enum tnf_alloc_mode); -extern void *tnfw_b_fw_alloc(TNFW_B_WCB *); - -#ifdef __cplusplus -} -#endif - -#endif /* _TNF_BUF_H */ diff --git a/usr/src/uts/common/tnf/tnf_probe.c b/usr/src/uts/common/tnf/tnf_probe.c deleted file mode 100644 index 52744b09c9..0000000000 --- a/usr/src/uts/common/tnf/tnf_probe.c +++ /dev/null @@ -1,187 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef _KERNEL -#include <sys/types.h> -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/ddi.h> /* strchr */ -#include <sys/sunddi.h> /* strchr */ -#include <sys/tnf_com.h> -#include <sys/tnf_writer.h> -#include <sys/tnf_probe.h> /* fixed tnf_probe_control_t->index problem */ -#include "tnf_types.h" -#include "tnf_trace.h" -#else /* _KERNEL */ -#include <stdlib.h> -#include <string.h> -#include <tnf/com.h> -#include <tnf/writer.h> -#include <tnf/probe.h> -#include "tnf_types.h" -#include <tnf_trace.h> -#endif /* _KERNEL */ - - -/* - * Defines - */ - -#define NAME_LIMIT 128 -#define ARRAY_LIMIT 5 -#define NAME_START 5 -#define SLOT_OFFSET 7 -#define CONST_SLOTS 2 - -/* - * probe version 1 - */ - -struct tnf_probe_version __tnf_probe_version_1_info = { - sizeof (struct tnf_probe_version), - sizeof (tnf_probe_control_t) -}; - -/* - * write instances of tnf_probe_type (i.e probe records) - */ - -uintptr_t -tnf_probe_tag(tnf_ops_t *ops, tnf_probe_control_t *probe_p) -{ - tnf_tag_data_t *metatag_data; - tnf_record_p metatag_index; - tnf_probe_prototype_t *buffer; - enum tnf_alloc_mode saved_mode; - tnf_uint32_t *fwp; - char probe_name[NAME_LIMIT]; - char slot_array[ARRAY_LIMIT][NAME_LIMIT]; - char *slot_args[ARRAY_LIMIT + CONST_SLOTS + 1]; - const char *nm_start, *nm_end, *slot_start, *slot_end; - int nm_len, separator, count; - - saved_mode = ops->mode; - ops->mode = TNF_ALLOC_FIXED; -#if defined(_LP64) - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ALLOC2(ops, sizeof (*buffer), buffer, saved_mode); -#else - ALLOC2(ops, sizeof (*buffer), buffer, saved_mode); -#endif - probe_p->index = (uintptr_t)buffer; - fwp = tnfw_b_fw_alloc(&(ops->wcb)); - if (fwp) { - /* REMIND: can make the next call more efficient */ - *fwp = tnf_ref32(ops, (tnf_record_p) buffer, - (tnf_record_p)fwp); - /* fwp - filestart < 64K */ -#ifdef _KERNEL - probe_p->index = (char *)fwp - tnf_buf; -#else - probe_p->index = (char *)fwp - _tnfw_b_control->tnf_buffer; -#endif - probe_p->index |= TNF_TAG16_T_ABS; - probe_p->index = probe_p->index << PROBE_INDEX_SHIFT; - probe_p->index |= PROBE_INDEX_FILE_PTR; - } - - metatag_data = TAG_DATA(tnf_probe_type); - metatag_index = metatag_data->tag_index ? - metatag_data->tag_index : - metatag_data->tag_desc(ops, metatag_data); - - /* find the name of the probe */ - nm_start = &(probe_p->attrs[NAME_START]); - separator = ATTR_SEPARATOR; - nm_end = strchr(probe_p->attrs, separator); -#if defined(_LP64) - /* LINTED assignment of 64-bit integer to 32-bit integer */ - nm_len = nm_end - nm_start; -#else - nm_len = nm_end - nm_start; -#endif - slot_start = nm_end + SLOT_OFFSET; - nm_len = (nm_len > (NAME_LIMIT - 1)) ? (NAME_LIMIT - 1) : nm_len; - (void) strncpy(probe_name, nm_start, nm_len); - probe_name[nm_len] = '\0'; - - /* initialize constant part of slot names */ - slot_args[0] = TNF_N_TAG; - slot_args[1] = TNF_N_TIME_DELTA; - - /* - * initialize rest of slot names, if any. This parsing routine is - * dependant on a space after "slots" (even for TNF_PROBE_0 and a - * space after the last slot name. It truncates any values that - * are larger than 127 chars to 127 chars. It handles missing slot - * names. - */ - separator = ATTR_SEPARATOR; - slot_end = strchr(slot_start, separator); - nm_start = slot_start; - separator = VAL_SEPARATOR; - for (count = 0; nm_start < slot_end; count++) { - nm_end = strchr(nm_start, separator); -#if defined(_LP64) - /* LINTED assignment of 64-bit integer to 32-bit integer */ - nm_len = nm_end - nm_start; -#else - nm_len = nm_end - nm_start; -#endif - nm_len = (nm_len > (NAME_LIMIT - 1)) ? (NAME_LIMIT - 1) : - nm_len; - (void) strncpy(slot_array[count], nm_start, nm_len); - slot_array[count][nm_len] = '\0'; - slot_args[count+CONST_SLOTS] = slot_array[count]; - /* get next name */ - nm_start = nm_end + 1; - } - /* null terminate string vector */ - slot_args[count+CONST_SLOTS] = NULL; - - ASSIGN(buffer, tag, metatag_index); - ASSIGN(buffer, name, probe_name); - /* XXX Fix these properties sometime */ - ASSIGN(buffer, properties, &tnf_struct_properties); - ASSIGN(buffer, slot_types, probe_p->slot_types); -#if defined(_LP64) - /* LINTED */ - ASSIGN(buffer, type_size, probe_p->tnf_event_size); -#else - ASSIGN(buffer, type_size, probe_p->tnf_event_size); -#endif - ASSIGN(buffer, slot_names, slot_args); - ASSIGN(buffer, string, (slot_end + 1)); -#if defined(_LP64) - /* supress lint warning for _KERNEL mode, really need this? */ - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ops->mode = saved_mode; -#else - ops->mode = saved_mode; -#endif - return (probe_p->index); -} diff --git a/usr/src/uts/common/tnf/tnf_res.c b/usr/src/uts/common/tnf/tnf_res.c deleted file mode 100644 index 57c738e959..0000000000 --- a/usr/src/uts/common/tnf/tnf_res.c +++ /dev/null @@ -1,388 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * "Resident" part of TNF -- this has to be around even when the - * driver is not loaded. - */ - -#ifndef NPROBE -#include <sys/types.h> -#include <sys/systm.h> -#include <sys/thread.h> -#include <sys/klwp.h> -#include <sys/proc.h> -#include <sys/kmem.h> -#include <sys/msacct.h> -#include <sys/tnf_com.h> -#include <sys/tnf_writer.h> -#include <sys/tnf_probe.h> -#include <sys/tnf.h> -#include <sys/debug.h> -#include <sys/modctl.h> -#include <sys/kobj.h> - -#include "tnf_buf.h" -#include "tnf_types.h" -#include "tnf_trace.h" - -/* - * Defines - */ - -#define TNF_PC_COUNT 8 - -/* - * Declarations - */ - -/* - * TNF kernel probe management externs - */ -extern tnf_probe_control_t *__tnf_probe_list_head; -extern tnf_tag_data_t *__tnf_tag_list_head; -extern int tnf_changed_probe_list; - -/* - * This makes the state of the TNFW_B_STOPPED bit externally visible - * in the kernel. - */ -volatile int tnf_tracing_active = 0; - -/* - * The trace buffer pointer - */ -caddr_t tnf_buf; - -/* - * Stub definitions for tag data pointers - */ - -/* tnf_writer module */ -tnf_tag_data_t *tnf_inline_tag_data = NULL; -tnf_tag_data_t *tnf_tagged_tag_data = NULL; -tnf_tag_data_t *tnf_scalar_tag_data = NULL; -tnf_tag_data_t *tnf_char_tag_data = NULL; -tnf_tag_data_t *tnf_int8_tag_data = NULL; -tnf_tag_data_t *tnf_uint8_tag_data = NULL; -tnf_tag_data_t *tnf_int16_tag_data = NULL; -tnf_tag_data_t *tnf_uint16_tag_data = NULL; -tnf_tag_data_t *tnf_int32_tag_data = NULL; -tnf_tag_data_t *tnf_uint32_tag_data = NULL; -tnf_tag_data_t *tnf_int64_tag_data = NULL; -tnf_tag_data_t *tnf_uint64_tag_data = NULL; -tnf_tag_data_t *tnf_float32_tag_data = NULL; -tnf_tag_data_t *tnf_float64_tag_data = NULL; -tnf_tag_data_t *tnf_array_tag_data = NULL; -tnf_tag_data_t *tnf_string_tag_data = NULL; -tnf_tag_data_t *tnf_type_array_tag_data = NULL; -tnf_tag_data_t *tnf_name_array_tag_data = NULL; -tnf_tag_data_t *tnf_derived_tag_data = NULL; -tnf_tag_data_t *tnf_align_tag_data = NULL; -tnf_tag_data_t *tnf_derived_base_tag_data = NULL; -tnf_tag_data_t *tnf_element_type_tag_data = NULL; -tnf_tag_data_t *tnf_header_size_tag_data = NULL; -tnf_tag_data_t *tnf_name_tag_data = NULL; -tnf_tag_data_t *tnf_opaque_tag_data = NULL; -tnf_tag_data_t *tnf_properties_tag_data = NULL; -tnf_tag_data_t *tnf_self_size_tag_data = NULL; -tnf_tag_data_t *tnf_size_tag_data = NULL; -tnf_tag_data_t *tnf_slot_names_tag_data = NULL; -tnf_tag_data_t *tnf_slot_types_tag_data = NULL; -tnf_tag_data_t *tnf_tag_tag_data = NULL; -tnf_tag_data_t *tnf_tag_arg_tag_data = NULL; -tnf_tag_data_t *tnf_type_size_tag_data = NULL; -tnf_tag_data_t *tnf_struct_tag_data = NULL; -tnf_tag_data_t *tnf_file_header_tag_data = NULL; -tnf_tag_data_t *tnf_block_header_tag_data = NULL; -tnf_tag_data_t *tnf_type_tag_data = NULL; -tnf_tag_data_t *tnf_array_type_tag_data = NULL; -tnf_tag_data_t *tnf_derived_type_tag_data = NULL; -tnf_tag_data_t *tnf_scalar_type_tag_data = NULL; -tnf_tag_data_t *tnf_struct_type_tag_data = NULL; - -/* tnf_trace module */ -tnf_tag_data_t *tnf_probe_event_tag_data = NULL; -tnf_tag_data_t *tnf_time_base_tag_data = NULL; -tnf_tag_data_t *tnf_time_delta_tag_data = NULL; -tnf_tag_data_t *tnf_pid_tag_data = NULL; -tnf_tag_data_t *tnf_lwpid_tag_data = NULL; -tnf_tag_data_t *tnf_kthread_id_tag_data = NULL; -tnf_tag_data_t *tnf_cpuid_tag_data = NULL; -tnf_tag_data_t *tnf_device_tag_data = NULL; -tnf_tag_data_t *tnf_symbol_tag_data = NULL; -tnf_tag_data_t *tnf_symbols_tag_data = NULL; -tnf_tag_data_t *tnf_sysnum_tag_data = NULL; -tnf_tag_data_t *tnf_microstate_tag_data = NULL; -tnf_tag_data_t *tnf_offset_tag_data = NULL; -tnf_tag_data_t *tnf_fault_type_tag_data = NULL; -tnf_tag_data_t *tnf_seg_access_tag_data = NULL; -tnf_tag_data_t *tnf_bioflags_tag_data = NULL; -tnf_tag_data_t *tnf_diskaddr_tag_data = NULL; -tnf_tag_data_t *tnf_kernel_schedule_tag_data = NULL; - -tnf_tag_data_t *tnf_probe_type_tag_data = NULL; - -/* Exported properties */ -tnf_tag_data_t ***tnf_user_struct_properties = NULL; - -/* - * tnf_thread_create() - * Called from thread_create() to initialize thread's tracing state. - * XXX Do this when tracing is first turned on - */ - -void -tnf_thread_create(kthread_t *t) -{ - /* If the allocation fails, this thread doesn't trace */ - t->t_tnf_tpdp = kmem_zalloc(sizeof (tnf_ops_t), KM_NOSLEEP); - - TNF_PROBE_3(thread_create, "thread", /* CSTYLED */, - tnf_kthread_id, tid, t, - tnf_pid, pid, ttoproc(t)->p_pid, - tnf_symbol, start_pc, t->t_startpc); -} - -/* - * tnf_thread_exit() - * Called from thread_exit() and lwp_exit() if thread has a tpdp. - * From this point on, we're off the allthreads list - */ - -void -tnf_thread_exit(void) -{ - tnf_ops_t *ops; - tnf_block_header_t *block; - - TNF_PROBE_0(thread_exit, "thread", /* CSTYLED */); - /* LINTED pointer cast may result in improper alignment */ - ops = (tnf_ops_t *)curthread->t_tnf_tpdp; - /* - * Mark ops as busy from now on, so it will never be used - * again. If we fail on the busy lock, the buffer - * deallocation code is cleaning our ops, so we don't need to - * do anything. If we get the lock and the buffer exists, - * release all blocks we hold. Once we're off allthreads, - * the deallocator will not examine our ops. - */ - if (ops->busy) - return; - LOCK_INIT_HELD(&ops->busy); - if (tnf_buf != NULL) { - /* Release any A-locks held */ - block = ops->wcb.tnfw_w_pos.tnfw_w_block; - ops->wcb.tnfw_w_pos.tnfw_w_block = NULL; - if (block != NULL) - lock_clear(&block->A_lock); - block = ops->wcb.tnfw_w_tag_pos.tnfw_w_block; - ops->wcb.tnfw_w_tag_pos.tnfw_w_block = NULL; - if (block != NULL) - lock_clear(&block->A_lock); - } -} - -/* - * Called from thread_free() if thread has tpdp. - */ - -void -tnf_thread_free(kthread_t *t) -{ - tnf_ops_t *ops; - /* LINTED pointer cast may result in improper alignment */ - ops = (tnf_ops_t *)t->t_tnf_tpdp; - t->t_tnf_tpdp = NULL; - kmem_free(ops, sizeof (*ops)); -} - -/* - * tnf_thread_queue() - * Probe wrapper called when tracing is enabled and a thread is - * placed on some dispatch queue. - */ - -void -tnf_thread_queue(kthread_t *t, cpu_t *cp, pri_t tpri) -{ - TNF_PROBE_4(thread_queue, "dispatcher", /* CSTYLED */, - tnf_kthread_id, tid, t, - tnf_cpuid, cpuid, cp->cpu_id, - tnf_long, priority, tpri, - tnf_ulong, queue_length, - /* cp->cpu_disp->disp_q[tpri].dq_sruncnt */ - cp->cpu_disp->disp_nrunnable); - - TNF_PROBE_2(thread_state, "thread", /* CSTYLED */, - tnf_kthread_id, tid, t, - tnf_microstate, state, LMS_WAIT_CPU); -} - -/* - * pcstack(): fill in, NULL-terminate and return pc stack. - */ - -static pc_t * -pcstack(pc_t *pcs) -{ - uint_t n; - - n = getpcstack(pcs, TNF_PC_COUNT); - pcs[n] = 0; - return (pcs); -} - -/* - * tnf_thread_switch() - * Probe wrapper called when tracing enabled and curthread is about to - * switch to the next thread. - * XXX Simple sleepstate and runstate calculations - */ - -#define SLPSTATE(t, ts) \ - (((ts) == TS_STOPPED) ? LMS_STOPPED : \ - ((t)->t_wchan0 ? LMS_USER_LOCK : LMS_SLEEP)) - -#define RUNSTATE(next, lwp) \ - ((((lwp = ttolwp(next)) != NULL) && \ - lwp->lwp_state == LWP_USER) ? \ - LMS_USER : LMS_SYSTEM) - -void -tnf_thread_switch(kthread_t *next) -{ - kthread_t *t; - klwp_t *lwp; - caddr_t ztpdp; - int borrow; - uint_t ts; - pc_t pcs[TNF_PC_COUNT + 1]; - - t = curthread; - ts = t->t_state; - - /* - * If we're a zombie, borrow idle thread's tpdp. This lets - * the driver decide whether the buffer is busy by examining - * allthreads (idle threads are always on the list). - */ - if ((borrow = (ts == TS_ZOMB)) != 0) { - ztpdp = t->t_tnf_tpdp; - t->t_tnf_tpdp = CPU->cpu_idle_thread->t_tnf_tpdp; - goto do_next; - } - - /* - * If we're blocked, test the blockage probe - */ - if (ts == TS_SLEEP && t->t_wchan) -#if defined(__sparc) - TNF_PROBE_2(thread_block, "synch", /* CSTYLED */, - tnf_opaque, reason, t->t_wchan, - tnf_symbols, stack, (pc_t *)pcstack(pcs)); -#else /* defined(__sparc) */ - TNF_PROBE_2(thread_block, "synch", /* CSTYLED */, - tnf_opaque, reason, t->t_wchan, - tnf_symbols, stack, (tnf_opaque_t *)pcstack(pcs)); -#endif /* defined(__sparc) */ - - /* - * Record outgoing thread's state - * Kernel thread ID is implicit in schedule record - * supress lint: cast from 32-bit integer to 8-bit integer - * tnf_microstate_t = tnf_uint8_t - */ -#if defined(_LP64) - /* LINTED */ - TNF_PROBE_1(thread_state, "thread", /* CSTYLED */, - tnf_microstate, state, SLPSTATE(t, ts)); -#else - TNF_PROBE_1(thread_state, "thread", /* CSTYLED */, - tnf_microstate, state, SLPSTATE(t, ts)); -#endif - -do_next: - /* - * Record incoming thread's state - * - * supress lint: cast from 32-bit integer to 8-bit integer - * tnf_microstate_t = tnf_uint8_t - */ -#if defined(_LP64) - /* LINTED */ - TNF_PROBE_2(thread_state, "thread", /* CSTYLED */, - tnf_kthread_id, tid, next, - tnf_microstate, state, RUNSTATE(next, lwp)); -#else - TNF_PROBE_2(thread_state, "thread", /* CSTYLED */, - tnf_kthread_id, tid, next, - tnf_microstate, state, RUNSTATE(next, lwp)); -#endif - - /* - * If we borrowed idle thread's tpdp above, restore the zombies - * tpdp so that it will be freed from tnf_thread_free(). - */ - if (borrow) - t->t_tnf_tpdp = ztpdp; - -} - -#endif /* NPROBE */ - -/* - * tnf_mod_load (and tnf_mod_unload), when called from a client module's _init - * (and _fini) entry points are insufficient mechanisms for maintaining the - * consistency of __tnf_probe_list_head and __tnf_tag_list_head whenever that - * module is loaded or unloaded. The problem occurs because loading a module, - * at which time the modules probes are linked into the two lists, and - * installing that module are separate operations. This means that it is - * possible for a module to be loaded, not installed, and unloaded without - * calling _init and _fini. If the module contains TNF probes, the probe and - * tag lists will contain references to data addresses freed when the module - * is unloaded. - * - * The implemented solution for maintaining the lists is to perform the - * unsplicing when the module is unloaded. (Splicing into the lists, "probe - * discovery", is done when krtld processes relocation references when it - * loads the module; this information is not available for subsequent - * operations on the module. - */ -int -tnf_mod_load() -{ - return (0); -} - -/* ARGSUSED */ -int -tnf_mod_unload(struct modlinkage *mlp) -{ - return (0); -} diff --git a/usr/src/uts/common/tnf/tnf_trace.c b/usr/src/uts/common/tnf/tnf_trace.c deleted file mode 100644 index 352fc8156a..0000000000 --- a/usr/src/uts/common/tnf/tnf_trace.c +++ /dev/null @@ -1,298 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 1994, 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/ddi.h> /* strchr */ -#include <sys/sunddi.h> /* strchr */ -#include <sys/tnf_com.h> -#include <sys/tnf_writer.h> -#include <sys/tnf_probe.h> -#include <sys/debug.h> - -#include "tnf_buf.h" -#include "tnf_types.h" -#include "tnf_trace.h" - -/* - * New derived types for probes - */ - -TNF_STD_DERIVED_TAG(tnf_probe_event, tnf_tag, - tnf_derived_properties, TNF_OPAQUE); - -TNF_STD_DERIVED_TAG(tnf_time_base, tnf_int64, - tnf_derived_properties, TNF_INT64); - -TNF_STD_DERIVED_TAG(tnf_time_delta, tnf_uint32, - tnf_derived_properties, TNF_UINT32); - -TNF_STD_DERIVED_TAG(tnf_pid, tnf_int32, - tnf_derived_properties, TNF_INT32); - -TNF_STD_DERIVED_TAG(tnf_lwpid, tnf_uint32, - tnf_derived_properties, TNF_UINT32); - -TNF_STD_DERIVED_TAG(tnf_kthread_id, tnf_opaque, - tnf_derived_properties, TNF_OPAQUE); - -TNF_STD_DERIVED_TAG(tnf_cpuid, tnf_int32, - tnf_derived_properties, TNF_INT32); - -TNF_STD_DERIVED_TAG(tnf_device, tnf_ulong, - tnf_derived_properties, TNF_ULONG); - -TNF_STD_DERIVED_TAG(tnf_symbol, tnf_opaque, - tnf_derived_properties, TNF_OPAQUE); - -TNF_STD_ARRAY_TAG(tnf_symbols, tnf_symbol, TNF_ARRAY); - -TNF_STD_DERIVED_TAG(tnf_sysnum, tnf_int16, - tnf_derived_properties, TNF_INT32); - -TNF_STD_DERIVED_TAG(tnf_microstate, tnf_int32, - tnf_derived_properties, TNF_INT32); - -TNF_STD_DERIVED_TAG(tnf_offset, tnf_int64, - tnf_derived_properties, TNF_INT64); - -TNF_STD_DERIVED_TAG(tnf_fault_type, tnf_int32, - tnf_derived_properties, TNF_INT32); - -TNF_STD_DERIVED_TAG(tnf_seg_access, tnf_int32, - tnf_derived_properties, TNF_INT32); - -TNF_STD_DERIVED_TAG(tnf_bioflags, tnf_int32, - tnf_derived_properties, TNF_INT32); - -TNF_STD_DERIVED_TAG(tnf_diskaddr, tnf_int64, - tnf_derived_properties, TNF_INT64); - -static char *kernel_schedule_slot_names[] = { - TNF_N_TAG, - TNF_N_TID, - TNF_N_LWPID, - TNF_N_PID, - TNF_N_TIME_BASE, - "cpuid", /* XXX */ - 0}; - -static tnf_tag_data_t **kernel_schedule_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_kthread_id), - &TAG_DATA(tnf_lwpid), - &TAG_DATA(tnf_pid), - &TAG_DATA(tnf_time_base), - &TAG_DATA(tnf_cpuid), - 0}; - -TNF_STD_STRUCT_TAG(tnf_kernel_schedule, - kernel_schedule_slots, - kernel_schedule_slot_names, - sizeof (tnf_schedule_prototype_t)); - -/* - * Probe type record (metatag) - */ - -static tnf_tag_data_t **probe_type_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_name), - &TAG_DATA(tnf_properties), - &TAG_DATA(tnf_slot_types), - &TAG_DATA(tnf_type_size), - &TAG_DATA(tnf_slot_names), - &TAG_DATA(tnf_string), /* detail */ - 0}; - -TNF_METATAG(tnf_probe_type, tnf_type_properties, - probe_type_slots, tnf_struct_tag_1); - -/* - * Write a kernel schedule record - * Can only be written in reusable data space. - */ - -tnf_record_p -tnf_kernel_schedule(tnf_ops_t *ops, tnf_schedule_t *sched) -{ - tnf_tag_data_t *metatag_data; - tnf_record_p metatag_index; - tnf_schedule_prototype_t *buffer; - kthread_t *t; - - t = curthread; - - /* Cannot be called when writing into tag space */ - ASSERT(ops->mode == TNF_ALLOC_REUSABLE); - - ALLOC(ops, sizeof (*buffer), buffer, sched->record_p, - TNF_ALLOC_REUSABLE); /* XXX see comment above */ - - metatag_data = TAG_DATA(tnf_kernel_schedule); - metatag_index = metatag_data->tag_index ? - metatag_data->tag_index : - metatag_data->tag_desc(ops, metatag_data); - - ASSIGN(buffer, tag, metatag_index); - ASSIGN2(buffer, tid, t, kthread_id); - ASSIGN(buffer, lwpid, t->t_tid); - ASSIGN(buffer, pid, ttoproc(t)->p_pid); - ASSIGN(buffer, time_base, sched->time_base); - ASSIGN(buffer, cpuid, sched->cpuid); - - /* - * Remember schedule record generation number so the distance - * in virtual space can be calculated from an event record - */ - sched->record_gen = ((tnf_block_header_t *) - ((uintptr_t)buffer & TNF_BLOCK_MASK))->generation; - /* Cannot have been written into tag space */ - ASSERT(sched->record_gen != TNF_TAG_GENERATION_NUM); - - return ((tnf_record_p)buffer); -} - -/* - * Array of addresses and derivatives - */ - -tnf_reference_t -tnf_opaque_array_1(tnf_ops_t *ops, tnf_opaque_t *opaques, - tnf_record_p reference, tnf_tag_data_t *tag_data) -{ - tnf_record_p tag_index; - size_t record_size; - tnf_opaque_t *tmp; - tnf_opaque_t *ref_p; - tnf_array_header_t *bufhdr; - - tag_index = tag_data->tag_index ? tag_data->tag_index : - tag_data->tag_desc(ops, tag_data); - - if (!opaques) - return (TNF_NULL); - - record_size = sizeof (*bufhdr); - tmp = opaques; - while (*tmp++) - record_size += sizeof (*ref_p); - - ALLOC2(ops, record_size, bufhdr, ops->mode); - - ASSIGN(bufhdr, tag, tag_index); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(bufhdr, self_size, record_size); - - tmp = opaques; - /* LINTED pointer cast may result in improper alignment */ - ref_p = (tnf_opaque_t *)((char *)bufhdr + sizeof (*bufhdr)); - while (*tmp) { - *ref_p = tnf_opaque(ops, *tmp, (tnf_reference_t *)ref_p); - tmp++; - ref_p++; - } - - return (tnf_ref32(ops, (tnf_record_p) bufhdr, reference)); -} - -#ifdef __sparc - -tnf_reference_t -tnf_opaque32_array_1(tnf_ops_t *ops, tnf_uint32_t *opaques, - tnf_record_p reference, tnf_tag_data_t *tag_data) -{ - tnf_record_p tag_index; - size_t record_size; - tnf_uint32_t *tmp; - tnf_uint32_t *ref_p; - tnf_array_header_t *bufhdr; - - tag_index = tag_data->tag_index ? tag_data->tag_index : - tag_data->tag_desc(ops, tag_data); - - if (!opaques) - return (TNF_NULL); - - record_size = sizeof (*bufhdr); - tmp = opaques; - while (*tmp++) - record_size += sizeof (*ref_p); - - ALLOC2(ops, record_size, bufhdr, ops->mode); - - ASSIGN(bufhdr, tag, tag_index); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(bufhdr, self_size, record_size); - - tmp = opaques; - /* LINTED pointer cast may result in improper alignment */ - ref_p = (tnf_uint32_t *)((char *)bufhdr + sizeof (*bufhdr)); - while (*tmp) { - *ref_p = tnf_uint32(ops, *tmp, (tnf_reference_t *)ref_p); - tmp++; - ref_p++; - } - - return (tnf_ref32(ops, (tnf_record_p) bufhdr, reference)); -} - -#endif /* __sparc */ - -/* - * Tag initializer - */ - -void -tnf_tag_trace_init(void) -{ - - TAG_SNAP(tnf_probe_event); - TAG_SNAP(tnf_time_base); - TAG_SNAP(tnf_time_delta); - TAG_SNAP(tnf_pid); - TAG_SNAP(tnf_lwpid); - - TAG_SNAP(tnf_kthread_id); - TAG_SNAP(tnf_cpuid); - TAG_SNAP(tnf_device); - TAG_SNAP(tnf_symbol); - TAG_SNAP(tnf_symbols); - TAG_SNAP(tnf_sysnum); - TAG_SNAP(tnf_microstate); - TAG_SNAP(tnf_offset); - TAG_SNAP(tnf_fault_type); - TAG_SNAP(tnf_seg_access); - TAG_SNAP(tnf_bioflags); - TAG_SNAP(tnf_diskaddr); - TAG_SNAP(tnf_kernel_schedule); - - TAG_SNAP(tnf_probe_type); - -} diff --git a/usr/src/uts/common/tnf/tnf_trace.h b/usr/src/uts/common/tnf/tnf_trace.h deleted file mode 100644 index 13b7a8b98c..0000000000 --- a/usr/src/uts/common/tnf/tnf_trace.h +++ /dev/null @@ -1,159 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - */ - -#ifndef _TNF_TRACE_H -#define _TNF_TRACE_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> -#include <sys/time.h> -#include <sys/tnf_probe.h> -#include <sys/thread.h> -#include <sys/processor.h> - -#include "tnf_buf.h" -#include "tnf_types.h" - -/* - * Minimum and default size of trace file - */ - -#define TNF_TRACE_FILE_MIN (128 * 1024) -#define TNF_TRACE_FILE_DEFAULT (1 * 1024 * 1024) - -/* - * Specification of index field of probe control block - */ - -#define PROBE_INDEX_TYPE_MASK 0x3 -#define PROBE_INDEX_MEM_PTR 0x0 /* index is a normal memory ptr */ -#define PROBE_INDEX_FILE_PTR 0x1 /* index is a file abs ptr */ -#define PROBE_INDEX_LOW_MASK 0xffff0000 -#define PROBE_INDEX_SHIFT 16 - -#define PROBE_IS_FILE_PTR(x) \ - (((x) & PROBE_INDEX_TYPE_MASK) == PROBE_INDEX_FILE_PTR) - -#define ATTR_SEPARATOR ';' -#define VAL_SEPARATOR ' ' - -/* - * Flags in proc struct - */ -#define PROC_F_FILTER 0x1 - -#define PROC_IS_FILTER(pp) ((pp)->p_tnf_flags & PROC_F_FILTER) -#define PROC_FILTER_SET(pp) ((pp)->p_tnf_flags |= PROC_F_FILTER) -#define PROC_FILTER_CLR(pp) ((pp)->p_tnf_flags &= ~PROC_F_FILTER) - -/* - * In-memory scheduling info, maintained per thread - */ - -typedef struct { - tnf_record_p record_p; - tnf_uint32_t record_gen; - hrtime_t time_base; - processorid_t cpuid; -} tnf_schedule_t; - -/* - * Per-thread tracing operations and state - */ - -struct _tnf_ops { - char mode; /* allocation mode */ - tnf_byte_lock_t busy; /* currently in a probe */ - TNFW_B_WCB wcb; /* write control info */ - tnf_schedule_t schedule; /* scheduling info */ -}; - -/* - * File layout of a kernel schedule record - */ - -typedef struct { - tnf_tag_t tag; - tnf_kthread_id_t tid; - tnf_lwpid_t lwpid; - tnf_pid_t pid; - /* - * time base should be on a double word boundary to avoid pads - */ - tnf_time_base_t time_base; - tnf_cpuid_t cpuid; -} tnf_schedule_prototype_t; - -/* - * File layout of a probe (event tag) record - */ - -typedef struct { - tnf_tag_t tag; - tnf_name_t name; - tnf_properties_t properties; - tnf_slot_types_t slot_types; - tnf_type_size_t type_size; - tnf_slot_names_t slot_names; - tnf_string_t string; /* XXX detail */ -} tnf_probe_prototype_t; - -/* - * Tag data variables - */ - -extern tnf_tag_data_t *tnf_probe_type_tag_data; -extern tnf_tag_data_t *tnf_kernel_schedule_tag_data; - -/* - * - */ - -extern size_t tnf_trace_file_size; - -/* - * Function prototypes - */ - -/* Encoder functions */ - -tnf_record_p tnf_kernel_schedule(tnf_ops_t *, tnf_schedule_t *); -uintptr_t tnf_probe_tag(tnf_ops_t *, tnf_probe_control_t *); - -/* Trace functions */ - -void *tnf_trace_alloc(tnf_ops_t *, tnf_probe_control_t *, tnf_probe_setup_t *); - -void tnf_trace_commit(tnf_probe_setup_t *); -void tnf_trace_rollback(tnf_probe_setup_t *); - -/* Trace control functions */ - -void tnf_trace_init(void); -void tnf_trace_on(void); -void tnf_trace_off(void); - -#endif /* _TNF_TRACE_H */ diff --git a/usr/src/uts/common/tnf/tnf_types.h b/usr/src/uts/common/tnf/tnf_types.h deleted file mode 100644 index 69e8e0c132..0000000000 --- a/usr/src/uts/common/tnf/tnf_types.h +++ /dev/null @@ -1,442 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994,1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#ifndef _TNF_TYPES_H -#define _TNF_TYPES_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> -#ifdef _KERNEL -#include <sys/tnf_com.h> -#include <sys/tnf_writer.h> -#include <sys/tnf_probe.h> -#include "tnf_buf.h" -#else /* _KERNEL */ -#include <tnf/com.h> -#include <tnf/writer.h> -#include <tnf/probe.h> -#endif /* _KERNEL */ - -#ifdef __cplusplus -extern "C" { -#endif - -extern struct tnf_probe_version __tnf_probe_version_1_info; - -/* - * Defines - */ - -#define TAG_DATA(type) type##_tag_data -#define _TAG_DATA(type) _##type##_tag_data - -#define TAG_SNAP(type) TAG_DATA(type) = &_TAG_DATA(type) -#define TAG_EXPORT(type) tnf_tag_data_t *TAG_SNAP(type) - -/* - * String limits - */ - -/* XXX tie into TNF_BLOCK_SIZE */ -#define TNF_STRING_LIMIT 255 /* excludes terminating NUL */ -#define TNF_STRING_ROUNDUP(sz) (((sz) + 3) & ~3) - -/* - * XXX Semi-private - */ - -#ifdef _KERNEL - -#define TAG_SET(type) TAG_SNAP(type) -#define BUF_ALLOC(ops) tnfw_b_alloc - -#else /* _KERNEL */ - -#define TAG_SET(type) TAG_EXPORT(type) -#define BUF_ALLOC(ops) ops->alloc - -#endif /* _KERNEL */ - -#define ASSIGN(buf, slot, val) \ - buf->slot = tnf_##slot(ops, val, (tnf_record_p) &buf->slot) - -#define ASSIGN2(buf, slot, val, func) \ - buf->slot = tnf_##func(ops, val, (tnf_record_p)&buf->slot) - -#define ALLOC(ops, size, mem, index_p, saved_mode) \ - mem = BUF_ALLOC(ops)(&(ops->wcb), size, ops->mode); \ - if (mem == TNF_NULL) { \ - ops->mode = saved_mode; \ - return (TNF_NULL); \ - } \ - index_p = (tnf_record_p)mem - -#define ALLOC2(ops, size, mem, saved_mode) \ - mem = BUF_ALLOC(ops)(&(ops->wcb), size, ops->mode); \ - if (mem == TNF_NULL) { \ - ops->mode = saved_mode; \ - return (TNF_NULL); \ - } - -/* - * NOTE: These macros DO NOT export the tags. In the kernel, tag data - * pointers are initialized to NULL in tnf_res.c, and are snapped by - * tnf_tag_XXX_init() when the driver is loaded. In user land - * they are exported by another macro. - */ - -/* - * Initializing abstract tags - */ - -#define TNF_ABSTRACT_TAG(type) \ -static tnf_tag_data_t _TAG_DATA(type) = { \ - TNF_TAG_VERSION, \ - &tnf_abstract_tag_1, \ - 0, \ - TNF_STRINGIFY(type) } - -/* - * Initializing scalar tags - */ - -#define TNF_SCALAR_TAG(type, size, align, kind) \ -static tnf_tag_data_t _TAG_DATA(type) = { \ - TNF_TAG_VERSION, \ - &tnf_scalar_tag_1, \ - 0, \ - TNF_STRINGIFY(type), \ - &tnf_scalar_properties, \ - size, \ - align, \ - size, \ - kind } - -#define TNF_STD_SCALAR_TAG(type, kind) \ - TNF_SCALAR_TAG(type, sizeof (type##_t), \ - TNF_ALIGN(type##_t), kind) - -/* - * Initializing array tags - * Assumes all arrays are `records' - */ - -#define TNF_ARRAY_TAG(type, eltag, props, slots, kind) \ -static tnf_tag_data_t _TAG_DATA(type) = { \ - TNF_TAG_VERSION, \ - &tnf_array_tag_1, \ - 0, \ - TNF_STRINGIFY(type), \ - &props, \ - ARRAY_HDR_SIZE, \ - TNF_ALIGN(tnf_ref32_t), \ - sizeof (tnf_ref32_t), \ - kind, \ - eltag, \ - slots } - -#define TNF_STD_ARRAY_TAG(type, eltype, kind) \ - TNF_ARRAY_TAG(type, &TAG_DATA(eltype), \ - tnf_array_properties, tnf_array_slots, kind) - -/* - * Initializing derived tags - */ - -#define TNF_DERIVED_TAG(type, basetag, props, size, align, kind) \ -static tnf_tag_data_t _TAG_DATA(type) = { \ - TNF_TAG_VERSION, \ - &tnf_derived_tag_1, \ - 0, \ - TNF_STRINGIFY(type), \ - &props, \ - 0, \ - align, \ - size, \ - kind, \ - basetag } - -#define TNF_STD_DERIVED_TAG(type, base, props, kind) \ - TNF_DERIVED_TAG(type, &TAG_DATA(base), props, \ - sizeof (type##_t), TNF_ALIGN(type##_t), kind) - -/* - * Initializing structure tags - * Assumes all structs are `records' - */ - -#define TNF_STRUCT_TAG(type, props, slots, names, size) \ -static tnf_tag_data_t _TAG_DATA(type) = { \ - TNF_TAG_VERSION, \ - &tnf_struct_tag_1, \ - 0, \ - TNF_STRINGIFY(type), \ - &props, \ - size, \ - TNF_ALIGN(tnf_ref32_t), \ - sizeof (tnf_ref32_t), \ - TNF_STRUCT, \ - 0, \ - slots, \ - names } - -#define TNF_STD_STRUCT_TAG(type, slots, names, size) \ - TNF_STRUCT_TAG(type, tnf_struct_properties, slots, names, size) - -/* - * Initializing metatags - * Size is initialized assuming NULL-terminated array of words and - * each element has a reference size of one word. - */ - -#define TNF_METATAG(type, props, slots, desc) \ -static tnf_tag_data_t _TAG_DATA(type) = { \ - TNF_TAG_VERSION, \ - &desc, \ - 0, \ - TNF_STRINGIFY(type), \ - &props, \ - (sizeof (slots) - sizeof (slots[0])) * \ - (sizeof (tnf_uint32_t))/(sizeof (char *)), \ - TNF_ALIGN(tnf_ref32_t), \ - sizeof (tnf_ref32_t), \ - TNF_STRUCT, \ - 0, \ - slots, \ - 0 } - -/* - * TNF internal types - */ - -extern tnf_tag_data_t *tnf_tag_arg_tag_data; -typedef tnf_ref32_t tnf_tag_arg_t; /* tag qualifier */ - -extern tnf_tag_data_t *tnf_inline_tag_data; /* abstract */ - -extern tnf_tag_data_t *tnf_tagged_tag_data; /* abstract */ - -extern tnf_tag_data_t *tnf_scalar_tag_data; /* abstract scalar */ - -extern tnf_tag_data_t *tnf_array_tag_data; /* abstract array */ - -extern tnf_tag_data_t *tnf_derived_tag_data; /* abstract derived */ - -extern tnf_tag_data_t *tnf_derived_base_tag_data; -typedef tnf_reference_t tnf_derived_base_t; -#define tnf_derived_base(ops, item, ref)\ - tnf_tag_element_1(ops, item, ref, tnf_derived_base_tag_data) - -extern tnf_tag_data_t *tnf_element_type_tag_data; -typedef tnf_reference_t tnf_element_type_t; -#define tnf_element_type(ops, item, ref)\ - tnf_tag_element_1(ops, item, ref, tnf_element_type_tag_data) - -extern tnf_tag_data_t *tnf_type_array_tag_data; -typedef tnf_reference_t tnf_type_array_t; -#define tnf_type_array(ops, item, ref) \ - tnf_tag_array_1(ops, item, ref, tnf_type_array_tag_data) - -extern tnf_tag_data_t *tnf_slot_types_tag_data; -typedef tnf_type_array_t tnf_slot_types_t; -#define tnf_slot_types(ops, item, ref) \ - tnf_tag_array_1(ops, item, ref, tnf_slot_types_tag_data) - -extern tnf_tag_data_t *tnf_properties_tag_data; -typedef tnf_type_array_t tnf_properties_t; -#define tnf_properties(ops, item, ref) \ - tnf_tag_properties_1(ops, item, ref, tnf_properties_tag_data) - -extern tnf_tag_data_t *tnf_name_array_tag_data; -typedef tnf_reference_t tnf_name_array_t; -#define tnf_name_array(ops, item, ref) \ - tnf_string_array_1(ops, item, ref, tnf_name_array_tag_data) - -extern tnf_tag_data_t *tnf_slot_names_tag_data; -typedef tnf_name_array_t tnf_slot_names_t; -#define tnf_slot_names(ops, item, ref) \ - tnf_string_array_1(ops, item, ref, tnf_slot_names_tag_data) - -extern tnf_tag_data_t *tnf_align_tag_data; -typedef tnf_uint32_t tnf_align_t; -#define tnf_align(ops, item, ref) \ - tnf_uint32(ops, item, ref) - -extern tnf_tag_data_t *tnf_self_size_tag_data; -typedef tnf_uint32_t tnf_self_size_t; -#define tnf_self_size(ops, item, ref) \ - tnf_uint32(ops, item, ref) - -extern tnf_tag_data_t *tnf_type_size_tag_data; -typedef tnf_uint32_t tnf_type_size_t; -#define tnf_type_size(ops, item, ref) \ - tnf_uint32(ops, item, ref) - -extern tnf_tag_data_t *tnf_header_size_tag_data; -typedef tnf_uint32_t tnf_header_size_t; -#define tnf_header_size(ops, item, ref) \ - tnf_uint32(ops, item, ref) - -extern tnf_tag_data_t *tnf_struct_tag_data; /* abstract struct */ - -extern tnf_tag_data_t *tnf_type_tag_data; /* abstract type */ - -extern tnf_tag_data_t *tnf_scalar_type_tag_data; - -extern tnf_tag_data_t *tnf_derived_type_tag_data; - -extern tnf_tag_data_t *tnf_array_type_tag_data; - -extern tnf_tag_data_t *tnf_struct_type_tag_data; - -/* - * Concrete struct types - */ - -extern tnf_tag_data_t *tnf_file_header_tag_data; - -extern tnf_tag_data_t *tnf_block_header_tag_data; - -/* - * Exported slots - */ - -extern tnf_tag_data_t **tnf_array_slots[]; - -/* - * Exported properties - */ - -extern tnf_tag_data_t ***tnf_no_properties; -extern tnf_tag_data_t ***tnf_scalar_properties; -extern tnf_tag_data_t ***tnf_array_properties; -extern tnf_tag_data_t ***tnf_derived_properties; -extern tnf_tag_data_t ***tnf_struct_properties; -extern tnf_tag_data_t ***tnf_type_properties; - -/* - * Binary layout of standard array header - */ - -typedef struct { - tnf_tag_t tag; - tnf_self_size_t self_size; -} tnf_array_header_t; - -#define ARRAY_HDR_SIZE sizeof (tnf_array_header_t) - -/* - * Binary layouts of TNF tags - */ - -typedef struct { - tnf_tag_t tag; - tnf_name_t name; - tnf_properties_t properties; -} tnf_type_prototype_t; - -typedef struct { - tnf_tag_t tag; - tnf_name_t name; - tnf_properties_t properties; - tnf_type_size_t type_size; - tnf_align_t align; -} tnf_scalar_type_prototype_t; - -typedef struct { - tnf_tag_t tag; - tnf_name_t name; - tnf_properties_t properties; - tnf_derived_base_t derived_base; -} tnf_derived_type_prototype_t; - -typedef struct { - tnf_tag_t tag; - tnf_name_t name; - tnf_properties_t properties; - tnf_slot_types_t slot_types; - tnf_header_size_t header_size; - tnf_element_type_t element_type; -} tnf_array_type_prototype_t; - -typedef struct { - tnf_tag_t tag; - tnf_name_t name; - tnf_properties_t properties; - tnf_slot_types_t slot_types; - tnf_type_size_t type_size; - tnf_slot_names_t slot_names; -} tnf_struct_type_prototype_t; - -/* - * Data encoders - */ - -extern tnf_reference_t tnf_tag_element_1(tnf_ops_t *, - tnf_tag_data_t **, - tnf_record_p, - tnf_tag_data_t *); - -extern tnf_reference_t tnf_tag_array_1(tnf_ops_t *, - tnf_tag_data_t ***, - tnf_record_p, - tnf_tag_data_t *); - -extern tnf_reference_t tnf_tag_properties_1(tnf_ops_t *, - tnf_tag_data_t ****, - tnf_record_p, - tnf_tag_data_t *); - -extern tnf_reference_t tnf_string_array_1(tnf_ops_t *, - char **, - tnf_record_p, - tnf_tag_data_t *); - -/* - * Tag descriptors - */ - -extern tnf_record_p tnf_abstract_tag_1(tnf_ops_t *, tnf_tag_data_t *); -extern tnf_record_p tnf_scalar_tag_1(tnf_ops_t *, tnf_tag_data_t *); -extern tnf_record_p tnf_derived_tag_1(tnf_ops_t *, tnf_tag_data_t *); -extern tnf_record_p tnf_array_tag_1(tnf_ops_t *, tnf_tag_data_t *); - -#ifdef _KERNEL -/* - * Tag pointer initializers, called when driver loaded to snap all - * tag data pointers. - */ - -extern void tnf_tag_core_init(void); /* initialize core tags */ -extern void tnf_tag_trace_init(void); /* initialize trace tags */ -#endif /* _KERNEL */ - -#ifdef __cplusplus -} -#endif - -#endif /* _TNF_TYPES_H */ diff --git a/usr/src/uts/common/tnf/tnf_writer.c b/usr/src/uts/common/tnf/tnf_writer.c deleted file mode 100644 index 4cfb19efe5..0000000000 --- a/usr/src/uts/common/tnf/tnf_writer.c +++ /dev/null @@ -1,966 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifndef DEBUG -#define NDEBUG 1 -#endif - -#ifdef _KERNEL -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/tnf_com.h> -#include <sys/tnf_writer.h> -#include <sys/debug.h> -#include "tnf_types.h" -#include "tnf_trace.h" -#else /* _KERNEL */ -#include <stdlib.h> -#include <string.h> -#include <tnf/com.h> -#include <tnf/writer.h> -#include <assert.h> -#include "tnf_types.h" -#include <tnf_trace.h> -#endif /* _KERNEL */ - -/* - * Defines - */ - -#ifdef _KERNEL -#define TNF_ASSERT(expr) ASSERT(expr) -#else -#define TNF_ASSERT(expr) assert(expr) -#endif - -/* - * Local functions - */ - -static tnf_record_p tnf_root_tag_1(tnf_ops_t *, tnf_tag_data_t *); - -/* - * TNF tag version 1 - */ - -tnf_tag_version_t __tnf_tag_version_1_info = { - sizeof (tnf_tag_version_t), - sizeof (tnf_tag_data_t) -}; - -/* - * Pure abstract types - */ - -TNF_ABSTRACT_TAG(tnf_inline); -TNF_ABSTRACT_TAG(tnf_tagged); - -/* - * Scalar types - */ - -static tnf_tag_data_t **std_scalar_properties[] = { - &TAG_DATA(tnf_inline), - &TAG_DATA(tnf_scalar), - 0}; - -tnf_tag_data_t ***tnf_scalar_properties = std_scalar_properties; - -TNF_SCALAR_TAG(tnf_scalar, 0, 0, TNF_UNKNOWN); - -TNF_STD_SCALAR_TAG(tnf_char, TNF_UNKNOWN); /* XXX */ -TNF_STD_SCALAR_TAG(tnf_int8, TNF_INT32); -TNF_STD_SCALAR_TAG(tnf_uint8, TNF_UINT32); -TNF_STD_SCALAR_TAG(tnf_int16, TNF_INT32); -TNF_STD_SCALAR_TAG(tnf_uint16, TNF_UINT32); -TNF_STD_SCALAR_TAG(tnf_int32, TNF_INT32); -TNF_STD_SCALAR_TAG(tnf_uint32, TNF_UINT32); -TNF_STD_SCALAR_TAG(tnf_int64, TNF_INT64); -TNF_STD_SCALAR_TAG(tnf_uint64, TNF_UINT64); - -TNF_STD_SCALAR_TAG(tnf_float32, TNF_FLOAT32); -TNF_STD_SCALAR_TAG(tnf_float64, TNF_FLOAT64); - -/* - * Array types - */ - -static tnf_tag_data_t **array_properties[] = { - &TAG_DATA(tnf_array), - 0 -}; -static tnf_tag_data_t ***abstract_array_properties = array_properties; - -static tnf_tag_data_t **std_array_properties[] = { - &TAG_DATA(tnf_array), - &TAG_DATA(tnf_tagged), - 0 -}; -/* Exported */ -tnf_tag_data_t ***tnf_array_properties = std_array_properties; - -/* Exported */ -tnf_tag_data_t **tnf_array_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_self_size), - 0 -}; - -TNF_ARRAY_TAG(tnf_array, TNF_NULL, abstract_array_properties, - TNF_NULL, TNF_UNKNOWN); - -TNF_STD_ARRAY_TAG(tnf_string, tnf_char, TNF_STRING); -TNF_STD_ARRAY_TAG(tnf_type_array, tnf_type, TNF_ARRAY); -TNF_STD_ARRAY_TAG(tnf_name_array, tnf_name, TNF_ARRAY); - -/* - * Derived types - */ - -static tnf_tag_data_t **derived_properties[] = { - &TAG_DATA(tnf_derived), - 0 -}; -/* Exported */ -tnf_tag_data_t ***tnf_derived_properties = derived_properties; - -TNF_DERIVED_TAG(tnf_derived, TNF_NULL, - tnf_derived_properties, TNF_NULL, TNF_NULL, TNF_UNKNOWN); - -TNF_STD_DERIVED_TAG(tnf_align, tnf_uint32, - tnf_derived_properties, TNF_UINT32); - -TNF_STD_DERIVED_TAG(tnf_derived_base, tnf_type, - tnf_derived_properties, TNF_OPAQUE); - -TNF_STD_DERIVED_TAG(tnf_element_type, tnf_type, - tnf_derived_properties, TNF_OPAQUE); - -TNF_STD_DERIVED_TAG(tnf_header_size, tnf_uint32, - tnf_derived_properties, TNF_UINT32); - -TNF_STD_DERIVED_TAG(tnf_name, tnf_string, - tnf_derived_properties, TNF_STRING); - -#if defined(_LP64) - -TNF_STD_DERIVED_TAG(tnf_opaque, tnf_uint64, - tnf_derived_properties, TNF_OPAQUE); - -#else - -TNF_STD_DERIVED_TAG(tnf_opaque, tnf_uint32, - tnf_derived_properties, TNF_OPAQUE); - -#endif /* defined(_LP64) */ - -TNF_STD_DERIVED_TAG(tnf_properties, tnf_type_array, - tnf_derived_properties, TNF_ARRAY); - -TNF_STD_DERIVED_TAG(tnf_self_size, tnf_uint32, - tnf_derived_properties, TNF_UINT32); - -TNF_STD_DERIVED_TAG(tnf_size, tnf_ulong, - tnf_derived_properties, TNF_ULONG); - -TNF_STD_DERIVED_TAG(tnf_slot_names, tnf_name_array, - tnf_derived_properties, TNF_ARRAY); - -TNF_STD_DERIVED_TAG(tnf_slot_types, tnf_type_array, - tnf_derived_properties, TNF_ARRAY); - -TNF_STD_DERIVED_TAG(tnf_tag, tnf_type, - tnf_derived_properties, TNF_OPAQUE); - -TNF_STD_DERIVED_TAG(tnf_tag_arg, tnf_tagged, - tnf_derived_properties, TNF_OPAQUE); - -TNF_STD_DERIVED_TAG(tnf_type_size, tnf_uint32, - tnf_derived_properties, TNF_UINT32); - -/* - * Struct types - */ - -static tnf_tag_data_t **no_properties[] = { 0 }; -tnf_tag_data_t ***tnf_no_properties = no_properties; - -static tnf_tag_data_t **no_slots[] = { 0 }; - -static tnf_tag_data_t **std_struct_properties[] = { - &TAG_DATA(tnf_tagged), - &TAG_DATA(tnf_struct), - 0}; -/* Exported */ -tnf_tag_data_t ***tnf_struct_properties = std_struct_properties; - -TNF_STRUCT_TAG(tnf_struct, tnf_no_properties, no_slots, 0, 0); - -/* - * File header - CAUTION - has to be in sync with com.h - */ - -static char *file_header_slot_names[] = { - TNF_N_TAG, - TNF_N_FILE_VERSION, - TNF_N_FILE_HEADER_SIZE, - TNF_N_FILE_LOGICAL_SIZE, - TNF_N_BLOCK_HEADER_SIZE, - TNF_N_BLOCK_SIZE, - TNF_N_DIRECTORY_SIZE, - TNF_N_BLOCK_COUNT, - TNF_N_BLOCKS_VALID, - /* XXX add writer-specific opaque slots here for reader */ - 0}; - -static tnf_tag_data_t **file_header_slots[] = { - &TAG_DATA(tnf_tag), /* tag */ - &TAG_DATA(tnf_uint32), /* file_version */ - &TAG_DATA(tnf_uint32), /* file_header_size */ - &TAG_DATA(tnf_uint32), /* file_logical_size */ - &TAG_DATA(tnf_uint32), /* block_header_size */ - &TAG_DATA(tnf_uint32), /* block_size */ - &TAG_DATA(tnf_uint32), /* directory_size */ - &TAG_DATA(tnf_uint32), /* block_count */ - &TAG_DATA(tnf_uint32), /* blocks_valid */ - /* XXX add writer-specific opaque slots here for reader */ - 0}; - -/* size of tnf_file_header has the size of the magic number subtracted */ -TNF_STD_STRUCT_TAG(tnf_file_header, - file_header_slots, - file_header_slot_names, - sizeof (tnf_buf_file_header_t) - sizeof (tnf_uint32_t)); - -/* - * Block header - CAUTION - has to be in sync with com.h - */ - -static char *block_header_slot_names[] = { - TNF_N_TAG, - TNF_N_GENERATION, - TNF_N_BYTES_VALID, - "A_lock", /* XXX */ - "B_lock", /* XXX */ - "next_block", /* XXX */ - 0}; - -static tnf_tag_data_t **block_header_slots[] = { - &TAG_DATA(tnf_tag), /* tag */ - &TAG_DATA(tnf_uint32), /* generation */ - &TAG_DATA(tnf_uint16), /* bytes_valid */ - &TAG_DATA(tnf_uint8), /* A_lock */ - &TAG_DATA(tnf_uint8), /* B_lock */ - &TAG_DATA(tnf_opaque), /* next_block */ - 0}; - -TNF_STD_STRUCT_TAG(tnf_block_header, - block_header_slots, - block_header_slot_names, - sizeof (tnf_block_header_t)); - -/* - * Metatypes - */ - -static tnf_tag_data_t **type_properties[] = { - &TAG_DATA(tnf_tagged), - &TAG_DATA(tnf_struct), - &TAG_DATA(tnf_type), - 0}; -/* Exported */ -tnf_tag_data_t ***tnf_type_properties = type_properties; - -static tnf_tag_data_t **type_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_name), - &TAG_DATA(tnf_properties), - 0}; - -TNF_METATAG(tnf_type, tnf_type_properties, type_slots, tnf_struct_tag_1); - -static tnf_tag_data_t **array_type_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_name), - &TAG_DATA(tnf_properties), - &TAG_DATA(tnf_slot_types), - &TAG_DATA(tnf_header_size), - &TAG_DATA(tnf_element_type), - 0}; - -TNF_METATAG(tnf_array_type, tnf_type_properties, - array_type_slots, tnf_struct_tag_1); - -static tnf_tag_data_t **derived_type_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_name), - &TAG_DATA(tnf_properties), - &TAG_DATA(tnf_derived_base), - 0}; - -TNF_METATAG(tnf_derived_type, tnf_type_properties, - derived_type_slots, tnf_struct_tag_1); - -static tnf_tag_data_t **scalar_type_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_name), - &TAG_DATA(tnf_properties), - &TAG_DATA(tnf_type_size), - &TAG_DATA(tnf_align), - 0}; - -TNF_METATAG(tnf_scalar_type, tnf_type_properties, - scalar_type_slots, tnf_struct_tag_1); - -static tnf_tag_data_t **struct_type_slots[] = { - &TAG_DATA(tnf_tag), - &TAG_DATA(tnf_name), - &TAG_DATA(tnf_properties), - &TAG_DATA(tnf_slot_types), - &TAG_DATA(tnf_type_size), - &TAG_DATA(tnf_slot_names), - 0}; - -TNF_METATAG(tnf_struct_type, tnf_type_properties, - struct_type_slots, tnf_root_tag_1); - - -/* - * Generic tnf reference - does checking on whether destination is - * a permanent block or not - */ - -#ifdef _KERNEL - -/*ARGSUSED0*/ -tnf_ref32_t -tnf_ref32_1(tnf_ops_t *ops, tnf_record_p item, tnf_record_p reference) -{ - tnf_ref32_t offset_delta, gen_delta; - tnf_block_header_t *dest_header_p, *src_header_p; - tnf_ref32_t result; - unsigned int offset_shift = - /* LINTED pointer cast may result in improper alignment */ - ((tnf_buf_file_header_t *)tnf_buf)->com.file_log_size; - - dest_header_p = (tnf_block_header_t *) - ((uintptr_t)item & TNF_BLOCK_MASK); - - if (((char *)dest_header_p < (tnf_buf + TNF_DIRECTORY_SIZE)) || - (dest_header_p->generation == TNF_TAG_GENERATION_NUM)) { - /* reference to a permanent block */ - /* LINTED ast from 64-bit integer to 32-bit integer */ - offset_delta = (tnf_ref32_t)(item - tnf_buf); - - return (TNF_REF32_MAKE_PERMANENT(offset_delta)); - } else { - /* reference to a reclaimable block */ - /* LINTED ast from 64-bit integer to 32-bit integer */ - offset_delta = (tnf_ref32_t)(item - reference); - - src_header_p = (tnf_block_header_t *) - ((uintptr_t)reference & TNF_BLOCK_MASK); - gen_delta = dest_header_p->generation - - src_header_p->generation; - - result = (gen_delta << offset_shift) + offset_delta; - return (TNF_REF32_MAKE_RECLAIMABLE(result)); - } -} - -#else - -/*ARGSUSED0*/ -tnf_ref32_t -tnf_ref32_1(tnf_ops_t *ops, tnf_record_p item, tnf_record_p reference) -{ - volatile char *file_start = _tnfw_b_control->tnf_buffer; - tnf_ref32_t offset_delta, gen_delta; - tnf_block_header_t *dest_header_p, *src_header_p; - tnf_ref32_t result; - unsigned int offset_shift = - /* LINTED pointer cast may result in improper alignment */ - ((tnf_buf_file_header_t *)file_start)->com.file_log_size; - - dest_header_p = (tnf_block_header_t *) - ((uintptr_t)item & TNF_BLOCK_MASK); - - if (((char *)dest_header_p < (file_start + TNFW_B_FW_ZONE)) || - (dest_header_p->generation == TNF_TAG_GENERATION_NUM)) { - /* reference to a permanent block */ - /* LINTED ast from 64-bit integer to 32-bit integer */ - offset_delta = (tnf_ref32_t)(item - (tnf_record_p) file_start); - - return (TNF_REF32_MAKE_PERMANENT(offset_delta)); - } else { - /* reference to a reclaimable block */ - /* LINTED ast from 64-bit integer to 32-bit integer */ - offset_delta = (tnf_ref32_t)(item - reference); - - src_header_p = (tnf_block_header_t *) - ((uintptr_t)reference & TNF_BLOCK_MASK); - gen_delta = dest_header_p->generation - - src_header_p->generation; - - result = (gen_delta << offset_shift) + offset_delta; - return (TNF_REF32_MAKE_RECLAIMABLE(result)); - } -} - -#endif - -/* - * Tag descriptors - */ - -/* - * Write instances of tnf_type - */ - -tnf_record_p -tnf_abstract_tag_1(tnf_ops_t *ops, tnf_tag_data_t *tag_data) -{ - tnf_tag_data_t *metatag_data; - tnf_record_p metatag_index; - tnf_type_prototype_t *buffer; - enum tnf_alloc_mode saved_mode; - - saved_mode = ops->mode; - ops->mode = TNF_ALLOC_FIXED; - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ALLOC(ops, sizeof (*buffer), buffer, tag_data->tag_index, - saved_mode); - - metatag_data = TAG_DATA(tnf_type); - metatag_index = metatag_data->tag_index ? metatag_data->tag_index : - metatag_data->tag_desc(ops, metatag_data); - - ASSIGN(buffer, tag, metatag_index); - ASSIGN(buffer, name, tag_data->tag_name); - ASSIGN(buffer, properties, tag_data->tag_props); - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ops->mode = saved_mode; - return (tag_data->tag_index); -} - -/* - * Write instances of tnf_scalar_type - */ - -tnf_record_p -tnf_scalar_tag_1(tnf_ops_t *ops, tnf_tag_data_t *tag_data) -{ - tnf_tag_data_t *metatag_data; - tnf_record_p metatag_index; - enum tnf_alloc_mode saved_mode; - tnf_scalar_type_prototype_t *buffer; - - saved_mode = ops->mode; - ops->mode = TNF_ALLOC_FIXED; - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ALLOC(ops, sizeof (*buffer), buffer, tag_data->tag_index, - saved_mode); - - metatag_data = TAG_DATA(tnf_scalar_type); - metatag_index = metatag_data->tag_index ? metatag_data->tag_index : - metatag_data->tag_desc(ops, metatag_data); - - ASSIGN(buffer, tag, metatag_index); - ASSIGN(buffer, name, tag_data->tag_name); - ASSIGN(buffer, properties, tag_data->tag_props); - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ASSIGN(buffer, type_size, tag_data->tag_size); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(buffer, align, tag_data->tag_align); - - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ops->mode = saved_mode; - return (tag_data->tag_index); -} - -/* - * Write instances of tnf_derived_type - */ - -tnf_record_p -tnf_derived_tag_1(tnf_ops_t *ops, tnf_tag_data_t *tag_data) -{ - tnf_tag_data_t *metatag_data; - tnf_record_p metatag_index; - enum tnf_alloc_mode saved_mode; - tnf_derived_type_prototype_t *buffer; - - saved_mode = ops->mode; - ops->mode = TNF_ALLOC_FIXED; - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ALLOC(ops, sizeof (*buffer), buffer, tag_data->tag_index, - saved_mode); - - metatag_data = TAG_DATA(tnf_derived_type); - metatag_index = metatag_data->tag_index ? metatag_data->tag_index: - metatag_data->tag_desc(ops, metatag_data); - - ASSIGN(buffer, tag, metatag_index); - ASSIGN(buffer, name, tag_data->tag_name); - ASSIGN(buffer, properties, tag_data->tag_props); - ASSIGN(buffer, derived_base, tag_data->tag_base); - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ops->mode = saved_mode; - return (tag_data->tag_index); -} - -/* - * Write instances of tnf_struct_type (except root) - */ - -tnf_record_p -tnf_struct_tag_1(tnf_ops_t *ops, tnf_tag_data_t *tag_data) -{ - tnf_tag_data_t *metatag_data; - tnf_record_p metatag_index; - enum tnf_alloc_mode saved_mode; - tnf_struct_type_prototype_t *buffer; - - saved_mode = ops->mode; - ops->mode = TNF_ALLOC_FIXED; - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ALLOC(ops, sizeof (*buffer), buffer, tag_data->tag_index, - saved_mode); - - metatag_data = TAG_DATA(tnf_struct_type); - metatag_index = metatag_data->tag_index ? metatag_data->tag_index: - metatag_data->tag_desc(ops, metatag_data); - - ASSIGN(buffer, tag, metatag_index); - ASSIGN(buffer, name, tag_data->tag_name); - ASSIGN(buffer, properties, tag_data->tag_props); - ASSIGN(buffer, slot_types, tag_data->tag_slots); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(buffer, type_size, tag_data->tag_size); - ASSIGN(buffer, slot_names, tag_data->tag_slot_names); - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ops->mode = saved_mode; - return (tag_data->tag_index); -} - -/* - * Write instances of tnf_array_type - */ - -tnf_record_p -tnf_array_tag_1(tnf_ops_t *ops, tnf_tag_data_t *tag_data) -{ - tnf_tag_data_t *metatag_data; - tnf_record_p metatag_index; - enum tnf_alloc_mode saved_mode; - tnf_array_type_prototype_t *buffer; - - saved_mode = ops->mode; - ops->mode = TNF_ALLOC_FIXED; - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ALLOC(ops, sizeof (*buffer), buffer, tag_data->tag_index, - saved_mode); - - metatag_data = TAG_DATA(tnf_array_type); - metatag_index = metatag_data->tag_index ? metatag_data->tag_index : - metatag_data->tag_desc(ops, metatag_data); - - ASSIGN(buffer, tag, metatag_index); - ASSIGN(buffer, name, tag_data->tag_name); - ASSIGN(buffer, properties, tag_data->tag_props); - ASSIGN(buffer, slot_types, tag_data->tag_slots); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(buffer, header_size, tag_data->tag_size); - ASSIGN(buffer, element_type, tag_data->tag_base); - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ops->mode = saved_mode; - return (tag_data->tag_index); -} - -/* - * Write the root metatype, and some critical bootstrap types - */ - -static tnf_record_p -tnf_root_tag_1(tnf_ops_t *ops, tnf_tag_data_t *tag_data) -{ - enum tnf_alloc_mode saved_mode; - tnf_tag_t *fw_p; - tnf_struct_type_prototype_t *buffer; - - saved_mode = ops->mode; - ops->mode = TNF_ALLOC_FIXED; - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ALLOC(ops, sizeof (*buffer), buffer, tag_data->tag_index, - saved_mode); - - /* - * update the root forwarding pointer to point to this root - * CAUTION: Do this before anything else... - */ - -#ifdef _KERNEL - /* LINTED pointer cast may result in improper alignment */ - fw_p = (tnf_tag_t *)(tnf_buf + TNF_DIRENT_ROOT); - *fw_p = tnf_ref32(ops, tag_data->tag_index, (tnf_record_p)fw_p); - tag_data->tag_index = (tnf_record_p)fw_p; -#else - /* LINTED pointer cast may result in improper alignment */ - fw_p = (tnf_tag_t *)_tnf_buf_headers_p->fw_root; - if (fw_p) { - *fw_p = tnf_ref32(ops, tag_data->tag_index, - (tnf_record_p) fw_p); - tag_data->tag_index = (tnf_record_p)fw_p; - } -#endif - -#ifdef _KERNEL - /* LINTED constant truncated by assignment */ - buffer->tag = TNF_ROOT_TAG; -#else - ASSIGN(buffer, tag, tag_data->tag_index); /* ROOT */ -#endif - ASSIGN(buffer, name, tag_data->tag_name); - ASSIGN(buffer, properties, tag_data->tag_props); - ASSIGN(buffer, slot_types, tag_data->tag_slots); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(buffer, type_size, tag_data->tag_size); - ASSIGN(buffer, slot_names, tag_data->tag_slot_names); - - /* - * Write some additional bootstrap types - */ - { - static tnf_tag_data_t *bootstrap_types[] = { - &_TAG_DATA(tnf_uint16), - &_TAG_DATA(tnf_int32), - &_TAG_DATA(tnf_tag), - &_TAG_DATA(tnf_file_header), - &_TAG_DATA(tnf_block_header), - 0}; - tnf_tag_data_t **list_p, *tag_p; - - list_p = bootstrap_types; - - while (tag_p = *list_p++) { - if (!tag_p->tag_index) /* not written */ - tag_p->tag_desc(ops, tag_p); - } - } - - - /* - * fix for circularity in filling in file header tag and block - * header tag. REMIND: should also fix tag_index of - * file_header. - */ - -#ifdef _KERNEL - - /* LINTED pointer cast may result in improper alignment */ - fw_p = (tnf_tag_t *)(tnf_buf + TNF_DIRENT_FILE_HEADER); - *fw_p = tnf_ref32(ops, _TAG_DATA(tnf_file_header).tag_index, - (tnf_record_p)fw_p); - - /* LINTED pointer cast may result in improper alignment */ - fw_p = (tnf_tag_t *)(tnf_buf + TNF_DIRENT_BLOCK_HEADER); - *fw_p = tnf_ref32(ops, _TAG_DATA(tnf_block_header).tag_index, - (tnf_record_p)fw_p); - -#else - - /* LINTED pointer cast may result in improper alignment */ - fw_p = (tnf_tag_t *)_tnf_buf_headers_p->fw_file_header; - if (fw_p) { - *fw_p = tnf_ref32(ops, _TAG_DATA(tnf_file_header).tag_index, - (tnf_record_p)fw_p); - } - /* LINTED pointer cast may result in improper alignment */ - fw_p = (tnf_tag_t *)_tnf_buf_headers_p->fw_block_header; - if (fw_p) { - *fw_p = tnf_ref32(ops, _TAG_DATA(tnf_block_header).tag_index, - (tnf_record_p) fw_p); - } - -#endif - - /* LINTED assignment of 32-bit integer to 8-bit integer */ - ops->mode = saved_mode; - return (tag_data->tag_index); -} - - -/* - * Data encoders - */ - -/* - * Strings and derivatives - */ - -tnf_reference_t -tnf_string_1(tnf_ops_t *ops, const char *string, tnf_record_p reference, - tnf_tag_data_t *tag_data) -{ - tnf_record_p tag_index; - size_t string_size, record_size; - tnf_array_header_t *bufhdr; - - tag_index = tag_data->tag_index ? tag_data->tag_index : - tag_data->tag_desc(ops, tag_data); - - if (!string) - return ((tnf_reference_t)TNF_NULL); - - string_size = strlen(string); /* excludes terminating NUL */ - if (string_size > TNF_STRING_LIMIT) - string_size = TNF_STRING_LIMIT; - /* Allocate space for terminating NUL as well */ - record_size = sizeof (*bufhdr) + TNF_STRING_ROUNDUP(string_size + 1); - - ALLOC2(ops, record_size, bufhdr, ops->mode); - - ASSIGN(bufhdr, tag, tag_index); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(bufhdr, self_size, record_size); - -#ifdef _KERNEL - (void) bcopy((caddr_t)string, (char *)bufhdr + sizeof (*bufhdr), - string_size); -#else - (void) memcpy((char *)bufhdr + sizeof (*bufhdr), string, string_size); -#endif - /* NUL-terminate */ - ((char *)bufhdr + sizeof (*bufhdr))[string_size] = '\0'; - - return (tnf_ref32(ops, (tnf_record_p)bufhdr, reference)); -} - -/* - * Array of strings and derivatives - */ - -tnf_reference_t -tnf_string_array_1(tnf_ops_t *ops, char **strings, tnf_record_p reference, - tnf_tag_data_t *tag_data) -{ - tnf_record_p tag_index; - size_t record_size; - char **tmp; - tnf_reference_t *ref_p; - tnf_array_header_t *bufhdr; - - tag_index = tag_data->tag_index ? tag_data->tag_index : - tag_data->tag_desc(ops, tag_data); - - if (!strings) - return ((tnf_reference_t)TNF_NULL); - - record_size = sizeof (*bufhdr); - tmp = strings; - while (*tmp++) - record_size += sizeof (tnf_string_t); - - ALLOC2(ops, record_size, bufhdr, ops->mode); - - ASSIGN(bufhdr, tag, tag_index); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(bufhdr, self_size, record_size); - - tmp = strings; - /* LINTED pointer cast may result in improper alignment */ - ref_p = (tnf_reference_t *)((char *)bufhdr + sizeof (*bufhdr)); - while (*tmp) { - *ref_p = tnf_string(ops, *tmp, (tnf_record_p)ref_p); - tmp++; - ref_p++; - } - - return (tnf_ref32(ops, (tnf_record_p) bufhdr, reference)); -} - -/* - * Type record as generic (not tag) reference - */ - -tnf_reference_t -tnf_tag_element_1(tnf_ops_t *ops, tnf_tag_data_t **tag_data_p, - tnf_record_p reference, tnf_tag_data_t *aux_tag_data) -{ - tnf_tag_data_t *tag_data; - - if (aux_tag_data) - if (!aux_tag_data->tag_index) - aux_tag_data->tag_desc(ops, aux_tag_data); - - /* tnf_derived has derived_base == TNF_NULL */ - if (!tag_data_p) - return ((tnf_reference_t)TNF_NULL); - - tag_data = *tag_data_p; - if (!tag_data->tag_index) - tag_data->tag_desc(ops, tag_data); - - return (tnf_ref32(ops, tag_data->tag_index, reference)); -} - - -/* - * Array of type records as generic (not tag) references - */ - -tnf_reference_t -tnf_tag_array_1(tnf_ops_t *ops, - tnf_tag_data_t ***tag_data_array, - tnf_record_p reference, - tnf_tag_data_t *tag_data) -{ - tnf_record_p tag_index; - size_t record_size; - tnf_array_header_t *bufhdr; - tnf_tag_data_t ***tmp; - tnf_reference_t *ref_p; - - tag_index = tag_data->tag_index ? tag_data->tag_index : - tag_data->tag_desc(ops, tag_data); - - if (!tag_data_array) - return ((tnf_reference_t)TNF_NULL); - - record_size = sizeof (*bufhdr); - tmp = tag_data_array; - while (*tmp++) - record_size += sizeof (tnf_reference_t); - - ALLOC2(ops, record_size, bufhdr, ops->mode); - - ASSIGN(bufhdr, tag, tag_index); - /* LINTED assignment of 64-bit integer to 32-bit integer */ - ASSIGN(bufhdr, self_size, record_size); - - tmp = tag_data_array; - /* LINTED pointer cast may result in improper alignment */ - ref_p = (tnf_reference_t *)((char *)bufhdr + sizeof (*bufhdr)); - while (*tmp) { - *ref_p = tnf_tag_element_1(ops, *tmp, (tnf_record_p)ref_p, - TNF_NULL); - tmp++; - ref_p++; - } - - return (tnf_ref32(ops, (tnf_record_p)bufhdr, reference)); -} - -/* - * Array of properties (type records) - */ - -tnf_reference_t -tnf_tag_properties_1(tnf_ops_t *ops, - tnf_tag_data_t ****tag_data_array, - tnf_record_p reference, - tnf_tag_data_t *tag_data) -{ - if (!(tag_data->tag_index)) - tag_data->tag_desc(ops, tag_data); - - if (!tag_data_array) - return ((tnf_reference_t)TNF_NULL); - - return (tnf_tag_array_1(ops, *tag_data_array, reference, tag_data)); -} - -#ifdef _KERNEL -/* - * Initialize all core tag pointers defined in this file. - * CAUTION: tnf_tag_core_init is a function for kernel compilation. - */ - -void -tnf_tag_core_init(void) -{ -#endif - TAG_SET(tnf_inline); - TAG_SET(tnf_tagged); - - TAG_SET(tnf_scalar); - TAG_SET(tnf_char); - TAG_SET(tnf_int8); - TAG_SET(tnf_uint8); - TAG_SET(tnf_int16); - TAG_SET(tnf_uint16); - TAG_SET(tnf_int32); - TAG_SET(tnf_uint32); - TAG_SET(tnf_int64); - TAG_SET(tnf_uint64); - - TAG_SET(tnf_float32); - TAG_SET(tnf_float64); - - TAG_SET(tnf_array); - TAG_SET(tnf_string); - TAG_SET(tnf_type_array); - TAG_SET(tnf_name_array); - - TAG_SET(tnf_derived); - TAG_SET(tnf_align); - TAG_SET(tnf_derived_base); - TAG_SET(tnf_element_type); - TAG_SET(tnf_header_size); - TAG_SET(tnf_name); - TAG_SET(tnf_opaque); - TAG_SET(tnf_properties); - TAG_SET(tnf_self_size); - TAG_SET(tnf_size); - TAG_SET(tnf_slot_names); - TAG_SET(tnf_slot_types); - TAG_SET(tnf_tag); - TAG_SET(tnf_tag_arg); - TAG_SET(tnf_type_size); - - TAG_SET(tnf_struct); - TAG_SET(tnf_file_header); - TAG_SET(tnf_block_header); - - TAG_SET(tnf_type); - TAG_SET(tnf_array_type); - TAG_SET(tnf_derived_type); - TAG_SET(tnf_scalar_type); - TAG_SET(tnf_struct_type); - -#ifdef _KERNEL - - /* Snap exported properties */ - tnf_user_struct_properties = std_struct_properties; - -} - -#else /* _KERNEL */ - -tnf_tag_data_t ***tnf_user_struct_properties = std_struct_properties; - -#endif /* _KERNEL */ diff --git a/usr/src/uts/common/tnf/trace_funcs.c b/usr/src/uts/common/tnf/trace_funcs.c deleted file mode 100644 index 96b3e8eed5..0000000000 --- a/usr/src/uts/common/tnf/trace_funcs.c +++ /dev/null @@ -1,342 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1994, by Sun Microsytems, Inc. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * Includes - */ -#include <sys/param.h> -#include <sys/time.h> -#include <sys/debug.h> -#include <sys/cmn_err.h> -#include <sys/tnf.h> - -#include "tnf_buf.h" -#include "tnf_types.h" -#include "tnf_trace.h" - -/* - * Defines - */ - -#define ENCODED_TAG(tag, tagarg) \ - ((tag) | ((tagarg) & 0xfffc) | TNF_REF32_T_PAIR) - -/* - * CAUTION: halfword_accessible assumes that the pointer is to a reclaimable - * block - i.e. negative offsets have a 0 in high bit - */ -#define HALFWORD_ACCESSIBLE(x) \ - ((((x) & 0xffff8000) == 0) || (((x) & 0xffff8000) == 0x7fff8000)) - -/* - * Check that x can be encoded in tagarg slot - * Same as above, but operates on ints (no space bit) - */ -#define TAGARG_CHECK(x) \ - (((x) < 32767) && ((x) > -32768)) - -/* - * Check that hit 32 bits of hrtime are zero - */ -#define TIME_CHECK(x) \ - (((x) >> 32) == 0) - -/* - * CAUTION: Use the following macro only when doing a self relative pointer - * to a target in the same block - */ -#define PTR_DIFF(item, ref) \ - ((tnf_ref32_t)((tnf_record_p)(item) - (tnf_record_p)(ref))) - -/* - * Typedefs - */ - -typedef struct { - tnf_probe_event_t probe_event; - tnf_time_delta_t time_delta; -} probe_event_prototype_t; - -/* - * Declarations - */ - -/* - * tnf_trace_alloc - * the probe allocation function - */ - -void * -tnf_trace_alloc(tnf_ops_t *ops, tnf_probe_control_t *probe_p, - tnf_probe_setup_t *set_p) -{ - TNFW_B_WCB *wcb; - uintptr_t probe_index; - tnf_record_p sched_record_p; - tnf_reference_t sched_offset, tag_disp; - tnf_block_header_t *block; - tnf_uint32_t shift; - probe_event_prototype_t *buffer; - hrtime_t curr_time, time_diff; - tnf_schedule_t *sched; - tnf_ref32_t *fwd_p; - size_t size, asize; - - /* - * Check the "tracing active" flag after setting the busy bit; - * this avoids a race in which we check the "tracing active" - * flag, then it gets turned off, and the buffer gets - * deallocated, before we've set the busy bit. - */ - if (!lock_try(&ops->busy)) /* atomic op flushes WB */ - return (NULL); - if (!tnf_tracing_active) - goto null_ret; - - /* - * Write probe tag if needed - */ - probe_index = probe_p->index; - if (probe_index == 0) { - if ((probe_index = tnf_probe_tag(ops, probe_p)) == 0) - goto null_ret; - } - - /* - * Determine how much memory is required - */ - size = probe_p->tnf_event_size; - asize = size + sizeof (tnf_ref32_t); /* one fwd ptr */ - - if (PROBE_IS_FILE_PTR(probe_index)) - /* common case - probe_index is a file ptr */ - /* LINTED assignment of 64-bit integer to 32-bit integer */ - tag_disp = probe_index & PROBE_INDEX_LOW_MASK; - else - /* rare case -- get an extra fwd ptr */ - asize += sizeof (tnf_ref32_t); - - /* - * Allocate memory - */ - wcb = &ops->wcb; - /* LINTED assignment of 64-bit integer to 16-bit integer */ - TNFW_B_ALLOC(wcb, asize, buffer, probe_event_prototype_t *); - if (buffer == NULL) - goto null_ret; - - /* LINTED pointer cast may result in improper alignment */ - fwd_p = (tnf_ref32_t *)((char *)buffer + size); - - /* - * Check if the probe tag needs more work - */ - if (!PROBE_IS_FILE_PTR(probe_index)) { - /* use up first fwd ptr */ - /* LINTED assignment of 64-bit integer to 32-bit integer */ - *fwd_p = TNF_REF32_MAKE_PERMANENT( - (tnf_record_p)probe_index - tnf_buf); - /* LINTED cast from 64-bit integer to 32-bit integer */ - tag_disp = PTR_DIFF(fwd_p, buffer); - tag_disp |= TNF_TAG16_T_REL; - tag_disp = tag_disp << TNF_REF32_TAG16_SHIFT; - fwd_p++; - } - - /* - * Get timestamp - */ - curr_time = gethrtime(); - - /* - * Write schedule record if needed - */ - sched = &ops->schedule; - - /* LINTED pointer cast */ - shift = ((tnf_buf_file_header_t *)tnf_buf)->com.file_log_size; - block = (tnf_block_header_t *)((uintptr_t)buffer & TNF_BLOCK_MASK); - - if ((sched_record_p = sched->record_p) == NULL) - /* No record written yet */ - goto new_schedule; - - /* - * Note: Don't bother about space bit here, because we'll - * only use bits 15:2 anyway - */ -#if defined(_LP64) - /* LINTED assignment of 64-bit integer to 32-bit integer */ - sched_offset = ((sched->record_gen - block->generation) << shift) + - (sched_record_p - (caddr_t)buffer); -#else - sched_offset = ((sched->record_gen - block->generation) << shift) + - (sched_record_p - (caddr_t)buffer); -#endif - if (!TAGARG_CHECK(sched_offset)) - /* Record too far away to reference */ - goto new_schedule; - - time_diff = curr_time - sched->time_base; - if (!TIME_CHECK(time_diff)) - /* Time delta can't fit in 32 bits */ - goto new_schedule; - - if (sched->cpuid != CPU->cpu_id) - /* CPU information is invalid */ - goto new_schedule; - - /* - * Can reuse existing schedule record - * Since we did not allocate any more space, can giveback - */ -#if defined(_LP64) - /* LINTED warning: assignment of 64-bit integer to 16-bit integer */ - TNFW_B_GIVEBACK(wcb, fwd_p); -#else - TNFW_B_GIVEBACK(wcb, fwd_p); -#endif - -good_ret: - /* - * Store return params and two common event members, return buffer - */ - set_p->tpd_p = ops; - set_p->buffer_p = buffer; - set_p->probe_p = probe_p; - buffer->probe_event = ENCODED_TAG(tag_disp, sched_offset); -#if defined(_LP64) - /* LINTED assignment of 64-bit integer to 32-bit integer */ - buffer->time_delta = tnf_time_delta(ops, (unsigned long)time_diff, - &buffer->probe_time_delta); -#else - buffer->time_delta = tnf_time_delta(ops, (unsigned long)time_diff, - &buffer->probe_time_delta); -#endif - return (buffer); - -new_schedule: - /* - * Write a new schedule record for this thread - */ - sched->cpuid = CPU->cpu_id; - sched->time_base = curr_time; - time_diff = 0; - if ((sched_record_p = tnf_kernel_schedule(ops, sched)) != NULL) { - /* use one of the extra alloced words for the forwarding ptr */ -#if defined(_LP64) - /* LINTED assignment of 64-bit integer to 32-bit integer */ - *fwd_p = TNF_REF32_MAKE_RECLAIMABLE( - ((sched->record_gen - block->generation) << shift) + - /* LINTED */ - (sched_record_p - (tnf_record_p)fwd_p)); - /* LINTED cast from 64-bit integer to 32-bit integer */ - sched_offset = PTR_DIFF(fwd_p, buffer); -#else - *fwd_p = TNF_REF32_MAKE_RECLAIMABLE( - ((sched->record_gen - block->generation) << shift) + - (sched_record_p - (tnf_record_p)fwd_p)); - sched_offset = PTR_DIFF(fwd_p, buffer); -#endif - } else { - /* Allocation failed (tracing may have been stopped) */ - sched_offset = 0; - *fwd_p = TNF_NULL; - } - goto good_ret; - -null_ret: - /* - * Clear busy flag and return null - */ - LOCK_INIT_CLEAR(&ops->busy); /* XXX save a call */ - return (NULL); -} - -/* - * tnf_trace_commit - */ -void -tnf_trace_commit(tnf_probe_setup_t *set_p) -{ - tnf_ops_t *ops; - TNFW_B_WCB *wcb; - TNFW_B_POS *pos; - - ops = set_p->tpd_p; - wcb = &ops->wcb; - - /* commit reusable bytes */ - pos = &wcb->tnfw_w_pos; - TNFW_B_COMMIT(pos); - - /* commit tag bytes */ - pos = &wcb->tnfw_w_tag_pos; - TNFW_B_COMMIT(pos); - - /* clear busy flag */ - LOCK_INIT_CLEAR(&ops->busy); /* XXX save a call */ -} - -/* - * tnf_trace_rollback - */ -void -tnf_trace_rollback(tnf_probe_setup_t *set_p) -{ - tnf_ops_t *ops; - TNFW_B_WCB *wcb; - TNFW_B_POS *pos; - - ops = set_p->tpd_p; - wcb = &ops->wcb; - - /* rollback data bytes */ - pos = &wcb->tnfw_w_pos; - TNFW_B_ROLLBACK(pos); - - /* commit tag bytes */ - pos = &wcb->tnfw_w_tag_pos; - TNFW_B_COMMIT(pos); - - /* zap schedule record, since it is in uncommitted store */ - ops->schedule.record_p = NULL; - - /* clear busy flag */ - LOCK_INIT_CLEAR(&ops->busy); /* XXX save a call */ -} - -/* - * tnf_allocate - * exported interface for allocating trace memory - */ - -void * -tnf_allocate(tnf_ops_t *ops, size_t size) -{ - return (tnfw_b_alloc(&ops->wcb, size, ops->mode)); -} diff --git a/usr/src/uts/common/tnf/trace_init.c b/usr/src/uts/common/tnf/trace_init.c deleted file mode 100644 index 17b98a4e23..0000000000 --- a/usr/src/uts/common/tnf/trace_init.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 1994-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * Includes - */ - -#include <sys/types.h> -#include <sys/param.h> -#include <sys/debug.h> -#include <sys/tnf.h> -#include <sys/thread.h> -#include <sys/dtrace.h> - -#include "tnf_buf.h" -#include "tnf_types.h" -#include "tnf_trace.h" - -#ifndef NPROBE - -/* - * Globals - */ - -size_t tnf_trace_file_size = TNF_TRACE_FILE_DEFAULT; - -/* - * tnf_trace_on - */ -void -tnf_trace_on(void) -{ - TNFW_B_UNSET_STOPPED(tnfw_b_state); - tnf_tracing_active = 1; - dtrace_vtime_enable_tnf(); - /* Enable system call tracing for all processes */ - set_all_proc_sys(); -} - -/* - * tnf_trace_off - */ -void -tnf_trace_off(void) -{ - TNFW_B_SET_STOPPED(tnfw_b_state); - dtrace_vtime_disable_tnf(); - tnf_tracing_active = 0; - /* System call tracing is automatically disabled */ -} - -/* - * tnf_trace_init - * Not reentrant: only called from tnf_allocbuf(), which is - * single-threaded. - */ -void -tnf_trace_init(void) -{ - int stopped; - tnf_ops_t *ops; - - ASSERT(tnf_buf != NULL); - ASSERT(!tnf_tracing_active); - - stopped = tnfw_b_state & TNFW_B_STOPPED; - - /* - * Initialize the buffer - */ - tnfw_b_init_buffer(tnf_buf, tnf_trace_file_size); - - /* - * Mark allocator running (not stopped). Luckily, - * tnf_trace_alloc() first checks tnf_tracing_active, so no - * trace data will be written. - */ - tnfw_b_state = TNFW_B_RUNNING; - - /* - * 1195835: Write out some tags now. The stopped bit needs - * to be clear while we do this. - */ - /* LINTED pointer cast may result in improper alignment */ - if ((ops = (tnf_ops_t *)curthread->t_tnf_tpdp) != NULL) { - tnf_tag_data_t *tag; - TNFW_B_POS *pos; - - ASSERT(!LOCK_HELD(&ops->busy)); - LOCK_INIT_HELD(&ops->busy); /* XXX save a call */ - - tag = TAG_DATA(tnf_struct_type); - (void) tag->tag_desc(ops, tag); - tag = TAG_DATA(tnf_probe_type); - (void) tag->tag_desc(ops, tag); - tag = TAG_DATA(tnf_kernel_schedule); - (void) tag->tag_desc(ops, tag); - - pos = &ops->wcb.tnfw_w_tag_pos; - TNFW_B_COMMIT(pos); - pos = &ops->wcb.tnfw_w_pos; - TNFW_B_ROLLBACK(pos); - - LOCK_INIT_CLEAR(&ops->busy); /* XXX save a call */ - } - - /* Restore stopped bit */ - tnfw_b_state |= stopped; -} - -#endif /* NPROBE */ diff --git a/usr/src/uts/common/vm/seg_spt.c b/usr/src/uts/common/vm/seg_spt.c index 1308935159..945bce54b3 100644 --- a/usr/src/uts/common/vm/seg_spt.c +++ b/usr/src/uts/common/vm/seg_spt.c @@ -49,7 +49,6 @@ #include <sys/vmsystm.h> #include <sys/policy.h> #include <sys/project.h> -#include <sys/tnf_probe.h> #include <sys/zone.h> #define SEGSPTADDR (caddr_t)0x0 @@ -344,10 +343,6 @@ sptcreate(size_t size, struct seg **sptseg, struct anon_map *amp, struct as *newas; struct segspt_crargs sptcargs; -#ifdef DEBUG - TNF_PROBE_1(sptcreate, "spt", /* CSTYLED */, - tnf_ulong, size, size ); -#endif if (segspt_minfree == 0) spt_setminfree(); @@ -379,9 +374,6 @@ void sptdestroy(struct as *as, struct anon_map *amp) { -#ifdef DEBUG - TNF_PROBE_0(sptdestroy, "spt", /* CSTYLED */); -#endif (void) as_unmap(as, SEGSPTADDR, amp->size); as_free(as); } @@ -553,10 +545,6 @@ segspt_create(struct seg **segpp, void *argsp) ASSERT(seg->s_as && AS_WRITE_HELD(seg->s_as)); ASSERT(sp != NULL); -#ifdef DEBUG - TNF_PROBE_2(segspt_create, "spt", /* CSTYLED */, - tnf_opaque, addr, addr, tnf_ulong, len, seg->s_size); -#endif if ((sptcargs->flags & SHM_PAGEABLE) == 0) { if (err = anon_swap_adjust(npages)) return (err); diff --git a/usr/src/uts/common/vm/vm_anon.c b/usr/src/uts/common/vm/vm_anon.c index 6785e6b4dd..e101860bf4 100644 --- a/usr/src/uts/common/vm/vm_anon.c +++ b/usr/src/uts/common/vm/vm_anon.c @@ -107,7 +107,6 @@ #include <sys/tuneable.h> #include <sys/debug.h> #include <sys/fs/swapnode.h> -#include <sys/tnf_probe.h> #include <sys/lgrp.h> #include <sys/policy.h> #include <sys/condvar_impl.h> @@ -2419,10 +2418,6 @@ anon_private( CPU_STATS_ADD_K(vm, cow_fault, 1); - /* Kernel probe */ - TNF_PROBE_1(anon_private, "vm pagefault", /* CSTYLED */, - tnf_opaque, address, addr); - *app = new = anon_alloc(NULL, 0); swap_xlate(new, &vp, &off); @@ -2802,10 +2797,6 @@ anon_zero(struct seg *seg, caddr_t addr, struct anon **app, struct cred *cred) page_t *anon_pl[1 + 1]; int err; - /* Kernel probe */ - TNF_PROBE_1(anon_zero, "vm pagefault", /* CSTYLED */, - tnf_opaque, address, addr); - *app = ap = anon_alloc(NULL, 0); swap_xlate(ap, &vp, &off); diff --git a/usr/src/uts/common/vm/vm_as.c b/usr/src/uts/common/vm/vm_as.c index 1871eb9c0e..24e03795e6 100644 --- a/usr/src/uts/common/vm/vm_as.c +++ b/usr/src/uts/common/vm/vm_as.c @@ -56,7 +56,6 @@ #include <sys/vmsystm.h> #include <sys/cmn_err.h> #include <sys/debug.h> -#include <sys/tnf_probe.h> #include <sys/vtrace.h> #include <sys/ddi.h> @@ -879,12 +878,6 @@ retry: break; } - /* Kernel probe */ - TNF_PROBE_3(address_fault, "vm pagefault", /* CSTYLED */, - tnf_opaque, address, addr, - tnf_fault_type, fault_type, type, - tnf_seg_access, access, rw); - raddr = (caddr_t)((uintptr_t)addr & (uintptr_t)PAGEMASK); rsize = (((size_t)(addr + size) + PAGEOFFSET) & PAGEMASK) - (size_t)raddr; diff --git a/usr/src/uts/common/vm/vm_page.c b/usr/src/uts/common/vm/vm_page.c index e603d32dd9..cb99a6b92b 100644 --- a/usr/src/uts/common/vm/vm_page.c +++ b/usr/src/uts/common/vm/vm_page.c @@ -59,7 +59,6 @@ #include <sys/cpuvar.h> #include <sys/callb.h> #include <sys/debug.h> -#include <sys/tnf_probe.h> #include <sys/condvar_impl.h> #include <sys/mem_config.h> #include <sys/mem_cage.h> @@ -3572,11 +3571,6 @@ page_hashout(page_t *pp, kmutex_t *phm) TRACE_2(TR_FAC_VM, TR_PAGE_HASHOUT, "page_hashout:pp %p vp %p", pp, vp); - /* Kernel probe */ - TNF_PROBE_2(page_unmap, "vm pagefault", /* CSTYLED */, - tnf_opaque, vnode, vp, - tnf_offset, offset, pp->p_offset); - /* * */ diff --git a/usr/src/uts/common/vm/vm_pvn.c b/usr/src/uts/common/vm/vm_pvn.c index a206320a30..db8b86d6e6 100644 --- a/usr/src/uts/common/vm/vm_pvn.c +++ b/usr/src/uts/common/vm/vm_pvn.c @@ -61,7 +61,6 @@ #include <sys/debug.h> #include <sys/cpuvar.h> #include <sys/vtrace.h> -#include <sys/tnf_probe.h> #include <vm/hat.h> #include <vm/as.h> @@ -571,13 +570,6 @@ pvn_write_done(page_t *plist, int flags) CPU_STATS_ADDQ(cpup, vm, execpgout, execpgout); CPU_STATS_ADDQ(cpup, vm, execfree, execfree); CPU_STATS_EXIT_K(); - - /* Kernel probe */ - TNF_PROBE_4(pageout, "vm pageio io", /* CSTYLED */, - tnf_opaque, vnode, vp, - tnf_ulong, pages_pageout, pgpgout, - tnf_ulong, pages_freed, dfree, - tnf_ulong, pages_reclaimed, pgrec); } /* |