Changeset 3e828ea in mainline for kernel/arch/sparc64/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/sparc64/src

Files:

• console.c (modified) (2 diffs)
• drivers/kbd.c (modified) (3 diffs)
• drivers/tty.c (added)
• mm/sun4u/tlb.c (modified) (1 diff)
• sun4u/sparc64.c (modified) (1 diff)
• sun4v/sparc64.c (modified) (1 diff)

kernel/arch/sparc64/src/console.c

@@ -37 +37 @@
 #include <arch/drivers/scr.h>
 #include <arch/drivers/kbd.h>
+#include <arch/drivers/tty.h>
 #include <genarch/srln/srln.h>
 #include <console/chardev.h>
@@ -84 +85 @@
         kbd_init(keyboard);
 #endif
+
+#ifdef CONFIG_SUN_TTY
+        ofw_tree_property_t *prop_tty = ofw_tree_getprop(aliases, "ttya");
+        if (prop_tty && prop_tty->value) {
+                ofw_tree_node_t *tty = ofw_tree_lookup(prop_tty->value);
+                if (tty)
+                        tty_init(tty);
+        }
+#endif
 }
 

kernel/arch/sparc64/src/drivers/kbd.c

@@ -38 +38 @@
 #include <console/console.h>
 #include <ddi/irq.h>
-#include <mm/page.h>
-#include <arch/mm/page.h>
-#include <mm/km.h>
 #include <typedefs.h>
 #include <align.h>
@@ -88 +85 @@
         }
 
-        size_t size = ((ofw_ebus_reg_t *) prop->value)->size;
-
         uintptr_t pa = 0; // Prevent -Werror=maybe-uninitialized
         if (!ofw_ebus_apply_ranges(node->parent,
@@ -109 +104 @@
         }
 
-        ioport8_t *ns16550 = (ioport8_t *) km_map(pa, size,
-            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE);
-
-        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, 0, inr, cir,
-            cir_arg, NULL);
+        ns16550_instance_t *ns16550_instance = ns16550_init((ioport8_t *) pa, 0,
+            inr, cir, cir_arg, NULL);
         if (ns16550_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -311 +311 @@
                 t.a = true;
                 t.d = true;
-                dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_SECONDARY,
+                dtlb_demap(TLB_DEMAP_PAGE,
+                    (as == AS_KERNEL) ? TLB_DEMAP_PRIMARY : TLB_DEMAP_SECONDARY,
                     page_16k + index * MMU_PAGE_SIZE);
                 dtlb_pte_copy(&t, index, false);

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -163 +163 @@
 {
         (void) interrupts_disable();
-        switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+        switch_to_userspace(kernel_uarg->uspace_entry,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size -
             (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
-            (uintptr_t) kernel_uarg->uspace_uarg);
+            kernel_uarg->uspace_uarg);
 
         /* Not reached */

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -161 +161 @@
 {
         (void) interrupts_disable();
-        switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-            ((uintptr_t) kernel_uarg->uspace_stack) +
+        switch_to_userspace(kernel_uarg->uspace_entry,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size -
             (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
-            (uintptr_t) kernel_uarg->uspace_uarg);
+            kernel_uarg->uspace_uarg);
 
         /* Not reached */