Print this page
8368 remove warlock leftovers from usr/src/uts
*** 650,662 ****
{
hermon_state_t *state;
hermon_qp_info_t qpinfo;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*queue_sizes_p))
-
/* Grab the Hermon softstate pointer */
state = (hermon_state_t *)hca;
/* Allocate the QP */
qpinfo.qpi_attrp = attr_p;
--- 650,659 ----
*** 689,701 ****
{
hermon_state_t *state;
hermon_qp_info_t qpinfo;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*queue_sizes_p))
-
/* Grab the Hermon softstate pointer */
state = (hermon_state_t *)hca;
/* Allocate the Special QP */
qpinfo.qpi_attrp = attr_p;
--- 686,695 ----
*** 728,740 ****
{
hermon_state_t *state;
hermon_qp_info_t qpinfo;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attr_p))
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*queue_sizes_p))
-
/* Grab the Hermon softstate pointer */
state = (hermon_state_t *)hca;
/* Allocate the QP */
qpinfo.qpi_attrp = attr_p;
--- 722,731 ----
*** 911,921 ****
/* Query the current CQ size */
*entries_p = cqhdl->cq_bufsz;
*count_p = cqhdl->cq_intmod_count;
*usec_p = cqhdl->cq_intmod_usec;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cqhdl))
*hid_p = HERMON_EQNUM_TO_HID(state, cqhdl->cq_eqnum);
return (IBT_SUCCESS);
}
--- 902,911 ----
*** 1013,1023 ****
state = (hermon_state_t *)hca;
if (!HERMON_HID_VALID(state, hid))
return (IBT_CQ_HID_INVALID);
if (attrs == NULL)
return (IBT_INVALID_PARAM);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*attrs))
attrs->cha_ih = state->hs_intrmsi_hdl[hid - 1];
attrs->cha_dip = state->hs_dip;
return (IBT_SUCCESS);
}
--- 1003,1012 ----
*** 1111,1122 ****
hermon_state_t *state;
hermon_pdhdl_t pdhdl;
hermon_mrhdl_t mrhdl;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
ASSERT(mr_attr != NULL);
ASSERT(mr_p != NULL);
ASSERT(mr_desc != NULL);
/*
--- 1100,1109 ----
*** 1140,1150 ****
status = hermon_mr_register(state, pdhdl, mr_attr, &mrhdl,
&op, HERMON_MPT_DMPT);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl))
/* Fill in the mr_desc structure */
mr_desc->md_vaddr = mrhdl->mr_bindinfo.bi_addr;
mr_desc->md_lkey = mrhdl->mr_lkey;
/* Only set RKey if remote access was requested */
--- 1127,1136 ----
*** 1184,1195 ****
hermon_pdhdl_t pdhdl;
hermon_mrhdl_t mrhdl;
int status;
ibt_mr_flags_t flags = attrp->mr_flags;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
ASSERT(mr_p != NULL);
ASSERT(mr_desc != NULL);
/*
* Validate the access flags. Both Remote Write and Remote Atomic
--- 1170,1179 ----
*** 1212,1222 ****
status = hermon_mr_register_buf(state, pdhdl, attrp, buf,
&mrhdl, &op, HERMON_MPT_DMPT);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl))
/* Fill in the mr_desc structure */
mr_desc->md_vaddr = mrhdl->mr_bindinfo.bi_addr;
mr_desc->md_lkey = mrhdl->mr_lkey;
/* Only set RKey if remote access was requested */
--- 1196,1205 ----
*** 1304,1315 ****
hermon_state_t *state;
hermon_pdhdl_t pdhdl;
hermon_mrhdl_t mrhdl, mrhdl_new;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
ASSERT(mr_attr != NULL);
ASSERT(mr_p != NULL);
ASSERT(mr_desc != NULL);
/*
--- 1287,1296 ----
*** 1331,1341 ****
status = hermon_mr_register_shared(state, mrhdl, pdhdl, mr_attr,
&mrhdl_new);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new))
/* Fill in the mr_desc structure */
mr_desc->md_vaddr = mrhdl_new->mr_bindinfo.bi_addr;
mr_desc->md_lkey = mrhdl_new->mr_lkey;
/* Only set RKey if remote access was requested */
--- 1312,1321 ----
*** 1374,1385 ****
hermon_state_t *state;
hermon_pdhdl_t pdhdl;
hermon_mrhdl_t mrhdl, mrhdl_new;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
ASSERT(mr_attr != NULL);
ASSERT(mr_new != NULL);
ASSERT(mr_desc != NULL);
/* Grab the Hermon softstate pointer, mrhdl, and pdhdl */
--- 1354,1363 ----
*** 1392,1402 ****
status = hermon_mr_reregister(state, mrhdl, pdhdl, mr_attr,
&mrhdl_new, &op);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new))
/* Fill in the mr_desc structure */
mr_desc->md_vaddr = mrhdl_new->mr_bindinfo.bi_addr;
mr_desc->md_lkey = mrhdl_new->mr_lkey;
/* Only set RKey if remote access was requested */
--- 1370,1379 ----
*** 1436,1447 ****
hermon_pdhdl_t pdhdl;
hermon_mrhdl_t mrhdl, mrhdl_new;
int status;
ibt_mr_flags_t flags = attrp->mr_flags;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
ASSERT(mr_new != NULL);
ASSERT(mr_desc != NULL);
/* Grab the Hermon softstate pointer, mrhdl, and pdhdl */
state = (hermon_state_t *)hca;
--- 1413,1422 ----
*** 1453,1463 ****
status = hermon_mr_reregister_buf(state, mrhdl, pdhdl, attrp, buf,
&mrhdl_new, &op);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl_new))
/* Fill in the mr_desc structure */
mr_desc->md_vaddr = mrhdl_new->mr_bindinfo.bi_addr;
mr_desc->md_lkey = mrhdl_new->mr_lkey;
/* Only set RKey if remote access was requested */
--- 1428,1437 ----
*** 1526,1536 ****
/* Allocate the memory window */
status = hermon_mw_alloc(state, pdhdl, flags, &mwhdl);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mwhdl))
/* Return the MW handle and RKey */
*mw_p = (ibc_mw_hdl_t)mwhdl;
*rkey_p = mwhdl->mr_rkey;
--- 1500,1509 ----
*** 1599,1610 ****
hermon_state_t *state;
hermon_pdhdl_t pdhdl;
hermon_mrhdl_t mrhdl;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mr_desc))
-
ASSERT(mr_attr != NULL);
ASSERT(mr_p != NULL);
ASSERT(mr_desc != NULL);
/*
--- 1572,1581 ----
*** 1623,1633 ****
status = hermon_dma_mr_register(state, pdhdl, mr_attr, &mrhdl);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl))
/* Fill in the mr_desc structure */
mr_desc->md_vaddr = mr_attr->dmr_paddr;
mr_desc->md_lkey = mrhdl->mr_lkey;
/* Only set RKey if remote access was requested */
--- 1594,1603 ----
*** 2093,2103 ****
if (hermon_kernel_data_ro == HERMON_RO_ENABLED)
dma_attr.dma_attr_flags |= DDI_DMA_RELAXED_ORDERING;
#endif
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ma_hdl))
status = ddi_dma_alloc_handle(state->hs_dip, &dma_attr,
callback, NULL, &ma_hdl->h_ma_dmahdl);
if (status != DDI_SUCCESS) {
kmem_free(ma_hdl, sizeof (*ma_hdl));
return (IBT_INSUFF_RESOURCE);
--- 2063,2072 ----
*** 2134,2145 ****
kaddr[i] = htonll(addr | HERMON_MTT_ENTRY_PRESENT);
i++;
addr += pagesize;
if (addr == 0) {
static int do_once = 1;
- _NOTE(SCHEME_PROTECTS_DATA("safe sharing",
- do_once))
if (do_once) {
do_once = 0;
cmn_err(CE_NOTE, "probable error in "
"dma_cookie address: map_mem_area");
}
--- 2103,2112 ----
*** 2148,2158 ****
}
if (cookie_cnt != 0)
ddi_dma_nextcookie(ma_hdl->h_ma_dmahdl, &dmacookie);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pmr))
pmr->pmr_addr_list = (ibt_phys_addr_t *)(void *)ma_hdl->h_ma_kaddr;
pmr->pmr_iova = va_attrs->va_vaddr;
pmr->pmr_len = len;
pmr->pmr_offset = va_attrs->va_vaddr & PAGEOFFSET;
pmr->pmr_buf_sz = PAGESHIFT; /* PRM says "Page Sice", but... */
--- 2115,2124 ----
*** 2235,2245 ****
ma_hdl = kmem_zalloc(sizeof (*ma_hdl), kmflag);
if (ma_hdl == NULL) {
return (IBT_INSUFF_RESOURCE);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*ma_hdl))
status = ddi_dma_alloc_handle(state->hs_dip, &dma_attr,
callback, NULL, &ma_hdl->h_ma_dmahdl);
if (status != DDI_SUCCESS) {
ibt_status = IBT_INSUFF_RESOURCE;
--- 2201,2210 ----
*** 2330,2341 ****
kaddr[i+j] = htonll(addr | HERMON_MTT_ENTRY_PRESENT);
i++;
addr += pagesize;
if (addr == 0) {
static int do_once = 1;
- _NOTE(SCHEME_PROTECTS_DATA("safe sharing",
- do_once))
if (do_once) {
do_once = 0;
cmn_err(CE_NOTE, "probable error in "
"dma_cookie address: map_mem_area");
}
--- 2295,2304 ----
*** 2345,2355 ****
if (cookie_cnt != 0)
ddi_dma_nextcookie(ma_hdl->h_ma_dmahdl, &dmacookie);
}
pmr = ®_req->wr;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*pmr))
pmr->pmr_len = len;
pmr->pmr_offset = va_attrs->va_vaddr & PAGEOFFSET;
pmr->pmr_buf_sz = PAGESHIFT; /* PRM says "Page Size", but... */
pmr->pmr_num_buf = i;
pmr->pmr_addr_list = &ma_hdl->h_ma_list_cookie;
--- 2308,2317 ----
*** 2412,2426 ****
struct ibc_mi_s {
int imh_len;
ddi_dma_handle_t imh_dmahandle[1];
};
- _NOTE(SCHEME_PROTECTS_DATA("safe sharing",
- ibc_mi_s::imh_len
- ibc_mi_s::imh_dmahandle))
-
/*
* hermon_ci_map_mem_iov()
* Map the memory
* Context: Can be called from interrupt or base context.
*/
--- 2374,2384 ----
*** 2442,2453 ****
ibt_wr_ds_t *sgl;
hermon_state_t *state;
int kmflag;
int (*callback)(caddr_t);
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*wr))
-
state = (hermon_state_t *)hca;
hermon_dma_attr_init(state, &dma_attr);
#ifdef __sparc
if (state->hs_cfg_profile->cp_iommu_bypass == HERMON_BINDMEM_BYPASS)
dma_attr.dma_attr_flags = DDI_DMA_FORCE_PHYSICAL;
--- 2400,2409 ----
*** 2474,2485 ****
if (iov_attr->iov_flags & IBT_IOV_BUF) {
mi_hdl = kmem_alloc(sizeof (*mi_hdl), kmflag);
if (mi_hdl == NULL)
return (IBT_INSUFF_RESOURCE);
sgl = wr->send.wr_sgl;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sgl))
-
status = ddi_dma_alloc_handle(state->hs_dip, &dma_attr,
callback, NULL, &dmahdl);
if (status != DDI_SUCCESS) {
kmem_free(mi_hdl, sizeof (*mi_hdl));
return (IBT_INSUFF_RESOURCE);
--- 2430,2439 ----
*** 2517,2527 ****
if (iov_attr->iov_flags & IBT_IOV_RECV)
sgl = wr->recv.wr_sgl;
else
sgl = wr->send.wr_sgl;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*sgl))
len = iov_attr->iov_list_len;
for (i = 0, j = 0; j < len; j++) {
if (iov_attr->iov[j].iov_len == 0)
continue;
--- 2471,2480 ----
*** 2625,2636 ****
hermon_state_t *state;
hermon_pdhdl_t pdhdl;
hermon_mrhdl_t mrhdl;
int status;
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mem_desc_p))
-
ASSERT(mr_p != NULL);
ASSERT(mem_desc_p != NULL);
state = (hermon_state_t *)hca;
pdhdl = (hermon_pdhdl_t)pd;
--- 2578,2587 ----
*** 2640,2650 ****
status = hermon_mr_alloc_lkey(state, pdhdl, flags, list_sz, &mrhdl);
if (status != DDI_SUCCESS) {
return (status);
}
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mrhdl))
/* Fill in the mem_desc_p structure */
mem_desc_p->pmd_iova = 0;
mem_desc_p->pmd_phys_buf_list_sz = list_sz;
mem_desc_p->pmd_lkey = mrhdl->mr_lkey;
--- 2591,2600 ----
*** 2801,2816 ****
/*
* If region is mapped for streaming (i.e. noncoherent), then set
* sync is required
*/
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*mem_desc_p))
mem_desc_p->pmd_sync_required = (mrhdl->mr_bindinfo.bi_flags &
IBT_MR_NONCOHERENT) ? B_TRUE : B_FALSE;
if (mem_desc_p->pmd_sync_required == B_TRUE) {
/* Fill in DMA handle for future sync operations */
- _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(mrhdl->mr_bindinfo))
mrhdl->mr_bindinfo.bi_dmahdl =
(ddi_dma_handle_t)mem_pattr->pmr_ma;
}
/* Return the Hermon MR handle */
--- 2751,2764 ----