Print this page
8368 remove warlock leftovers from usr/src/uts
@@ -510,18 +510,16 @@
status = hermon_rsrc_alloc(state, HERMON_AHHDL, 1, sleepflag, &rsrc);
if (status != DDI_SUCCESS) {
return (IBT_INSUFF_RESOURCE);
}
ah = (hermon_ahhdl_t)rsrc->hr_addr;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ah))
/* Increment the reference count on the protection domain (PD) */
hermon_pd_refcnt_inc(pd);
udav = (hermon_hw_udav_t *)kmem_zalloc(sizeof (hermon_hw_udav_t),
KM_SLEEP);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*udav))
/*
* Fill in the UDAV data. We first zero out the UDAV, then populate
* it by then calling hermon_set_addr_path() to fill in the common
* portions that can be pulled from the "ibt_adds_vect_t" passed in
@@ -575,11 +573,10 @@
ah = *ahhdl;
mutex_enter(&ah->ah_lock);
rsrc = ah->ah_rsrcp;
pd = ah->ah_pdhdl;
mutex_exit(&ah->ah_lock);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ah))
/* Free the UDAV memory */
kmem_free(ah->ah_udav, sizeof (hermon_hw_udav_t));
/* Decrement the reference count on the protection domain (PD) */
@@ -603,11 +600,10 @@
int
hermon_ah_query(hermon_state_t *state, hermon_ahhdl_t ah, hermon_pdhdl_t *pd,
ibt_adds_vect_t *attr_p)
{
mutex_enter(&ah->ah_lock);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p))
/*
* Pull the PD and UDAV from the Hermon Address Handle structure
*/
*pd = ah->ah_pdhdl;
@@ -670,11 +666,10 @@
if (status != DDI_SUCCESS) {
mutex_exit(&ah->ah_lock);
return (status);
}
ah->ah_save_guid = attr_p->av_dgid.gid_guid;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*(ah->ah_udav)))
ah->ah_udav->sl = attr_p->av_srvl;
/*
* Copy changes into the new UDAV.
* Note: We copy in 64-bit chunks. For the first two of these
@@ -1817,11 +1812,10 @@
status = hermon_rsrc_alloc(state, HERMON_PDHDL, 1, sleepflag, &rsrc);
if (status != DDI_SUCCESS) {
return (IBT_INSUFF_RESOURCE);
}
pd = (hermon_pdhdl_t)rsrc->hr_addr;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pd))
pd->pd_refcnt = 0;
*pdhdl = pd;
return (DDI_SUCCESS);
@@ -1842,11 +1836,10 @@
* Pull all the necessary information from the Hermon Protection Domain
* handle. This is necessary here because the resource for the
* PD is going to be freed up as part of this operation.
*/
pd = *pdhdl;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pd))
rsrc = pd->pd_rsrcp;
/*
* Check the PD reference count. If the reference count is non-zero,
* then it means that this protection domain is still referenced by
@@ -1906,13 +1899,10 @@
uint_t sgid_max, pkey_max, tbl_size;
int i, j, indx, status;
ib_pkey_t *pkeyp;
ib_guid_t *guidp;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pi))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*state))
-
/* Validate that specified port number is legal */
if (!hermon_portnum_is_valid(state, port)) {
return (IBT_HCA_PORT_INVALID);
}
pkeyp = state->hs_pkey[port - 1];
@@ -2006,11 +1996,10 @@
/* Figure out how many of the entries are valid */
sgid_max = min((pi->p_sgid_tbl_sz - i), 8);
for (j = 0; j < sgid_max; j++) {
indx = (i + j);
sgid = &pi->p_sgid_tbl[indx];
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sgid))
sgid->gid_prefix = portinfo.GidPrefix;
guidp[indx] = sgid->gid_guid =
guidinfo.GUIDBlocks[j];
}
}
@@ -2172,15 +2161,11 @@
hermon_hw_addr_path_t *path, uint_t type)
{
uint_t gidtbl_sz;
hermon_hw_udav_t *udav;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*av))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*path))
-
udav = (hermon_hw_udav_t *)(void *)path;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*udav))
path->mlid = av->av_src_path;
path->rlid = av->av_dlid;
switch (av->av_srate) {
case IBT_SRATE_2: /* 1xSDR-2.5Gb/s injection rate */
@@ -2287,13 +2272,10 @@
hermon_get_addr_path(hermon_state_t *state, hermon_hw_addr_path_t *path,
ibt_adds_vect_t *av, uint_t type)
{
uint_t gidtbl_sz;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*path))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*av))
-
av->av_src_path = path->mlid;
av->av_dlid = path->rlid;
/* Set "av_ipd" value from max_stat_rate */
switch (path->max_stat_rate) {
@@ -2398,12 +2380,10 @@
ddi_dma_attr_t dma_attr;
int (*callback)(caddr_t);
uint64_t realsize, alloc_mask;
int flag, status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*qa_info))
-
/* Set the callback flag appropriately */
callback = (sleepflag == HERMON_SLEEP) ? DDI_DMA_SLEEP :
DDI_DMA_DONTWAIT;
/*
@@ -2518,12 +2498,10 @@
* Context: Can be called from interrupt or base context.
*/
void
hermon_queue_free(hermon_qalloc_info_t *qa_info)
{
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*qa_info))
-
/*
* Depending on how (i.e. from where) we allocated the memory for
* this queue, we choose the appropriate method for releasing the
* resources.
*/
@@ -2567,11 +2545,10 @@
fmrpool = (hermon_fmrhdl_t)kmem_zalloc(sizeof (*fmrpool), sleep);
if (fmrpool == NULL) {
status = IBT_INSUFF_RESOURCE;
goto fail;
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*fmrpool))
mutex_init(&fmrpool->fmr_lock, NULL, MUTEX_DRIVER,
DDI_INTR_PRI(state->hs_intrmsi_pri));
mutex_init(&fmrpool->remap_lock, NULL, MUTEX_DRIVER,
DDI_INTR_PRI(state->hs_intrmsi_pri));
@@ -2607,17 +2584,15 @@
goto fail2;
}
fmr = (hermon_fmr_list_t *)kmem_zalloc(
sizeof (hermon_fmr_list_t), sleep);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*fmr))
fmr->fmr = mr;
fmr->fmr_remaps = 0;
fmr->fmr_remap_gen = fmrpool->fmr_remap_gen;
fmr->fmr_pool = fmrpool;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr))
mr->mr_fmr = fmr;
if (!i) /* address of last entry's link */
fmrpool->fmr_free_list_tail = &fmr->fmr_next;
fmr->fmr_next = fmrpool->fmr_free_list;
@@ -2629,11 +2604,10 @@
IBTF_DPRINTF_L2("fmr", "create_fmr_pool SUCCESS");
return (IBT_SUCCESS);
fail2:
for (fmr = fmrpool->fmr_free_list; fmr != NULL; fmr = fmr_next) {
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*fmr))
fmr_next = fmr->fmr_next;
(void) hermon_mr_dealloc_fmr(state, &fmr->fmr);
kmem_free(fmr, sizeof (hermon_fmr_list_t));
}
kmem_free(fmrpool, sizeof (*fmrpool));
@@ -2758,21 +2732,18 @@
fmrpool->fmr_free_list_tail = &fmrpool->fmr_free_list;
fmr->fmr_next = NULL;
fmrpool->fmr_stat_register++;
mutex_exit(&fmrpool->fmr_lock);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*fmr))
status = hermon_mr_register_physical_fmr(state, mem_pattr, fmr->fmr,
mem_desc_p);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*fmr->fmr))
if (hermon_rdma_debug & 0x4)
IBTF_DPRINTF_L2("fmr", " reg: mr %p key %x",
fmr->fmr, fmr->fmr->mr_rkey);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*fmr->fmr))
if (fmr->fmr_remap_gen != fmrpool->fmr_remap_gen) {
fmr->fmr_remap_gen = fmrpool->fmr_remap_gen;
fmr->fmr_remaps = 0;
}
@@ -2794,25 +2765,21 @@
hermon_fmrhdl_t fmrpool;
hermon_fmr_list_t *fmr, **fmrlast;
int len;
fmr = mr->mr_fmr;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*fmr))
fmrpool = fmr->fmr_pool;
/* mark as owned by software */
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*(fmr->fmr)))
*(uint8_t *)(fmr->fmr->mr_mptrsrcp->hr_addr) = 0xF0;
if (fmr->fmr_remaps <
state->hs_cfg_profile->cp_fmr_max_remaps) {
/* add to remap list */
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*(fmr->fmr)))
if (hermon_rdma_debug & 0x4)
IBTF_DPRINTF_L2("fmr", "dereg: mr %p key %x",
fmr->fmr, fmr->fmr->mr_rkey);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*(fmr->fmr)))
mutex_enter(&fmrpool->remap_lock);
fmr->fmr_next = NULL;
*(fmrpool->fmr_remap_list_tail) = fmr;
fmrpool->fmr_remap_list_tail = &fmr->fmr_next;
fmrpool->fmr_remap_len++;
@@ -2837,15 +2804,13 @@
fmrpool->fmr_free_len += len;
mutex_exit(&fmrpool->fmr_lock);
}
} else {
/* add to dirty list */
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*(fmr->fmr)))
if (hermon_rdma_debug & 0x4)
IBTF_DPRINTF_L2("fmr", "dirty: mr %p key %x",
fmr->fmr, fmr->fmr->mr_rkey);
- _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(*(fmr->fmr)))
mutex_enter(&fmrpool->dirty_lock);
fmr->fmr_next = NULL;
*(fmrpool->fmr_dirty_list_tail) = fmr;
fmrpool->fmr_dirty_list_tail = &fmr->fmr_next;