[SCSI] hpsa: Acknowledge controller events in ioaccell mode 2 as well as mode 1

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index e55e787f5092fa8fc1ef316db8fe5e0417ac385b..1c6bd79078e82a39e14e3ab1108253eff4bf9261 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5485,7 +5485,8 @@ static int hpsa_kickoff_rescan(struct ctlr_info *h)
        char *event_type;
 
        /* Ask the controller to clear the events we're handling. */
-       if (h->transMethod & (CFGTBL_Trans_io_accel1) &&
+       if ((h->transMethod & (CFGTBL_Trans_io_accel1
+                       | CFGTBL_Trans_io_accel2)) &&
                (h->events & HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_STATE_CHANGE ||
                 h->events & HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_CONFIG_CHANGE)) {
 

diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h
index 9e00988817f3948db26745c791341a0217b7402c..6b336e833fa390b5dfa8c67017a8bc7c0cfea033 100644 (file)
--- a/drivers/scsi/hpsa_cmd.h
+++ b/drivers/scsi/hpsa_cmd.h
@@ -133,6 +133,7 @@
 #define CFGTBL_Trans_Simple     0x00000002l
 #define CFGTBL_Trans_Performant 0x00000004l
 #define CFGTBL_Trans_io_accel1 0x00000080l
+#define CFGTBL_Trans_io_accel2 0x00000100l
 #define CFGTBL_Trans_use_short_tags 0x20000000l
 #define CFGTBL_Trans_enable_directed_msix (1 << 30)