types: Add CMBSWTP property definitions

Also change PMRSWTU to use NVME_UNIT definitions.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/src/nvme/types.h b/src/nvme/types.h
index c3670dabb35c8c1a13d5f27aa3ba66d2d9a2d69e..ea8e3860c75acf85e25124b0cbecb376884d4b3f 100644 (file)
--- a/src/nvme/types.h
+++ b/src/nvme/types.h
@@ -515,6 +515,20 @@ enum nvme_cmbebs {
 #define NVME_CMBEBS_RBB(cmbebs)                NVME_GET(cmbebs, CMBEBS_RBB)
 #define NVME_CMBEBS_CMBWBZ(cmbebs)     NVME_GET(cmbebs, CMBEBS_CMBWBZ)
 
+enum nvme_cmbswtp {
+       NVME_CMBSWTP_CMBSWTU_SHIFT      = 0,
+       NVME_CMBSWTP_CMBSWTV_SHIFT      = 8,
+       NVME_CMBSWTP_CMBSWTU_MASK       = 0xf,
+       NVME_CMBSWTP_CMBSWTV_MASK       = 0xffffff,
+       NVME_CMBSWTP_CMBSWTU_B          = NVME_UNIT_B,
+       NVME_CMBSWTP_CMBSWTU_1K         = NVME_UNIT_1K,
+       NVME_CMBSWTP_CMBSWTU_1M         = NVME_UNIT_1M,
+       NVME_CMBSWTP_CMBSWTU_1G         = NVME_UNIT_1G,
+};
+
+#define NVME_CMBSWTP_CMBSWTU(cmbswtp)  NVME_GET(cmbswtp, CMBSWTP_CMBSWTU)
+#define NVME_CMBSWTP_CMBSWTV(cmbswtp)  NVME_GET(cmbswtp, CMBSWTP_CMBSWTV)
+
 enum nvme_crto {
        NVME_CRTO_CRIMT_SHIFT   = 16,
        NVME_CRTO_CRIMT_MASK    = 0xffff0000,
@@ -610,10 +624,10 @@ enum nvme_pmrswtp {
        NVME_PMRSWTP_PMRSWTV_SHIFT      = 8,
        NVME_PMRSWTP_PMRSWTU_MASK       = 0xf,
        NVME_PMRSWTP_PMRSWTV_MASK       = 0xffffff,
-       NVME_PMRSWTP_PMRSWTU_BPS        = 0,
-       NVME_PMRSWTP_PMRSWTU_KBPS       = 1,
-       NVME_PMRSWTP_PMRSWTU_MBPS       = 2,
-       NVME_PMRSWTP_PMRSWTU_GBPS       = 3,
+       NVME_PMRSWTP_PMRSWTU_BPS        = NVME_UNIT_B,
+       NVME_PMRSWTP_PMRSWTU_KBPS       = NVME_UNIT_1K,
+       NVME_PMRSWTP_PMRSWTU_MBPS       = NVME_UNIT_1M,
+       NVME_PMRSWTP_PMRSWTU_GBPS       = NVME_UNIT_1G,
 };
 
 #define NVME_PMRSWTP_PMRSWTU(pmrswtp)  NVME_GET(pmrswtp, PMRSWTP_PMRSWTU)