i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now properly allocates the kernel stacks of the other CPUs.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10057 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-11-19 22:04:12 +00:00
parent 0641ddaabc
commit 50f99a085e
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/platform/bios_ia32/smp_boot.c
+13 -18
View File
@@ -1,18 +1,21 @@
/* /*
** Copyright 2001, Travis Geiselbrecht. All rights reserved. * Copyright 2004, Axel Dörfler, [email protected].
** Distributed under the terms of the NewOS License. * Distributed under the terms of the MIT License.
** *
** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2001, Travis Geiselbrecht. All rights reserved.
** Distributed under the terms of the OpenBeOS License. * Distributed under the terms of the NewOS License.
*/ */
// ToDo: this should be integrated better with the rest of the loader! // ToDo: this should be integrated better with the rest of the loader!
#include "mmu.h"
#include <KernelExport.h> #include <KernelExport.h>
#include <boot/stage2.h> #include <boot/stage2.h>
#include <arch/x86/smp_apic.h> #include <arch/x86/smp_apic.h>
#include <kernel.h>
#include <string.h> #include <string.h>
@@ -28,7 +31,6 @@
#define ADDR_MASK 0xfffff000 #define ADDR_MASK 0xfffff000
#define DEFAULT_PAGE_FLAGS (1 | 2) // present/rw #define DEFAULT_PAGE_FLAGS (1 | 2) // present/rw
#define STACK_SIZE 2
struct gdt_idt_descr { struct gdt_idt_descr {
uint16 a; uint16 a;
@@ -357,27 +359,20 @@ smp_boot_all_cpus(void)
uint32 j; uint32 j;
// create a final stack the trampoline code will put the ap processor on // create a final stack the trampoline code will put the ap processor on
gKernelArgs.cpu_kstack[i].start = gKernelArgs.virtual_allocated_range[0].start + gKernelArgs.virtual_allocated_range[0].size; gKernelArgs.cpu_kstack[i].start = (addr_t)mmu_allocate(NULL, KERNEL_STACK_SIZE);
gKernelArgs.cpu_kstack[i].size = STACK_SIZE * B_PAGE_SIZE; gKernelArgs.cpu_kstack[i].size = KERNEL_STACK_SIZE;
for (j = 0; j < gKernelArgs.cpu_kstack[i].size / B_PAGE_SIZE; j++) {
// map the pages in
map_page(gKernelArgs.physical_allocated_range[0].start + gKernelArgs.physical_allocated_range[0].size,
gKernelArgs.virtual_allocated_range[0].start + gKernelArgs.virtual_allocated_range[0].size);
gKernelArgs.physical_allocated_range[0].size += B_PAGE_SIZE;
gKernelArgs.virtual_allocated_range[0].size += B_PAGE_SIZE;
}
// set this stack up // set this stack up
final_stack = (uint32 *)gKernelArgs.cpu_kstack[i].start; final_stack = (uint32 *)gKernelArgs.cpu_kstack[i].start;
memset(final_stack, 0, STACK_SIZE * B_PAGE_SIZE); memset(final_stack, 0, KERNEL_STACK_SIZE);
final_stack_ptr = (final_stack + (STACK_SIZE * B_PAGE_SIZE) / sizeof(uint32)) - 1; final_stack_ptr = (final_stack + KERNEL_STACK_SIZE / sizeof(uint32)) - 1;
*final_stack_ptr = (uint32)&smp_cpu_ready; *final_stack_ptr = (uint32)&smp_cpu_ready;
final_stack_ptr--; final_stack_ptr--;
// set the trampoline stack up // set the trampoline stack up
tramp_stack_ptr = (uint32 *)(trampoline_stack + B_PAGE_SIZE - 4); tramp_stack_ptr = (uint32 *)(trampoline_stack + B_PAGE_SIZE - 4);
// final location of the stack // final location of the stack
*tramp_stack_ptr = ((uint32)final_stack) + STACK_SIZE * B_PAGE_SIZE - sizeof(uint32); *tramp_stack_ptr = ((uint32)final_stack) + KERNEL_STACK_SIZE - sizeof(uint32);
tramp_stack_ptr--; tramp_stack_ptr--;
// page dir // page dir
*tramp_stack_ptr = gKernelArgs.arch_args.phys_pgdir; *tramp_stack_ptr = gKernelArgs.arch_args.phys_pgdir;