[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.12 v2 11/12] sparp: merge ics_set_irq_type() i
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH for-2.12 v2 11/12] sparp: merge ics_set_irq_type() in irq_alloc_block() operation |
Date: |
Thu, 9 Nov 2017 11:14:38 +0100 |
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.
For compatibility with older machines, we use the machine class flag
'has_irq_bitmap'.
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/intc/xics.c | 8 --------
hw/intc/xics_spapr.c | 7 +------
hw/ppc/pnv_psi.c | 4 ----
hw/ppc/spapr.c | 14 ++++++++++++++
include/hw/ppc/xics.h | 1 -
5 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 42880e736697..237eed3c11f8 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -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);
diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
index b8e91aaf52bd..f28e9136f2f6 100644
--- a/hw/intc/xics_spapr.c
+++ b/hw/intc/xics_spapr.c
@@ -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;
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 9876c266223d..ee7fca311cbf 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -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);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d576e235d226..0cf1e02fa2b7 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3592,6 +3592,13 @@ static bool spapr_irq_test(XICSFabric *xi, int irq)
return test_bit(srcno, spapr->irq_map);
}
+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;
+}
/*
* Let's provision 4 LSIs per PHBs
@@ -3632,6 +3639,13 @@ static int spapr_irq_alloc_block(XICSFabric *xi, int
count, int align, bool lsi)
return -1;
}
+ if (!smc->has_irq_bitmap) {
+ int i;
+ for (i = srcno; i < srcno + count; ++i) {
+ ics_set_irq_type(spapr->ics, i, lsi);
+ }
+ }
+
bitmap_set(spapr->irq_map, srcno, count);
return srcno + spapr->irq_base;
}
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 292b929e88eb..056cf37bc68f 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -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);
--
2.13.6
- [Qemu-devel] [PATCH for-2.12 v2 01/12] spapr: add pseries 2.12 machine type, (continued)
- [Qemu-devel] [PATCH for-2.12 v2 01/12] spapr: add pseries 2.12 machine type, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 02/12] ppc/xics: remove useless if condition, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 03/12] spapr: introduce new XICSFabric operations for an IRQ allocator, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 04/12] spapr: move current IRQ allocation under the machine, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 05/12] spapr: introduce an IRQ allocator using a bitmap, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 06/12] spapr: store a reference IRQ bitmap, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 07/12] spapr: introduce an 'irq_base' number, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 08/12] spapr: remove the use of ics_valid_irq(), Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 09/12] spapr: introduce a XICSFabric irq_is_lsi() operation, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 10/12] spapr: split the IRQ number space for LSI interrupts, Cédric Le Goater, 2017/11/09
- [Qemu-devel] [PATCH for-2.12 v2 11/12] sparp: merge ics_set_irq_type() in irq_alloc_block() operation,
Cédric Le Goater <=
- [Qemu-devel] [PATCH for-2.12 v2 12/12] spapr: use sPAPRMachineState in spapr_ics_ prototypes, Cédric Le Goater, 2017/11/09
- Re: [Qemu-devel] [Qemu-ppc] [PATCH for-2.12 v2 00/12] spapr: introduce an IRQ allocator at the machine level, Cédric Le Goater, 2017/11/09