Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/Makefile (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -94,8 +94,4 @@ ifeq ($(CONFIG_VIRT_IDX_DCACHE),y) DEFS += -DCONFIG_VIRT_IDX_DCACHE -endif - -ifeq ($(CONFIG_POWEROFF),y) - DEFS += -DCONFIG_POWEROFF endif @@ -161,4 +157,5 @@ generic/src/main/uinit.c \ generic/src/main/version.c \ + generic/src/main/shutdown.c \ generic/src/proc/scheduler.c \ generic/src/proc/thread.c \ Index: kernel/arch/amd64/src/pm.c =================================================================== --- kernel/arch/amd64/src/pm.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/amd64/src/pm.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -34,4 +34,5 @@ */ +#include #include #include @@ -228,4 +229,22 @@ } +/* Reboot the machine by initiating + * a triple fault + */ +void arch_reboot(void) +{ + preemption_disable(); + ipl_t ipl = interrupts_disable(); + + memsetb((uintptr_t) idt, sizeof(idt), 0); + idtr_load(&idtr); + + interrupts_restore(ipl); + asm volatile ( + "int $0x03\n" + "hlt\n" + ); +} + /** @} */ Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/arm32/src/arm32.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -83,4 +83,10 @@ } +void arch_reboot(void) +{ + // TODO + while (1); +} + /** @} */ Index: kernel/arch/ia32/src/pm.c =================================================================== --- kernel/arch/ia32/src/pm.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/ia32/src/pm.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -122,5 +122,5 @@ { idescriptor_t *d; - int i; + unsigned int i; for (i = 0; i < IDT_ITEMS; i++) { @@ -231,4 +231,26 @@ } +/* Reboot the machine by initiating + * a triple fault + */ +void arch_reboot(void) +{ + preemption_disable(); + ipl_t ipl = interrupts_disable(); + + memsetb((uintptr_t) idt, sizeof(idt), 0); + + ptr_16_32_t idtr; + idtr.limit = sizeof(idt); + idtr.base = (uintptr_t) idt; + idtr_load(&idtr); + + interrupts_restore(ipl); + asm volatile ( + "int $0x03\n" + "hlt\n" + ); +} + /** @} */ Index: kernel/arch/ia32xen/src/ia32xen.c =================================================================== --- kernel/arch/ia32xen/src/ia32xen.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/ia32xen/src/ia32xen.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -212,4 +212,10 @@ } +void arch_reboot(void) +{ + // TODO + while (1); +} + /** @} */ Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/ia64/src/ia64.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -177,4 +177,10 @@ } +void arch_reboot(void) +{ + // TODO + while (1); +} + /** @} */ Index: kernel/arch/mips32/src/mips32.c =================================================================== --- kernel/arch/mips32/src/mips32.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/mips32/src/mips32.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -179,4 +179,10 @@ } +void arch_reboot(void) +{ + // TODO + while (1); +} + /** @} */ Index: kernel/arch/ppc32/src/drivers/cuda.c =================================================================== --- kernel/arch/ppc32/src/drivers/cuda.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/ppc32/src/drivers/cuda.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -49,5 +49,6 @@ #define PACKET_CUDA 0x01 -#define CUDA_POWERDOWN 0x0a +#define CUDA_POWERDOWN 0x0a +#define CUDA_RESET 0x11 #define RS 0x200 @@ -192,7 +193,4 @@ -void send_packet(const uint8_t kind, index_t count, ...); - - static void receive_packet(uint8_t *kind, index_t count, uint8_t data[]) { @@ -317,5 +315,5 @@ -void send_packet(const uint8_t kind, index_t count, ...) +static void send_packet(const uint8_t kind, count_t count, ...) { index_t i; @@ -342,7 +340,4 @@ void cpu_halt(void) { -#ifdef CONFIG_POWEROFF - send_packet(PACKET_CUDA, 1, CUDA_POWERDOWN); -#endif asm volatile ( "b 0\n" @@ -350,4 +345,11 @@ } +void arch_reboot(void) { + send_packet(PACKET_CUDA, 1, CUDA_RESET); + asm volatile ( + "b 0\n" + ); +} + /** @} */ Index: kernel/arch/ppc64/src/ppc64.c =================================================================== --- kernel/arch/ppc64/src/ppc64.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/ppc64/src/ppc64.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -129,4 +129,5 @@ { } + /** Return console to userspace * @@ -136,4 +137,10 @@ } +void arch_reboot(void) +{ + // TODO + while (1); +} + /** @} */ Index: kernel/arch/sparc64/src/sparc64.c =================================================================== --- kernel/arch/sparc64/src/sparc64.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/arch/sparc64/src/sparc64.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -156,4 +156,10 @@ } +void arch_reboot(void) +{ + // TODO + while (1); +} + /** @} */ Index: kernel/generic/include/arch.h =================================================================== --- kernel/generic/include/arch.h (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/generic/include/arch.h (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -75,5 +75,9 @@ extern void arch_pre_smp_init(void); extern void arch_post_smp_init(void); + extern void calibrate_delay_loop(void); + +extern void reboot(void); +extern void arch_reboot(void); #endif Index: kernel/generic/include/proc/task.h =================================================================== --- kernel/generic/include/proc/task.h (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/generic/include/proc/task.h (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -112,4 +112,5 @@ extern void task_init(void); +extern void task_done(void); extern task_t *task_create(as_t *as, char *name); extern void task_destroy(task_t *t); Index: kernel/generic/src/console/cmd.c =================================================================== --- kernel/generic/src/console/cmd.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/generic/src/console/cmd.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -49,4 +49,5 @@ #include #include +#include #include #include @@ -80,5 +81,13 @@ static cmd_info_t exit_info = { .name = "exit", - .description = "Exit kconsole", + .description = "Exit kconsole.", + .argc = 0 +}; + +static int cmd_reboot(cmd_arg_t *argv); +static cmd_info_t reboot_info = { + .name = "reboot", + .description = "Reboot.", + .func = cmd_reboot, .argc = 0 }; @@ -430,4 +439,5 @@ &desc_info, &exit_info, + &reboot_info, &halt_info, &help_info, @@ -505,4 +515,19 @@ } + +/** Reboot the system. + * + * @param argv Argument vector. + * + * @return 0 on failure, 1 on success. + */ +int cmd_reboot(cmd_arg_t *argv) +{ + reboot(); + + /* Not reached */ + return 1; +} + /** Describe specified command. * Index: kernel/generic/src/main/shutdown.c =================================================================== --- kernel/generic/src/main/shutdown.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) +++ kernel/generic/src/main/shutdown.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2007 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 main + * @{ + */ + +/** + * @file + * @brief Shutdown procedures. + */ + +#include +#include + +void reboot(void) +{ + task_done(); + +#ifdef CONFIG_DEBUG + printf("Rebooting the system\n"); +#endif + + arch_reboot(); +} + +/** @} + */ Index: kernel/generic/src/proc/task.c =================================================================== --- kernel/generic/src/proc/task.c (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/generic/src/proc/task.c (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -94,4 +94,47 @@ } +/** Kill all tasks except the current task. + * + */ +void task_done(void) +{ + task_t *t; + do { /* Repeat until there are any tasks except TASK */ + + /* Messing with task structures, avoid deadlock */ + ipl_t ipl = interrupts_disable(); + spinlock_lock(&tasks_lock); + + t = NULL; + link_t *cur; + for (cur = tasks_btree.leaf_head.next; cur != &tasks_btree.leaf_head; cur = cur->next) { + btree_node_t *node = list_get_instance(cur, btree_node_t, leaf_link); + + unsigned int i; + for (i = 0; i < node->keys; i++) { + if ((task_t *) node->value[i] != TASK) { + t = (task_t *) node->value[i]; + break; + } + } + } + + if (t != NULL) { + task_id_t id = t->taskid; + + spinlock_unlock(&tasks_lock); + interrupts_restore(ipl); + +#ifdef CONFIG_DEBUG + printf("Killing task %llu\n", id); +#endif + task_kill(id); + } else { + spinlock_unlock(&tasks_lock); + interrupts_restore(ipl); + } + + } while (t != NULL); +} /** Create new task @@ -374,5 +417,5 @@ ipl_t ipl; - /* Messing with thread structures, avoid deadlock */ + /* Messing with task structures, avoid deadlock */ ipl = interrupts_disable(); spinlock_lock(&tasks_lock); Index: kernel/kernel.config =================================================================== --- kernel/kernel.config (revision 04d45129f69d986fd89e6d7719e54cfbf4212bdb) +++ kernel/kernel.config (revision f74bbaf20e8d8be55495c56affc5b17ef6ea2bf0) @@ -93,7 +93,4 @@ ! [(ARCH=mips32&MACHINE!=msim&MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=sparc64|ARCH=ia32xen] CONFIG_FPU_LAZY (y/n) -# Power off on halt -! [ARCH=ppc32] CONFIG_POWEROFF (n/y) - # Use VHPT ! [ARCH=ia64] CONFIG_VHPT (n/y)