svn commit: r328689 - stable/11/sys/dev/nvme

[Alexander Motin]

Author: mav
Date: Thu Feb  1 16:50:25 2018
New Revision: 328689
URL: https://svnweb.freebsd.org/changeset/base/328689

Log:
  MFC r322902 (by imp):
  NVME Namespace ID is 32-bits, so widen interface to reflect that.

Modified:
  stable/11/sys/dev/nvme/nvme_ctrlr.c
  stable/11/sys/dev/nvme/nvme_ctrlr_cmd.c
  stable/11/sys/dev/nvme/nvme_ns.c
  stable/11/sys/dev/nvme/nvme_private.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- stable/11/sys/dev/nvme/nvme_ctrlr.c	Thu Feb  1 16:49:28 2018	(r328688)
+++ stable/11/sys/dev/nvme/nvme_ctrlr.c	Thu Feb  1 16:50:25 2018	(r328689)
@@ -460,7 +460,7 @@ static int
 nvme_ctrlr_construct_namespaces(struct nvme_controller *ctrlr)
 {
 	struct nvme_namespace	*ns;
-	int			i;
+	uint32_t 		i;
 
 	for (i = 0; i < min(ctrlr->cdata.nn, NVME_MAX_NAMESPACES); i++) {
 		ns = &ctrlr->ns[i];

Modified: stable/11/sys/dev/nvme/nvme_ctrlr_cmd.c
==============================================================================
--- stable/11/sys/dev/nvme/nvme_ctrlr_cmd.c	Thu Feb  1 16:49:28 2018	(r328688)
+++ stable/11/sys/dev/nvme/nvme_ctrlr_cmd.c	Thu Feb  1 16:50:25 2018	(r328689)
@@ -52,7 +52,7 @@ nvme_ctrlr_cmd_identify_controller(struct nvme_control
 }
 
 void
-nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr, uint16_t nsid,
+nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr, uint32_t nsid,
 	void *payload, nvme_cb_fn_t cb_fn, void *cb_arg)
 {
 	struct nvme_request *req;

Modified: stable/11/sys/dev/nvme/nvme_ns.c
==============================================================================
--- stable/11/sys/dev/nvme/nvme_ns.c	Thu Feb  1 16:49:28 2018	(r328688)
+++ stable/11/sys/dev/nvme/nvme_ns.c	Thu Feb  1 16:50:25 2018	(r328689)
@@ -476,7 +476,7 @@ nvme_ns_bio_process(struct nvme_namespace *ns, struct 
 }
 
 int
-nvme_ns_construct(struct nvme_namespace *ns, uint16_t id,
+nvme_ns_construct(struct nvme_namespace *ns, uint32_t id,
     struct nvme_controller *ctrlr)
 {
 	struct nvme_completion_poll_status	status;

Modified: stable/11/sys/dev/nvme/nvme_private.h
==============================================================================
--- stable/11/sys/dev/nvme/nvme_private.h	Thu Feb  1 16:49:28 2018	(r328688)
+++ stable/11/sys/dev/nvme/nvme_private.h	Thu Feb  1 16:50:25 2018	(r328689)
@@ -225,8 +225,8 @@ struct nvme_namespace {
 
 	struct nvme_controller		*ctrlr;
 	struct nvme_namespace_data	data;
-	uint16_t			id;
-	uint16_t			flags;
+	uint32_t			id;
+	uint32_t			flags;
 	struct cdev			*cdev;
 	void				*cons_cookie[NVME_MAX_CONSUMERS];
 	uint32_t			stripesize;
@@ -356,7 +356,7 @@ void	nvme_ctrlr_cmd_identify_controller(struct nvme_co
 					   void *payload,
 					   nvme_cb_fn_t cb_fn, void *cb_arg);
 void	nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr,
-					  uint16_t nsid, void *payload,
+					  uint32_t nsid, void *payload,
 					  nvme_cb_fn_t cb_fn, void *cb_arg);
 void	nvme_ctrlr_cmd_set_interrupt_coalescing(struct nvme_controller *ctrlr,
 						uint32_t microseconds,
@@ -438,7 +438,7 @@ void	nvme_io_qpair_enable(struct nvme_qpair *qpair);
 void	nvme_io_qpair_disable(struct nvme_qpair *qpair);
 void	nvme_io_qpair_destroy(struct nvme_qpair *qpair);
 
-int	nvme_ns_construct(struct nvme_namespace *ns, uint16_t id,
+int	nvme_ns_construct(struct nvme_namespace *ns, uint32_t id,
 			  struct nvme_controller *ctrlr);
 void	nvme_ns_destruct(struct nvme_namespace *ns);