Changeset 8262010 in mainline for arch/ia32/src/smp/apic.c

Timestamp:

2005-04-10T16:36:45Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

23c0c08

Parents:

43114c5

Message:

Switch from mm-based 'the' mechanism to macro-based 'cpu_private_data[CPU_ID_ARCH]' mechanism.
Added l_apic_id() and some other minor APIC changes.
Move gdtr to K_DATA_START section.
Move K_DATA_START section immediately behind K_TEXT_START section so that real-mode addresses work even with growing size of kernel code.

File:

• arch/ia32/src/smp/apic.c (modified) (6 diffs)

arch/ia32/src/smp/apic.c

@@ -27 +27 @@
  */
 
-#ifdef __SMP__
-
 #include <arch/types.h>
 #include <arch/smp/apic.h>
@@ -39 +37 @@
 #include <arch/asm.h>
 #include <arch.h>
+
+#ifdef __SMP__
 
 /*
@@ -222 +222 @@
 {
         __u32 tmp, t1, t2;
-        
+        int cpu_id = config.cpu_active - 1;
+        
+
+        /*
+         * Here we set local APIC ID's so that they match operating system's CPU ID's
+         * This operation is dangerous as it is model specific.
+         * TODO: some care should be taken.
+         * NOTE: CPU may not be used to define APIC ID
+         */
+        if (l_apic_id() != cpu_id) {
+                l_apic[L_APIC_ID] &= L_APIC_IDClear;
+                l_apic[L_APIC_ID] |= (l_apic[L_APIC_ID]&L_APIC_IDClear)|((cpu_id)<<L_APIC_IDShift);
+        }
 
         l_apic[LVT_Err] |= (1<<16);
@@ -271 +283 @@
         int i, lint;
 
-        printf("LVT on cpu%d, LAPIC ID: %d\n", CPU->id, (l_apic[L_APIC_ID] >> 24)&0xf);
+        printf("LVT on cpu%d, LAPIC ID: %d\n", CPU->id, l_apic_id());
 
         printf("LVT_Tm: ");
@@ -305 +317 @@
          * This register is supported only on P6 and higher.
          */
-        if (CPU->family > 5) {
+        if (CPU->arch.family > 5) {
                 printf("LVT_PCINT: ");
                 if (l_apic[LVT_PCINT] & (1<<16)) printf("masked"); else printf("not masked"); putchar(',');
@@ -324 +336 @@
         l_apic_eoi();
         clock();
+}
+
+__u8 l_apic_id(void)
+{
+        return (l_apic[L_APIC_ID] >> L_APIC_IDShift)&L_APIC_IDMask;
 }