WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/ Rev 2725 and /trunk/kernel/ Rev 2724

Ignore whitespace Rev 2725 → Rev 2724

 /trunk/kernel/generic/src/mm/frame.c
 ,29 → 104,25
 static zones_t zones;
-/********************/
+/*********************************/
 /* Helper functions */
-/********************/
 static inline index_t frame_index(zone_t *zone, frame_t *frame)
 {
-    return (index_t) (frame - zone->frames);
+    return (index_t)(frame - zone->frames);
 }
 static inline index_t frame_index_abs(zone_t *zone, frame_t *frame)
 {
-    return (index_t) (frame - zone->frames) + zone->base;
+    return (index_t)(frame - zone->frames) + zone->base;
 }
 static inline int frame_index_valid(zone_t *zone, index_t index)
 {
-    return (index >= 0) && (index < zone->count);
+    return index >= 0 && index < zone->count;
 }
 /** Compute pfn_t from frame_t pointer & zone pointer */
 static index_t make_frame_index(zone_t *zone, frame_t *frame)
 {
-    return (frame - zone->frames);
+    return frame - zone->frames;
 }
 /** Initialize frame structure
 ,9 → 137,8
     frame->buddy_order = 0;
 }
-/**********************/
+/*************************************/
 /* Zoneinfo functions */
-/**********************/
 /**
  * Insert-sort zone into zones list
 ,19 → 154,14
     ipl = interrupts_disable();
     spinlock_lock(&zones.lock);
     /* Try to merge */
-    if (zones.count + 1 == ZONES_MAX) {
-        printf("Maximum zone count %u exceeded!\n", ZONES_MAX);
-        spinlock_unlock(&zones.lock);
-        interrupts_restore(ipl);
-        return -1;
-    }
+    if (zones.count + 1 == ZONES_MAX)
+        panic("Maximum zone(%d) count exceeded.", ZONES_MAX);
     for (i = 0; i < zones.count; i++) {
         /* Check for overflow */
         z = zones.info[i];
-        if (overlaps(newzone->base, newzone->count, z->base, z->count)) {
+        if (overlaps(newzone->base,newzone->count, z->base,
+            z->count)) {
             printf("Zones overlap!\n");
             return -1;
         }
 ,14 → 168,11
         if (newzone->base < z->base)
             break;
     }
     /* Move other zones up */
     for (j = i; j < zones.count; j++)
         zones.info[j + 1] = zones.info[j];
     zones.info[i] = newzone;
     zones.count++;
     spinlock_unlock(&zones.lock);
     interrupts_restore(ipl);
 ,9 → 181,9
 /**
  * Try to find a zone where can we find the frame
- *
  * Assume interrupts are disabled.
- *
  * @param frame Frame number contained in zone
  * @param pzone If not null, it is used as zone hint. Zone index
  *              is filled into the variable on success.
 ,7 → 900,7
             panic("Cannot find configuration data for zone.");
     }
-    z = (zone_t *) PA2KA(PFN2ADDR(confframe));
+    z = (zone_t *)PA2KA(PFN2ADDR(confframe));
     zone_construct(start, count, z, flags);
     znum = zones_add_zone(z);
     if (znum == -1)
 ,33 → 1109,7
 }
-/** Return total size of all zones
- *
- */
-uint64_t zone_total_size(void) {
-    zone_t *zone = NULL;
-    unsigned int i;
-    ipl_t ipl;
-    uint64_t total = 0;
-    ipl = interrupts_disable();
-    spinlock_lock(&zones.lock);
-    for (i = 0; i < zones.count; i++) {
-        zone = zones.info[i];
-        spinlock_lock(&zone->lock);
-        total += (uint64_t) FRAMES2SIZE(zone->count);
-        spinlock_unlock(&zone->lock);
-    }
-    spinlock_unlock(&zones.lock);
-    interrupts_restore(ipl);
-    return total;
-}
 /** Prints list of zones
  *
  */
 ,7 → 1160,7
     spinlock_lock(&zones.lock);
     for (i = 0; i < zones.count; i++) {
-        if ((i == num) || (PFN2ADDR(zones.info[i]->base) == num)) {
+        if (i == num || PFN2ADDR(zones.info[i]->base) == num) {
             zone = zones.info[i];
             break;
         }
 ,15 → 1174,15
     printf("Memory zone information\n");
     printf("Zone base address: %#.*p\n", sizeof(uintptr_t) * 2,
         PFN2ADDR(zone->base));
-    printf("Zone size: %zd frames (%zd KB)\n", zone->count,
-        SIZE2KB(FRAMES2SIZE(zone->count)));
-    printf("Allocated space: %zd frames (%zd KB)\n", zone->busy_count,
-        SIZE2KB(FRAMES2SIZE(zone->busy_count)));
-    printf("Available space: %zd frames (%zd KB)\n", zone->free_count,
-        SIZE2KB(FRAMES2SIZE(zone->free_count)));
+    printf("Zone size: %zd frames (%zdK)\n", zone->count,
+        ((zone->count) * FRAME_SIZE) >> 10);
+    printf("Allocated space: %zd frames (%zdK)\n", zone->busy_count,
+        (zone->busy_count * FRAME_SIZE) >> 10);
+    printf("Available space: %zd frames (%zdK)\n", zone->free_count,
+        (zone->free_count * FRAME_SIZE) >> 10);
     buddy_system_structure_print(zone->buddy_system, FRAME_SIZE);
     spinlock_unlock(&zone->lock);
 out:
     spinlock_unlock(&zones.lock);
     interrupts_restore(ipl);

 /trunk/kernel/generic/src/main/main.c
 ,6 → 63,7
 #include <cpu.h>
 #include <align.h>
 #include <interrupt.h>
+#include <arch/mm/memory_init.h>
 #include <mm/frame.h>
 #include <mm/page.h>
 #include <genarch/mm/page_pt.h>
 ,6 → 143,8
     config.cpu_active = 1;
     config.base = hardcoded_load_address;
+    config.memory_size = get_memory_size();
     config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
         hardcoded_kdata_size, PAGE_SIZE);
     config.stack_size = CONFIG_STACK_SIZE;
 ,22 → 219,22
     tlb_init();
     ddi_init();
     arch_post_mm_init();
     version_print();
-    printf("kernel: %.*p hardcoded_ktext_size=%zd KB, "
-        "hardcoded_kdata_size=%zd KB\n", sizeof(uintptr_t) * 2,
-        config.base, SIZE2KB(hardcoded_ktext_size),
-        SIZE2KB(hardcoded_kdata_size));
-    printf("stack:  %.*p size=%zd KB\n", sizeof(uintptr_t) * 2,
-        config.stack_base, SIZE2KB(config.stack_size));
+    printf("kernel: %.*p hardcoded_ktext_size=%zdK, "
+        "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
+        config.base, hardcoded_ktext_size >> 10,
+        hardcoded_kdata_size >> 10);
+    printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2,
+        config.stack_base, config.stack_size >> 10);
     arch_pre_smp_init();
     smp_init();
     /* Slab must be initialized after we know the number of processors. */
     slab_enable_cpucache();
-    printf("Detected %zu CPU(s), %llu MB free memory\n",
-        config.cpu_count, SIZE2MB(zone_total_size()));
+    printf("config.memory_size=%zdM\n", config.memory_size >> 20);
+    printf("config.cpu_count=%zd\n", config.cpu_count);
     cpu_init();
     calibrate_delay_loop();

 /trunk/kernel/generic/include/macros.h
 ,9 → 66,6
 /* Compute overlapping of physical addresses */
 #define PA_overlaps(x, szx, y, szy) overlaps(KA2PA(x), szx, KA2PA(y), szy)
-#define SIZE2KB(size) (size >> 10)
-#define SIZE2MB(size) (size >> 20)
 #define STRING(arg) STRING_ARG(arg)
 #define STRING_ARG(arg) #arg

 /trunk/kernel/generic/include/mm/frame.h
 ,11 → 84,6
     return (count_t) ((size - 1) >> FRAME_WIDTH) + 1;
 }
-static inline size_t FRAMES2SIZE(count_t frames)
-{
-    return (size_t) (frames << FRAME_WIDTH);
-}
 #define IS_BUDDY_ORDER_OK(index, order)     \
     ((~(((unative_t) -1) << (order)) & (index)) == 0)
 #define IS_BUDDY_LEFT_BLOCK(zone, frame)    \
 ,19 → 104,18
 extern void frame_reference_add(pfn_t pfn);
 extern int zone_create(pfn_t start, count_t count, pfn_t confframe, int flags);
-extern void *frame_get_parent(pfn_t frame, unsigned int hint);
-extern void frame_set_parent(pfn_t frame, void *data, unsigned int hint);
-extern void frame_mark_unavailable(pfn_t start, count_t count);
-extern uintptr_t zone_conf_size(count_t count);
-extern void zone_merge(unsigned int z1, unsigned int z2);
-extern void zone_merge_all(void);
-extern uint64_t zone_total_size(void);
+void *frame_get_parent(pfn_t frame, unsigned int hint);
+void frame_set_parent(pfn_t frame, void *data, unsigned int hint);
+void frame_mark_unavailable(pfn_t start, count_t count);
+uintptr_t zone_conf_size(count_t count);
+void zone_merge(unsigned int z1, unsigned int z2);
+void zone_merge_all(void);
 /*
  * Console functions
  */
 extern void zone_print_list(void);
-extern void zone_print_one(unsigned int znum);
+void zone_print_one(unsigned int znum);
 #endif

/trunk/kernel/generic/include/config.h
69,6 → 69,7
volatile count_t cpu_active; /*< Number of processors that are up and running. /

uintptr_t base;
size_t memory_size; /*< Size of detected memory in bytes. /
size_t kernel_size; /*< Size of memory in bytes taken by kernel and stack /

uintptr_t stack_base; /*< Base adddress of initial stack /

 /trunk/kernel/arch/ppc32/include/mm/memory_init.h
 ,0 → 1,43
+/*
+ * 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.
+ */
+/** @addtogroup ppc32mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc32_MEMORY_INIT_H_
+#define KERN_ppc32_MEMORY_INIT_H_
+size_t get_memory_size(void);
+#endif
+/** @}
+ */

/trunk/kernel/arch/ppc32/src/ppc32.c
36,6 → 36,7
#include <arch.h>
#include <arch/boot/boot.h>
#include <arch/drivers/cuda.h>
#include <arch/mm/memory_init.h>
#include <arch/interrupt.h>
#include <genarch/fb/fb.h>
#include <genarch/fb/visuals.h>

/trunk/kernel/arch/ppc32/src/mm/frame.c
34,6 → 34,7

#include <arch/boot/boot.h>
#include <arch/mm/frame.h>
#include <arch/mm/memory_init.h>
#include <mm/frame.h>
#include <align.h>
#include <macros.h>

 /trunk/kernel/arch/ppc32/src/mm/memory_init.c
 ,0 → 1,46
+/*
+ * 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.
+ */
+/** @addtogroup ppc32mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/boot/boot.h>
+#include <arch/mm/memory_init.h>
+#include <print.h>
+size_t get_memory_size(void)
+{
+    return bootinfo.memmap.total;
+}
+/** @}
+ */

/trunk/kernel/arch/ppc32/Makefile.inc
79,6 → 79,7
arch/$(ARCH)/src/drivers/cuda.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/drivers/pic.c

 /trunk/kernel/arch/ia32xen/include/mm/memory_init.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2006 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.
+ */
+/** @addtogroup ia32xen_mm
+ * @{
+ */
+/** @file
+ * @ingroup ia32xen_mm
+ */
+#ifndef KERN_ia32xen_MEMORY_INIT_H_
+#define KERN_ia32xen_MEMORY_INIT_H_
+#include <arch/types.h>
+size_t get_memory_size(void);
+#endif
+/** @}
+ */

/trunk/kernel/arch/ia32xen/src/ia32xen.c
53,6 → 53,7

#include <arch/bios/bios.h>

#include <arch/mm/memory_init.h>
#include <interrupt.h>
#include <arch/debugger.h>
#include <proc/thread.h>

 /trunk/kernel/arch/ia32xen/src/mm/memory_init.c
 ,0 → 1,46
+/*
+ * Copyright (c) 2006 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.
+ */
+/** @addtogroup ia32xen_mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/mm/memory_init.h>
+#include <arch/mm/page.h>
+#include <print.h>
+#include <mm/frame.h>
+size_t get_memory_size(void)
+{
+    return start_info.frames * PAGE_SIZE;
+}
+/** @}
+ */

/trunk/kernel/arch/ia32xen/Makefile.inc
131,6 → 131,7
arch/$(ARCH)/src/cpu/cpu.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/ddi/ddi.c \

/trunk/kernel/arch/amd64/src/amd64.c
50,6 → 50,7
#endif

#include <arch/bios/bios.h>
#include <arch/mm/memory_init.h>
#include <arch/cpu.h>
#include <print.h>
#include <arch/cpuid.h>

 /trunk/kernel/arch/amd64/src/mm/memory_init.c
 ,0 → 1,50
+/*
+ * Copyright (c) 2005 Josef Cejka
+ * 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.
+ */
+/** @addtogroup amd64mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/boot/memmap.h>
+#include <arch/mm/memory_init.h>
+#include <arch/mm/page.h>
+#include <print.h>
+uint8_t e820counter = 0xff;
+e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
+uint32_t e801memorysize;
+size_t get_memory_size(void)
+{
+    return e801memorysize * 1024;
+}
+/** @}
+ */

/trunk/kernel/arch/amd64/src/boot/memmap.c
File deleted

 /trunk/kernel/arch/amd64/src/boot/boot.S
 ,6 → 182,7
     je valid_boot
         xorl %ecx, %ecx                 # no memory size or map available
+        movl %ecx, e801memorysize
         movl %ecx, e820counter
         jmp invalid_boot
 ,6 → 191,19
         movl (%ebx), %eax               # ebx = physical address of struct multiboot_info
+        bt $0, %eax                 # mbi->flags[0] (mem_lower, mem_upper valid)
+        jc mem_valid
+            xorl %ecx, %ecx
+            jmp mem_invalid
+        mem_valid:
+        movl 4(%ebx), %ecx              # mbi->mem_lower
+        addl 8(%ebx), %ecx              # mbi->mem_upper
+        mem_invalid:
+        movl %ecx, e801memorysize
         bt $3, %eax                 # mbi->flags[3] (mods_count, mods_addr valid)
         jc mods_valid

/trunk/kernel/arch/amd64/include/mm/memory_init.h
0,0 → 1,0
link ../../../ia32/include/mm/memory_init.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/trunk/kernel/arch/amd64/Makefile.inc
87,7 → 87,6
ARCH_SOURCES = \
arch/$(ARCH)/src/fpu_context.c \
arch/$(ARCH)/src/boot/boot.S \
arch/$(ARCH)/src/boot/memmap.c \
arch/$(ARCH)/src/pm.c \
arch/$(ARCH)/src/context.S \
arch/$(ARCH)/src/ddi/ddi.c \
104,6 → 103,7
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/asm_utils.S \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/cpu/cpu.c \
arch/$(ARCH)/src/proc/scheduler.c \
arch/$(ARCH)/src/proc/task.c \

 /trunk/kernel/arch/ppc64/include/mm/memory_init.h
 ,0 → 1,43
+/*
+ * 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.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ppc64_MEMORY_INIT_H_
+#define KERN_ppc64_MEMORY_INIT_H_
+size_t get_memory_size(void);
+#endif
+/** @}
+ */

/trunk/kernel/arch/ppc64/src/mm/frame.c
34,6 → 34,7

#include <arch/boot/boot.h>
#include <arch/mm/frame.h>
#include <arch/mm/memory_init.h>
#include <mm/frame.h>
#include <align.h>
#include <macros.h>

 /trunk/kernel/arch/ppc64/src/mm/memory_init.c
 ,0 → 1,47
+/*
+ * 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.
+ */
+/** @addtogroup ppc64mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/boot/boot.h>
+#include <arch/mm/memory_init.h>
+#include <print.h>
+size_t get_memory_size(void)
+{
+    return bootinfo.memmap.total;
+}
+/** @}
+ */

/trunk/kernel/arch/ppc64/src/ppc64.c
34,6 → 34,7

#include <arch.h>
#include <arch/boot/boot.h>
#include <arch/mm/memory_init.h>
#include <arch/interrupt.h>
#include <genarch/fb/fb.h>
#include <genarch/fb/visuals.h>

/trunk/kernel/arch/ppc64/Makefile.inc
67,6 → 67,7
arch/$(ARCH)/src/ddi/ddi.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/drivers/pic.c

 /trunk/kernel/arch/ia32/include/mm/memory_init.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2005 Josef Cejka
+ * 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.
+ */
+/** @addtogroup ia32mm
+ * @{
+ */
+/** @file
+ * @ingroup ia32mm, am64mm
+ */
+#ifndef KERN_ia32_MEMORY_INIT_H_
+#define KERN_ia32_MEMORY_INIT_H_
+size_t get_memory_size(void);
+#endif
+/** @}
+ */

/trunk/kernel/arch/ia32/include/boot/memmap.h
65,6 → 65,7

extern e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
extern uint8_t e820counter;
extern uint32_t e801memorysize; /*< Size of available memory in KB. /

#endif

/trunk/kernel/arch/ia32/src/ia32.c
54,6 → 54,7

#include <arch/bios/bios.h>

#include <arch/mm/memory_init.h>
#include <interrupt.h>
#include <ddi/irq.h>
#include <arch/debugger.h>

 /trunk/kernel/arch/ia32/src/mm/memory_init.c
 ,0 → 1,50
+/*
+ * Copyright (c) 2005 Josef Cejka
+ * 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.
+ */
+/** @addtogroup ia32mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/boot/memmap.h>
+#include <arch/mm/memory_init.h>
+#include <arch/mm/page.h>
+#include <print.h>
+uint8_t e820counter = 0xff;
+e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
+uint32_t e801memorysize;
+size_t get_memory_size(void)
+{
+    return e801memorysize * 1024;
+}
+/** @}
+ */

/trunk/kernel/arch/ia32/src/boot/memmap.c
File deleted

 /trunk/kernel/arch/ia32/src/boot/boot.S
 ,7 → 109,8
     cmpl $MULTIBOOT_LOADER_MAGIC, %eax              # compare GRUB signature
     je valid_boot
-        xorl %ecx, %ecx                         # no memory map available
+        xorl %ecx, %ecx                         # no memory size or map available
+        movl %ecx, e801memorysize
         movl %ecx, e820counter
         jmp invalid_boot
 ,6 → 119,19
         movl (%ebx), %eax                       # ebx = physical address of struct multiboot_info
+        bt $0, %eax                             # mbi->flags[0] (mem_lower, mem_upper valid)
+        jc mem_valid
+            xorl %ecx, %ecx
+            jmp mem_invalid
+        mem_valid:
+        movl 4(%ebx), %ecx                      # mbi->mem_lower
+        addl 8(%ebx), %ecx                      # mbi->mem_upper
+        mem_invalid:
+        movl %ecx, e801memorysize
         bt $3, %eax                             # mbi->flags[3] (mods_count, mods_addr valid)
         jc mods_valid

/trunk/kernel/arch/ia32/Makefile.inc
141,6 → 141,7
arch/$(ARCH)/src/cpu/cpu.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/ddi/ddi.c \
149,6 → 150,5
arch/$(ARCH)/src/drivers/ega.c \
arch/$(ARCH)/src/drivers/vesa.c \
arch/$(ARCH)/src/boot/boot.S \
arch/$(ARCH)/src/boot/memmap.c \
arch/$(ARCH)/src/fpu_context.c \
arch/$(ARCH)/src/debugger.c

 /trunk/kernel/arch/mips32/include/mm/memory_init.h
 ,0 → 1,48
+/*
+ * Copyright (c) 2005 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.
+ */
+/** @addtogroup mips32mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_mips32_MEMORY_INIT_H_
+#define KERN_mips32_MEMORY_INIT_H_
+#include <config.h>
+/* When this function is called, we do not have ARC initiated
+ * - provide some reasonable minimum and update it later
+ */
+#define get_memory_size()   CONFIG_MEMORY_SIZE
+#endif
+/** @}
+ */

 /trunk/kernel/arch/mips32/src/mm/frame.c
 ,7 → 46,7
 void frame_arch_init(void)
 {
     if (!arc_frame_init()) {
-        zone_create(0, ADDR2PFN(CONFIG_MEMORY_SIZE), 1, 0);
+        zone_create(0, ADDR2PFN(config.memory_size), 1, 0);
         /*
          * Blacklist interrupt vector
          */

 /trunk/kernel/arch/mips32/src/drivers/arc.c
 ,7 → 220,7
             desc = arc_entry->getmemorydescriptor(desc);
         }
     } else
-        printf("%#10x %#10x free\n", 0, CONFIG_MEMORY_SIZE);
+        printf("%#10x %#10x free\n", 0, config.memory_size);
 }
 /** Print charactor to console */
 ,6 → 362,7
 {
     if (arc_enabled()) {
         arc_memdescriptor_t *desc;
+        int total = 0;
         uintptr_t base;
         size_t basesize;
 ,6 → 379,8
                 }
                 basesize = ALIGN_DOWN(basesize, FRAME_SIZE);
+                total += basesize;
                 zone_create(ADDR2PFN(base), SIZE2FRAMES(basesize),
                         ADDR2PFN(base), 0);
             }
 ,6 → 387,7
             desc = arc_entry->getmemorydescriptor(desc);
         }
+        config.memory_size = total;
         return true;
     }

 /trunk/kernel/arch/sparc64/include/mm/memory_init.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2005 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.
+ */
+/** @addtogroup sparc64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_sparc64_MEMORY_INIT_H_
+#define KERN_sparc64_MEMORY_INIT_H_
+#include <arch/types.h>
+extern size_t get_memory_size(void);
+#endif
+/** @}
+ */

/trunk/kernel/arch/sparc64/Makefile.inc
89,6 → 89,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/proc/scheduler.c \

 /trunk/kernel/arch/sparc64/src/mm/memory_init.c
 ,0 → 1,48
+/*
+ * 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.
+ */
+/** @addtogroup sparc64mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/mm/memory_init.h>
+#include <arch/boot/boot.h>
+/** Return total size of available memory in bytes.
+ *
+ * @return Size of available memory in bytes.
+ */
+size_t get_memory_size(void)
+{
+    return bootinfo.memmap.total;
+}
+/** @}
+ */

 /trunk/kernel/arch/ia64/include/mm/memory_init.h
 ,0 → 1,45
+/*
+ * Copyright (c) 2005 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.
+ */
+/** @addtogroup ia64mm
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_ia64_MEMORY_INIT_H_
+#define KERN_ia64_MEMORY_INIT_H_
+#include <config.h>
+#define get_memory_size()   (512*1024*1024)     /* 512M */
+#endif
+/** @}
+ */

 /trunk/kernel/arch/ia64/src/mm/frame.c
 ,18 → 41,17
  * This is Ski-specific and certainly not sufficient
  * for real ia64 systems that provide memory map.
  */
-#define MEMORY_SIZE (512 * 1024 * 1024)
 #define ROM_BASE    0xa0000
-#define ROM_SIZE    (384 * 1024)
+#define ROM_SIZE    (384*1024)
 void frame_arch_init(void)
 {
-    zone_create(0, SIZE2FRAMES(MEMORY_SIZE), 1, 0);
+    zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
     /*
      * Blacklist ROM regions.
      */
-    frame_mark_unavailable(ADDR2PFN(ROM_BASE), SIZE2FRAMES(ROM_SIZE));
+    frame_mark_unavailable(ADDR2PFN(ROM_BASE), ROM_SIZE >> FRAME_WIDTH);
 }
 /** @}

 /trunk/kernel/arch/arm32/include/mm/memory_init.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2007 Pavel Jancik
+ * 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.
+ */
+/** @addtogroup arm32mm
+ * @{
+ */
+/** @file
+ *  @brief Memory information functions declarations.
+ */
+#ifndef KERN_arm32_MEMORY_INIT_H_
+#define KERN_arm32_MEMORY_INIT_H_
+#include <config.h>
+size_t get_memory_size(void);
+#endif
+/** @}
+ */

 /trunk/kernel/arch/arm32/src/mm/frame.c
 ,7 → 35,6
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
-#include <arch/machine.h>
 #include <config.h>
 #include <arch/debug/print.h>
 ,9 → 45,9
 void frame_arch_init(void)
 {
     /* all memory as one zone */
-    zone_create(0, ADDR2PFN(machine_get_memory_size()),
+    zone_create(0, ADDR2PFN(config.memory_size),
         BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
-    last_frame = machine_get_memory_size();
+    last_frame = config.memory_size;
     /* blacklist boot page table */
     frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME,

 /trunk/kernel/arch/arm32/src/mm/memory_init.c
 ,0 → 1,50
+/*
+ * Copyright (c) 2007 Pavel Jancik
+ * 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.
+ */
+/** @addtogroup arm32mm
+ * @{
+ */
+/** @file
+ *  @brief Memory information functions.
+ */
+#include <arch/mm/memory_init.h>
+#include <arch/mm/page.h>
+#include <arch/machine.h>
+/** Returns memory size.
+ *
+ * @return Memory size in bytes
+ */
+size_t get_memory_size(void)
+{
+    return  machine_get_memory_size();
+}
+/** @}
+ */

/trunk/kernel/arch/arm32/Makefile.inc
88,6 → 88,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/mm/page_fault.c

ifeq ($(MACHINE), gxemul_testarm)

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2725 → Rev 2724