Print this page
8368 remove warlock leftovers from usr/src/uts
*** 97,107 ****
/* initialize the FMA retry loop */
hermon_pio_init(fm_loop_cnt, fm_status, fm_test_num);
ASSERT(MUTEX_HELD(&qp->qp_sq_lock));
- _NOTE(LOCK_RELEASED_AS_SIDE_EFFECT(&qp->qp_sq_lock))
/* Grab the lock for the WRID list */
membar_consumer();
/* Save away some initial QP state */
--- 97,106 ----
*** 454,464 ****
/* initialize the FMA retry loop */
hermon_pio_init(fm_loop_cnt, fm_status, fm_test_num);
ASSERT(MUTEX_HELD(&qp->qp_sq_lock));
- _NOTE(LOCK_RELEASED_AS_SIDE_EFFECT(&qp->qp_sq_lock))
/* Save away some initial QP state */
wq = qp->qp_sq_wqhdr;
qsize_msk = wq->wq_mask;
hdrmwqes = qp->qp_sq_hdrmwqes; /* in WQEs */
--- 453,462 ----
*** 2218,2238 ****
hermon_workq_hdr_t *swq, *rwq;
if (qp->qp_alloc_flags & IBT_QP_USER_MAP)
return (DDI_SUCCESS);
- #ifdef __lock_lint
- mutex_enter(&qp->qp_rq_cqhdl->cq_lock);
- mutex_enter(&qp->qp_sq_cqhdl->cq_lock);
- #else
/* grab the cq lock(s) to modify the wqavl tree */
if (qp->qp_rq_cqhdl)
mutex_enter(&qp->qp_rq_cqhdl->cq_lock);
if (qp->qp_rq_cqhdl != qp->qp_sq_cqhdl &&
qp->qp_sq_cqhdl != NULL)
mutex_enter(&qp->qp_sq_cqhdl->cq_lock);
- #endif
/* Chain the newly allocated work queue header to the CQ's list */
if (qp->qp_sq_cqhdl)
hermon_cq_workq_add(qp->qp_sq_cqhdl, &qp->qp_sq_wqavl);
--- 2216,2231 ----
*** 2246,2288 ****
* or shared receive work queue.
*
* Note: We still use the 'qp_rq_cqhdl' even in the SRQ case.
*/
- #ifdef __lock_lint
- mutex_enter(&qp->qp_srqhdl->srq_lock);
- #else
if (qp->qp_alloc_flags & IBT_QP_USES_SRQ) {
mutex_enter(&qp->qp_srqhdl->srq_lock);
} else {
rwq = qp->qp_rq_wqhdr;
rwq->wq_head = 0;
rwq->wq_tail = 0;
rwq->wq_full = 0;
qp->qp_rq_wqecntr = 0;
}
- #endif
hermon_cq_workq_add(qp->qp_rq_cqhdl, &qp->qp_rq_wqavl);
- #ifdef __lock_lint
- mutex_exit(&qp->qp_srqhdl->srq_lock);
- #else
if (qp->qp_alloc_flags & IBT_QP_USES_SRQ) {
mutex_exit(&qp->qp_srqhdl->srq_lock);
}
- #endif
- #ifdef __lock_lint
- mutex_exit(&qp->qp_sq_cqhdl->cq_lock);
- mutex_exit(&qp->qp_rq_cqhdl->cq_lock);
- #else
if (qp->qp_rq_cqhdl != qp->qp_sq_cqhdl &&
qp->qp_sq_cqhdl != NULL)
mutex_exit(&qp->qp_sq_cqhdl->cq_lock);
if (qp->qp_rq_cqhdl)
mutex_exit(&qp->qp_rq_cqhdl->cq_lock);
- #endif
return (DDI_SUCCESS);
}
/*
--- 2239,2268 ----
*** 2298,2353 ****
/*
* If there are unpolled entries in these CQs, they are
* polled/flushed.
* Grab the CQ lock(s) before manipulating the lists.
*/
- #ifdef __lock_lint
- mutex_enter(&qp->qp_rq_cqhdl->cq_lock);
- mutex_enter(&qp->qp_sq_cqhdl->cq_lock);
- #else
/* grab the cq lock(s) to modify the wqavl tree */
if (qp->qp_rq_cqhdl)
mutex_enter(&qp->qp_rq_cqhdl->cq_lock);
if (qp->qp_rq_cqhdl != qp->qp_sq_cqhdl &&
qp->qp_sq_cqhdl != NULL)
mutex_enter(&qp->qp_sq_cqhdl->cq_lock);
- #endif
- #ifdef __lock_lint
- mutex_enter(&qp->qp_srqhdl->srq_lock);
- #else
if (qp->qp_alloc_flags & IBT_QP_USES_SRQ) {
mutex_enter(&qp->qp_srqhdl->srq_lock);
}
- #endif
/*
* Flush the entries on the CQ for this QP's QPN.
*/
hermon_cq_entries_flush(state, qp);
- #ifdef __lock_lint
- mutex_exit(&qp->qp_srqhdl->srq_lock);
- #else
if (qp->qp_alloc_flags & IBT_QP_USES_SRQ) {
mutex_exit(&qp->qp_srqhdl->srq_lock);
}
- #endif
hermon_cq_workq_remove(qp->qp_rq_cqhdl, &qp->qp_rq_wqavl);
if (qp->qp_sq_cqhdl != NULL)
hermon_cq_workq_remove(qp->qp_sq_cqhdl, &qp->qp_sq_wqavl);
- #ifdef __lock_lint
- mutex_exit(&qp->qp_sq_cqhdl->cq_lock);
- mutex_exit(&qp->qp_rq_cqhdl->cq_lock);
- #else
if (qp->qp_rq_cqhdl != qp->qp_sq_cqhdl &&
qp->qp_sq_cqhdl != NULL)
mutex_exit(&qp->qp_sq_cqhdl->cq_lock);
if (qp->qp_rq_cqhdl)
mutex_exit(&qp->qp_rq_cqhdl->cq_lock);
- #endif
return (IBT_SUCCESS);
}
--- 2278,2315 ----
*** 2444,2456 ****
* create a new entry because it helps us easily find the end of the
* list.
*/
cmp.cmp_qpn = qpn;
cmp.cmp_type = wq_type;
- #ifdef __lock_lint
- hermon_wrid_workq_compare(NULL, NULL);
- #endif
curr = avl_find(&cq->cq_wrid_wqhdr_avl_tree, &cmp, NULL);
return (curr);
}
--- 2406,2415 ----
*** 2470,2480 ****
*/
wqhdr = (hermon_workq_hdr_t *)kmem_zalloc(sizeof (*wqhdr), KM_NOSLEEP);
if (wqhdr == NULL) {
return (NULL);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*wqhdr))
wqhdr->wq_wrid = kmem_zalloc(bufsz * sizeof (uint64_t), KM_NOSLEEP);
if (wqhdr->wq_wrid == NULL) {
kmem_free(wqhdr, sizeof (*wqhdr));
return (NULL);
}
--- 2429,2438 ----
*** 2502,2514 ****
hermon_workq_compare_t cmp;
avl_index_t where;
cmp.cmp_qpn = wqavl->wqa_qpn;
cmp.cmp_type = wqavl->wqa_type;
- #ifdef __lock_lint
- hermon_wrid_workq_compare(NULL, NULL);
- #endif
(void) avl_find(&cq->cq_wrid_wqhdr_avl_tree, &cmp, &where);
avl_insert(&cq->cq_wrid_wqhdr_avl_tree, wqavl, where);
}
--- 2460,2469 ----
*** 2517,2526 ****
* Context: Can be called from interrupt or base context.
*/
static void
hermon_cq_workq_remove(hermon_cqhdl_t cq, hermon_workq_avl_t *wqavl)
{
- #ifdef __lock_lint
- hermon_wrid_workq_compare(NULL, NULL);
- #endif
avl_remove(&cq->cq_wrid_wqhdr_avl_tree, wqavl);
}
--- 2472,2478 ----