[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/12] hw/block/nvme: bump to v1.4
From: |
Klaus Jensen |
Subject: |
[PATCH v3 11/12] hw/block/nvme: bump to v1.4 |
Date: |
Tue, 19 Jan 2021 11:15:03 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
With the new CMB logic in place, bump the implemented specification
version to v1.4 by default.
This requires adding the setting the CNTRLTYPE field and modifying the
VWC field since 0x00 is no longer a valid value for bits 2:1.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
include/block/nvme.h | 3 ++-
hw/block/nvme.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 7dcd8f9b4e78..c34343c13a3c 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -949,7 +949,8 @@ typedef struct QEMU_PACKED NvmeIdCtrl {
uint32_t rtd3e;
uint32_t oaes;
uint32_t ctratt;
- uint8_t rsvd100[12];
+ uint8_t rsvd100[11];
+ uint8_t cntrltype;
uint8_t fguid[16];
uint8_t rsvd128[128];
uint16_t oacs;
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 4bcc3cd71c9f..2c158cf419b0 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -108,7 +108,7 @@
#define NVME_MAX_IOQPAIRS 0xffff
#define NVME_DB_SIZE 4
-#define NVME_SPEC_VER 0x00010300
+#define NVME_SPEC_VER 0x00010400
#define NVME_CMB_BIR 2
#define NVME_PMR_BIR 4
#define NVME_TEMPERATURE 0x143
@@ -4421,6 +4421,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice
*pci_dev)
id->mdts = n->params.mdts;
id->ver = cpu_to_le32(NVME_SPEC_VER);
id->oacs = cpu_to_le16(0);
+ id->cntrltype = 0x1;
/*
* Because the controller always completes the Abort command immediately,
@@ -4449,7 +4450,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice
*pci_dev)
NVME_ONCS_FEATURES | NVME_ONCS_DSM |
NVME_ONCS_COMPARE);
- id->vwc = 0x1;
+ id->vwc = (0x2 << 1) | 0x1;
id->sgls = cpu_to_le32(NVME_CTRL_SGLS_SUPPORT_NO_ALIGN |
NVME_CTRL_SGLS_BITBUCKET);
--
2.30.0
- [PATCH v3 05/12] hw/block/nvme: allow cmb and pmr to coexist, (continued)
- [PATCH v3 05/12] hw/block/nvme: allow cmb and pmr to coexist, Klaus Jensen, 2021/01/19
- [PATCH v3 06/12] hw/block/nvme: rename PMR/CMB shift/mask fields, Klaus Jensen, 2021/01/19
- [PATCH v3 07/12] hw/block/nvme: remove redundant zeroing of PMR registers, Klaus Jensen, 2021/01/19
- [PATCH v3 08/12] hw/block/nvme: disable PMR at boot up, Klaus Jensen, 2021/01/19
- [PATCH v3 09/12] hw/block/nvme: add PMR RDS/WDS support, Klaus Jensen, 2021/01/19
- [PATCH v3 10/12] hw/block/nvme: move cmb logic to v1.4, Klaus Jensen, 2021/01/19
- [PATCH v3 11/12] hw/block/nvme: bump to v1.4,
Klaus Jensen <=
- [PATCH v3 12/12] hw/block/nvme: lift cmb restrictions, Klaus Jensen, 2021/01/19
- Re: [PATCH v3 00/12] hw/block/nvme: misc cmb/pmr patches and bump to v1.4, Keith Busch, 2021/01/19
- Re: [PATCH v3 00/12] hw/block/nvme: misc cmb/pmr patches and bump to v1.4, Klaus Jensen, 2021/01/20