Commit ff461b8d authored by Bharata B Rao's avatar Bharata B Rao Committed by David Gibson
Browse files

spapr: Restore support for older PowerPC CPU cores 



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: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent dde35bc9

hw/ppc/spapr_cpu_core.c

+8 −1
Original line number Diff line number Diff line
@@ -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.

 * TODO: Add support for 'host' core type.

 */

#define SPAPR_CPU_CORE_INITFN(_type, _fname) \

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; \

}



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.1, POWER7plus);

SPAPR_CPU_CORE_INITFN(POWER8_v2.0, POWER8);
@@ -349,6 +350,12 @@ typedef struct SPAPRCoreInfo { 
} SPAPRCoreInfo;



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 */

    { .name = "POWER7_v2.3", .initfn = spapr_cpu_core_POWER7_initfn },

    { .name = "POWER7", .initfn = spapr_cpu_core_POWER7_initfn },