haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

spapr: export and rename the xics_max_server_number() routine

Browse source 
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>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2018-12-06 00:22:29 +01:00 committed by David Gibson
parent fab397d84a
commit 1a518e7693
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/ppc/spapr.c
View file

@ -150,7 +150,7 @@ static void pre_2_10_vmstate_unregister_dummy_icp(int i)
(void *)(uintptr_t) i); (void *)(uintptr_t) i);
} }
static int xics_max_server_number(sPAPRMachineState *spapr) int spapr_max_server_number(sPAPRMachineState *spapr)
{ {
assert(spapr->vsmt); assert(spapr->vsmt);
return DIV_ROUND_UP(max_cpus * spapr->vsmt, smp_threads); return DIV_ROUND_UP(max_cpus * spapr->vsmt, smp_threads);
@ -1268,7 +1268,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
_FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2));
/* /interrupt controller */ /* /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); ret = spapr_populate_memory(spapr, fdt);
if (ret < 0) { if (ret < 0) {
@ -2467,7 +2467,7 @@ static void spapr_init_cpus(sPAPRMachineState *spapr)
if (smc->pre_2_10_has_unused_icps) { if (smc->pre_2_10_has_unused_icps) {
int i; 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 /* Dummy entries get deregistered when real ICPState objects
* are registered during CPU core hotplug. * are registered during CPU core hotplug.
*/ */
@ -2588,7 +2588,7 @@ static void spapr_machine_init(MachineState *machine)
/* /*
* VSMT must be set in order to be able to compute VCPU ids, ie to * 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); spapr_set_vsmt_mode(spapr, &error_fatal);

1
include/hw/ppc/spapr.h
View file

@ -737,6 +737,7 @@ int spapr_hpt_shift_for_ramsize(uint64_t ramsize);
void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift, void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift,
Error **errp); Error **errp);
void spapr_clear_pending_events(sPAPRMachineState *spapr); void spapr_clear_pending_events(sPAPRMachineState *spapr);
int spapr_max_server_number(sPAPRMachineState *spapr);
/* CPU and LMB DRC release callbacks. */ /* CPU and LMB DRC release callbacks. */
void spapr_core_release(DeviceState *dev); void spapr_core_release(DeviceState *dev);