From: Klaus Jensen <k.jen...@samsung.com> Allos the LBA data size (lbads) to be set between 9 and 12.
Signed-off-by: Klaus Jensen <k.jen...@samsung.com> Acked-by: Keith Busch <kbu...@kernel.org> Reviewed-by: Maxim Levitsky <mlevi...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- Based-on: <20200629214051.1282060-1-...@irrelevant.dk> ("[PATCH v2 0/4] hw/block/nvme: support multiple namespaces") hw/block/nvme-ns.c | 8 +++++++- hw/block/nvme-ns.h | 1 + hw/block/nvme.c | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index 28ce5e011568..d6ec55860a5e 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -32,7 +32,7 @@ static void nvme_ns_init(NvmeNamespace *ns) { NvmeIdNs *id_ns = &ns->id_ns; - id_ns->lbaf[0].ds = BDRV_SECTOR_BITS; + id_ns->lbaf[0].ds = ns->params.lbads; id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(ns)); @@ -92,6 +92,11 @@ static int nvme_ns_check_constraints(NvmeNamespace *ns, Error **errp) return -1; } + if (ns->params.lbads < 9 || ns->params.lbads > 12) { + error_setg(errp, "unsupported lbads (supported: 9-12)"); + return -1; + } + return 0; } @@ -130,6 +135,7 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp) static Property nvme_ns_props[] = { DEFINE_PROP_DRIVE("drive", NvmeNamespace, blk), DEFINE_PROP_UINT32("nsid", NvmeNamespace, params.nsid, 0), + DEFINE_PROP_UINT8("lbads", NvmeNamespace, params.lbads, BDRV_SECTOR_BITS), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h index 16fa8b1e3fb9..bee46b32efa5 100644 --- a/hw/block/nvme-ns.h +++ b/hw/block/nvme-ns.h @@ -21,6 +21,7 @@ typedef struct NvmeNamespaceParams { uint32_t nsid; + uint8_t lbads; } NvmeNamespaceParams; typedef struct NvmeNamespace { diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 164c5e294d06..9e512c88656d 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -2877,6 +2877,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) if (n->namespace.blk) { ns = &n->namespace; ns->params.nsid = 1; + ns->params.lbads = BDRV_SECTOR_BITS; if (nvme_ns_setup(n, ns, errp)) { return; -- 2.27.0