Print this page
XXXX introduce drv_sectohz

*** 328,341 **** arcmsr_iop_init(acb); /* restart ccbs "timeout" watchdog */ acb->timeout_count = 0; acb->timeout_id = timeout(arcmsr_ccbs_timeout, (caddr_t)acb, ! (ARCMSR_TIMEOUT_WATCH * drv_usectohz(1000000))); acb->timeout_sc_id = timeout(arcmsr_devMap_monitor, (caddr_t)acb, ! (ARCMSR_DEV_MAP_WATCH * drv_usectohz(1000000))); mutex_exit(&acb->acb_mutex); return (DDI_SUCCESS); default: return (DDI_FAILURE); --- 328,341 ---- arcmsr_iop_init(acb); /* restart ccbs "timeout" watchdog */ acb->timeout_count = 0; acb->timeout_id = timeout(arcmsr_ccbs_timeout, (caddr_t)acb, ! drv_sectohz(ARCMSR_TIMEOUT_WATCH)); acb->timeout_sc_id = timeout(arcmsr_devMap_monitor, (caddr_t)acb, ! drv_sectohz(ARCMSR_DEV_MAP_WATCH)); mutex_exit(&acb->acb_mutex); return (DDI_SUCCESS); default: return (DDI_FAILURE);
*** 2952,2964 **** } acb->timeout_count = 0; /* active ccbs "timeout" watchdog */ acb->timeout_id = timeout(arcmsr_ccbs_timeout, (caddr_t)acb, ! (ARCMSR_TIMEOUT_WATCH * drv_usectohz(1000000))); acb->timeout_sc_id = timeout(arcmsr_devMap_monitor, (caddr_t)acb, ! (ARCMSR_DEV_MAP_WATCH * drv_usectohz(1000000))); /* report device info */ ddi_report_dev(dev_info); return (DDI_SUCCESS); --- 2952,2964 ---- } acb->timeout_count = 0; /* active ccbs "timeout" watchdog */ acb->timeout_id = timeout(arcmsr_ccbs_timeout, (caddr_t)acb, ! drv_sectohz(ARCMSR_TIMEOUT_WATCH)); acb->timeout_sc_id = timeout(arcmsr_devMap_monitor, (caddr_t)acb, ! drv_sectohz(ARCMSR_DEV_MAP_WATCH)); /* report device info */ ddi_report_dev(dev_info); return (DDI_SUCCESS);
*** 3160,3171 **** if (i != DDI_SUCCESS) { if ((acb->timeout_id != 0) && ((acb->acb_flags & ACB_F_SCSISTOPADAPTER) == 0)) { /* do pkt timeout check each 60 secs */ acb->timeout_id = timeout(arcmsr_ccbs_timeout, ! (void*)acb, (ARCMSR_TIMEOUT_WATCH * ! drv_usectohz(1000000))); } mutex_exit(&acb->isr_mutex); arcmsr_enable_allintr(acb, intmask_org); return; } --- 3160,3170 ---- if (i != DDI_SUCCESS) { if ((acb->timeout_id != 0) && ((acb->acb_flags & ACB_F_SCSISTOPADAPTER) == 0)) { /* do pkt timeout check each 60 secs */ acb->timeout_id = timeout(arcmsr_ccbs_timeout, ! (void*)acb, drv_sectohz(ARCMSR_TIMEOUT_WATCH)); } mutex_exit(&acb->isr_mutex); arcmsr_enable_allintr(acb, intmask_org); return; }
*** 3211,3221 **** } if ((acb->timeout_id != 0) && ((acb->acb_flags & ACB_F_SCSISTOPADAPTER) == 0)) { /* do pkt timeout check each 60 secs */ acb->timeout_id = timeout(arcmsr_ccbs_timeout, ! (void*)acb, (ARCMSR_TIMEOUT_WATCH * drv_usectohz(1000000))); } mutex_exit(&acb->isr_mutex); arcmsr_enable_allintr(acb, intmask_org); } --- 3210,3220 ---- } if ((acb->timeout_id != 0) && ((acb->acb_flags & ACB_F_SCSISTOPADAPTER) == 0)) { /* do pkt timeout check each 60 secs */ acb->timeout_id = timeout(arcmsr_ccbs_timeout, ! (void*)acb, drv_sectohz(ARCMSR_TIMEOUT_WATCH)); } mutex_exit(&acb->isr_mutex); arcmsr_enable_allintr(acb, intmask_org); }
*** 3429,3439 **** if ((acb->timeout_id != 0) && ((acb->acb_flags & ACB_F_SCSISTOPADAPTER) == 0)) { /* do pkt timeout check each 5 secs */ acb->timeout_id = timeout(arcmsr_devMap_monitor, (void*)acb, ! (ARCMSR_DEV_MAP_WATCH * drv_usectohz(1000000))); } } static uint32_t --- 3428,3438 ---- if ((acb->timeout_id != 0) && ((acb->acb_flags & ACB_F_SCSISTOPADAPTER) == 0)) { /* do pkt timeout check each 5 secs */ acb->timeout_id = timeout(arcmsr_devMap_monitor, (void*)acb, ! drv_sectohz(ARCMSR_DEV_MAP_WATCH)); } } static uint32_t