From: Viresh Kumar <viresh.kumar@linaro.org>
To: xen-devel@lists.xen.org
Cc: "Viresh Kumar" <viresh.kumar@linaro.org>,
"Vincent Guittot" <vincent.guittot@linaro.org>,
stratos-dev@op-lists.linaro.org,
"Alex Bennée" <alex.bennee@linaro.org>,
"Stefano Stabellini" <stefano.stabellini@xilinx.com>,
"Mathieu Poirier" <mathieu.poirier@linaro.com>,
"Oleksandr Tyshchenko" <olekstysh@gmail.com>,
"Wei Liu" <wl@xen.org>, "Juergen Gross" <jgross@suse.com>,
"Julien Grall" <julien@xen.org>,
"Anthony PERARD" <anthony.perard@citrix.com>,
"Oleksandr Tyshchenko" <oleksandr_tyshchenko@epam.com>
Subject: [PATCH V6 1/3] libxl: arm: Create alloc_virtio_mmio_params()
Date: Thu, 8 Sep 2022 14:22:59 +0530 [thread overview]
Message-ID: <fa118965422d6954f9cbf95ffd8e442fcd6702a7.1662626550.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1662626550.git.viresh.kumar@linaro.org>
In order to prepare for adding support for more device types, create a
separate routine to allocate base and irq for a device as the same code
will be required for other device types too.
Also move updates to virtio_irq and virtio_enabled out of the disk
device specific block, as they will depend on other device types too.
Suggested-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
tools/libs/light/libxl_arm.c | 47 +++++++++++++++++++++++++-----------
1 file changed, 33 insertions(+), 14 deletions(-)
diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c
index 1a3ac1646e94..cc30ba124918 100644
--- a/tools/libs/light/libxl_arm.c
+++ b/tools/libs/light/libxl_arm.c
@@ -48,6 +48,24 @@ static uint32_t alloc_virtio_mmio_irq(libxl__gc *gc, uint32_t *virtio_mmio_irq)
return irq;
}
+static int alloc_virtio_mmio_params(libxl__gc *gc, uint64_t *base,
+ uint32_t *irq, uint64_t *virtio_mmio_base,
+ uint32_t *virtio_mmio_irq)
+{
+ *base = alloc_virtio_mmio_base(gc, virtio_mmio_base);
+ if (!*base)
+ return ERROR_FAIL;
+
+ *irq = alloc_virtio_mmio_irq(gc, virtio_mmio_irq);
+ if (!*irq)
+ return ERROR_FAIL;
+
+ LOG(DEBUG, "Allocate Virtio MMIO params: IRQ %u BASE 0x%"PRIx64, *irq,
+ *base);
+
+ return 0;
+}
+
static const char *gicv_to_string(libxl_gic_version gic_version)
{
switch (gic_version) {
@@ -70,6 +88,7 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
bool vuart_enabled = false, virtio_enabled = false;
uint64_t virtio_mmio_base = GUEST_VIRTIO_MMIO_BASE;
uint32_t virtio_mmio_irq = GUEST_VIRTIO_MMIO_SPI_FIRST;
+ int rc;
/*
* If pl011 vuart is enabled then increment the nr_spis to allow allocation
@@ -85,20 +104,12 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
libxl_device_disk *disk = &d_config->disks[i];
if (disk->specification == LIBXL_DISK_SPECIFICATION_VIRTIO) {
- disk->base = alloc_virtio_mmio_base(gc, &virtio_mmio_base);
- if (!disk->base)
- return ERROR_FAIL;
-
- disk->irq = alloc_virtio_mmio_irq(gc, &virtio_mmio_irq);
- if (!disk->irq)
- return ERROR_FAIL;
-
- if (virtio_irq < disk->irq)
- virtio_irq = disk->irq;
- virtio_enabled = true;
+ rc = alloc_virtio_mmio_params(gc, &disk->base, &disk->irq,
+ &virtio_mmio_base,
+ &virtio_mmio_irq);
- LOG(DEBUG, "Allocate Virtio MMIO params for Vdev %s: IRQ %u BASE 0x%"PRIx64,
- disk->vdev, disk->irq, disk->base);
+ if (rc)
+ return rc;
}
}
@@ -107,8 +118,16 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
* present, make sure that we allocate enough SPIs for them.
* The resulting "nr_spis" needs to cover the highest possible SPI.
*/
- if (virtio_enabled)
+ if (virtio_mmio_irq != GUEST_VIRTIO_MMIO_SPI_FIRST) {
+ virtio_enabled = true;
+
+ /*
+ * Assumes that "virtio_mmio_irq" is the highest allocated irq, which is
+ * updated from alloc_virtio_mmio_irq() currently.
+ */
+ virtio_irq = virtio_mmio_irq - 1;
nr_spis = max(nr_spis, virtio_irq - 32 + 1);
+ }
for (i = 0; i < d_config->b_info.num_irqs; i++) {
uint32_t irq = d_config->b_info.irqs[i];
--
2.31.1.272.g89b43f80a514
next prev parent reply other threads:[~2022-09-08 8:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 8:52 [PATCH V6 0/3] libxl: arm: Make generic code independent of disk device Viresh Kumar
2022-09-08 8:52 ` Viresh Kumar [this message]
2022-09-09 13:19 ` [PATCH V6 1/3] libxl: arm: Create alloc_virtio_mmio_params() Anthony PERARD
2022-09-08 8:53 ` [PATCH V6 2/3] libxl: arm: Split make_virtio_mmio_node() Viresh Kumar
2022-09-09 13:21 ` Anthony PERARD
2022-09-08 8:53 ` [PATCH V6 3/3] libxl: arm: make creation of iommu node independent of disk device Viresh Kumar
2022-09-09 13:47 ` Anthony PERARD
2022-09-09 14:43 ` [PATCH V6.1 " Viresh Kumar
2022-09-09 15:02 ` Anthony PERARD
2022-09-20 10:29 ` Viresh Kumar
2022-10-04 9:59 ` Julien Grall
2022-11-24 19:19 ` Julien Grall
2022-11-25 5:45 ` Viresh Kumar
2022-11-28 9:31 ` Julien Grall
2022-09-16 10:21 ` Oleksandr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa118965422d6954f9cbf95ffd8e442fcd6702a7.1662626550.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=anthony.perard@citrix.com \
--cc=jgross@suse.com \
--cc=julien@xen.org \
--cc=mathieu.poirier@linaro.com \
--cc=oleksandr_tyshchenko@epam.com \
--cc=olekstysh@gmail.com \
--cc=stefano.stabellini@xilinx.com \
--cc=stratos-dev@op-lists.linaro.org \
--cc=vincent.guittot@linaro.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).