Add support for READCAPACITY16

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>

lib/libiscsi.def

@@ -43,6 +43,7 @@ iscsi_reportluns_task
 iscsi_testunitready_task
 iscsi_inquiry_task
 iscsi_readcapacity10_task
+iscsi_readcapacity16_task
 iscsi_synchronizecache10_task
 iscsi_read6_task
 iscsi_read10_task
@@ -54,6 +55,7 @@ iscsi_reportluns_sync
 iscsi_testunitready_sync
 iscsi_inquiry_sync
 iscsi_readcapacity10_sync
+iscsi_readcapacity16_sync
 iscsi_synchronizecache10_sync
 iscsi_read6_sync
 iscsi_read10_sync
@@ -87,4 +89,6 @@ scsi_cdb_read10
 scsi_cdb_verify10
 scsi_cdb_write10
 scsi_cdb_synchronizecache10
+scsi_cdb_readcapacity16
+scsi_cdb_serviceactionin16
 

lib/scsi-command.c

@@ -604,6 +604,27 @@ iscsi_readcapacity10_task(struct iscsi_context *iscsi, int lun, int lba,
 	return task;
 }
 
+struct scsi_task *
+iscsi_readcapacity16_task(struct iscsi_context *iscsi, int lun,
+			   iscsi_command_cb cb, void *private_data)
+{
+	struct scsi_task *task;
+
+	task = scsi_cdb_readcapacity16();
+	if (task == NULL) {
+		iscsi_set_error(iscsi, "Out-of-memory: Failed to create "
+				"readcapacity16 cdb.");
+		return NULL;
+	}
+	if (iscsi_scsi_command_async(iscsi, lun, task, cb, NULL,
+				       private_data) != 0) {
+		scsi_free_scsi_task(task);
+		return NULL;
+	}
+
+	return task;
+}
+
 struct scsi_task *
 iscsi_read6_task(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		   uint32_t datalen, int blocksize,

lib/scsi-lowlevel.c

@@ -258,6 +258,36 @@ scsi_cdb_readcapacity10(int lba, int pmi)
 	return task;
 }
 
+/*
+ * service_action_in unmarshall
+ */
+static void *
+scsi_serviceactionin_datain_unmarshall(struct scsi_task *task)
+{
+	struct scsi_readcapacity16 *rc16;
+
+	switch (task->params.serviceactionin.sa) {
+	case SCSI_READCAPACITY16:
+		rc16 = scsi_malloc(task, sizeof(struct scsi_readcapacity16));
+		if (rc16 == NULL) {
+			return NULL;
+		}
+		rc16->returned_lba = htonl(*(uint32_t *)&(task->datain.data[0]));
+		rc16->returned_lba = (rc16->returned_lba << 32) | htonl(*(uint32_t *)&(task->datain.data[4]));
+		rc16->block_length = htonl(*(uint32_t *)&(task->datain.data[8]));
+		rc16->p_type       = (task->datain.data[12] >> 1) & 0x07;
+		rc16->prot_en      = task->datain.data[12] & 0x01;
+		rc16->p_i_exp      = (task->datain.data[13] >> 4) & 0x0f;
+		rc16->lbppbe       = task->datain.data[13] & 0x0f;
+		rc16->lbpme        = !!(task->datain.data[14] & 0x80);
+		rc16->lbprz        = !!(task->datain.data[14] & 0x40);
+		rc16->lalba        = htons(*(uint16_t *)&(task->datain.data[14])) & 0x3fff;
+		return rc16;
+	}
+
+	return NULL;
+}
+
 /*
  * parse the data in blob and calcualte the size of a full
  * readcapacity10 datain structure
@@ -923,6 +953,43 @@ scsi_cdb_synchronizecache10(int lba, int num_blocks, int syncnv, int immed)
 }
 
 
+/*
+ * SERVICEACTIONIN16
+ */
+struct scsi_task *
+scsi_cdb_serviceactionin16(enum scsi_service_action_in sa, uint32_t xferlen)
+{
+	struct scsi_task *task;
+
+	task = malloc(sizeof(struct scsi_task));
+	if (task == NULL) {
+		return NULL;
+	}
+
+	memset(task, 0, sizeof(struct scsi_task));
+	task->cdb[0]   = SCSI_OPCODE_SERVICE_ACTION_IN;
+
+	task->cdb[1] = sa;
+
+	*(uint32_t *)&task->cdb[10] = htonl(xferlen);
+
+	task->cdb_size   = 16;
+	task->xfer_dir   = SCSI_XFER_READ;
+	task->expxferlen = xferlen;
+
+	task->params.serviceactionin.sa = sa;
+
+	return task;
+}
+
+/*
+ * READCAPACITY16
+ */
+struct scsi_task *
+scsi_cdb_readcapacity16(void)
+{
+	return scsi_cdb_serviceactionin16(SCSI_READCAPACITY16, 32);
+}
 
 int
 scsi_datain_getfullsize(struct scsi_task *task)
@@ -960,6 +1027,8 @@ scsi_datain_unmarshall(struct scsi_task *task)
 		return NULL;
 	case SCSI_OPCODE_REPORTLUNS:
 		return scsi_reportluns_datain_unmarshall(task);
+	case SCSI_OPCODE_SERVICE_ACTION_IN:
+		return scsi_serviceactionin_datain_unmarshall(task);
 	}
 	return NULL;
 }

lib/sync.c

@@ -281,6 +281,25 @@ iscsi_readcapacity10_sync(struct iscsi_context *iscsi, int lun, int lba,
 	return state.task;
 }
 
+struct scsi_task *
+iscsi_readcapacity16_sync(struct iscsi_context *iscsi, int lun)
+{
+	struct iscsi_sync_state state;
+
+	memset(&state, 0, sizeof(state));
+
+	if (iscsi_readcapacity16_task(iscsi, lun,
+				       scsi_sync_cb, &state) == NULL) {
+		iscsi_set_error(iscsi,
+				"Failed to send ReadCapacity16 command");
+		return NULL;
+	}
+
+	event_loop(iscsi, &state);
+
+	return state.task;
+}
+
 struct scsi_task *
 iscsi_synchronizecache10_sync(struct iscsi_context *iscsi, int lun, int lba,
 			      int num_blocks, int syncnv, int immed)