Changeset 778c1e1 in mainline

Timestamp:

2006-02-22T14:52:18Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7d53ef4

Parents:

effee6f

Message:

Move OFW functionality of ppc32 memory_init to genarch so that the code can also be used by sparc64.
sparc64 is now close to broken as it lacks functionality to provide identity mapping for the whole phyisical memory.

Files:

• arch/ppc32/include/mm/memory_init.h (modified) (1 diff)
• arch/ppc32/src/mm/frame.c (modified) (1 diff)
• arch/ppc32/src/mm/memory_init.c (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/mm/memory_init.h (modified) (1 diff)
• arch/sparc64/include/trap/mmu.h (modified) (2 diffs)
• arch/sparc64/src/mm/frame.c (modified) (2 diffs)
• arch/sparc64/src/start.S (modified) (1 diff)
• arch/sparc64/src/trap/trap.c (modified) (2 diffs)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/include/ofw/memory_init.h (added)
• genarch/src/ofw/memory_init.c (added)

arch/ppc32/include/mm/memory_init.h

@@ -30 +30 @@
 #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

arch/ppc32/src/mm/frame.c

@@ -30 +30 @@
 #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);

arch/ppc32/src/mm/memory_init.c

@@ -28 +28 @@
 
 #include <arch/mm/memory_init.h>
-#include <genarch/ofw/ofw.h>
-#include <panic.h>
-#include <mm/frame.h>
-#include <align.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;
-        }
-}
+#include <genarch/ofw/memory_init.h>
+#include <typedefs.h>
 
 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);
-        }
-}

arch/sparc64/Makefile.inc

@@ -69 +69 @@
         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/sparc64/include/mm/memory_init.h

@@ -30 +30 @@
 #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

arch/sparc64/include/trap/mmu.h

@@ -40 +40 @@
 #define FAST_MMU_HANDLER_SIZE                   128
 
+#ifdef __ASM__
 .macro FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER
         call fast_instruction_access_mmu_miss
@@ -57 +58 @@
         retry
 .endm
+#endif /* __ASM__ */
 
 #endif

arch/sparc64/src/mm/frame.c

@@ -28 +28 @@
 
 #include <arch/mm/frame.h>
+#include <genarch/ofw/memory_init.h>
 #include <mm/frame.h>
 #include <config.h>
@@ -34 +35 @@
 void frame_arch_init(void)
 {
-        zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
+        ofw_init_zones();
 
         /*

arch/sparc64/src/start.S

@@ -99 +99 @@
         stx %o4, [%l0]
 
+        call ofw_init_memmap
+        nop
+
         call main_bsp
         nop

arch/sparc64/src/trap/trap.c

@@ -32 +32 @@
 #include <arch/trap/exception.h>
 #include <arch/trap/interrupt.h>
+#include <arch/trap/mmu.h>
 #include <arch/asm.h>
 #include <memstr.h>
@@ -81 +82 @@
         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);
+*/
+
 }
 

genarch/Makefile.inc

@@ -31 +31 @@
 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)