|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] mini-os: switched initial C entry point to arch_init
commit 4db67cf657fe0194b56f042c3a89c29bca1e19a9
Author: Karim Raslan <karim.allah.ahmed@xxxxxxxxx>
AuthorDate: Thu Jun 26 12:28:23 2014 +0100
Commit: Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Jun 27 13:38:34 2014 +0100
mini-os: switched initial C entry point to arch_init
Signed-off-by: Karim Allah Ahmed <karim.allah.ahmed@xxxxxxxxx>
[talex5@xxxxxxxxx: separated from big ARM commit]
[talex5@xxxxxxxxx: restored comment, moved prototypes to headers]
Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
[talex5@xxxxxxxxx: restored stack address printk on x86]
[talex5@xxxxxxxxx: moved first printk's after start_info setup on x86]
Signed-off-by: Thomas Leonard <talex5@xxxxxxxxx>
---
extras/mini-os/arch/x86/setup.c | 44 +++++++++++++++++++++++++++++++-------
extras/mini-os/arch/x86/x86_32.S | 2 +-
extras/mini-os/arch/x86/x86_64.S | 2 +-
extras/mini-os/include/kernel.h | 6 +++-
extras/mini-os/include/x86/os.h | 2 -
extras/mini-os/kernel.c | 37 +++----------------------------
6 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/extras/mini-os/arch/x86/setup.c b/extras/mini-os/arch/x86/setup.c
index 54046d3..5e87dd1 100644
--- a/extras/mini-os/arch/x86/setup.c
+++ b/extras/mini-os/arch/x86/setup.c
@@ -28,6 +28,8 @@
#include <mini-os/os.h>
#include <mini-os/lib.h> /* for printk, memcpy */
+#include <mini-os/kernel.h>
+#include <xen/xen.h>
/*
* Shared page for communicating with the hypervisor.
@@ -87,20 +89,45 @@ static inline void sse_init(void) {
#define sse_init()
#endif
+
+/*
+ * INITIAL C ENTRY POINT.
+ */
void
arch_init(start_info_t *si)
{
+ static char hello[] = "Bootstrapping...\n";
+
+ (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello);
+
+ trap_init();
+
/*Initialize floating point unit */
- fpu_init();
+ fpu_init();
- /* Initialize SSE */
- sse_init();
+ /* Initialize SSE */
+ sse_init();
/* Copy the start_info struct to a globally-accessible area. */
/* WARN: don't do printk before here, it uses information from
shared_info. Use xprintk instead. */
memcpy(&start_info, si, sizeof(*si));
+ /* print out some useful information */
+ printk("Xen Minimal OS!\n");
+ printk(" start_info: %p(VA)\n", si);
+ printk(" nr_pages: 0x%lx\n", si->nr_pages);
+ printk(" shared_inf: 0x%08lx(MA)\n", si->shared_info);
+ printk(" pt_base: %p(VA)\n", (void *)si->pt_base);
+ printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames);
+ printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list);
+ printk(" mod_start: 0x%lx(VA)\n", si->mod_start);
+ printk(" mod_len: %lu\n", si->mod_len);
+ printk(" flags: 0x%x\n", (unsigned int)si->flags);
+ printk(" cmd_line: %s\n",
+ si->cmd_line ? (const char *)si->cmd_line : "NULL");
+ printk(" stack: %p-%p\n", stack, stack + sizeof(stack));
+
/* set up minimal memory infos */
phys_to_machine_mapping = (unsigned long *)start_info.mfn_list;
@@ -118,12 +145,15 @@ arch_init(start_info_t *si)
(unsigned long)failsafe_callback, 0);
#endif
-
+ start_kernel();
}
void
arch_fini(void)
{
+ /* Reset traps */
+ trap_fini();
+
#ifdef __i386__
HYPERVISOR_set_callbacks(0, 0, 0, 0);
#else
@@ -132,9 +162,7 @@ arch_fini(void)
}
void
-arch_print_info(void)
+arch_do_exit(void)
{
- printk(" stack: %p-%p\n", stack, stack + sizeof(stack));
+ stack_walk();
}
-
-
diff --git a/extras/mini-os/arch/x86/x86_32.S b/extras/mini-os/arch/x86/x86_32.S
index fb3e30a..b9aa392 100644
--- a/extras/mini-os/arch/x86/x86_32.S
+++ b/extras/mini-os/arch/x86/x86_32.S
@@ -20,7 +20,7 @@ _start:
lss stack_start,%esp
andl $(~(__STACK_SIZE-1)), %esp
push %esi
- call start_kernel
+ call arch_init
stack_start:
.long stack+(2*__STACK_SIZE), __KERNEL_SS
diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S
index f022eb3..df3469e 100644
--- a/extras/mini-os/arch/x86/x86_64.S
+++ b/extras/mini-os/arch/x86/x86_64.S
@@ -21,7 +21,7 @@ _start:
movq stack_start(%rip),%rsp
andq $(~(__STACK_SIZE-1)), %rsp
movq %rsi,%rdi
- call start_kernel
+ call arch_init
stack_start:
.quad stack+(2*__STACK_SIZE)
diff --git a/extras/mini-os/include/kernel.h b/extras/mini-os/include/kernel.h
index b36f172..13e3274 100644
--- a/extras/mini-os/include/kernel.h
+++ b/extras/mini-os/include/kernel.h
@@ -1,7 +1,9 @@
#ifndef _KERNEL_H_
#define _KERNEL_H_
-extern void do_exit(void) __attribute__((noreturn));
-extern void stop_kernel(void);
+void start_kernel(void);
+void do_exit(void) __attribute__((noreturn));
+void arch_do_exit(void);
+void stop_kernel(void);
#endif /* _KERNEL_H_ */
diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h
index f193865..73b8297 100644
--- a/extras/mini-os/include/x86/os.h
+++ b/extras/mini-os/include/x86/os.h
@@ -64,8 +64,6 @@ extern shared_info_t *HYPERVISOR_shared_info;
void trap_init(void);
void trap_fini(void);
-void arch_init(start_info_t *si);
-void arch_print_info(void);
void arch_fini(void);
diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c
index c7410db..9a30550 100644
--- a/extras/mini-os/kernel.c
+++ b/extras/mini-os/kernel.c
@@ -28,6 +28,7 @@
*/
#include <mini-os/os.h>
+#include <mini-os/kernel.h>
#include <mini-os/hypervisor.h>
#include <mini-os/mm.h>
#include <mini-os/events.h>
@@ -114,41 +115,14 @@ __attribute__((weak)) int app_main(start_info_t *si)
return 0;
}
-/*
- * INITIAL C ENTRY POINT.
- */
-void start_kernel(start_info_t *si)
+void start_kernel(void)
{
- static char hello[] = "Bootstrapping...\n";
-
- (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello);
-
- arch_init(si);
-
- trap_init();
-
- /* print out some useful information */
- printk("Xen Minimal OS!\n");
- printk(" start_info: %p(VA)\n", si);
- printk(" nr_pages: 0x%lx\n", si->nr_pages);
- printk(" shared_inf: 0x%08lx(MA)\n", si->shared_info);
- printk(" pt_base: %p(VA)\n", (void *)si->pt_base);
- printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames);
- printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list);
- printk(" mod_start: 0x%lx(VA)\n", si->mod_start);
- printk(" mod_len: %lu\n", si->mod_len);
- printk(" flags: 0x%x\n", (unsigned int)si->flags);
- printk(" cmd_line: %s\n",
- si->cmd_line ? (const char *)si->cmd_line : "NULL");
-
/* Set up events. */
init_events();
-
+
/* ENABLE EVENT DELIVERY. This is disabled at start of day. */
__sti();
- arch_print_info();
-
setup_xen_features();
/* Init memory management. */
@@ -201,9 +175,6 @@ void stop_kernel(void)
/* Reset events. */
fini_events();
- /* Reset traps */
- trap_fini();
-
/* Reset arch details */
arch_fini();
}
@@ -218,7 +189,7 @@ void stop_kernel(void)
void do_exit(void)
{
printk("Do_exit called!\n");
- stack_walk();
+ arch_do_exit();
for( ;; )
{
struct sched_shutdown sched_shutdown = { .reason = SHUTDOWN_crash };
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |