[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] hw/block/nvme: rename CAP_PMR_{SHIFT, MASK} to CAP_PMRS_{SHI
From: |
Klaus Jensen |
Subject: |
[PATCH 5/8] hw/block/nvme: rename CAP_PMR_{SHIFT, MASK} to CAP_PMRS_{SHIFT, MASK} |
Date: |
Fri, 18 Dec 2020 14:29:02 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
Use the correct field name.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
include/block/nvme.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 24f3c256a7f9..686e2541a587 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -35,7 +35,7 @@ enum NvmeCapShift {
CAP_CSS_SHIFT = 37,
CAP_MPSMIN_SHIFT = 48,
CAP_MPSMAX_SHIFT = 52,
- CAP_PMR_SHIFT = 56,
+ CAP_PMRS_SHIFT = 56,
CAP_CMB_SHIFT = 57,
};
@@ -49,7 +49,7 @@ enum NvmeCapMask {
CAP_CSS_MASK = 0xff,
CAP_MPSMIN_MASK = 0xf,
CAP_MPSMAX_MASK = 0xf,
- CAP_PMR_MASK = 0x1,
+ CAP_PMRS_MASK = 0x1,
CAP_CMB_MASK = 0x1,
};
@@ -81,8 +81,8 @@ enum NvmeCapMask {
<< CAP_MPSMIN_SHIFT)
#define NVME_CAP_SET_MPSMAX(cap, val) (cap |= (uint64_t)(val &
CAP_MPSMAX_MASK)\
<< CAP_MPSMAX_SHIFT)
-#define NVME_CAP_SET_PMRS(cap, val) (cap |= (uint64_t)(val & CAP_PMR_MASK)
\
- << CAP_PMR_SHIFT)
+#define NVME_CAP_SET_PMRS(cap, val) (cap |= (uint64_t)(val & CAP_PMRS_MASK)
\
+ << CAP_PMRS_SHIFT)
#define NVME_CAP_SET_CMBS(cap, val) (cap |= (uint64_t)(val & CAP_CMB_MASK)
\
<< CAP_CMB_SHIFT)
--
2.29.2
- [PATCH 0/8] hw/block/nvme: misc cmb/pmr patches, Klaus Jensen, 2020/12/18
- [PATCH 1/8] hw/block/nvme: indicate CMB support through controller capabilities register, Klaus Jensen, 2020/12/18
- [PATCH 4/8] hw/block/nvme: fix controller reset/shutdown logic, Klaus Jensen, 2020/12/18
- [PATCH 2/8] hw/block/nvme: move msix table and pba to BAR 0, Klaus Jensen, 2020/12/18
- [PATCH 8/8] hw/block/nvme: add PMR RDS/WDS support, Klaus Jensen, 2020/12/18
- [PATCH 6/8] hw/block/nvme: remove redundant zeroing of PMR registers, Klaus Jensen, 2020/12/18
- [PATCH 3/8] hw/block/nvme: allow cmb and pmr to coexist, Klaus Jensen, 2020/12/18
- [PATCH 7/8] hw/block/nvme: disable PMR at boot up, Klaus Jensen, 2020/12/18
- [PATCH 5/8] hw/block/nvme: rename CAP_PMR_{SHIFT, MASK} to CAP_PMRS_{SHIFT, MASK},
Klaus Jensen <=