| Message ID | 20181205232251.10446-16-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | ppc: support for the XIVE interrupt controller (POWER9) | expand |
On Thu, Dec 06, 2018 at 12:22:29AM +0100, Cédric Le Goater wrote: > The XIVE sPAPR IRQ backend will use it to define the number of ENDs of > the IC controller. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Again, this makes sense on its own, so I've applied. > --- > include/hw/ppc/spapr.h | 1 + > hw/ppc/spapr.c | 8 ++++---- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 6279711fe8f7..198764066dc9 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -737,6 +737,7 @@ int spapr_hpt_shift_for_ramsize(uint64_t ramsize); > void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift, > Error **errp); > void spapr_clear_pending_events(sPAPRMachineState *spapr); > +int spapr_max_server_number(sPAPRMachineState *spapr); > > /* CPU and LMB DRC release callbacks. */ > void spapr_core_release(DeviceState *dev); > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index e470efe7993c..a689f853e020 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -150,7 +150,7 @@ static void pre_2_10_vmstate_unregister_dummy_icp(int i) > (void *)(uintptr_t) i); > } > > -static int xics_max_server_number(sPAPRMachineState *spapr) > +int spapr_max_server_number(sPAPRMachineState *spapr) > { > assert(spapr->vsmt); > return DIV_ROUND_UP(max_cpus * spapr->vsmt, smp_threads); > @@ -1270,7 +1270,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, > _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); > > /* /interrupt controller */ > - spapr_dt_xics(xics_max_server_number(spapr), fdt, PHANDLE_XICP); > + spapr_dt_xics(spapr_max_server_number(spapr), fdt, PHANDLE_XICP); > > ret = spapr_populate_memory(spapr, fdt); > if (ret < 0) { > @@ -2469,7 +2469,7 @@ static void spapr_init_cpus(sPAPRMachineState *spapr) > if (smc->pre_2_10_has_unused_icps) { > int i; > > - for (i = 0; i < xics_max_server_number(spapr); i++) { > + for (i = 0; i < spapr_max_server_number(spapr); i++) { > /* Dummy entries get deregistered when real ICPState objects > * are registered during CPU core hotplug. > */ > @@ -2589,7 +2589,7 @@ static void spapr_machine_init(MachineState *machine) > load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; > > /* VSMT must be set in order to be able to compute VCPU ids, ie to > - * call xics_max_server_number() or spapr_vcpu_id(). > + * call spapr_max_server_number() or spapr_vcpu_id(). > */ > spapr_set_vsmt_mode(spapr, &error_fatal); >
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 6279711fe8f7..198764066dc9 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -737,6 +737,7 @@ int spapr_hpt_shift_for_ramsize(uint64_t ramsize); void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift, Error **errp); void spapr_clear_pending_events(sPAPRMachineState *spapr); +int spapr_max_server_number(sPAPRMachineState *spapr); /* CPU and LMB DRC release callbacks. */ void spapr_core_release(DeviceState *dev); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e470efe7993c..a689f853e020 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -150,7 +150,7 @@ static void pre_2_10_vmstate_unregister_dummy_icp(int i) (void *)(uintptr_t) i); } -static int xics_max_server_number(sPAPRMachineState *spapr) +int spapr_max_server_number(sPAPRMachineState *spapr) { assert(spapr->vsmt); return DIV_ROUND_UP(max_cpus * spapr->vsmt, smp_threads); @@ -1270,7 +1270,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); /* /interrupt controller */ - spapr_dt_xics(xics_max_server_number(spapr), fdt, PHANDLE_XICP); + spapr_dt_xics(spapr_max_server_number(spapr), fdt, PHANDLE_XICP); ret = spapr_populate_memory(spapr, fdt); if (ret < 0) { @@ -2469,7 +2469,7 @@ static void spapr_init_cpus(sPAPRMachineState *spapr) if (smc->pre_2_10_has_unused_icps) { int i; - for (i = 0; i < xics_max_server_number(spapr); i++) { + for (i = 0; i < spapr_max_server_number(spapr); i++) { /* Dummy entries get deregistered when real ICPState objects * are registered during CPU core hotplug. */ @@ -2589,7 +2589,7 @@ static void spapr_machine_init(MachineState *machine) load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; /* VSMT must be set in order to be able to compute VCPU ids, ie to - * call xics_max_server_number() or spapr_vcpu_id(). + * call spapr_max_server_number() or spapr_vcpu_id(). */ spapr_set_vsmt_mode(spapr, &error_fatal);
The XIVE sPAPR IRQ backend will use it to define the number of ENDs of the IC controller. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/spapr.h | 1 + hw/ppc/spapr.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)