Changeset 19b3cc6 in mainline for kernel/arch/ia32/src/smp/apic.c

Timestamp:

2014-01-17T23:12:10Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libdrv-cleanup branch (includes mainline changes)

File:

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

kernel/arch/ia32/src/smp/apic.c

@@ -42 +42 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
-#include <print.h>
+#include <log.h>
 #include <arch/asm.h>
 #include <arch.h>
@@ -135 +135 @@
 {
 #ifdef CONFIG_DEBUG
-        printf("cpu%u: APIC spurious interrupt\n", CPU->id);
+        log(LF_ARCH, LVL_DEBUG, "cpu%u: APIC spurious interrupt", CPU->id);
 #endif
 }
@@ -241 +241 @@
         esr.value = l_apic[ESR];
         
-        if (esr.send_checksum_error)
-                printf("Send Checksum Error\n");
-        if (esr.receive_checksum_error)
-                printf("Receive Checksum Error\n");
-        if (esr.send_accept_error)
-                printf("Send Accept Error\n");
-        if (esr.receive_accept_error)
-                printf("Receive Accept Error\n");
-        if (esr.send_illegal_vector)
-                printf("Send Illegal Vector\n");
-        if (esr.received_illegal_vector)
-                printf("Received Illegal Vector\n");
-        if (esr.illegal_register_address)
-                printf("Illegal Register Address\n");
+        if (esr.err_bitmap) {
+                log_begin(LF_ARCH, LVL_ERROR);
+                log_printf("APIC errors detected:");
+                if (esr.send_checksum_error)
+                        log_printf("\nSend Checksum Error");
+                if (esr.receive_checksum_error)
+                        log_printf("\nReceive Checksum Error");
+                if (esr.send_accept_error)
+                        log_printf("\nSend Accept Error");
+                if (esr.receive_accept_error)
+                        log_printf("\nReceive Accept Error");
+                if (esr.send_illegal_vector)
+                        log_printf("\nSend Illegal Vector");
+                if (esr.received_illegal_vector)
+                        log_printf("\nReceived Illegal Vector");
+                if (esr.illegal_register_address)
+                        log_printf("\nIllegal Register Address");
+                log_end();
+        }
         
         return !esr.err_bitmap;
@@ -270 +275 @@
                         retries = 0;
 #ifdef CONFIG_DEBUG
-                        printf("IPI is pending.\n");
+                        log(LF_ARCH, LVL_DEBUG, "IPI is pending.");
 #endif
                         delay(20);
@@ -489 +494 @@
 {
 #ifdef LAPIC_VERBOSE
-        printf("LVT on cpu%u, LAPIC ID: %" PRIu8 "\n",
+        log_begin(LF_ARCH, LVL_DEBUG);
+        log_printf("LVT on cpu%u, LAPIC ID: %" PRIu8 "\n",
             CPU->id, l_apic_id());
         
         lvt_tm_t tm;
         tm.value = l_apic[LVT_Tm];
-        printf("LVT Tm: vector=%" PRIu8 ", %s, %s, %s\n",
+        log_printf("LVT Tm: vector=%" PRIu8 ", %s, %s, %s\n",
             tm.vector, delivs_str[tm.delivs], mask_str[tm.masked],
             tm_mode_str[tm.mode]);
@@ -500 +506 @@
         lvt_lint_t lint;
         lint.value = l_apic[LVT_LINT0];
-        printf("LVT LINT0: vector=%" PRIu8 ", %s, %s, %s, irr=%u, %s, %s\n",
+        log_printf("LVT LINT0: vector=%" PRIu8 ", %s, %s, %s, irr=%u, %s, %s\n",
             tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs],
             intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode],
@@ -506 +512 @@
         
         lint.value = l_apic[LVT_LINT1];
-        printf("LVT LINT1: vector=%" PRIu8 ", %s, %s, %s, irr=%u, %s, %s\n",
+        log_printf("LVT LINT1: vector=%" PRIu8 ", %s, %s, %s, irr=%u, %s, %s\n",
             tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs],
             intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode],
@@ -513 +519 @@
         lvt_error_t error;
         error.value = l_apic[LVT_Err];
-        printf("LVT Err: vector=%" PRIu8 ", %s, %s\n", error.vector,
+        log_printf("LVT Err: vector=%" PRIu8 ", %s, %s\n", error.vector,
             delivs_str[error.delivs], mask_str[error.masked]);
+        log_end();
 #endif
 }