D53327.1775437285.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53327.1775437285.diff
View Options

	diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c
	--- a/sys/dev/ofw/ofw_cpu.c
	+++ b/sys/dev/ofw/ofw_cpu.c
	@@ -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 @@
	} 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 @@
	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) {