diff options
| author |   Salyzyn, Mark <mark_salyzyn@adaptec.com> | 2007-05-01 11:43:06 -0400 |
|---|---|---|
| committer |   James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-06 09:48:21 -0500 |
| commit | 9e4d4a5d71d673901d9c1df5146ce545c2cc0cc0 (patch) | |
| tree | e67a0a0c93d1dac2f7a50d8e03d67a432b0398ef /drivers/scsi/aacraid/rx.c | |
| parent | [SCSI] aacraid: kexec fix (reset interrupt handler) (diff) | |
| download | linux-dev-9e4d4a5d71d673901d9c1df5146ce545c2cc0cc0.tar.xz linux-dev-9e4d4a5d71d673901d9c1df5146ce545c2cc0cc0.zip | |
[SCSI] aacraid: superfluous adapter reset for IBM 8 series ServeRAID controllers
The kexec patch introduced a superfluous (and otherwise inert) reset of
some adapters. The register can have a hardware default value that has
zeros for the undefined interrupts. This patch refines the test of the
interrupt enable register to focus on only the interrupts that affect
the driver in order to detect if an incomplete shutdown of the Adapter
had occurred (kdump).
Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aacraid/rx.c')
| -rw-r--r-- | drivers/scsi/aacraid/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c index b6ee3c0a7820..291cd14f4e98 100644 --- a/drivers/scsi/aacraid/rx.c +++ b/drivers/scsi/aacraid/rx.c @@ -542,7 +542,7 @@ int _aac_rx_init(struct aac_dev *dev) dev->a_ops.adapter_sync_cmd = rx_sync_cmd; dev->a_ops.adapter_enable_int = aac_rx_disable_interrupt; dev->OIMR = status = rx_readb (dev, MUnit.OIMR); - if ((((status & 0xff) != 0xff) || reset_devices) && + if ((((status & 0x0c) != 0x0c) || reset_devices) && !aac_rx_restart_adapter(dev, 0)) ++restart; /* |