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

Timestamp:

2005-11-24T18:43:46Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

78c32b4

Parents:

f701b236

Message:

SMP cleanup continued.
Add nice type for IO APIC ID register.
Replace some magic numbers with more descriptive macros.

File:

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

arch/ia32/src/smp/apic.c

@@ -65 +65 @@
 static int apic_poll_errors(void);
 
+#ifdef LAPIC_VERBOSE
 static char *delmod_str[] = {
         "Fixed",
@@ -105 +106 @@
         "Polarity Low"
 };
+#endif /* LAPIC_VERBOSE */
 
 /** Initialize APIC on BSP. */
 void apic_init(void)
 {
-        __u32 tmp, id, i;
+        io_apic_id_t idreg;
+        int i;
 
         trap_register(VECTOR_APIC_SPUR, apic_spurious);
@@ -124 +127 @@
         io_apic_disable_irqs(0xffff);
         trap_register(VECTOR_CLK, l_apic_timer_interrupt);
-        for (i=0; i<16; i++) {
+        for (i = 0; i < IRQ_COUNT; i++) {
                 int pin;
         
                 if ((pin = smp_irq_to_pin(i)) != -1) {
-                        io_apic_change_ioredtbl(pin, 0xff, IVT_IRQBASE+i, LOPRI);
+                        io_apic_change_ioredtbl(pin, DEST_ALL, IVT_IRQBASE+i, LOPRI);
                 }
         }
         
-
         /*
          * Ensure that io_apic has unique ID.
          */
-        tmp = io_apic_read(IOAPICID);
-        id = (tmp >> 24) & 0xf;
-        if ((1<<id) & apic_id_mask) {
-                int i;
-                
-                for (i=0; i<15; i++) {
+        idreg.value = io_apic_read(IOAPICID);
+        if ((1<<idreg.apic_id) & apic_id_mask) {        /* see if IO APIC ID is used already */
+                for (i = 0; i < APIC_ID_COUNT; i++) {
                         if (!((1<<i) & apic_id_mask)) {
-                                io_apic_write(IOAPICID, (tmp & (~(0xf<<24))) | (i<<24));
+                                idreg.apic_id = i;
+                                io_apic_write(IOAPICID, idreg.value);
                                 break;
                         }
@@ -153 +153 @@
          */
         l_apic_init();
+
         l_apic_debug(); 
 }
@@ -179 +180 @@
         
         if (esr.send_checksum_error)
-                printf("Send CS Error\n");
+                printf("Send Checksum Error\n");
         if (esr.receive_checksum_error)
-                printf("Receive CS Error\n");
+                printf("Receive Checksum Error\n");
         if (esr.send_accept_error)
                 printf("Send Accept Error\n");
@@ -217 +218 @@
 
         icr.lo = l_apic[ICRlo];
-        if (icr.lo & SEND_PENDING)
+        if (icr.delivs == DELIVS_PENDING)
                 printf("IPI is pending.\n");
 
@@ -260 +261 @@
 
         icr.lo = l_apic[ICRlo];
-        if (icr.lo & SEND_PENDING)
+        if (icr.delivs == DELIVS_PENDING)
                 printf("IPI is pending.\n");
 
@@ -293 +294 @@
         }
         
-        
         return apic_poll_errors();
 }
@@ -367 +367 @@
         
         l_apic[ICRT] = t1-t2;
-        
 }
 
@@ -414 +413 @@
 __u8 l_apic_id(void)
 {
-        lapic_id_t lapic_id;
-        
-        lapic_id.value = l_apic[L_APIC_ID];
-        return lapic_id.apic_id;
+        l_apic_id_t idreg;
+        
+        idreg.value = l_apic[L_APIC_ID];
+        return idreg.apic_id;
 }
 
@@ -491 +490 @@
         
         for (i=0;i<16;i++) {
-                if ((irqmask>>i) & 1) {
+                if (irqmask & (1<<i)) {
                         /*
                          * Mask the signal input in IO APIC if there is a
@@ -517 +516 @@
         
         for (i=0;i<16;i++) {
-                if ((irqmask>>i) & 1) {
+                if (irqmask & (1<<i)) {
                         /*
                          * Unmask the signal input in IO APIC if there is a
@@ -531 +530 @@
                 }
         }
-
 }