diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
index 8e91c46c254..8bd0e4ed584 100644
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -84,6 +84,8 @@
 #define NVME_CAP_HI_REG_DSTRD_MASK			(0xF)
 #define NVME_CAP_HI_REG_NSSRS_SHIFT			(4)
 #define NVME_CAP_HI_REG_NSSRS_MASK			(0x1)
+#define NVME_CAP_HI_REG_CSS_SHIFT			(5)
+#define NVME_CAP_HI_REG_CSS_MASK			(0xff)
 #define NVME_CAP_HI_REG_CSS_NVM_SHIFT			(5)
 #define NVME_CAP_HI_REG_CSS_NVM_MASK			(0x1)
 #define NVME_CAP_HI_REG_BPS_SHIFT			(13)
@@ -101,6 +103,8 @@
 #define NVME_CAP_HI_NSSRS(x) \
 	(((x) >> NVME_CAP_HI_REG_NSSRS_SHIFT) & NVME_CAP_HI_REG_NSSRS_MASK)
 #define NVME_CAP_HI_CSS(x) \
+	(((x) >> NVME_CAP_HI_REG_CSS_SHIFT) & NVME_CAP_HI_REG_CSS_MASK)
+#define NVME_CAP_HI_CSS_NVM(x) \
 	(((x) >> NVME_CAP_HI_REG_CSS_NVM_SHIFT) & NVME_CAP_HI_REG_CSS_NVM_MASK)
 #define NVME_CAP_HI_BPS(x) \
 	(((x) >> NVME_CAP_HI_REG_BPS_SHIFT) & NVME_CAP_HI_REG_BPS_MASK)