scsi: hpsa: correct scsi 6byte lba calculation

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

Reported-by: Mahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Mahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Orabug: 25605941
(cherry picked from commit abbada7175999fbd6500b8144e985b779588962f)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 61f91151e6346fd284b4a6f62316249c8c79a447..9aa1c26ec30a1792ba2a3c2486738d4396cf562f 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4587,7 +4587,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;
@@ -4747,9 +4749,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:
@@ -4999,7 +5003,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;