Changeset 36df4109 in mainline for kernel/arch/sparc64/src/sun4v

Timestamp:

2016-06-06T16:29:56Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7510326

Parents:

7f0580d

Message:

Introduce architecure-specific operations

This replaces the arch_*_init() functions with an arch_ops_t structure
defined for each architecture. Undefined operations are treated as NOPs.

Location:

kernel/arch/sparc64/src/sun4v

Files:

• sparc64.c (modified) (5 diffs)
• start.S (modified) (1 diff)

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

@@ -34 +34 @@
 
 #include <arch.h>
+#include <arch/arch.h>
 #include <debug.h>
 #include <config.h>
@@ -54 +55 @@
 #include <sysinfo/sysinfo.h>
 
+static void sparc64_pre_mm_init(void);
+static void sparc64_post_mm_init(void);
+static void sparc64_post_smp_init(void);
+
+arch_ops_t sparc64_ops = {
+        .pre_mm_init = sparc64_pre_mm_init,
+        .post_mm_init = sparc64_post_mm_init,
+        .post_smp_init = sparc64_post_smp_init,
+};
+
+arch_ops_t *arch_ops = &sparc64_ops;
+
 memmap_t memmap;
 
 /** Perform sparc64-specific initialization before main_bsp() is called. */
-void arch_pre_main(bootinfo_t *bootinfo)
+void sparc64_pre_main(bootinfo_t *bootinfo)
 {
         /* Copy init task info. */
@@ -82 +95 @@
 
 /** Perform sparc64 specific initialization before mm is initialized. */
-void arch_pre_mm_init(void)
+void sparc64_pre_mm_init(void)
 {
         if (config.cpu_active == 1) {
@@ -91 +104 @@
 
 /** Perform sparc64 specific initialization afterr mm is initialized. */
-void arch_post_mm_init(void)
+void sparc64_post_mm_init(void)
 {
         if (config.cpu_active == 1) {
@@ -105 +118 @@
 }
 
-void arch_post_cpu_init(void)
-{
-}
-
-void arch_pre_smp_init(void)
-{
-}
-
-void arch_post_smp_init(void)
+void sparc64_post_smp_init(void)
 {
         /* Currently the only supported platform for sparc64/sun4v is 'sun4v'. */

kernel/arch/sparc64/src/sun4v/start.S

@@ -248 +248 @@
 
         /*
-         * Call arch_pre_main(bootinfo)
-         */
-        call arch_pre_main
+         * Call sparc64_pre_main(bootinfo)
+         */
+        call sparc64_pre_main
         or %l1, %g0, %o0