mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-24 00:45:38 +00:00
target/arm: Add a core count property
The cortex A53 TRM specifies that bits 24 and 25 of the L2CTLR register specify the number of cores in the processor, not the total number of cores in the system. To report this correctly on machines with multiple CPU clusters (ARM's big.LITTLE or Xilinx's ZynqMP) we need to allow the machine to overwrite this value. To do this let's add an optional property. Backports commit f9a697112ee64180354f98309a5d6b691cc8699d from qemu
This commit is contained in:
parent
025e354370
commit
44d8c38138
|
@ -714,6 +714,11 @@ static int arm_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err
|
|||
cs->num_ases = 1;
|
||||
}
|
||||
cpu_address_space_init(cs, ARMASIdx_NS, "cpu-memory", cs->memory);
|
||||
|
||||
/* No core_count specified, default to smp_cpus. */
|
||||
if (cpu->core_count == -1) {
|
||||
cpu->core_count = smp_cpus;
|
||||
}
|
||||
#endif
|
||||
|
||||
init_cpreg_list(cpu);
|
||||
|
|
|
@ -743,6 +743,11 @@ typedef struct ARMCPU {
|
|||
/* Uniprocessor system with MP extensions */
|
||||
bool mp_is_up;
|
||||
|
||||
/* Specify the number of cores in this CPU cluster. Used for the L2CTLR
|
||||
* register.
|
||||
*/
|
||||
int32_t core_count;
|
||||
|
||||
/* The instance init functions for implementation-specific subclasses
|
||||
* set these fields to specify the implementation-dependent values of
|
||||
* various constant registers and reset values of non-constant
|
||||
|
|
|
@ -38,8 +38,10 @@ static inline QEMU_UNUSED_FUNC void unset_feature(CPUARMState *env, int feature)
|
|||
#ifndef CONFIG_USER_ONLY
|
||||
static uint64_t a57_a53_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
|
||||
{
|
||||
/* Number of processors is in [25:24]; otherwise we RAZ */
|
||||
return (smp_cpus - 1) << 24;
|
||||
ARMCPU *cpu = arm_env_get_cpu(env);
|
||||
|
||||
/* Number of cores is in [25:24]; otherwise we RAZ */
|
||||
return (cpu->core_count - 1) << 24;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue