[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/43] hw/block/nvme: use constants in identify
From: |
Kevin Wolf |
Subject: |
[PULL 11/43] hw/block/nvme: use constants in identify |
Date: |
Wed, 17 Jun 2020 16:48:37 +0200 |
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>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-6-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/nvme.h | 8 ++++++++
hw/block/nvme.c | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 5525c8e343..1720ee1d51 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -705,6 +705,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;
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index bc2d9d2091..2a26b8859a 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -692,7 +692,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);
@@ -722,11 +722,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));
--
2.25.4
- [PULL 05/43] block: Refactor subdirectory recursion during make, (continued)
- [PULL 05/43] block: Refactor subdirectory recursion during make, Kevin Wolf, 2020/06/17
- [PULL 02/43] icount: make dma reads deterministic, Kevin Wolf, 2020/06/17
- [PULL 10/43] hw/block/nvme: move device parameters to separate struct, Kevin Wolf, 2020/06/17
- [PULL 07/43] hw/block/nvme: fix pci doorbell size calculation, Kevin Wolf, 2020/06/17
- [PULL 09/43] hw/block/nvme: remove superfluous breaks, Kevin Wolf, 2020/06/17
- [PULL 12/43] hw/block/nvme: refactor nvme_addr_read, Kevin Wolf, 2020/06/17
- [PULL 14/43] hw/block/nvme: add max_ioqpairs device parameter, Kevin Wolf, 2020/06/17
- [PULL 15/43] hw/block/nvme: remove redundant cmbloc/cmbsz members, Kevin Wolf, 2020/06/17
- [PULL 16/43] hw/block/nvme: factor out property/constraint checks, Kevin Wolf, 2020/06/17
- [PULL 13/43] hw/block/nvme: fix pin-based interrupt behavior, Kevin Wolf, 2020/06/17
- [PULL 11/43] hw/block/nvme: use constants in identify,
Kevin Wolf <=
- [PULL 18/43] hw/block/nvme: factor out block backend setup, Kevin Wolf, 2020/06/17
- [PULL 17/43] hw/block/nvme: factor out device state setup, Kevin Wolf, 2020/06/17
- [PULL 19/43] hw/block/nvme: add namespace helpers, Kevin Wolf, 2020/06/17
- [PULL 21/43] hw/block/nvme: factor out pci setup, Kevin Wolf, 2020/06/17
- [PULL 24/43] hw/block/nvme: do cmb/pmr init as part of pci init, Kevin Wolf, 2020/06/17
- [PULL 26/43] hw/block/nvme: Verify msix_vector_use() returned value, Kevin Wolf, 2020/06/17
- [PULL 08/43] hw/block/nvme: rename trace events to pci_nvme, Kevin Wolf, 2020/06/17
- [PULL 20/43] hw/block/nvme: factor out namespace setup, Kevin Wolf, 2020/06/17
- [PULL 22/43] hw/block/nvme: factor out cmb setup, Kevin Wolf, 2020/06/17
- [PULL 23/43] hw/block/nvme: factor out pmr setup, Kevin Wolf, 2020/06/17