arm: Factor out gic_targets_in_cell

We will reuse it for affinity adjustments on cell creation.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/arch/arm/gic-common.c b/hypervisor/arch/arm/gic-common.c
index ab405e52577fdaa953cd380eb265ea3467756dfc..5d0eed86d5a2fc61cd81fb7bb053fabf1ac36698 100644 (file)
--- a/hypervisor/arch/arm/gic-common.c
+++ b/hypervisor/arch/arm/gic-common.c
@@ -33,6 +33,19 @@ static DEFINE_SPINLOCK(dist_lock);
 /* The GIC interface numbering does not necessarily match the logical map */
 static u8 target_cpu_map[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
+/* Check that the targeted interface belongs to the cell */
+bool gic_targets_in_cell(struct cell *cell, u8 targets)
+{
+       unsigned int cpu;
+
+       for (cpu = 0; cpu < ARRAY_SIZE(target_cpu_map); cpu++)
+               if (targets & target_cpu_map[cpu] &&
+                   per_cpu(cpu)->cell != cell)
+                       return false;
+
+       return true;
+}
+
 /*
  * Most of the GIC distributor writes only reconfigure the IRQs corresponding to
  * the bits of the written value, by using separate `set' and `clear' registers.
@@ -106,9 +119,9 @@ static enum mmio_result handle_irq_target(struct mmio_access *mmio,
         * access corresponds to the reg index
         */
        struct cell *cell = this_cell();
-       unsigned int i, cpu;
        unsigned int offset;
        u32 access_mask = 0;
+       unsigned int i;
        u8 targets;
 
        /*
@@ -140,14 +153,7 @@ static enum mmio_result handle_irq_target(struct mmio_access *mmio,
 
                targets = (mmio->value >> (8 * i)) & 0xff;
 
-               /* Check that the targeted interface belongs to the cell */
-               for (cpu = 0; cpu < 8; cpu++) {
-                       if (!(targets & target_cpu_map[cpu]))
-                               continue;
-
-                       if (per_cpu(cpu)->cell == cell)
-                               continue;
-
+               if (!gic_targets_in_cell(cell, targets)) {
                        printk("Attempt to route IRQ%d outside of cell\n", irq);
                        return MMIO_ERROR;
                }

diff --git a/hypervisor/arch/arm/include/asm/gic_common.h b/hypervisor/arch/arm/include/asm/gic_common.h
index 4c58933b75292bce450f94b81a19927ad5f1c2b4..162595363a879e7926a037ee351f4ccfdcc4e0fd 100644 (file)
--- a/hypervisor/arch/arm/include/asm/gic_common.h
+++ b/hypervisor/arch/arm/include/asm/gic_common.h
@@ -55,6 +55,7 @@ enum mmio_result gic_handle_irq_route(struct mmio_access *mmio,
 void gic_handle_sgir_write(struct sgi *sgi, bool virt_input);
 void gic_handle_irq(struct per_cpu *cpu_data);
 void gic_target_spis(struct cell *config_cell, struct cell *dest_cell);
+bool gic_targets_in_cell(struct cell *cell, u8 targets);
 
 #endif /* !__ASSEMBLY__ */
 #endif /* !_JAILHOUSE_ASM_GIC_COMMON_H */