[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/23] hw/nvme: default for namespace EUI-64
From: |
Klaus Jensen |
Subject: |
[PULL 07/23] hw/nvme: default for namespace EUI-64 |
Date: |
Tue, 29 Jun 2021 20:47:27 +0200 |
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
On machines with version > 6.0 replace a missing EUI-64 by a generated
value.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
---
docs/system/nvme.rst | 2 ++
hw/nvme/nvme.h | 2 ++
hw/core/machine.c | 1 +
hw/nvme/ns.c | 9 +++++++++
4 files changed, 14 insertions(+)
diff --git a/docs/system/nvme.rst b/docs/system/nvme.rst
index b5f8288d7c85..33a15c7dbc78 100644
--- a/docs/system/nvme.rst
+++ b/docs/system/nvme.rst
@@ -84,6 +84,8 @@ There are a number of parameters available:
``eui64``
Set the EUI-64 of the namespace. This will be reported as a "IEEE Extended
Unique Identifier" descriptor in the Namespace Identification Descriptor
List.
+ Since machine type 6.1 a non-zero default value is used if the parameter
+ is not provided. For earlier machine types the field defaults to 0.
``bus``
If there are more ``nvme`` devices defined, this parameter may be used to
diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h
index ac90e13d7b3f..371ac9bfd8fc 100644
--- a/hw/nvme/nvme.h
+++ b/hw/nvme/nvme.h
@@ -26,6 +26,7 @@
#define NVME_MAX_CONTROLLERS 32
#define NVME_MAX_NAMESPACES 256
+#define NVME_EUI64_DEFAULT ((uint64_t)0x5254000000000000)
typedef struct NvmeCtrl NvmeCtrl;
typedef struct NvmeNamespace NvmeNamespace;
@@ -84,6 +85,7 @@ typedef struct NvmeNamespaceParams {
uint32_t nsid;
QemuUUID uuid;
uint64_t eui64;
+ bool eui64_default;
uint16_t ms;
uint8_t mset;
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 55b9bc7817d8..d0e934888872 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -39,6 +39,7 @@
GlobalProperty hw_compat_6_0[] = {
{ "gpex-pcihost", "allow-unmapped-accesses", "false" },
{ "i8042", "extended-state", "false"},
+ { "nvme-ns", "eui64-default", "off"},
};
const size_t hw_compat_6_0_len = G_N_ELEMENTS(hw_compat_6_0);
diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index 45e457de6ae1..4275c3db6301 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -56,6 +56,7 @@ void nvme_ns_init_format(NvmeNamespace *ns)
static int nvme_ns_init(NvmeNamespace *ns, Error **errp)
{
+ static uint64_t ns_count;
NvmeIdNs *id_ns = &ns->id_ns;
uint8_t ds;
uint16_t ms;
@@ -73,6 +74,12 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp)
id_ns->nmic |= NVME_NMIC_NS_SHARED;
}
+ /* Substitute a missing EUI-64 by an autogenerated one */
+ ++ns_count;
+ if (!ns->params.eui64 && ns->params.eui64_default) {
+ ns->params.eui64 = ns_count + NVME_EUI64_DEFAULT;
+ }
+
/* simple copy */
id_ns->mssrl = cpu_to_le16(ns->params.mssrl);
id_ns->mcl = cpu_to_le32(ns->params.mcl);
@@ -533,6 +540,8 @@ static Property nvme_ns_props[] = {
params.max_open_zones, 0),
DEFINE_PROP_UINT32("zoned.descr_ext_size", NvmeNamespace,
params.zd_extension_size, 0),
+ DEFINE_PROP_BOOL("eui64-default", NvmeNamespace, params.eui64_default,
+ true),
DEFINE_PROP_END_OF_LIST(),
};
--
2.32.0
- [PULL 00/23] hw/nvme patches, Klaus Jensen, 2021/06/29
- [PULL 01/23] hw/nvme: fix style, Klaus Jensen, 2021/06/29
- [PULL 02/23] hw/nvme: add identify namespace flbas/mc enums, Klaus Jensen, 2021/06/29
- [PULL 03/23] hw/nvme: fix lbaf formats initialization, Klaus Jensen, 2021/06/29
- [PULL 05/23] hw/nvme: fix csi field for cns 0x00 and 0x11, Klaus Jensen, 2021/06/29
- [PULL 04/23] hw/nvme: add param to control auto zone transitioning to zone state closed, Klaus Jensen, 2021/06/29
- [PULL 07/23] hw/nvme: default for namespace EUI-64,
Klaus Jensen <=
- [PULL 09/23] hw/nvme: add nvme_block_status_all helper, Klaus Jensen, 2021/06/29
- [PULL 08/23] hw/nvme: reimplement flush to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 11/23] hw/nvme: save reftag when generating pi, Klaus Jensen, 2021/06/29
- [PULL 06/23] hw/nvme: namespace parameter for EUI-64, Klaus Jensen, 2021/06/29
- [PULL 10/23] hw/nvme: reimplement dsm to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 12/23] hw/nvme: remove assert from nvme_get_zone_by_slba, Klaus Jensen, 2021/06/29
- [PULL 13/23] hw/nvme: use prinfo directly in nvme_check_prinfo and nvme_dif_check, Klaus Jensen, 2021/06/29
- [PULL 14/23] hw/nvme: add dw0/1 to the req completion trace event, Klaus Jensen, 2021/06/29
- [PULL 15/23] hw/nvme: reimplement the copy command to allow aio cancellation, Klaus Jensen, 2021/06/29
- [PULL 16/23] hw/nvme: reimplement zone reset to allow cancellation, Klaus Jensen, 2021/06/29