Changeset c4b3e3e in mainline for arch/amd64/src/boot/boot.S

Timestamp:

2005-09-03T19:33:52Z (20 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.

File:

• arch/amd64/src/boot/boot.S (modified) (8 diffs)

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