Print this page
XXXX introduce drv_sectohz

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/sun4v/ontario/io/tsalarm.c
          +++ new/usr/src/uts/sun4v/ontario/io/tsalarm.c
↓ open down ↓ 751 lines elided ↑ open up ↑
 752  752          send_msg.sub_type = NULL;
 753  753          send_msg.msg_len = sizeof (tsal_pcp_alarm_req_t);
 754  754          send_msg.msg_data = (uint8_t *)req_ptr;
 755  755  
 756  756          /*
 757  757           * send the request, receive the response
 758  758           */
 759  759          if (tsal_pcp_send_recv(sc, &send_msg, &recv_msg,
 760  760              PCP_COMM_TIMEOUT) < 0) {
 761  761                  /* we either timed out or erred; either way try again */
 762      -                (void) delay(PCP_COMM_TIMEOUT * drv_usectohz(1000000));
      762 +                (void) delay(drv_sectohz(PCP_COMM_TIMEOUT));
 763  763  
 764  764                  if (tsal_pcp_send_recv(sc, &send_msg, &recv_msg,
 765  765                      PCP_COMM_TIMEOUT) < 0) {
 766  766                          cmn_err(CE_WARN, "tsalarm: communication failure");
 767  767                          goto alarm_return;
 768  768                  }
 769  769          }
 770  770  
 771  771          /*
 772  772           * validate that this data was meant for us
↓ open down ↓ 54 lines elided ↑ open up ↑
 827  827          send_msg.sub_type = NULL;
 828  828          send_msg.msg_len = sizeof (tsal_pcp_alarm_req_t);
 829  829          send_msg.msg_data = (uint8_t *)req_ptr;
 830  830  
 831  831          /*
 832  832           * send the request, receive the response
 833  833           */
 834  834          if (tsal_pcp_send_recv(sc, &send_msg, &recv_msg,
 835  835              PCP_COMM_TIMEOUT) < 0) {
 836  836                  /* we either timed out or erred; either way try again */
 837      -                (void) delay(PCP_COMM_TIMEOUT * drv_usectohz(1000000));
      837 +                (void) delay(drv_sectohz(PCP_COMM_TIMEOUT));
 838  838  
 839  839                  if (tsal_pcp_send_recv(sc, &send_msg, &recv_msg,
 840  840                      PCP_COMM_TIMEOUT) < 0) {
 841  841                          goto alarm_return;
 842  842                  }
 843  843          }
 844  844  
 845  845          /*
 846  846           * validate that this data was meant for us
 847  847           */
↓ open down ↓ 238 lines elided ↑ open up ↑
1086 1086          while (rv < byte_cnt) {
1087 1087                  io_sz = MIN((byte_cnt - rv), sc->mtu_size);
1088 1088                  try_cnt = 0;
1089 1089                  while ((n = (*func_ptr)(sc, datap, io_sz)) < 0) {
1090 1090                          try_cnt++;
1091 1091                          if (try_cnt > PCP_MAX_TRY_CNT) {
1092 1092                                  rv = n;
1093 1093                                  goto done;
1094 1094                          }
1095 1095                          /* waiting 5 secs. Do we need 5 Secs? */
1096      -                        (void) delay(PCP_GLVC_SLEEP * drv_usectohz(1000000));
     1096 +                        (void) delay(drv_sectohz(PCP_GLVC_SLEEP));
1097 1097                  } /* while trying the io operation */
1098 1098  
1099 1099                  if (n < 0) {
1100 1100                          rv = n;
1101 1101                          goto done;
1102 1102                  }
1103 1103                  rv += n;
1104 1104                  datap += n;
1105 1105          } /* while still have more data */
1106 1106  
↓ open down ↓ 550 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX