From: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Date: Mon, 22 Feb 2021 19:09:18 +0000 (+0530)
Subject: nvme: fix status field masking and data type
X-Git-Tag: v1.14~73
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=12d211fafb5382bfa6c09f3394ba8c0fe87b6de8;p=users%2Fsagi%2Fnvme-cli.git

nvme: fix status field masking and data type

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
---

diff --git a/nvme.c b/nvme.c
index 42d02413..b4f40c6b 100644
--- a/nvme.c
+++ b/nvme.c
@@ -2629,9 +2629,9 @@ ret:
 	return nvme_status_to_errno(err, false);
 }
 
-static char *nvme_fw_status_reset_type(__u32 status)
+static char *nvme_fw_status_reset_type(__u16 status)
 {
-	switch (status & 0x3ff) {
+	switch (status & 0x7ff) {
 	case NVME_SC_FW_NEEDS_CONV_RESET:	return "conventional";
 	case NVME_SC_FW_NEEDS_SUBSYS_RESET:	return "subsystem";
 	case NVME_SC_FW_NEEDS_RESET:		return "any controller";
@@ -2694,7 +2694,7 @@ static int fw_commit(int argc, char **argv, struct command *cmd, struct plugin *
 	if (err < 0)
 		perror("fw-commit");
 	else if (err != 0)
-		switch (err & 0x3ff) {
+		switch (err & 0x7ff) {
 		case NVME_SC_FW_NEEDS_CONV_RESET:
 		case NVME_SC_FW_NEEDS_SUBSYS_RESET:
 		case NVME_SC_FW_NEEDS_RESET: