svn commit: r346233 - stable/12/sys/dev/nvme

[Alexander Motin]

Author: mav
Date: Mon Apr 15 14:58:40 2019
New Revision: 346233
URL: https://svnweb.freebsd.org/changeset/base/346233

Log:
  MFC r341710 (by imp):
  Even though they are reserved, cdw2 and cdw3 can be set via nvme-cli
  (and soon nvmecontrol). Go ahead and copy them into rsvd2 and rsvd3.

Modified:
  stable/12/sys/dev/nvme/nvme_ctrlr.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- stable/12/sys/dev/nvme/nvme_ctrlr.c	Mon Apr 15 14:57:50 2019	(r346232)
+++ stable/12/sys/dev/nvme/nvme_ctrlr.c	Mon Apr 15 14:58:40 2019	(r346233)
@@ -1075,6 +1075,8 @@ nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctr
 	/* Assume userspace already converted to little-endian */
 	req->cmd.opc = pt->cmd.opc;
 	req->cmd.fuse = pt->cmd.fuse;
+	req->cmd.rsvd2 = pt->cmd.rsvd2;
+	req->cmd.rsvd3 = pt->cmd.rsvd3;
 	req->cmd.cdw10 = pt->cmd.cdw10;
 	req->cmd.cdw11 = pt->cmd.cdw11;
 	req->cmd.cdw12 = pt->cmd.cdw12;