sbsa-ref: allow to use Cortex-A53/57/72 cpus
Trusted Firmware now supports A72 on sbsa-ref by default [1] so enable it for QEMU as well. A53 was already enabled there. 1. https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7117 Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20201120141705.246690-1-marcin.juszkiewicz@linaro.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
d36d711213
commit
ce3adffc3c
|
@ -143,6 +143,24 @@ static const int sbsa_ref_irqmap[] = {
|
||||||
[SBSA_GWDT] = 16,
|
[SBSA_GWDT] = 16,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const char * const valid_cpus[] = {
|
||||||
|
ARM_CPU_TYPE_NAME("cortex-a53"),
|
||||||
|
ARM_CPU_TYPE_NAME("cortex-a57"),
|
||||||
|
ARM_CPU_TYPE_NAME("cortex-a72"),
|
||||||
|
};
|
||||||
|
|
||||||
|
static bool cpu_type_valid(const char *cpu)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < ARRAY_SIZE(valid_cpus); i++) {
|
||||||
|
if (strcmp(cpu, valid_cpus[i]) == 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx)
|
static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx)
|
||||||
{
|
{
|
||||||
uint8_t clustersz = ARM_DEFAULT_CPUS_PER_CLUSTER;
|
uint8_t clustersz = ARM_DEFAULT_CPUS_PER_CLUSTER;
|
||||||
|
@ -649,9 +667,8 @@ static void sbsa_ref_init(MachineState *machine)
|
||||||
const CPUArchIdList *possible_cpus;
|
const CPUArchIdList *possible_cpus;
|
||||||
int n, sbsa_max_cpus;
|
int n, sbsa_max_cpus;
|
||||||
|
|
||||||
if (strcmp(machine->cpu_type, ARM_CPU_TYPE_NAME("cortex-a57"))) {
|
if (!cpu_type_valid(machine->cpu_type)) {
|
||||||
error_report("sbsa-ref: CPU type other than the built-in "
|
error_report("mach-virt: CPU type %s not supported", machine->cpu_type);
|
||||||
"cortex-a57 not supported");
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue