Commit ed6e83f9 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvmf: implement Firmware Slot Information log page 



Change-Id: I93a4cae46dad7ec42fd82fa4917fd27e3b14c46a
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/405827


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f945642a

lib/nvmf/ctrlr.c

+22 −1
Original line number Diff line number Diff line
@@ -795,6 +795,25 @@ spdk_nvmf_ctrlr_async_event_request(struct spdk_nvmf_request *req) 
	return SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS;

}



static void

spdk_nvmf_get_firmware_slot_log_page(void *buffer, uint64_t offset, uint32_t length)

{

	struct spdk_nvme_firmware_page fw_page;

	size_t copy_len;



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

	fw_page.afi.active_slot = 1;

	fw_page.afi.next_reset_slot = 0;

	spdk_strcpy_pad(fw_page.revision[0], FW_VERSION, sizeof(fw_page.revision[0]), ' ');



	if (offset < sizeof(fw_page)) {

		copy_len = spdk_min(sizeof(fw_page) - offset, length);

		if (copy_len > 0) {

			memcpy(buffer, (const char *)&fw_page + offset, copy_len);

		}

	}

}



static int

spdk_nvmf_ctrlr_get_log_page(struct spdk_nvmf_request *req)

{
@@ -847,9 +866,11 @@ spdk_nvmf_ctrlr_get_log_page(struct spdk_nvmf_request *req) 
		switch (lid) {

		case SPDK_NVME_LOG_ERROR:

		case SPDK_NVME_LOG_HEALTH_INFORMATION:

		case SPDK_NVME_LOG_FIRMWARE_SLOT:

			/* TODO: actually fill out log page data */

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		case SPDK_NVME_LOG_FIRMWARE_SLOT:

			spdk_nvmf_get_firmware_slot_log_page(req->data, offset, len);

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		case SPDK_NVME_LOG_COMMAND_EFFECTS_LOG:

			spdk_nvmf_get_cmds_and_effects_log_page(req->data, offset, len);

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;