Commit 1572882a authored by sunshihao520's avatar sunshihao520 Committed by Tomasz Zawadzki
Browse files

lib/nvme: add function spdk_nvme_bytes_to_numd to calculate number of dwords 



According to kernel, use an inline function spdk_nvme_bytes_to_numd
to transfer paload_size form bytes to numer of dwords.

Signed-off-by: default avatarsunshihao <sunshihao@huawei.com>
Change-Id: I8b9ded122bbf4a3c8e46988993ea52404783c0b0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5926


Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 9317f72d

CHANGELOG.md

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ parameter in `spdk_blob_open_opts_init` function. 


Added a new function `spdk_nvme_ctrlr_reset_subsystem` to perform a NVMe

subsystem reset. Note: The NVMf target does not support the subsystem reset yet.



Add a new function 'spdk_nvme_bytes_to_numd' to transfer bytes to number of

dwords.

### event



The pci_whitelist and pci_blacklist members of struct spdk_app_opts have been

include/spdk/nvme_spec.h

+6 −0
Original line number Diff line number Diff line
@@ -1398,6 +1398,12 @@ static inline enum spdk_nvme_data_transfer spdk_nvme_opc_get_data_transfer(uint8 
	return (enum spdk_nvme_data_transfer)(opc & 3);

}



static inline uint32_t

spdk_nvme_bytes_to_numd(uint32_t len)

{

	return (len >> 2) - 1;

}



enum spdk_nvme_feat {

	/* 0x00 - reserved */

lib/nvme/nvme_ctrlr_cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ spdk_nvme_ctrlr_cmd_get_log_page_ext(struct spdk_nvme_ctrlr *ctrlr, uint8_t log_ 
		return -EINVAL;

	}



	numd = payload_size / sizeof(uint32_t) - 1u;

	numd = spdk_nvme_bytes_to_numd(payload_size);

	numdl = numd & 0xFFFFu;

	numdu = (numd >> 16) & 0xFFFFu;
@@ -867,7 +867,7 @@ nvme_ctrlr_cmd_fw_image_download(struct spdk_nvme_ctrlr *ctrlr, 


	cmd = &req->cmd;

	cmd->opc = SPDK_NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD;

	cmd->cdw10 = (size >> 2) - 1;

	cmd->cdw10 = spdk_nvme_bytes_to_numd(size);

	cmd->cdw11 = offset >> 2;



	rc = nvme_ctrlr_submit_admin_request(ctrlr, req);

lib/nvme/nvme_zns.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ nvme_zns_zone_mgmt_recv(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, 
	cmd->nsid = ns->id;



	*(uint64_t *)&cmd->cdw10 = slba;

	cmd->cdw12 = payload_size / sizeof(uint32_t) - 1u;

	cmd->cdw12 = spdk_nvme_bytes_to_numd(payload_size);

	cmd->cdw13 = zone_recv_action | zra_spec_field << 8 | zra_spec_feats << 16;



	return nvme_qpair_submit_request(qpair, req);

module/bdev/nvme/bdev_nvme_rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ apply_firmware_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg 
		firm_ctx->transfer = spdk_min(firm_ctx->size_remaining, 4096);

		cmd.opc = SPDK_NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD;



		cmd.cdw10 = (firm_ctx->transfer >> 2) - 1;

		cmd.cdw10 = spdk_nvme_bytes_to_numd(firm_ctx->transfer);

		cmd.cdw11 = firm_ctx->offset >> 2;

		rc = spdk_bdev_nvme_admin_passthru(firm_ctx->desc, firm_ctx->ch, &cmd, firm_ctx->p,

						   firm_ctx->transfer, apply_firmware_complete, firm_ctx);
@@ -913,7 +913,7 @@ rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request, 
	memset(cmd, 0, sizeof(struct spdk_nvme_cmd));

	cmd->opc = SPDK_NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD;



	cmd->cdw10 = (firm_ctx->transfer >> 2) - 1;

	cmd->cdw10 = spdk_nvme_bytes_to_numd(firm_ctx->transfer);

	cmd->cdw11 = firm_ctx->offset >> 2;



	rc = spdk_bdev_nvme_admin_passthru(firm_ctx->desc, firm_ctx->ch, cmd, firm_ctx->p,