Print this page
XXXX introduce drv_sectohz

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_nx.c
          +++ new/usr/src/uts/common/io/fibre-channel/fca/qlc/ql_nx.c
↓ open down ↓ 1111 lines elided ↑ open up ↑
1112 1112  
1113 1113          return (0);
1114 1114  }
1115 1115  
1116 1116  static int
1117 1117  ql_8021_wait_flash_done(ql_adapter_state_t *ha)
1118 1118  {
1119 1119          clock_t         timer;
1120 1120          uint32_t        status;
1121 1121  
1122      -        for (timer = 30 * drv_usectohz(1000000); timer; timer--) {
     1122 +        for (timer = drv_sectohz(30); timer; timer--) {
1123 1123                  ql_8021_wr_32(ha, UNM_ROMUSB_ROM_ABYTE_CNT, 0);
1124 1124                  ql_8021_wr_32(ha, UNM_ROMUSB_ROM_INSTR_OPCODE,
1125 1125                      UNM_ROMUSB_ROM_RDSR_INSTR);
1126 1126                  if (ql_8021_wait_rom_done(ha)) {
1127 1127                          EL(ha, "Error waiting for rom done2\n");
1128 1128                          return (-1);
1129 1129                  }
1130 1130  
1131 1131                  /* Get status. */
1132 1132                  ql_8021_rd_32(ha, UNM_ROMUSB_ROM_RDATA, &status);
↓ open down ↓ 468 lines elided ↑ open up ↑
1601 1601          return (0);
1602 1602  }
1603 1603  
1604 1604  static int
1605 1605  ql_8021_init_p3p(ql_adapter_state_t *ha)
1606 1606  {
1607 1607          uint32_t        data;
1608 1608  
1609 1609          /* ??? */
1610 1610          ql_8021_wr_32(ha, UNM_PORT_MODE_ADDR, UNM_PORT_MODE_AUTO_NEG);
1611      -        delay(drv_usectohz(1000000));
     1611 +        delay(drv_sectohz(1));
1612 1612  
1613 1613          /* CAM RAM Cold Boot Register */
1614 1614          ql_8021_rd_32(ha, UNM_RAM_COLD_BOOT, &data);
1615 1615          if (data == 0x55555555) {
1616 1616                  ql_8021_rd_32(ha, UNM_ROMUSB_GLB_SW_RESET, &data);
1617 1617                  if (data != 0x80000f) {
1618 1618                          EL(ha, "CRB_UNM_GLB_SW_RST=%x exit\n", data);
1619 1619                          return (-1);
1620 1620                  }
1621 1621                  ql_8021_wr_32(ha, UNM_RAM_COLD_BOOT, 0);
↓ open down ↓ 350 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX