[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 15/22] hw/block/nvme: factor out pci setup
From: |
Klaus Jensen |
Subject: |
[PATCH v7 15/22] hw/block/nvme: factor out pci setup |
Date: |
Tue, 9 Jun 2020 21:03:26 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200514044611.734782-17-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
hw/block/nvme.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index c98af03f4449..a4022b029166 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1438,6 +1438,22 @@ static void nvme_init_namespace(NvmeCtrl *n,
NvmeNamespace *ns, Error **errp)
id_ns->nuse = id_ns->ncap;
}
+static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev)
+{
+ uint8_t *pci_conf = pci_dev->config;
+
+ pci_conf[PCI_INTERRUPT_PIN] = 1;
+ pci_config_set_prog_interface(pci_conf, 0x2);
+ pci_config_set_class(pci_conf, PCI_CLASS_STORAGE_EXPRESS);
+ pcie_endpoint_cap_init(pci_dev, 0x80);
+
+ memory_region_init_io(&n->iomem, OBJECT(n), &nvme_mmio_ops, n, "nvme",
+ n->reg_size);
+ 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);
+}
+
static void nvme_realize(PCIDevice *pci_dev, Error **errp)
{
NvmeCtrl *n = NVME(pci_dev);
@@ -1461,19 +1477,9 @@ static void nvme_realize(PCIDevice *pci_dev, Error
**errp)
return;
}
+ nvme_init_pci(n, pci_dev);
+
pci_conf = pci_dev->config;
- pci_conf[PCI_INTERRUPT_PIN] = 1;
- pci_config_set_prog_interface(pci_dev->config, 0x2);
- pci_config_set_class(pci_dev->config, PCI_CLASS_STORAGE_EXPRESS);
- pcie_endpoint_cap_init(pci_dev, 0x80);
-
- memory_region_init_io(&n->iomem, OBJECT(n), &nvme_mmio_ops, n,
- "nvme", n->reg_size);
- 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);
-
id->vid = cpu_to_le16(pci_get_word(pci_conf + PCI_VENDOR_ID));
id->ssvid = cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID));
strpadcpy((char *)id->mn, sizeof(id->mn), "QEMU NVMe Ctrl", ' ');
--
2.27.0
- [PATCH v7 02/22] hw/block/nvme: rename trace events to pci_nvme, (continued)
- [PATCH v7 02/22] hw/block/nvme: rename trace events to pci_nvme, Klaus Jensen, 2020/06/09
- [PATCH v7 09/22] hw/block/nvme: remove redundant cmbloc/cmbsz members, Klaus Jensen, 2020/06/09
- [PATCH v7 07/22] hw/block/nvme: fix pin-based interrupt behavior, Klaus Jensen, 2020/06/09
- [PATCH v7 03/22] hw/block/nvme: remove superfluous breaks, Klaus Jensen, 2020/06/09
- [PATCH v7 05/22] hw/block/nvme: use constants in identify, Klaus Jensen, 2020/06/09
- [PATCH v7 06/22] hw/block/nvme: refactor nvme_addr_read, Klaus Jensen, 2020/06/09
- [PATCH v7 13/22] hw/block/nvme: add namespace helpers, Klaus Jensen, 2020/06/09
- [PATCH v7 10/22] hw/block/nvme: factor out property/constraint checks, Klaus Jensen, 2020/06/09
- [PATCH v7 11/22] hw/block/nvme: factor out device state setup, Klaus Jensen, 2020/06/09
- [PATCH v7 16/22] hw/block/nvme: factor out cmb setup, Klaus Jensen, 2020/06/09
- [PATCH v7 15/22] hw/block/nvme: factor out pci setup,
Klaus Jensen <=
- [PATCH v7 14/22] hw/block/nvme: factor out namespace setup, Klaus Jensen, 2020/06/09
- [PATCH v7 17/22] hw/block/nvme: factor out pmr setup, Klaus Jensen, 2020/06/09
- [PATCH v7 19/22] hw/block/nvme: factor out controller identify setup, Klaus Jensen, 2020/06/09
- [PATCH v7 21/22] hw/block/nvme: add msix_qsize parameter, Klaus Jensen, 2020/06/09
- [PATCH v7 12/22] hw/block/nvme: factor out block backend setup, Klaus Jensen, 2020/06/09
- [PATCH v7 20/22] hw/block/nvme: Verify msix_vector_use() returned value, Klaus Jensen, 2020/06/09
- [PATCH v7 18/22] hw/block/nvme: do cmb/pmr init as part of pci init, Klaus Jensen, 2020/06/09
- [PATCH v7 22/22] hw/block/nvme: verify msix_init_exclusive_bar() return value, Klaus Jensen, 2020/06/09
- Re: [PATCH v7 00/22] nvme: small fixes, refactoring and cleanups, Kevin Wolf, 2020/06/15