mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/nvme: Calculate BAR attributes in a function

Browse Source 
An NVMe device with SR-IOV capability calculates the BAR size
differently for PF and VF, so it makes sense to extract the common code
to a separate function.

Signed-off-by: Łukasz Gieryk <lukasz.gieryk@linux.intel.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
Łukasz Gieryk 2022-05-09 16:16:15 +02:00 committed by Klaus Jensen
parent 3bfcc51737
commit aa81771337
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hw/nvme/ctrl.c
View File

@ -6730,6 +6730,34 @@ static void nvme_init_pmr(NvmeCtrl *n, PCIDevice *pci_dev)
memory_region_set_enabled(&n->pmr.dev->mr, false); memory_region_set_enabled(&n->pmr.dev->mr, false);
} }
static uint64_t nvme_bar_size(unsigned total_queues, unsigned total_irqs,
unsigned *msix_table_offset,
unsigned *msix_pba_offset)
{
uint64_t bar_size, msix_table_size, msix_pba_size;
bar_size = sizeof(NvmeBar) + 2 * total_queues * NVME_DB_SIZE;
bar_size = QEMU_ALIGN_UP(bar_size, 4 * KiB);
if (msix_table_offset) {
*msix_table_offset = bar_size;
}
msix_table_size = PCI_MSIX_ENTRY_SIZE * total_irqs;
bar_size += msix_table_size;
bar_size = QEMU_ALIGN_UP(bar_size, 4 * KiB);
if (msix_pba_offset) {
*msix_pba_offset = bar_size;
}
msix_pba_size = QEMU_ALIGN_UP(total_irqs, 64) / 8;
bar_size += msix_pba_size;
bar_size = pow2ceil(bar_size);
return bar_size;
}
static void nvme_init_sriov(NvmeCtrl *n, PCIDevice *pci_dev, uint16_t offset, static void nvme_init_sriov(NvmeCtrl *n, PCIDevice *pci_dev, uint16_t offset,
uint64_t bar_size) uint64_t bar_size)
{ {
@ -6769,7 +6797,7 @@ static int nvme_add_pm_capability(PCIDevice *pci_dev, uint8_t offset)
static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
{ {
uint8_t *pci_conf = pci_dev->config; uint8_t *pci_conf = pci_dev->config;
uint64_t bar_size, msix_table_size, msix_pba_size; uint64_t bar_size;
unsigned msix_table_offset, msix_pba_offset; unsigned msix_table_offset, msix_pba_offset;
int ret; int ret;
@ -6795,19 +6823,8 @@ static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
} }
/* add one to max_ioqpairs to account for the admin queue pair */ /* add one to max_ioqpairs to account for the admin queue pair */
bar_size = sizeof(NvmeBar) + bar_size = nvme_bar_size(n->params.max_ioqpairs + 1, n->params.msix_qsize,
2 * (n->params.max_ioqpairs + 1) * NVME_DB_SIZE; &msix_table_offset, &msix_pba_offset);
bar_size = QEMU_ALIGN_UP(bar_size, 4 * KiB);
msix_table_offset = bar_size;
msix_table_size = PCI_MSIX_ENTRY_SIZE * n->params.msix_qsize;
bar_size += msix_table_size;
bar_size = QEMU_ALIGN_UP(bar_size, 4 * KiB);
msix_pba_offset = bar_size;
msix_pba_size = QEMU_ALIGN_UP(n->params.msix_qsize, 64) / 8;
bar_size += msix_pba_size;
bar_size = pow2ceil(bar_size);
memory_region_init(&n->bar0, OBJECT(n), "nvme-bar0", bar_size); memory_region_init(&n->bar0, OBJECT(n), "nvme-bar0", bar_size);
memory_region_init_io(&n->iomem, OBJECT(n), &nvme_mmio_ops, n, "nvme", memory_region_init_io(&n->iomem, OBJECT(n), &nvme_mmio_ops, n, "nvme",