Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21c34006 authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen
Browse files

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



Memset the IO frame to zero after release.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent cf4e55e7

drivers/scsi/megaraid/megaraid_sas.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/megaraid/megaraid_sas_base.c

+6 −4
Original line number Diff line number Diff line
@@ -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)