Index: arch/ppc32/include/mm/memory_init.h =================================================================== --- arch/ppc32/include/mm/memory_init.h (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/ppc32/include/mm/memory_init.h (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -30,9 +30,8 @@ #define __ppc32_MEMORY_INIT_H__ -#include +#include size_t get_memory_size(void); void preboot_read_config(void); -void ppc_init_zones(void); #endif Index: arch/ppc32/src/mm/frame.c =================================================================== --- arch/ppc32/src/mm/frame.c (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/ppc32/src/mm/frame.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -30,10 +30,9 @@ #include #include -#include -#include +#include void frame_arch_init(void) { - ppc_init_zones(); + ofw_init_zones(); /* First is exception vector, second is 'implementation specific' */ frame_mark_unavailable(0, 2); Index: arch/ppc32/src/mm/memory_init.c =================================================================== --- arch/ppc32/src/mm/memory_init.c (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/ppc32/src/mm/memory_init.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -28,63 +28,14 @@ #include -#include -#include -#include -#include - -#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; - } -} +#include +#include 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); - } -} Index: arch/sparc64/Makefile.inc =================================================================== --- arch/sparc64/Makefile.inc (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/sparc64/Makefile.inc (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -69,4 +69,5 @@ 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 \ Index: arch/sparc64/include/mm/memory_init.h =================================================================== --- arch/sparc64/include/mm/memory_init.h (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/sparc64/include/mm/memory_init.h (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -30,7 +30,7 @@ #define __sparc64_MEMORY_INIT_H__ -#include +#include -#define get_memory_size() CONFIG_MEMORY_SIZE +extern size_t get_memory_size(void); #endif Index: arch/sparc64/include/trap/mmu.h =================================================================== --- arch/sparc64/include/trap/mmu.h (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/sparc64/include/trap/mmu.h (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -40,4 +40,5 @@ #define FAST_MMU_HANDLER_SIZE 128 +#ifdef __ASM__ .macro FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER call fast_instruction_access_mmu_miss @@ -57,4 +58,5 @@ retry .endm +#endif /* __ASM__ */ #endif Index: arch/sparc64/src/mm/frame.c =================================================================== --- arch/sparc64/src/mm/frame.c (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/sparc64/src/mm/frame.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -28,4 +28,5 @@ #include +#include #include #include @@ -34,5 +35,5 @@ void frame_arch_init(void) { - zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0); + ofw_init_zones(); /* Index: arch/sparc64/src/start.S =================================================================== --- arch/sparc64/src/start.S (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/sparc64/src/start.S (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -99,4 +99,7 @@ stx %o4, [%l0] + call ofw_init_memmap + nop + call main_bsp nop Index: arch/sparc64/src/trap/trap.c =================================================================== --- arch/sparc64/src/trap/trap.c (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ arch/sparc64/src/trap/trap.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -32,4 +32,5 @@ #include #include +#include #include #include @@ -81,4 +82,17 @@ 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); +*/ + } Index: genarch/Makefile.inc =================================================================== --- genarch/Makefile.inc (revision effee6fbb246d1c32b76583262aed178a9f84add) +++ genarch/Makefile.inc (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -31,5 +31,6 @@ ifeq ($(CONFIG_OFW),y) GENARCH_SOURCES += \ - genarch/src/ofw/ofw.c + genarch/src/ofw/ofw.c \ + genarch/src/ofw/memory_init.c endif ifeq ($(CONFIG_ACPI),y) Index: genarch/include/ofw/memory_init.h =================================================================== --- genarch/include/ofw/memory_init.h (revision 778c1e13481e0b5687b788ccd214d7053813f24c) +++ genarch/include/ofw/memory_init.h (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __OFW_MEMORY_INIT_H__ +#define __OFW_MEMORY_INIT_H__ + +#include + +extern void ofw_init_memmap(void); +extern size_t ofw_get_memory_size(void); +extern void ofw_init_zones(void); + +#endif Index: genarch/src/ofw/memory_init.c =================================================================== --- genarch/src/ofw/memory_init.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) +++ genarch/src/ofw/memory_init.c (revision 778c1e13481e0b5687b788ccd214d7053813f24c) @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2005 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define MEMMAP_MAX_RECORDS 32 + +typedef struct { + __address start; + size_t size; +} memmap_t; + +static memmap_t memmap[MEMMAP_MAX_RECORDS]; +size_t total_mem = 0; + +void ofw_init_memmap(void) +{ + int i; + int ret; + + phandle handle = ofw_find_device("/memory"); + if (handle == -1) + panic("No RAM\n"); + + 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; + } +} + +size_t ofw_get_memory_size(void) +{ + return total_mem; +} + +void ofw_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); + } +}