@@ -50,7 +50,21 @@ include::xable-bus-options.txt[]
-i::
--force::
Ignore in-progress Address Range Scrub and try to submit the
- firmware update.
+ firmware update, or ignore firmware activate arm overflows and
+ force-arm devices.
+
+-A::
+--arm::
+ Arm a device for firmware activation. This is enabled by default
+ when a firmware image is specified. Specify --no-arm to disable
+ this default. Otherwise, without a firmware image, this option can be
+ used to manually arm a device for firmware activate.
+
+-D::
+--disarm::
+ Disarm devices after uploading the firmware file, or manually
+ disarm devices when a firmware image is not specified.
+ --no-disarm is not accepted.
-v::
--verbose::
@@ -59,10 +59,15 @@ static struct parameters {
bool master_pass;
bool human;
bool force;
+ bool arm;
+ bool arm_set;
+ bool disarm;
+ bool disarm_set;
bool index;
bool json;
bool verbose;
} param = {
+ .arm = true,
.labelversion = "1.1",
};
@@ -694,6 +699,72 @@ out:
return rc;
}
+static enum ndctl_fwa_state fw_update_arm(struct ndctl_dimm *dimm)
+{
+ struct ndctl_bus *bus = ndctl_dimm_get_bus(dimm);
+ const char *devname = ndctl_dimm_get_devname(dimm);
+ enum ndctl_fwa_state state = ndctl_bus_get_fw_activate_state(bus);
+
+ if (state == NDCTL_FWA_INVALID) {
+ if (param.verbose)
+ err("%s: firmware activate capability not found\n",
+ devname);
+ return NDCTL_FWA_INVALID;
+ }
+
+ if (state == NDCTL_FWA_ARM_OVERFLOW && !param.force) {
+ err("%s: overflow detected skip arm\n", devname);
+ return NDCTL_FWA_INVALID;
+ }
+
+ state = ndctl_dimm_fw_activate_arm(dimm);
+ if (state != NDCTL_FWA_ARMED) {
+ err("%s: failed to arm\n", devname);
+ return NDCTL_FWA_INVALID;
+ }
+
+ if (param.force)
+ return state;
+
+ state = ndctl_bus_get_fw_activate_state(bus);
+ if (state == NDCTL_FWA_ARM_OVERFLOW) {
+ err("%s: arm aborted, tripped overflow\n", devname);
+ ndctl_dimm_fw_activate_disarm(dimm);
+ return NDCTL_FWA_INVALID;
+ }
+ return NDCTL_FWA_ARMED;
+}
+
+#define ARM_FAILURE_FATAL (1)
+#define ARM_FAILURE_OK (0)
+
+static int fw_update_toggle_arm(struct ndctl_dimm *dimm,
+ struct json_object *jdimms, bool arm_fatal)
+{
+ enum ndctl_fwa_state state;
+ struct json_object *jobj;
+ unsigned long flags;
+
+ if (param.disarm)
+ state = ndctl_dimm_fw_activate_disarm(dimm);
+ else if (param.arm)
+ state = fw_update_arm(dimm);
+ else
+ state = NDCTL_FWA_INVALID;
+
+ if (state == NDCTL_FWA_INVALID && arm_fatal)
+ return -ENXIO;
+
+ flags = UTIL_JSON_FIRMWARE;
+ if (isatty(1))
+ flags |= UTIL_JSON_HUMAN;
+ jobj = util_dimm_to_json(dimm, flags);
+ if (jobj)
+ json_object_array_add(jdimms, jobj);
+
+ return 0;
+}
+
static int query_fw_finish_status(struct ndctl_dimm *dimm,
struct action_context *actx)
{
@@ -701,10 +772,8 @@ static int query_fw_finish_status(struct ndctl_dimm *dimm,
struct update_context *uctx = &actx->update;
struct fw_info *fw = &uctx->dimm_fw;
struct timespec now, before, after;
- struct json_object *jobj;
enum ND_FW_STATUS status;
struct ndctl_cmd *cmd;
- unsigned long flags;
uint64_t ver;
int rc;
@@ -765,12 +834,13 @@ again:
goto unref;
}
- flags = UTIL_JSON_FIRMWARE;
- if (isatty(1))
- flags |= UTIL_JSON_HUMAN;
- jobj = util_dimm_to_json(dimm, flags);
- if (jobj)
- json_object_array_add(actx->jdimms, jobj);
+ /*
+ * Now try to arm/disarm firmware activation if
+ * requested. Failure to toggle the arm state is not
+ * fatal, the success / failure will be inferred from
+ * the emitted json state.
+ */
+ fw_update_toggle_arm(dimm, actx->jdimms, ARM_FAILURE_OK);
rc = 0;
break;
case FW_EBADFW:
@@ -846,6 +916,10 @@ static int action_update(struct ndctl_dimm *dimm, struct action_context *actx)
const char *devname = ndctl_dimm_get_devname(dimm);
int rc;
+ if (!param.infile)
+ return fw_update_toggle_arm(dimm, actx->jdimms,
+ ARM_FAILURE_FATAL);
+
rc = ndctl_dimm_fw_update_supported(dimm);
switch (rc) {
case -ENOTTY:
@@ -1090,7 +1164,11 @@ OPT_STRING('i', "input", ¶m.infile, "input-file", \
#define UPDATE_OPTIONS() \
OPT_STRING('f', "firmware", ¶m.infile, "firmware-file", \
"firmware filename for update"), \
-OPT_BOOLEAN('i', "force", ¶m.force, "ignore ARS status, try to force update")
+OPT_BOOLEAN('i', "force", ¶m.force, "ignore ARS / arm status, try to force update"), \
+OPT_BOOLEAN_SET('A', "arm", ¶m.arm, ¶m.arm_set, \
+ "arm device for firmware activation (default)"), \
+OPT_BOOLEAN_SET('D', "disarm", ¶m.disarm, ¶m.disarm_set, \
+ "disarm device for firmware activation")
#define INIT_OPTIONS() \
OPT_BOOLEAN('f', "force", ¶m.force, \
@@ -1237,10 +1315,35 @@ static int dimm_action(int argc, const char **argv, struct ndctl_ctx *ctx,
}
}
+ if (param.arm_set && param.disarm_set) {
+ fprintf(stderr, "set either --arm, or --disarm, not both\n");
+ usage_with_options(u, options);
+ }
+
+ if (param.disarm_set && !param.disarm) {
+ fprintf(stderr, "--no-disarm syntax not supported\n");
+ usage_with_options(u, options);
+ return -EINVAL;
+ }
+
if (!param.infile) {
+ /*
+ * Update needs an infile unless we are only being
+ * called to toggle the arm state. Other actions either
+ * do no need an input file, or are prepared for stdin.
+ */
if (action == action_update) {
- usage_with_options(u, options);
- return -EINVAL;
+ if (!param.arm_set && !param.disarm_set) {
+ fprintf(stderr, "require --arm, or --disarm\n");
+ usage_with_options(u, options);
+ return -EINVAL;
+ }
+
+ if (param.arm_set && !param.arm) {
+ fprintf(stderr, "--no-arm syntax not supported\n");
+ usage_with_options(u, options);
+ return -EINVAL;
+ }
}
actx.f_in = stdin;
} else {
@@ -2093,6 +2093,37 @@ NDCTL_EXPORT int ndctl_dimm_enable(struct ndctl_dimm *dimm)
return 0;
}
+static int dimm_set_arm(struct ndctl_dimm *dimm, bool arm)
+{
+ struct ndctl_ctx *ctx = ndctl_dimm_get_ctx(dimm);
+ char *path = dimm->dimm_buf;
+ int len = dimm->buf_len;
+
+ if (dimm->fwa_state == NDCTL_FWA_INVALID)
+ return NDCTL_FWA_INVALID;
+
+ if (snprintf(path, len, "%s/firmware/activate", dimm->dimm_path) >= len) {
+ err(ctx, "%s: buffer too small!\n", ndctl_dimm_get_devname(dimm));
+ return NDCTL_FWA_INVALID;
+ }
+
+ if (sysfs_write_attr(ctx, path, arm ? "arm" : "disarm") < 0)
+ return NDCTL_FWA_INVALID;
+ return NDCTL_FWA_ARMED;
+}
+
+NDCTL_EXPORT enum ndctl_fwa_state ndctl_dimm_fw_activate_disarm(
+ struct ndctl_dimm *dimm)
+{
+ return dimm_set_arm(dimm, false);
+}
+
+NDCTL_EXPORT enum ndctl_fwa_state ndctl_dimm_fw_activate_arm(
+ struct ndctl_dimm *dimm)
+{
+ return dimm_set_arm(dimm, true);
+}
+
NDCTL_EXPORT enum ndctl_fwa_state ndctl_dimm_get_fw_activate_state(
struct ndctl_dimm *dimm)
{
@@ -437,4 +437,6 @@ LIBNDCTL_24 {
ndctl_dimm_get_fw_activate_result;
ndctl_bus_get_fw_activate_state;
ndctl_bus_get_fw_activate_method;
+ ndctl_dimm_fw_activate_disarm;
+ ndctl_dimm_fw_activate_arm;
} LIBNDCTL_23;
@@ -729,6 +729,8 @@ enum ndctl_fwa_result {
enum ndctl_fwa_state ndctl_dimm_get_fw_activate_state(struct ndctl_dimm *dimm);
enum ndctl_fwa_result ndctl_dimm_get_fw_activate_result(struct ndctl_dimm *dimm);
+enum ndctl_fwa_state ndctl_dimm_fw_activate_disarm(struct ndctl_dimm *dimm);
+enum ndctl_fwa_state ndctl_dimm_fw_activate_arm(struct ndctl_dimm *dimm);
int ndctl_cmd_xlat_firmware_status(struct ndctl_cmd *cmd);
int ndctl_cmd_submit_xlat(struct ndctl_cmd *cmd);
Add an option to control firmware-activation arming and enable it by default. The arming process checks for the "arm overflow" condition and disarms dimms if the last arming caused the overflow to be indicated. The --force option skips checking for arm-overflow. The --disarm option toggles arming off and can be specified without a firmware-image to just perform the disarm operation in isolation. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- Documentation/ndctl/ndctl-update-firmware.txt | 16 +++ ndctl/dimm.c | 125 +++++++++++++++++++++++-- ndctl/lib/libndctl.c | 31 ++++++ ndctl/lib/libndctl.sym | 2 ndctl/libndctl.h | 2 5 files changed, 164 insertions(+), 12 deletions(-)