arm: Rework spi_in_cell to irqchip_irq_in_cell

[jailhouse.git] / hypervisor / arch / arm / include / asm / irqchip.h

diff --git a/hypervisor/arch/arm/include/asm/irqchip.h b/hypervisor/arch/arm/include/asm/irqchip.h
index 7a86f3ac9888c796ff562965371eb48ff9fe682d..56b1b4a1ce786f654ca87310a5c9af902407750b 100644 (file)
--- a/hypervisor/arch/arm/include/asm/irqchip.h
+++ b/hypervisor/arch/arm/include/asm/irqchip.h
@@ -13,20 +13,15 @@
 #ifndef _JAILHOUSE_ASM_IRQCHIP_H
 #define _JAILHOUSE_ASM_IRQCHIP_H
 
-/*
- * Since there is no finer-grained allocation than page-alloc for the moment,
- * and it is very complicated to predict the total size needed at
- * initialisation, each cpu is allocated one page of pending irqs.
- * This allows for 256 pending IRQs, which should be sufficient.
- */
-#define MAX_PENDING_IRQS       (PAGE_SIZE / sizeof(struct pending_irq))
+#define MAX_PENDING_IRQS       256
 
+#include <jailhouse/cell.h>
 #include <jailhouse/mmio.h>
-#include <asm/percpu.h>
-#include <asm/traps.h>
 
 #ifndef __ASSEMBLY__
 
+struct per_cpu;
+
 struct sgi {
        /*
         * Routing mode values:
@@ -47,46 +42,27 @@ struct sgi {
 struct irqchip_ops {
        int     (*init)(void);
        int     (*cpu_init)(struct per_cpu *cpu_data);
-       void    (*cell_init)(struct cell *cell);
+       int     (*cell_init)(struct cell *cell);
        void    (*cell_exit)(struct cell *cell);
-       int     (*cpu_reset)(struct per_cpu *cpu_data);
+       int     (*cpu_reset)(struct per_cpu *cpu_data, bool is_shutdown);
 
        int     (*send_sgi)(struct sgi *sgi);
        void    (*handle_irq)(struct per_cpu *cpu_data);
        void    (*eoi_irq)(u32 irqn, bool deactivate);
-       int     (*inject_irq)(struct per_cpu *cpu_data,
-                             struct pending_irq *irq);
+       int     (*inject_irq)(struct per_cpu *cpu_data, u16 irq_id);
+       void    (*enable_maint_irq)(bool enable);
 
-       int     (*mmio_access)(struct per_cpu *cpu_data,
-                              struct mmio_access *access);
+       int     (*mmio_access)(struct mmio_access *access);
 };
 
-/* Virtual interrupts waiting to be injected */
-struct pending_irq {
-       u32     virt_id;
-
-       u8      priority;
-       u8      hw;
-       union {
-               /* Physical id, when hw is 1 */
-               u16 irq;
-               struct {
-                       /* GICv2 needs cpuid for SGIs */
-                       u16 cpuid       : 15;
-                       /* EOI generates a maintenance irq */
-                       u16 maintenance : 1;
-               } sgi __attribute__((packed));
-       } type;
-
-       struct pending_irq *next;
-       struct pending_irq *prev;
-} __attribute__((packed));
+unsigned int irqchip_mmio_count_regions(struct cell *cell);
 
 int irqchip_init(void);
 int irqchip_cpu_init(struct per_cpu *cpu_data);
 int irqchip_cpu_reset(struct per_cpu *cpu_data);
+void irqchip_cpu_shutdown(struct per_cpu *cpu_data);
 
-void irqchip_cell_init(struct cell *cell);
+int irqchip_cell_init(struct cell *cell);
 void irqchip_cell_exit(struct cell *cell);
 void irqchip_root_cell_shrink(struct cell *cell);
 
@@ -94,25 +70,10 @@ int irqchip_send_sgi(struct sgi *sgi);
 void irqchip_handle_irq(struct per_cpu *cpu_data);
 void irqchip_eoi_irq(u32 irqn, bool deactivate);
 
-int irqchip_mmio_access(struct per_cpu *cpu_data, struct mmio_access *access);
-
-int irqchip_inject_pending(struct per_cpu *cpu_data);
-int irqchip_insert_pending(struct per_cpu *cpu_data, struct pending_irq *irq);
-int irqchip_remove_pending(struct per_cpu *cpu_data, struct pending_irq *irq);
-int irqchip_set_pending(struct per_cpu *cpu_data, u32 irq_id, bool try_inject);
-
-static inline bool spi_in_cell(struct cell *cell, unsigned int spi)
-{
-       /* FIXME: Change the configuration to a bitmask range */
-       u64 spi_mask;
-
-       if (spi > 64)
-               return false;
-
-       spi_mask = cell->arch.spis;
+void irqchip_inject_pending(struct per_cpu *cpu_data);
+void irqchip_set_pending(struct per_cpu *cpu_data, u16 irq_id);
 
-       return spi_mask & (1 << spi);
-}
+bool irqchip_irq_in_cell(struct cell *cell, unsigned int irq_id);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _JAILHOUSE_ASM_IRQCHIP_H */