[SCSI] qla4xxx: Pass correct LUN address to firmware in case of lun_reset

Use function int_to_scsilun() in qla4xxx_reset_lun() to convert
integer value comming from scsi_transport to scsi LUN address format.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 160d336972164bacaad1fe8722f5184464db2c32..446511d5812438b93daa25db6f3c22a02c4393d2 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -1129,6 +1129,7 @@ int qla4xxx_reset_lun(struct scsi_qla_host * ha, struct ddb_entry * ddb_entry,
 {
        uint32_t mbox_cmd[MBOX_REG_COUNT];
        uint32_t mbox_sts[MBOX_REG_COUNT];
+       uint32_t scsi_lun[2];
        int status = QLA_SUCCESS;
 
        DEBUG2(printk("scsi%ld:%d:%d: lun reset issued\n", ha->host_no,
@@ -1140,10 +1141,16 @@ int qla4xxx_reset_lun(struct scsi_qla_host * ha, struct ddb_entry * ddb_entry,
         */
        memset(&mbox_cmd, 0, sizeof(mbox_cmd));
        memset(&mbox_sts, 0, sizeof(mbox_sts));
+       int_to_scsilun(lun, (struct scsi_lun *) scsi_lun);
 
        mbox_cmd[0] = MBOX_CMD_LUN_RESET;
        mbox_cmd[1] = ddb_entry->fw_ddb_index;
-       mbox_cmd[2] = lun << 8;
+       /* FW expects LUN bytes 0-3 in Incoming Mailbox 2
+        * (LUN byte 0 is LSByte, byte 3 is MSByte) */
+       mbox_cmd[2] = cpu_to_le32(scsi_lun[0]);
+       /* FW expects LUN bytes 4-7 in Incoming Mailbox 3
+        * (LUN byte 4 is LSByte, byte 7 is MSByte) */
+       mbox_cmd[3] = cpu_to_le32(scsi_lun[1]);
        mbox_cmd[5] = 0x01;     /* Immediate Command Enable */
 
        qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, 1, &mbox_cmd[0], &mbox_sts[0]);