Print this page
XXXX introduce drv_sectohz

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/sata/adapters/si3124/si3124.c
          +++ new/usr/src/uts/common/io/sata/adapters/si3124/si3124.c
↓ open down ↓ 462 lines elided ↑ open up ↑
 463  463          }
 464  464  
 465  465          error = mod_install(&modlinkage);
 466  466          if (error != 0) {
 467  467                  sata_hba_fini(&modlinkage);
 468  468                  mutex_destroy(&si_log_mutex);
 469  469                  ddi_soft_state_fini(&si_statep);
 470  470                  return (error);
 471  471          }
 472  472  
 473      -        si_watchdog_tick = drv_usectohz((clock_t)si_watchdog_timeout * 1000000);
      473 +        si_watchdog_tick = drv_sectohz((clock_t)si_watchdog_timeout);
 474  474  
 475  475          return (error);
 476  476  }
 477  477  
 478  478  /*
 479  479   * si3124 module uninitialize.
 480  480   *
 481  481   */
 482  482  int
 483  483  _fini(void)
↓ open down ↓ 1852 lines elided ↑ open up ↑
2336 2336          int slot,
2337 2337          sata_pkt_t *satapkt)
2338 2338  {
2339 2339          uint32_t slot_status;
2340 2340          int pkt_timeout_ticks;
2341 2341          uint32_t port_intr_status;
2342 2342          int in_panic = ddi_in_panic();
2343 2343  
2344 2344          SIDBG_P(SIDBG_ENTRY, si_portp, "si_poll_cmd entered: port: 0x%x", port);
2345 2345  
2346      -        pkt_timeout_ticks = drv_usectohz((clock_t)satapkt->satapkt_time *
2347      -            1000000);
     2346 +        pkt_timeout_ticks = drv_sectohz((clock_t)satapkt->satapkt_time);
2348 2347  
2349 2348  
2350 2349          /* we start out with SATA_PKT_COMPLETED as the satapkt_reason */
2351 2350          satapkt->satapkt_reason = SATA_PKT_COMPLETED;
2352 2351  
2353 2352          do {
2354 2353                  slot_status = ddi_get32(si_ctlp->sictl_port_acc_handle,
2355 2354                      (uint32_t *)(PORT_SLOT_STATUS(si_ctlp, port)));
2356 2355  
2357 2356                  if (slot_status & SI_SLOT_MASK & (0x1 << slot)) {
↓ open down ↓ 3718 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX