Message ID | 20190522074016.10521-3-clg@kaod.org |
---|---|
State | New |
Headers | show |
Series | spapr/xive: change default interrupt mode to 'dual' | expand |
On Wed, 22 May 2019 09:40:16 +0200 Cédric Le Goater <clg@kaod.org> wrote: > Now that XIVE support is complete (QEMU emulated and KVM devices), > change the pseries machine to advertise both interrupt modes: XICS > (P7/P8) and XIVE (P9). > > The machine default interrupt modes depends on the version. Current > settings are: > > pseries default interrupt mode > > 4.1 dual > 4.0 xics > 3.1 xics > 3.0 legacy xics (different IRQ number space layout) > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- At last ! :) Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 39e698e9b013..4fd16b43f014 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4352,7 +4352,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON; > smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_OFF; > spapr_caps_add_properties(smc, &error_abort); > - smc->irq = &spapr_irq_xics; > + smc->irq = &spapr_irq_dual; > smc->dr_phb_enabled = true; > } > > @@ -4430,6 +4430,7 @@ static void spapr_machine_4_0_class_options(MachineClass *mc) > spapr_machine_4_1_class_options(mc); > compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); > smc->phb_placement = phb_placement_4_0; > + smc->irq = &spapr_irq_xics; > } > > DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 39e698e9b013..4fd16b43f014 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4352,7 +4352,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON; smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_OFF; spapr_caps_add_properties(smc, &error_abort); - smc->irq = &spapr_irq_xics; + smc->irq = &spapr_irq_dual; smc->dr_phb_enabled = true; } @@ -4430,6 +4430,7 @@ static void spapr_machine_4_0_class_options(MachineClass *mc) spapr_machine_4_1_class_options(mc); compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); smc->phb_placement = phb_placement_4_0; + smc->irq = &spapr_irq_xics; } DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
Now that XIVE support is complete (QEMU emulated and KVM devices), change the pseries machine to advertise both interrupt modes: XICS (P7/P8) and XIVE (P9). The machine default interrupt modes depends on the version. Current settings are: pseries default interrupt mode 4.1 dual 4.0 xics 3.1 xics 3.0 legacy xics (different IRQ number space layout) Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/ppc/spapr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)