Re: [PATCH 3/6] qla2xxx_nvmet: Add FC-NVMe Target LS request handling

[Madhani, Himanshu]

> On Sep 16, 2018, at 6:42 AM, Bart Van Assche  wrote:
> 
> External Email
> 
> On 09/14/18 14:28, Himanshu Madhani wrote:
>> From: Anil Gurumurthy 
>> 
>> This patch adds LS handling into driver
> 
> Please make the patch description more clear. What does "LS" stand for?
> What is the relationship between LS and NVMe target support?
> 
> Thanks,
> 
> Bart.

Sure. Will add description for the commit. “LS” here stands for Link Service 
support
for NVME Target. Will resubmit series with more clear description in commit 
message

Thanks,
- Himanshu

Re: [PATCH 3/6] qla2xxx_nvmet: Add FC-NVMe Target LS request handling

[Bart Van Assche]

On 09/14/18 14:28, Himanshu Madhani wrote:

From: Anil Gurumurthy 

This patch adds LS handling into driver


Please make the patch description more clear. What does "LS" stand for? 
What is the relationship between LS and NVMe target support?


Thanks,

Bart.

[PATCH 3/6] qla2xxx_nvmet: Add FC-NVMe Target LS request handling

[Himanshu Madhani]

From: Anil Gurumurthy 

This patch adds LS handling into driver

Signed-off-by: Anil Gurumurthy 
Signed-off-by: Giridhar Malavali 
Signed-off-by: Darren Trapp 
Signed-off-by: Himanshu Madhani 
---
 drivers/scsi/qla2xxx/qla_dbg.c  |  1 +
 drivers/scsi/qla2xxx/qla_dbg.h  |  2 ++
 drivers/scsi/qla2xxx/qla_iocb.c | 42 -
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index c7533fa7f46e..ed9c228f7d11 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -67,6 +67,7 @@
  * | Target Mode Management  |   0xf09b   | 0xf002 |
  * |  || 0xf046-0xf049  |
  * | Target Mode Task Management  |  0x1000d  ||
+ * | NVME|   0x11000  ||
  * --
  */
 
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index 8877aa97d829..4ad97923e40b 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -367,6 +367,8 @@ ql_log_qp(uint32_t, struct qla_qpair *, int32_t, const char 
*fmt, ...);
 #define ql_dbg_tgt_tmr 0x1000 /* Target mode task management */
 #define ql_dbg_tgt_dif  0x0800 /* Target mode dif */
 
+#define ql_dbg_nvme 0x0400 /* NVME Target */
+
 extern int qla27xx_dump_mpi_ram(struct qla_hw_data *, uint32_t, uint32_t *,
uint32_t, void **);
 extern int qla24xx_dump_ram(struct qla_hw_data *, uint32_t, uint32_t *,
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 4de910231ba6..cce32362cf21 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -2113,7 +2113,7 @@ __qla2x00_alloc_iocbs(struct qla_qpair *qpair, srb_t *sp)
req_cnt = 1;
handle = 0;
 
-   if (sp && (sp->type != SRB_SCSI_CMD)) {
+   if (sp && (sp->type != SRB_SCSI_CMD) && (sp->type != SRB_NVMET_FCP)) {
/* Adjust entry-counts as needed. */
req_cnt = sp->iocbs;
}
@@ -3433,6 +3433,40 @@ qla24xx_prlo_iocb(srb_t *sp, struct logio_entry_24xx 
*logio)
logio->vp_index = sp->fcport->vha->vp_idx;
 }
 
+/*
+ * Build NVMET LS response
+ */
+static int
+qla_nvmet_ls(srb_t *sp, struct pt_ls4_request *rsp_pkt)
+{
+   struct srb_iocb *nvme;
+   int rval = QLA_SUCCESS;
+
+   nvme = >u.iocb_cmd;
+
+   rsp_pkt->entry_type = PT_LS4_REQUEST;
+   rsp_pkt->entry_count = 1;
+   rsp_pkt->control_flags = cpu_to_le16(CF_LS4_RESPONDER << CF_LS4_SHIFT);
+   rsp_pkt->handle = sp->handle;
+
+   rsp_pkt->nport_handle = sp->fcport->loop_id;
+   rsp_pkt->vp_index = nvme->u.nvme.vp_index;
+   rsp_pkt->exchange_address = cpu_to_le32(nvme->u.nvme.exchange_address);
+
+   rsp_pkt->tx_dseg_count = 1;
+   rsp_pkt->tx_byte_count = cpu_to_le16(nvme->u.nvme.rsp_len);
+   rsp_pkt->dseg0_len = cpu_to_le16(nvme->u.nvme.rsp_len);
+   rsp_pkt->dseg0_address[0] = cpu_to_le32(LSD(nvme->u.nvme.rsp_dma));
+   rsp_pkt->dseg0_address[1] = cpu_to_le32(MSD(nvme->u.nvme.rsp_dma));
+
+   ql_log(ql_log_info, sp->vha, 0x,
+   "Dumping the NVME-LS response IOCB\n");
+   ql_dump_buffer(ql_dbg_disc + ql_dbg_buffer, sp->vha, 0x2075,
+   (uint8_t *)rsp_pkt, sizeof(*rsp_pkt));
+
+   return rval;
+}
+
 int
 qla2x00_start_sp(srb_t *sp)
 {
@@ -3493,6 +3527,9 @@ qla2x00_start_sp(srb_t *sp)
case SRB_NVME_LS:
qla_nvme_ls(sp, pkt);
break;
+   case SRB_NVMET_LS:
+   qla_nvmet_ls(sp, pkt);
+   break;
case SRB_ABT_CMD:
IS_QLAFX00(ha) ?
qlafx00_abort_iocb(sp, pkt) :
@@ -3518,6 +3555,9 @@ qla2x00_start_sp(srb_t *sp)
case SRB_PRLO_CMD:
qla24xx_prlo_iocb(sp, pkt);
break;
+   case SRB_NVME_ELS_RSP:
+   qlt_send_els_resp(sp, pkt);
+   break;
default:
break;
}
-- 
2.12.0