arm: Remove return code from irqchip_inject_pending

[jailhouse.git] / hypervisor / arch / arm / irqchip.c

diff --git a/hypervisor/arch/arm/irqchip.c b/hypervisor/arch/arm/irqchip.c
index fe8b0f1f4cacff799945fec2264a56a300c257fa..1e2a4e494a6a08a83bf81e3a6de58f6635b1ff25 100644 (file)
--- a/hypervisor/arch/arm/irqchip.c
+++ b/hypervisor/arch/arm/irqchip.c
@@ -34,6 +34,21 @@ unsigned long gicd_size;
 static bool irqchip_is_init;
 static struct irqchip_ops irqchip;
 
+bool spi_in_cell(struct cell *cell, unsigned int spi)
+{
+       /* FIXME: Change the configuration to a bitmask range */
+       u32 spi_mask;
+
+       if (spi >= 64)
+               return false;
+       else if (spi >= 32)
+               spi_mask = cell->arch.spis >> 32;
+       else
+               spi_mask = cell->arch.spis;
+
+       return spi_mask & (1 << (spi & 31));
+}
+
 static int irqchip_init_pending(struct per_cpu *cpu_data)
 {
        struct pending_irq *pend_array;
@@ -119,17 +134,6 @@ int irqchip_set_pending(struct per_cpu *cpu_data, u32 irq_id, bool try_inject)
        struct pending_irq pending;
 
        pending.virt_id = irq_id;
-       /* Priority must be less than ICC_PMR */
-       pending.priority = 0;
-
-       if (is_sgi(irq_id)) {
-               pending.hw = 0;
-               pending.type.sgi.maintenance = 0;
-               pending.type.sgi.cpuid = 0;
-       } else {
-               pending.hw = 1;
-               pending.type.irq = irq_id;
-       }
 
        if (try_inject && irqchip.inject_irq(cpu_data, &pending) == 0)
                return 0;
@@ -156,7 +160,7 @@ int irqchip_remove_pending(struct per_cpu *cpu_data, struct pending_irq *irq)
        return 0;
 }
 
-int irqchip_inject_pending(struct per_cpu *cpu_data)
+void irqchip_inject_pending(struct per_cpu *cpu_data)
 {
        int err;
        struct pending_irq *pending = cpu_data->first_pending;
@@ -179,8 +183,6 @@ int irqchip_inject_pending(struct per_cpu *cpu_data)
 
                pending = pending->next;
        }
-
-       return 0;
 }
 
 void irqchip_handle_irq(struct per_cpu *cpu_data)
@@ -237,14 +239,6 @@ void irqchip_cpu_shutdown(struct per_cpu *cpu_data)
                irqchip.cpu_reset(cpu_data, true);
 }
 
-int irqchip_mmio_access(struct per_cpu *cpu_data, struct mmio_access *access)
-{
-       if (irqchip.mmio_access)
-               return irqchip.mmio_access(cpu_data, access);
-
-       return TRAP_UNHANDLED;
-}
-
 static const struct jailhouse_irqchip *
 irqchip_find_config(struct jailhouse_cell_desc *config)
 {
@@ -257,13 +251,13 @@ irqchip_find_config(struct jailhouse_cell_desc *config)
                return NULL;
 }
 
-void irqchip_cell_init(struct cell *cell)
+int irqchip_cell_init(struct cell *cell)
 {
        const struct jailhouse_irqchip *pins = irqchip_find_config(cell->config);
 
        cell->arch.spis = (pins ? pins->pin_bitmap : 0);
 
-       irqchip.cell_init(cell);
+       return irqchip.cell_init(cell);
 }
 
 void irqchip_cell_exit(struct cell *cell)
@@ -271,6 +265,11 @@ void irqchip_cell_exit(struct cell *cell)
        const struct jailhouse_irqchip *root_pins =
                irqchip_find_config(root_cell.config);
 
+       /* might be called by arch_shutdown while rolling back
+        * a failed setup */
+       if (!irqchip_is_init)
+               return;
+
        if (root_pins)
                root_cell.arch.spis |= cell->arch.spis & root_pins->pin_bitmap;