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

Commit fa96d927 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Properly set the dsd_list_len for dsd_chaining in cmd type 6. 



The firmware spec has the fcp_data_dseg_len defined as a 32-bit
value, while the corresponding field in the driver structure has
it defined as a 16-bit value.

Cc: stable@kernel.org
Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarMadhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent cefcaba6

drivers/scsi/qla2xxx/qla_fw.h

+1 −2
Original line number Diff line number Diff line
@@ -416,8 +416,7 @@ struct cmd_type_6 { 
	uint8_t vp_index;



	uint32_t fcp_data_dseg_address[2];	/* Data segment address. */

	uint16_t fcp_data_dseg_len;		/* Data segment length. */

	uint16_t reserved_1;			/* MUST be set to 0. */

	uint32_t fcp_data_dseg_len;		/* Data segment length. */

};



#define COMMAND_TYPE_7	0x18		/* Command Type 7 entry */

drivers/scsi/qla2xxx/qla_nx.c

+2 −2
Original line number Diff line number Diff line
@@ -2563,11 +2563,11 @@ qla2xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt, 
			dsd_seg = (uint32_t *)&cmd_pkt->fcp_data_dseg_address;

			*dsd_seg++ = cpu_to_le32(LSD(dsd_ptr->dsd_list_dma));

			*dsd_seg++ = cpu_to_le32(MSD(dsd_ptr->dsd_list_dma));

			cmd_pkt->fcp_data_dseg_len = dsd_list_len;

			*dsd_seg++ = cpu_to_le32(dsd_list_len);

		} else {

			*cur_dsd++ = cpu_to_le32(LSD(dsd_ptr->dsd_list_dma));

			*cur_dsd++ = cpu_to_le32(MSD(dsd_ptr->dsd_list_dma));

			*cur_dsd++ = dsd_list_len;

			*cur_dsd++ = cpu_to_le32(dsd_list_len);

		}

		cur_dsd = (uint32_t *)next_dsd;

		while (avail_dsds) {