Changeset 811770c in mainline for kernel/arch/amd64/src/asm.S

Timestamp:

2016-05-05T12:06:04Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

57c2a87

Parents:

0f17bff

Message:

Avoid magic numbers and specialized functions to set/get register bits

File:

• kernel/arch/amd64/src/asm.S (modified) (5 diffs)

kernel/arch/amd64/src/asm.S

@@ -33 +33 @@
 #include <arch/kseg_struct.h>
 #include <arch/cpu.h>
+#include <arch/smp/apic.h>
 
 .text
@@ -93 +94 @@
         
         /* Flip the ID bit */
-        btcl $21, %edx
+        xorl $RFLAGS_ID, %edx
         
         /* Store RFLAGS */
@@ -102 +103 @@
         /* Get the ID bit again */
         popq %rdx
-        andl $(1 << 21), %eax
-        andl $(1 << 21), %edx
+        andl $RFLAGS_ID, %eax
+        andl $RFLAGS_ID, %edx
         
         /* 0 if not supported, 1 if supported */
@@ -127 +128 @@
 FUNCTION_END(cpuid)
 
-FUNCTION_BEGIN(set_efer_flag)
-        movl $0xc0000080, %ecx
+/** Enable local APIC
+ *
+ * Enable local APIC in MSR.
+ *
+ */
+FUNCTION_BEGIN(enable_l_apic_in_msr)
+        movl $AMD_MSR_APIC_BASE, %ecx
         rdmsr
-        btsl %edi, %eax
+        orl $(L_APIC_BASE | AMD_APIC_BASE_GE), %eax
         wrmsr
         ret
-FUNCTION_END(set_efer_flag)
-
-FUNCTION_BEGIN(read_efer_flag)
-        movl $0xc0000080, %ecx
-        rdmsr
-        ret
-FUNCTION_END(read_efer_flag)
+FUNCTION_END(enable_l_apic_in_msr)
 
 /*
@@ -541 +541 @@
         ret
 FUNCTION_END(early_putchar)
-