On Sun, Dec 09, 2018 at 08:45:58PM +0100, Cédric Le Goater wrote: > The XIVE IRQ backend uses the same layout as the new XICS backend but > covers the full range of the IRQ number space. The IRQ numbers for the > CPU IPIs are allocated at the bottom of this space, below 4K, to > preserve compatibility with XICS which does not use that range. > > This should be enough given that the maximum number of CPUs is 1024 > for the sPAPR machine under QEMU. For the record, the biggest POWER8 > or POWER9 system has a maximum of 1536 HW threads (16 sockets, 192 > cores, SMT8). > > Signed-off-by: Cédric Le Goater <c...@kaod.org>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> WIth the exception of the TODO noted below. > --- > include/hw/ppc/spapr.h | 2 + > include/hw/ppc/spapr_irq.h | 2 + > hw/ppc/spapr_irq.c | 113 +++++++++++++++++++++++++++++++++++++ > 3 files changed, 117 insertions(+) > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 198764066dc9..cb3082d319af 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -16,6 +16,7 @@ typedef struct sPAPREventLogEntry sPAPREventLogEntry; > typedef struct sPAPREventSource sPAPREventSource; > typedef struct sPAPRPendingHPT sPAPRPendingHPT; > typedef struct ICSState ICSState; > +typedef struct sPAPRXive sPAPRXive; > > #define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL > #define SPAPR_ENTRY_POINT 0x100 > @@ -175,6 +176,7 @@ struct sPAPRMachineState { > const char *icp_type; > int32_t irq_map_nr; > unsigned long *irq_map; > + sPAPRXive *xive; > > bool cmd_line_caps[SPAPR_CAP_NUM]; > sPAPRCapabilities def, eff, mig; > diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h > index bd7301e6d9c6..23cdb51b879e 100644 > --- a/include/hw/ppc/spapr_irq.h > +++ b/include/hw/ppc/spapr_irq.h > @@ -13,6 +13,7 @@ > /* > * IRQ range offsets per device type > */ > +#define SPAPR_IRQ_IPI 0x0 > #define SPAPR_IRQ_EPOW 0x1000 /* XICS_IRQ_BASE offset */ > #define SPAPR_IRQ_HOTPLUG 0x1001 > #define SPAPR_IRQ_VIO 0x1100 /* 256 VIO devices */ > @@ -42,6 +43,7 @@ typedef struct sPAPRIrq { > > extern sPAPRIrq spapr_irq_xics; > extern sPAPRIrq spapr_irq_xics_legacy; > +extern sPAPRIrq spapr_irq_xive; > > void spapr_irq_init(sPAPRMachineState *spapr, Error **errp); > int spapr_irq_claim(sPAPRMachineState *spapr, int irq, bool lsi, Error > **errp); > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index f8b651de0ec9..0bf47ff9fa26 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -12,6 +12,7 @@ > #include "qemu/error-report.h" > #include "qapi/error.h" > #include "hw/ppc/spapr.h" > +#include "hw/ppc/spapr_xive.h" > #include "hw/ppc/xics.h" > #include "sysemu/kvm.h" > > @@ -205,6 +206,118 @@ sPAPRIrq spapr_irq_xics = { > .print_info = spapr_irq_print_info_xics, > }; > > +/* > + * XIVE IRQ backend. > + */ > +static sPAPRXive *spapr_xive_create(sPAPRMachineState *spapr, int nr_irqs, > + int nr_servers, Error **errp) > +{ > + sPAPRXive *xive; > + Error *local_err = NULL; > + Object *obj; > + uint32_t nr_ends = nr_servers << 3; /* 8 priority ENDs per CPU */ > + int i; > + > + /* TODO : use qdev_create() ? */ Ok, still waiting on this todo. > + obj = object_new(TYPE_SPAPR_XIVE); > + object_property_set_int(obj, nr_irqs, "nr-irqs", &error_abort); > + object_property_set_int(obj, nr_ends, "nr-ends", &error_abort); > + object_property_set_bool(obj, true, "realized", &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return NULL; > + } > + qdev_set_parent_bus(DEVICE(obj), sysbus_get_default()); > + xive = SPAPR_XIVE(obj); > + > + /* Enable the CPU IPIs */ > + for (i = 0; i < nr_servers; ++i) { > + spapr_xive_irq_claim(xive, SPAPR_IRQ_IPI + i, false); > + } > + > + return xive; > +} > + > +static void spapr_irq_init_xive(sPAPRMachineState *spapr, Error **errp) > +{ > + MachineState *machine = MACHINE(spapr); > + sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr); > + int nr_irqs = smc->irq->nr_irqs; > + Error *local_err = NULL; > + > + /* KVM XIVE device not yet available */ > + if (kvm_enabled()) { > + if (machine_kernel_irqchip_required(machine)) { > + error_setg(errp, "kernel_irqchip requested. no KVM XIVE > support"); > + return; > + } > + } > + > + spapr->xive = spapr_xive_create(spapr, nr_irqs, > + spapr_max_server_number(spapr), > &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > +} > + > +static int spapr_irq_claim_xive(sPAPRMachineState *spapr, int irq, bool lsi, > + Error **errp) > +{ > + if (!spapr_xive_irq_claim(spapr->xive, irq, lsi)) { > + error_setg(errp, "IRQ %d is invalid", irq); > + return -1; > + } > + return 0; > +} > + > +static void spapr_irq_free_xive(sPAPRMachineState *spapr, int irq, int num) > +{ > + int i; > + > + for (i = irq; i < irq + num; ++i) { > + spapr_xive_irq_free(spapr->xive, i); > + } > +} > + > +static qemu_irq spapr_qirq_xive(sPAPRMachineState *spapr, int irq) > +{ > + return spapr_xive_qirq(spapr->xive, irq); > +} > + > +static void spapr_irq_print_info_xive(sPAPRMachineState *spapr, > + Monitor *mon) > +{ > + CPUState *cs; > + > + CPU_FOREACH(cs) { > + PowerPCCPU *cpu = POWERPC_CPU(cs); > + > + xive_tctx_pic_print_info(XIVE_TCTX(cpu->intc), mon); > + } > + > + spapr_xive_pic_print_info(spapr->xive, mon); > +} > + > +/* > + * XIVE uses the full IRQ number space. Set it to 8K to be compatible > + * with XICS. > + */ > + > +#define SPAPR_IRQ_XIVE_NR_IRQS 0x2000 > +#define SPAPR_IRQ_XIVE_NR_MSIS (SPAPR_IRQ_XIVE_NR_IRQS - SPAPR_IRQ_MSI) > + > +sPAPRIrq spapr_irq_xive = { > + .nr_irqs = SPAPR_IRQ_XIVE_NR_IRQS, > + .nr_msis = SPAPR_IRQ_XIVE_NR_MSIS, > + > + .init = spapr_irq_init_xive, > + .claim = spapr_irq_claim_xive, > + .free = spapr_irq_free_xive, > + .qirq = spapr_qirq_xive, > + .print_info = spapr_irq_print_info_xive, > +}; > + > /* > * sPAPR IRQ frontend routines for devices > */ -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature