All of lore.kernel.org
 help / color / mirror / Atom feed
From: Klaus Jensen <its@irrelevant.dk>
To: qemu-block@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Beata Michalska" <beata.michalska@linaro.org>,
	"Klaus Jensen" <k.jensen@samsung.com>,
	qemu-devel@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
	"Klaus Jensen" <its@irrelevant.dk>,
	"Keith Busch" <kbusch@kernel.org>,
	"Javier Gonzalez" <javier.gonz@samsung.com>,
	"Maxim Levitsky" <mlevitsk@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 05/16] nvme: use constants in identify
Date: Wed, 15 Apr 2020 15:01:48 +0200	[thread overview]
Message-ID: <20200415130159.611361-6-its@irrelevant.dk> (raw)
In-Reply-To: <20200415130159.611361-1-its@irrelevant.dk>

From: Klaus Jensen <k.jensen@samsung.com>

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/block/nvme.c      | 8 ++++----
 include/block/nvme.h | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index a2b15a0ebd87..563cccae6795 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -682,7 +682,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c)
 
 static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)
 {
-    static const int data_len = 4 * KiB;
+    static const int data_len = NVME_IDENTIFY_DATA_SIZE;
     uint32_t min_nsid = le32_to_cpu(c->nsid);
     uint64_t prp1 = le64_to_cpu(c->prp1);
     uint64_t prp2 = le64_to_cpu(c->prp2);
@@ -712,11 +712,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd)
     NvmeIdentify *c = (NvmeIdentify *)cmd;
 
     switch (le32_to_cpu(c->cns)) {
-    case 0x00:
+    case NVME_ID_CNS_NS:
         return nvme_identify_ns(n, c);
-    case 0x01:
+    case NVME_ID_CNS_CTRL:
         return nvme_identify_ctrl(n, c);
-    case 0x02:
+    case NVME_ID_CNS_NS_ACTIVE_LIST:
         return nvme_identify_nslist(n, c);
     default:
         trace_pci_nvme_err_invalid_identify_cns(le32_to_cpu(c->cns));
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 8fb941c6537c..c2fd01cf2f1d 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -533,6 +533,14 @@ typedef struct NvmePSD {
     uint8_t     resv[16];
 } NvmePSD;
 
+#define NVME_IDENTIFY_DATA_SIZE 4096
+
+enum {
+    NVME_ID_CNS_NS             = 0x0,
+    NVME_ID_CNS_CTRL           = 0x1,
+    NVME_ID_CNS_NS_ACTIVE_LIST = 0x2,
+};
+
 typedef struct NvmeIdCtrl {
     uint16_t    vid;
     uint16_t    ssvid;
-- 
2.26.0



  parent reply	other threads:[~2020-04-15 13:09 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-15 13:01 [PATCH v2 00/16] nvme: refactoring and cleanups Klaus Jensen
2020-04-15 13:01 ` [PATCH v2 01/16] nvme: fix pci doorbell size calculation Klaus Jensen
2020-04-15 13:13   ` Philippe Mathieu-Daudé
2020-04-21  9:39     ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 02/16] nvme: rename trace events to pci_nvme Klaus Jensen
2020-04-15 13:04   ` Philippe Mathieu-Daudé
2020-04-21  9:43   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 03/16] nvme: remove superfluous breaks Klaus Jensen
2020-04-15 13:01 ` [PATCH v2 04/16] nvme: move device parameters to separate struct Klaus Jensen
2020-04-15 13:01 ` Klaus Jensen [this message]
2020-04-15 13:01 ` [PATCH v2 06/16] nvme: refactor nvme_addr_read Klaus Jensen
2020-04-21 10:35   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 07/16] nvme: add max_ioqpairs device parameter Klaus Jensen
2020-04-15 13:01 ` [PATCH v2 08/16] nvme: remove redundant cmbloc/cmbsz members Klaus Jensen
2020-04-21 12:05   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 09/16] nvme: factor out property/constraint checks Klaus Jensen
2020-04-15 13:08   ` Philippe Mathieu-Daudé
2020-04-21 14:53   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 10/16] nvme: factor out device state setup Klaus Jensen
2020-04-21 14:55   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 11/16] nvme: factor out block backend setup Klaus Jensen
2020-04-15 13:08   ` Philippe Mathieu-Daudé
2020-04-21 15:04   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 12/16] nvme: add namespace helpers Klaus Jensen
2020-04-15 13:09   ` Philippe Mathieu-Daudé
2020-04-21 15:41   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 13/16] nvme: factor out namespace setup Klaus Jensen
2020-04-15 13:16   ` Philippe Mathieu-Daudé
2020-04-15 13:20     ` Klaus Birkelund Jensen
2020-04-15 13:26       ` Philippe Mathieu-Daudé
2020-04-16  6:03         ` Klaus Birkelund Jensen
2020-04-24 10:13           ` Philippe Mathieu-Daudé
2020-04-21 15:57   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 14/16] nvme: factor out pci setup Klaus Jensen
2020-04-15 13:14   ` Philippe Mathieu-Daudé
2020-04-21 15:59   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 15/16] nvme: factor out cmb setup Klaus Jensen
2020-04-21 16:10   ` Maxim Levitsky
2020-04-15 13:01 ` [PATCH v2 16/16] nvme: factor out controller identify setup Klaus Jensen
2020-04-15 13:06   ` Philippe Mathieu-Daudé
2020-04-21 16:17   ` Maxim Levitsky
2020-04-15 14:29 ` [PATCH v2 00/16] nvme: refactoring and cleanups no-reply
2020-04-20  5:14 ` Klaus Birkelund Jensen
2020-04-20 17:38 ` Keith Busch
2020-04-21  6:38   ` Klaus Birkelund Jensen
2020-04-21 15:47     ` Kevin Wolf
2020-04-21 16:24 ` Maxim Levitsky
2020-04-22  6:19   ` Klaus Birkelund 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=20200415130159.611361-6-its@irrelevant.dk \
    --to=its@irrelevant.dk \
    --cc=beata.michalska@linaro.org \
    --cc=javier.gonz@samsung.com \
    --cc=k.jensen@samsung.com \
    --cc=kbusch@kernel.org \
    --cc=kwolf@redhat.com \
    --cc=mlevitsk@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.