Add helpers for LPI invalidation.
Signed-off-by: Mykyta Poturai <[email protected]>
---
xen/arch/arm/gic-v3-its.c | 21 ++++++++++++++++++++-
xen/arch/arm/gic-v4-its.c | 22 ++++++++++++++++++++++
xen/arch/arm/include/asm/gic_v3_its.h | 5 +++++
3 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/gic-v3-its.c b/xen/arch/arm/gic-v3-its.c
index 25889445f5..c628959f42 100644
--- a/xen/arch/arm/gic-v3-its.c
+++ b/xen/arch/arm/gic-v3-its.c
@@ -201,7 +201,7 @@ int its_send_command(struct host_its *hw_its, const void
*its_cmd)
}
/* Wait for an ITS to finish processing all commands. */
-static int gicv3_its_wait_commands(struct host_its *hw_its)
+int gicv3_its_wait_commands(struct host_its *hw_its)
{
/*
* As there could be quite a number of commands in a queue, we will
@@ -672,6 +672,25 @@ static int compare_its_guest_devices(struct its_device
*dev,
return 0;
}
+int its_inv_lpi(struct host_its *its, struct its_device *dev,
+ uint32_t eventid, unsigned int cpu)
+{
+ int ret;
+
+ if ( event_is_forwarded_to_vcpu(dev, eventid) )
+ return its_send_cmd_vinv(its, dev, eventid);
+
+ ret = its_send_cmd_inv(its, dev->host_devid, eventid);
+ if ( ret )
+ return ret;
+
+ ret = its_send_cmd_sync(its, cpu);
+ if ( ret )
+ return ret;
+
+ return gicv3_its_wait_commands(its);
+}
+
/*
* On the host ITS @its, map @nr_events consecutive LPIs.
* The mapping connects a device @devid and event @eventid pair to LPI @lpi,
diff --git a/xen/arch/arm/gic-v4-its.c b/xen/arch/arm/gic-v4-its.c
index 9bbd0d96b7..358d0bffb9 100644
--- a/xen/arch/arm/gic-v4-its.c
+++ b/xen/arch/arm/gic-v4-its.c
@@ -290,3 +290,25 @@ int gicv4_its_vlpi_move(struct pending_irq *pirq, struct
vcpu *vcpu)
map->vpe_idx = vcpu->vcpu_id;
return gicv4_its_vlpi_map(map);
}
+
+/*
+ * There is no real VINV command.
+ * We do a normal INV, with a VSYNC instead of a SYNC.
+ */
+int its_send_cmd_vinv(struct host_its *its, struct its_device *dev,
+ uint32_t eventid)
+{
+ int ret;
+ struct its_vlpi_map *map = &dev->event_map.vlpi_maps[eventid];
+ uint16_t vpeid = map->vm->vpes[map->vpe_idx]->vpe_id;
+
+ ret = its_send_cmd_inv(its, dev->host_devid, eventid);
+ if ( ret )
+ return ret;
+
+ ret = its_send_cmd_vsync(its, vpeid);
+ if ( ret )
+ return ret;
+
+ return gicv3_its_wait_commands(its);
+}
diff --git a/xen/arch/arm/include/asm/gic_v3_its.h
b/xen/arch/arm/include/asm/gic_v3_its.h
index 75c91c0426..973ca6acdd 100644
--- a/xen/arch/arm/include/asm/gic_v3_its.h
+++ b/xen/arch/arm/include/asm/gic_v3_its.h
@@ -194,6 +194,9 @@ int its_send_cmd_discard(struct host_its *its, struct
its_device *dev,
uint32_t eventid);
int its_send_cmd_inv(struct host_its *its, uint32_t deviceid, uint32_t
eventid);
int its_send_cmd_clear(struct host_its *its, uint32_t deviceid, uint32_t
eventid);
+int gicv3_its_wait_commands(struct host_its *hw_its);
+int its_inv_lpi(struct host_its *its, struct its_device *dev,
+ uint32_t eventid, unsigned int cpu);
int its_send_cmd_mapti(struct host_its *its, uint32_t deviceid,
uint32_t eventid, uint32_t pintid, uint16_t icid);
#ifdef CONFIG_ACPI
@@ -267,6 +270,8 @@ int gicv4_assign_guest_event(struct domain *d, paddr_t
vdoorbell_address,
uint32_t vdevid, uint32_t eventid,
struct pending_irq *pirq);
int gicv4_its_vlpi_move(struct pending_irq *pirq, struct vcpu *vcpu);
+int its_send_cmd_vinv(struct host_its *its, struct its_device *dev,
+ uint32_t eventid);
#ifndef CONFIG_GICV4
#define event_is_forwarded_to_vcpu(dev, eventid) ((void)dev, (void)eventid,
false)
#else
--
2.51.2
