| Message ID | 20191015103900.313928-20-its@irrelevant.dk |
|---|---|
| State | New |
| Headers | show |
| Series | nvme: support NVMe v1.3d, SGLs and multiple namespaces | expand |
Hi Klaus, On Tue, 15 Oct 2019 at 11:50, Klaus Jensen <its@irrelevant.dk> wrote: > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > --- > hw/block/nvme-ns.c | 2 +- > hw/block/nvme-ns.h | 4 +++- > hw/block/nvme.c | 1 + > 3 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c > index aa76bb63ef45..70ff622a5729 100644 > --- a/hw/block/nvme-ns.c > +++ b/hw/block/nvme-ns.c > @@ -18,7 +18,7 @@ static int 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->nuse = id_ns->ncap = id_ns->nsze = > cpu_to_le64(nvme_ns_nlbas(ns)); > > diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h > index 64dd054cf6a9..aa1c81d85cde 100644 > --- a/hw/block/nvme-ns.h > +++ b/hw/block/nvme-ns.h > @@ -6,10 +6,12 @@ > OBJECT_CHECK(NvmeNamespace, (obj), TYPE_NVME_NS) > > #define DEFINE_NVME_NS_PROPERTIES(_state, _props) \ > - DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0) > + DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0), \ > + DEFINE_PROP_UINT8("lbads", _state, _props.lbads, 9) > Could we actually use BDRV_SECTOR_BITS instead of magic numbers? BR Beata > 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 67f92bf5a3ac..d0103c16cfe9 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -2602,6 +2602,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) > if (n->namespace.conf.blk) { > ns = &n->namespace; > ns->params.nsid = 1; > + ns->params.lbads = 9; > > if (nvme_ns_setup(n, ns, &local_err)) { > error_propagate_prepend(errp, local_err, "nvme_ns_setup: "); > -- > 2.23.0 > >
On Tue, Nov 12, 2019 at 03:24:00PM +0000, Beata Michalska wrote: > Hi Klaus, > > On Tue, 15 Oct 2019 at 11:50, Klaus Jensen <its@irrelevant.dk> wrote: > > #define DEFINE_NVME_NS_PROPERTIES(_state, _props) \ > > - DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0) > > + DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0), \ > > + DEFINE_PROP_UINT8("lbads", _state, _props.lbads, 9) > > > Could we actually use BDRV_SECTOR_BITS instead of magic numbers? > Yes, better. Fixed in two places.
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c index aa76bb63ef45..70ff622a5729 100644 --- a/hw/block/nvme-ns.c +++ b/hw/block/nvme-ns.c @@ -18,7 +18,7 @@ static int 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->nuse = id_ns->ncap = id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(ns)); diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h index 64dd054cf6a9..aa1c81d85cde 100644 --- a/hw/block/nvme-ns.h +++ b/hw/block/nvme-ns.h @@ -6,10 +6,12 @@ OBJECT_CHECK(NvmeNamespace, (obj), TYPE_NVME_NS) #define DEFINE_NVME_NS_PROPERTIES(_state, _props) \ - DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0) + DEFINE_PROP_UINT32("nsid", _state, _props.nsid, 0), \ + DEFINE_PROP_UINT8("lbads", _state, _props.lbads, 9) 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 67f92bf5a3ac..d0103c16cfe9 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -2602,6 +2602,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) if (n->namespace.conf.blk) { ns = &n->namespace; ns->params.nsid = 1; + ns->params.lbads = 9; if (nvme_ns_setup(n, ns, &local_err)) { error_propagate_prepend(errp, local_err, "nvme_ns_setup: ");
Signed-off-by: Klaus Jensen <k.jensen@samsung.com> --- hw/block/nvme-ns.c | 2 +- hw/block/nvme-ns.h | 4 +++- hw/block/nvme.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)