Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sparc: boot cpu support

Browse Source 
There is no /cpus in the device tree on my machine, the CPUs are instead
directly under the root. So search for them there.

There is also no timebase property, and according to the docs, the
RDTICK instruction just gets CPU clock ticks, so set them to the same
value for now.

The two CPUs in my reference machine are succesfully found now, yay!

Change-Id: I5fbb4cfc98ee3b68cb2aa810816e0054a56d52d0
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1483
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
This commit is contained in:
PulkoMandy 2019-05-24 23:12:41 +02:00 committed by Adrien Destugues
parent 3c0d65cc30
commit 402f5046b0
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/system/boot/platform/openfirmware/arch/sparc/cpu.cpp
View File

@ -28,24 +28,16 @@ boot_arch_cpu_init(void)
{ {
int32 busFrequency = 0; int32 busFrequency = 0;
int root = of_finddevice("/"); intptr_t cpus = of_finddevice("/");
if (root == OF_FAILED) { if (cpus == OF_FAILED) {
printf("boot_arch_cpu_init(): Failed to open \"/\"!\n"); printf("boot_arch_cpu_init(): Failed to open \"/\"!\n");
return B_ERROR; return B_ERROR;
} }
of_getprop(root, "clock-frequency", &busFrequency, 4); of_getprop(cpus, "clock-frequency", &busFrequency, 4);
// we might find it in /cpus instead
// iterate through the "/cpus" node to find all CPUs
int cpus = of_finddevice("/cpus");
if (cpus == OF_FAILED) {
printf("boot_arch_cpu_init(): Failed to open \"/cpus\"!\n");
return B_ERROR;
}
char cpuPath[256]; char cpuPath[256];
int cookie = 0; intptr_t cookie = 0;
int cpuCount = 0; int cpuCount = 0;
while (of_get_next_device(&cookie, cpus, "cpu", cpuPath, while (of_get_next_device(&cookie, cpus, "cpu", cpuPath,
sizeof(cpuPath)) == B_OK) { sizeof(cpuPath)) == B_OK) {
@ -54,7 +46,7 @@ boot_arch_cpu_init(void)
// For the first CPU get the frequencies of CPU, bus, and time base. // For the first CPU get the frequencies of CPU, bus, and time base.
// We assume they are the same for all CPUs. // We assume they are the same for all CPUs.
if (cpuCount == 0) { if (cpuCount == 0) {
int cpu = of_finddevice(cpuPath); intptr_t cpu = of_finddevice(cpuPath);
if (cpu == OF_FAILED) { if (cpu == OF_FAILED) {
printf("boot_arch_cpu_init: Failed get CPU device node!\n"); printf("boot_arch_cpu_init: Failed get CPU device node!\n");
return B_ERROR; return B_ERROR;
@ -76,21 +68,13 @@ boot_arch_cpu_init(void)
"frequency!\n"); "frequency!\n");
return B_ERROR; return B_ERROR;
} }
int32 timeBaseFrequency;
if (of_getprop(cpu, "timebase-frequency", &timeBaseFrequency, 4)
== OF_FAILED) {
printf("boot_arch_cpu_init: Failed to get time base "
"frequency!\n");
return B_ERROR;
}
gKernelArgs.arch_args.cpu_frequency = clockFrequency; gKernelArgs.arch_args.cpu_frequency = clockFrequency;
gKernelArgs.arch_args.bus_frequency = busFrequency; gKernelArgs.arch_args.bus_frequency = busFrequency;
gKernelArgs.arch_args.time_base_frequency = timeBaseFrequency; gKernelArgs.arch_args.time_base_frequency = clockFrequency;
TRACE((" CPU clock frequency: %d\n", clockFrequency)); TRACE((" CPU clock frequency: %d\n", clockFrequency));
TRACE((" bus clock frequency: %d\n", busFrequency)); TRACE((" bus clock frequency: %d\n", busFrequency));
TRACE((" time base frequency: %d\n", timeBaseFrequency));
} }
cpuCount++; cpuCount++;