scsi: use 64-bit LUNs

The SCSI standard defines 64-bit values for LUNs, and large arrays
employing large or hierarchical LUN numbers become more and more
common.

So update the linux SCSI stack to use 64-bit LUN numbers.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@infradead.org>
Reviewed-by: Ewan Milne <emilne@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

7 files changed, 47 insertions, 45 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index de5d0ae19d83..b64399153135 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -320,8 +320,8 @@ struct srb_iocb {
                          * defined in tsk_mgmt_entry struct
                          * for control_flags field in qla_fw.h.
                          */
+                        uint64_t lun;
                         uint32_t flags;
-                        uint32_t lun;
                         uint32_t data;
                         struct completion comp;
                         __le16 comp_status;
@@ -2529,8 +2529,8 @@ struct isp_operations {
         void (*disable_intrs) (struct qla_hw_data *);
 
         int (*abort_command) (srb_t *);
-        int (*target_reset) (struct fc_port *, unsigned int, int);
-        int (*lun_reset) (struct fc_port *, unsigned int, int);
+        int (*target_reset) (struct fc_port *, uint64_t, int);
+        int (*lun_reset) (struct fc_port *, uint64_t, int);
         int (*fabric_login) (struct scsi_qla_host *, uint16_t, uint8_t,
                 uint8_t, uint8_t, uint16_t *, uint8_t);
         int (*fabric_logout) (struct scsi_qla_host *, uint16_t, uint8_t,
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index d48dea8fab1b..9ef0781b12da 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -212,7 +212,7 @@ extern void qla2x00_build_scsi_iocbs_64(srb_t *, cmd_entry_t *, uint16_t);
 extern int qla2x00_start_scsi(srb_t *sp);
 extern int qla24xx_start_scsi(srb_t *sp);
 int qla2x00_marker(struct scsi_qla_host *, struct req_que *, struct rsp_que *,
-                                                uint16_t, uint16_t, uint8_t);
+                                                uint16_t, uint64_t, uint8_t);
 extern int qla2x00_start_sp(srb_t *);
 extern int qla24xx_dif_start_scsi(srb_t *);
 extern int qla2x00_start_bidir(srb_t *, struct scsi_qla_host *, uint32_t);
@@ -262,10 +262,10 @@ extern int
 qla2x00_abort_command(srb_t *);
 
 extern int
-qla2x00_abort_target(struct fc_port *, unsigned int, int);
+qla2x00_abort_target(struct fc_port *, uint64_t, int);
 
 extern int
-qla2x00_lun_reset(struct fc_port *, unsigned int, int);
+qla2x00_lun_reset(struct fc_port *, uint64_t, int);
 
 extern int
 qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *,
@@ -339,12 +339,12 @@ qla24xx_get_isp_stats(scsi_qla_host_t *, struct link_statistics *,
 extern int qla24xx_abort_command(srb_t *);
 extern int qla24xx_async_abort_command(srb_t *);
 extern int
-qla24xx_abort_target(struct fc_port *, unsigned int, int);
+qla24xx_abort_target(struct fc_port *, uint64_t, int);
 extern int
-qla24xx_lun_reset(struct fc_port *, unsigned int, int);
+qla24xx_lun_reset(struct fc_port *, uint64_t, int);
 extern int
 qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *, unsigned int,
-        unsigned int, enum nexus_wait_type);
+        uint64_t, enum nexus_wait_type);
 extern int
 qla2x00_system_error(scsi_qla_host_t *);
 
@@ -617,8 +617,8 @@ extern char *qlafx00_fw_version_str(struct scsi_qla_host *, char *);
 extern irqreturn_t qlafx00_intr_handler(int, void *);
 extern void qlafx00_enable_intrs(struct qla_hw_data *);
 extern void qlafx00_disable_intrs(struct qla_hw_data *);
-extern int qlafx00_abort_target(fc_port_t *, unsigned int, int);
-extern int qlafx00_lun_reset(fc_port_t *, unsigned int, int);
+extern int qlafx00_abort_target(fc_port_t *, uint64_t, int);
+extern int qlafx00_lun_reset(fc_port_t *, uint64_t, int);
 extern int qlafx00_start_scsi(srb_t *);
 extern int qlafx00_abort_isp(scsi_qla_host_t *);
 extern int qlafx00_iospace_config(struct qla_hw_data *);
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 760931529592..150529d98db4 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -520,7 +520,7 @@ qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)
 static int
 __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
                         struct rsp_que *rsp, uint16_t loop_id,
-                        uint16_t lun, uint8_t type)
+                        uint64_t lun, uint8_t type)
 {
         mrk_entry_t *mrk;
         struct mrk_entry_24xx *mrk24 = NULL;
@@ -543,14 +543,13 @@ __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
                 if (IS_FWI2_CAPABLE(ha)) {
                         mrk24 = (struct mrk_entry_24xx *) mrk;
                         mrk24->nport_handle = cpu_to_le16(loop_id);
-                        mrk24->lun[1] = LSB(lun);
-                        mrk24->lun[2] = MSB(lun);
+                        int_to_scsilun(lun, (struct scsi_lun *)&mrk24->lun);
                         host_to_fcp_swap(mrk24->lun, sizeof(mrk24->lun));
                         mrk24->vp_index = vha->vp_idx;
                         mrk24->handle = MAKE_HANDLE(req->id, mrk24->handle);
                 } else {
                         SET_TARGET_ID(ha, mrk->target, loop_id);
-                        mrk->lun = cpu_to_le16(lun);
+                        mrk->lun = cpu_to_le16((uint16_t)lun);
                 }
         }
         wmb();
@@ -562,7 +561,7 @@ __qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
 
 int
 qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
-                struct rsp_que *rsp, uint16_t loop_id, uint16_t lun,
+                struct rsp_que *rsp, uint16_t loop_id, uint64_t lun,
                 uint8_t type)
 {
         int ret;
@@ -2047,7 +2046,7 @@ static void
 qla24xx_tm_iocb(srb_t *sp, struct tsk_mgmt_entry *tsk)
 {
         uint32_t flags;
-        unsigned int lun;
+        uint64_t lun;
         struct fc_port *fcport = sp->fcport;
         scsi_qla_host_t *vha = fcport->vha;
         struct qla_hw_data *ha = vha->hw;
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index a56825c73c31..550a4a31f51a 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1659,7 +1659,7 @@ qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t par_sense_len,
 
         if (sense_len) {
                 ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x301c,
-                    "Check condition Sense data, nexus%ld:%d:%d cmd=%p.\n",
+                    "Check condition Sense data, nexus%ld:%d:%llu cmd=%p.\n",
                     sp->fcport->vha->host_no, cp->device->id, cp->device->lun,
                     cp);
                 ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x302b,
@@ -2281,7 +2281,7 @@ check_scsi_status:
 out:
         if (logit)
                 ql_dbg(ql_dbg_io, fcport->vha, 0x3022,
-                    "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%d "
+                    "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu "
                     "portid=%02x%02x%02x oxid=0x%x cdb=%10phN len=0x%x "
                     "rsp_info=0x%x resid=0x%x fw_resid=0x%x.\n",
                     comp_status, scsi_status, res, vha->host_no,
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 1c33a77db5c2..d9aafc003be2 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -947,7 +947,7 @@ qla2x00_abort_command(srb_t *sp)
 }
 
 int
-qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
+qla2x00_abort_target(struct fc_port *fcport, uint64_t l, int tag)
 {
         int rval, rval2;
         mbx_cmd_t  mc;
@@ -1000,7 +1000,7 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
 }
 
 int
-qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
+qla2x00_lun_reset(struct fc_port *fcport, uint64_t l, int tag)
 {
         int rval, rval2;
         mbx_cmd_t  mc;
@@ -1022,7 +1022,7 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
                 mcp->mb[1] = fcport->loop_id;
         else
                 mcp->mb[1] = fcport->loop_id << 8;
-        mcp->mb[2] = l;
+        mcp->mb[2] = (u32)l;
         mcp->mb[3] = 0;
         mcp->mb[9] = vha->vp_idx;
 
@@ -2666,7 +2666,7 @@ struct tsk_mgmt_cmd {
 
 static int
 __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
-    unsigned int l, int tag)
+    uint64_t l, int tag)
 {
         int             rval, rval2;
         struct tsk_mgmt_cmd *tsk;
@@ -2760,7 +2760,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
 }
 
 int
-qla24xx_abort_target(struct fc_port *fcport, unsigned int l, int tag)
+qla24xx_abort_target(struct fc_port *fcport, uint64_t l, int tag)
 {
         struct qla_hw_data *ha = fcport->vha->hw;
 
@@ -2771,7 +2771,7 @@ qla24xx_abort_target(struct fc_port *fcport, unsigned int l, int tag)
 }
 
 int
-qla24xx_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
+qla24xx_lun_reset(struct fc_port *fcport, uint64_t l, int tag)
 {
         struct qla_hw_data *ha = fcport->vha->hw;
 
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index abeb3901498b..4775baa8b6a0 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -726,13 +726,13 @@ qlafx00_disable_intrs(struct qla_hw_data *ha)
 }
 
 int
-qlafx00_abort_target(fc_port_t *fcport, unsigned int l, int tag)
+qlafx00_abort_target(fc_port_t *fcport, uint64_t l, int tag)
 {
         return qla2x00_async_tm_cmd(fcport, TCF_TARGET_RESET, l, tag);
 }
 
 int
-qlafx00_lun_reset(fc_port_t *fcport, unsigned int l, int tag)
+qlafx00_lun_reset(fc_port_t *fcport, uint64_t l, int tag)
 {
         return qla2x00_async_tm_cmd(fcport, TCF_LUN_RESET, l, tag);
 }
@@ -2159,7 +2159,7 @@ qlafx00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t par_sense_len,
 
         if (sense_len) {
                 ql_dbg(ql_dbg_io + ql_dbg_buffer, vha, 0x3039,
-                    "Check condition Sense data, nexus%ld:%d:%d cmd=%p.\n",
+                    "Check condition Sense data, nexus%ld:%d:%llu cmd=%p.\n",
                     sp->fcport->vha->host_no, cp->device->id, cp->device->lun,
                     cp);
                 ql_dump_buffer(ql_dbg_io + ql_dbg_buffer, vha, 0x3049,
@@ -2524,7 +2524,7 @@ check_scsi_status:
 
         if (logit)
                 ql_dbg(ql_dbg_io, fcport->vha, 0x3058,
-                    "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%d "
+                    "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu "
                     "tgt_id: 0x%x lscsi_status: 0x%x cdb=%10phN len=0x%x "
                     "rsp_info=0x%x resid=0x%x fw_resid=0x%x sense_len=0x%x, "
                     "par_sense_len=0x%x, rsp_info_len=0x%x\n",
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 5269aee1df3b..b22c75305b44 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -920,7 +920,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         scsi_qla_host_t *vha = shost_priv(cmd->device->host);
         srb_t *sp;
         int ret;
-        unsigned int id, lun;
+        unsigned int id;
+        uint64_t lun;
         unsigned long flags;
         int rval, wait = 0;
         struct qla_hw_data *ha = vha->hw;
@@ -944,7 +945,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         }
 
         ql_dbg(ql_dbg_taskm, vha, 0x8002,
-            "Aborting from RISC nexus=%ld:%d:%d sp=%p cmd=%p\n",
+            "Aborting from RISC nexus=%ld:%d:%llu sp=%p cmd=%p\n",
             vha->host_no, id, lun, sp, cmd);
 
         /* Get a reference to the sp and drop the lock.*/
@@ -995,7 +996,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         }
 
         ql_log(ql_log_info, vha, 0x801c,
-            "Abort command issued nexus=%ld:%d:%d --  %d %x.\n",
+            "Abort command issued nexus=%ld:%d:%llu --  %d %x.\n",
             vha->host_no, id, lun, wait, ret);
 
         return ret;
@@ -1003,7 +1004,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
 
 int
 qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *vha, unsigned int t,
-        unsigned int l, enum nexus_wait_type type)
+        uint64_t l, enum nexus_wait_type type)
 {
         int cnt, match, status;
         unsigned long flags;
@@ -1060,7 +1061,7 @@ static char *reset_errors[] = {
 
 static int
 __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
-    struct scsi_cmnd *cmd, int (*do_reset)(struct fc_port *, unsigned int, int))
+    struct scsi_cmnd *cmd, int (*do_reset)(struct fc_port *, uint64_t, int))
 {
         scsi_qla_host_t *vha = shost_priv(cmd->device->host);
         fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
@@ -1075,7 +1076,7 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
                 return err;
 
         ql_log(ql_log_info, vha, 0x8009,
-            "%s RESET ISSUED nexus=%ld:%d:%d cmd=%p.\n", name, vha->host_no,
+            "%s RESET ISSUED nexus=%ld:%d:%llu cmd=%p.\n", name, vha->host_no,
             cmd->device->id, cmd->device->lun, cmd);
 
         err = 0;
@@ -1100,14 +1101,14 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
         }
 
         ql_log(ql_log_info, vha, 0x800e,
-            "%s RESET SUCCEEDED nexus:%ld:%d:%d cmd=%p.\n", name,
+            "%s RESET SUCCEEDED nexus:%ld:%d:%llu cmd=%p.\n", name,
             vha->host_no, cmd->device->id, cmd->device->lun, cmd);
 
         return SUCCESS;
 
 eh_reset_failed:
         ql_log(ql_log_info, vha, 0x800f,
-            "%s RESET FAILED: %s nexus=%ld:%d:%d cmd=%p.\n", name,
+            "%s RESET FAILED: %s nexus=%ld:%d:%llu cmd=%p.\n", name,
             reset_errors[err], vha->host_no, cmd->device->id, cmd->device->lun,
             cmd);
         return FAILED;
@@ -1154,7 +1155,8 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
         scsi_qla_host_t *vha = shost_priv(cmd->device->host);
         fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
         int ret = FAILED;
-        unsigned int id, lun;
+        unsigned int id;
+        uint64_t lun;
 
         id = cmd->device->id;
         lun = cmd->device->lun;
@@ -1169,7 +1171,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
         ret = FAILED;
 
         ql_log(ql_log_info, vha, 0x8012,
-            "BUS RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
+            "BUS RESET ISSUED nexus=%ld:%d:%llu.\n", vha->host_no, id, lun);
 
         if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
                 ql_log(ql_log_fatal, vha, 0x8013,
@@ -1193,7 +1195,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
 
 eh_bus_reset_done:
         ql_log(ql_log_warn, vha, 0x802b,
-            "BUS RESET %s nexus=%ld:%d:%d.\n",
+            "BUS RESET %s nexus=%ld:%d:%llu.\n",
             (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no, id, lun);
 
         return ret;
@@ -1220,14 +1222,15 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
         scsi_qla_host_t *vha = shost_priv(cmd->device->host);
         struct qla_hw_data *ha = vha->hw;
         int ret = FAILED;
-        unsigned int id, lun;
+        unsigned int id;
+        uint64_t lun;
         scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
 
         id = cmd->device->id;
         lun = cmd->device->lun;
 
         ql_log(ql_log_info, vha, 0x8018,
-            "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
+            "ADAPTER RESET ISSUED nexus=%ld:%d:%llu.\n", vha->host_no, id, lun);
 
         /*
          * No point in issuing another reset if one is active.  Also do not
@@ -1273,7 +1276,7 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
 
 eh_host_reset_lock:
         ql_log(ql_log_info, vha, 0x8017,
-            "ADAPTER RESET %s nexus=%ld:%d:%d.\n",
+            "ADAPTER RESET %s nexus=%ld:%d:%llu.\n",
             (ret == FAILED) ? "FAILED" : "SUCCEEDED", vha->host_no, id, lun);
 
         return ret;
@@ -1409,7 +1412,7 @@ static void qla2x00_handle_queue_full(struct scsi_device *sdev, int qdepth)
                 return;
 
         ql_dbg(ql_dbg_io, fcport->vha, 0x3029,
-            "Queue depth adjusted-down to %d for nexus=%ld:%d:%d.\n",
+            "Queue depth adjusted-down to %d for nexus=%ld:%d:%llu.\n",
             sdev->queue_depth, fcport->vha->host_no, sdev->id, sdev->lun);
 }
 
@@ -1432,7 +1435,7 @@ static void qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, int qdepth)
                 scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, qdepth);
 
         ql_dbg(ql_dbg_io, vha, 0x302a,
-            "Queue depth adjusted-up to %d for nexus=%ld:%d:%d.\n",
+            "Queue depth adjusted-up to %d for nexus=%ld:%d:%llu.\n",
             sdev->queue_depth, fcport->vha->host_no, sdev->id, sdev->lun);
 }