Changeset 5d721f0 in mainline

Timestamp:

2005-07-20T16:54:13Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

5d945376

Parents:

b4f9214

Message:

Added e801 method for obtaining memory size, improved e820 method for memory map.

Location:

arch/ia32

Files:

• include/asm.h (modified) (1 diff)
• include/boot/memmap.h (modified) (1 diff)
• include/boot/memmapasm.h (added)
• src/boot/boot.S (modified) (1 diff)
• src/boot/memmap.S (modified) (4 diffs)
• src/mm/frame.c (modified) (3 diffs)

arch/ia32/include/asm.h

@@ -34 +34 @@
 #include <mm/page.h>
 #include <synch/spinlock.h>
+#include <arch/boot/memmap.h>
 
 extern __u32 interrupt_handler_size;

arch/ia32/include/boot/memmap.h

@@ -30 +30 @@
 #define __ia32_MEMMAP_H__
 
-/* E820h memory range types - other values*/
-#define MEMMAP_MEMORY_AVAILABLE 1
-        /* Not available for OS */
-#define MEMMAP_MEMORY_RESERVED  2 
-        /* OS may use it after reading ACPI table */
-#define MEMMAP_MEMORY_ACPI      3 
-        /* Unusable, required to be saved and restored across an NVS sleep */
-#define MEMMAP_MEMORY_NVS       4 
-        /* Corrupted memory */
-#define MEMMAP_MEMORY_UNUSABLE  5 
 
-         /* size of one entry */
-#define MEMMAP_E820_RECORD_SIZE 20 
-        /* maximum entries */
-#define MEMMAP_E820_MAX_RECORDS 32 
+#include <arch/boot/memmapasm.h>
+#include <arch/types.h>
+
+struct e820memmap_ {
+        __u64 base_address;
+        __u64 size;
+        __u32 type;
+        } __attribute__ ((packed));
+
+extern struct e820memmap_ e820table[MEMMAP_E820_MAX_RECORDS];
+
+extern __u8 e820counter; 
+
+extern __u32 e801memorysize; // size of memory in KB
+
 #endif

arch/ia32/src/boot/boot.S

@@ -40 +40 @@
 #
 kernel_image_start:
+        call memmap_arch_init
         cli
-        call memmap_arch_init
         xorw %ax,%ax
         movw %ax,%ds

arch/ia32/src/boot/memmap.S

@@ -28 +28 @@
 
 
-#include <arch/boot/memmap.h>
+#include <arch/boot/memmapasm.h>
 
 E820_RECORD_SIZE = MEMMAP_E820_RECORD_SIZE
@@ -35 +35 @@
 
 .global memmap_arch_init
+.global e820counter
+.global e820table
+.global e801memorysize
 
 .code16
@@ -40 +43 @@
 
 memmap_arch_init:
-        
+
 e820begin:
         xorl    %ebx,%ebx       # during first call, ebx must be 0
-        
+        movw    %bx,%ds
+        movw    %bx,%es
         movw    $e820table,%di
         movb    $E820_MAX_RECORDS,(e820counter)
 e820loop:       
-        movl    $E820_SMAP,%edx         # constrol sequence "SMAP"
-        pushw   %ds
-        popw    %es             # e820 buffer address
+        movl    $E820_SMAP,%edx         # control sequence "SMAP"
 
-        movl    $0xe820,%eax            # service
+        movl    $0x0000e820,%eax        # service
         movl    $E820_RECORD_SIZE,%ecx
         int     $0x15
-        jc              e820end 
-        
+        jc      e820err
         
         cmpl    $E820_SMAP,%eax         # verifying BIOS
-        jne             e820end
+        jne     e820err
+
+        cmpl    $E820_RECORD_SIZE,%ecx
+        jne     e820err                 # bad record size - bug in bios
         
         movw    %di,%ax         # next record
@@ -71 +75 @@
         
 e820end:
+        movb    $E820_MAX_RECORDS,%al
+        subb    (e820counter),%al
+        movb    %al,(e820counter) # store # of valid entries in e820counter
+
+        jmp     e801begin
+
+e820err:
+        movb    $0,(e820counter)
+
+# method e801 - get size of memory
+
+e801begin:
+        xorw    %dx,%dx
+        xorw    %cx,%cx
+        xorw    %bx,%bx
+        movw    $0xe801,%ax
+        stc
+        int     $0x15
         
-        movb    (e820counter),%al       
-        negb    %al
-        addb    $32,%al
-        movb    %al,(e820counter) # store # of valid entries in e820counter
+        jc      e801end
         
+                        # fix problem with some BIOSes which use ax:bx rather than cx:dx
+        testw   %cx,%cx
+        jnz     e801cxdx
+        testw   %dx,%dx
+        jnz     e801cxdx
+
+        movw    %ax,%cx
+        movw    %bx,%dx
+        
+e801cxdx:
+        andl    $0xffff,%edx
+        shll    $6,%edx
+        andl    $0xffff,%ecx
+        addl    %ecx,%edx
+        addl    $0x0400,%edx  # add lower 1 MB - its not count by e801 method
+        movl    %edx,(e801memorysize)           
+e801end:
         ret
 
+        #memory size in 1 kb chunks
+e801memorysize:
+        .long   0
 
 e820counter:
-        .byte 0
-                 
+        .byte 0xff
+
 e820table:
-        .space  (32*E820_RECORD_SIZE),0 # space for 32 records, each E820_RECORD_SIZE bytes long
+        .space  (32*E820_RECORD_SIZE),0xff # space for 32 records, each E820_RECORD_SIZE bytes long

arch/ia32/src/mm/frame.c

@@ -31 +31 @@
 #include <mm/vm.h>
 #include <config.h>
+#include <arch/boot/memmap.h>
+
+#include <print.h>
 
 /*
@@ -37 +40 @@
 void frame_arch_init(void)
 {
+        __u8 i;
+        
         if (config.cpu_active == 1) {
                 frame_not_free(0x0);
@@ -42 +47 @@
                 frame_region_not_free(0xa0000,0xff000);
                 frame_region_not_free(0xfec00000,0xffffffff);
+                
+                for (i=e820counter;i>0;i--) {
+                        //printf("E820 base: %Q size: %Q type: %L \n",e820table[i-1].base_address,e820table[i-1].size,e820table[i-1].type);
+                        if (e820table[i-1].type!=MEMMAP_MEMORY_AVAILABLE) {
+                                frame_region_not_free(e820table[i-1].base_address,e820table[i-1].size);
+                                }
+                        }
         }
 }