Print this page
XXXX introduce drv_sectohz

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfc.c
          +++ new/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs_dfc.c
↓ open down ↓ 4360 lines elided ↑ open up ↑
4361 4361          mutex_enter(&EMLXS_PORT_LOCK);
4362 4362  
4363 4363          /* Wait if adapter is in transition */
4364 4364          i = 0;
4365 4365          while ((hba->flag & (FC_ONLINING_MODE | FC_OFFLINING_MODE))) {
4366 4366                  if (i++ > 30) {
4367 4367                          break;
4368 4368                  }
4369 4369  
4370 4370                  mutex_exit(&EMLXS_PORT_LOCK);
4371      -                delay(drv_usectohz(1000000));
     4371 +                delay(drv_sectohz(1));
4372 4372                  mutex_enter(&EMLXS_PORT_LOCK);
4373 4373          }
4374 4374  
4375 4375          if (hba->sli_mode <= EMLXS_HBA_SLI3_MODE) {
4376 4376                  switch (mode) {
4377 4377                  case DDI_SHOW:
4378 4378                          break;
4379 4379  
4380 4380                  case DDI_ONDI:
4381 4381                          if (hba->flag & FC_OFFLINE_MODE) {
↓ open down ↓ 74 lines elided ↑ open up ↑
4456 4456                  }
4457 4457  
4458 4458                  /* Wait if adapter is in transition */
4459 4459                  i = 0;
4460 4460                  while ((hba->flag & (FC_ONLINING_MODE | FC_OFFLINING_MODE))) {
4461 4461                          if (i++ > 30) {
4462 4462                                  break;
4463 4463                          }
4464 4464  
4465 4465                          mutex_exit(&EMLXS_PORT_LOCK);
4466      -                        delay(drv_usectohz(1000000));
     4466 +                        delay(drv_sectohz(1));
4467 4467                          mutex_enter(&EMLXS_PORT_LOCK);
4468 4468                  }
4469 4469  
4470 4470                  /* Return current state */
4471 4471                  if (hba->flag & FC_ONLINE_MODE) {
4472 4472                          mode = DDI_ONDI;
4473 4473                  } else if (hba->state == FC_KILLED) {
4474 4474                          mode = DDI_DIAGDI;
4475 4475                  } else if (hba->state == FC_WARM_START) {
4476 4476                          mode = DDI_WARMDI;
↓ open down ↓ 62 lines elided ↑ open up ↑
4539 4539                  }
4540 4540  
4541 4541                  /* Wait if adapter is in transition */
4542 4542                  i = 0;
4543 4543                  while ((hba->flag & (FC_ONLINING_MODE | FC_OFFLINING_MODE))) {
4544 4544                          if (i++ > 30) {
4545 4545                                  break;
4546 4546                          }
4547 4547  
4548 4548                          mutex_exit(&EMLXS_PORT_LOCK);
4549      -                        delay(drv_usectohz(1000000));
     4549 +                        delay(drv_sectohz(1));
4550 4550                          mutex_enter(&EMLXS_PORT_LOCK);
4551 4551                  }
4552 4552  
4553 4553                  /* Return current state */
4554 4554                  if (hba->flag & FC_ONLINE_MODE) {
4555 4555                          mode = DDI_ONDI;
4556 4556                  } else {
4557 4557                          mode = DDI_OFFDI;
4558 4558                  }
4559 4559  
↓ open down ↓ 3757 lines elided ↑ open up ↑
8317 8317                  EMLXS_MSGF(EMLXS_CONTEXT, &emlxs_dfc_error_msg,
8318 8318                      "%s: %s failed. mbxstatus=0x%x",
8319 8319                      emlxs_dfc_xlate(EMLXS_LOOPBACK_MODE),
8320 8320                      emlxs_mb_cmd_xlate(mb->mbxCommand), mbxstatus);
8321 8321  
8322 8322                  rval = DFC_IO_ERROR;
8323 8323                  if (mbxstatus == MBX_TIMEOUT)
8324 8324                          rval = DFC_TIMEOUT;
8325 8325          }
8326 8326  
8327      -        delay(drv_usectohz(1000000));
     8327 +        delay(drv_sectohz(1));
8328 8328          i = 0;
8329 8329          while ((hba->state < FC_LINK_UP) && (hba->state != FC_ERROR)) {
8330 8330                  delay(drv_usectohz(100000));
8331 8331                  i++;
8332 8332  
8333 8333                  if (i == 300) {
8334 8334                          rval = DFC_TIMEOUT;
8335 8335  
8336 8336                          EMLXS_MSGF(EMLXS_CONTEXT, &emlxs_dfc_error_msg,
8337 8337                              "%s: Linkup timeout.",
↓ open down ↓ 2715 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX