Changeset 69bd642 in mainline

Timestamp:

2005-09-01T15:47:50Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3c56c94

Parents:

79c1593

Message:

Fix addresses in GDT and IDT to be virtual addresses.

Location:

arch/ia32/src

Files:

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

arch/ia32/src/boot/boot.S

@@ -51 +51 @@
         
         lgdt gdtr                       # initialize Global Descriptor Table register
-        lidt idtr                       # initialize Interrupt Descriptor Table register
         
         movl %cr0,%eax
@@ -74 +73 @@
         
         lgdt gdtr
-        lidt idtr
 
 meeting_point:

arch/ia32/src/pm.c

@@ -166 +166 @@
         struct descriptor *gdt_p = (struct descriptor *) PA2KA(gdtr.base);
 
+
+        /*
+         * Update addresses in GDT and IDT to their virtual counterparts.
+         */
+        gdtr.base = KA2PA(gdtr.base);
+        idtr.base = (__address) idt;
+        __asm__ volatile ("lgdt %0\n" : : "m" (gdtr));
+        __asm__ volatile ("lidt %0\n" : : "m" (idtr));  
+        
         /*
          * Each CPU has its private GDT and TSS.
@@ -198 +207 @@
          * to its own TSS. We just need to load the TR register.
          */
-        __asm__("ltr %0" : : "r" ((__u16) selector(TSS_DES)));
+        __asm__ volatile ("ltr %0" : : "r" ((__u16) selector(TSS_DES)));
         
         clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels */

arch/ia32/src/smp/ap.S

@@ -52 +52 @@
 
         lgdt gdtr                       # initialize Global Descriptor Table register
-        lidt idtr                       # initialize Interrupt Descriptor Table register
         
         movl %cr0,%eax