upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-07-16 12:33:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dev/ofw: Teach ofw_cpu to find the pcpu on arm64

Browse source 
Use the midr value to ensure we find the correct PCPU pointer on arm64.

Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D53327

(cherry picked from commit 6b12b94c8fd2d5d85060d02620ed807ac6233f71)
This commit is contained in:
Andrew Turner 2025-11-18 18:00:29 +00:00
parent 6e890c4602
commit 8dca461b1e
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sys/dev/ofw/ofw_cpu.c
View file

@ -35,6 +35,7 @@
#include <sys/malloc.h>
#include <sys/bus.h>
#include <sys/cpu.h>
#include <sys/smp.h>
#include <machine/bus.h>
#include <dev/ofw/openfirm.h>
@ -280,6 +281,28 @@ ofw_cpu_attach(device_t dev)
} else
sc->sc_reg_valid = true;
#ifdef __aarch64__
if (sc->sc_reg_valid) {
uint64_t target_mpidr;
target_mpidr = sc->sc_reg[0];
if (psc->sc_addr_cells > 1) {
MPASS(psc->sc_addr_cells == 2);
target_mpidr <<= 32;
target_mpidr |= sc->sc_reg[1];
}
target_mpidr &= CPU_AFF_MASK;
for (int cpu = 0; cpu <= mp_maxid; cpu++) {
if (cpuid_to_pcpu[cpu] == NULL)
continue;
if (cpuid_to_pcpu[cpu]->pc_mpidr == target_mpidr) {
sc->sc_cpu_pcpu = cpuid_to_pcpu[cpu];
break;
}
}
}
#endif
#ifdef __powerpc__
/*
* On powerpc, "interrupt-servers" denotes a SMT CPU. Look for any
@ -315,9 +338,10 @@ ofw_cpu_attach(device_t dev)
device_printf(dev, "No CPU found for this device.\n");
return (ENXIO);
}
} else
}
#endif
sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev));
if (sc->sc_cpu_pcpu == NULL)
sc->sc_cpu_pcpu = pcpu_find(device_get_unit(dev));
if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) {
if (get_freq_from_clk(dev, sc) != 0) {