Changeset 4965a846 in mainline

Timestamp:

2006-07-24T14:19:44Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5de522d

Parents:

d227101

Message:

xen32 hypervisor interface

Location:

kernel/arch/xen32

Files:

• include/boot/boot.h (modified) (1 diff)
• include/hypercall.h (added)
• src/boot/boot.S (modified) (3 diffs)
• src/mm/memory_init.c (modified) (1 diff)
• src/xen32.c (modified) (2 diffs)

kernel/arch/xen32/include/boot/boot.h

@@ -36 +36 @@
 #define __xen32_BOOT_H__
 
+#define GUEST_CMDLINE   1024
+#define START_INFO_SIZE 1104
 #define BOOT_OFFSET             0x0000
-#define TEMP_STACK_SIZE 0x400
+
+#ifndef __ASM__
+
+#include <arch/types.h>
+
+typedef struct {
+        char magic[32];             /**< "xen-<version>-<platform>" */
+        unsigned long nr_pages;     /**< Total pages allocated to this domain */
+        unsigned long shared_info;  /**< Physical address of shared info struct */
+        uint32_t flags;             /**< SIF_xxx flags */
+        unsigned long store_mfn;    /**< Physical page number of shared page */
+        uint32_t store_evtchn;      /**< Event channel for store communication */
+        unsigned long console_mfn;  /**< Physical address of console page */
+        uint32_t console_evtchn;    /**< Event channel for console messages */
+        unsigned long pt_base;      /**< Virtual address of page directory */
+        unsigned long nr_pt_frames; /**< Number of bootstrap p.t. frames */
+        unsigned long mfn_list;     /**< Virtual address of page-frame list */
+        unsigned long mod_start;    /**< Virtual address of pre-loaded module */
+        unsigned long mod_len;      /**< Size (bytes) of pre-loaded module */
+        int8_t cmd_line[GUEST_CMDLINE];
+} start_info_t;
+
+extern start_info_t start_info;
+
+#endif
 
 #endif

kernel/arch/xen32/src/boot/boot.S

@@ -35 +35 @@
         .ascii  "GUEST_OS=HelenOS,"
         .ascii  "XEN_VER=xen-3.0,"
-        .ascii  "HYPERCALL_PAGE=0x2,"
+        .ascii  "HYPERCALL_PAGE=0x0002,"
         .ascii  "LOADER=generic,"
         .ascii  "PT_MODE_WRITABLE"
@@ -48 +48 @@
 kernel_image_start:
         cld
-        movl $kernel_stack, %esp         # initialize stack pointer
         
+        # copy start_info (esi initialized by Xen)
+        
+        movl $start_info, %edi
+        movl $START_INFO_SIZE >> 2, %ecx
+        cld
+        rep movsb
+
         call main_bsp                                                           # never returns
 
@@ -55 +61 @@
         hlt
 
-.data
+.global hypercall_page
 
-.align 4096
-page_directory:
-        .space 4096, 0
-
-kernel_stack_bottom:
-        .space TEMP_STACK_SIZE
-kernel_stack:
+.org (0x0002 * PAGE_SIZE)
+hypercall_page:
+        .space PAGE_SIZE

kernel/arch/xen32/src/mm/memory_init.c

@@ -35 +35 @@
 #include <arch/mm/memory_init.h>
 #include <arch/mm/page.h>
+#include <arch/boot/boot.h>
 #include <print.h>
 
 size_t get_memory_size(void) 
 {
-        return 0;
+        return start_info.nr_pages * PAGE_SIZE;
 }
 

kernel/arch/xen32/src/xen32.c

@@ -56 +56 @@
 #include <arch/bios/bios.h>
 
+#include <arch/boot/boot.h>
 #include <arch/mm/memory_init.h>
 #include <interrupt.h>
@@ -62 +63 @@
 #include <syscall/syscall.h>
 #include <console/console.h>
+
+start_info_t start_info;
 
 void arch_pre_mm_init(void)