From: Klaus Jensen <its@irrelevant.dk>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>,
qemu-block@nongnu.org, Klaus Jensen <k.jensen@samsung.com>,
Max Reitz <mreitz@redhat.com>, Keith Busch <kbusch@kernel.org>,
Andrzej Jakowski <andrzej.jakowski@linux.intel.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Klaus Jensen <its@irrelevant.dk>
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 [thread overview]
Message-ID: <20201218132905.967326-6-its@irrelevant.dk> (raw)
In-Reply-To: <20201218132905.967326-1-its@irrelevant.dk>
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
next prev parent reply other threads:[~2020-12-18 13:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 13:28 [PATCH 0/8] hw/block/nvme: misc cmb/pmr patches Klaus Jensen
2020-12-18 13:28 ` [PATCH 1/8] hw/block/nvme: indicate CMB support through controller capabilities register Klaus Jensen
2020-12-18 13:28 ` [PATCH 2/8] hw/block/nvme: move msix table and pba to BAR 0 Klaus Jensen
2020-12-18 13:29 ` [PATCH 3/8] hw/block/nvme: allow cmb and pmr to coexist Klaus Jensen
2020-12-18 13:29 ` [PATCH 4/8] hw/block/nvme: fix controller reset/shutdown logic Klaus Jensen
2020-12-18 13:29 ` Klaus Jensen [this message]
2020-12-18 13:29 ` [PATCH 6/8] hw/block/nvme: remove redundant zeroing of PMR registers Klaus Jensen
2020-12-18 13:29 ` [PATCH 7/8] hw/block/nvme: disable PMR at boot up Klaus Jensen
2020-12-18 13:29 ` [PATCH 8/8] hw/block/nvme: add PMR RDS/WDS support Klaus Jensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201218132905.967326-6-its@irrelevant.dk \
--to=its@irrelevant.dk \
--cc=andrzej.jakowski@linux.intel.com \
--cc=fam@euphon.net \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).