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

Commit abbada71 authored by Mahesh Rajashekhara's avatar Mahesh Rajashekhara Committed by Martin K. Petersen
Browse files

scsi: hpsa: correct scsi 6byte lba calculation 



Missing 5 bits of byte 1 in the LBA issued by SML.

Reported-by: default avatarMahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarMahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 96c11dd2

drivers/scsi/hpsa.c

+10 −4
Original line number Diff line number Diff line
@@ -4565,7 +4565,9 @@ static int fixup_ioaccel_cdb(u8 *cdb, int *cdb_len) 
	case READ_6:

	case READ_12:

		if (*cdb_len == 6) {

			block = get_unaligned_be16(&cdb[2]);

			block = (((cdb[1] & 0x1F) << 16) |

				(cdb[2] << 8) |

				cdb[3]);

			block_cnt = cdb[4];

			if (block_cnt == 0)

				block_cnt = 256;
@@ -4725,9 +4727,11 @@ static void set_encrypt_ioaccel2(struct ctlr_info *h, 
	 */

	switch (cmd->cmnd[0]) {

	/* Required? 6-byte cdbs eliminated by fixup_ioaccel_cdb */

	case WRITE_6:

	case READ_6:

		first_block = get_unaligned_be16(&cmd->cmnd[2]);

	case WRITE_6:

		first_block = (((cmd->cmnd[1] & 0x1F) << 16) |

				(cmd->cmnd[2] << 8) |

				cmd->cmnd[3]);

		break;

	case WRITE_10:

	case READ_10:
@@ -4977,7 +4981,9 @@ static int hpsa_scsi_ioaccel_raid_map(struct ctlr_info *h, 
	case WRITE_6:

		is_write = 1;

	case READ_6:

		first_block = get_unaligned_be16(&cmd->cmnd[2]);

		first_block = (((cmd->cmnd[1] & 0x1F) << 16) |

				(cmd->cmnd[2] << 8) |

				cmd->cmnd[3]);

		block_cnt = cmd->cmnd[4];

		if (block_cnt == 0)

			block_cnt = 256;