Index: boot/Makefile.build =================================================================== --- boot/Makefile.build (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ boot/Makefile.build (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -31,5 +31,5 @@ include Makefile.common -INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include +INCLUDES = -Igeneric/include -Iarch/$(KARCH)/include -Igenarch/include -I$(ROOT_PATH)/abi/include OPTIMIZATION = 3 @@ -76,5 +76,5 @@ clean: - rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) + rm -f $(RAW) $(MAP) -include $(DEPENDS) @@ -109,5 +109,5 @@ endif -depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(PRE_DEPEND) +depend: $(PRE_DEPEND) $(COMPS).s: $(COMPS).zip @@ -128,7 +128,2 @@ include Makefile.initrd -$(ARCH_INCLUDE) $(ARCH_INCLUDE)/%.h: arch/$(KARCH)/include/ - ln -sfn ../../$< $@ - -$(GENARCH_INCLUDE) $(GENARCH_INCLUDE)/%.h: genarch/include/ - ln -sfn ../../$< $@ Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ boot/Makefile.common (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -58,7 +58,4 @@ JOBFILE = $(ROOT_PATH)/tools/jobfile.py - -ARCH_INCLUDE = generic/include/arch -GENARCH_INCLUDE = generic/include/genarch DISTROOT = distroot Index: boot/arch/arm32/include/arch.h =================================================================== --- boot/arch/arm32/include/arch.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,74 +1,0 @@ -/* - * Copyright (c) 2010 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. - */ - -#ifndef BOOT_arm32_ARCH_H -#define BOOT_arm32_ARCH_H - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#define PTL0_ENTRIES 4096 -#define PTL0_ENTRY_SIZE 4 - -/* - * Address where the boot stage image starts (beginning of usable physical - * memory). - */ -#ifdef MACHINE_gta02 -#define BOOT_BASE 0x30008000 -#elif defined MACHINE_beagleboardxm -#define BOOT_BASE 0x80000000 -#elif defined MACHINE_beaglebone -#define BOOT_BASE 0x80000000 -#elif defined MACHINE_raspberrypi -#define BOOT_BASE 0x00008000 -#else -#define BOOT_BASE 0x00000000 -#endif - -#define BOOT_OFFSET (BOOT_BASE + 0xa00000) - -#ifdef MACHINE_beagleboardxm - #define PA_OFFSET 0 -#elif defined MACHINE_beaglebone - #define PA_OFFSET 0 -#else - #define PA_OFFSET 0x80000000 -#endif - -#ifndef __ASM__ - #define PA2KA(addr) (((uintptr_t) (addr)) + PA_OFFSET) -#else - #define PA2KA(addr) ((addr) + PA_OFFSET) -#endif - - -#endif - -/** @} - */ Index: boot/arch/arm32/include/arch/arch.h =================================================================== --- boot/arch/arm32/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/arm32/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2010 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. + */ + +#ifndef BOOT_arm32_ARCH_H +#define BOOT_arm32_ARCH_H + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define PTL0_ENTRIES 4096 +#define PTL0_ENTRY_SIZE 4 + +/* + * Address where the boot stage image starts (beginning of usable physical + * memory). + */ +#ifdef MACHINE_gta02 +#define BOOT_BASE 0x30008000 +#elif defined MACHINE_beagleboardxm +#define BOOT_BASE 0x80000000 +#elif defined MACHINE_beaglebone +#define BOOT_BASE 0x80000000 +#elif defined MACHINE_raspberrypi +#define BOOT_BASE 0x00008000 +#else +#define BOOT_BASE 0x00000000 +#endif + +#define BOOT_OFFSET (BOOT_BASE + 0xa00000) + +#ifdef MACHINE_beagleboardxm + #define PA_OFFSET 0 +#elif defined MACHINE_beaglebone + #define PA_OFFSET 0 +#else + #define PA_OFFSET 0x80000000 +#endif + +#ifndef __ASM__ + #define PA2KA(addr) (((uintptr_t) (addr)) + PA_OFFSET) +#else + #define PA2KA(addr) ((addr) + PA_OFFSET) +#endif + + +#endif + +/** @} + */ Index: boot/arch/arm32/include/arch/asm.h =================================================================== --- boot/arch/arm32/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/arm32/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2007 Michal Kebrt + * 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 arm32boot + * @{ + */ +/** @file + * @brief Functions implemented in assembly. + */ + +#ifndef BOOT_arm32_ASM_H +#define BOOT_arm32_ASM_H + +#include +#include + +extern pte_level0_section_t boot_pt[PTL0_ENTRIES]; +extern void *boot_stack; + +/** Jump to the kernel entry point. + * + * @param entry Kernel entry point. + * @param bootinfo Structure holding information about loaded tasks. + * + */ +extern void jump_to_kernel(void *entry, void *bootinfo) + __attribute__((noreturn)); + +#endif + +/** @} + */ Index: boot/arch/arm32/include/arch/cp15.h =================================================================== --- boot/arch/arm32/include/arch/cp15.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/arm32/include/arch/cp15.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,1 @@ +../../../../../kernel/arch/arm32/include/arch/cp15.h Index: boot/arch/arm32/include/arch/main.h =================================================================== --- boot/arch/arm32/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/arm32/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2007 Michal Kebrt + * Copyright (c) 2010 Jiri Svoboda + * 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 arm32boot + * @{ + */ +/** @file + * @brief Boot related declarations. + */ + +#ifndef BOOT_arm32_MAIN_H +#define BOOT_arm32_MAIN_H + +/** Address where characters to be printed are expected. */ + + +/** BeagleBoard-xM UART register address + * + * This is UART3 of AM/DM37x CPU + */ +#define BBXM_SCONS_THR 0x49020000 +#define BBXM_SCONS_SSR 0x49020044 + +/* Check this bit before writing (tx fifo full) */ +#define BBXM_THR_FULL 0x00000001 + +/** Beaglebone UART register addresses + * + * This is UART0 of AM335x CPU + */ +#define BBONE_SCONS_THR 0x44E09000 +#define BBONE_SCONS_SSR 0x44E09044 + +/** Check this bit before writing (tx fifo full) */ +#define BBONE_TXFIFO_FULL 0x00000001 + +/** GTA02 serial console UART register addresses. + * + * This is UART channel 2 of the S3C24xx CPU + */ +#define GTA02_SCONS_UTRSTAT 0x50008010 +#define GTA02_SCONS_UTXH 0x50008020 + +/* Bits in UTXH register */ +#define S3C24XX_UTXH_TX_EMPTY 0x00000004 + + +/** IntegratorCP serial console output register */ +#define ICP_SCONS_ADDR 0x16000000 + +/** Raspberry PI serial console registers */ +#define BCM2835_UART0_BASE 0x20201000 +#define BCM2835_UART0_DR (BCM2835_UART0_BASE + 0x00) +#define BCM2835_UART0_FR (BCM2835_UART0_BASE + 0x18) +#define BCM2835_UART0_ILPR (BCM2835_UART0_BASE + 0x20) +#define BCM2835_UART0_IBRD (BCM2835_UART0_BASE + 0x24) +#define BCM2835_UART0_FBRD (BCM2835_UART0_BASE + 0x28) +#define BCM2835_UART0_LCRH (BCM2835_UART0_BASE + 0x2C) +#define BCM2835_UART0_CR (BCM2835_UART0_BASE + 0x30) +#define BCM2835_UART0_ICR (BCM2835_UART0_BASE + 0x44) + +#define BCM2835_UART0_FR_TXFF (1 << 5) +#define BCM2835_UART0_LCRH_FEN (1 << 4) +#define BCM2835_UART0_LCRH_WL8 ((1 << 5) | (1 << 6)) +#define BCM2835_UART0_CR_UARTEN (1 << 0) +#define BCM2835_UART0_CR_TXE (1 << 8) +#define BCM2835_UART0_CR_RXE (1 << 9) + + + +extern void bootstrap(void); + +#endif + +/** @} + */ Index: boot/arch/arm32/include/arch/mm.h =================================================================== --- boot/arch/arm32/include/arch/mm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/arm32/include/arch/mm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2007 Pavel Jancik + * Copyright (c) 2007 Michal Kebrt + * 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 arm32boot + * @{ + */ +/** @file + * @brief Memory management used while booting the kernel. + * + * So called "section" paging is used while booting the kernel. The term + * "section" comes from the ARM architecture specification and stands for the + * following: one-level paging, 1MB sized pages, 4096 entries in the page + * table. + */ + +#ifndef BOOT_arm32__MM_H +#define BOOT_arm32__MM_H + +/** Describe "section" page table entry (one-level paging with 1 MB sized pages). */ +#define PTE_DESCRIPTOR_SECTION 0x02 +/** Shift of memory address in section descriptor */ +#define PTE_SECTION_SHIFT 20 + +/** Page table access rights: user - no access, kernel - read/write. */ +#define PTE_AP_USER_NO_KERNEL_RW 0x01 + +/** Start of memory mapped I/O area for GTA02 */ +#define GTA02_IOMEM_START 0x48000000 +/** End of memory mapped I/O area for GTA02 */ +#define GTA02_IOMEM_END 0x60000000 + +/** Start of ram memory on BBxM */ +#define BBXM_RAM_START 0x80000000 +/** Start of ram memory on BBxM */ +#define BBXM_RAM_END 0xc0000000 + +/** Start of ram memory on AM335x */ +#define AM335x_RAM_START 0x80000000 +/** End of ram memory on AM335x */ +#define AM335x_RAM_END 0xC0000000 + +/** Start of ram memory on BCM2835 */ +#define BCM2835_RAM_START 0 +/** End of ram memory on BCM2835 */ +#define BCM2835_RAM_END 0x20000000 + +/* Page table level 0 entry - "section" format is used + * (one-level paging, 1 MB sized pages). Used only while booting the kernel. + */ +typedef struct { + unsigned int descriptor_type : 2; + unsigned int bufferable : 1; + unsigned int cacheable : 1; + unsigned int xn : 1; + unsigned int domain : 4; + unsigned int should_be_zero_1 : 1; + unsigned int access_permission_0 : 2; + unsigned int tex : 3; + unsigned int access_permission_1 : 1; + unsigned int shareable : 1; + unsigned int non_global : 1; + unsigned int should_be_zero_2 : 1; + unsigned int non_secure : 1; + unsigned int section_base_addr : 12; +} __attribute__((packed)) pte_level0_section_t; + +extern void mmu_start(void); + +#endif + +/** @} + */ Index: boot/arch/arm32/include/arch/types.h =================================================================== --- boot/arch/arm32/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/arm32/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,61 @@ +/* + * 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 arm32boot + * @{ + */ +/** @file + * @brief Definitions of basic types like #uintptr_t. + */ + +#ifndef BOOT_arm32_TYPES_H +#define BOOT_arm32_TYPES_H + +#include <_bits/all.h> + +#define TASKMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 + +typedef struct { + /** Address where the task was placed. */ + void *addr; + /** Size of the task's binary. */ + size_t size; + /** Task name. */ + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} task_t; + +typedef struct { + size_t cnt; + task_t tasks[TASKMAP_MAX_RECORDS]; +} bootinfo_t; + +#endif + +/** @} + */ Index: boot/arch/arm32/include/asm.h =================================================================== --- boot/arch/arm32/include/asm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,57 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * 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 arm32boot - * @{ - */ -/** @file - * @brief Functions implemented in assembly. - */ - -#ifndef BOOT_arm32_ASM_H -#define BOOT_arm32_ASM_H - -#include -#include - -extern pte_level0_section_t boot_pt[PTL0_ENTRIES]; -extern void *boot_stack; - -/** Jump to the kernel entry point. - * - * @param entry Kernel entry point. - * @param bootinfo Structure holding information about loaded tasks. - * - */ -extern void jump_to_kernel(void *entry, void *bootinfo) - __attribute__((noreturn)); - -#endif - -/** @} - */ Index: boot/arch/arm32/include/cp15.h =================================================================== --- boot/arch/arm32/include/cp15.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../kernel/arch/arm32/include/arch/cp15.h Index: boot/arch/arm32/include/main.h =================================================================== --- boot/arch/arm32/include/main.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,102 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * Copyright (c) 2010 Jiri Svoboda - * 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 arm32boot - * @{ - */ -/** @file - * @brief Boot related declarations. - */ - -#ifndef BOOT_arm32_MAIN_H -#define BOOT_arm32_MAIN_H - -/** Address where characters to be printed are expected. */ - - -/** BeagleBoard-xM UART register address - * - * This is UART3 of AM/DM37x CPU - */ -#define BBXM_SCONS_THR 0x49020000 -#define BBXM_SCONS_SSR 0x49020044 - -/* Check this bit before writing (tx fifo full) */ -#define BBXM_THR_FULL 0x00000001 - -/** Beaglebone UART register addresses - * - * This is UART0 of AM335x CPU - */ -#define BBONE_SCONS_THR 0x44E09000 -#define BBONE_SCONS_SSR 0x44E09044 - -/** Check this bit before writing (tx fifo full) */ -#define BBONE_TXFIFO_FULL 0x00000001 - -/** GTA02 serial console UART register addresses. - * - * This is UART channel 2 of the S3C24xx CPU - */ -#define GTA02_SCONS_UTRSTAT 0x50008010 -#define GTA02_SCONS_UTXH 0x50008020 - -/* Bits in UTXH register */ -#define S3C24XX_UTXH_TX_EMPTY 0x00000004 - - -/** IntegratorCP serial console output register */ -#define ICP_SCONS_ADDR 0x16000000 - -/** Raspberry PI serial console registers */ -#define BCM2835_UART0_BASE 0x20201000 -#define BCM2835_UART0_DR (BCM2835_UART0_BASE + 0x00) -#define BCM2835_UART0_FR (BCM2835_UART0_BASE + 0x18) -#define BCM2835_UART0_ILPR (BCM2835_UART0_BASE + 0x20) -#define BCM2835_UART0_IBRD (BCM2835_UART0_BASE + 0x24) -#define BCM2835_UART0_FBRD (BCM2835_UART0_BASE + 0x28) -#define BCM2835_UART0_LCRH (BCM2835_UART0_BASE + 0x2C) -#define BCM2835_UART0_CR (BCM2835_UART0_BASE + 0x30) -#define BCM2835_UART0_ICR (BCM2835_UART0_BASE + 0x44) - -#define BCM2835_UART0_FR_TXFF (1 << 5) -#define BCM2835_UART0_LCRH_FEN (1 << 4) -#define BCM2835_UART0_LCRH_WL8 ((1 << 5) | (1 << 6)) -#define BCM2835_UART0_CR_UARTEN (1 << 0) -#define BCM2835_UART0_CR_TXE (1 << 8) -#define BCM2835_UART0_CR_RXE (1 << 9) - - - -extern void bootstrap(void); - -#endif - -/** @} - */ Index: boot/arch/arm32/include/mm.h =================================================================== --- boot/arch/arm32/include/mm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,98 +1,0 @@ -/* - * Copyright (c) 2007 Pavel Jancik - * Copyright (c) 2007 Michal Kebrt - * 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 arm32boot - * @{ - */ -/** @file - * @brief Memory management used while booting the kernel. - * - * So called "section" paging is used while booting the kernel. The term - * "section" comes from the ARM architecture specification and stands for the - * following: one-level paging, 1MB sized pages, 4096 entries in the page - * table. - */ - -#ifndef BOOT_arm32__MM_H -#define BOOT_arm32__MM_H - -/** Describe "section" page table entry (one-level paging with 1 MB sized pages). */ -#define PTE_DESCRIPTOR_SECTION 0x02 -/** Shift of memory address in section descriptor */ -#define PTE_SECTION_SHIFT 20 - -/** Page table access rights: user - no access, kernel - read/write. */ -#define PTE_AP_USER_NO_KERNEL_RW 0x01 - -/** Start of memory mapped I/O area for GTA02 */ -#define GTA02_IOMEM_START 0x48000000 -/** End of memory mapped I/O area for GTA02 */ -#define GTA02_IOMEM_END 0x60000000 - -/** Start of ram memory on BBxM */ -#define BBXM_RAM_START 0x80000000 -/** Start of ram memory on BBxM */ -#define BBXM_RAM_END 0xc0000000 - -/** Start of ram memory on AM335x */ -#define AM335x_RAM_START 0x80000000 -/** End of ram memory on AM335x */ -#define AM335x_RAM_END 0xC0000000 - -/** Start of ram memory on BCM2835 */ -#define BCM2835_RAM_START 0 -/** End of ram memory on BCM2835 */ -#define BCM2835_RAM_END 0x20000000 - -/* Page table level 0 entry - "section" format is used - * (one-level paging, 1 MB sized pages). Used only while booting the kernel. - */ -typedef struct { - unsigned int descriptor_type : 2; - unsigned int bufferable : 1; - unsigned int cacheable : 1; - unsigned int xn : 1; - unsigned int domain : 4; - unsigned int should_be_zero_1 : 1; - unsigned int access_permission_0 : 2; - unsigned int tex : 3; - unsigned int access_permission_1 : 1; - unsigned int shareable : 1; - unsigned int non_global : 1; - unsigned int should_be_zero_2 : 1; - unsigned int non_secure : 1; - unsigned int section_base_addr : 12; -} __attribute__((packed)) pte_level0_section_t; - -extern void mmu_start(void); - -#endif - -/** @} - */ Index: boot/arch/arm32/include/types.h =================================================================== --- boot/arch/arm32/include/types.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,61 +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 arm32boot - * @{ - */ -/** @file - * @brief Definitions of basic types like #uintptr_t. - */ - -#ifndef BOOT_arm32_TYPES_H -#define BOOT_arm32_TYPES_H - -#include <_bits/all.h> - -#define TASKMAP_MAX_RECORDS 32 -#define BOOTINFO_TASK_NAME_BUFLEN 32 - -typedef struct { - /** Address where the task was placed. */ - void *addr; - /** Size of the task's binary. */ - size_t size; - /** Task name. */ - char name[BOOTINFO_TASK_NAME_BUFLEN]; -} task_t; - -typedef struct { - size_t cnt; - task_t tasks[TASKMAP_MAX_RECORDS]; -} bootinfo_t; - -#endif - -/** @} - */ Index: boot/arch/ia64/include/arch.h =================================================================== --- boot/arch/ia64/include/arch.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,42 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * Copyright (c) 2006 Jakub Jermar - * 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. - */ - -#ifndef BOOT_ia64_ARCH_H_ -#define BOOT_ia64_ARCH_H_ - -#define PAGE_WIDTH 14 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#define LOADER_ADDRESS 0x4400000 -#define KERNEL_ADDRESS 0x4800000 - -#define STACK_SIZE 8192 -#define STACK_ALIGNMENT 16 - -#endif Index: boot/arch/ia64/include/arch/arch.h =================================================================== --- boot/arch/ia64/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ia64/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2006 Martin Decky + * Copyright (c) 2006 Jakub Jermar + * 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. + */ + +#ifndef BOOT_ia64_ARCH_H_ +#define BOOT_ia64_ARCH_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define LOADER_ADDRESS 0x4400000 +#define KERNEL_ADDRESS 0x4800000 + +#define STACK_SIZE 8192 +#define STACK_ALIGNMENT 16 + +#endif Index: boot/arch/ia64/include/arch/asm.h =================================================================== --- boot/arch/ia64/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ia64/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2006 Martin Decky + * Copyright (c) 2006 Jakub Jermar + * 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. + */ + +#ifndef BOOT_ia64_ASM_H_ +#define BOOT_ia64_ASM_H_ + +extern void jump_to_kernel(void *) __attribute__((noreturn)); + +#endif Index: boot/arch/ia64/include/arch/main.h =================================================================== --- boot/arch/ia64/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ia64/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef BOOT_ia64_MAIN_H_ +#define BOOT_ia64_MAIN_H_ + +extern void bootstrap(void); + +#endif Index: boot/arch/ia64/include/arch/pal.h =================================================================== --- boot/arch/ia64/include/arch/pal.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ia64/include/arch/pal.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2011 Jakub Jermar + * 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. + */ + +#ifndef BOOT_ia64_PAL_H_ +#define BOOT_ia64_PAL_H_ + +#include +#include +#include + +/* + * Essential PAL procedures' IDs + */ +#define PAL_FREQ_RATIOS 14 + +extern uint64_t pal_proc_freq_ratio(void); + +#define pal_static_call_0_1(id, ret1) \ + pal_static_call((id), 0, 0, 0, (ret1), NULL, NULL) + +extern uint64_t pal_static_call(uint64_t, uint64_t, uint64_t, uint64_t, + uint64_t *, uint64_t *, uint64_t *); + +#endif Index: boot/arch/ia64/include/arch/sal.h =================================================================== --- boot/arch/ia64/include/arch/sal.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ia64/include/arch/sal.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2011 Jakub Jermar + * 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. + */ + +#ifndef BOOT_ia64_SAL_H_ +#define BOOT_ia64_SAL_H_ + +#include +#include +#include + +/* + * Essential SAL procedures' IDs + */ +#define SAL_FREQ_BASE 0x1000012 + +typedef struct { + uint8_t signature[4]; + uint32_t total_length; + uint16_t sal_revision; + uint16_t entry_count; + uint8_t checksum; + uint8_t reserved1[7]; + uint16_t sal_a_version; + uint16_t sal_b_version; + uint8_t oem_id[32]; + uint8_t product_id[32]; + uint8_t reserved2[8]; +} sal_system_table_header_t; + +typedef enum { + SSTT_ENTRYPOINT_DESC, + SSTT_MEMORY_DESC, + SSTT_PLATFORM_FEATURES_DESC, + SSTT_TR_DESC, + SSTT_PTC_COHERENCE_DOMAIN_DESC, + SSTT_AP_WAKEUP_DESC +} sal_sst_type_t; + +typedef struct { + uint8_t type; + uint8_t reserved1[7]; + uint64_t pal_proc; + uint64_t sal_proc; + uint64_t sal_proc_gp; + uint8_t reserved2[16]; +} sal_entrypoint_desc_t; + +/* This descriptor is unused on Itanium systems. */ +typedef struct { + uint8_t type; + uint8_t unused[31]; +} sal_memory_desc_t; + +typedef struct { + uint8_t type; + uint8_t features; + uint8_t reserved[14]; +} sal_platform_features_desc_t; + +typedef struct { + uint8_t type; + uint8_t tr_type; + uint8_t tr_number; + uint8_t reserved1[5]; + uint64_t va; + uint64_t psc; + uint8_t reserved2[8]; +} sal_tr_desc_t; + +typedef struct { + uint8_t type; + uint8_t reserved[3]; + uint32_t coherence_domains; + uint64_t coherence_domain_info; +} sal_ptc_coherence_domain_desc_t; + +typedef struct { + uint8_t type; + uint8_t mechanism; + uint8_t reserved[6]; + uint64_t vector; +} sal_ap_wakeup_desc_t; + +extern void sal_system_table_parse(sal_system_table_header_t *); + +extern uint64_t sal_base_clock_frequency(void); + +#define sal_call_1_1(id, arg1, ret1) \ + sal_call((id), (arg1), 0, 0, 0, 0, 0, 0, (ret1), NULL, NULL) + +extern uint64_t sal_call(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, + uint64_t, uint64_t, uint64_t, uint64_t *, uint64_t *, uint64_t *); + +#endif Index: boot/arch/ia64/include/arch/ski.h =================================================================== --- boot/arch/ia64/include/arch/ski.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ia64/include/arch/ski.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * 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. + */ + +#ifndef BOOT_ia64_SKI_H_ +#define BOOT_ia64_SKI_H_ + +#include +#include + +extern void ski_putchar(const wchar_t); + +#endif Index: boot/arch/ia64/include/arch/types.h =================================================================== --- boot/arch/ia64/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ia64/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef BOOT_ia64_TYPES_H_ +#define BOOT_ia64_TYPES_H_ + +#include <_bits/all.h> + +#define TASKMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 +#define MEMMAP_ITEMS 128 + +typedef struct { + void *addr; + size_t size; + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} binit_task_t; + +typedef struct { + size_t cnt; + binit_task_t tasks[TASKMAP_MAX_RECORDS]; +} binit_t; + +typedef struct { + unsigned int type; + unsigned long base; + unsigned long size; +} memmap_item_t; + +typedef struct { + binit_t taskmap; + + memmap_item_t memmap[MEMMAP_ITEMS]; + unsigned int memmap_items; + + sysarg_t *sapic; + unsigned long sys_freq; + unsigned long freq_scale; + unsigned int wakeup_intno; +} bootinfo_t; + +/** This is a minimal ELILO-compatible boot parameter structure. */ +typedef struct { + uint64_t cmd_line; + uint64_t efi_system_table; + uint64_t efi_memmap; + uint64_t efi_memmap_sz; + uint64_t efi_memdesc_sz; +} boot_param_t; + +#endif Index: boot/arch/ia64/include/asm.h =================================================================== --- boot/arch/ia64/include/asm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,35 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * Copyright (c) 2006 Jakub Jermar - * 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. - */ - -#ifndef BOOT_ia64_ASM_H_ -#define BOOT_ia64_ASM_H_ - -extern void jump_to_kernel(void *) __attribute__((noreturn)); - -#endif Index: boot/arch/ia64/include/main.h =================================================================== --- boot/arch/ia64/include/main.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,34 +1,0 @@ -/* - * Copyright (c) 2005 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. - */ - -#ifndef BOOT_ia64_MAIN_H_ -#define BOOT_ia64_MAIN_H_ - -extern void bootstrap(void); - -#endif Index: boot/arch/ia64/include/pal.h =================================================================== --- boot/arch/ia64/include/pal.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2011 Jakub Jermar - * 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. - */ - -#ifndef BOOT_ia64_PAL_H_ -#define BOOT_ia64_PAL_H_ - -#include -#include -#include - -/* - * Essential PAL procedures' IDs - */ -#define PAL_FREQ_RATIOS 14 - -extern uint64_t pal_proc_freq_ratio(void); - -#define pal_static_call_0_1(id, ret1) \ - pal_static_call((id), 0, 0, 0, (ret1), NULL, NULL) - -extern uint64_t pal_static_call(uint64_t, uint64_t, uint64_t, uint64_t, - uint64_t *, uint64_t *, uint64_t *); - -#endif Index: boot/arch/ia64/include/sal.h =================================================================== --- boot/arch/ia64/include/sal.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,119 +1,0 @@ -/* - * Copyright (c) 2011 Jakub Jermar - * 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. - */ - -#ifndef BOOT_ia64_SAL_H_ -#define BOOT_ia64_SAL_H_ - -#include -#include -#include - -/* - * Essential SAL procedures' IDs - */ -#define SAL_FREQ_BASE 0x1000012 - -typedef struct { - uint8_t signature[4]; - uint32_t total_length; - uint16_t sal_revision; - uint16_t entry_count; - uint8_t checksum; - uint8_t reserved1[7]; - uint16_t sal_a_version; - uint16_t sal_b_version; - uint8_t oem_id[32]; - uint8_t product_id[32]; - uint8_t reserved2[8]; -} sal_system_table_header_t; - -typedef enum { - SSTT_ENTRYPOINT_DESC, - SSTT_MEMORY_DESC, - SSTT_PLATFORM_FEATURES_DESC, - SSTT_TR_DESC, - SSTT_PTC_COHERENCE_DOMAIN_DESC, - SSTT_AP_WAKEUP_DESC -} sal_sst_type_t; - -typedef struct { - uint8_t type; - uint8_t reserved1[7]; - uint64_t pal_proc; - uint64_t sal_proc; - uint64_t sal_proc_gp; - uint8_t reserved2[16]; -} sal_entrypoint_desc_t; - -/* This descriptor is unused on Itanium systems. */ -typedef struct { - uint8_t type; - uint8_t unused[31]; -} sal_memory_desc_t; - -typedef struct { - uint8_t type; - uint8_t features; - uint8_t reserved[14]; -} sal_platform_features_desc_t; - -typedef struct { - uint8_t type; - uint8_t tr_type; - uint8_t tr_number; - uint8_t reserved1[5]; - uint64_t va; - uint64_t psc; - uint8_t reserved2[8]; -} sal_tr_desc_t; - -typedef struct { - uint8_t type; - uint8_t reserved[3]; - uint32_t coherence_domains; - uint64_t coherence_domain_info; -} sal_ptc_coherence_domain_desc_t; - -typedef struct { - uint8_t type; - uint8_t mechanism; - uint8_t reserved[6]; - uint64_t vector; -} sal_ap_wakeup_desc_t; - -extern void sal_system_table_parse(sal_system_table_header_t *); - -extern uint64_t sal_base_clock_frequency(void); - -#define sal_call_1_1(id, arg1, ret1) \ - sal_call((id), (arg1), 0, 0, 0, 0, 0, 0, (ret1), NULL, NULL) - -extern uint64_t sal_call(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, - uint64_t, uint64_t, uint64_t, uint64_t *, uint64_t *, uint64_t *); - -#endif Index: boot/arch/ia64/include/ski.h =================================================================== --- boot/arch/ia64/include/ski.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,37 +1,0 @@ -/* - * Copyright (c) 2005 Jakub Jermar - * 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. - */ - -#ifndef BOOT_ia64_SKI_H_ -#define BOOT_ia64_SKI_H_ - -#include -#include - -extern void ski_putchar(const wchar_t); - -#endif Index: boot/arch/ia64/include/types.h =================================================================== --- boot/arch/ia64/include/types.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,76 +1,0 @@ -/* - * Copyright (c) 2005 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. - */ - -#ifndef BOOT_ia64_TYPES_H_ -#define BOOT_ia64_TYPES_H_ - -#include <_bits/all.h> - -#define TASKMAP_MAX_RECORDS 32 -#define BOOTINFO_TASK_NAME_BUFLEN 32 -#define MEMMAP_ITEMS 128 - -typedef struct { - void *addr; - size_t size; - char name[BOOTINFO_TASK_NAME_BUFLEN]; -} binit_task_t; - -typedef struct { - size_t cnt; - binit_task_t tasks[TASKMAP_MAX_RECORDS]; -} binit_t; - -typedef struct { - unsigned int type; - unsigned long base; - unsigned long size; -} memmap_item_t; - -typedef struct { - binit_t taskmap; - - memmap_item_t memmap[MEMMAP_ITEMS]; - unsigned int memmap_items; - - sysarg_t *sapic; - unsigned long sys_freq; - unsigned long freq_scale; - unsigned int wakeup_intno; -} bootinfo_t; - -/** This is a minimal ELILO-compatible boot parameter structure. */ -typedef struct { - uint64_t cmd_line; - uint64_t efi_system_table; - uint64_t efi_memmap; - uint64_t efi_memmap_sz; - uint64_t efi_memdesc_sz; -} boot_param_t; - -#endif Index: boot/arch/mips32/include/arch.h =================================================================== --- boot/arch/mips32/include/arch.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,67 +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. - */ - -#ifndef BOOT_mips32_ARCH_H_ -#define BOOT_mips32_ARCH_H_ - -#define PAGE_WIDTH 14 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#if defined(MACHINE_msim) -#define CPUMAP_OFFSET 0x00001000 -#define STACK_OFFSET 0x00002000 -#define BOOTINFO_OFFSET 0x00003000 -#define BOOT_OFFSET 0x00100000 -#define LOADER_OFFSET 0x1fc00000 - -#define MSIM_VIDEORAM_ADDRESS 0xb0000000 -#define MSIM_DORDER_ADDRESS 0xb0000100 -#endif - -#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta) -#define CPUMAP_OFFSET 0x00100000 -#define STACK_OFFSET 0x00101000 -#define BOOTINFO_OFFSET 0x00102000 -#define BOOT_OFFSET 0x00200000 -#define LOADER_OFFSET 0x00103000 - -#define YAMON_SUBR_BASE PA2KA(0x1fc00500) -#define YAMON_SUBR_PRINT_COUNT (YAMON_SUBR_BASE + 0x4) -#endif - -#ifndef __ASM__ - #define PA2KA(addr) (((uintptr_t) (addr)) + 0x80000000) - #define PA2KSEG(addr) (((uintptr_t) (addr)) + 0xa0000000) - #define KA2PA(addr) (((uintptr_t) (addr)) - 0x80000000) - #define KSEG2PA(addr) (((uintptr_t) (addr)) - 0xa0000000) -#else - #define PA2KA(addr) ((addr) + 0x80000000) - #define KSEG2PA(addr) ((addr) - 0xa0000000) -#endif - -#endif Index: boot/arch/mips32/include/arch/arch.h =================================================================== --- boot/arch/mips32/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/mips32/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,67 @@ +/* + * 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. + */ + +#ifndef BOOT_mips32_ARCH_H_ +#define BOOT_mips32_ARCH_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#if defined(MACHINE_msim) +#define CPUMAP_OFFSET 0x00001000 +#define STACK_OFFSET 0x00002000 +#define BOOTINFO_OFFSET 0x00003000 +#define BOOT_OFFSET 0x00100000 +#define LOADER_OFFSET 0x1fc00000 + +#define MSIM_VIDEORAM_ADDRESS 0xb0000000 +#define MSIM_DORDER_ADDRESS 0xb0000100 +#endif + +#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta) +#define CPUMAP_OFFSET 0x00100000 +#define STACK_OFFSET 0x00101000 +#define BOOTINFO_OFFSET 0x00102000 +#define BOOT_OFFSET 0x00200000 +#define LOADER_OFFSET 0x00103000 + +#define YAMON_SUBR_BASE PA2KA(0x1fc00500) +#define YAMON_SUBR_PRINT_COUNT (YAMON_SUBR_BASE + 0x4) +#endif + +#ifndef __ASM__ + #define PA2KA(addr) (((uintptr_t) (addr)) + 0x80000000) + #define PA2KSEG(addr) (((uintptr_t) (addr)) + 0xa0000000) + #define KA2PA(addr) (((uintptr_t) (addr)) - 0x80000000) + #define KSEG2PA(addr) (((uintptr_t) (addr)) - 0xa0000000) +#else + #define PA2KA(addr) ((addr) + 0x80000000) + #define KSEG2PA(addr) ((addr) - 0xa0000000) +#endif + +#endif Index: boot/arch/mips32/include/arch/asm.h =================================================================== --- boot/arch/mips32/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/mips32/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,34 @@ +/* + * 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. + */ + +#ifndef BOOT_mips32_ASM_H_ +#define BOOT_mips32_ASM_H_ + +extern void jump_to_kernel(void *, void *) __attribute__((noreturn)); + +#endif Index: boot/arch/mips32/include/arch/main.h =================================================================== --- boot/arch/mips32/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/mips32/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef BOOT_mips32_MAIN_H_ +#define BOOT_mips32_MAIN_H_ + +extern void bootstrap(void); + +#endif Index: boot/arch/mips32/include/arch/regname.h =================================================================== --- boot/arch/mips32/include/arch/regname.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/mips32/include/arch/regname.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2005 Ondrej Palkovsky + * 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. + */ + +#ifndef BOOT_mips32_REGNAME_H_ +#define BOOT_mips32_REGNAME_H_ + +#define zero 0 +#define at 1 +#define v0 2 +#define v1 3 +#define a0 4 +#define a1 5 +#define a2 6 +#define a3 7 +#define t0 8 +#define t1 9 +#define t2 10 +#define t3 11 +#define t4 12 +#define t5 13 +#define t6 14 +#define t7 15 +#define s0 16 +#define s1 17 +#define s2 18 +#define s3 19 +#define s4 20 +#define s5 21 +#define s6 22 +#define s7 23 +#define t8 24 +#define t9 25 +#define k0 26 +#define k1 27 +#define gp 28 +#define sp 29 +#define s8 30 +#define ra 31 + +#define rindex 0 +#define rrandom 1 +#define entrylo0 2 +#define entrylo1 3 +#define context 4 +#define pagemask 5 +#define wired 6 +#define badvaddr 8 +#define count 9 +#define entryhi 10 +#define compare 11 +#define status 12 +#define cause 13 +#define epc 14 +#define rconfig 16 +#define lladdr 17 +#define watchlo 18 +#define watchhi 19 +#define xcontext 20 +#define rdebug 23 +#define depc 24 +#define eepc 30 + +#endif Index: boot/arch/mips32/include/arch/types.h =================================================================== --- boot/arch/mips32/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/mips32/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,56 @@ +/* + * 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. + */ + +#ifndef BOOT_mips32_TYPES_H_ +#define BOOT_mips32_TYPES_H_ + +#include <_bits/all.h> + +#define TASKMAP_MAX_RECORDS 32 +#define CPUMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 + +typedef struct { + /** Address where the task was placed. */ + void *addr; + /** Size of the task's binary. */ + size_t size; + /** Task name. */ + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} task_t; + +typedef struct { +#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta) + uint32_t sdram_size; +#endif + uint32_t cpumap; + size_t cnt; + task_t tasks[TASKMAP_MAX_RECORDS]; +} bootinfo_t; + +#endif Index: boot/arch/mips32/include/asm.h =================================================================== --- boot/arch/mips32/include/asm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,34 +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. - */ - -#ifndef BOOT_mips32_ASM_H_ -#define BOOT_mips32_ASM_H_ - -extern void jump_to_kernel(void *, void *) __attribute__((noreturn)); - -#endif Index: boot/arch/mips32/include/main.h =================================================================== --- boot/arch/mips32/include/main.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,34 +1,0 @@ -/* - * Copyright (c) 2005 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. - */ - -#ifndef BOOT_mips32_MAIN_H_ -#define BOOT_mips32_MAIN_H_ - -extern void bootstrap(void); - -#endif Index: boot/arch/mips32/include/regname.h =================================================================== --- boot/arch/mips32/include/regname.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,88 +1,0 @@ -/* - * Copyright (c) 2005 Ondrej Palkovsky - * 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. - */ - -#ifndef BOOT_mips32_REGNAME_H_ -#define BOOT_mips32_REGNAME_H_ - -#define zero 0 -#define at 1 -#define v0 2 -#define v1 3 -#define a0 4 -#define a1 5 -#define a2 6 -#define a3 7 -#define t0 8 -#define t1 9 -#define t2 10 -#define t3 11 -#define t4 12 -#define t5 13 -#define t6 14 -#define t7 15 -#define s0 16 -#define s1 17 -#define s2 18 -#define s3 19 -#define s4 20 -#define s5 21 -#define s6 22 -#define s7 23 -#define t8 24 -#define t9 25 -#define k0 26 -#define k1 27 -#define gp 28 -#define sp 29 -#define s8 30 -#define ra 31 - -#define rindex 0 -#define rrandom 1 -#define entrylo0 2 -#define entrylo1 3 -#define context 4 -#define pagemask 5 -#define wired 6 -#define badvaddr 8 -#define count 9 -#define entryhi 10 -#define compare 11 -#define status 12 -#define cause 13 -#define epc 14 -#define rconfig 16 -#define lladdr 17 -#define watchlo 18 -#define watchhi 19 -#define xcontext 20 -#define rdebug 23 -#define depc 24 -#define eepc 30 - -#endif Index: boot/arch/mips32/include/types.h =================================================================== --- boot/arch/mips32/include/types.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,56 +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. - */ - -#ifndef BOOT_mips32_TYPES_H_ -#define BOOT_mips32_TYPES_H_ - -#include <_bits/all.h> - -#define TASKMAP_MAX_RECORDS 32 -#define CPUMAP_MAX_RECORDS 32 -#define BOOTINFO_TASK_NAME_BUFLEN 32 - -typedef struct { - /** Address where the task was placed. */ - void *addr; - /** Size of the task's binary. */ - size_t size; - /** Task name. */ - char name[BOOTINFO_TASK_NAME_BUFLEN]; -} task_t; - -typedef struct { -#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta) - uint32_t sdram_size; -#endif - uint32_t cpumap; - size_t cnt; - task_t tasks[TASKMAP_MAX_RECORDS]; -} bootinfo_t; - -#endif Index: boot/arch/ppc32/include/arch.h =================================================================== --- boot/arch/ppc32/include/arch.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,45 +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. - */ - -#ifndef BOOT_ppc32_ARCH_H_ -#define BOOT_ppc32_ARCH_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#define BOOT_OFFSET 0x8000 - -#define LOADER_ADDRESS 0x08000000 - -#ifndef __ASM__ - #define PA2KA(addr) (((uintptr_t) (addr)) + 0x80000000) -#else - #define PA2KA(addr) ((addr) + 0x80000000) -#endif - -#endif Index: boot/arch/ppc32/include/arch/arch.h =================================================================== --- boot/arch/ppc32/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ppc32/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,45 @@ +/* + * 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. + */ + +#ifndef BOOT_ppc32_ARCH_H_ +#define BOOT_ppc32_ARCH_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define BOOT_OFFSET 0x8000 + +#define LOADER_ADDRESS 0x08000000 + +#ifndef __ASM__ + #define PA2KA(addr) (((uintptr_t) (addr)) + 0x80000000) +#else + #define PA2KA(addr) ((addr) + 0x80000000) +#endif + +#endif Index: boot/arch/ppc32/include/arch/asm.h =================================================================== --- boot/arch/ppc32/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ppc32/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,39 @@ +/* + * 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. + */ + +#ifndef BOOT_ppc32_ASM_H_ +#define BOOT_ppc32_ASM_H_ + +#include +#include + +extern void jump_to_kernel(void *, void *, size_t, void *) + __attribute__((noreturn)); +extern void real_mode(void); + +#endif Index: boot/arch/ppc32/include/arch/main.h =================================================================== --- boot/arch/ppc32/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ppc32/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef BOOT_ppc32_MAIN_H_ +#define BOOT_ppc32_MAIN_H_ + +#include +#include +#include + +typedef struct { + memmap_t memmap; + taskmap_t taskmap; + ballocs_t ballocs; + ofw_tree_node_t *ofw_root; +} bootinfo_t; + +extern void bootstrap(void); + +#endif Index: boot/arch/ppc32/include/arch/ofw.h =================================================================== --- boot/arch/ppc32/include/arch/ofw.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ppc32/include/arch/ofw.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * 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. + */ + +#ifndef BOOT_ppc32_OFWARCH_H_ +#define BOOT_ppc32_OFWARCH_H_ + +#define OFW_ADDRESS_CELLS 1 +#define OFW_SIZE_CELLS 1 + +#endif Index: boot/arch/ppc32/include/arch/regname.h =================================================================== --- boot/arch/ppc32/include/arch/regname.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ppc32/include/arch/regname.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,226 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef BOOT_ppc32_REGNAME_H_ +#define BOOT_ppc32_REGNAME_H_ + +/* Condition Register Bit Fields */ +#define cr0 0 +#define cr1 1 +#define cr2 2 +#define cr3 3 +#define cr4 4 +#define cr5 5 +#define cr6 6 +#define cr7 7 + +/* General Purpose Registers (GPRs) */ +#define r0 0 +#define r1 1 +#define r2 2 +#define r3 3 +#define r4 4 +#define r5 5 +#define r6 6 +#define r7 7 +#define r8 8 +#define r9 9 +#define r10 10 +#define r11 11 +#define r12 12 +#define r13 13 +#define r14 14 +#define r15 15 +#define r16 16 +#define r17 17 +#define r18 18 +#define r19 19 +#define r20 20 +#define r21 21 +#define r22 22 +#define r23 23 +#define r24 24 +#define r25 25 +#define r26 26 +#define r27 27 +#define r28 28 +#define r29 29 +#define r30 30 +#define r31 31 + +/* GPR Aliases */ +#define sp 1 + +/* Floating Point Registers (FPRs) */ +#define fr0 0 +#define fr1 1 +#define fr2 2 +#define fr3 3 +#define fr4 4 +#define fr5 5 +#define fr6 6 +#define fr7 7 +#define fr8 8 +#define fr9 9 +#define fr10 10 +#define fr11 11 +#define fr12 12 +#define fr13 13 +#define fr14 14 +#define fr15 15 +#define fr16 16 +#define fr17 17 +#define fr18 18 +#define fr19 19 +#define fr20 20 +#define fr21 21 +#define fr22 22 +#define fr23 23 +#define fr24 24 +#define fr25 25 +#define fr26 26 +#define fr27 27 +#define fr28 28 +#define fr29 29 +#define fr30 30 +#define fr31 31 + +#define vr0 0 +#define vr1 1 +#define vr2 2 +#define vr3 3 +#define vr4 4 +#define vr5 5 +#define vr6 6 +#define vr7 7 +#define vr8 8 +#define vr9 9 +#define vr10 10 +#define vr11 11 +#define vr12 12 +#define vr13 13 +#define vr14 14 +#define vr15 15 +#define vr16 16 +#define vr17 17 +#define vr18 18 +#define vr19 19 +#define vr20 20 +#define vr21 21 +#define vr22 22 +#define vr23 23 +#define vr24 24 +#define vr25 25 +#define vr26 26 +#define vr27 27 +#define vr28 28 +#define vr29 29 +#define vr30 30 +#define vr31 31 + +#define evr0 0 +#define evr1 1 +#define evr2 2 +#define evr3 3 +#define evr4 4 +#define evr5 5 +#define evr6 6 +#define evr7 7 +#define evr8 8 +#define evr9 9 +#define evr10 10 +#define evr11 11 +#define evr12 12 +#define evr13 13 +#define evr14 14 +#define evr15 15 +#define evr16 16 +#define evr17 17 +#define evr18 18 +#define evr19 19 +#define evr20 20 +#define evr21 21 +#define evr22 22 +#define evr23 23 +#define evr24 24 +#define evr25 25 +#define evr26 26 +#define evr27 27 +#define evr28 28 +#define evr29 29 +#define evr30 30 +#define evr31 31 + +/* Special Purpose Registers (SPRs) */ +#define xer 1 +#define lr 8 +#define ctr 9 +#define dec 22 +#define sdr1 25 +#define srr0 26 +#define srr1 27 +#define sprg0 272 +#define sprg1 273 +#define sprg2 274 +#define sprg3 275 +#define prv 287 +#define ibat0u 528 +#define ibat0l 529 +#define ibat1u 530 +#define ibat1l 531 +#define ibat2u 532 +#define ibat2l 533 +#define ibat3u 534 +#define ibat3l 535 +#define dbat0u 536 +#define dbat0l 537 +#define dbat1u 538 +#define dbat1l 539 +#define dbat2u 540 +#define dbat2l 541 +#define dbat3u 542 +#define dbat3l 543 +#define tlbmiss 980 +#define ptehi 981 +#define ptelo 982 +#define hid0 1008 + +/* MSR bits */ +#define msr_dr (1 << 4) +#define msr_ir (1 << 5) +#define msr_pr (1 << 14) +#define msr_ee (1 << 15) + +/* HID0 bits */ +#define hid0_sten (1 << 24) +#define hid0_ice (1 << 15) +#define hid0_dce (1 << 14) +#define hid0_icfi (1 << 11) +#define hid0_dci (1 << 10) + +#endif Index: boot/arch/ppc32/include/arch/types.h =================================================================== --- boot/arch/ppc32/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/ppc32/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,48 @@ +/* + * 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. + */ + +#ifndef BOOT_ppc32_TYPES_H_ +#define BOOT_ppc32_TYPES_H_ + +#include <_bits/all.h> + +#define TASKMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 + +typedef struct { + void *addr; + size_t size; + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} task_t; + +typedef struct { + size_t cnt; + task_t tasks[TASKMAP_MAX_RECORDS]; +} taskmap_t; + +#endif Index: boot/arch/ppc32/include/asm.h =================================================================== --- boot/arch/ppc32/include/asm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,39 +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. - */ - -#ifndef BOOT_ppc32_ASM_H_ -#define BOOT_ppc32_ASM_H_ - -#include -#include - -extern void jump_to_kernel(void *, void *, size_t, void *) - __attribute__((noreturn)); -extern void real_mode(void); - -#endif Index: boot/arch/ppc32/include/main.h =================================================================== --- boot/arch/ppc32/include/main.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2005 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. - */ - -#ifndef BOOT_ppc32_MAIN_H_ -#define BOOT_ppc32_MAIN_H_ - -#include -#include -#include - -typedef struct { - memmap_t memmap; - taskmap_t taskmap; - ballocs_t ballocs; - ofw_tree_node_t *ofw_root; -} bootinfo_t; - -extern void bootstrap(void); - -#endif Index: boot/arch/ppc32/include/ofw.h =================================================================== --- boot/arch/ppc32/include/ofw.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,35 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * 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. - */ - -#ifndef BOOT_ppc32_OFWARCH_H_ -#define BOOT_ppc32_OFWARCH_H_ - -#define OFW_ADDRESS_CELLS 1 -#define OFW_SIZE_CELLS 1 - -#endif Index: boot/arch/ppc32/include/regname.h =================================================================== --- boot/arch/ppc32/include/regname.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,226 +1,0 @@ -/* - * Copyright (c) 2005 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. - */ - -#ifndef BOOT_ppc32_REGNAME_H_ -#define BOOT_ppc32_REGNAME_H_ - -/* Condition Register Bit Fields */ -#define cr0 0 -#define cr1 1 -#define cr2 2 -#define cr3 3 -#define cr4 4 -#define cr5 5 -#define cr6 6 -#define cr7 7 - -/* General Purpose Registers (GPRs) */ -#define r0 0 -#define r1 1 -#define r2 2 -#define r3 3 -#define r4 4 -#define r5 5 -#define r6 6 -#define r7 7 -#define r8 8 -#define r9 9 -#define r10 10 -#define r11 11 -#define r12 12 -#define r13 13 -#define r14 14 -#define r15 15 -#define r16 16 -#define r17 17 -#define r18 18 -#define r19 19 -#define r20 20 -#define r21 21 -#define r22 22 -#define r23 23 -#define r24 24 -#define r25 25 -#define r26 26 -#define r27 27 -#define r28 28 -#define r29 29 -#define r30 30 -#define r31 31 - -/* GPR Aliases */ -#define sp 1 - -/* Floating Point Registers (FPRs) */ -#define fr0 0 -#define fr1 1 -#define fr2 2 -#define fr3 3 -#define fr4 4 -#define fr5 5 -#define fr6 6 -#define fr7 7 -#define fr8 8 -#define fr9 9 -#define fr10 10 -#define fr11 11 -#define fr12 12 -#define fr13 13 -#define fr14 14 -#define fr15 15 -#define fr16 16 -#define fr17 17 -#define fr18 18 -#define fr19 19 -#define fr20 20 -#define fr21 21 -#define fr22 22 -#define fr23 23 -#define fr24 24 -#define fr25 25 -#define fr26 26 -#define fr27 27 -#define fr28 28 -#define fr29 29 -#define fr30 30 -#define fr31 31 - -#define vr0 0 -#define vr1 1 -#define vr2 2 -#define vr3 3 -#define vr4 4 -#define vr5 5 -#define vr6 6 -#define vr7 7 -#define vr8 8 -#define vr9 9 -#define vr10 10 -#define vr11 11 -#define vr12 12 -#define vr13 13 -#define vr14 14 -#define vr15 15 -#define vr16 16 -#define vr17 17 -#define vr18 18 -#define vr19 19 -#define vr20 20 -#define vr21 21 -#define vr22 22 -#define vr23 23 -#define vr24 24 -#define vr25 25 -#define vr26 26 -#define vr27 27 -#define vr28 28 -#define vr29 29 -#define vr30 30 -#define vr31 31 - -#define evr0 0 -#define evr1 1 -#define evr2 2 -#define evr3 3 -#define evr4 4 -#define evr5 5 -#define evr6 6 -#define evr7 7 -#define evr8 8 -#define evr9 9 -#define evr10 10 -#define evr11 11 -#define evr12 12 -#define evr13 13 -#define evr14 14 -#define evr15 15 -#define evr16 16 -#define evr17 17 -#define evr18 18 -#define evr19 19 -#define evr20 20 -#define evr21 21 -#define evr22 22 -#define evr23 23 -#define evr24 24 -#define evr25 25 -#define evr26 26 -#define evr27 27 -#define evr28 28 -#define evr29 29 -#define evr30 30 -#define evr31 31 - -/* Special Purpose Registers (SPRs) */ -#define xer 1 -#define lr 8 -#define ctr 9 -#define dec 22 -#define sdr1 25 -#define srr0 26 -#define srr1 27 -#define sprg0 272 -#define sprg1 273 -#define sprg2 274 -#define sprg3 275 -#define prv 287 -#define ibat0u 528 -#define ibat0l 529 -#define ibat1u 530 -#define ibat1l 531 -#define ibat2u 532 -#define ibat2l 533 -#define ibat3u 534 -#define ibat3l 535 -#define dbat0u 536 -#define dbat0l 537 -#define dbat1u 538 -#define dbat1l 539 -#define dbat2u 540 -#define dbat2l 541 -#define dbat3u 542 -#define dbat3l 543 -#define tlbmiss 980 -#define ptehi 981 -#define ptelo 982 -#define hid0 1008 - -/* MSR bits */ -#define msr_dr (1 << 4) -#define msr_ir (1 << 5) -#define msr_pr (1 << 14) -#define msr_ee (1 << 15) - -/* HID0 bits */ -#define hid0_sten (1 << 24) -#define hid0_ice (1 << 15) -#define hid0_dce (1 << 14) -#define hid0_icfi (1 << 11) -#define hid0_dci (1 << 10) - -#endif Index: boot/arch/ppc32/include/types.h =================================================================== --- boot/arch/ppc32/include/types.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,48 +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. - */ - -#ifndef BOOT_ppc32_TYPES_H_ -#define BOOT_ppc32_TYPES_H_ - -#include <_bits/all.h> - -#define TASKMAP_MAX_RECORDS 32 -#define BOOTINFO_TASK_NAME_BUFLEN 32 - -typedef struct { - void *addr; - size_t size; - char name[BOOTINFO_TASK_NAME_BUFLEN]; -} task_t; - -typedef struct { - size_t cnt; - task_t tasks[TASKMAP_MAX_RECORDS]; -} taskmap_t; - -#endif Index: boot/arch/riscv64/include/arch.h =================================================================== --- boot/arch/riscv64/include/arch.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2016 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. - */ - -#ifndef BOOT_riscv64_ARCH_H_ -#define BOOT_riscv64_ARCH_H_ - -#define PAGE_WIDTH 12 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#define BOOT_STACK_SIZE PAGE_SIZE - -#define PHYSMEM_START 0x40000000 -#define PHYSMEM_SIZE 1073741824 -#define BOOT_OFFSET 0x48000000 - -#define DEFAULT_MTVEC 0x00000100 -#define TRAP_VECTOR_RESET 0x0100 - -#endif Index: boot/arch/riscv64/include/arch/arch.h =================================================================== --- boot/arch/riscv64/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/riscv64/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2016 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. + */ + +#ifndef BOOT_riscv64_ARCH_H_ +#define BOOT_riscv64_ARCH_H_ + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define BOOT_STACK_SIZE PAGE_SIZE + +#define PHYSMEM_START 0x40000000 +#define PHYSMEM_SIZE 1073741824 +#define BOOT_OFFSET 0x48000000 + +#define DEFAULT_MTVEC 0x00000100 +#define TRAP_VECTOR_RESET 0x0100 + +#endif Index: boot/arch/riscv64/include/arch/asm.h =================================================================== --- boot/arch/riscv64/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/riscv64/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2016 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. + */ + +#ifndef BOOT_riscv64_ASM_H_ +#define BOOT_riscv64_ASM_H_ + +#include + +extern char htif_page[]; +extern char pt_page[]; + +extern void jump_to_kernel(uintptr_t) + __attribute__((noreturn)); + +#endif Index: boot/arch/riscv64/include/arch/main.h =================================================================== --- boot/arch/riscv64/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/riscv64/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016 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. + */ + +#ifndef BOOT_riscv64_MAIN_H_ +#define BOOT_riscv64_MAIN_H_ + +extern void bootstrap(void); + +#endif Index: boot/arch/riscv64/include/arch/mm.h =================================================================== --- boot/arch/riscv64/include/arch/mm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/riscv64/include/arch/mm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2017 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. + */ + +/** @file + */ + +#ifndef BOOT_riscv64_MM_H_ +#define BOOT_riscv64_MM_H_ + +#ifndef __ASM__ + #define KA2PA(x) (((uintptr_t) (x)) - UINT64_C(0xffff800000000000)) + #define PA2KA(x) (((uintptr_t) (x)) + UINT64_C(0xffff800000000000)) +#else + #define KA2PA(x) ((x) - 0xffff800000000000) + #define PA2KA(x) ((x) + 0xffff800000000000) +#endif + +#define PTL_DIRTY (1 << 7) +#define PTL_ACCESSED (1 << 6) +#define PTL_GLOBAL (1 << 5) +#define PTL_USER (1 << 4) +#define PTL_EXECUTABLE (1 << 3) +#define PTL_WRITABLE (1 << 2) +#define PTL_READABLE (1 << 1) +#define PTL_VALID 1 + +#endif + +/** @} + */ Index: boot/arch/riscv64/include/arch/types.h =================================================================== --- boot/arch/riscv64/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/riscv64/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2016 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. + */ + +#ifndef BOOT_riscv64_TYPES_H_ +#define BOOT_riscv64_TYPES_H_ + +#include <_bits/all.h> + +#define MEMMAP_MAX_RECORDS 32 +#define TASKMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 + +typedef struct { + volatile uint64_t *tohost; + volatile uint64_t *fromhost; +} ucbinfo_t; + +typedef struct { + void *start; + size_t size; +} memzone_t; + +typedef struct { + uint64_t total; + size_t cnt; + memzone_t zones[MEMMAP_MAX_RECORDS]; +} memmap_t; + +typedef struct { + /** Address where the task was placed. */ + void *addr; + /** Size of the task's binary. */ + size_t size; + /** Task name. */ + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} task_t; + +typedef struct { + size_t cnt; + task_t tasks[TASKMAP_MAX_RECORDS]; +} taskmap_t; + +typedef struct { + ucbinfo_t ucbinfo; + uintptr_t physmem_start; + uintptr_t htif_frame; + uintptr_t pt_frame; + memmap_t memmap; + taskmap_t taskmap; +} bootinfo_t; + +#endif Index: boot/arch/riscv64/include/arch/ucb.h =================================================================== --- boot/arch/riscv64/include/arch/ucb.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/riscv64/include/arch/ucb.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2016 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. + */ + +#ifndef BOOT_riscv64_UCB_H_ +#define BOOT_riscv64_UCB_H_ + +/** University of California, Berkeley extensions to RISC-V + * + * Non-standard host-target interface extension targeting + * primarily the Spike ISA Simulator. + */ + +#include + +extern volatile uint64_t tohost; +extern volatile uint64_t fromhost; + +#define HTIF_DEVICE_CONSOLE 1 + +#define HTIF_CONSOLE_PUTC 1 + +extern void htif_cmd(uint8_t device, uint8_t cmd, uint64_t payload); + +#endif Index: boot/arch/riscv64/include/asm.h =================================================================== --- boot/arch/riscv64/include/asm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,40 +1,0 @@ -/* - * Copyright (c) 2016 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. - */ - -#ifndef BOOT_riscv64_ASM_H_ -#define BOOT_riscv64_ASM_H_ - -#include - -extern char htif_page[]; -extern char pt_page[]; - -extern void jump_to_kernel(uintptr_t) - __attribute__((noreturn)); - -#endif Index: boot/arch/riscv64/include/main.h =================================================================== --- boot/arch/riscv64/include/main.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,34 +1,0 @@ -/* - * Copyright (c) 2016 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. - */ - -#ifndef BOOT_riscv64_MAIN_H_ -#define BOOT_riscv64_MAIN_H_ - -extern void bootstrap(void); - -#endif Index: boot/arch/riscv64/include/mm.h =================================================================== --- boot/arch/riscv64/include/mm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2017 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. - */ - -/** @file - */ - -#ifndef BOOT_riscv64_MM_H_ -#define BOOT_riscv64_MM_H_ - -#ifndef __ASM__ - #define KA2PA(x) (((uintptr_t) (x)) - UINT64_C(0xffff800000000000)) - #define PA2KA(x) (((uintptr_t) (x)) + UINT64_C(0xffff800000000000)) -#else - #define KA2PA(x) ((x) - 0xffff800000000000) - #define PA2KA(x) ((x) + 0xffff800000000000) -#endif - -#define PTL_DIRTY (1 << 7) -#define PTL_ACCESSED (1 << 6) -#define PTL_GLOBAL (1 << 5) -#define PTL_USER (1 << 4) -#define PTL_EXECUTABLE (1 << 3) -#define PTL_WRITABLE (1 << 2) -#define PTL_READABLE (1 << 1) -#define PTL_VALID 1 - -#endif - -/** @} - */ Index: boot/arch/riscv64/include/types.h =================================================================== --- boot/arch/riscv64/include/types.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,77 +1,0 @@ -/* - * Copyright (c) 2016 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. - */ - -#ifndef BOOT_riscv64_TYPES_H_ -#define BOOT_riscv64_TYPES_H_ - -#include <_bits/all.h> - -#define MEMMAP_MAX_RECORDS 32 -#define TASKMAP_MAX_RECORDS 32 -#define BOOTINFO_TASK_NAME_BUFLEN 32 - -typedef struct { - volatile uint64_t *tohost; - volatile uint64_t *fromhost; -} ucbinfo_t; - -typedef struct { - void *start; - size_t size; -} memzone_t; - -typedef struct { - uint64_t total; - size_t cnt; - memzone_t zones[MEMMAP_MAX_RECORDS]; -} memmap_t; - -typedef struct { - /** Address where the task was placed. */ - void *addr; - /** Size of the task's binary. */ - size_t size; - /** Task name. */ - char name[BOOTINFO_TASK_NAME_BUFLEN]; -} task_t; - -typedef struct { - size_t cnt; - task_t tasks[TASKMAP_MAX_RECORDS]; -} taskmap_t; - -typedef struct { - ucbinfo_t ucbinfo; - uintptr_t physmem_start; - uintptr_t htif_frame; - uintptr_t pt_frame; - memmap_t memmap; - taskmap_t taskmap; -} bootinfo_t; - -#endif Index: boot/arch/riscv64/include/ucb.h =================================================================== --- boot/arch/riscv64/include/ucb.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2016 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. - */ - -#ifndef BOOT_riscv64_UCB_H_ -#define BOOT_riscv64_UCB_H_ - -/** University of California, Berkeley extensions to RISC-V - * - * Non-standard host-target interface extension targeting - * primarily the Spike ISA Simulator. - */ - -#include - -extern volatile uint64_t tohost; -extern volatile uint64_t fromhost; - -#define HTIF_DEVICE_CONSOLE 1 - -#define HTIF_CONSOLE_PUTC 1 - -extern void htif_cmd(uint8_t device, uint8_t cmd, uint64_t payload); - -#endif Index: boot/arch/sparc64/include/arch.h =================================================================== --- boot/arch/sparc64/include/arch.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,66 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * Copyright (c) 2006 Jakub Jermar - * 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. - */ - -#ifndef BOOT_sparc64_ARCH_H_ -#define BOOT_sparc64_ARCH_H_ - -#define PAGE_WIDTH 14 -#define PAGE_SIZE (1 << PAGE_WIDTH) - -#define LOADER_ADDRESS 0x004000 -#define KERNEL_ADDRESS 0x400000 - -#define STACK_SIZE 8192 -#define STACK_ALIGNMENT 16 -#define STACK_BIAS 2047 -#define STACK_WINDOW_SAVE_AREA_SIZE (16 * 8) -#define STACK_ARG_SAVE_AREA_SIZE (6 * 8) - -#define NWINDOWS 8 - -#define PSTATE_IE_BIT 2 -#define PSTATE_PRIV_BIT 4 -#define PSTATE_AM_BIT 8 - -#define ASI_ICBUS_CONFIG 0x4a -#define ICBUS_CONFIG_MID_SHIFT 17 - -/** Constants to distinguish particular UltraSPARC architecture */ -#define ARCH_SUN4U 10 -#define ARCH_SUN4V 20 - -/** Constants to distinguish particular UltraSPARC subarchitecture */ -#define SUBARCH_UNKNOWN 0 -#define SUBARCH_US 1 -#define SUBARCH_US3 3 - -#define BSP_PROCESSOR 1 -#define AP_PROCESSOR 0 - -#endif Index: boot/arch/sparc64/include/arch/arch.h =================================================================== --- boot/arch/sparc64/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/sparc64/include/arch/arch.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2006 Martin Decky + * Copyright (c) 2006 Jakub Jermar + * 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. + */ + +#ifndef BOOT_sparc64_ARCH_H_ +#define BOOT_sparc64_ARCH_H_ + +#define PAGE_WIDTH 14 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define LOADER_ADDRESS 0x004000 +#define KERNEL_ADDRESS 0x400000 + +#define STACK_SIZE 8192 +#define STACK_ALIGNMENT 16 +#define STACK_BIAS 2047 +#define STACK_WINDOW_SAVE_AREA_SIZE (16 * 8) +#define STACK_ARG_SAVE_AREA_SIZE (6 * 8) + +#define NWINDOWS 8 + +#define PSTATE_IE_BIT 2 +#define PSTATE_PRIV_BIT 4 +#define PSTATE_AM_BIT 8 + +#define ASI_ICBUS_CONFIG 0x4a +#define ICBUS_CONFIG_MID_SHIFT 17 + +/** Constants to distinguish particular UltraSPARC architecture */ +#define ARCH_SUN4U 10 +#define ARCH_SUN4V 20 + +/** Constants to distinguish particular UltraSPARC subarchitecture */ +#define SUBARCH_UNKNOWN 0 +#define SUBARCH_US 1 +#define SUBARCH_US3 3 + +#define BSP_PROCESSOR 1 +#define AP_PROCESSOR 0 + +#endif Index: boot/arch/sparc64/include/arch/asm.h =================================================================== --- boot/arch/sparc64/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/sparc64/include/arch/asm.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2006 Martin Decky + * Copyright (c) 2006 Jakub Jermar + * 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. + */ + +#ifndef BOOT_sparc64_ASM_H_ +#define BOOT_sparc64_ASM_H_ + +#include + +extern void jump_to_kernel(uintptr_t physmem_start, bootinfo_t *bootinfo, + uint8_t subarch, void *entry) __attribute__((noreturn)); + +#endif Index: boot/arch/sparc64/include/arch/main.h =================================================================== --- boot/arch/sparc64/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/sparc64/include/arch/main.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef BOOT_sparc64_MAIN_H_ +#define BOOT_sparc64_MAIN_H_ + +#include +#include +#include + +typedef struct { + uintptr_t physmem_start; + taskmap_t taskmap; + memmap_t memmap; + ballocs_t ballocs; + ofw_tree_node_t *ofw_root; +} bootinfo_t; + +extern void bootstrap(void); + +#endif Index: boot/arch/sparc64/include/arch/ofw.h =================================================================== --- boot/arch/sparc64/include/arch/ofw.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/sparc64/include/arch/ofw.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * 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. + */ + +#ifndef BOOT_sparc64_OFW_H_ +#define BOOT_sparc64_OFW_H_ + +#include + +#define OFW_ADDRESS_CELLS 2 +#define OFW_SIZE_CELLS 2 + +extern uintptr_t ofw_get_physmem_start(void); +extern void ofw_cpu(uint16_t, uintptr_t); + +#endif Index: boot/arch/sparc64/include/arch/types.h =================================================================== --- boot/arch/sparc64/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/arch/sparc64/include/arch/types.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,48 @@ +/* + * 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. + */ + +#ifndef BOOT_sparc64_TYPES_H_ +#define BOOT_sparc64_TYPES_H_ + +#include <_bits/all.h> + +#define TASKMAP_MAX_RECORDS 32 +#define BOOTINFO_TASK_NAME_BUFLEN 32 + +typedef struct { + void *addr; + size_t size; + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} task_t; + +typedef struct { + size_t cnt; + task_t tasks[TASKMAP_MAX_RECORDS]; +} taskmap_t; + +#endif Index: boot/arch/sparc64/include/asm.h =================================================================== --- boot/arch/sparc64/include/asm.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,38 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * Copyright (c) 2006 Jakub Jermar - * 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. - */ - -#ifndef BOOT_sparc64_ASM_H_ -#define BOOT_sparc64_ASM_H_ - -#include - -extern void jump_to_kernel(uintptr_t physmem_start, bootinfo_t *bootinfo, - uint8_t subarch, void *entry) __attribute__((noreturn)); - -#endif Index: boot/arch/sparc64/include/main.h =================================================================== --- boot/arch/sparc64/include/main.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 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. - */ - -#ifndef BOOT_sparc64_MAIN_H_ -#define BOOT_sparc64_MAIN_H_ - -#include -#include -#include - -typedef struct { - uintptr_t physmem_start; - taskmap_t taskmap; - memmap_t memmap; - ballocs_t ballocs; - ofw_tree_node_t *ofw_root; -} bootinfo_t; - -extern void bootstrap(void); - -#endif Index: boot/arch/sparc64/include/ofw.h =================================================================== --- boot/arch/sparc64/include/ofw.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,40 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * 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. - */ - -#ifndef BOOT_sparc64_OFW_H_ -#define BOOT_sparc64_OFW_H_ - -#include - -#define OFW_ADDRESS_CELLS 2 -#define OFW_SIZE_CELLS 2 - -extern uintptr_t ofw_get_physmem_start(void); -extern void ofw_cpu(uint16_t, uintptr_t); - -#endif Index: boot/arch/sparc64/include/types.h =================================================================== --- boot/arch/sparc64/include/types.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,48 +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. - */ - -#ifndef BOOT_sparc64_TYPES_H_ -#define BOOT_sparc64_TYPES_H_ - -#include <_bits/all.h> - -#define TASKMAP_MAX_RECORDS 32 -#define BOOTINFO_TASK_NAME_BUFLEN 32 - -typedef struct { - void *addr; - size_t size; - char name[BOOTINFO_TASK_NAME_BUFLEN]; -} task_t; - -typedef struct { - size_t cnt; - task_t tasks[TASKMAP_MAX_RECORDS]; -} taskmap_t; - -#endif Index: boot/genarch/include/division.h =================================================================== --- boot/genarch/include/division.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,57 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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. - */ - -/** @file - */ - -#ifndef BOOT_DIVISION_H_ -#define BOOT_DIVISION_H_ - -extern int __divsi3(int, int); -extern long long __divdi3(long long, long long); - -extern unsigned int __udivsi3(unsigned int, unsigned int); -extern unsigned long long __udivdi3(unsigned long long, unsigned long long); - -extern int __modsi3(int, int); -extern long long __moddi3(long long, long long); - -extern unsigned int __umodsi3(unsigned int, unsigned int); -extern unsigned long long __umoddi3(unsigned long long, unsigned long long); - -extern int __divmodsi3(int, int, int *); -extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *); - -extern long long __divmoddi3(long long, long long, long long *); -extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long, - unsigned long long *); - -#endif - -/** @} - */ Index: boot/genarch/include/efi.h =================================================================== --- boot/genarch/include/efi.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,108 +1,0 @@ -/* - * Copyright (c) 2011 Jakub Jermar - * 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. - */ - -#ifndef BOOT_EFI_H_ -#define BOOT_EFI_H_ - -#include - -typedef struct { - uint64_t signature; - uint32_t revision; - uint32_t header_size; - uint32_t crc32; - uint32_t reserved; -} efi_table_header_t; - -#define SAL_SYSTEM_TABLE_GUID \ - { \ - { \ - 0x32, 0x2d, 0x9d, 0xeb, 0x88, 0x2d, 0xd3, 0x11, \ - 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \ - } \ - } - -typedef union { - uint8_t bytes[16]; - struct { - uint64_t low; - uint64_t high; - }; -} efi_guid_t; - -typedef struct { - efi_guid_t guid; - void *table; -} efi_configuration_table_t; - -typedef struct { - efi_table_header_t hdr; - char *fw_vendor; - uint32_t fw_revision; - void *cons_in_handle; - void *cons_in; - void *cons_out_handle; - void *cons_out; - void *cons_err_handle; - void *cons_err; - void *runtime_services; - void *boot_services; - sysarg_t conf_table_entries; - efi_configuration_table_t *conf_table; -} efi_system_table_t; - -typedef enum { - EFI_RESERVED, - EFI_LOADER_CODE, - EFI_LOADER_DATA, - EFI_BOOT_SERVICES_CODE, - EFI_BOOT_SERVICES_DATA, - EFI_RUNTIME_SERVICES_CODE, - EFI_RUNTIME_SERVICES_DATA, - EFI_CONVENTIONAL_MEMORY, - EFI_UNUSABLE_MEMORY, - EFI_ACPI_RECLAIM_MEMORY, - EFI_ACPI_MEMORY_NVS, - EFI_MEMORY_MAPPED_IO, - EFI_MEMORY_MAPPED_IO_PORT_SPACE, - EFI_PAL_CODE -} efi_memory_type_t; - -typedef struct { - uint32_t type; - uint64_t phys_start; - uint64_t virt_start; - uint64_t pages; - uint64_t attribute; -} efi_v1_memdesc_t; - -#define EFI_PAGE_SIZE 4096 - -extern void *efi_vendor_table_find(efi_system_table_t *, efi_guid_t); - -#endif Index: boot/genarch/include/genarch/division.h =================================================================== --- boot/genarch/include/genarch/division.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/genarch/include/genarch/division.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2006 Josef Cejka + * 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. + */ + +/** @file + */ + +#ifndef BOOT_DIVISION_H_ +#define BOOT_DIVISION_H_ + +extern int __divsi3(int, int); +extern long long __divdi3(long long, long long); + +extern unsigned int __udivsi3(unsigned int, unsigned int); +extern unsigned long long __udivdi3(unsigned long long, unsigned long long); + +extern int __modsi3(int, int); +extern long long __moddi3(long long, long long); + +extern unsigned int __umodsi3(unsigned int, unsigned int); +extern unsigned long long __umoddi3(unsigned long long, unsigned long long); + +extern int __divmodsi3(int, int, int *); +extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *); + +extern long long __divmoddi3(long long, long long, long long *); +extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long, + unsigned long long *); + +#endif + +/** @} + */ Index: boot/genarch/include/genarch/efi.h =================================================================== --- boot/genarch/include/genarch/efi.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/genarch/include/genarch/efi.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2011 Jakub Jermar + * 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. + */ + +#ifndef BOOT_EFI_H_ +#define BOOT_EFI_H_ + +#include + +typedef struct { + uint64_t signature; + uint32_t revision; + uint32_t header_size; + uint32_t crc32; + uint32_t reserved; +} efi_table_header_t; + +#define SAL_SYSTEM_TABLE_GUID \ + { \ + { \ + 0x32, 0x2d, 0x9d, 0xeb, 0x88, 0x2d, 0xd3, 0x11, \ + 0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \ + } \ + } + +typedef union { + uint8_t bytes[16]; + struct { + uint64_t low; + uint64_t high; + }; +} efi_guid_t; + +typedef struct { + efi_guid_t guid; + void *table; +} efi_configuration_table_t; + +typedef struct { + efi_table_header_t hdr; + char *fw_vendor; + uint32_t fw_revision; + void *cons_in_handle; + void *cons_in; + void *cons_out_handle; + void *cons_out; + void *cons_err_handle; + void *cons_err; + void *runtime_services; + void *boot_services; + sysarg_t conf_table_entries; + efi_configuration_table_t *conf_table; +} efi_system_table_t; + +typedef enum { + EFI_RESERVED, + EFI_LOADER_CODE, + EFI_LOADER_DATA, + EFI_BOOT_SERVICES_CODE, + EFI_BOOT_SERVICES_DATA, + EFI_RUNTIME_SERVICES_CODE, + EFI_RUNTIME_SERVICES_DATA, + EFI_CONVENTIONAL_MEMORY, + EFI_UNUSABLE_MEMORY, + EFI_ACPI_RECLAIM_MEMORY, + EFI_ACPI_MEMORY_NVS, + EFI_MEMORY_MAPPED_IO, + EFI_MEMORY_MAPPED_IO_PORT_SPACE, + EFI_PAL_CODE +} efi_memory_type_t; + +typedef struct { + uint32_t type; + uint64_t phys_start; + uint64_t virt_start; + uint64_t pages; + uint64_t attribute; +} efi_v1_memdesc_t; + +#define EFI_PAGE_SIZE 4096 + +extern void *efi_vendor_table_find(efi_system_table_t *, efi_guid_t); + +#endif Index: boot/genarch/include/genarch/multiplication.h =================================================================== --- boot/genarch/include/genarch/multiplication.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/genarch/include/genarch/multiplication.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2009 Josef Cejka + * 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. + */ + +/** + * @file + */ + +#ifndef BOOT_MULTIPLICATION_H__ +#define BOOT_MULTIPLICATION_H__ + +/* 64 bit multiplication */ +extern long long __muldi3(long long, long long); + +#endif + +/** @} + */ + + Index: boot/genarch/include/genarch/ofw.h =================================================================== --- boot/genarch/include/genarch/ofw.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/genarch/include/genarch/ofw.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2005 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. + */ + +#ifndef BOOT_OFW_H_ +#define BOOT_OFW_H_ + +#include +#include + +#define MEMMAP_MAX_RECORDS 32 +#define MAX_OFW_ARGS 12 + +#define OFW_TREE_PATH_MAX_LEN 256 +#define OFW_TREE_PROPERTY_MAX_NAMELEN 32 +#define OFW_TREE_PROPERTY_MAX_VALUELEN 64 + +typedef sysarg_t ofw_arg_t; +typedef native_t ofw_ret_t; +typedef uint32_t ofw_prop_t; +typedef uint32_t ihandle; +typedef uint32_t phandle; + +/** OpenFirmware command structure + * + */ +typedef struct { + ofw_arg_t service; /**< Command name. */ + ofw_arg_t nargs; /**< Number of in arguments. */ + ofw_arg_t nret; /**< Number of out arguments. */ + ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments. */ +} ofw_args_t; + +typedef struct { + void *start; + size_t size; +} memzone_t; + +typedef struct { + uint64_t total; + size_t cnt; + memzone_t zones[MEMMAP_MAX_RECORDS]; +} memmap_t; + +typedef struct { + uint32_t info; + uint32_t addr_hi; + uint32_t addr_lo; +} pci_addr_t; + +typedef struct { + pci_addr_t addr; + uint32_t size_hi; + uint32_t size_lo; +} pci_reg_t; + +extern uintptr_t ofw_cif; + +extern phandle ofw_chosen; +extern ihandle ofw_stdout; +extern phandle ofw_root; +extern ihandle ofw_mmu; +extern phandle ofw_memory; + +extern void ofw_init(void); + +extern void ofw_putchar(const char); + +extern ofw_arg_t ofw_get_property(const phandle, const char *, void *, + const size_t); +extern ofw_arg_t ofw_get_proplen(const phandle, const char *); +extern ofw_arg_t ofw_next_property(const phandle, char *, char *); + +extern phandle ofw_get_child_node(const phandle); +extern phandle ofw_get_peer_node(const phandle); +extern phandle ofw_find_device(const char *); + +extern ofw_arg_t ofw_package_to_path(const phandle, char *, const size_t); + +extern ofw_arg_t ofw(ofw_args_t *); +extern ofw_arg_t ofw_call(const char *, const size_t, const size_t, ofw_arg_t *, + ...); + +extern size_t ofw_get_address_cells(const phandle); +extern size_t ofw_get_size_cells(const phandle); + +extern void *ofw_translate(const void *); + +extern void ofw_claim_virt(const void *, const size_t); +extern void *ofw_claim_virt_any(const size_t, const size_t); + +extern void ofw_claim_phys(const void *, const size_t); +extern void *ofw_claim_phys_any(const size_t, const size_t); + +extern void ofw_map(const void *, const void *, const size_t, + const ofw_arg_t); + +extern void ofw_alloc(const char *, void **, void **, const size_t, void *); + +extern void ofw_memmap(memmap_t *); +extern void ofw_setup_screens(void); +extern void ofw_quiesce(void); + +#endif Index: boot/genarch/include/genarch/ofw_tree.h =================================================================== --- boot/genarch/include/genarch/ofw_tree.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) +++ boot/genarch/include/genarch/ofw_tree.h (revision 0798689015f6ea90e886a343e0eb42cff7ca5c2a) @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * 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. + */ + +#ifndef BOOT_OFW_TREE_H_ +#define BOOT_OFW_TREE_H_ + +#include +#include + +/** Memory representation of OpenFirmware device tree node property. */ +typedef struct { + char name[OFW_TREE_PROPERTY_MAX_NAMELEN]; + size_t size; + void *value; +} ofw_tree_property_t; + +/** Memory representation of OpenFirmware device tree node. */ +typedef struct ofw_tree_node { + struct ofw_tree_node *parent; + struct ofw_tree_node *peer; + struct ofw_tree_node *child; + + phandle node_handle; /**< Old OpenFirmware node handle. */ + + char *da_name; /**< Disambigued name. */ + + size_t properties; /**< Number of properties. */ + ofw_tree_property_t *property; + + void *device; /**< Member used solely by the kernel. */ +} ofw_tree_node_t; + +extern ofw_tree_node_t *ofw_tree_build(void); + +#endif Index: boot/genarch/include/multiplication.h =================================================================== --- boot/genarch/include/multiplication.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2009 Josef Cejka - * 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. - */ - -/** - * @file - */ - -#ifndef BOOT_MULTIPLICATION_H__ -#define BOOT_MULTIPLICATION_H__ - -/* 64 bit multiplication */ -extern long long __muldi3(long long, long long); - -#endif - -/** @} - */ - - Index: boot/genarch/include/ofw.h =================================================================== --- boot/genarch/include/ofw.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,128 +1,0 @@ -/* - * Copyright (c) 2005 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. - */ - -#ifndef BOOT_OFW_H_ -#define BOOT_OFW_H_ - -#include -#include - -#define MEMMAP_MAX_RECORDS 32 -#define MAX_OFW_ARGS 12 - -#define OFW_TREE_PATH_MAX_LEN 256 -#define OFW_TREE_PROPERTY_MAX_NAMELEN 32 -#define OFW_TREE_PROPERTY_MAX_VALUELEN 64 - -typedef sysarg_t ofw_arg_t; -typedef native_t ofw_ret_t; -typedef uint32_t ofw_prop_t; -typedef uint32_t ihandle; -typedef uint32_t phandle; - -/** OpenFirmware command structure - * - */ -typedef struct { - ofw_arg_t service; /**< Command name. */ - ofw_arg_t nargs; /**< Number of in arguments. */ - ofw_arg_t nret; /**< Number of out arguments. */ - ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments. */ -} ofw_args_t; - -typedef struct { - void *start; - size_t size; -} memzone_t; - -typedef struct { - uint64_t total; - size_t cnt; - memzone_t zones[MEMMAP_MAX_RECORDS]; -} memmap_t; - -typedef struct { - uint32_t info; - uint32_t addr_hi; - uint32_t addr_lo; -} pci_addr_t; - -typedef struct { - pci_addr_t addr; - uint32_t size_hi; - uint32_t size_lo; -} pci_reg_t; - -extern uintptr_t ofw_cif; - -extern phandle ofw_chosen; -extern ihandle ofw_stdout; -extern phandle ofw_root; -extern ihandle ofw_mmu; -extern phandle ofw_memory; - -extern void ofw_init(void); - -extern void ofw_putchar(const char); - -extern ofw_arg_t ofw_get_property(const phandle, const char *, void *, - const size_t); -extern ofw_arg_t ofw_get_proplen(const phandle, const char *); -extern ofw_arg_t ofw_next_property(const phandle, char *, char *); - -extern phandle ofw_get_child_node(const phandle); -extern phandle ofw_get_peer_node(const phandle); -extern phandle ofw_find_device(const char *); - -extern ofw_arg_t ofw_package_to_path(const phandle, char *, const size_t); - -extern ofw_arg_t ofw(ofw_args_t *); -extern ofw_arg_t ofw_call(const char *, const size_t, const size_t, ofw_arg_t *, - ...); - -extern size_t ofw_get_address_cells(const phandle); -extern size_t ofw_get_size_cells(const phandle); - -extern void *ofw_translate(const void *); - -extern void ofw_claim_virt(const void *, const size_t); -extern void *ofw_claim_virt_any(const size_t, const size_t); - -extern void ofw_claim_phys(const void *, const size_t); -extern void *ofw_claim_phys_any(const size_t, const size_t); - -extern void ofw_map(const void *, const void *, const size_t, - const ofw_arg_t); - -extern void ofw_alloc(const char *, void **, void **, const size_t, void *); - -extern void ofw_memmap(memmap_t *); -extern void ofw_setup_screens(void); -extern void ofw_quiesce(void); - -#endif Index: boot/genarch/include/ofw_tree.h =================================================================== --- boot/genarch/include/ofw_tree.h (revision 37e8c4a1c218e8d69819bd4f761fa694e0884dad) +++ (revision ) @@ -1,60 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * 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. - */ - -#ifndef BOOT_OFW_TREE_H_ -#define BOOT_OFW_TREE_H_ - -#include -#include - -/** Memory representation of OpenFirmware device tree node property. */ -typedef struct { - char name[OFW_TREE_PROPERTY_MAX_NAMELEN]; - size_t size; - void *value; -} ofw_tree_property_t; - -/** Memory representation of OpenFirmware device tree node. */ -typedef struct ofw_tree_node { - struct ofw_tree_node *parent; - struct ofw_tree_node *peer; - struct ofw_tree_node *child; - - phandle node_handle; /**< Old OpenFirmware node handle. */ - - char *da_name; /**< Disambigued name. */ - - size_t properties; /**< Number of properties. */ - ofw_tree_property_t *property; - - void *device; /**< Member used solely by the kernel. */ -} ofw_tree_node_t; - -extern ofw_tree_node_t *ofw_tree_build(void); - -#endif