@@ -31,6 +31,7 @@ man1_MANS = \
ndctl-destroy-namespace.1 \
ndctl-check-namespace.1 \
ndctl-inject-error.1 \
+ ndctl-update-firmware.1 \
ndctl-list.1
CLEANFILES = $(man1_MANS)
new file mode 100644
@@ -0,0 +1,18 @@
+ndctl-update-firmware(1)
+========================
+
+NAME
+----
+ndctl-update-firmware - provides updating of NVDIMM firmware
+
+SYNOPSIS
+--------
+[verse]
+'ndctl update-firmware' -f <firmware_file> -d <dimm name>
+
+COPYRIGHT
+---------
+Copyright (c) 2016 - 2017, Intel Corporation. License GPLv2: GNU GPL
+version 2 <http://gnu.org/licenses/gpl.html>. This is free software:
+you are free to change and redistribute it. There is NO WARRANTY, to
+the extent permitted by law.
@@ -43,4 +43,5 @@ int cmd_test(int argc, const char **argv, void *ctx);
#ifdef ENABLE_DESTRUCTIVE
int cmd_bat(int argc, const char **argv, void *ctx);
#endif
+int cmd_update_firmware(int argc, const char **argv, void *ctx);
#endif /* _NDCTL_BUILTIN_H_ */
@@ -13,7 +13,8 @@ ndctl_SOURCES = ndctl.c \
test.c \
../util/json.c \
util/json-smart.c \
- inject-error.c
+ inject-error.c \
+ update.c
if ENABLE_DESTRUCTIVE
ndctl_SOURCES += ../test/blk_namespaces.c \
@@ -84,6 +84,7 @@ static struct cmd_struct commands[] = {
{ "init-labels", cmd_init_labels },
{ "check-labels", cmd_check_labels },
{ "inject-error", cmd_inject_error },
+ { "update-firmware", cmd_update_firmware },
{ "list", cmd_list },
{ "help", cmd_help },
#ifdef ENABLE_TEST
new file mode 100644
@@ -0,0 +1,553 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2018 Intel Corporation. All rights reserved. */
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <syslog.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/file.h>
+
+#include <util/log.h>
+#include <util/size.h>
+#include <util/util.h>
+#include <uuid/uuid.h>
+#include <util/json.h>
+#include <util/filter.h>
+#include <json-c/json.h>
+#include <util/fletcher.h>
+#include <ndctl/libndctl.h>
+#include <ndctl/namespace.h>
+#include <util/parse-options.h>
+#include <ccan/minmax/minmax.h>
+#include <ccan/array_size/array_size.h>
+#ifdef HAVE_NDCTL_H
+#include <linux/ndctl.h>
+#else
+#include <ndctl.h>
+#endif
+
+#include <libndctl-nfit.h>
+#include "private.h"
+#include <builtin.h>
+#include <test.h>
+
+#define ND_CMD_STATUS_SUCCESS 0
+#define ND_CMD_STATUS_NOTSUPP 1
+#define ND_CMD_STATUS_NOTEXIST 2
+#define ND_CMD_STATUS_INVALPARM 3
+#define ND_CMD_STATUS_HWERR 4
+#define ND_CMD_STATUS_RETRY 5
+#define ND_CMD_STATUS_UNKNOWN 6
+#define ND_CMD_STATUS_EXTEND 7
+#define ND_CMD_STATUS_NORES 8
+#define ND_CMD_STATUS_NOTREADY 9
+
+#define ND_CMD_STATUS_START_BUSY 0x10000
+#define ND_CMD_STATUS_SEND_CTXINVAL 0x10000
+#define ND_CMD_STATUS_FIN_CTXINVAL 0x10000
+#define ND_CMD_STATUS_FIN_DONE 0x20000
+#define ND_CMD_STATUS_FIN_BAD 0x30000
+#define ND_CMD_STATUS_FIN_ABORTED 0x40000
+#define ND_CMD_STATUS_FQ_CTXINVAL 0x10000
+#define ND_CMD_STATUS_FQ_BUSY 0x20000
+#define ND_CMD_STATUS_FQ_BAD 0x30000
+#define ND_CMD_STATUS_FQ_ORDER 0x40000
+
+struct fw_info {
+ uint32_t store_size;
+ uint32_t update_size;
+ uint32_t query_interval;
+ uint32_t max_query;
+ uint64_t run_version;
+ uint32_t context;
+};
+
+struct update_context {
+ int fw_fd;
+ size_t fw_size;
+ const char *fw_path;
+ const char *dimm_id;
+ struct ndctl_dimm *dimm;
+ struct fw_info dimm_fw;
+ struct ndctl_cmd *start;
+};
+
+/*
+ * updating firmware consists of performing the following steps:
+ * 1. Call GET_FIMRWARE_INFO DSM. The return results provide:
+ * A. Size of the firmware storage area
+ * B. Max size per send command
+ * C. Polling interval for check finish status
+ * D. Max time for finish update poll
+ * E. Update capabilities
+ * F. Running FIS version
+ * G. Running FW revision
+ * H. Updated FW revision. Only valid after firmware update done.
+ * 2. Call START_FW_UPDATE. The return results provide:
+ * A. Ready to start status
+ * B. Valid FW update context
+ * 3. Call SEND_FW_UPDATE_DATA with valid payload
+ * Repeat until done.
+ * 4. Call FINISH_FW_UPDATE
+ * 5. Poll with QUERY_FINISH_UPDATE success or failure
+ */
+
+static int verify_fw_size(struct update_context *uctx)
+{
+ struct fw_info *fw = &uctx->dimm_fw;
+
+ if (uctx->fw_size > fw->store_size) {
+ error("Firmware file size greater than DIMM store\n");
+ return -ENOSPC;
+ }
+
+ return 0;
+}
+
+static int submit_get_firmware_info(struct update_context *uctx)
+{
+ struct ndctl_cmd *cmd;
+ int rc;
+ enum ND_FW_STATUS status;
+ struct fw_info *fw = &uctx->dimm_fw;
+
+ cmd = ndctl_dimm_cmd_new_fw_get_info(uctx->dimm);
+ if (!cmd)
+ return -ENXIO;
+
+ rc = ndctl_cmd_submit(cmd);
+ if (rc < 0)
+ return rc;
+
+ status = ndctl_cmd_fw_xlat_firmware_status(cmd);
+ if (status != FW_SUCCESS) {
+ error("GET FIRMWARE INFO failed: %#x\n", status);
+ return -ENXIO;
+ }
+
+ fw->store_size = ndctl_cmd_fw_info_get_storage_size(cmd);
+ if (fw->store_size == UINT_MAX)
+ return -ENXIO;
+
+ fw->update_size = ndctl_cmd_fw_info_get_max_send_len(cmd);
+ if (fw->update_size == UINT_MAX)
+ return -ENXIO;
+
+ fw->query_interval = ndctl_cmd_fw_info_get_query_interval(cmd);
+ if (fw->query_interval == UINT_MAX)
+ return -ENXIO;
+
+ fw->max_query = ndctl_cmd_fw_info_get_max_query_time(cmd);
+ if (fw->max_query == UINT_MAX)
+ return -ENXIO;
+
+ fw->run_version = ndctl_cmd_fw_info_get_run_version(cmd);
+ if (fw->run_version == ULLONG_MAX)
+ return -ENXIO;
+
+ rc = verify_fw_size(uctx);
+ ndctl_cmd_unref(cmd);
+ return rc;
+}
+
+static int submit_start_firmware_upload(struct update_context *uctx)
+{
+ struct ndctl_cmd *cmd;
+ int rc;
+ enum ND_FW_STATUS status;
+ struct fw_info *fw = &uctx->dimm_fw;
+
+ cmd = ndctl_dimm_cmd_new_fw_start_update(uctx->dimm);
+ if (!cmd)
+ return -ENXIO;
+
+ rc = ndctl_cmd_submit(cmd);
+ if (rc < 0)
+ return rc;
+
+ status = ndctl_cmd_fw_xlat_firmware_status(cmd);
+ if (status != FW_SUCCESS) {
+ error("START FIRMWARE UPDATE failed: %#x\n", status);
+ if (status == FW_EBUSY)
+ error("Another firmware upload in progress or finished.\n");
+ return -ENXIO;
+ }
+
+ fw->context = ndctl_cmd_fw_start_get_context(cmd);
+ if (fw->context == UINT_MAX)
+ return -ENXIO;
+
+ uctx->start = cmd;
+
+ return 0;
+}
+
+static int get_fw_data_from_file(int fd, void *buf, uint32_t len,
+ uint32_t offset)
+{
+ ssize_t rc, total = len;
+
+ while (len) {
+ rc = pread(fd, buf, len, offset);
+ if (rc < 0)
+ return -errno;
+ len -= rc;
+ }
+
+ return total;
+}
+
+static int send_firmware(struct update_context *uctx)
+{
+ struct ndctl_cmd *cmd = NULL;
+ ssize_t read;
+ int rc;
+ enum ND_FW_STATUS status;
+ struct fw_info *fw = &uctx->dimm_fw;
+ uint32_t copied = 0, len, remain;
+ void *buf;
+
+ buf = malloc(fw->update_size);
+ if (!buf)
+ return -ENOMEM;
+
+ remain = uctx->fw_size;
+
+ while (remain) {
+ len = min(fw->update_size, remain);
+ read = get_fw_data_from_file(uctx->fw_fd, buf, len, copied);
+ if (read < 0) {
+ rc = read;
+ goto cleanup;
+ }
+
+ cmd = ndctl_dimm_cmd_new_fw_send(uctx->start, copied, read,
+ buf);
+ if (!cmd) {
+ rc = -ENXIO;
+ goto cleanup;
+ }
+
+ rc = ndctl_cmd_submit(cmd);
+ if (rc < 0)
+ goto cleanup;
+
+ status = ndctl_cmd_fw_xlat_firmware_status(cmd);
+ if (status != FW_SUCCESS) {
+ error("SEND FIRMWARE failed: %#x\n", status);
+ rc = -ENXIO;
+ goto cleanup;
+ }
+
+ copied += read;
+ remain -= read;
+
+ ndctl_cmd_unref(cmd);
+ cmd = NULL;
+ }
+
+cleanup:
+ if (cmd)
+ ndctl_cmd_unref(cmd);
+ free(buf);
+ return rc;
+}
+
+static int submit_finish_firmware(struct update_context *uctx)
+{
+ struct ndctl_cmd *cmd;
+ int rc;
+ enum ND_FW_STATUS status;
+
+ cmd = ndctl_dimm_cmd_new_fw_finish(uctx->start);
+ if (!cmd)
+ return -ENXIO;
+
+ rc = ndctl_cmd_submit(cmd);
+ if (rc < 0)
+ goto out;
+
+ status = ndctl_cmd_fw_xlat_firmware_status(cmd);
+ if (status != FW_SUCCESS) {
+ error("FINISH FIRMWARE UPDATE failed: %#x\n", status);
+ rc = -ENXIO;
+ goto out;
+ }
+
+out:
+ ndctl_cmd_unref(cmd);
+ return rc;
+}
+
+static int submit_abort_firmware(struct update_context *uctx)
+{
+ struct ndctl_cmd *cmd;
+ int rc;
+ enum ND_FW_STATUS status;
+
+ cmd = ndctl_dimm_cmd_new_fw_abort(uctx->start);
+ if (!cmd)
+ return -ENXIO;
+
+ rc = ndctl_cmd_submit(cmd);
+ if (rc < 0)
+ goto out;
+
+ status = ndctl_cmd_fw_xlat_firmware_status(cmd);
+ if (!(status & ND_CMD_STATUS_FIN_ABORTED)) {
+ error("FW update abort failed: %#x\n", status);
+ rc = -ENXIO;
+ goto out;
+ }
+
+out:
+ ndctl_cmd_unref(cmd);
+ return rc;
+}
+
+static int query_fw_finish_status(struct update_context *uctx)
+{
+ struct ndctl_cmd *cmd;
+ int rc;
+ enum ND_FW_STATUS status;
+ struct fw_info *fw = &uctx->dimm_fw;
+ bool done = false;
+ struct timespec now, before, after;
+ uint64_t ver;
+
+ cmd = ndctl_dimm_cmd_new_fw_finish_query(uctx->start);
+ if (!cmd)
+ return -ENXIO;
+
+ rc = clock_gettime(CLOCK_MONOTONIC, &before);
+ if (rc < 0)
+ goto out;
+
+ now.tv_nsec = fw->query_interval / 1000;
+ now.tv_sec = 0;
+
+ do {
+ rc = ndctl_cmd_submit(cmd);
+ if (rc < 0)
+ break;
+
+ status = ndctl_cmd_fw_xlat_firmware_status(cmd);
+ switch (status) {
+ case FW_SUCCESS:
+ ver = ndctl_cmd_fw_fquery_get_fw_rev(cmd);
+ if (ver == 0) {
+ printf("No firmware updated\n");
+ rc = -ENXIO;
+ goto out;
+ }
+
+ printf("Image %s updated successfully to DIMM %s\n",
+ uctx->fw_path, uctx->dimm_id);
+ printf("Firmware version %#lx.\n", ver);
+ printf("Reboot to activate.\n");
+ done = true;
+ rc = 0;
+ break;
+ case FW_EBUSY:
+ /* Still on going, continue */
+ rc = clock_gettime(CLOCK_MONOTONIC, &after);
+ if (rc < 0) {
+ rc = -errno;
+ goto out;
+ }
+
+ /*
+ * If we expire max query time,
+ * we timed out
+ */
+ if (after.tv_sec - before.tv_sec >
+ fw->max_query / 1000000) {
+ rc = -ETIMEDOUT;
+ goto out;
+ }
+
+ /*
+ * Sleep the interval dictated by firmware
+ * before query again.
+ */
+ rc = nanosleep(&now, NULL);
+ if (rc < 0) {
+ rc = -errno;
+ goto out;
+ }
+ break;
+ case FW_EBADFW:
+ printf("Image failed to verify by DIMM\n");
+ case FW_EINVAL_CTX:
+ case FW_ESEQUENCE:
+ done = true;
+ rc = -ENXIO;
+ goto out;
+ case FW_ENORES:
+ printf("Firmware update sequence timed out\n");
+ rc = -ETIMEDOUT;
+ done = true;
+ goto out;
+ default:
+ rc = -EINVAL;
+ done = true;
+ goto out;
+ }
+ } while (!done);
+
+out:
+ ndctl_cmd_unref(cmd);
+ return rc;
+}
+
+static int update_firmware(struct update_context *uctx)
+{
+ int rc;
+
+ rc = submit_get_firmware_info(uctx);
+ if (rc < 0)
+ return rc;
+
+ rc = submit_start_firmware_upload(uctx);
+ if (rc < 0)
+ return rc;
+
+ printf("Uploading %s to DIMM %s\n", uctx->fw_path, uctx->dimm_id);
+
+ rc = send_firmware(uctx);
+ if (rc < 0) {
+ error("Firmware send failed. Aborting...\n");
+ rc = submit_abort_firmware(uctx);
+ if (rc < 0)
+ error("Aborting update sequence failed\n");
+ return rc;
+ }
+
+ rc = submit_finish_firmware(uctx);
+ if (rc < 0) {
+ error("Unable to end update sequence\n");
+ rc = submit_abort_firmware(uctx);
+ if (rc < 0)
+ error("Aborting update sequence failed\n");
+ return rc;
+ }
+
+ rc = query_fw_finish_status(uctx);
+ if (rc < 0)
+ return rc;
+
+ return 0;
+}
+
+static int get_ndctl_dimm(struct update_context *uctx, void *ctx)
+{
+ struct ndctl_dimm *dimm;
+ struct ndctl_bus *bus;
+
+ ndctl_bus_foreach(ctx, bus)
+ ndctl_dimm_foreach(bus, dimm) {
+ if (!util_dimm_filter(dimm, uctx->dimm_id))
+ continue;
+ uctx->dimm = dimm;
+ return 0;
+ }
+
+ return -ENODEV;
+}
+
+static int verify_fw_file(struct update_context *uctx)
+{
+ struct stat st;
+ int rc;
+
+ uctx->fw_fd = open(uctx->fw_path, O_RDONLY);
+ if (uctx->fw_fd < 0)
+ return -errno;
+
+ rc = flock(uctx->fw_fd, LOCK_EX | LOCK_NB);
+ if (rc < 0) {
+ rc = -errno;
+ goto cleanup;
+ }
+
+ if (fstat(uctx->fw_fd, &st) < 0) {
+ rc = -errno;
+ goto cleanup;
+ }
+
+ if (!S_ISREG(st.st_mode)) {
+ rc = -EINVAL;
+ goto cleanup;
+ }
+
+ uctx->fw_size = st.st_size;
+ if (uctx->fw_size == 0) {
+ rc = -EINVAL;
+ goto cleanup;
+ }
+
+ return 0;
+
+cleanup:
+ close(uctx->fw_fd);
+ return rc;
+}
+
+int cmd_update_firmware(int argc, const char **argv, void *ctx)
+{
+ struct update_context uctx = { 0 };
+ const struct option options[] = {
+ OPT_STRING('f', "firmware", &uctx.fw_path,
+ "file-name", "name of firmware"),
+ OPT_STRING('d', "dimm", &uctx.dimm_id, "dimm-id",
+ "dimm to be updated"),
+ OPT_END(),
+ };
+ const char * const u[] = {
+ "ndctl update_firmware [<options>]",
+ NULL
+ };
+ int i, rc;
+
+ argc = parse_options(argc, argv, options, u, 0);
+ for (i = 0; i < argc; i++)
+ error("unknown parameter \"%s\"\n", argv[i]);
+ if (argc)
+ usage_with_options(u, options);
+
+ if (!uctx.fw_path) {
+ error("No firmware file provided\n");
+ usage_with_options(u, options);
+ return -EINVAL;
+ }
+
+ if (!uctx.dimm_id) {
+ error("No DIMM ID provided\n");
+ usage_with_options(u, options);
+ return -EINVAL;
+ }
+
+ rc = verify_fw_file(&uctx);
+ if (rc < 0)
+ return rc;
+
+ rc = get_ndctl_dimm(&uctx, ctx);
+ if (rc < 0)
+ return rc;
+
+ rc = update_firmware(&uctx);
+ if (rc < 0)
+ return rc;
+
+ if (uctx.start)
+ ndctl_cmd_unref(uctx.start);
+
+ return 0;
+}
Adding option "update-firmware" to ndctl for update firmware support from Intel DSM v1.6. ndctl update-firmware takes an option of -f for a firmware binary and a -d for the DIMM name: ndctl update-firmware -d nmem0 -f new_firmware.bin Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- Fixed issue from coverity warning that points to using stat and then opening the file based on the result of stat. We will now open the file, flock the file exclusively, and then use fstat. Documentation/ndctl/Makefile.am | 1 Documentation/ndctl/ndctl-update-firmware.txt | 18 + builtin.h | 1 ndctl/Makefile.am | 3 ndctl/ndctl.c | 1 ndctl/update.c | 553 +++++++++++++++++++++++++ 6 files changed, 576 insertions(+), 1 deletion(-) create mode 100644 Documentation/ndctl/ndctl-update-firmware.txt create mode 100644 ndctl/update.c