Changeset b0bf501 in mainline for arch/ia32/src

Timestamp:

2005-06-06T20:42:06Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a7a10630

Parents:

e3f41b6

Message:

Define two placeholder functions for atomic_inc and atomic_dec on IA-64.

Add Ondrej Palkovsky to doc/AUTHORS.

Tweaks in IA-32 low level code to bring SMP back to life. (SMP still broken)

Location:

arch/ia32/src

Files:

• boot/boot.S (modified) (3 diffs)
• pm.c (modified) (2 diffs)
• smp/ap.S (modified) (1 diff)
• smp/apic.c (modified) (1 diff)

arch/ia32/src/boot/boot.S

@@ -48 +48 @@
         orl $0x1,%eax
         movl %eax,%cr0
-        jmp 0f
-0:
+        jmpl $8,$meeting_point
+meeting_point:
+.code32
+
         movw $16,%ax
         movw %ax,%es
@@ -57 +59 @@
         movw %ax,%ss
         movl $0x7c00,%esp
-        jmpl $8,$meeting_point
-meeting_point:
-.code32
 
         lidt idtr
@@ -97 +96 @@
         orl $(1<<31), %ebx
         movl %ebx, %cr0
+        jmp 0f
+0:
         ret
 

arch/ia32/src/pm.c

@@ -72 +72 @@
 void gdt_setbase(struct descriptor *d, __address base)
 {
-        d->base_0_15 = KA2PA(base) & 0xffff;
-        d->base_16_23 = (KA2PA(base) >> 16) & 0xff;
-        d->base_24_31 = (KA2PA(base) >> 24) & 0xff;
+        d->base_0_15 = base & 0xffff;
+        d->base_16_23 = ((base) >> 16) & 0xff;
+        d->base_24_31 = ((base) >> 24) & 0xff;
 
 }
@@ -86 +86 @@
 void idt_setoffset(struct idescriptor *d, __address offset)
 {
-        d->offset_0_15 = KA2PA(offset) & 0xffff;
-        d->offset_16_31 = KA2PA(offset) >> 16;
+        /*
+         * Offset is a linear address.
+         */
+        d->offset_0_15 = offset & 0xffff;
+        d->offset_16_31 = offset >> 16;
 }
 

arch/ia32/src/smp/ap.S

@@ -55 +55 @@
         orl $1,%eax
         movl %eax,%cr0
-        jmp 0f
-0:
-        ljmp $KTEXT,$jump_to_kernel
-
-# this is where the AP enters the kernel space
+        jmpl $KTEXT,$jump_to_kernel
 jump_to_kernel:
 .code32

arch/ia32/src/smp/apic.c

@@ -44 +44 @@
  * Advanced Programmable Interrupt Controller for MP systems.
  * Tested on:
- *      Bochs 2.0.2 - Bochs 2.2-cvs with 2-8 CPUs
+ *      Bochs 2.0.2 - Bochs 2.2 with 2-8 CPUs
  *      ASUS P/I-P65UP5 + ASUS C-P55T2D REV. 1.41 with 2x 200Mhz Pentium CPUs
  */