Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2025-02-16 13:48:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

smp: Add support for ADT from old FW

Browse source 
Old ADT does not have /cpus/cpu<n>/cpu-impl-reg, and the value is in
/arm-io/pmgr/reg[2*n+2].

Signed-off-by: Nick Chan <towinchenmi@gmail.com>
This commit is contained in:
Nick Chan 2024-08-25 15:33:03 +08:00 • committed by Hector Martin
parent cb0ceb4ee8
commit 3b7fd2ce5e
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/smp.c
View file

@ -223,6 +223,12 @@ void smp_start_secondaries(void)
return; return;
} }
int arm_io_node;
if ((arm_io_node = adt_path_offset(adt, "/arm-io")) < 0) {
printf("Error getting /arm-io node\n");
return;
}
int node = adt_path_offset(adt, "/cpus"); int node = adt_path_offset(adt, "/cpus");
if (node < 0) { if (node < 0) {
printf("Error getting /cpus node\n"); printf("Error getting /cpus node\n");
@ -275,7 +281,9 @@ void smp_start_secondaries(void)
u32 cpu_id; u32 cpu_id;
if (ADT_GETPROP(adt, node, "cpu-id", &cpu_id) < 0) if (ADT_GETPROP(adt, node, "cpu-id", &cpu_id) < 0)
continue; if (ADT_GETPROP(adt, node, "reg", &cpu_id) < 0)
continue;
if (cpu_id >= MAX_CPUS) { if (cpu_id >= MAX_CPUS) {
printf("cpu-id %d exceeds max CPU count %d: increase MAX_CPUS\n", cpu_id, MAX_CPUS); printf("cpu-id %d exceeds max CPU count %d: increase MAX_CPUS\n", cpu_id, MAX_CPUS);
continue; continue;
@ -323,8 +331,16 @@ void smp_start_secondaries(void)
u64 cpu_impl_reg[2]; u64 cpu_impl_reg[2];
if (ADT_GETPROP(adt, cpu_node, "reg", &reg) < 0) if (ADT_GETPROP(adt, cpu_node, "reg", &reg) < 0)
continue; continue;
if (ADT_GETPROP_ARRAY(adt, cpu_node, "cpu-impl-reg", cpu_impl_reg) < 0) if (ADT_GETPROP_ARRAY(adt, cpu_node, "cpu-impl-reg", cpu_impl_reg) < 0) {
continue; u32 reg_len;
const u64 *regs = adt_getprop(adt, arm_io_node, "reg", &reg_len);
if (!regs)
continue;
u32 index = 2 * i + 2;
if (reg_len < index)
continue;
memcpy(cpu_impl_reg, &regs[index], 16);
}
u8 core = FIELD_GET(CPU_REG_CORE, reg); u8 core = FIELD_GET(CPU_REG_CORE, reg);
u8 cluster = FIELD_GET(CPU_REG_CLUSTER, reg); u8 cluster = FIELD_GET(CPU_REG_CLUSTER, reg);
@ -339,6 +355,11 @@ void smp_start_secondaries(void)
void smp_stop_secondaries(bool deep_sleep) void smp_stop_secondaries(bool deep_sleep)
{ {
printf("Stopping secondary CPUs...\n"); printf("Stopping secondary CPUs...\n");
int arm_io_node;
if ((arm_io_node = adt_path_offset(adt, "/arm-io")) < 0) {
printf("Error getting /arm-io node\n");
return;
}
smp_set_wfe_mode(true); smp_set_wfe_mode(true);
for (int i = 0; i < MAX_CPUS; i++) { for (int i = 0; i < MAX_CPUS; i++) {
@ -351,8 +372,16 @@ void smp_stop_secondaries(bool deep_sleep)
u64 cpu_impl_reg[2]; u64 cpu_impl_reg[2];
if (ADT_GETPROP(adt, node, "reg", &reg) < 0) if (ADT_GETPROP(adt, node, "reg", &reg) < 0)
continue; continue;
if (ADT_GETPROP_ARRAY(adt, node, "cpu-impl-reg", cpu_impl_reg) < 0) if (ADT_GETPROP_ARRAY(adt, node, "cpu-impl-reg", cpu_impl_reg) < 0) {
continue; u32 reg_len;
const u64 *regs = adt_getprop(adt, arm_io_node, "reg", &reg_len);
if (!regs)
continue;
u32 index = 2 * i + 2;
if (reg_len < index)
continue;
memcpy(cpu_impl_reg, &regs[index], 16);
}
u8 core = FIELD_GET(CPU_REG_CORE, reg); u8 core = FIELD_GET(CPU_REG_CORE, reg);
u8 cluster = FIELD_GET(CPU_REG_CLUSTER, reg); u8 cluster = FIELD_GET(CPU_REG_CLUSTER, reg);