If an ipr adapter encounters an adapter error requiring an adapter reset to recover from prior to driver load time, the error will be ignored and recovery will not happen until the initial timeout occurs waiting for the firmware to come ready, which means a five minute timeout. Fix is to read the interrupt register before clearing any of the interrupts at probe time. Signed-off-by: Brian King <brking@xxxxxxxxxxxxxxxxxx> --- linux-2.6-bjking1/drivers/scsi/ipr.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) diff -puN drivers/scsi/ipr.c~ipr_boot_errors drivers/scsi/ipr.c --- linux-2.6/drivers/scsi/ipr.c~ipr_boot_errors 2007-05-01 13:38:17.000000000 -0500 +++ linux-2.6-bjking1/drivers/scsi/ipr.c 2007-05-01 13:38:17.000000000 -0500 @@ -7451,7 +7451,7 @@ static int __devinit ipr_probe_ioa(struc unsigned long ipr_regs_pci; void __iomem *ipr_regs; int rc = PCIBIOS_SUCCESSFUL; - volatile u32 mask, uproc; + volatile u32 mask, uproc, interrupts; ENTER; @@ -7558,9 +7558,14 @@ static int __devinit ipr_probe_ioa(struc * the card is in an unknown state and needs a hard reset */ mask = readl(ioa_cfg->regs.sense_interrupt_mask_reg); + interrupts = readl(ioa_cfg->regs.sense_interrupt_reg); uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg); if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT)) ioa_cfg->needs_hard_reset = 1; + if (interrupts & IPR_PCII_ERROR_INTERRUPTS) + ioa_cfg->needs_hard_reset = 1; + if (interrupts & IPR_PCII_IOA_UNIT_CHECKED) + ioa_cfg->ioa_unit_checked = 1; ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER); rc = request_irq(pdev->irq, ipr_isr, IRQF_SHARED, IPR_NAME, ioa_cfg); _ - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
