| Message ID | 20210118094705.56772-7-its@irrelevant.dk |
|---|---|
| State | New |
| Headers | show |
| Series | hw/block/nvme: misc cmb/pmr patches and bump to v1.4 | expand |
On 21-01-18 10:46:59, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Use the correct field names. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > --- > include/block/nvme.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/block/nvme.h b/include/block/nvme.h > index 86d7fc2f905c..f3cbe17d0971 100644 > --- a/include/block/nvme.h > +++ b/include/block/nvme.h > @@ -35,8 +35,8 @@ enum NvmeCapShift { > CAP_CSS_SHIFT = 37, > CAP_MPSMIN_SHIFT = 48, > CAP_MPSMAX_SHIFT = 52, > - CAP_PMR_SHIFT = 56, > - CAP_CMB_SHIFT = 57, > + CAP_PMRS_SHIFT = 56, > + CAP_CMBS_SHIFT = 57, > }; > > enum NvmeCapMask { > @@ -49,8 +49,8 @@ enum NvmeCapMask { > CAP_CSS_MASK = 0xff, > CAP_MPSMIN_MASK = 0xf, > CAP_MPSMAX_MASK = 0xf, > - CAP_PMR_MASK = 0x1, > - CAP_CMB_MASK = 0x1, > + CAP_PMRS_MASK = 0x1, > + CAP_CMBS_MASK = 0x1, > }; > > #define NVME_CAP_MQES(cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK) > @@ -81,10 +81,10 @@ 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_CMBS(cap, val) (cap |= (uint64_t)(val & CAP_CMB_MASK) \ > - << CAP_CMB_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_CMBS_MASK) \ > + << CAP_CMBS_SHIFT) Oh, it would have been better folded into [3/12] patch, though. Changes are looking good to me to represent "Supported". Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com> > > enum NvmeCapCss { > NVME_CAP_CSS_NVM = 1 << 0, > -- > 2.30.0 > >
diff --git a/include/block/nvme.h b/include/block/nvme.h index 86d7fc2f905c..f3cbe17d0971 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -35,8 +35,8 @@ enum NvmeCapShift { CAP_CSS_SHIFT = 37, CAP_MPSMIN_SHIFT = 48, CAP_MPSMAX_SHIFT = 52, - CAP_PMR_SHIFT = 56, - CAP_CMB_SHIFT = 57, + CAP_PMRS_SHIFT = 56, + CAP_CMBS_SHIFT = 57, }; enum NvmeCapMask { @@ -49,8 +49,8 @@ enum NvmeCapMask { CAP_CSS_MASK = 0xff, CAP_MPSMIN_MASK = 0xf, CAP_MPSMAX_MASK = 0xf, - CAP_PMR_MASK = 0x1, - CAP_CMB_MASK = 0x1, + CAP_PMRS_MASK = 0x1, + CAP_CMBS_MASK = 0x1, }; #define NVME_CAP_MQES(cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK) @@ -81,10 +81,10 @@ 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_CMBS(cap, val) (cap |= (uint64_t)(val & CAP_CMB_MASK) \ - << CAP_CMB_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_CMBS_MASK) \ + << CAP_CMBS_SHIFT) enum NvmeCapCss { NVME_CAP_CSS_NVM = 1 << 0,