aacraid: AIF support for SES device add/remove

Signed-off-by: Mahesh Rajashekhara <Mahesh.Rajashekhara@pmcs.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Murthy Bhat <Murthy.Bhat@pmcs.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index eaaf8705a5f4..284db3937a82 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1951,6 +1951,8 @@ extern struct aac_common aac_config;
 #define                 AifEnEnclosureManagement 13     /* EM_DRIVE_* */
 #define                         EM_DRIVE_INSERTION      31
 #define                         EM_DRIVE_REMOVAL        32
+#define                 EM_SES_DRIVE_INSERTION  33
+#define                 EM_SES_DRIVE_REMOVAL    26
 #define                 AifEnBatteryEvent       14      /* Change in Battery State */
 #define                 AifEnAddContainer       15      /* A new array was created */
 #define                 AifEnDeleteContainer    16      /* A container was deleted */
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index cab190af6345..090ba681ff36 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1044,6 +1044,8 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                         switch (le32_to_cpu(((__le32 *)aifcmd->data)[3])) {
                         case EM_DRIVE_INSERTION:
                         case EM_DRIVE_REMOVAL:
+                        case EM_SES_DRIVE_INSERTION:
+                        case EM_SES_DRIVE_REMOVAL:
                                 container = le32_to_cpu(
                                         ((__le32 *)aifcmd->data)[2]);
                                 if ((container >> 28)) {
@@ -1069,8 +1071,10 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                                 }
                                 channel = aac_phys_to_logical(channel);
                                 device_config_needed =
-                                  (((__le32 *)aifcmd->data)[3]
-                                    == cpu_to_le32(EM_DRIVE_INSERTION)) ?
+                                  ((((__le32 *)aifcmd->data)[3]
+                                    == cpu_to_le32(EM_DRIVE_INSERTION)) ||
+                                    (((__le32 *)aifcmd->data)[3]
+                                    == cpu_to_le32(EM_SES_DRIVE_INSERTION))) ?
                                   ADD : DELETE;
                                 break;
                         }