diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2014-02-18 20:56:09 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-03-15 18:19:05 +0100 |
| commit | 1f7cee8c7d44ad360a16c7e87831b4568419322b (patch) | |
| tree | 12e9dce77f971cbe4ac17afcc76daff9a7d78f29 /drivers | |
| parent | [SCSI] hpsa: add ioaccel mode 2 structure definitions (diff) | |
| download | linux-1f7cee8c7d44ad360a16c7e87831b4568419322b.tar.xz linux-1f7cee8c7d44ad360a16c7e87831b4568419322b.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/hpsa.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/hpsa_cmd.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index e55e787f5092..1c6bd79078e8 100644 --- 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 9e00988817f3..6b336e833fa3 100644 --- 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) |