Changeset 3e828ea in mainline for kernel/arch/ia32/src/smp/apic.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

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

@@ -47 +47 @@
 #include <arch.h>
 #include <ddi/irq.h>
+#include <genarch/pic/pic_ops.h>
 
 #ifdef CONFIG_SMP
@@ -63 +64 @@
  */
 
+static const char *apic_get_name(void);
+static bool l_apic_is_spurious(unsigned int);
+static void l_apic_handle_spurious(unsigned int);
+
+pic_ops_t apic_pic_ops = {
+        .get_name = apic_get_name,
+        .enable_irqs = io_apic_enable_irqs,
+        .disable_irqs = io_apic_disable_irqs,
+        .eoi = l_apic_eoi,
+        .is_spurious = l_apic_is_spurious,
+        .handle_spurious = l_apic_handle_spurious,
+};
+
 /*
  * These variables either stay configured as initilalized, or are changed by
@@ -125 +139 @@
 #endif /* LAPIC_VERBOSE */
 
+const char *apic_get_name(void)
+{
+        return "apic";
+}
+
+bool l_apic_is_spurious(unsigned int n)
+{
+        return n == VECTOR_APIC_SPUR;
+}
+
+void l_apic_handle_spurious(unsigned int n)
+{
+}
+
 /** APIC spurious interrupt handler.
  *
@@ -134 +162 @@
     istate_t *istate __attribute__((unused)))
 {
-#ifdef CONFIG_DEBUG
-        log(LF_ARCH, LVL_DEBUG, "cpu%u: APIC spurious interrupt", CPU->id);
-#endif
 }
 
@@ -175 +200 @@
             (iroutine_t) apic_spurious);
 
-        enable_irqs_function = io_apic_enable_irqs;
-        disable_irqs_function = io_apic_disable_irqs;
-        eoi_function = l_apic_eoi;
-        irqs_info = "apic";
+        pic_ops = &apic_pic_ops;
 
         /*
@@ -508 +530 @@
 
 /** Local APIC End of Interrupt. */
-void l_apic_eoi(void)
+void l_apic_eoi(unsigned int ignored)
 {
         l_apic[EOI] = 0;