Index: kernel/arch/ia32xen/include/boot/boot.h =================================================================== --- kernel/arch/ia32xen/include/boot/boot.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ (revision ) @@ -1,190 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup ia32xen - * @{ - */ -/** @file - */ - -#ifndef KERN_ia32xen_BOOT_H_ -#define KERN_ia32xen_BOOT_H_ - -#define GUEST_CMDLINE 1024 -#define VIRT_CPUS 32 -#define START_INFO_SIZE 1104 - -#define BOOT_OFFSET 0x0000 -#define TEMP_STACK_SIZE 0x1000 - -#define XEN_VIRT_START 0xFC000000 -#define XEN_CS 0xe019 - -#define XEN_ELFNOTE_INFO 0 -#define XEN_ELFNOTE_ENTRY 1 -#define XEN_ELFNOTE_HYPERCALL_PAGE 2 -#define XEN_ELFNOTE_VIRT_BASE 3 -#define XEN_ELFNOTE_PADDR_OFFSET 4 -#define XEN_ELFNOTE_XEN_VERSION 5 -#define XEN_ELFNOTE_GUEST_OS 6 -#define XEN_ELFNOTE_GUEST_VERSION 7 -#define XEN_ELFNOTE_LOADER 8 -#define XEN_ELFNOTE_PAE_MODE 9 -#define XEN_ELFNOTE_FEATURES 10 -#define XEN_ELFNOTE_BSD_SYMTAB 11 - -#ifndef __ASM__ - -#define mp_map ((pfn_t *) XEN_VIRT_START) - -#define SIF_PRIVILEGED (1 << 0) /**< Privileged domain */ -#define SIF_INITDOMAIN (1 << 1) /**< Iinitial control domain */ - -#include - -typedef uint32_t evtchn_t; - -typedef struct { - uint32_t version; - uint32_t pad0; - uint64_t tsc_timestamp; /**< TSC at last update of time vals */ - uint64_t system_time; /**< Time, in nanosecs, since boot */ - uint32_t tsc_to_system_mul; - int8_t tsc_shift; - int8_t pad1[3]; -} vcpu_time_info_t; - -typedef struct { - uint32_t cr2; - uint32_t pad[5]; -} arch_vcpu_info_t; - -typedef struct arch_shared_info { - pfn_t max_pfn; /**< max pfn that appears in table */ - uint32_t pfn_to_mfn_frame_list_list; - uint32_t nmi_reason; -} arch_shared_info_t; - -typedef struct { - uint8_t evtchn_upcall_pending; - ipl_t evtchn_upcall_mask; - evtchn_t evtchn_pending_sel; - arch_vcpu_info_t arch; - vcpu_time_info_t time; -} vcpu_info_t; - -typedef struct { - vcpu_info_t vcpu_info[VIRT_CPUS]; - evtchn_t evtchn_pending[32]; - evtchn_t evtchn_mask[32]; - - uint32_t wc_version; /**< Version counter */ - uint32_t wc_sec; /**< Secs 00:00:00 UTC, Jan 1, 1970 */ - uint32_t wc_nsec; /**< Nsecs 00:00:00 UTC, Jan 1, 1970 */ - - arch_shared_info_t arch; -} shared_info_t; - -typedef struct { - int8_t magic[32]; /**< "xen--" */ - uint32_t frames; /**< Available frames */ - shared_info_t *shared_info; /**< Shared info structure (machine address) */ - uint32_t flags; /**< SIF_xxx flags */ - pfn_t store_mfn; /**< Shared page (machine page) */ - evtchn_t store_evtchn; /**< Event channel for store communication */ - - union { - struct { - pfn_t mfn; /**< Console page (machine page) */ - evtchn_t evtchn; /**< Event channel for console messages */ - } domU; - - struct { - uint32_t info_off; /**< Offset of console_info struct */ - uint32_t info_size; /**< Size of console_info struct from start */ - } dom0; - } console; - - pte_t *ptl0; /**< Boot PTL0 (kernel address) */ - uint32_t pt_frames; /**< Number of bootstrap page table frames */ - pfn_t *pm_map; /**< Physical->machine frame map (kernel address) */ - void *mod_start; /**< Modules start (kernel address) */ - uint32_t mod_len; /**< Modules size (bytes) */ - int8_t cmd_line[GUEST_CMDLINE]; -} start_info_t; - -#define XEN_CONSOLE_VGA 0x03 -#define XEN_CONSOLE_VESA 0x23 - -typedef struct { - uint8_t video_type; - - union { - struct { - uint16_t font_height; - uint16_t cursor_x; - uint16_t cursor_y; - uint16_t rows; - uint16_t columns; - } vga; - - struct { - uint16_t width; - uint16_t height; - uint16_t bytes_per_line; - uint16_t bits_per_pixel; - uint32_t lfb_base; - uint32_t lfb_size; - uint8_t red_pos; - uint8_t red_size; - uint8_t green_pos; - uint8_t green_size; - uint8_t blue_pos; - uint8_t blue_size; - uint8_t rsvd_pos; - uint8_t rsvd_size; - } vesa_lfb; - } info; -} console_info_t; - -typedef struct { - pfn_t start; - pfn_t size; - pfn_t reserved; -} memzone_t; - -extern start_info_t start_info; -extern shared_info_t shared_info; -extern memzone_t meminfo; - -#endif - -#endif - -/** @} - */ Index: kernel/arch/ia32xen/include/hypercall.h =================================================================== --- kernel/arch/ia32xen/include/hypercall.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ kernel/arch/ia32xen/include/hypercall.h (revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27) @@ -30,28 +30,39 @@ #define KERN_ia32xen_HYPERCALL_H_ -#include -#include - -typedef uint16_t domid_t; - -typedef struct { - uint8_t vector; /**< Exception vector */ - uint8_t flags; /**< 0-3: privilege level; 4: clear event enable */ - uint16_t cs; /**< Code selector */ - void *address; /**< Code offset */ -} trap_info_t; - - -typedef struct { - evtchn_t port; -} evtchn_send_t; - -typedef struct { - uint32_t cmd; - union { - evtchn_send_t send; - }; -} evtchn_op_t; - +#ifndef __ASM__ +# include +# include +#endif + +#define GUEST_CMDLINE 1024 +#define VIRT_CPUS 32 +#define START_INFO_SIZE 1104 + +#define BOOT_OFFSET 0x0000 +#define TEMP_STACK_SIZE 0x1000 + +#define XEN_VIRT_START 0xFC000000 +#define XEN_CS 0xe019 + +#define XEN_ELFNOTE_INFO 0 +#define XEN_ELFNOTE_ENTRY 1 +#define XEN_ELFNOTE_HYPERCALL_PAGE 2 +#define XEN_ELFNOTE_VIRT_BASE 3 +#define XEN_ELFNOTE_PADDR_OFFSET 4 +#define XEN_ELFNOTE_XEN_VERSION 5 +#define XEN_ELFNOTE_GUEST_OS 6 +#define XEN_ELFNOTE_GUEST_VERSION 7 +#define XEN_ELFNOTE_LOADER 8 +#define XEN_ELFNOTE_PAE_MODE 9 +#define XEN_ELFNOTE_FEATURES 10 +#define XEN_ELFNOTE_BSD_SYMTAB 11 + +#define mp_map ((pfn_t *) XEN_VIRT_START) + +#define SIF_PRIVILEGED (1 << 0) /**< Privileged domain */ +#define SIF_INITDOMAIN (1 << 1) /**< Iinitial control domain */ + +#define XEN_CONSOLE_VGA 0x03 +#define XEN_CONSOLE_VESA 0x23 #define XEN_SET_TRAP_TABLE 0 @@ -104,4 +115,136 @@ #define DOMID_IO (0x7FF1U) +#ifndef __ASM__ + +typedef uint16_t domid_t; +typedef uint32_t evtchn_t; + +typedef struct { + uint32_t version; + uint32_t pad0; + uint64_t tsc_timestamp; /**< TSC at last update of time vals */ + uint64_t system_time; /**< Time, in nanosecs, since boot */ + uint32_t tsc_to_system_mul; + int8_t tsc_shift; + int8_t pad1[3]; +} vcpu_time_info_t; + +typedef struct { + uint32_t cr2; + uint32_t pad[5]; +} arch_vcpu_info_t; + +typedef struct arch_shared_info { + pfn_t max_pfn; /**< max pfn that appears in table */ + uint32_t pfn_to_mfn_frame_list_list; + uint32_t nmi_reason; +} arch_shared_info_t; + +typedef struct { + uint8_t evtchn_upcall_pending; + ipl_t evtchn_upcall_mask; + evtchn_t evtchn_pending_sel; + arch_vcpu_info_t arch; + vcpu_time_info_t time; +} vcpu_info_t; + +typedef struct { + vcpu_info_t vcpu_info[VIRT_CPUS]; + evtchn_t evtchn_pending[32]; + evtchn_t evtchn_mask[32]; + + uint32_t wc_version; /**< Version counter */ + uint32_t wc_sec; /**< Secs 00:00:00 UTC, Jan 1, 1970 */ + uint32_t wc_nsec; /**< Nsecs 00:00:00 UTC, Jan 1, 1970 */ + + arch_shared_info_t arch; +} shared_info_t; + +typedef struct { + int8_t magic[32]; /**< "xen--" */ + uint32_t frames; /**< Available frames */ + shared_info_t *shared_info; /**< Shared info structure (machine address) */ + uint32_t flags; /**< SIF_xxx flags */ + pfn_t store_mfn; /**< Shared page (machine page) */ + evtchn_t store_evtchn; /**< Event channel for store communication */ + + union { + struct { + pfn_t mfn; /**< Console page (machine page) */ + evtchn_t evtchn; /**< Event channel for console messages */ + } domU; + + struct { + uint32_t info_off; /**< Offset of console_info struct */ + uint32_t info_size; /**< Size of console_info struct from start */ + } dom0; + } console; + + pte_t *ptl0; /**< Boot PTL0 (kernel address) */ + uint32_t pt_frames; /**< Number of bootstrap page table frames */ + pfn_t *pm_map; /**< Physical->machine frame map (kernel address) */ + void *mod_start; /**< Modules start (kernel address) */ + uint32_t mod_len; /**< Modules size (bytes) */ + int8_t cmd_line[GUEST_CMDLINE]; +} start_info_t; + +typedef struct { + uint8_t video_type; + + union { + struct { + uint16_t font_height; + uint16_t cursor_x; + uint16_t cursor_y; + uint16_t rows; + uint16_t columns; + } vga; + + struct { + uint16_t width; + uint16_t height; + uint16_t bytes_per_line; + uint16_t bits_per_pixel; + uint32_t lfb_base; + uint32_t lfb_size; + uint8_t red_pos; + uint8_t red_size; + uint8_t green_pos; + uint8_t green_size; + uint8_t blue_pos; + uint8_t blue_size; + uint8_t rsvd_pos; + uint8_t rsvd_size; + } vesa_lfb; + } info; +} console_info_t; + +typedef struct { + pfn_t start; + pfn_t size; + pfn_t reserved; +} memzone_t; + +extern start_info_t start_info; +extern shared_info_t shared_info; +extern memzone_t meminfo; + +typedef struct { + uint8_t vector; /**< Exception vector */ + uint8_t flags; /**< 0-3: privilege level; 4: clear event enable */ + uint16_t cs; /**< Code selector */ + void *address; /**< Code offset */ +} trap_info_t; + +typedef struct { + evtchn_t port; +} evtchn_send_t; + +typedef struct { + uint32_t cmd; + union { + evtchn_send_t send; + }; +} evtchn_op_t; #define force_evtchn_callback() ((void) xen_version(0, 0)) @@ -235,2 +378,4 @@ #endif + +#endif Index: kernel/arch/ia32xen/include/mm/as.h =================================================================== --- kernel/arch/ia32xen/include/mm/as.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ kernel/arch/ia32xen/include/mm/as.h (revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27) @@ -48,4 +48,6 @@ } as_arch_t; +#include + #define as_constructor_arch(as, flags) (as != as) #define as_destructor_arch(as) (as != as) Index: kernel/arch/ia32xen/include/mm/frame.h =================================================================== --- kernel/arch/ia32xen/include/mm/frame.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ kernel/arch/ia32xen/include/mm/frame.h (revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27) @@ -43,7 +43,4 @@ #ifndef __ASM__ -#include -#include - #define PA2MA(x) ((start_info.pm_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff)) #define MA2PA(x) ((mp_map[((uintptr_t) (x)) >> 12] << 12) + (((uintptr_t) (x)) & 0xfff)) Index: kernel/arch/ia32xen/include/mm/memory_init.h =================================================================== --- kernel/arch/ia32xen/include/mm/memory_init.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ kernel/arch/ia32xen/include/mm/memory_init.h (revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27) @@ -37,5 +37,5 @@ #define KERN_ia32xen_MEMORY_INIT_H_ -#include +#include size_t get_memory_size(void); Index: kernel/arch/ia32xen/include/mm/page.h =================================================================== --- kernel/arch/ia32xen/include/mm/page.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ kernel/arch/ia32xen/include/mm/page.h (revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27) @@ -122,9 +122,7 @@ #ifndef __ASM__ -#include -#include -#include -#include +#include #include +#include /* Page fault error codes. */ @@ -141,20 +139,4 @@ /** When bit on this position is 1, a reserved bit was set in page directory. */ #define PFERR_CODE_RSVD (1 << 3) - -/** Page Table Entry. */ -struct page_specifier { - unsigned present : 1; - unsigned writeable : 1; - unsigned uaccessible : 1; - unsigned page_write_through : 1; - unsigned page_cache_disable : 1; - unsigned accessed : 1; - unsigned dirty : 1; - unsigned pat : 1; - unsigned global : 1; - unsigned soft_valid : 1; /**< Valid content even if the present bit is not set. */ - unsigned avl : 2; - unsigned frame_address : 20; -} __attribute__ ((packed)); typedef struct { Index: kernel/arch/ia32xen/include/pm.h =================================================================== --- kernel/arch/ia32xen/include/pm.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ kernel/arch/ia32xen/include/pm.h (revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27) @@ -70,5 +70,4 @@ #include -#include #include Index: kernel/arch/ia32xen/include/types.h =================================================================== --- kernel/arch/ia32xen/include/types.h (revision e7b7be3ff072782e570cb6ee64b50b1625a3fd89) +++ kernel/arch/ia32xen/include/types.h (revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27) @@ -37,4 +37,6 @@ #define NULL 0 +#define false 0 +#define true 1 typedef signed char int8_t; @@ -48,4 +50,8 @@ typedef unsigned long long uint64_t; +typedef uint32_t size_t; +typedef uint32_t count_t; +typedef uint32_t index_t; + typedef uint32_t uintptr_t; typedef uint32_t pfn_t; @@ -56,5 +62,26 @@ typedef int32_t native_t; -typedef struct page_specifier pte_t; +typedef uint8_t bool; +typedef uint64_t task_id_t; +typedef uint32_t context_id_t; + +typedef int32_t inr_t; +typedef int32_t devno_t; + +/** Page Table Entry. */ +typedef struct { + unsigned present : 1; + unsigned writeable : 1; + unsigned uaccessible : 1; + unsigned page_write_through : 1; + unsigned page_cache_disable : 1; + unsigned accessed : 1; + unsigned dirty : 1; + unsigned pat : 1; + unsigned global : 1; + unsigned soft_valid : 1; /**< Valid content even if the present bit is not set. */ + unsigned avl : 2; + unsigned frame_address : 20; +} __attribute__ ((packed)) pte_t; #endif