scsi: megaraid_sas: megasas_return_cmd does not memset IO frame to zero

Memset the IO frame to zero after release.

Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index efc01a374a6e98b93e9076ad33c86940e1f2e664..508516d412c9dcd7d15910063a81531ec0aecdd6 100644 (file)
--- 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 06001b4f9cad28ad2af42191cea46d87c9e7525a..30e390c14208652ad1d9475fd9bb6f7844f2d0e6 100644 (file)
--- 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);
@@ -3889,7 +3891,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;
 
@@ -3917,12 +3918,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");
@@ -3966,7 +3968,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)