From 76296e9c3235799f93850f8405c574f5aa7aa492 Mon Sep 17 00:00:00 2001 From: Brian King Date: Wed, 2 May 2007 10:44:11 -0500 Subject: [PATCH] --- yaml --- r: 55223 b: refs/heads/master c: 473b1e8ed2e4f545de22e58c8c073471b18459e8 h: refs/heads/master i: 55221: 31d384a9e516dbcc1af715006539dc79e26c3414 55219: 381e42a4083078d3ddccf3011906cbd1bc45195b 55215: fb27c759f9b9862bb6481d20b052fa9b7c1525c4 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 19a29b5e0e0f..28aa323c2268 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6bcbc2f5ddd6de8a0e08ea3871585abcc82ecd6 +refs/heads/master: 473b1e8ed2e4f545de22e58c8c073471b18459e8 diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index b15dfcbde4a0..101e519844df 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -7444,7 +7444,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, unsigned long ipr_regs_pci; void __iomem *ipr_regs; int rc = PCIBIOS_SUCCESSFUL; - volatile u32 mask, uproc; + volatile u32 mask, uproc, interrupts; ENTER; @@ -7551,9 +7551,14 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, * 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);