scsi: smartpqi: raid bypass lba calculation fix

Orabug: 25144431

In the ioaccel path, the calculation of the starting LBA for
READ(6)/WRITE(6) SCSI commands does not take into account the most
significant 5 bits of the LBA: it only uses the least significant 16
bits of the starting LBA.

Reported-by: Mahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit e018ef572ba4ff17caa9e82d5e1b5cea0d76f903)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index aaaeccafb22bd9a434214405cf20d3a70f7f1c54..8998db35fe4ce8cb1d980aaf3f4b6591104702c9 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -1966,7 +1966,8 @@ static int pqi_raid_bypass_submit_scsi_cmd(struct pqi_ctrl_info *ctrl_info,
                is_write = true;
                /* fall through */
        case READ_6:
-               first_block = (u64)get_unaligned_be16(&scmd->cmnd[2]);
+               first_block = (u64)(((scmd->cmnd[1] & 0x1f) << 16) |
+                       (scmd->cmnd[2] << 8) | scmd->cmnd[3]);
                block_cnt = (u32)scmd->cmnd[4];
                if (block_cnt == 0)
                        block_cnt = 256;