 88f42c6773
			
		
	
	
		88f42c6773
		
	
	
	
	
		
			
			Although the order doesn't really matter at the moment, it's possible other initializastions could depend on the compatiblity mode, so make sure we set it first in spapr_cpu_reset(). While we're at it drop the test against first_cpu. Setting the compat mode to the value it already has is redundant, but harmless, so we might as well make a small simplification to the code. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Greg Kurz <groug@kaod.org>
		
			
				
	
	
		
			259 lines
		
	
	
		
			7.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			259 lines
		
	
	
		
			7.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * sPAPR CPU core device, acts as container of CPU thread devices.
 | |
|  *
 | |
|  * Copyright (C) 2016 Bharata B Rao <bharata@linux.vnet.ibm.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  */
 | |
| #include "qemu/osdep.h"
 | |
| #include "hw/cpu/core.h"
 | |
| #include "hw/ppc/spapr_cpu_core.h"
 | |
| #include "target/ppc/cpu.h"
 | |
| #include "hw/ppc/spapr.h"
 | |
| #include "hw/boards.h"
 | |
| #include "qapi/error.h"
 | |
| #include "sysemu/cpus.h"
 | |
| #include "sysemu/kvm.h"
 | |
| #include "target/ppc/kvm_ppc.h"
 | |
| #include "hw/ppc/ppc.h"
 | |
| #include "target/ppc/mmu-hash64.h"
 | |
| #include "sysemu/numa.h"
 | |
| #include "sysemu/hw_accel.h"
 | |
| #include "qemu/error-report.h"
 | |
| 
 | |
| static void spapr_cpu_reset(void *opaque)
 | |
| {
 | |
|     PowerPCCPU *cpu = opaque;
 | |
|     CPUState *cs = CPU(cpu);
 | |
|     CPUPPCState *env = &cpu->env;
 | |
|     PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
 | |
| 
 | |
|     cpu_reset(cs);
 | |
| 
 | |
|     /* Set compatibility mode to match the boot CPU, which was either set
 | |
|      * by the machine reset code or by CAS. This should never fail.
 | |
|      */
 | |
|     ppc_set_compat(cpu, POWERPC_CPU(first_cpu)->compat_pvr, &error_abort);
 | |
| 
 | |
|     /* All CPUs start halted.  CPU0 is unhalted from the machine level
 | |
|      * reset code and the rest are explicitly started up by the guest
 | |
|      * using an RTAS call */
 | |
|     cs->halted = 1;
 | |
| 
 | |
|     env->spr[SPR_HIOR] = 0;
 | |
| 
 | |
|     /* Disable Power-saving mode Exit Cause exceptions for the CPU.
 | |
|      * This can cause issues when rebooting the guest if a secondary
 | |
|      * is awaken */
 | |
|     if (cs != first_cpu) {
 | |
|         env->spr[SPR_LPCR] &= ~pcc->lpcr_pm;
 | |
|     }
 | |
| 
 | |
| }
 | |
| 
 | |
| static void spapr_cpu_destroy(PowerPCCPU *cpu)
 | |
| {
 | |
|     qemu_unregister_reset(spapr_cpu_reset, cpu);
 | |
| }
 | |
| 
 | |
| static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu,
 | |
|                            Error **errp)
 | |
| {
 | |
|     CPUPPCState *env = &cpu->env;
 | |
| 
 | |
|     /* Set time-base frequency to 512 MHz */
 | |
|     cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
 | |
| 
 | |
|     /* Enable PAPR mode in TCG or KVM */
 | |
|     cpu_ppc_set_papr(cpu, PPC_VIRTUAL_HYPERVISOR(spapr));
 | |
| 
 | |
|     qemu_register_reset(spapr_cpu_reset, cpu);
 | |
|     spapr_cpu_reset(cpu);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Return the sPAPR CPU core type for @model which essentially is the CPU
 | |
|  * model specified with -cpu cmdline option.
 | |
|  */
 | |
| const char *spapr_get_cpu_core_type(const char *cpu_type)
 | |
| {
 | |
|     int len = strlen(cpu_type) - strlen(POWERPC_CPU_TYPE_SUFFIX);
 | |
|     char *core_type = g_strdup_printf(SPAPR_CPU_CORE_TYPE_NAME("%.*s"),
 | |
|                                       len, cpu_type);
 | |
|     ObjectClass *oc = object_class_by_name(core_type);
 | |
| 
 | |
|     g_free(core_type);
 | |
|     if (!oc) {
 | |
|         return NULL;
 | |
|     }
 | |
| 
 | |
|     return object_class_get_name(oc);
 | |
| }
 | |
| 
 | |
| static void spapr_cpu_core_unrealizefn(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
 | |
|     CPUCore *cc = CPU_CORE(dev);
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < cc->nr_threads; i++) {
 | |
|         Object *obj = OBJECT(sc->threads[i]);
 | |
|         DeviceState *dev = DEVICE(obj);
 | |
|         CPUState *cs = CPU(dev);
 | |
|         PowerPCCPU *cpu = POWERPC_CPU(cs);
 | |
| 
 | |
|         spapr_cpu_destroy(cpu);
 | |
|         object_unparent(cpu->intc);
 | |
|         cpu_remove_sync(cs);
 | |
|         object_unparent(obj);
 | |
|     }
 | |
|     g_free(sc->threads);
 | |
| }
 | |
| 
 | |
| static void spapr_cpu_core_realize_child(Object *child,
 | |
|                                          sPAPRMachineState *spapr, Error **errp)
 | |
| {
 | |
|     Error *local_err = NULL;
 | |
|     CPUState *cs = CPU(child);
 | |
|     PowerPCCPU *cpu = POWERPC_CPU(cs);
 | |
| 
 | |
|     object_property_set_bool(child, true, "realized", &local_err);
 | |
|     if (local_err) {
 | |
|         goto error;
 | |
|     }
 | |
| 
 | |
|     spapr_cpu_init(spapr, cpu, &local_err);
 | |
|     if (local_err) {
 | |
|         goto error;
 | |
|     }
 | |
| 
 | |
|     cpu->intc = icp_create(child, spapr->icp_type, XICS_FABRIC(spapr),
 | |
|                            &local_err);
 | |
|     if (local_err) {
 | |
|         goto error;
 | |
|     }
 | |
| 
 | |
|     return;
 | |
| 
 | |
| error:
 | |
|     error_propagate(errp, local_err);
 | |
| }
 | |
| 
 | |
| static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     /* We don't use SPAPR_MACHINE() in order to exit gracefully if the user
 | |
|      * tries to add a sPAPR CPU core to a non-pseries machine.
 | |
|      */
 | |
|     sPAPRMachineState *spapr =
 | |
|         (sPAPRMachineState *) object_dynamic_cast(qdev_get_machine(),
 | |
|                                                   TYPE_SPAPR_MACHINE);
 | |
|     sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
 | |
|     sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
 | |
|     CPUCore *cc = CPU_CORE(OBJECT(dev));
 | |
|     Error *local_err = NULL;
 | |
|     Object *obj;
 | |
|     int i, j;
 | |
| 
 | |
|     if (!spapr) {
 | |
|         error_setg(errp, TYPE_SPAPR_CPU_CORE " needs a pseries machine");
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     sc->threads = g_new(PowerPCCPU *, cc->nr_threads);
 | |
|     for (i = 0; i < cc->nr_threads; i++) {
 | |
|         char id[32];
 | |
|         CPUState *cs;
 | |
|         PowerPCCPU *cpu;
 | |
| 
 | |
|         obj = object_new(scc->cpu_type);
 | |
| 
 | |
|         cs = CPU(obj);
 | |
|         cpu = sc->threads[i] = POWERPC_CPU(obj);
 | |
|         cs->cpu_index = cc->core_id + i;
 | |
|         spapr_set_vcpu_id(cpu, cs->cpu_index, &local_err);
 | |
|         if (local_err) {
 | |
|             goto err;
 | |
|         }
 | |
| 
 | |
| 
 | |
|         /* Set NUMA node for the threads belonged to core  */
 | |
|         cpu->node_id = sc->node_id;
 | |
| 
 | |
|         snprintf(id, sizeof(id), "thread[%d]", i);
 | |
|         object_property_add_child(OBJECT(sc), id, obj, &local_err);
 | |
|         if (local_err) {
 | |
|             goto err;
 | |
|         }
 | |
|         object_unref(obj);
 | |
|     }
 | |
| 
 | |
|     for (j = 0; j < cc->nr_threads; j++) {
 | |
|         obj = OBJECT(sc->threads[j]);
 | |
| 
 | |
|         spapr_cpu_core_realize_child(obj, spapr, &local_err);
 | |
|         if (local_err) {
 | |
|             goto err;
 | |
|         }
 | |
|     }
 | |
|     return;
 | |
| 
 | |
| err:
 | |
|     while (--i >= 0) {
 | |
|         obj = OBJECT(sc->threads[i]);
 | |
|         object_unparent(obj);
 | |
|     }
 | |
|     g_free(sc->threads);
 | |
|     error_propagate(errp, local_err);
 | |
| }
 | |
| 
 | |
| static Property spapr_cpu_core_properties[] = {
 | |
|     DEFINE_PROP_INT32("node-id", sPAPRCPUCore, node_id, CPU_UNSET_NUMA_NODE_ID),
 | |
|     DEFINE_PROP_END_OF_LIST()
 | |
| };
 | |
| 
 | |
| static void spapr_cpu_core_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(oc);
 | |
|     sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_CLASS(oc);
 | |
| 
 | |
|     dc->realize = spapr_cpu_core_realize;
 | |
|     dc->unrealize = spapr_cpu_core_unrealizefn;
 | |
|     dc->props = spapr_cpu_core_properties;
 | |
|     scc->cpu_type = data;
 | |
| }
 | |
| 
 | |
| #define DEFINE_SPAPR_CPU_CORE_TYPE(cpu_model) \
 | |
|     {                                                   \
 | |
|         .parent = TYPE_SPAPR_CPU_CORE,                  \
 | |
|         .class_data = (void *) POWERPC_CPU_TYPE_NAME(cpu_model), \
 | |
|         .class_init = spapr_cpu_core_class_init,        \
 | |
|         .name = SPAPR_CPU_CORE_TYPE_NAME(cpu_model),    \
 | |
|     }
 | |
| 
 | |
| static const TypeInfo spapr_cpu_core_type_infos[] = {
 | |
|     {
 | |
|         .name = TYPE_SPAPR_CPU_CORE,
 | |
|         .parent = TYPE_CPU_CORE,
 | |
|         .abstract = true,
 | |
|         .instance_size = sizeof(sPAPRCPUCore),
 | |
|         .class_size = sizeof(sPAPRCPUCoreClass),
 | |
|     },
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("970_v2.2"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.0"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.1"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power5+_v2.1"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power7_v2.3"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power8e_v2.1"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power8nvl_v1.0"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power9_v1.0"),
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("power9_v2.0"),
 | |
| #ifdef CONFIG_KVM
 | |
|     DEFINE_SPAPR_CPU_CORE_TYPE("host"),
 | |
| #endif
 | |
| };
 | |
| 
 | |
| DEFINE_TYPES(spapr_cpu_core_type_infos)
 |