|
@@ -2420,7 +2420,7 @@ static int qla4_8xxx_check_temp(struct scsi_qla_host *ha)
|
|
|
uint32_t temp, temp_state, temp_val;
|
|
|
int status = QLA_SUCCESS;
|
|
|
|
|
|
- temp = qla4_8xxx_rd_32(ha, CRB_TEMP_STATE);
|
|
|
+ temp = qla4_82xx_rd_32(ha, CRB_TEMP_STATE);
|
|
|
|
|
|
temp_state = qla82xx_get_temp_state(temp);
|
|
|
temp_val = qla82xx_get_temp_val(temp);
|
|
@@ -2456,7 +2456,7 @@ static int qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)
|
|
|
uint32_t fw_heartbeat_counter;
|
|
|
int status = QLA_SUCCESS;
|
|
|
|
|
|
- fw_heartbeat_counter = qla4_8xxx_rd_32(ha, QLA82XX_PEG_ALIVE_COUNTER);
|
|
|
+ fw_heartbeat_counter = qla4_82xx_rd_32(ha, QLA82XX_PEG_ALIVE_COUNTER);
|
|
|
/* If PEG_ALIVE_COUNTER is 0xffffffff, AER/EEH is in progress, ignore */
|
|
|
if (fw_heartbeat_counter == 0xffffffff) {
|
|
|
DEBUG2(printk(KERN_WARNING "scsi%ld: %s: Device in frozen "
|
|
@@ -2478,19 +2478,19 @@ static int qla4_8xxx_check_fw_alive(struct scsi_qla_host *ha)
|
|
|
" 0x%x,\n PEG_NET_2_PC: 0x%x, PEG_NET_3_PC:"
|
|
|
" 0x%x,\n PEG_NET_4_PC: 0x%x\n",
|
|
|
ha->host_no, __func__,
|
|
|
- qla4_8xxx_rd_32(ha,
|
|
|
+ qla4_82xx_rd_32(ha,
|
|
|
QLA82XX_PEG_HALT_STATUS1),
|
|
|
- qla4_8xxx_rd_32(ha,
|
|
|
+ qla4_82xx_rd_32(ha,
|
|
|
QLA82XX_PEG_HALT_STATUS2),
|
|
|
- qla4_8xxx_rd_32(ha, QLA82XX_CRB_PEG_NET_0 +
|
|
|
+ qla4_82xx_rd_32(ha, QLA82XX_CRB_PEG_NET_0 +
|
|
|
0x3c),
|
|
|
- qla4_8xxx_rd_32(ha, QLA82XX_CRB_PEG_NET_1 +
|
|
|
+ qla4_82xx_rd_32(ha, QLA82XX_CRB_PEG_NET_1 +
|
|
|
0x3c),
|
|
|
- qla4_8xxx_rd_32(ha, QLA82XX_CRB_PEG_NET_2 +
|
|
|
+ qla4_82xx_rd_32(ha, QLA82XX_CRB_PEG_NET_2 +
|
|
|
0x3c),
|
|
|
- qla4_8xxx_rd_32(ha, QLA82XX_CRB_PEG_NET_3 +
|
|
|
+ qla4_82xx_rd_32(ha, QLA82XX_CRB_PEG_NET_3 +
|
|
|
0x3c),
|
|
|
- qla4_8xxx_rd_32(ha, QLA82XX_CRB_PEG_NET_4 +
|
|
|
+ qla4_82xx_rd_32(ha, QLA82XX_CRB_PEG_NET_4 +
|
|
|
0x3c));
|
|
|
status = QLA_ERROR;
|
|
|
}
|
|
@@ -2515,12 +2515,12 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
|
|
|
if (!(test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags) ||
|
|
|
test_bit(DPC_RESET_HA, &ha->dpc_flags) ||
|
|
|
test_bit(DPC_RETRY_RESET_HA, &ha->dpc_flags))) {
|
|
|
- dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
|
|
|
+ dev_state = qla4_82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
|
|
|
|
|
|
if (qla4_8xxx_check_temp(ha)) {
|
|
|
ql4_printk(KERN_INFO, ha, "disabling pause"
|
|
|
" transmit on port 0 & 1.\n");
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
|
|
|
CRB_NIU_XG_PAUSE_CTL_P0 |
|
|
|
CRB_NIU_XG_PAUSE_CTL_P1);
|
|
|
set_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags);
|
|
@@ -2544,10 +2544,10 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
|
|
|
if (qla4_8xxx_check_fw_alive(ha)) {
|
|
|
ql4_printk(KERN_INFO, ha, "disabling pause"
|
|
|
" transmit on port 0 & 1.\n");
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
|
|
|
CRB_NIU_XG_PAUSE_CTL_P0 |
|
|
|
CRB_NIU_XG_PAUSE_CTL_P1);
|
|
|
- halt_status = qla4_8xxx_rd_32(ha,
|
|
|
+ halt_status = qla4_82xx_rd_32(ha,
|
|
|
QLA82XX_PEG_HALT_STATUS1);
|
|
|
|
|
|
if (QLA82XX_FWERROR_CODE(halt_status) == 0x67)
|
|
@@ -3040,9 +3040,9 @@ recover_ha_init_adapter:
|
|
|
* with multiple resets in the same thread,
|
|
|
* utilize DPC to retry */
|
|
|
if (is_qla8022(ha)) {
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
- dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
+ dev_state = qla4_82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
if (dev_state == QLA82XX_DEV_FAILED) {
|
|
|
ql4_printk(KERN_INFO, ha, "%s: don't retry "
|
|
|
"recover adapter. H/W is in Failed "
|
|
@@ -3385,10 +3385,10 @@ static void qla4xxx_do_dpc(struct work_struct *work)
|
|
|
|
|
|
if (is_qla8022(ha)) {
|
|
|
if (test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags)) {
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
QLA82XX_DEV_FAILED);
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
ql4_printk(KERN_INFO, ha, "HW State: FAILED\n");
|
|
|
qla4_8xxx_device_state_handler(ha);
|
|
|
}
|
|
@@ -3512,9 +3512,9 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha)
|
|
|
ha->isp_ops->reset_firmware(ha);
|
|
|
|
|
|
if (is_qla8022(ha)) {
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
qla4_8xxx_clear_drv_active(ha);
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
}
|
|
|
|
|
|
/* Detach interrupts */
|
|
@@ -3663,17 +3663,17 @@ static struct isp_operations qla4xxx_isp_ops = {
|
|
|
static struct isp_operations qla4_8xxx_isp_ops = {
|
|
|
.iospace_config = qla4_8xxx_iospace_config,
|
|
|
.pci_config = qla4_8xxx_pci_config,
|
|
|
- .disable_intrs = qla4_8xxx_disable_intrs,
|
|
|
- .enable_intrs = qla4_8xxx_enable_intrs,
|
|
|
+ .disable_intrs = qla4_82xx_disable_intrs,
|
|
|
+ .enable_intrs = qla4_82xx_enable_intrs,
|
|
|
.start_firmware = qla4_8xxx_load_risc,
|
|
|
- .intr_handler = qla4_8xxx_intr_handler,
|
|
|
- .interrupt_service_routine = qla4_8xxx_interrupt_service_routine,
|
|
|
- .reset_chip = qla4_8xxx_isp_reset,
|
|
|
+ .intr_handler = qla4_82xx_intr_handler,
|
|
|
+ .interrupt_service_routine = qla4_82xx_interrupt_service_routine,
|
|
|
+ .reset_chip = qla4_82xx_isp_reset,
|
|
|
.reset_firmware = qla4_8xxx_stop_firmware,
|
|
|
- .queue_iocb = qla4_8xxx_queue_iocb,
|
|
|
- .complete_iocb = qla4_8xxx_complete_iocb,
|
|
|
- .rd_shdw_req_q_out = qla4_8xxx_rd_shdw_req_q_out,
|
|
|
- .rd_shdw_rsp_q_in = qla4_8xxx_rd_shdw_rsp_q_in,
|
|
|
+ .queue_iocb = qla4_82xx_queue_iocb,
|
|
|
+ .complete_iocb = qla4_82xx_complete_iocb,
|
|
|
+ .rd_shdw_req_q_out = qla4_82xx_rd_shdw_req_q_out,
|
|
|
+ .rd_shdw_rsp_q_in = qla4_82xx_rd_shdw_rsp_q_in,
|
|
|
.get_sys_info = qla4_8xxx_get_sys_info,
|
|
|
};
|
|
|
|
|
@@ -3682,7 +3682,7 @@ uint16_t qla4xxx_rd_shdw_req_q_out(struct scsi_qla_host *ha)
|
|
|
return (uint16_t)le32_to_cpu(ha->shadow_regs->req_q_out);
|
|
|
}
|
|
|
|
|
|
-uint16_t qla4_8xxx_rd_shdw_req_q_out(struct scsi_qla_host *ha)
|
|
|
+uint16_t qla4_82xx_rd_shdw_req_q_out(struct scsi_qla_host *ha)
|
|
|
{
|
|
|
return (uint16_t)le32_to_cpu(readl(&ha->qla4_8xxx_reg->req_q_out));
|
|
|
}
|
|
@@ -3692,7 +3692,7 @@ uint16_t qla4xxx_rd_shdw_rsp_q_in(struct scsi_qla_host *ha)
|
|
|
return (uint16_t)le32_to_cpu(ha->shadow_regs->rsp_q_in);
|
|
|
}
|
|
|
|
|
|
-uint16_t qla4_8xxx_rd_shdw_rsp_q_in(struct scsi_qla_host *ha)
|
|
|
+uint16_t qla4_82xx_rd_shdw_rsp_q_in(struct scsi_qla_host *ha)
|
|
|
{
|
|
|
return (uint16_t)le32_to_cpu(readl(&ha->qla4_8xxx_reg->rsp_q_in));
|
|
|
}
|
|
@@ -5161,9 +5161,9 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
|
|
|
init_retry_count++ < MAX_INIT_RETRIES) {
|
|
|
|
|
|
if (is_qla8022(ha)) {
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
- dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
+ dev_state = qla4_82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
if (dev_state == QLA82XX_DEV_FAILED) {
|
|
|
ql4_printk(KERN_WARNING, ha, "%s: don't retry "
|
|
|
"initialize adapter. H/W is in failed state\n",
|
|
@@ -5186,10 +5186,10 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
|
|
|
if (is_qla8022(ha) && ql4xdontresethba) {
|
|
|
/* Put the device in failed state. */
|
|
|
DEBUG2(printk(KERN_ERR "HW STATE: FAILED\n"));
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
QLA82XX_DEV_FAILED);
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
}
|
|
|
ret = -ENODEV;
|
|
|
goto remove_host;
|
|
@@ -6033,31 +6033,31 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha)
|
|
|
"0x%x is the owner\n", ha->host_no, __func__,
|
|
|
ha->pdev->devfn);
|
|
|
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
QLA82XX_DEV_COLD);
|
|
|
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_DRV_IDC_VERSION,
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_DRV_IDC_VERSION,
|
|
|
QLA82XX_IDC_VERSION);
|
|
|
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
clear_bit(AF_FW_RECOVERY, &ha->flags);
|
|
|
rval = qla4xxx_initialize_adapter(ha, RESET_ADAPTER);
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
|
|
|
if (rval != QLA_SUCCESS) {
|
|
|
ql4_printk(KERN_INFO, ha, "scsi%ld: %s: HW State: "
|
|
|
"FAILED\n", ha->host_no, __func__);
|
|
|
qla4_8xxx_clear_drv_active(ha);
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
QLA82XX_DEV_FAILED);
|
|
|
} else {
|
|
|
ql4_printk(KERN_INFO, ha, "scsi%ld: %s: HW State: "
|
|
|
"READY\n", ha->host_no, __func__);
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
|
|
|
QLA82XX_DEV_READY);
|
|
|
/* Clear driver state register */
|
|
|
- qla4_8xxx_wr_32(ha, QLA82XX_CRB_DRV_STATE, 0);
|
|
|
+ qla4_82xx_wr_32(ha, QLA82XX_CRB_DRV_STATE, 0);
|
|
|
qla4_8xxx_set_drv_active(ha);
|
|
|
ret = qla4xxx_request_irqs(ha);
|
|
|
if (ret) {
|
|
@@ -6070,12 +6070,12 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha)
|
|
|
rval = QLA_SUCCESS;
|
|
|
}
|
|
|
}
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
} else {
|
|
|
ql4_printk(KERN_INFO, ha, "scsi%ld: %s: devfn 0x%x is not "
|
|
|
"the reset owner\n", ha->host_no, __func__,
|
|
|
ha->pdev->devfn);
|
|
|
- if ((qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE) ==
|
|
|
+ if ((qla4_82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE) ==
|
|
|
QLA82XX_DEV_READY)) {
|
|
|
clear_bit(AF_FW_RECOVERY, &ha->flags);
|
|
|
rval = qla4xxx_initialize_adapter(ha, RESET_ADAPTER);
|
|
@@ -6091,9 +6091,9 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha)
|
|
|
rval = QLA_SUCCESS;
|
|
|
}
|
|
|
}
|
|
|
- qla4_8xxx_idc_lock(ha);
|
|
|
+ qla4_82xx_idc_lock(ha);
|
|
|
qla4_8xxx_set_drv_active(ha);
|
|
|
- qla4_8xxx_idc_unlock(ha);
|
|
|
+ qla4_82xx_idc_unlock(ha);
|
|
|
}
|
|
|
}
|
|
|
clear_bit(DPC_RESET_ACTIVE, &ha->dpc_flags);
|