Changeset 3e828ea in mainline for kernel/arch/amd64/src

Timestamp:

2019-09-23T12:49:29Z (6 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

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (5 diffs)
• asm.S (modified) (2 diffs)
• debug/stacktrace.c (modified) (1 diff)
• interrupt.c (modified) (10 diffs)
• userspace.c (modified) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -60 +60 @@
 #include <arch/vreg.h>
 #include <arch/kseg.h>
+#include <genarch/pic/pic_ops.h>
 
 #ifdef CONFIG_SMP
@@ -121 +122 @@
                 /* PIC */
                 i8259_init((i8259_t *) I8259_PIC0_BASE,
-                    (i8259_t *) I8259_PIC1_BASE, IRQ_PIC1, IVT_IRQBASE,
-                    IVT_IRQBASE + 8);
-
-                /*
-                 * Set the enable/disable IRQs handlers.
-                 * Set the End-of-Interrupt handler.
-                 */
-                enable_irqs_function = pic_enable_irqs;
-                disable_irqs_function = pic_disable_irqs;
-                eoi_function = pic_eoi;
-                irqs_info = "i8259";
+                    (i8259_t *) I8259_PIC1_BASE, IVT_IRQBASE);
+
+                /* Set PIC operations. */
+                pic_ops = &i8259_pic_ops;
         }
 }
@@ -210 +204 @@
                         indev_t *kbrd = kbrd_wire(kbrd_instance, sink);
                         i8042_wire(i8042_instance, kbrd);
-                        trap_virtual_enable_irqs(1 << IRQ_KBD);
-                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
+                        pic_ops->enable_irqs(1 << IRQ_KBD);
+                        pic_ops->enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -236 +230 @@
                         indev_t *srln = srln_wire(srln_instance, sink);
                         ns16550_wire(ns16550_instance, srln);
-                        trap_virtual_enable_irqs(1 << IRQ_NS16550);
+                        pic_ops->enable_irqs(1 << IRQ_NS16550);
                 }
 #endif
@@ -247 +241 @@
 #endif
 
-        if (irqs_info != NULL)
-                sysinfo_set_item_val(irqs_info, NULL, true);
+        sysinfo_set_item_val(pic_ops->get_name(), NULL, true);
 }
 

kernel/arch/amd64/src/asm.S

@@ -398 +398 @@
         .asciz "Invalid instruction pointer."
 
-/** Print Unicode character to EGA display.
- *
- * If CONFIG_EGA is undefined or CONFIG_FB is defined
- * then this function does nothing.
+/** Print Unicode character to an early display device.
  *
  * Since the EGA can only display Extended ASCII (usually
@@ -413 +410 @@
  */
 FUNCTION_BEGIN(early_putwchar)
+
+#if (defined(CONFIG_L4RE_UVMM_EARLY_PRINT))
+        xorl %eax, %eax  /* RAX==0: uvmm's print hypercall */
+        mov %rdi, %rcx   /* RCX:    printed character */
+        vmcall
+#endif
+
 #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB)))
 

kernel/arch/amd64/src/debug/stacktrace.c

@@ -69 +69 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint64_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }
 

kernel/arch/amd64/src/interrupt.c

@@ -38 +38 @@
 #include <panic.h>
 #include <genarch/drivers/i8259/i8259.h>
+#include <genarch/pic/pic_ops.h>
 #include <halt.h>
 #include <cpu.h>
@@ -57 +58 @@
  * Interrupt and exception dispatching.
  */
-
-void (*disable_irqs_function)(uint16_t irqmask) = NULL;
-void (*enable_irqs_function)(uint16_t irqmask) = NULL;
-void (*eoi_function)(void) = NULL;
-const char *irqs_info = NULL;
+pic_ops_t *pic_ops = NULL;
 
 void istate_decode(istate_t *istate)
@@ -89 +86 @@
             "r14=%0#18" PRIx64 "\tr15=%0#18" PRIx64 "\n",
             istate->r12, istate->r13, istate->r14, istate->r15);
-}
-
-static void trap_virtual_eoi(void)
-{
-        if (eoi_function)
-                eoi_function();
-        else
-                panic("No eoi_function.");
-
 }
 
@@ -157 +145 @@
 static void tlb_shootdown_ipi(unsigned int n, istate_t *istate)
 {
-        trap_virtual_eoi();
+        pic_ops->eoi(0);
         tlb_shootdown_ipi_recv();
 }
@@ -172 +160 @@
         bool ack = false;
         assert(inum < IRQ_COUNT);
-        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
+        assert(inum != IRQ_PIC1);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -182 +170 @@
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
-                        trap_virtual_eoi();
+                        pic_ops->eoi(inum);
                         ack = true;
                 }
@@ -188 +176 @@
                 irq_spinlock_unlock(&irq->lock, false);
         } else {
-                /*
-                 * Spurious interrupt.
-                 */
 #ifdef CONFIG_DEBUG
-                log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious interrupt (inum=%u)",
-                    CPU->id, inum);
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ %u", CPU->id,
+                    inum);
 #endif
         }
 
         if (!ack)
-                trap_virtual_eoi();
+                pic_ops->eoi(inum);
+}
+
+static void pic_spurious(unsigned int n, istate_t *istate)
+{
+        unsigned int inum = n - IVT_IRQBASE;
+        if (!pic_ops->is_spurious(inum)) {
+                /* This is actually not a spurious IRQ, so proceed as usual. */
+                irq_interrupt(n, istate);
+                return;
+        }
+        pic_ops->handle_spurious(n);
+#ifdef CONFIG_DEBUG
+        log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u", CPU->id,
+            inum);
+#endif
 }
 
@@ -209 +209 @@
 
         for (i = 0; i < IRQ_COUNT; i++) {
-                if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
+                if ((i != IRQ_PIC0_SPUR) && (i != IRQ_PIC1_SPUR) &&
+                    (i != IRQ_PIC1))
                         exc_register(IVT_IRQBASE + i, "irq", true,
                             (iroutine_t) irq_interrupt);
@@ -218 +219 @@
         exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault);
         exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
+        exc_register(VECTOR_PIC0_SPUR, "pic0_spurious", true,
+            (iroutine_t) pic_spurious);
+        exc_register(VECTOR_PIC1_SPUR, "pic1_spurious", true,
+            (iroutine_t) pic_spurious);
 
 #ifdef CONFIG_SMP
@@ -225 +230 @@
 }
 
-void trap_virtual_enable_irqs(uint16_t irqmask)
-{
-        if (enable_irqs_function)
-                enable_irqs_function(irqmask);
-        else
-                panic("No enable_irqs_function.");
-}
-
-void trap_virtual_disable_irqs(uint16_t irqmask)
-{
-        if (disable_irqs_function)
-                disable_irqs_function(irqmask);
-        else
-                panic("No disable_irqs_function.");
-}
-
 /** @}
  */

kernel/arch/amd64/src/userspace.c

@@ -66 +66 @@
             "iretq\n"
             :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-              [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+              [stack_top] "r" (kernel_uarg->uspace_stack +
               kernel_uarg->uspace_stack_size),
               [rflags] "r" (rflags),