[PATCH 27/39] megaraid_sas: megasas_return_cmd does not memset IO frame to zero

[Shivasharan S]

Memset the IO frame to zero after release.

Signed-off-by: Kashyap Desai <kashyap.de...@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>
---
 drivers/scsi/megaraid/megaraid_sas.h      |  1 +
 drivers/scsi/megaraid/megaraid_sas_base.c | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas.h 
b/drivers/scsi/megaraid/megaraid_sas.h
index ec5f003..59fe39d 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -2238,6 +2238,7 @@ struct megasas_instance {
        u8 is_rdpq;
        bool dev_handle;
        bool fw_sync_cache_support;
+       u32 mfi_frame_size;
        bool is_ventura;
        bool msix_combined;
        u16 max_raid_mapsize;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c 
b/drivers/scsi/megaraid/megaraid_sas_base.c
index e435c2b..2d72460 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -268,6 +268,8 @@ megasas_return_cmd(struct megasas_instance *instance, 
struct megasas_cmd *cmd)
        cmd->scmd = NULL;
        cmd->frame_count = 0;
        cmd->flags = 0;
+       memset(cmd->frame, 0, instance->mfi_frame_size);
+       cmd->frame->io.context = cpu_to_le32(cmd->index);
        if (!fusion && reset_devices)
                cmd->frame->hdr.cmd = MFI_CMD_INVALID;
        list_add(&cmd->list, (&instance->cmd_pool)->next);
@@ -3886,7 +3888,6 @@ static int megasas_create_frame_pool(struct 
megasas_instance *instance)
        int i;
        u16 max_cmd;
        u32 sge_sz;
-       u32 total_sz;
        u32 frame_count;
        struct megasas_cmd *cmd;
 
@@ -3914,12 +3915,13 @@ static int megasas_create_frame_pool(struct 
megasas_instance *instance)
         * Total 192 byte (3 MFI frame of 64 byte)
         */
        frame_count = instance->ctrl_context ? (3 + 1) : (15 + 1);
-       total_sz = MEGAMFI_FRAME_SIZE * frame_count;
+       instance->mfi_frame_size = MEGAMFI_FRAME_SIZE * frame_count;
        /*
         * Use DMA pool facility provided by PCI layer
         */
        instance->frame_dma_pool = pci_pool_create("megasas frame pool",
-                                       instance->pdev, total_sz, 256, 0);
+                                       instance->pdev, 
instance->mfi_frame_size,
+                                       256, 0);
 
        if (!instance->frame_dma_pool) {
                dev_printk(KERN_DEBUG, &instance->pdev->dev, "failed to setup 
frame pool\n");
@@ -3963,7 +3965,7 @@ static int megasas_create_frame_pool(struct 
megasas_instance *instance)
                        return -ENOMEM;
                }
 
-               memset(cmd->frame, 0, total_sz);
+               memset(cmd->frame, 0, instance->mfi_frame_size);
                cmd->frame->io.context = cpu_to_le32(cmd->index);
                cmd->frame->io.pad_0 = 0;
                if (!instance->ctrl_context && reset_devices)
-- 
2.8.3