diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-09-05 09:43:56 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-09-05 09:43:56 +0200 |
| commit | 0ca4ed3c1999bbaf058e1492b68c4db261d74b35 (patch) | |
| tree | c41a4491deca2d3e30d9e623947b4c64b84498c3 /kernel | |
| parent | c245268812a63bae0610de9a416dc7de97edde07 (diff) | |
fixed APs start address and reenabled smp.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kernel.c | 4 | ||||
| -rw-r--r-- | kernel/smp.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 45f798d..a9f8e54 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -118,6 +118,7 @@ void kernel_main(uint32_t initial_stack, int mp) if(!mp_find(&procdata)) panic(FOOLOS_MODULE_NAME,"ACPI and MP search failed! I do not want to continue!"); + // // Memory Init // @@ -132,7 +133,8 @@ void kernel_main(uint32_t initial_stack, int mp) // // Start the other Processors (also before paging !) // -// smp_start_aps(&procdata,0x80000); // starts at 0x90000 + smp_log_procdata(&procdata); + smp_start_aps(&procdata,0x80000); // starts at 0x90000 // but it will be copied over mbr // diff --git a/kernel/smp.c b/kernel/smp.c index 0543943..1721382 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -13,7 +13,7 @@ void smp_log_procdata(smp_processors *procdata) log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"---- smp -----"); for(int i=0;i<procdata->processors;i++) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"cpu %d : local_apic_id: 0x%X bps: %s local_apic_addr:0x%08X",i,procdata->local_apic_id[i],i==procdata->boot?"yes":"no",procdata->local_apic_address); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"cpu %d, apic_id: 0x%X, bps: %s, apic_addr:0x%08X",i,procdata->local_apic_id[i],i==procdata->boot?"yes":"no",procdata->local_apic_address); } } |