WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/arch Rev 3906 and /trunk/kernel/arch Rev 3908

Ignore whitespace Rev 3906 → Rev 3908

/trunk/kernel/arch/sparc64/include/mm/frame.h
73,6 → 73,7
typedef union frame_address frame_address_t;

extern uintptr_t last_frame;
extern uintptr_t end_frame;
extern void frame_arch_init(void);
#define physmem_print()

/trunk/kernel/arch/sparc64/src/mm/frame.c
41,6 → 41,7
#include <macros.h>

uintptr_t last_frame = NULL;
uintptr_t end_frame = NULL;

/** Create memory zones according to information stored in bootinfo.
*
80,6 → 81,7
frame_mark_unavailable(ADDR2PFN(KA2PA(PFN2ADDR(0))), 1);
}

end_frame = last_frame;
}

/** @}

 /trunk/kernel/arch/sparc64/src/mm/page.c
 ,7 → 147,7
             physaddr + i * sizemap[order].increment,
             sizemap[order].pagesize_code, true, false);
-#ifdef CONFIG_SMP
+#ifdef CONFIG_SMP
         /*
          * Second, save the information about the mapping for APs.
          */
 ,6 → 164,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0x7ffffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/sparc64/src/drivers/sgcn.c
 ,19 → 161,10
 chardev_t sgcn_io;
 /**
- * Registers the physical area of the SRAM so that the userspace SGCN
- * driver can map it. Moreover, it sets some sysinfo values (SRAM address
- * and SRAM size).
+ * Set some sysinfo values (SRAM address and SRAM size).
  */
-static void register_sram_parea(uintptr_t sram_begin_physical)
+static void register_sram(uintptr_t sram_begin_physical)
 {
-    static parea_t sram_parea;
-    sram_parea.pbase = sram_begin_physical;
-    sram_parea.vbase = (uintptr_t) sram_begin;
-    sram_parea.frames = MAPPED_AREA_SIZE / FRAME_SIZE;
-    sram_parea.cacheable = false;
-    ddi_parea_register(&sram_parea);
     sysinfo_set_item_val("sram.area.size", NULL, MAPPED_AREA_SIZE);
     sysinfo_set_item_val("sram.address.physical", NULL,
         sram_begin_physical);
 ,7 → 202,7
         + *((uint32_t *) iosram_toc->value);
     sram_begin = hw_map(sram_begin_physical, MAPPED_AREA_SIZE);
-    register_sram_parea(sram_begin_physical);
+    register_sram(sram_begin_physical);
 }
 /**

/trunk/kernel/arch/ia64/include/mm/frame.h
44,6 → 44,7
#include <arch/types.h>

extern uintptr_t last_frame;
extern uintptr_t end_frame;

extern void frame_arch_init(void);
#define physmem_print()

/trunk/kernel/arch/ia64/src/mm/frame.c
51,6 → 51,7
#define MINCONF 1

uintptr_t last_frame = 0;
uintptr_t end_frame = 0;

void frame_arch_init(void)
{

 /trunk/kernel/arch/ia64/src/mm/page.c
 ,5 → 274,11
     return PA2KA(physaddr);
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0x7fffffffffffffffUL - end_frame);
+}
 /** @}
  */

/trunk/kernel/arch/arm32/include/mm/frame.h
51,6 → 51,7
#define BOOT_PAGE_TABLE_SIZE_IN_FRAMES (BOOT_PAGE_TABLE_SIZE >> FRAME_WIDTH)

extern uintptr_t last_frame;
extern uintptr_t end_frame;

extern void frame_arch_init(void);
extern void boot_page_table_free(void);

 /trunk/kernel/arch/arm32/src/mm/frame.c
 ,6 → 41,7
 /** Address of the last frame in the memory. */
 uintptr_t last_frame = 0;
+uintptr_t end_frame = 0;
 /** Creates memory zones. */
 void frame_arch_init(void)
 ,7 → 50,8
     zone_create(0, ADDR2PFN(machine_get_memory_size()),
         BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
     last_frame = machine_get_memory_size();
+    end_frame = last_frame;
     /* blacklist boot page table */
     frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME,
         BOOT_PAGE_TABLE_SIZE_IN_FRAMES);

 /trunk/kernel/arch/arm32/src/mm/page.c
 ,5 → 106,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/ppc32/include/mm/frame.h
 ,9 → 41,10
 #ifdef KERNEL
 #ifndef __ASM__
-#include <arch/types.h>
+#include <arch/types.h>
 extern uintptr_t last_frame;
+extern uintptr_t end_frame;
 extern void frame_arch_init(void);
 extern void physmem_print(void);

 /trunk/kernel/arch/ppc32/src/mm/frame.c
 ,6 → 40,7
 #include <print.h>
 uintptr_t last_frame = 0;
+uintptr_t end_frame = 0;
 void physmem_print(void)
 {
 ,7 → 75,9
         if (last_frame < ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE))
             last_frame = ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE);
     }
+    end_frame = last_frame;
     /* First is exception vector, second is 'implementation specific',
        third and fourth is reserved, other contain real mode code */
     frame_mark_unavailable(0, 8);

 /trunk/kernel/arch/ppc32/src/mm/page.c
 ,5 → 63,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 /** @}
  */

/trunk/kernel/arch/amd64/include/mm/frame.h
44,6 → 44,7

#ifndef __ASM__
extern uintptr_t last_frame;
extern uintptr_t end_frame;
extern void frame_arch_init(void);
extern void physmem_print(void);
#endif /* __ASM__ */

 /trunk/kernel/arch/amd64/src/mm/page.c
 ,5 → 214,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xfffffffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/mips32/include/mm/frame.h
 ,15 → 35,19
 #ifndef KERN_mips32_FRAME_H_
 #define KERN_mips32_FRAME_H_
-#define FRAME_WIDTH     14  /* 16K */
-#define FRAME_SIZE      (1 << FRAME_WIDTH)
+#define FRAME_WIDTH  14  /* 16K */
+#define FRAME_SIZE   (1 << FRAME_WIDTH)
 #ifdef KERNEL
 #ifndef __ASM__
+#include <typedefs.h>
 extern void frame_arch_init(void);
 extern void physmem_print(void);
+extern uintptr_t end_frame;
 #endif /* __ASM__ */
 #endif /* KERNEL */

 /trunk/kernel/arch/mips32/src/mm/frame.c
 ,7 → 65,9
 static count_t phys_regions_count = 0;
 static phys_region_t phys_regions[MAX_REGIONS];
+uintptr_t end_frame = 0;
 /** Check whether frame is available
  *
  * Returns true if given frame is generally available for use.
 ,8 → 238,10
         }
     }
-    frame_add_region(start_frame, frame);
+    end_frame = frame;
+    frame_add_region(start_frame, end_frame);
     /* Blacklist interrupt vector frame */
     frame_mark_unavailable(0, 1);

 /trunk/kernel/arch/mips32/src/mm/page.c
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup mips32mm
+/** @addtogroup mips32mm
  * @{
  */
 /** @file
 ,6 → 35,7
 #include <arch/mm/page.h>
 #include <genarch/mm/page_pt.h>
 #include <mm/page.h>
+#include <mm/frame.h>
 void page_arch_init(void)
 {
 ,5 → 51,11
     return physaddr + 0xa0000000;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/mips32/src/drivers/msim.c
 ,7 → 41,6
 #include <sysinfo/sysinfo.h>
 #include <ddi/ddi.h>
-static parea_t msim_parea;
 static chardev_t console;
 static irq_t msim_irq;
 ,12 → 155,6
     sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
     sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS);
-    msim_parea.pbase = KA2PA(MSIM_VIDEORAM);
-    msim_parea.vbase = MSIM_VIDEORAM;
-    msim_parea.frames = 1;
-    msim_parea.cacheable = false;
-    ddi_parea_register(&msim_parea);
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 3);
     sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(MSIM_VIDEORAM));

/trunk/kernel/arch/ia32/include/mm/frame.h
44,6 → 44,7
#include <arch/types.h>

extern uintptr_t last_frame;
extern uintptr_t end_frame;

extern void frame_arch_init(void);
extern void physmem_print(void);

 /trunk/kernel/arch/ia32/src/mm/frame.c
 ,6 → 50,7
 size_t hardcoded_unmapped_kdata_size = 0;
 uintptr_t last_frame = 0;
+uintptr_t end_frame = 0;
 static void init_e820_memory(pfn_t minconf)
 {
 ,8 → 74,10
                 e820table[i].size, FRAME_SIZE))
                 last_frame =
                     ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
-        }
+        }
     }
+    end_frame = last_frame;
 }
 static char *e820names[] = {
 ,6 → 116,7
     if (config.cpu_active == 1) {
         minconf = 1;
 #ifdef CONFIG_SMP
         minconf = max(minconf,
             ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
 ,7 → 123,7
             hardcoded_unmapped_kdata_size));
 #endif
         init_e820_memory(minconf);
         /* Reserve frame 0 (BIOS data) */
         frame_mark_unavailable(0, 1);

 /trunk/kernel/arch/ia32/src/mm/page.c
 ,6 → 93,12
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 void page_fault(int n __attribute__((unused)), istate_t *istate)
 {
     uintptr_t page;
 ,7 → 108,7
     if (istate->error_word & PFERR_CODE_RSVD)
         panic("Reserved bit set in page directory.");
     if (istate->error_word & PFERR_CODE_RW)
         access = PF_ACCESS_WRITE;
     else

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3906 → Rev 3908