OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

spapr: Restore support for older PowerPC CPU cores

Browse Source 
Introduction of core based CPU hotplug for PowerPC sPAPR didn't
add support for 970 and POWER5+ based core types. Add support for
the same.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Bharata B Rao 2016-06-28 20:35:02 +05:30 committed by David Gibson
parent dde35bc966
commit ff461b8da9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/ppc/spapr_cpu_core.c
View File

@ -325,7 +325,6 @@ static void spapr_cpu_core_class_init(ObjectClass *oc, void *data)
/* /*
* instance_init routines from different flavours of sPAPR CPU cores. * instance_init routines from different flavours of sPAPR CPU cores.
* TODO: Add support for 'host' core type.
*/ */
#define SPAPR_CPU_CORE_INITFN(_type, _fname) \ #define SPAPR_CPU_CORE_INITFN(_type, _fname) \
static void glue(glue(spapr_cpu_core_, _fname), _initfn(Object *obj)) \ static void glue(glue(spapr_cpu_core_, _fname), _initfn(Object *obj)) \
@ -338,6 +337,8 @@ static void glue(glue(spapr_cpu_core_, _fname), _initfn(Object *obj)) \
core->cpu_class = oc; \ core->cpu_class = oc; \
} }
SPAPR_CPU_CORE_INITFN(970_v2.2, 970);
SPAPR_CPU_CORE_INITFN(POWER5+_v2.1, POWER5plus);
SPAPR_CPU_CORE_INITFN(POWER7_v2.3, POWER7); SPAPR_CPU_CORE_INITFN(POWER7_v2.3, POWER7);
SPAPR_CPU_CORE_INITFN(POWER7+_v2.1, POWER7plus); SPAPR_CPU_CORE_INITFN(POWER7+_v2.1, POWER7plus);
SPAPR_CPU_CORE_INITFN(POWER8_v2.0, POWER8); SPAPR_CPU_CORE_INITFN(POWER8_v2.0, POWER8);
@ -349,6 +350,12 @@ typedef struct SPAPRCoreInfo {
} SPAPRCoreInfo; } SPAPRCoreInfo;
static const SPAPRCoreInfo spapr_cores[] = { static const SPAPRCoreInfo spapr_cores[] = {
/* 970 */
{ .name = "970", .initfn = spapr_cpu_core_970_initfn },
/* POWER5 */
{ .name = "POWER5+", .initfn = spapr_cpu_core_POWER5plus_initfn },
/* POWER7 and aliases */ /* POWER7 and aliases */
{ .name = "POWER7_v2.3", .initfn = spapr_cpu_core_POWER7_initfn }, { .name = "POWER7_v2.3", .initfn = spapr_cpu_core_POWER7_initfn },
{ .name = "POWER7", .initfn = spapr_cpu_core_POWER7_initfn }, { .name = "POWER7", .initfn = spapr_cpu_core_POWER7_initfn },