/kernel/trunk/arch/amd64/include/types.h |
---|
39,6 → 39,7 |
typedef unsigned long long __u64; |
typedef __u64 __address; |
typedef __u64 pfn_t; |
/* Flags of processor (return value of interrupts_disable()) */ |
typedef __u64 ipl_t; |
/kernel/trunk/arch/amd64/src/pm.c |
---|
37,7 → 37,7 |
#include <config.h> |
#include <memstr.h> |
#include <mm/heap.h> |
#include <mm/slab.h> |
#include <debug.h> |
/* |
/kernel/trunk/arch/amd64/src/mm/page.c |
---|
44,7 → 44,7 |
if (config.cpu_active == 1) { |
page_mapping_operations = &pt_mapping_operations; |
/* |
* PA2KA(identity) mapping for all frames. |
*/ |
51,7 → 51,6 |
for (cur = 0; cur < last_frame; cur += FRAME_SIZE) { |
page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_CACHEABLE | PAGE_EXEC); |
} |
exc_register(14, "page_fault", (iroutine)page_fault); |
write_cr3((__address) AS_KERNEL->page_table); |
} |
/kernel/trunk/arch/mips32/include/types.h |
---|
51,4 → 51,6 |
typedef union pte pte_t; |
typedef __u32 pfn_t; |
#endif |
/kernel/trunk/arch/mips32/Makefile.inc |
---|
73,6 → 73,8 |
TOOLCHAIN_DIR = /usr/local/mips/bin |
KERNEL_LOAD_ADDRESS = 0x88002000 |
CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -march=r4600 |
INIT_ADDRESS = 0 |
INIT_SIZE = 0 |
endif |
ifeq ($(MIPS_MACHINE),lgxemul) |
BFD_NAME=elf32-tradlittlemips |
/kernel/trunk/arch/mips32/src/mm/frame.c |
---|
43,12 → 43,9 |
*/ |
void frame_arch_init(void) |
{ |
/* Blacklist first 4KB, exception vector */ |
frame_region_not_free(0, FRAME_SIZE); |
if (arc_enabled()) |
arc_frame_init(); |
else |
zone_create_in_region(KA2PA(KERNEL_LOAD_ADDRESS), |
(config.memory_size & ~(FRAME_SIZE-1))); |
else { |
zone_create(1, (config.memory_size >> PAGE_WIDTH)-1,1,0); |
} |
} |
/kernel/trunk/arch/mips32/src/drivers/arc.c |
---|
303,7 → 303,10 |
basesize = ALIGN_DOWN(basesize, FRAME_SIZE); |
total += basesize; |
zone_create_in_region(base, basesize); |
zone_create(ADDR2PFN(base), |
SIZE2PFN(ALIGN_DOWN(basesize,FRAME_SIZE)), |
ADDR2PFN(base),0); |
} |
desc = arc_entry->getmemorydescriptor(desc); |
} |
/kernel/trunk/arch/mips32/src/mips32.c |
---|
95,13 → 95,13 |
debugger_init(); |
arc_print_memory_map(); |
arc_print_devices(); |
/* Setup usermode...*/ |
// config.init_addr = INIT_ADDRESS; |
// config.init_size = INIT_SIZE; |
} |
void arch_post_mm_init(void) |
{ |
/* Setup usermode...*/ |
config.init_addr = INIT_ADDRESS; |
config.init_size = INIT_SIZE; |
} |
void arch_pre_smp_init(void) |
/kernel/trunk/arch/ia32/include/types.h |
---|
39,6 → 39,7 |
typedef long long __u64; |
typedef __u32 __address; |
typedef __u32 pfn_t; |
typedef __u32 ipl_t; |
/kernel/trunk/arch/ia32/src/pm.c |
---|
35,7 → 35,7 |
#include <arch/context.h> |
#include <panic.h> |
#include <arch/mm/page.h> |
#include <mm/heap.h> |
#include <mm/slab.h> |
#include <memstr.h> |
#include <arch/boot/boot.h> |
#include <interrupt.h> |
/kernel/trunk/arch/ia32/src/smp/smp.c |
---|
43,7 → 43,7 |
#include <arch/asm.h> |
#include <mm/frame.h> |
#include <mm/page.h> |
#include <mm/heap.h> |
#include <mm/slab.h> |
#include <mm/as.h> |
#include <print.h> |
#include <memstr.h> |
/kernel/trunk/arch/ia32/src/mm/frame.c |
---|
35,39 → 35,101 |
#include <panic.h> |
#include <debug.h> |
#include <align.h> |
#include <macros.h> |
#include <print.h> |
#include <console/cmd.h> |
#include <console/kconsole.h> |
size_t hardcoded_unmapped_ktext_size = 0; |
size_t hardcoded_unmapped_kdata_size = 0; |
__address last_frame = 0; |
static void init_e820_memory(pfn_t minconf) |
{ |
int i; |
pfn_t start, size,conf; |
for (i = 0; i < e820counter; i++) { |
if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) { |
start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, |
FRAME_SIZE)); |
size = SIZE2PFN(ALIGN_DOWN(e820table[i].size, |
FRAME_SIZE)); |
if (minconf < start || minconf >= start+size) |
conf = start; |
else |
conf = minconf; |
zone_create(start,size, conf, 0); |
if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE)) |
last_frame = ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE); |
} |
} |
} |
static int cmd_e820mem(cmd_arg_t *argv); |
static cmd_info_t e820_info = { |
.name = "e820list", |
.description = "List e820 memory.", |
.func = cmd_e820mem, |
.argc = 0 |
}; |
static char *e820names[] = { "invalid", "available", "reserved", |
"acpi", "nvs", "unusable" }; |
static int cmd_e820mem(cmd_arg_t *argv) |
{ |
int i; |
char *name; |
for (i = 0; i < e820counter; i++) { |
if (e820table[i].type <= MEMMAP_MEMORY_UNUSABLE) |
name = e820names[e820table[i].type]; |
else |
name = "invalid"; |
printf("%P %dB %s\n", e820table[i].base_address, |
e820table[i].size, |
name); |
} |
return 0; |
} |
void frame_arch_init(void) |
{ |
__u8 i; |
static pfn_t minconf; |
if (config.cpu_active == 1) { |
cmd_initialize(&e820_info); |
cmd_register(&e820_info); |
minconf = 1; |
#ifdef CONFIG_SMP |
minconf = max(minconf, |
ADDR2PFN(AP_BOOT_OFFSET+hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size)); |
#endif |
#ifdef CONFIG_SIMICS_FIX |
minconf = max(minconf, ADDR2PFN(0x10000)); |
#endif |
init_e820_memory(minconf); |
/* Reserve frame 0 (BIOS data) */ |
frame_region_not_free(0, FRAME_SIZE); |
frame_mark_unavailable(0, 1); |
#ifdef CONFIG_SMP |
/* Reserve AP real mode bootstrap memory */ |
frame_region_not_free(AP_BOOT_OFFSET, hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size); |
frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, |
(hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH); |
#ifdef CONFIG_SIMICS_FIX |
/* Don't know why, but this addresses help */ |
frame_region_not_free(0xf000,FRAME_SIZE); |
frame_region_not_free(0xe000,FRAME_SIZE); |
frame_region_not_free(0xd000,FRAME_SIZE); |
frame_mark_unavailable(0xd000 >> FRAME_WIDTH,3); |
#endif |
#endif |
for (i = 0; i < e820counter; i++) { |
if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) { |
zone_create_in_region(e820table[i].base_address, e820table[i].size & ~(FRAME_SIZE-1)); |
if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE)) |
last_frame = ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE); |
} |
} |
} |
} |