Print this page
8368 remove warlock leftovers from usr/src/uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ib/adapters/hermon/hermon_rsrc.c
          +++ new/usr/src/uts/common/io/ib/adapters/hermon/hermon_rsrc.c
↓ open down ↓ 190 lines elided ↑ open up ↑
 191  191          ASSERT(rsrc_pool != NULL);
 192  192  
 193  193          /*
 194  194           * Allocate space for the object used to track the resource handle
 195  195           */
 196  196          flag = (sleepflag == HERMON_SLEEP) ? KM_SLEEP : KM_NOSLEEP;
 197  197          tmp_rsrc_hdl = kmem_cache_alloc(state->hs_rsrc_cache, flag);
 198  198          if (tmp_rsrc_hdl == NULL) {
 199  199                  return (DDI_FAILURE);
 200  200          }
 201      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*tmp_rsrc_hdl))
 202  201  
 203  202          /*
 204  203           * Set rsrc_hdl type.  This is later used by the hermon_rsrc_free call
 205  204           * to know what type of resource is being freed.
 206  205           */
 207  206          tmp_rsrc_hdl->rsrc_type = rsrc;
 208  207  
 209  208          /*
 210  209           * Depending on resource type, call the appropriate alloc routine
 211  210           */
↓ open down ↓ 104 lines elided ↑ open up ↑
 316  315          ASSERT(rsrc_pool != NULL);
 317  316  
 318  317          /*
 319  318           * Allocate space for the object used to track the resource handle
 320  319           */
 321  320          flag = (sleepflag == HERMON_SLEEP) ? KM_SLEEP : KM_NOSLEEP;
 322  321          tmp_rsrc_hdl = kmem_cache_alloc(state->hs_rsrc_cache, flag);
 323  322          if (tmp_rsrc_hdl == NULL) {
 324  323                  return (DDI_FAILURE);
 325  324          }
 326      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*tmp_rsrc_hdl))
 327  325  
 328  326          /*
 329  327           * Set rsrc_hdl type.  This is later used by the hermon_rsrc_free call
 330  328           * to know what type of resource is being freed.
 331  329           */
 332  330          tmp_rsrc_hdl->rsrc_type = rsrc;
 333  331  
 334  332          switch (rsrc) {
 335  333          case HERMON_QPC:
 336  334          case HERMON_DMPT:
↓ open down ↓ 1739 lines elided ↑ open up ↑
2076 2074  
2077 2075          if (hermon_rsrc_verbose) {
2078 2076                  IBTF_DPRINTF_L2("hermon", "hermon_rsrc_hw_entry_icm_confirm: "
2079 2077                      "type (0x%x) num (0x%x) length (0x%x) index (0x%x, 0x%x): ",
2080 2078                      type, num, hdl->hr_len, index1, index2);
2081 2079          }
2082 2080  
2083 2081          mutex_enter(&icm_table->icm_table_lock);
2084 2082          hermon_bitmap(bitmap, dma_info, icm_table, index1, num_to_hdl);
2085 2083          while (num) {
2086      -#ifndef __lock_lint
2087 2084                  while (icm_table->icm_busy) {
2088 2085                          cv_wait(&icm_table->icm_table_cv,
2089 2086                              &icm_table->icm_table_lock);
2090 2087                  }
2091      -#endif
2092 2088                  if (!HERMON_BMAP_BIT_ISSET(bitmap, index2)) {
2093 2089                          /* Allocate ICM for this span */
2094 2090                          icm_table->icm_busy = 1;
2095 2091                          mutex_exit(&icm_table->icm_table_lock);
2096 2092                          status = hermon_icm_alloc(state, type, index1, index2);
2097 2093                          mutex_enter(&icm_table->icm_table_lock);
2098 2094                          icm_table->icm_busy = 0;
2099 2095                          cv_broadcast(&icm_table->icm_table_cv);
2100 2096                          if (status != DDI_SUCCESS) {
2101 2097                                  goto fail_alloc;
↓ open down ↓ 250 lines elided ↑ open up ↑
2352 2348  
2353 2349          ASSERT(pool_info != NULL);
2354 2350          ASSERT(hdl != NULL);
2355 2351  
2356 2352          /* Allocate the software handle */
2357 2353          status = hermon_rsrc_swhdl_alloc(pool_info, sleepflag, hdl);
2358 2354          if (status != DDI_SUCCESS) {
2359 2355                  return (DDI_FAILURE);
2360 2356          }
2361 2357          addr = (hermon_pdhdl_t)hdl->hr_addr;
2362      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*addr))
2363 2358  
2364 2359          /* Allocate a PD number for the handle */
2365 2360          flag = (sleepflag == HERMON_SLEEP) ? VM_SLEEP : VM_NOSLEEP;
2366 2361          tmpaddr = vmem_alloc(pool_info->rsrc_vmp, 1, flag);
2367 2362          if (tmpaddr == NULL) {
2368 2363                  /* No more PD number entries available */
2369 2364                  hermon_rsrc_swhdl_free(pool_info, hdl);
2370 2365                  return (DDI_FAILURE);
2371 2366          }
2372 2367          addr->pd_pdnum = (uint32_t)(uintptr_t)tmpaddr;
↓ open down ↓ 314 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX