[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 19/20] hw/block/nvme: do cmb/pmr init as part of pci init
From: |
Klaus Jensen |
Subject: |
[PATCH v6 19/20] hw/block/nvme: do cmb/pmr init as part of pci init |
Date: |
Thu, 14 May 2020 06:46:10 +0200 |
From: Klaus Jensen <address@hidden>
Signed-off-by: Klaus Jensen <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
---
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) {
--
2.26.2
- [PATCH v6 08/20] hw/block/nvme: allow use of any valid msix vector, (continued)
- [PATCH v6 08/20] hw/block/nvme: allow use of any valid msix vector, Klaus Jensen, 2020/05/14
- [PATCH v6 09/20] hw/block/nvme: add max_ioqpairs device parameter, Klaus Jensen, 2020/05/14
- [PATCH v6 07/20] hw/block/nvme: fix pin-based interrupt behavior, Klaus Jensen, 2020/05/14
- [PATCH v6 10/20] hw/block/nvme: remove redundant cmbloc/cmbsz members, Klaus Jensen, 2020/05/14
- [PATCH v6 06/20] hw/block/nvme: refactor nvme_addr_read, Klaus Jensen, 2020/05/14
- [PATCH v6 05/20] hw/block/nvme: use constants in identify, Klaus Jensen, 2020/05/14
- [PATCH v6 12/20] hw/block/nvme: factor out device state setup, Klaus Jensen, 2020/05/14
- [PATCH v6 11/20] hw/block/nvme: factor out property/constraint checks, Klaus Jensen, 2020/05/14
- [PATCH v6 16/20] hw/block/nvme: factor out pci setup, Klaus Jensen, 2020/05/14
- [PATCH v6 19/20] hw/block/nvme: do cmb/pmr init as part of pci init,
Klaus Jensen <=
- [PATCH v6 20/20] hw/block/nvme: factor out controller identify setup, Klaus Jensen, 2020/05/14
- [PATCH v6 13/20] hw/block/nvme: factor out block backend setup, Klaus Jensen, 2020/05/14
- [PATCH v6 14/20] hw/block/nvme: add namespace helpers, Klaus Jensen, 2020/05/14
- [PATCH v6 15/20] hw/block/nvme: factor out namespace setup, Klaus Jensen, 2020/05/14
- [PATCH v6 17/20] hw/block/nvme: factor out cmb setup, Klaus Jensen, 2020/05/14
- [PATCH v6 18/20] hw/block/nvme: factor out pmr setup, Klaus Jensen, 2020/05/14