@@ -710,14 +710,6 @@ ICPState *xics_icp_get(XICSFabric *xi, int server)
return xic->icp_get(xi, server);
}
-void ics_set_irq_type(ICSState *ics, int srcno, bool lsi)
-{
- assert(!(ics->irqs[srcno].flags & XICS_FLAGS_IRQ_MASK));
-
- ics->irqs[srcno].flags |=
- lsi ? XICS_FLAGS_IRQ_LSI : XICS_FLAGS_IRQ_MSI;
-}
-
static void xics_register_types(void)
{
type_register_static(&ics_simple_info);
@@ -264,7 +264,6 @@ int spapr_ics_alloc(ICSState *ics, int irq_hint, bool lsi, Error **errp)
}
}
- ics_set_irq_type(ics, irq - ics->offset, lsi);
trace_xics_alloc(irq);
return irq;
@@ -277,7 +276,7 @@ int spapr_ics_alloc(ICSState *ics, int irq_hint, bool lsi, Error **errp)
int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi,
bool align, Error **errp)
{
- int i, first = -1;
+ int first = -1;
XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(ics->xics);
@@ -300,12 +299,6 @@ int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi,
return -1;
}
- if (first >= 0) {
- for (i = first; i < first + num; ++i) {
- ics_set_irq_type(ics, i - ics->offset, lsi);
- }
- }
-
trace_xics_alloc_block(first, num, lsi, align);
return first;
@@ -487,10 +487,6 @@ static void pnv_psi_realize(DeviceState *dev, Error **errp)
return;
}
- for (i = 0; i < ics->nr_irqs; i++) {
- ics_set_irq_type(ics, i, true);
- }
-
/* XSCOM region for PSI registers */
pnv_xscom_region_init(&psi->xscom_regs, OBJECT(dev), &pnv_psi_xscom_ops,
psi, "xscom-psi", PNV_XSCOM_PSIHB_SIZE);
@@ -3598,7 +3598,7 @@ static int spapr_irq_alloc_block(XICSFabric *xi, int count, int align, bool lsi)
sPAPRMachineState *spapr = SPAPR_MACHINE(xi);
sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
int start = 0;
- int srcno;
+ int srcno, i;
if (!lsi && !smc->pre_2_11_has_no_bitmap) {
start = SPAPR_MAX_LSI;
@@ -3614,6 +3614,13 @@ static int spapr_irq_alloc_block(XICSFabric *xi, int count, int align, bool lsi)
return -1;
}
+ if (lsi && smc->pre_2_11_has_no_bitmap) {
+ for (i = srcno; i < srcno + count; ++i) {
+ assert(!(spapr->ics->irqs[srcno].flags & XICS_FLAGS_IRQ_MASK));
+ spapr->ics->irqs[srcno].flags = XICS_FLAGS_IRQ_LSI;
+ }
+ }
+
bitmap_set(spapr->irq_map, srcno, count);
return srcno + spapr->irq_base;
}
Setting the XICS_FLAGS_IRQ_LSI (or XICS_FLAGS_IRQ_MSI) for pre-2.11 pseries machines can now be done directly under the irq_alloc_block() operation. let's remove ics_set_irq_type() which becomes useless. The PowerNV machine is a bit special because it does not manage its own IRQ number allocator yet. But, as it only handles the PSI interrupts which are LSIs, this is not a problem. For compatibility with older machines, we use the machine class flag 'pre_2_11_has_no_bitmap'. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/intc/xics.c | 8 -------- hw/intc/xics_spapr.c | 9 +-------- hw/ppc/pnv_psi.c | 4 ---- hw/ppc/spapr.c | 9 ++++++++- 4 files changed, 9 insertions(+), 21 deletions(-)