aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc/spapr_irq.c
diff options
context:
space:
mode:
authorCédric Le Goater <clg@kaod.org>2018-09-11 07:55:03 +0200
committerDavid Gibson <david@gibson.dropbear.id.au>2018-09-25 11:12:25 +1000
commitae837402379b649e942b6a968de88b94585a5c84 (patch)
tree56793c8a5fc22c96f9bb5f06fb58169f15fe36c7 /hw/ppc/spapr_irq.c
parente39de895f6adc3a274f3116d4f38845d8fcbf135 (diff)
downloadqemu-ae837402379b649e942b6a968de88b94585a5c84.zip
qemu-ae837402379b649e942b6a968de88b94585a5c84.tar.gz
qemu-ae837402379b649e942b6a968de88b94585a5c84.tar.bz2
spapr: increase the size of the IRQ number space
The new layout using static IRQ number does not leave much space to the dynamic MSI range, only 0x100 IRQ numbers. Increase the total number of IRQS for newer machines and introduce a legacy XICS backend for pre-3.1 machines to maintain compatibility. For the old backend, provide a 'nr_msis' value covering the full IRQ number space as it does not use the bitmap allocator to allocate MSI interrupt numbers. Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Greg Kurz <groug@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/spapr_irq.c')
-rw-r--r--hw/ppc/spapr_irq.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index fe8be5f..e77b94c 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -195,7 +195,7 @@ static void spapr_irq_print_info_xics(sPAPRMachineState *spapr, Monitor *mon)
ics_pic_print_info(spapr->ics, mon);
}
-#define SPAPR_IRQ_XICS_NR_IRQS 0x400
+#define SPAPR_IRQ_XICS_NR_IRQS 0x1000
#define SPAPR_IRQ_XICS_NR_MSIS \
(XICS_IRQ_BASE + SPAPR_IRQ_XICS_NR_IRQS - SPAPR_IRQ_MSI)
@@ -289,3 +289,16 @@ int spapr_irq_find(sPAPRMachineState *spapr, int num, bool align, Error **errp)
return first + ics->offset;
}
+
+#define SPAPR_IRQ_XICS_LEGACY_NR_IRQS 0x400
+
+sPAPRIrq spapr_irq_xics_legacy = {
+ .nr_irqs = SPAPR_IRQ_XICS_LEGACY_NR_IRQS,
+ .nr_msis = SPAPR_IRQ_XICS_LEGACY_NR_IRQS,
+
+ .init = spapr_irq_init_xics,
+ .claim = spapr_irq_claim_xics,
+ .free = spapr_irq_free_xics,
+ .qirq = spapr_qirq_xics,
+ .print_info = spapr_irq_print_info_xics,
+};