Message ID | 20200514044611.734782-20-its@irrelevant.dk |
---|---|
State | New |
Headers | show |
Series | nvme: small fixes, refactoring and cleanups | expand |
On 5/14/20 6:46 AM, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> Having the patch subject duplicated ease review (not all email client display email subject close to email content): "Do cmb/pmr init as part of pci init." Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > --- > hw/block/nvme.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 7254b66ae199..2addcc86034a 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -1527,6 +1527,12 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev) > pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY | > PCI_BASE_ADDRESS_MEM_TYPE_64, &n->iomem); > msix_init_exclusive_bar(pci_dev, n->params.max_ioqpairs + 1, 4, NULL); > + > + if (n->params.cmb_size_mb) { > + nvme_init_cmb(n, pci_dev); > + } else if (n->pmrdev) { > + nvme_init_pmr(n, pci_dev); > + } > } > > static void nvme_realize(PCIDevice *pci_dev, Error **errp) > @@ -1588,12 +1594,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) > n->bar.vs = 0x00010200; > n->bar.intmc = n->bar.intms = 0; > > - if (n->params.cmb_size_mb) { > - nvme_init_cmb(n, pci_dev); > - } else if (n->pmrdev) { > - nvme_init_pmr(n, pci_dev); > - } > - > for (i = 0; i < n->num_namespaces; i++) { > nvme_init_namespace(n, &n->namespaces[i], &local_err); > if (local_err) { >
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 7254b66ae199..2addcc86034a 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1527,6 +1527,12 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev) pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64, &n->iomem); msix_init_exclusive_bar(pci_dev, n->params.max_ioqpairs + 1, 4, NULL); + + if (n->params.cmb_size_mb) { + nvme_init_cmb(n, pci_dev); + } else if (n->pmrdev) { + nvme_init_pmr(n, pci_dev); + } } static void nvme_realize(PCIDevice *pci_dev, Error **errp) @@ -1588,12 +1594,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.vs = 0x00010200; n->bar.intmc = n->bar.intms = 0; - if (n->params.cmb_size_mb) { - nvme_init_cmb(n, pci_dev); - } else if (n->pmrdev) { - nvme_init_pmr(n, pci_dev); - } - for (i = 0; i < n->num_namespaces; i++) { nvme_init_namespace(n, &n->namespaces[i], &local_err); if (local_err) {