Changeset e49e234 in mainline for kernel/arch/amd64

Timestamp:

2009-02-27T11:32:31Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c1f7f6ea

Parents:

5f0f29ce

Message:

kernel memory management revisited (phase 2): map physical memory according to zones

• ia32: register reserved and ACPI zones
• pareas are now used only for mapping of present physical memory (hw_area() is gone)
• firmware zones and physical addresses outside any zones are allowed to be mapped generally
• fix nasty antient bug in zones_insert_zone()

Location:

kernel/arch/amd64

Files:

• include/mm/frame.h (modified) (2 diffs)
• src/mm/page.c (modified) (3 diffs)

kernel/arch/amd64/include/mm/frame.h

@@ -27 +27 @@
  */
 
-/** @addtogroup amd64mm 
+/** @addtogroup amd64mm
  * @{
  */
@@ -40 +40 @@
 #endif /* __ASM__ */
 
-#define FRAME_WIDTH             12      /* 4K */
-#define FRAME_SIZE              (1 << FRAME_WIDTH)
+#define FRAME_WIDTH  12  /* 4K */
+#define FRAME_SIZE   (1 << FRAME_WIDTH)
 
 #ifndef __ASM__
 extern uintptr_t last_frame;
-extern uintptr_t end_frame;
 extern void frame_arch_init(void);
 extern void physmem_print(void);

kernel/arch/amd64/src/mm/page.c

@@ -35 +35 @@
 #include <arch/mm/page.h>
 #include <genarch/mm/page_pt.h>
-#include <genarch/drivers/ega/ega.h>
-#include <genarch/drivers/legacy/ia32/io.h>
 #include <arch/mm/frame.h>
 #include <mm/page.h>
@@ -49 +47 @@
 #include <panic.h>
 #include <align.h>
-#include <ddi/ddi.h>
-
-/** Physical memory area for devices. */
-static parea_t dev_area;
-static parea_t ega_area;
 
 /* Definitions for identity page mapper */
@@ -222 +215 @@
 }
 
-void hw_area(void)
-{
-        dev_area.pbase = end_frame;
-        dev_area.frames = SIZE2FRAMES(0xfffffffffffff - end_frame);
-        ddi_parea_register(&dev_area);
-        
-        ega_area.pbase = EGA_VIDEORAM;
-        ega_area.frames = SIZE2FRAMES(EGA_VRAM_SIZE);
-        ddi_parea_register(&ega_area);
-}
-
 /** @}
  */