From: Stephen M. Cameron Date: Tue, 18 Feb 2014 19:56:09 +0000 (-0600) Subject: [SCSI] hpsa: Acknowledge controller events in ioaccell mode 2 as well as mode 1 X-Git-Tag: firefly_0821_release~176^2~4190^2~121 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f7cee8c7d44ad360a16c7e87831b4568419322b;p=firefly-linux-kernel-4.4.55.git [SCSI] hpsa: Acknowledge controller events in ioaccell mode 2 as well as mode 1 Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley --- 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)