Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d7c20b7 authored by Anton Blanchard's avatar Anton Blanchard Committed by James Bottomley
Browse files

[SCSI] ipr: Always initiate hard reset in kdump kernel 



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: default avatarAnton Blanchard <anton@samba.org>
Cc: <stable@kernel.org>
Acked-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 98cbe371

drivers/scsi/ipr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -8812,7 +8812,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, 
	uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg32);

	uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg32);

	if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT))

	if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT))

		ioa_cfg->needs_hard_reset = 1;

		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;

		ioa_cfg->needs_hard_reset = 1;

	if (interrupts & IPR_PCII_IOA_UNIT_CHECKED)

	if (interrupts & IPR_PCII_IOA_UNIT_CHECKED)

		ioa_cfg->ioa_unit_checked = 1;

		ioa_cfg->ioa_unit_checked = 1;