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/tavor/tavor_agents.c
          +++ new/usr/src/uts/common/io/ib/adapters/tavor/tavor_agents.c
↓ open down ↓ 203 lines elided ↑ open up ↑
 204  204                  if (ibmf_status != IBMF_SUCCESS) {
 205  205                          TNF_PROBE_1(tavor_agent_request_cb_ibmf_free_msg_fail,
 206  206                              TAVOR_TNF_ERROR, "", tnf_uint, ibmf_status,
 207  207                              ibmf_status);
 208  208                  }
 209  209                  TNF_PROBE_0(tavor_agent_request_cb_kma_fail,
 210  210                      TAVOR_TNF_ERROR, "");
 211  211                  TAVOR_TNF_EXIT(tavor_agent_request_cb);
 212  212                  return;
 213  213          }
 214      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*cb_args))
 215  214  
 216  215          /* Fill in the callback args */
 217  216          cb_args->ahd_ibmfhdl    = ibmf_handle;
 218  217          cb_args->ahd_ibmfmsg    = msgp;
 219  218          cb_args->ahd_agentlist  = args;
 220  219  
 221  220          /*
 222  221           * Dispatch the message to the task queue.  Note: Just like above,
 223  222           * if this request fails for any reason then make sure to free up
 224  223           * the IBMF message and then return
↓ open down ↓ 58 lines elided ↑ open up ↑
 283  282           *
 284  283           * Note: Tavor has a unique method for handling internally generated
 285  284           * Traps.  All internally detected/generated Trap messages are
 286  285           * automatically received by the IBMF (as receive completions on QP0),
 287  286           * which (because all Tavor Trap MADs have SLID == 0) detects it as a
 288  287           * special "Tavor Trap" and forwards it here to the driver's SMA.
 289  288           * It is then our responsibility here to fill in the Trap MAD's DLID
 290  289           * for forwarding to the real Master SM (as programmed in the port's
 291  290           * PortInfo.MasterSMLID field.)
 292  291           */
 293      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(msgp->im_local_addr))
 294  292          if (TAVOR_IS_SPECIAL_TRAP_MAD(msgp)) {
 295  293                  msgp->im_local_addr.ia_remote_lid =
 296  294                      TAVOR_PORT_MASTERSMLID_GET(state, port - 1);
 297  295          } else {
 298  296                  /*
 299  297                   * Post the command to the firmware (using the MAD_IFC
 300  298                   * command).  Note: We also reuse the command that was passed
 301  299                   * in.  We pass the pointer to the original MAD payload as if
 302  300                   * it were both the source of the incoming MAD as well as the
 303  301                   * destination for the response.  This is acceptable and saves
↓ open down ↓ 333 lines elided ↑ open up ↑
 637  635  
 638  636          /*
 639  637           * Handle directed route MADs as a special case.  Tavor firmware
 640  638           * does not update the "direction" bit, "hop pointer", "Return
 641  639           * Path" or, in fact, any of the "directed route" parameters.  So
 642  640           * the responsibility falls on Tavor driver software to inspect the
 643  641           * MADs and update those fields as appropriate (see section 14.2.2
 644  642           * of the IBA specification, rev 1.1)
 645  643           */
 646  644          if (TAVOR_MAD_IS_DR(rmadhdrp)) {
 647      -
 648      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((sm_dr_mad_hdr_t *)rmadhdrp)))
 649      -        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(*((sm_dr_mad_hdr_t *)smadhdrp)))
 650      -
 651  645                  /*
 652  646                   * Set the "Direction" bit to one.  This indicates that this
 653  647                   * is now directed route response
 654  648                   */
 655  649                  TAVOR_DRMAD_SET_DIRECTION(rmadhdrp);
 656  650  
 657  651                  /* Extract the "hop pointer" and "hop count" from the MAD */
 658  652                  hop_count = TAVOR_DRMAD_GET_HOPCOUNT(rmadhdrp);
 659  653                  hop_point = TAVOR_DRMAD_GET_HOPPOINTER(rmadhdrp);
 660  654  
↓ open down ↓ 12 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX