arm: Remove unused return code of irqchip_set_pending

[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..c4b8289f19cf581468e64db3d7d065bacb3c05ce 100644 (file)
--- a/hypervisor/arch/arm/include/asm/irqchip.h
+++ b/hypervisor/arch/arm/include/asm/irqchip.h
@@ -21,9 +21,9 @@
  */
 #define MAX_PENDING_IRQS       (PAGE_SIZE / sizeof(struct pending_irq))
 
+#include <jailhouse/cell.h>
 #include <jailhouse/mmio.h>
 #include <asm/percpu.h>
-#include <asm/traps.h>
 
 #ifndef __ASSEMBLY__
 
@@ -47,9 +47,9 @@ 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);
@@ -57,36 +57,25 @@ struct irqchip_ops {
        int     (*inject_irq)(struct per_cpu *cpu_data,
                              struct pending_irq *irq);
 
-       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 +83,12 @@ 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);
+void 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_set_pending(struct per_cpu *cpu_data, u32 irq_id, bool try_inject);
 
-       return spi_mask & (1 << spi);
-}
+bool spi_in_cell(struct cell *cell, unsigned int spi);
 
 #endif /* __ASSEMBLY__ */
 #endif /* _JAILHOUSE_ASM_IRQCHIP_H */