X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fqla2xxx%2Fqla_isr.c;h=603d4c683c6ce337c175903fcea2c4d479e148d9;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=382a4fe93a194f2f3dd9cbd79c3e7ade74207b5e;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 382a4fe93..603d4c683 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -16,9 +16,6 @@ * General Public License for more details. * */ - -#include "qla_os.h" - #include "qla_def.h" static void qla2x00_mbx_completion(scsi_qla_host_t *, uint16_t); @@ -33,7 +30,7 @@ static void qla2x00_ms_entry(scsi_qla_host_t *, ms_iocb_entry_t *); static int qla2x00_check_sense(struct scsi_cmnd *cp, os_lun_t *); /** - * qla2x00_intr_handler() - Process interrupts for the ISP. + * qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200. * @irq: * @dev_id: SCSI driver HA context * @regs: @@ -43,20 +40,14 @@ static int qla2x00_check_sense(struct scsi_cmnd *cp, os_lun_t *); * Returns handled flag. */ irqreturn_t -qla2x00_intr_handler(int irq, void *dev_id, struct pt_regs *regs) +qla2100_intr_handler(int irq, void *dev_id, struct pt_regs *regs) { scsi_qla_host_t *ha; - device_reg_t *reg; + device_reg_t __iomem *reg; + int status; + unsigned long flags; + unsigned long iter; uint32_t mbx; - int status = 0; - unsigned long flags = 0; - unsigned long mbx_flags = 0; - unsigned long intr_iter; - uint32_t stat; - uint16_t hccr; - - /* Don't loop forever, interrupt are OFF */ - intr_iter = 50; ha = (scsi_qla_host_t *) dev_id; if (!ha) { @@ -66,159 +57,172 @@ qla2x00_intr_handler(int irq, void *dev_id, struct pt_regs *regs) } reg = ha->iobase; + status = 0; spin_lock_irqsave(&ha->hardware_lock, flags); - - for (;;) { - /* Relax CPU! */ - if (!(intr_iter--)) + for (iter = 50; iter--; ) { + if ((RD_REG_WORD(®->istatus) & ISR_RISC_INT) == 0) break; - if (IS_QLA2100(ha) || IS_QLA2200(ha)) { - if ((RD_REG_WORD(®->istatus) & ISR_RISC_INT) == 0) - break; - - if (RD_REG_WORD(®->semaphore) & BIT_0) { - WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT); - RD_REG_WORD(®->hccr); - - /* Get mailbox data. */ - mbx = RD_MAILBOX_REG(ha, reg, 0); - if (mbx > 0x3fff && mbx < 0x8000) { - qla2x00_mbx_completion(ha, - (uint16_t)mbx); - status |= MBX_INTERRUPT; - } else if (mbx > 0x7fff && mbx < 0xc000) { - qla2x00_async_event(ha, mbx); - } else { - /*EMPTY*/ - DEBUG2(printk("scsi(%ld): Unrecognized " - "interrupt type (%d)\n", - ha->host_no, mbx)); - } - /* Release mailbox registers. */ - WRT_REG_WORD(®->semaphore, 0); - /* Workaround for ISP2100 chip. */ - if (IS_QLA2100(ha)) - RD_REG_WORD(®->semaphore); - } else { - qla2x00_process_response_queue(ha); - - WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT); - RD_REG_WORD(®->hccr); - } - } else /* IS_QLA23XX(ha) */ { - stat = RD_REG_DWORD(®->u.isp2300.host_status); - if ((stat & HSR_RISC_INT) == 0) - break; + if (RD_REG_WORD(®->semaphore) & BIT_0) { + WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT); + RD_REG_WORD(®->hccr); - mbx = MSW(stat); - switch (stat & 0xff) { - case 0x13: - qla2x00_process_response_queue(ha); - break; - case 0x1: - case 0x2: - case 0x10: - case 0x11: + /* Get mailbox data. */ + mbx = RD_MAILBOX_REG(ha, reg, 0); + if (mbx > 0x3fff && mbx < 0x8000) { qla2x00_mbx_completion(ha, (uint16_t)mbx); status |= MBX_INTERRUPT; - - /* Release mailbox registers. */ - WRT_REG_WORD(®->semaphore, 0); - break; - case 0x12: - qla2x00_async_event(ha, mbx); - break; - case 0x15: - mbx = mbx << 16 | MBA_CMPLT_1_16BIT; + } else if (mbx > 0x7fff && mbx < 0xc000) { qla2x00_async_event(ha, mbx); - break; - case 0x16: - mbx = mbx << 16 | MBA_SCSI_COMPLETION; - qla2x00_async_event(ha, mbx); - break; - default: - hccr = RD_REG_WORD(®->hccr); - if (hccr & HCCR_RISC_PAUSE) { - qla_printk(KERN_INFO, ha, - "RISC paused, dumping HCCR=%x\n", - hccr); - - /* - * Issue a "HARD" reset in order for - * the RISC interrupt bit to be - * cleared. Schedule a big hammmer to - * get out of the RISC PAUSED state. - */ - WRT_REG_WORD(®->hccr, - HCCR_RESET_RISC); - RD_REG_WORD(®->hccr); - set_bit(ISP_ABORT_NEEDED, - &ha->dpc_flags); - break; - } else { - DEBUG2(printk("scsi(%ld): Unrecognized " - "interrupt type (%d)\n", - ha->host_no, stat & 0xff)); - } - break; + } else { + /*EMPTY*/ + DEBUG2(printk("scsi(%ld): Unrecognized " + "interrupt type (%d)\n", + ha->host_no, mbx)); } + /* Release mailbox registers. */ + WRT_REG_WORD(®->semaphore, 0); + RD_REG_WORD(®->semaphore); + } else { + qla2x00_process_response_queue(ha); + WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT); - RD_REG_WORD_RELAXED(®->hccr); + RD_REG_WORD(®->hccr); } } - spin_unlock_irqrestore(&ha->hardware_lock, flags); qla2x00_next(ha); - ha->last_irq_cpu = smp_processor_id(); + ha->last_irq_cpu = _smp_processor_id(); ha->total_isr_cnt++; if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) && (status & MBX_INTERRUPT) && ha->flags.mbox_int) { + spin_lock_irqsave(&ha->mbx_reg_lock, flags); - /* There was a mailbox completion */ - DEBUG3(printk("%s(%ld): Going to get mbx reg lock.\n", - __func__, ha->host_no)); + set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags); + up(&ha->mbx_intr_sem); - spin_lock_irqsave(&ha->mbx_reg_lock, mbx_flags); + spin_unlock_irqrestore(&ha->mbx_reg_lock, flags); + } - if (ha->mcp == NULL) { - DEBUG3(printk("%s(%ld): Error mbx pointer.\n", - __func__, ha->host_no)); - } else { - DEBUG3(printk("%s(%ld): Going to set mbx intr flags. " - "cmd=%x.\n", - __func__, ha->host_no, ha->mcp->mb[0])); - } - set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags); + if (!list_empty(&ha->done_queue)) + qla2x00_done(ha); - DEBUG3(printk("%s(%ld): Going to wake up mbx function for " - "completion.\n", - __func__, ha->host_no)); + return (IRQ_HANDLED); +} - up(&ha->mbx_intr_sem); +/** + * qla2300_intr_handler() - Process interrupts for the ISP23xx and ISP63xx. + * @irq: + * @dev_id: SCSI driver HA context + * @regs: + * + * Called by system whenever the host adapter generates an interrupt. + * + * Returns handled flag. + */ +irqreturn_t +qla2300_intr_handler(int irq, void *dev_id, struct pt_regs *regs) +{ + scsi_qla_host_t *ha; + device_reg_t __iomem *reg; + int status; + unsigned long flags; + unsigned long iter; + uint32_t stat; + uint32_t mbx; + uint16_t hccr; - DEBUG3(printk("%s(%ld): Going to release mbx reg lock.\n", - __func__, ha->host_no)); + ha = (scsi_qla_host_t *) dev_id; + if (!ha) { + printk(KERN_INFO + "%s(): NULL host pointer\n", __func__); + return (IRQ_NONE); + } + + reg = ha->iobase; + status = 0; + + spin_lock_irqsave(&ha->hardware_lock, flags); + for (iter = 50; iter--; ) { + stat = RD_REG_DWORD(®->u.isp2300.host_status); + if (stat & HSR_RISC_PAUSED) { + hccr = RD_REG_WORD(®->hccr); + if (hccr & (BIT_15 | BIT_13 | BIT_11 | BIT_8)) + qla_printk(KERN_INFO, ha, + "Parity error -- HCCR=%x.\n", hccr); + else + qla_printk(KERN_INFO, ha, + "RISC paused -- HCCR=%x\n", hccr); + + /* + * Issue a "HARD" reset in order for the RISC + * interrupt bit to be cleared. Schedule a big + * hammmer to get out of the RISC PAUSED state. + */ + WRT_REG_WORD(®->hccr, HCCR_RESET_RISC); + RD_REG_WORD(®->hccr); + set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); + break; + } else if ((stat & HSR_RISC_INT) == 0) + break; - spin_unlock_irqrestore(&ha->mbx_reg_lock, mbx_flags); + mbx = MSW(stat); + switch (stat & 0xff) { + case 0x13: + qla2x00_process_response_queue(ha); + break; + case 0x1: + case 0x2: + case 0x10: + case 0x11: + qla2x00_mbx_completion(ha, (uint16_t)mbx); + status |= MBX_INTERRUPT; + + /* Release mailbox registers. */ + WRT_REG_WORD(®->semaphore, 0); + break; + case 0x12: + qla2x00_async_event(ha, mbx); + break; + case 0x15: + mbx = mbx << 16 | MBA_CMPLT_1_16BIT; + qla2x00_async_event(ha, mbx); + break; + case 0x16: + mbx = mbx << 16 | MBA_SCSI_COMPLETION; + qla2x00_async_event(ha, mbx); + break; + default: + DEBUG2(printk("scsi(%ld): Unrecognized interrupt type " + "(%d)\n", + ha->host_no, stat & 0xff)); + break; + } + WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT); + RD_REG_WORD_RELAXED(®->hccr); } + spin_unlock_irqrestore(&ha->hardware_lock, flags); - if (!list_empty(&ha->done_queue)) - qla2x00_done(ha); + qla2x00_next(ha); + ha->last_irq_cpu = _smp_processor_id(); + ha->total_isr_cnt++; - /* Wakeup the DPC routine */ - if ((!ha->flags.mbox_busy && - (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || - test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) || - test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))) && - ha->dpc_wait && !ha->dpc_active) { + if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) && + (status & MBX_INTERRUPT) && ha->flags.mbox_int) { + spin_lock_irqsave(&ha->mbx_reg_lock, flags); - up(ha->dpc_wait); + set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags); + up(&ha->mbx_intr_sem); + + spin_unlock_irqrestore(&ha->mbx_reg_lock, flags); } + if (!list_empty(&ha->done_queue)) + qla2x00_done(ha); + return (IRQ_HANDLED); } @@ -231,17 +235,17 @@ static void qla2x00_mbx_completion(scsi_qla_host_t *ha, uint16_t mb0) { uint16_t cnt; - uint16_t *wptr; - device_reg_t *reg = ha->iobase; + uint16_t __iomem *wptr; + device_reg_t __iomem *reg = ha->iobase; /* Load return mailbox registers. */ - ha->flags.mbox_int = TRUE; + ha->flags.mbox_int = 1; ha->mailbox_out[0] = mb0; - wptr = (uint16_t *)MAILBOX_REG(ha, reg, 1); + wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 1); for (cnt = 1; cnt < ha->mbx_count; cnt++) { if (IS_QLA2200(ha) && cnt == 8) - wptr = (uint16_t *)MAILBOX_REG(ha, reg, 8); + wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8); if (cnt == 4 || cnt == 5) ha->mailbox_out[cnt] = qla2x00_debounce_register(wptr); else @@ -273,7 +277,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx) uint16_t handle_cnt; uint16_t cnt; uint32_t handles[5]; - device_reg_t *reg = ha->iobase; + device_reg_t __iomem *reg = ha->iobase; uint32_t rscn_entry, host_pid; uint8_t rscn_queue_index; @@ -344,7 +348,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx) break; } - mb[0] = LSW(mbx); switch (mb[0]) { case MBA_SCSI_COMPLETION: /* Fast Post */ if (!ha->flags.online) @@ -373,7 +376,14 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx) qla2100_fw_dump(ha, 1); else qla2300_fw_dump(ha, 1); - set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); + + if (mb[1] == 0) { + qla_printk(KERN_INFO, ha, + "Unrecoverable Hardware Error: adapter marked " + "OFFLINE!\n"); + ha->flags.online = 0; + } else + set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); break; case MBA_REQ_TRANSFER_ERR: /* Request Transfer Error */ @@ -558,8 +568,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx) rscn_fcport = qla2x00_alloc_rscn_fcport(ha, GFP_ATOMIC); if (rscn_fcport) { DEBUG14(printk("scsi(%ld): Port Update -- " - "creating RSCN fcport %p for login.\n", - ha->host_no, rscn_fcport)); + "creating RSCN fcport %p for %x/%x.\n", + ha->host_no, rscn_fcport, mb[1], mb[2])); rscn_fcport->loop_id = mb[1]; rscn_fcport->d_id.b24 = INVALID_PORT_ID; @@ -584,7 +594,9 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx) * event etc. earlier indicating loop is down) then process * it. Otherwise ignore it and Wait for RSCN to come in. */ - if (atomic_read(&ha->loop_state) != LOOP_DOWN) { + atomic_set(&ha->loop_down_timer, 0); + if (atomic_read(&ha->loop_state) != LOOP_DOWN && + atomic_read(&ha->loop_state) != LOOP_DEAD) { DEBUG2(printk("scsi(%ld): Asynchronous PORT UPDATE " "ignored.\n", ha->host_no)); break; @@ -601,7 +613,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx) */ atomic_set(&ha->loop_state, LOOP_UP); - atomic_set(&ha->loop_down_timer, 0); qla2x00_mark_all_devices_lost(ha); ha->flags.rscn_queue_overflow = 1; @@ -692,7 +703,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *ha, uint32_t index) sp = ha->outstanding_cmds[index]; if (sp) { /* Free outstanding command slot. */ - ha->outstanding_cmds[index] = 0; + ha->outstanding_cmds[index] = NULL; if (ha->actthreads) ha->actthreads--; @@ -721,7 +732,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *ha, uint32_t index) void qla2x00_process_response_queue(struct scsi_qla_host *ha) { - device_reg_t *reg = ha->iobase; + device_reg_t __iomem *reg = ha->iobase; sts_entry_t *pkt; uint16_t handle_cnt; uint16_t cnt; @@ -827,7 +838,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) uint16_t comp_status; uint16_t scsi_status; uint8_t lscsi_status; - uint32_t resid; + int32_t resid; uint8_t sense_sz = 0; uint16_t rsp_info_len; @@ -842,7 +853,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) /* Validate handle. */ if (pkt->handle < MAX_OUTSTANDING_COMMANDS) { sp = ha->outstanding_cmds[pkt->handle]; - ha->outstanding_cmds[pkt->handle] = 0; + ha->outstanding_cmds[pkt->handle] = NULL; } else sp = NULL; @@ -948,6 +959,11 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) cp->result = DID_OK << 16; break; } + if (scsi_status & (SS_RESIDUAL_UNDER | SS_RESIDUAL_OVER)) { + resid = le32_to_cpu(pkt->residual_length); + cp->resid = resid; + CMD_RESID_LEN(cp) = resid; + } if (lscsi_status == SS_BUSY_CONDITION) { cp->result = DID_BUS_BUSY << 16 | lscsi_status; break; @@ -970,7 +986,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) sizeof(cp->sense_buffer)) sense_sz = le16_to_cpu(pkt->req_sense_length); else - sense_sz = sizeof(cp->sense_buffer) - 1; + sense_sz = sizeof(cp->sense_buffer); CMD_ACTUAL_SNSLEN(cp) = sense_sz; sp->request_sense_length = sense_sz; @@ -1009,7 +1025,10 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) ha->host_no, t, l, comp_status, scsi_status)); resid = le32_to_cpu(pkt->residual_length); - CMD_RESID_LEN(cp) = resid; + if (scsi_status & SS_RESIDUAL_UNDER) { + cp->resid = resid; + CMD_RESID_LEN(cp) = resid; + } /* * Check to see if SCSI Status is non zero. If so report SCSI @@ -1037,7 +1056,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) sizeof(cp->sense_buffer)) sense_sz = le16_to_cpu(pkt->req_sense_length); else - sense_sz = sizeof(cp->sense_buffer) - 1; + sense_sz = sizeof(cp->sense_buffer); CMD_ACTUAL_SNSLEN(cp) = sense_sz; sp->request_sense_length = sense_sz; @@ -1085,7 +1104,6 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) } /* Handle mid-layer underflow */ - cp->resid = resid; if ((unsigned)(cp->request_bufflen - resid) < cp->underflow) { qla_printk(KERN_INFO, ha, @@ -1186,8 +1204,9 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) case CS_TIMEOUT: DEBUG2(printk(KERN_INFO - "scsi(%ld:%d:%d:%d): TIMEOUT status detected 0x%x-0x%x.\n", - ha->host_no, b, t, l, comp_status, scsi_status)); + "scsi(%ld:%d:%d:%d): TIMEOUT status detected 0x%x-0x%x " + "sflags=%x.\n", ha->host_no, b, t, l, comp_status, + scsi_status, le16_to_cpu(pkt->status_flags))); cp->result = DID_BUS_BUSY << 16; @@ -1319,7 +1338,7 @@ qla2x00_error_entry(scsi_qla_host_t *ha, sts_entry_t *pkt) if (sp) { /* Free outstanding command slot. */ - ha->outstanding_cmds[pkt->handle] = 0; + ha->outstanding_cmds[pkt->handle] = NULL; if (ha->actthreads) ha->actthreads--; sp->lun_queue->out_cnt--; @@ -1382,7 +1401,7 @@ qla2x00_ms_entry(scsi_qla_host_t *ha, ms_iocb_entry_t *pkt) CMD_ENTRY_STATUS(sp->cmd) = pkt->entry_status; /* Free outstanding command slot. */ - ha->outstanding_cmds[pkt->handle1] = 0; + ha->outstanding_cmds[pkt->handle1] = NULL; add_to_done_queue(ha, sp); }