[SCSI] hpsa: Do not attempt kdump if we detect resetting controller failed.

We can get completions left over from before the attempted reset which
will interfere with the kdump.  Better to just not make the attempt in
that case.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Stephen M. Cameron 2011-02-15 15:33:08 -06:00 committed by James Bottomley
parent 960a30e7a7
commit ba95e2ac6b

View File

@ -3264,13 +3264,13 @@ static __devinit int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
* It means we're on one of those controllers which doesn't support * It means we're on one of those controllers which doesn't support
* the doorbell reset method and on which the PCI power management reset * the doorbell reset method and on which the PCI power management reset
* method doesn't work (P800, for example.) * method doesn't work (P800, for example.)
* In those cases, pretend the reset worked and hope for the best. * In those cases, don't try to proceed, as it generally doesn't work.
*/ */
active_transport = readl(&cfgtable->TransportActive); active_transport = readl(&cfgtable->TransportActive);
if (active_transport & PERFORMANT_MODE) { if (active_transport & PERFORMANT_MODE) {
dev_warn(&pdev->dev, "Unable to successfully reset controller," dev_warn(&pdev->dev, "Unable to successfully reset controller,"
" proceeding anyway.\n"); " Ignoring controller.\n");
rc = -ENOTSUPP; rc = -ENODEV;
} }
unmap_cfgtable: unmap_cfgtable: