| From 5d7c20b7fa5c6ca19e871b4050e321c99d32bd43 Mon Sep 17 00:00:00 2001 |
| From: Anton Blanchard <anton@samba.org> |
| Date: Mon, 1 Aug 2011 19:43:45 +1000 |
| Subject: [SCSI] ipr: Always initiate hard reset in kdump kernel |
| |
| From: Anton Blanchard <anton@samba.org> |
| |
| commit 5d7c20b7fa5c6ca19e871b4050e321c99d32bd43 upstream. |
| |
| During kdump testing I noticed timeouts when initialising each IPR |
| adapter. While the driver has logic to detect an adapter in an |
| indeterminate state, it wasn't triggering and each adapter went |
| through a 5 minute timeout before finally going operational. |
| |
| Some analysis showed the needs_hard_reset flag wasn't getting set. |
| We can check the reset_devices kernel parameter which is set by |
| kdump and force a full reset. This fixes the problem. |
| |
| Signed-off-by: Anton Blanchard <anton@samba.org> |
| Acked-by: Brian King <brking@linux.vnet.ibm.com> |
| Signed-off-by: James Bottomley <JBottomley@Parallels.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/scsi/ipr.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/scsi/ipr.c |
| +++ b/drivers/scsi/ipr.c |
| @@ -7673,7 +7673,7 @@ static int __devinit ipr_probe_ioa(struc |
| 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) |
| + if ((interrupts & IPR_PCII_ERROR_INTERRUPTS) || reset_devices) |
| ioa_cfg->needs_hard_reset = 1; |
| if (interrupts & IPR_PCII_IOA_UNIT_CHECKED) |
| ioa_cfg->ioa_unit_checked = 1; |
