Changeset c4b3e3e in mainline

Timestamp:

2005-09-03T19:33:52Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

c835e7c

Parents:

78665c0

Message:

Moved AMD64 kernel above 1MB.

Location:

arch

Files:

• amd64/_link.ld (modified) (4 diffs)
• amd64/include/boot/boot.h (modified) (1 diff)
• amd64/include/cpuid.h (modified) (2 diffs)
• amd64/src/boot/boot.S (modified) (8 diffs)
• ia32/include/boot/boot.h (modified) (1 diff)

arch/amd64/_link.ld

@@ -18 +18 @@
                 *(K_TEXT_START_2);
                 unmapped_ktext_end = .;
+
                 unmapped_kdata_start = .;
                 *(K_DATA_START);
@@ -23 +24 @@
         }
 
-        .mapped (0xffffffff80000000+SIZEOF(.unmapped)+0x8000) : AT (0x8000+SIZEOF(.unmapped)) {
+        .mapped (0xffffffff80100000+0x8000+SIZEOF(.unmapped)) : AT (0x8000+SIZEOF(.unmapped)) {
                 ktext_start = .;
                 *(BOOT_DATA);
@@ -38 +39 @@
                 hardcoded_kdata_size = .;
                 QUAD(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
+                hardcoded_unmapped_ktext_size = .;
+                LONG(unmapped_ktext_end - unmapped_ktext_start);
+                hardcoded_unmapped_kdata_size = .;
+                LONG(unmapped_kdata_end - unmapped_kdata_start);
                 *(COMMON);              /* global variables */
 
@@ -51 +56 @@
                 kdata_end = .;
         }
-        _map_address = 0xffffffff80000000;
+        _map_address = 0xffffffff80100000;
+        _hardcoded_kernel_size = (ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start) + (kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start);
+
         e820table_boot = e820table - _map_address;
         e820counter_boot = e820counter - _map_address;

arch/amd64/include/boot/boot.h

@@ -31 +31 @@
 
 #define BOOTSTRAP_OFFSET                        0x8000
-#define BOOT_OFFSET                             0x0
+#define BOOT_OFFSET                             0x100000
 
 #define MULTIBOOT_HEADER_MAGIC          0x1BADB002

arch/amd64/include/cpuid.h

@@ -30 +30 @@
 #define __CPUID_H__
 
-#include <arch/types.h>
-
 #define AMD_CPUID_EXTENDED 0x80000001
 #define AMD_EXT_NOEXECUTE    20
+
+#ifndef __ASM__
+
+#include <arch/types.h>
 
 struct cpu_info {
@@ -49 +51 @@
 extern __u64 rdtsc(void);
 
+#endif /* __ASM__ */
 #endif

arch/amd64/src/boot/boot.S

@@ -33 +33 @@
 #include <arch/pm.h>
 #include <arch/cpu.h>
+#include <arch/cpuid.h>
+#include <arch/boot/boot.h>
 
-#define START_STACK     0x7c00  
 #define START_STACK_64  0xffffffff80007c00
                                         
@@ -45 +46 @@
 # switch to protected mode.
 #
+
+#define START_STACK (BOOTSTRAP_OFFSET-0x400)
+        
 .section K_TEXT_START
 .code16
@@ -53 +57 @@
         movw %ax,%ds
         movw %ax,%ss            # initialize stack segment register
-        movl $(START_STACK),%esp        # initialize stack pointer
+        movl $(START_STACK), %esp       # initialize stack pointer
         
         call memmap_arch_init
@@ -61 +65 @@
         cmp $0x80000000, %eax   # any function > 80000000h?
         jbe no_long_mode
-        movl $0x80000001, %eax  # Extended function code 80000001
+        movl $(AMD_CPUID_EXTENDED), %eax # Extended function code 80000001
         cpuid
         bt $29, %edx            # Test if long mode is supported.
@@ -89 +93 @@
         movw %ax, %ss
 
+        movb $0xd1, %al         # enable A20 using the keyboard controller
+        outb %al, $0x64
+        movb $0xdf, %al
+        outb %al, $0x60
+
+        
         # Enable 64-bit page transaltion entries - CR4.PAE = 1.
         # Paging is not enabled until after long mode is enabled
@@ -98 +108 @@
         leal ptl_0, %eax
         movl %eax, %cr3
-                
+        
         # Enable long mode
         movl $EFER_MSR_NUM, %ecx   # EFER MSR number
@@ -115 +125 @@
 .code64
 start64:
-        movq $(START_STACK_64), %rsp
+        movq $(PA2KA(START_STACK)), %rsp
+
+        # Copy kernel to higher physical memory
+        movq $BOOTSTRAP_OFFSET, %rsi
+        movq $BOOTSTRAP_OFFSET + BOOT_OFFSET, %rdi
+        movq $_hardcoded_kernel_size, %rcx
+        cld
+        rep movsb
         
         call main_bsp   # never returns
@@ -154 +171 @@
 bsp_bootstrap_gdtr:
         .word gdtselector(GDT_ITEMS)
-        .long KA2PA(gdt)
+        .long KA2PA(gdt)-BOOT_OFFSET
 
 .global ap_bootstrap_gdtr
 ap_bootstrap_gdtr:
         .word gdtselector(GDT_ITEMS)
-        .long KA2PA(gdt)
+        .long KA2PA(gdt)-BOOT_OFFSET

arch/ia32/include/boot/boot.h

@@ -31 +31 @@
 
 #define BOOTSTRAP_OFFSET                        0x8000
-#define BOOT_OFFSET                                     0x100000
+#define BOOT_OFFSET                             0x100000
 
 #define MULTIBOOT_HEADER_MAGIC          0x1BADB002