mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spapr: Limit threads per core according to current compatibility mode

Browse Source 
This puts a limit to the number of threads per core based on the current
compatibility mode. Although PowerISA specs do not specify the maximum
threads per core number, the linux guest still expects that
PowerISA2.05-compatible CPU supports only 2 threads per core as this
is what POWER6 (2.05 compliant CPU) implements, the same is for
POWER7 (2.06, 4 threads) and POWER8 (2.07, 8 threads).

This calls spapr_fixup_cpu_smt_dt() with the maximum allowed number of
threads which affects ibm,ppc-interrupt-server#s and
ibm,ppc-interrupt-gserver#s properties.

The number of CPU nodesremains unchanged.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexey Kardashevskiy 2014-05-23 12:26:56 +10:00 committed by Alexander Graf
parent 82677ed2f5
commit 2a48d99335
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ppc/spapr.c
View File

@ -293,7 +293,7 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPREnvironment *spapr)
}
ret = spapr_fixup_cpu_smt_dt(fdt, offset, cpu,
smp_threads);
ppc_get_compat_smt_threads(cpu));
if (ret < 0) {
return ret;
}

1
target-ppc/cpu.h
View File

@ -1122,6 +1122,7 @@ void ppc_store_sdr1 (CPUPPCState *env, target_ulong value);
void ppc_store_msr (CPUPPCState *env, target_ulong value);
void ppc_cpu_list (FILE *f, fprintf_function cpu_fprintf);
int ppc_get_compat_smt_threads(PowerPCCPU *cpu);
int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version);
/* Time-base and decrementer management */

27
target-ppc/translate_init.c
View File

@ -8921,6 +8921,33 @@ static void ppc_cpu_unrealizefn(DeviceState *dev, Error **errp)
}
}
int ppc_get_compat_smt_threads(PowerPCCPU *cpu)
{
int ret = smp_threads;
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
switch (cpu->cpu_version) {
case CPU_POWERPC_LOGICAL_2_05:
ret = 2;
break;
case CPU_POWERPC_LOGICAL_2_06:
ret = 4;
break;
case CPU_POWERPC_LOGICAL_2_07:
ret = 8;
break;
default:
if (pcc->pcr_mask & PCR_COMPAT_2_06) {
ret = 4;
} else if (pcc->pcr_mask & PCR_COMPAT_2_05) {
ret = 2;
}
break;
}
return MIN(ret, smp_threads);
}
int ppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version)
{
int ret = 0;