From: Minwoo Im <minwoo.im.dev@gmail.com>
Date: Tue, 30 Jan 2018 09:56:46 +0000 (+0900)
Subject: nvme-cli: make it have bpid in cdw10 for fw-commit
X-Git-Tag: v1.6~95^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8e8a8f165820d231dba36895357dc82c996117e6;p=users%2Fsagi%2Fnvme-cli.git

nvme-cli: make it have bpid in cdw10 for fw-commit

_bpid_ was added as a parameter in commit d52c9988 without any being
used.
Make it have inside of cdw10 before submitting a command.

Fixes: d52c9988 ("nvme-cli: update Firmware Commit with boot partition
feature")
Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
---

diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index 6fdb6361..644a85f9 100644
--- a/nvme-ioctl.c
+++ b/nvme-ioctl.c
@@ -689,7 +689,7 @@ int nvme_fw_commit(int fd, __u8 slot, __u8 action, __u8 bpid)
 {
 	struct nvme_admin_cmd cmd = {
 		.opcode		= nvme_admin_activate_fw,
-		.cdw10		= (action << 3) | slot,
+		.cdw10		= (bpid << 31) | (action << 3) | slot,
 	};
 
 	return nvme_submit_admin_passthru(fd, &cmd);