svn commit: r328697 - in stable/11/sys: cam dev/nvme

[Alexander Motin]

Author: mav
Date: Thu Feb  1 18:59:03 2018
New Revision: 328697
URL: https://svnweb.freebsd.org/changeset/base/328697

Log:
  MFC r322998 (by imp):
  Fix a few overlooked spots where the coded uses 16-bit NSIDs. Chuck
  Tuffli had submitted a more thorough patch that I was unaware of when
  I did my work and this brings in the bits I missed from that patch.

Modified:
  stable/11/sys/cam/cam_ccb.h
  stable/11/sys/dev/nvme/nvme.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/cam_ccb.h
==============================================================================
--- stable/11/sys/cam/cam_ccb.h	Thu Feb  1 18:57:10 2018	(r328696)
+++ stable/11/sys/cam/cam_ccb.h	Thu Feb  1 18:59:03 2018	(r328697)
@@ -626,7 +626,7 @@ struct ccb_pathinq_settings_sas {
 };
 
 struct ccb_pathinq_settings_nvme {
-	uint16_t nsid;		/* Namespace ID for this path */
+	uint32_t nsid;		/* Namespace ID for this path */
 };
 
 #define	PATHINQ_SETTINGS_SIZE	128

Modified: stable/11/sys/dev/nvme/nvme.h
==============================================================================
--- stable/11/sys/dev/nvme/nvme.h	Thu Feb  1 18:57:10 2018	(r328696)
+++ stable/11/sys/dev/nvme/nvme.h	Thu Feb  1 18:59:03 2018	(r328697)
@@ -1070,7 +1070,7 @@ int	nvme_ns_bio_process(struct nvme_namespace *ns, str
 
 /* Command building helper functions -- shared with CAM */
 static inline
-void	nvme_ns_flush_cmd(struct nvme_command *cmd, uint16_t nsid)
+void	nvme_ns_flush_cmd(struct nvme_command *cmd, uint32_t nsid)
 {
 
 	cmd->opc = NVME_OPC_FLUSH;
@@ -1078,7 +1078,7 @@ void	nvme_ns_flush_cmd(struct nvme_command *cmd, uint1
 }
 
 static inline
-void	nvme_ns_rw_cmd(struct nvme_command *cmd, uint32_t rwcmd, uint16_t nsid,
+void	nvme_ns_rw_cmd(struct nvme_command *cmd, uint32_t rwcmd, uint32_t nsid,
     uint64_t lba, uint32_t count)
 {
 	cmd->opc = rwcmd;
@@ -1092,21 +1092,21 @@ void	nvme_ns_rw_cmd(struct nvme_command *cmd, uint32_t
 }
 
 static inline
-void	nvme_ns_write_cmd(struct nvme_command *cmd, uint16_t nsid,
+void	nvme_ns_write_cmd(struct nvme_command *cmd, uint32_t nsid,
     uint64_t lba, uint32_t count)
 {
 	nvme_ns_rw_cmd(cmd, NVME_OPC_WRITE, nsid, lba, count);
 }
 
 static inline
-void	nvme_ns_read_cmd(struct nvme_command *cmd, uint16_t nsid,
+void	nvme_ns_read_cmd(struct nvme_command *cmd, uint32_t nsid,
     uint64_t lba, uint32_t count)
 {
 	nvme_ns_rw_cmd(cmd, NVME_OPC_READ, nsid, lba, count);
 }
 
 static inline
-void	nvme_ns_trim_cmd(struct nvme_command *cmd, uint16_t nsid,
+void	nvme_ns_trim_cmd(struct nvme_command *cmd, uint32_t nsid,
     uint32_t num_ranges)
 {
 	cmd->opc = NVME_OPC_DATASET_MANAGEMENT;