| Message ID | 9a382501b425f4248e071e93db7c213025f402e6.1660023094.git.viresh.kumar@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Virtio toolstack support for I2C and GPIO on Arm | expand |
On 09.08.22 08:34, Viresh Kumar wrote: Hello Viresh > Create a separate routine to allocate base and irq for a device as the > same code will be required for each device type. > > Suggested-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > tools/libs/light/libxl_arm.c | 41 +++++++++++++++++++++++------------- > 1 file changed, 26 insertions(+), 15 deletions(-) > > diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c > index 1a3ac1646e94..4a750852b671 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) { > @@ -85,20 +103,10 @@ 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; > - > - LOG(DEBUG, "Allocate Virtio MMIO params for Vdev %s: IRQ %u BASE 0x%"PRIx64, > - disk->vdev, disk->irq, disk->base); > + int rc = alloc_virtio_mmio_params(gc, &disk->base, &disk->irq, > + &virtio_mmio_base, &virtio_mmio_irq); Nit: Something wrong with the indentation and looks like the blank line is needed here. > + if (rc) > + return rc; > } > } > > @@ -107,8 +115,11 @@ 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; > + virtio_irq = virtio_mmio_irq - 1; Well, here we assume that "virtio_mmio_irq" is always the highest allocated irq, currently it is true because we increment the counter in alloc_virtio_mmio_irq(), but this logic might be changed in future. So I would probably add a comment in code about that assumption. > 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]; With above fixed: Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 1a3ac1646e94..4a750852b671 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) { @@ -85,20 +103,10 @@ 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; - - LOG(DEBUG, "Allocate Virtio MMIO params for Vdev %s: IRQ %u BASE 0x%"PRIx64, - disk->vdev, disk->irq, disk->base); + int rc = alloc_virtio_mmio_params(gc, &disk->base, &disk->irq, + &virtio_mmio_base, &virtio_mmio_irq); + if (rc) + return rc; } } @@ -107,8 +115,11 @@ 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; + 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];
Create a separate routine to allocate base and irq for a device as the same code will be required for each device type. Suggested-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- tools/libs/light/libxl_arm.c | 41 +++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 15 deletions(-)