| Message ID | 20240923062651.3511358-1-ayush.m55@samsung.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/nvme: Adding support for NPDAL and NPDGL | expand |
On Sep 23 11:56, Ayush Mishra wrote: > Adding support for new 32 bit NPDGL and NPDAL fields to address the > needs of larger granularities. > > Signed-off-by: Ayush Mishra <ayush.m55@samsung.com> > --- > hw/nvme/ns.c | 5 ++++- > include/block/nvme.h | 7 ++++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c > index ea8db175db..8b2ea37a1b 100644 > --- a/hw/nvme/ns.c > +++ b/hw/nvme/ns.c > @@ -30,6 +30,7 @@ > void nvme_ns_init_format(NvmeNamespace *ns) > { > NvmeIdNs *id_ns = &ns->id_ns; > + NvmeIdNsNvm *id_ns_nvm = &ns->id_ns_nvm; > BlockDriverInfo bdi; > int npdg, ret; > int64_t nlbas; > @@ -55,6 +56,8 @@ void nvme_ns_init_format(NvmeNamespace *ns) > } > > id_ns->npda = id_ns->npdg = npdg - 1; > + id_ns_nvm->npdal = npdg; > + id_ns_nvm->npdgl = npdg; > } > > static int nvme_ns_init(NvmeNamespace *ns, Error **errp) > @@ -72,7 +75,7 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp) > ns->id_ns.dlfeat = 0x1; > > /* support DULBE and I/O optimization fields */ > - id_ns->nsfeat |= (0x4 | 0x10); > + id_ns->nsfeat |= (0x4 | 0x30); This is a good opportunity to add some defines in include/block/nvme.h for these spec values. > > if (ns->params.shared) { > id_ns->nmic |= NVME_NMIC_NS_SHARED; > diff --git a/include/block/nvme.h b/include/block/nvme.h > index 5298bc4a28..fdf3d999c0 100644 > --- a/include/block/nvme.h > +++ b/include/block/nvme.h > @@ -1413,7 +1413,12 @@ typedef struct QEMU_PACKED NvmeIdNsNvm { > uint8_t pic; > uint8_t rsvd9[3]; > uint32_t elbaf[NVME_MAX_NLBAF]; > - uint8_t rsvd268[3828]; > + uint32_t npdgl; > + uint32_t nprg; > + uint32_t npra; > + uint32_t nors; > + uint32_t npdal; > + uint8_t rsvd288[3808]; > } NvmeIdNsNvm; > > typedef struct QEMU_PACKED NvmeIdNsDescr { > -- > 2.43.0 > >
diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c index ea8db175db..8b2ea37a1b 100644 --- a/hw/nvme/ns.c +++ b/hw/nvme/ns.c @@ -30,6 +30,7 @@ void nvme_ns_init_format(NvmeNamespace *ns) { NvmeIdNs *id_ns = &ns->id_ns; + NvmeIdNsNvm *id_ns_nvm = &ns->id_ns_nvm; BlockDriverInfo bdi; int npdg, ret; int64_t nlbas; @@ -55,6 +56,8 @@ void nvme_ns_init_format(NvmeNamespace *ns) } id_ns->npda = id_ns->npdg = npdg - 1; + id_ns_nvm->npdal = npdg; + id_ns_nvm->npdgl = npdg; } static int nvme_ns_init(NvmeNamespace *ns, Error **errp) @@ -72,7 +75,7 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp) ns->id_ns.dlfeat = 0x1; /* support DULBE and I/O optimization fields */ - id_ns->nsfeat |= (0x4 | 0x10); + id_ns->nsfeat |= (0x4 | 0x30); if (ns->params.shared) { id_ns->nmic |= NVME_NMIC_NS_SHARED; diff --git a/include/block/nvme.h b/include/block/nvme.h index 5298bc4a28..fdf3d999c0 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -1413,7 +1413,12 @@ typedef struct QEMU_PACKED NvmeIdNsNvm { uint8_t pic; uint8_t rsvd9[3]; uint32_t elbaf[NVME_MAX_NLBAF]; - uint8_t rsvd268[3828]; + uint32_t npdgl; + uint32_t nprg; + uint32_t npra; + uint32_t nors; + uint32_t npdal; + uint8_t rsvd288[3808]; } NvmeIdNsNvm; typedef struct QEMU_PACKED NvmeIdNsDescr {
Adding support for new 32 bit NPDGL and NPDAL fields to address the needs of larger granularities. Signed-off-by: Ayush Mishra <ayush.m55@samsung.com> --- hw/nvme/ns.c | 5 ++++- include/block/nvme.h | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-)