8368 remove warlock leftovers from usr/src/uts

@@ -76,12 +76,10 @@
         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

@@ -141,11 +139,10 @@
                 TAVOR_TNF_FAIL(IBT_INSUFF_RESOURCE, "failed SRQ handle");
                 goto srqalloc_fail2;
         }
 
         srq = (tavor_srqhdl_t)rsrc->tr_addr;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*srq))
 
         srq->srq_srqnum = srqc->tr_indx;        /* just use index */
 
         /*
          * If this will be a user-mappable SRQ, then allocate an entry for

@@ -255,11 +252,10 @@
                 /* 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;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*buf))
 
         /*
          * Register the memory for the SRQ work queues.  The memory for the SRQ
          * must be registered in the Tavor TPT tables.  This gives us the LKey
          * to specify in the SRQ context later.  Note: If the work queue is to

@@ -299,11 +295,10 @@
         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))
         addr = mr->mr_bindinfo.bi_addr;
         lkey = mr->mr_lkey;
 
         /*
          * Calculate the offset between the kernel virtual address space

@@ -320,19 +315,17 @@
         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)))
 
         srq->srq_wridlist->wl_srq_en = 1;
         srq->srq_wridlist->wl_free_list_indx = -1;
 
         /*

@@ -558,12 +551,10 @@
          * number has been freed.
          */
         state->ts_srqhdl[srqc->tr_indx] = NULL;
 
         mutex_exit(&srq->srq_lock);
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*srq));
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*srq->srq_wridlist));
 
         /*
          * Reclaim SRQC entry from hardware (using the Tavor HW2SW_SRQ
          * firmware command).  If the ownership transfer fails for any reason,
          * then it is an indication that something (either in HW or SW) has

@@ -727,11 +718,10 @@
                 /* 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;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*buf))
 
         /*
          * Allocate the memory for the new WRE list.  This will be used later
          * when we resize the wridlist based on the new SRQ size.
          */

@@ -750,11 +740,10 @@
          * "addr" binding (as is the case here) and a "buf" binding (see
          * below).  The "bind" struct is later passed to tavor_mr_mem_bind()
          * which does most of the "heavy lifting" for the Tavor memory
          * registration routines.
          */
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(bind))
         bzero(&bind, sizeof (tavor_bind_info_t));
         bind.bi_type  = TAVOR_BINDHDL_VADDR;
         bind.bi_addr  = (uint64_t)(uintptr_t)buf;
         bind.bi_len   = new_srqinfo.qa_size;
         bind.bi_as    = NULL;

@@ -897,17 +886,13 @@
 
         /* Update MR mtt pagesize */
         mr->mr_logmttpgsz = mtt_pgsize_bits;
         mutex_exit(&mr->mr_lock);
 
-#ifdef __lock_lint
-        mutex_enter(&srq->srq_wrid_wql->wql_lock);
-#else
         if (srq->srq_wrid_wql != NULL) {
                 mutex_enter(&srq->srq_wrid_wql->wql_lock);
         }
-#endif
 
         /*
          * Initialize new wridlist, if needed.
          *
          * If a wridlist already is setup on an SRQ (the QP associated with an

@@ -931,17 +916,13 @@
                         tavor_wrid_list_srq_init(srq->srq_wridlist, srq,
                             srq_old_bufsz);
                 }
         }
 
-#ifdef __lock_lint
-        mutex_exit(&srq->srq_wrid_wql->wql_lock);
-#else
         if (srq->srq_wrid_wql != NULL) {
                 mutex_exit(&srq->srq_wrid_wql->wql_lock);
         }
-#endif
 
         /*
          * If "old" SRQ was a user-mappable SRQ that is currently mmap()'d out
          * to a user process, then we need to call devmap_devmem_remap() to
          * invalidate the mapping to the SRQ memory.  We also need to