Print this page
XXXX introduce drv_sectohz

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/skd/skd.c
          +++ new/usr/src/uts/common/io/skd/skd.c
↓ open down ↓ 209 lines elided ↑ open up ↑
 210  210          int             rval = 0;
 211  211          int             tgts = 0;
 212  212  
 213  213          tgts |= 0x02;
 214  214          tgts |= 0x08;   /* In #ifdef NEXENTA block from original sTec drop. */
 215  215  
 216  216          /*
 217  217           * drv_usectohz() is a function, so can't initialize it at
 218  218           * instantiation.
 219  219           */
 220      -        skd_timer_ticks = drv_usectohz(1000000);
      220 +        skd_timer_ticks = drv_sectohz(1);
 221  221  
 222  222          Dcmn_err(CE_NOTE,
 223  223              "<# Installing skd Driver dbg-lvl=%d %s %x>",
 224  224              skd_dbg_level, DRV_BUILD_ID, tgts);
 225  225  
 226  226          rval = ddi_soft_state_init(&skd_state, sizeof (skd_device_t), 0);
 227  227          if (rval != DDI_SUCCESS)
 228  228                  return (rval);
 229  229  
 230  230          bd_mod_init(&skd_dev_ops);
↓ open down ↓ 2655 lines elided ↑ open up ↑
2886 2886  
2887 2887          skdev->state = SKD_DRVR_STATE_SYNCING;
2888 2888          skdev->sync_done = 0;
2889 2889  
2890 2890          skd_send_internal_skspcl(skdev, skspcl, SYNCHRONIZE_CACHE);
2891 2891  
2892 2892          secs = 10;
2893 2893          mutex_enter(&skdev->skd_internalio_mutex);
2894 2894          while (skdev->sync_done == 0) {
2895 2895                  cur_ticks = ddi_get_lbolt();
2896      -                tmo = cur_ticks + drv_usectohz(1000000 * secs);
     2896 +                tmo = cur_ticks + drv_sectohz(secs);
2897 2897                  if (cv_timedwait(&skdev->cv_waitq,
2898 2898                      &skdev->skd_internalio_mutex, tmo) == -1) {
2899 2899                          /* Oops - timed out */
2900 2900  
2901 2901                          Dcmn_err(CE_NOTE, "stop_device - %d secs TMO", secs);
2902 2902                  }
2903 2903          }
2904 2904  
2905 2905          mutex_exit(&skdev->skd_internalio_mutex);
2906 2906  
↓ open down ↓ 1606 lines elided ↑ open up ↑
4513 4513  skd_wait_for_s1120(skd_device_t *skdev)
4514 4514  {
4515 4515          clock_t cur_ticks, tmo;
4516 4516          int     loop_cntr = 0;
4517 4517          int     rc = DDI_FAILURE;
4518 4518  
4519 4519          mutex_enter(&skdev->skd_internalio_mutex);
4520 4520  
4521 4521          while (skdev->gendisk_on == 0) {
4522 4522                  cur_ticks = ddi_get_lbolt();
4523      -                tmo = cur_ticks + drv_usectohz(MICROSEC);
     4523 +                tmo = cur_ticks + drv_sectohz(1);
4524 4524                  if (cv_timedwait(&skdev->cv_waitq,
4525 4525                      &skdev->skd_internalio_mutex, tmo) == -1) {
4526 4526                          /* Oops - timed out */
4527 4527                          if (loop_cntr++ > 10)
4528 4528                                  break;
4529 4529                  }
4530 4530          }
4531 4531  
4532 4532          mutex_exit(&skdev->skd_internalio_mutex);
4533 4533  
↓ open down ↓ 691 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX