Author: imp
Date: Tue Aug 29 15:46:34 2017
New Revision: 322998
URL: https://svnweb.freebsd.org/changeset/base/322998
Log:
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.
PR: 220267
Submitted by: Chuck Tuffli
Modified:
head/sys/cam/cam_ccb.h
head/sys/dev/nvme/nvme.h
Modified: head/sys/cam/cam_ccb.h
==============================================================================
--- head/sys/cam/cam_ccb.h Tue Aug 29 15:29:57 2017 (r322997)
+++ head/sys/cam/cam_ccb.h Tue Aug 29 15:46:34 2017 (r322998)
@@ -631,7 +631,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: head/sys/dev/nvme/nvme.h
==============================================================================
--- head/sys/dev/nvme/nvme.h Tue Aug 29 15:29:57 2017 (r322997)
+++ head/sys/dev/nvme/nvme.h Tue Aug 29 15:46:34 2017 (r322998)
@@ -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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
