@@ -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);
@@ -267,7 +267,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;
@@ -280,7 +279,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);
if (!ics) {
@@ -306,10 +305,6 @@ int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi,
return -1;
}
- 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);
@@ -3596,18 +3596,31 @@ static bool spapr_irq_test_2_11(XICSFabric *xi, int irq)
return !ICS_IRQ_FREE(ics, srcno);
}
+static 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 int spapr_irq_alloc_block_2_11(XICSFabric *xi, int count, int align,
bool lsi)
{
sPAPRMachineState *spapr = SPAPR_MACHINE(xi);
ICSState *ics = spapr->ics;
int srcno;
+ int i;
srcno = ics_find_free_block(ics, count, align);
if (srcno == -1) {
return -1;
}
+ for (i = srcno; i < srcno + count; ++i) {
+ ics_set_irq_type(ics, i, lsi);
+ }
+
return srcno + ics->offset;
}
@@ -203,7 +203,6 @@ void icp_eoi(ICPState *icp, uint32_t xirr);
void ics_simple_write_xive(ICSState *ics, int nr, int server,
uint8_t priority, uint8_t saved_priority);
-void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);
void icp_pic_print_info(ICPState *icp, Monitor *mon);
void ics_pic_print_info(ICSState *ics, Monitor *mon);
bool ics_is_lsi(ICSState *ics, int srno);
Setting the XICS_FLAGS_IRQ_LSI (or XICS_FLAGS_IRQ_MSI) for older pseries machines can now be done directly under the irq_alloc_block() operation. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/intc/xics.c | 8 -------- hw/intc/xics_spapr.c | 7 +------ hw/ppc/pnv_psi.c | 4 ---- hw/ppc/spapr.c | 13 +++++++++++++ include/hw/ppc/xics.h | 1 - 5 files changed, 14 insertions(+), 19 deletions(-)