Print this page
XXXX introduce drv_sectohz

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/scsi/targets/sddef.h
          +++ new/usr/src/uts/common/sys/scsi/targets/sddef.h
↓ open down ↓ 1128 lines elided ↑ open up ↑
1129 1129  #define SD_TRACE        { if (0) sd_log_trace; }
1130 1130  #define SD_INFO         { if (0) sd_log_info; }
1131 1131  #define SD_DUMP_MEMORY  { if (0) sd_dump_memory; }
1132 1132  #endif
1133 1133  
1134 1134  
1135 1135  /*
1136 1136   * Miscellaneous macros
1137 1137   */
1138 1138  
1139      -#define SD_USECTOHZ(x)                  (drv_usectohz((x)*1000000))
1140 1139  #define SD_GET_PKT_STATUS(pktp)         ((*(pktp)->pkt_scbp) & STATUS_MASK)
1141 1140  
1142 1141  #define SD_BIOERROR(bp, errcode)                                        \
1143 1142          if ((bp)->b_resid == 0) {                                       \
1144 1143                  (bp)->b_resid = (bp)->b_bcount;                         \
1145 1144          }                                                               \
1146 1145          if ((bp)->b_error == 0) {                                       \
1147 1146                  bioerror(bp, errcode);                                  \
1148 1147          }                                                               \
1149 1148          (bp)->b_flags |= B_ERROR;
↓ open down ↓ 159 lines elided ↑ open up ↑
1309 1308   * throttle back to it SD_MAX_THROTTLE for TRAN_BUSY.
1310 1309   * 10 seconds for STATUS_QFULL because QFULL will incrementally
1311 1310   * increase the throttle limit until it reaches max value.
1312 1311   */
1313 1312  #define SD_RESET_THROTTLE_TIMEOUT       60
1314 1313  #define SD_QFULL_THROTTLE_TIMEOUT       10
1315 1314  
1316 1315  #define SD_THROTTLE_TRAN_BUSY           0
1317 1316  #define SD_THROTTLE_QFULL               1
1318 1317  
1319      -#define SD_THROTTLE_RESET_INTERVAL      \
1320      -        (sd_reset_throttle_timeout * drv_usectohz(1000000))
     1318 +#define SD_THROTTLE_RESET_INTERVAL      drv_sectohz(sd_reset_throttle_timeout)
1321 1319  
1322 1320  #define SD_QFULL_THROTTLE_RESET_INTERVAL        \
1323      -        (sd_qfull_throttle_timeout * drv_usectohz(1000000))
     1321 +        drv_sectohz(sd_qfull_throttle_timeout)
1324 1322  
1325 1323  
1326 1324  /*
1327 1325   * xb_pkt_flags defines
1328 1326   * SD_XB_DMA_FREED indicates the scsi_pkt has had its DMA resources freed
1329 1327   * by a call to scsi_dmafree(9F). The resources must be reallocated before
1330 1328   *   before a call to scsi_transport can be made again.
1331 1329   * SD_XB_USCSICMD indicates the scsi request is a uscsi request
1332 1330   * SD_XB_INITPKT_MASK: since this field is also used to store flags for
1333 1331   *   a scsi_init_pkt(9F) call, we need a mask to make sure that we don't
↓ open down ↓ 375 lines elided ↑ open up ↑
1709 1707  #define SD_IO_TIME                      60
1710 1708  
1711 1709  /*
1712 1710   * 2 hours is an excessively reasonable amount of time for format operations.
1713 1711   */
1714 1712  #define SD_FMT_TIME                     (120 * 60)
1715 1713  
1716 1714  /*
1717 1715   * 5 seconds is what we'll wait if we get a Busy Status back
1718 1716   */
1719      -#define SD_BSY_TIMEOUT                  (drv_usectohz(5 * 1000000))
     1717 +#define SD_BSY_TIMEOUT                  drv_sectohz(5)
1720 1718  
1721 1719  /*
1722 1720   * 100 msec. is what we'll wait if we get Unit Attention.
1723 1721   */
1724 1722  #define SD_UA_RETRY_DELAY               (drv_usectohz((clock_t)100000))
1725 1723  
1726 1724  /*
1727 1725   * 100 msec. is what we'll wait for restarted commands.
1728 1726   */
1729 1727  #define SD_RESTART_TIMEOUT              (drv_usectohz((clock_t)100000))
1730 1728  
1731 1729  /*
1732 1730   * 10s misaligned I/O warning message interval
1733 1731   */
1734      -#define SD_RMW_MSG_PRINT_TIMEOUT        (drv_usectohz((clock_t)10000000))
     1732 +#define SD_RMW_MSG_PRINT_TIMEOUT        drv_sectohz(10)
1735 1733  
1736 1734  /*
1737 1735   * 100 msec. is what we'll wait for certain retries for fibre channel
1738 1736   * targets, 0 msec for parallel SCSI.
1739 1737   */
1740 1738  #if defined(__fibre)
1741 1739  #define SD_RETRY_DELAY                  (drv_usectohz(100000))
1742 1740  #else
1743 1741  #define SD_RETRY_DELAY                  ((clock_t)0)
1744 1742  #endif
↓ open down ↓ 675 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX