Commit 1fea1fcc authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvme: replace cdw10 with specific union command 



Change-Id: Ibdbc6d0356749795db26f58aa5c5e68739d5df5e
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475465


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent bae1750b

examples/nvme/arbitration/arbitration.c

+2 −2
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ get_feature(struct spdk_nvme_ctrlr *ctrlr, uint8_t fid) 
	feature->valid = false;



	cmd.opc = SPDK_NVME_OPC_GET_FEATURES;

	cmd.cdw10 = fid;

	cmd.cdw10_bits.get_features.fid = fid;



	return spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, NULL, 0, get_feature_completion, feature);

}
@@ -1067,7 +1067,7 @@ set_arb_feature(struct spdk_nvme_ctrlr *ctrlr) 
	unsigned ab, lpw, mpw, hpw;



	cmd.opc = SPDK_NVME_OPC_SET_FEATURES;

	cmd.cdw10 = SPDK_NVME_FEAT_ARBITRATION;

	cmd.cdw10_bits.set_features.fid = SPDK_NVME_FEAT_ARBITRATION;



	g_arbitration.outstanding_commands = 0;

examples/nvme/identify/identify.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ get_feature(struct spdk_nvme_ctrlr *ctrlr, uint8_t fid) 
	feature->valid = false;



	cmd.opc = SPDK_NVME_OPC_GET_FEATURES;

	cmd.cdw10 = fid;

	cmd.cdw10_bits.get_features.fid = fid;



	return spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, NULL, 0, get_feature_completion, feature);

}

examples/nvme/nvme_manage/nvme_manage.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
	/* Identify Namespace with NSID set to FFFFFFFFh to get common namespace capabilities. */

	memset(&cmd, 0, sizeof(cmd));

	cmd.opc = SPDK_NVME_OPC_IDENTIFY;

	cmd.cdw10 = 0; /* CNS = 0 (Identify Namespace) */

	cmd.cdw10_bits.identify.cns = 0; /* CNS = 0 (Identify Namespace) */

	cmd.nsid = SPDK_NVME_GLOBAL_NS_TAG;



	dev->outstanding_admin_cmds++;
@@ -410,7 +410,7 @@ get_allocated_nsid(struct dev *dev) 
	}



	cmd.opc = SPDK_NVME_OPC_IDENTIFY;

	cmd.cdw10 = SPDK_NVME_IDENTIFY_ALLOCATED_NS_LIST;

	cmd.cdw10_bits.identify.cns = SPDK_NVME_IDENTIFY_ALLOCATED_NS_LIST;

	cmd.nsid = 0;



	dev->outstanding_admin_cmds++;

include/spdk/nvme_spec.h

+6 −2
Original line number Diff line number Diff line
@@ -611,8 +611,12 @@ struct spdk_nvme_cmd { 
		struct spdk_nvme_sgl_descriptor sgl1;

	} dptr;



	/* dword 10-15 */

	uint32_t cdw10;		/* command-specific */

	/* command-specific */

	union {

		uint32_t cdw10;

		union spdk_nvme_cmd_cdw10 cdw10_bits;

	};

	/* dword 11-15 */

	uint32_t cdw11;		/* command-specific */

	uint32_t cdw12;		/* command-specific */

	uint32_t cdw13;		/* command-specific */

lib/nvme/nvme_ctrlr_cmd.c

+23 −14
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ nvme_ctrlr_cmd_identify(struct spdk_nvme_ctrlr *ctrlr, uint8_t cns, uint16_t cnt 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_IDENTIFY;

	cmd->cdw10 = cns | ((uint32_t)cntid << 16);

	cmd->cdw10_bits.identify.cns = cns;

	cmd->cdw10_bits.identify.cntid = cntid;

	cmd->nsid = nsid;



	return nvme_ctrlr_submit_admin_request(ctrlr, req);
@@ -167,7 +168,7 @@ nvme_ctrlr_cmd_attach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, 
	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_NS_ATTACHMENT;

	cmd->nsid = nsid;

	cmd->cdw10 = SPDK_NVME_NS_CTRLR_ATTACH;

	cmd->cdw10_bits.ns_attach.sel = SPDK_NVME_NS_CTRLR_ATTACH;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);
@@ -195,7 +196,7 @@ nvme_ctrlr_cmd_detach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, 
	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_NS_ATTACHMENT;

	cmd->nsid = nsid;

	cmd->cdw10 = SPDK_NVME_NS_CTRLR_DETACH;

	cmd->cdw10_bits.ns_attach.sel = SPDK_NVME_NS_CTRLR_DETACH;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);
@@ -222,7 +223,7 @@ nvme_ctrlr_cmd_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_data 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_NS_MANAGEMENT;

	cmd->cdw10 = SPDK_NVME_NS_MANAGEMENT_CREATE;

	cmd->cdw10_bits.ns_manage.sel = SPDK_NVME_NS_MANAGEMENT_CREATE;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);
@@ -247,7 +248,7 @@ nvme_ctrlr_cmd_delete_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid, spdk_nvme 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_NS_MANAGEMENT;

	cmd->cdw10 = SPDK_NVME_NS_MANAGEMENT_DELETE;

	cmd->cdw10_bits.ns_manage.sel = SPDK_NVME_NS_MANAGEMENT_DELETE;

	cmd->nsid = nsid;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);
@@ -327,7 +328,7 @@ spdk_nvme_ctrlr_cmd_set_feature(struct spdk_nvme_ctrlr *ctrlr, uint8_t feature, 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_SET_FEATURES;

	cmd->cdw10 = feature;

	cmd->cdw10_bits.set_features.fid = feature;

	cmd->cdw11 = cdw11;

	cmd->cdw12 = cdw12;
@@ -356,7 +357,7 @@ spdk_nvme_ctrlr_cmd_get_feature(struct spdk_nvme_ctrlr *ctrlr, uint8_t feature, 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_GET_FEATURES;

	cmd->cdw10 = feature;

	cmd->cdw10_bits.get_features.fid = feature;

	cmd->cdw11 = cdw11;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);
@@ -385,7 +386,7 @@ spdk_nvme_ctrlr_cmd_get_feature_ns(struct spdk_nvme_ctrlr *ctrlr, uint8_t featur 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_GET_FEATURES;

	cmd->cdw10 = feature;

	cmd->cdw10_bits.get_features.fid = feature;

	cmd->cdw11 = cdw11;

	cmd->nsid = ns_id;
@@ -414,7 +415,7 @@ int spdk_nvme_ctrlr_cmd_set_feature_ns(struct spdk_nvme_ctrlr *ctrlr, uint8_t fe 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_SET_FEATURES;

	cmd->cdw10 = feature;

	cmd->cdw10_bits.set_features.fid = feature;

	cmd->cdw11 = cdw11;

	cmd->cdw12 = cdw12;

	cmd->nsid = ns_id;
@@ -521,8 +522,9 @@ spdk_nvme_ctrlr_cmd_get_log_page(struct spdk_nvme_ctrlr *ctrlr, uint8_t log_page 
	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_GET_LOG_PAGE;

	cmd->nsid = nsid;

	cmd->cdw10 = numdl << 16;

	cmd->cdw10 |= log_page;

	cmd->cdw10_bits.get_log_page.numdl = numdl;

	cmd->cdw10_bits.get_log_page.lid = log_page;



	cmd->cdw11 = numdu;

	cmd->cdw12 = lpol;

	cmd->cdw13 = lpou;
@@ -594,7 +596,8 @@ spdk_nvme_ctrlr_cmd_abort(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_ABORT;

	cmd->cdw10 = (cid << 16) | sqid;

	cmd->cdw10_bits.abort.sqid = sqid;

	cmd->cdw10_bits.abort.cid = cid;



	if (ctrlr->outstanding_aborts >= ctrlr->cdata.acl) {

		STAILQ_INSERT_TAIL(&ctrlr->queued_aborts, req, stailq);
@@ -681,7 +684,10 @@ nvme_ctrlr_cmd_security_receive(struct spdk_nvme_ctrlr *ctrlr, uint8_t secp, 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_SECURITY_RECEIVE;

	cmd->cdw10 = ((uint32_t)secp << 24) | ((uint32_t)spsp << 8) | ((uint32_t)nssf);

	cmd->cdw10_bits.sec_send_recv.nssf = nssf;

	cmd->cdw10_bits.sec_send_recv.spsp0 = (uint8_t)spsp;

	cmd->cdw10_bits.sec_send_recv.spsp1 = (uint8_t)(spsp >> 8);

	cmd->cdw10_bits.sec_send_recv.secp = secp;

	cmd->cdw11 = payload_size;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);
@@ -709,7 +715,10 @@ nvme_ctrlr_cmd_security_send(struct spdk_nvme_ctrlr *ctrlr, uint8_t secp, 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_SECURITY_SEND;

	cmd->cdw10 = ((uint32_t)secp << 24) | ((uint32_t)spsp << 8) | ((uint32_t)nssf);

	cmd->cdw10_bits.sec_send_recv.nssf = nssf;

	cmd->cdw10_bits.sec_send_recv.spsp0 = (uint8_t)spsp;

	cmd->cdw10_bits.sec_send_recv.spsp1 = (uint8_t)(spsp >> 8);

	cmd->cdw10_bits.sec_send_recv.secp = secp;

	cmd->cdw11 = payload_size;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);