summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Morrogh <gmorrogh@tintri.com>2020-06-29 15:29:42 +0000
committerHans Rosenfeld <rosenfeld@grumpf.hope-2000.org>2022-02-22 10:14:32 +0100
commit68df0c4f60a2e57680d6d1e6dba32ffa2d035538 (patch)
treea99746e82b3f230c5d1b385e3ca0879d7b061ec4
parent8466ab889653be2119e4a8966b6bc4e2d5ee2fb6 (diff)
downloadillumos-gate-68df0c4f60a2e57680d6d1e6dba32ffa2d035538.tar.gz
14513 nvmeadm list-firmware
Reviewed by: Andy Giles <agiles@tintri.com> Reviewed by: Ben Jameson <bjameson@tintri.com> Reviewed by: Vishwarupa Chary <vchary@tintri.com> Reviewed by: Niraj Kumar <nkumar@tintri.com> Reviewed by: Robert Mustacchi <rm+illumos@fingolfin.org> Reviewed by: Andy Fiddaman <andy@omnios.org> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/cmd/nvmeadm/nvmeadm.c18
-rw-r--r--usr/src/man/man1m/nvmeadm.1m30
2 files changed, 39 insertions, 9 deletions
diff --git a/usr/src/cmd/nvmeadm/nvmeadm.c b/usr/src/cmd/nvmeadm/nvmeadm.c
index 8fe59a6dc6..b592a2bd25 100644
--- a/usr/src/cmd/nvmeadm/nvmeadm.c
+++ b/usr/src/cmd/nvmeadm/nvmeadm.c
@@ -27,8 +27,7 @@
* secure-erase ...
* detach ...
* attach ...
- * get-param ...
- * set-param ...
+ * list-firmware ...
* load-firmware ...
* commit-firmware ...
* activate-firmware ...
@@ -109,6 +108,7 @@ static void usage_get_features(const char *);
static void usage_format(const char *);
static void usage_secure_erase(const char *);
static void usage_attach_detach(const char *);
+static void usage_firmware_list(const char *);
static void usage_firmware_load(const char *);
static void usage_firmware_commit(const char *);
static void usage_firmware_activate(const char *);
@@ -168,6 +168,12 @@ static const nvmeadm_cmd_t nvmeadm_cmds[] = {
do_attach_detach, usage_attach_detach, B_FALSE
},
{
+ "list-firmware",
+ "list firmware on a controller",
+ NULL,
+ do_get_logpage_fwslot, usage_firmware_list, B_FALSE
+ },
+ {
"load-firmware",
"load firmware to a controller",
NULL,
@@ -721,6 +727,14 @@ usage_get_logpage(const char *c_name)
"are error, health, and firmware.\n", c_name);
}
+static void
+usage_firmware_list(const char *c_name)
+{
+ (void) fprintf(stderr, "%s <ctl>\n\n"
+ " Print the log page that contains the list of firmware "
+ "images installed on the specified NVMe controller.\n", c_name);
+}
+
static int
do_get_logpage_error(int fd, const nvme_process_arg_t *npa)
{
diff --git a/usr/src/man/man1m/nvmeadm.1m b/usr/src/man/man1m/nvmeadm.1m
index b18868a16e..0ec278936e 100644
--- a/usr/src/man/man1m/nvmeadm.1m
+++ b/usr/src/man/man1m/nvmeadm.1m
@@ -64,6 +64,10 @@
.Ar ctl[/ns]
.Nm
.Op Fl dv
+.Cm list-firmware
+.Ar ctl
+.Nm
+.Op Fl dv
.Cm load-firmware
.Ar ctl
.Ar firmware-file
@@ -173,11 +177,10 @@ using the
command, and subsequently activated with the
.Cm activate-firmware
command.
-Slots and their contents can be printed using
-.Cm nvmeadm get-logpage
-to request the
-.Ar firmware
-logpage.
+Slots and their contents can be printed using the
+.Nm
+.Cm list-firmware
+command.
.El
.Sh COMMANDS
.Bl -tag -width ""
@@ -402,6 +405,19 @@ previous
command.
.It Xo
.Nm
+.Cm list-firmware
+.Ar ctl
+.Xc
+List currently active firmware slot, the next active firmware slot, and the
+current contents of all firmware slots of an NVMe controller.
+This is a synonym for the
+.Nm
+.Cm get-logpage
+.Ar ctl
+.Cm firmware
+command.
+.It Xo
+.Nm
.Cm load-firmware
.Ar ctl
.Ar firmware-file
@@ -527,7 +543,7 @@ nvme4: Get Features
.Ed
.It Sy Example 5: Load and activate firmware
.Bd -literal
-# nvmeadm get-logpage nvme3 firmware
+# nvmeadm list-firmware nvme3
nvme3: Firmware Slot Information
Active Firmware Slot: 4
Next Firmware Slot: 4
@@ -546,7 +562,7 @@ Firmware committed to slot 5.
# nvmeadm -v activate-firmware nvme3 5
Slot 5 activated: NVM subsystem reset required - power cycle your system.
-# nvmeadm get-logpage nvme3 firmware
+# nvmeadm list-firmware nvme3
nvme3: Firmware Slot Information
Active Firmware Slot: 4
Next Firmware Slot: 5