[SCSI] megaraid_sas: Fix the fix for fw hang caused by megaraid sas application

Add a lock to the skinny firmware initialisation sequence to prevent
the two stage write being non atomic if multiple instances use it.

Add a flag to the driver shutdown sequence to prevent aen ioctls being
called after shutdown begins.

Signed-off-by Bo Yang<bo.yang@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index a1fd44bc1817..13ac37e80075 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1157,17 +1157,6 @@ struct megasas_evt_detail {
 
 } __attribute__ ((packed));
 
- struct megasas_instance_template {
-        void (*fire_cmd)(dma_addr_t ,u32 ,struct megasas_register_set __iomem *);
-
-        void (*enable_intr)(struct megasas_register_set __iomem *) ;
-        void (*disable_intr)(struct megasas_register_set __iomem *);
-
-        int (*clear_intr)(struct megasas_register_set __iomem *);
-
-        u32 (*read_fw_status_reg)(struct megasas_register_set __iomem *);
- };
-
 struct megasas_instance {
 
         u32 *producer;
@@ -1193,6 +1182,8 @@ struct megasas_instance {
         spinlock_t cmd_pool_lock;
         /* used to synch producer, consumer ptrs in dpc */
         spinlock_t completion_lock;
+        /* used to sync fire the cmd to fw */
+        spinlock_t fire_lock;
         struct dma_pool *frame_dma_pool;
         struct dma_pool *sense_dma_pool;
 
@@ -1224,6 +1215,18 @@ struct megasas_instance {
         struct timer_list io_completion_timer;
 };
 
+struct megasas_instance_template {
+        void (*fire_cmd)(struct megasas_instance *, dma_addr_t, \
+                u32, struct megasas_register_set __iomem *);
+
+        void (*enable_intr)(struct megasas_register_set __iomem *) ;
+        void (*disable_intr)(struct megasas_register_set __iomem *);
+
+        int (*clear_intr)(struct megasas_register_set __iomem *);
+
+        u32 (*read_fw_status_reg)(struct megasas_register_set __iomem *);
+};
+
 #define MEGASAS_IS_LOGICAL(scp)                                         \
         (scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1