Changeset c18e666 in mainline

Timestamp:

2009-03-30T20:30:32Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0dd1d444

Parents:

18251cc

Message:

detect SYSENTER/SYSEXIT support on boot
(this serves as a hint for people who try to boot HelenOS on Bochs emulating plain Pentium,
unfortunatelly it also kills VirtualBox, as it does not support SYSENTER/SYSEXIT officially,
see ​http://www.virtualbox.org/ticket/1248)

Location:

kernel/arch

Files:

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

kernel/arch/amd64/include/cpuid.h

@@ -36 +36 @@
 #define KERN_amd64_CPUID_H_
 
-#define AMD_CPUID_EXTENDED   0x80000001
-#define AMD_EXT_NOEXECUTE    20
-#define AMD_EXT_LONG_MODE    29
+#define AMD_CPUID_EXTENDED  0x80000001
+#define AMD_EXT_NOEXECUTE   20
+#define AMD_EXT_LONG_MODE   29
 
-#define INTEL_CPUID_STANDARD 0x00000001
-#define INTEL_CPUID_EXTENDED 0x80000000
-#define INTEL_SSE2           26
-#define INTEL_FXSAVE         24
+#define INTEL_CPUID_LEVEL     0x00000000
+#define INTEL_CPUID_STANDARD  0x00000001
+#define INTEL_CPUID_EXTENDED  0x80000000
+#define INTEL_SSE2            26
+#define INTEL_FXSAVE          24
 
 #ifndef __ASM__

kernel/arch/ia32/include/cpuid.h

@@ -35 +35 @@
 #ifndef KERN_ia32_CPUID_H_
 #define KERN_ia32_CPUID_H_
+
+#define INTEL_CPUID_LEVEL     0x00000000
+#define INTEL_CPUID_STANDARD  0x00000001
+#define INTEL_PSE             3
+#define INTEL_SEP             11
+
+#ifndef __ASM__
 
 #include <arch/types.h>
@@ -105 +112 @@
 }
 
+#endif /* !def __ASM__ */
 #endif
 

kernel/arch/ia32/src/boot/boot.S

@@ -32 +32 @@
 #include <arch/mm/page.h>
 #include <arch/pm.h>
+#include <arch/cpuid.h>
 
 #define START_STACK (BOOT_OFFSET - BOOT_STACK_SIZE)
@@ -68 +69 @@
         movl %ebx, grub_ebx
         
-        xorl %eax, %eax
+        movl $(INTEL_CPUID_LEVEL), %eax
         cpuid
         cmp $0x0, %eax              # any function > 0?
         jbe pse_unsupported
-        movl $0x1, %eax             # basic function code 1
+        
+        movl $(INTEL_CPUID_STANDARD), %eax
         cpuid
-        bt $3, %edx                 # test if PSE is supported
+        bt $(INTEL_PSE), %edx
         jc pse_supported
         
@@ -82 +84 @@
         
         pse_supported:
+        
+        bt $(INTEL_SEP), %edx
+        jc sep_supported
+        
+                movl $sep_msg, %esi
+                jmp error_halt
+        
+        sep_supported:
 
 #include "vesa_prot.inc"
@@ -214 +224 @@
 pse_msg:
         .asciz "Page Size Extension not supported. System halted."
+
+sep_msg:
+        .asciz "SYSENTER/SYSEXIT not supported. System halted."