/kernel/trunk/arch/sparc64/include/trap/mmu.h |
---|
39,6 → 39,7 |
#define FAST_MMU_HANDLER_SIZE 128 |
#ifdef __ASM__ |
.macro FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER |
call fast_instruction_access_mmu_miss |
nop |
56,5 → 57,6 |
nop |
retry |
.endm |
#endif /* __ASM__ */ |
#endif |
/kernel/trunk/arch/sparc64/include/mm/memory_init.h |
---|
29,8 → 29,8 |
#ifndef __sparc64_MEMORY_INIT_H__ |
#define __sparc64_MEMORY_INIT_H__ |
#include <config.h> |
#include <typedefs.h> |
#define get_memory_size() CONFIG_MEMORY_SIZE |
extern size_t get_memory_size(void); |
#endif |
/kernel/trunk/arch/sparc64/Makefile.inc |
---|
68,6 → 68,7 |
arch/$(ARCH)/src/mm/frame.c \ |
arch/$(ARCH)/src/mm/page.c \ |
arch/$(ARCH)/src/mm/tlb.c \ |
arch/$(ARCH)/src/mm/memory_init.c \ |
arch/$(ARCH)/src/sparc64.c \ |
arch/$(ARCH)/src/start.S \ |
arch/$(ARCH)/src/trap/trap_table.S \ |
/kernel/trunk/arch/sparc64/src/trap/trap.c |
---|
31,6 → 31,7 |
#include <arch/trap/regwin.h> |
#include <arch/trap/exception.h> |
#include <arch/trap/interrupt.h> |
#include <arch/trap/mmu.h> |
#include <arch/asm.h> |
#include <memstr.h> |
#include <debug.h> |
80,6 → 81,19 |
trap_install_handler(TT_INTERRUPT_LEVEL_14, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); |
trap_install_handler(TT_INTERRUPT_LEVEL_15, INTERRUPT_LEVEL_N_HANDLER_SIZE, false); |
trap_install_handler(TT_INTERRUPT_VECTOR_TRAP, INTERRUPT_VECTOR_TRAP_HANDLER_SIZE, false); |
/* |
* Kernel must become independent on Open Firmware calls before MMU handlers are enabled. |
*/ |
/* |
trap_install_handler(TT_FAST_INSTRUCTION_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, false); |
trap_install_handler(TT_FAST_DATA_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, false); |
trap_install_handler(TT_FAST_DATA_ACCESS_PROTECTION, FAST_MMU_HANDLER_SIZE, false); |
trap_install_handler(TT_FAST_INSTRUCTION_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, true); |
trap_install_handler(TT_FAST_DATA_ACCESS_MMU_MISS, FAST_MMU_HANDLER_SIZE, true); |
trap_install_handler(TT_FAST_DATA_ACCESS_PROTECTION, FAST_MMU_HANDLER_SIZE, true); |
*/ |
} |
/** Copy trap handler to active trap table. |
/kernel/trunk/arch/sparc64/src/mm/frame.c |
---|
27,6 → 27,7 |
*/ |
#include <arch/mm/frame.h> |
#include <genarch/ofw/memory_init.h> |
#include <mm/frame.h> |
#include <config.h> |
#include <align.h> |
33,7 → 34,7 |
void frame_arch_init(void) |
{ |
zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0); |
ofw_init_zones(); |
/* |
* Workaround to prevent slab allocator from allocating frame 0. |
/kernel/trunk/arch/sparc64/src/start.S |
---|
98,6 → 98,9 |
call ofw_init |
stx %o4, [%l0] |
call ofw_init_memmap |
nop |
call main_bsp |
nop |
/kernel/trunk/arch/ppc32/include/mm/memory_init.h |
---|
29,10 → 29,9 |
#ifndef __ppc32_MEMORY_INIT_H__ |
#define __ppc32_MEMORY_INIT_H__ |
#include <config.h> |
#include <typedefs.h> |
size_t get_memory_size(void); |
void preboot_read_config(void); |
void ppc_init_zones(void); |
#endif |
/kernel/trunk/arch/ppc32/src/mm/frame.c |
---|
29,12 → 29,11 |
#include <arch/mm/frame.h> |
#include <arch/mm/memory_init.h> |
#include <mm/frame.h> |
#include <config.h> |
#include <panic.h> |
#include <genarch/ofw/memory_init.h> |
void frame_arch_init(void) |
{ |
ppc_init_zones(); |
ofw_init_zones(); |
/* First is exception vector, second is 'implementation specific' */ |
frame_mark_unavailable(0, 2); |
} |
/kernel/trunk/arch/ppc32/src/mm/memory_init.c |
---|
27,64 → 27,15 |
*/ |
#include <arch/mm/memory_init.h> |
#include <genarch/ofw/ofw.h> |
#include <panic.h> |
#include <mm/frame.h> |
#include <align.h> |
#include <genarch/ofw/memory_init.h> |
#include <typedefs.h> |
#define MEMMAP_MAX_RECORDS 32 |
typedef struct { |
__u32 start; |
__u32 size; |
} memmap_t; |
static memmap_t memmap[MEMMAP_MAX_RECORDS]; |
size_t total_mem = 0; |
static void init_memmap(void) |
{ |
int i; |
phandle handle = ofw_find_device("/memory"); |
if (handle == -1) |
panic("No RAM\n"); |
size_t ret = ofw_get_property(handle, "reg", &memmap, sizeof(memmap)); |
if (ret == -1) |
panic("Device /memory has no reg property\n"); |
for (i = 0; i < MEMMAP_MAX_RECORDS; i++) { |
if (memmap[i].size == 0) |
break; |
total_mem += memmap[i].size; |
} |
} |
void preboot_read_config(void) |
{ |
init_memmap(); |
ofw_init_memmap(); |
} |
size_t get_memory_size(void) |
{ |
return total_mem; |
return ofw_get_memory_size(); |
} |
void ppc_init_zones(void) |
{ |
int i; |
pfn_t confdata; |
for (i = 0; i < MEMMAP_MAX_RECORDS; i++) { |
if (memmap[i].size == 0) |
break; |
confdata = ADDR2PFN(memmap[i].start); |
if (confdata == 0) |
confdata = 2; |
zone_create(ADDR2PFN(memmap[i].start), |
SIZE2FRAMES(ALIGN_DOWN(memmap[i].size,PAGE_SIZE)), |
confdata, 0); |
} |
} |