Move grub_reboot out of the kernel.
* grub-core/Makefile.core.def (reboot): Add platform-specific files. * grub-core/kern/efi/efi.c (grub_reboot): Moved to ... * grub-core/lib/efi/reboot.c: ... here. * grub-core/kern/i386/efi/startup.S: Remove including of realmode.S. * grub-core/kern/i386/ieee1275/startup.S: Likewise. * grub-core/kern/i386/pc/startup.S (grub_exit): Inline cold_reboot. * grub-core/kern/i386/realmode.S (grub_reboot): Moved to... * grub-core/lib/i386/reboot_trampoline.S: ... here. * grub-core/kern/ieee1275/openfw.c (grub_reboot): Moved to... * grub-core/lib/ieee1275/reboot.c: ... here. * grub-core/kern/mips/arc/init.c (grub_reboot): Moved to... * grub-core/lib/mips/arc/reboot.c: ... here. * grub-core/kern/mips/loongson/init.c (grub_reboot): Moved to... * grub-core/lib/mips/loongson/reboot.c: ...here. * grub-core/kern/mips/qemu_mips/init.c (grub_reboot): Moved to... * grub-core/lib/mips/qemu_mips/reboot.c: ... here. * include/grub/emu/misc.h (grub_reboot): New function declaration. * include/grub/i386/reboot.h: New file. * include/grub/mips/loongson/ec.h: Fix includes. * include/grub/mips/qemu_mips/kernel.h (grub_reboot): Removed. * include/grub/misc.h (grub_reboot): Don't mark as kernel function. * grub-core/lib/i386/reboot.c: New file.
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
a97501d238
commit
544c24876e
23 changed files with 348 additions and 103 deletions
27
ChangeLog
27
ChangeLog
|
|
@ -1,3 +1,30 @@
|
||||||
|
2011-10-19 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
Move grub_reboot out of the kernel.
|
||||||
|
|
||||||
|
* grub-core/Makefile.core.def (reboot): Add platform-specific files.
|
||||||
|
* grub-core/kern/efi/efi.c (grub_reboot): Moved to ...
|
||||||
|
* grub-core/lib/efi/reboot.c: ... here.
|
||||||
|
* grub-core/kern/i386/efi/startup.S: Remove including of realmode.S.
|
||||||
|
* grub-core/kern/i386/ieee1275/startup.S: Likewise.
|
||||||
|
* grub-core/kern/i386/pc/startup.S (grub_exit): Inline cold_reboot.
|
||||||
|
* grub-core/kern/i386/realmode.S (grub_reboot): Moved to...
|
||||||
|
* grub-core/lib/i386/reboot_trampoline.S: ... here.
|
||||||
|
* grub-core/kern/ieee1275/openfw.c (grub_reboot): Moved to...
|
||||||
|
* grub-core/lib/ieee1275/reboot.c: ... here.
|
||||||
|
* grub-core/kern/mips/arc/init.c (grub_reboot): Moved to...
|
||||||
|
* grub-core/lib/mips/arc/reboot.c: ... here.
|
||||||
|
* grub-core/kern/mips/loongson/init.c (grub_reboot): Moved to...
|
||||||
|
* grub-core/lib/mips/loongson/reboot.c: ...here.
|
||||||
|
* grub-core/kern/mips/qemu_mips/init.c (grub_reboot): Moved to...
|
||||||
|
* grub-core/lib/mips/qemu_mips/reboot.c: ... here.
|
||||||
|
* include/grub/emu/misc.h (grub_reboot): New function declaration.
|
||||||
|
* include/grub/i386/reboot.h: New file.
|
||||||
|
* include/grub/mips/loongson/ec.h: Fix includes.
|
||||||
|
* include/grub/mips/qemu_mips/kernel.h (grub_reboot): Removed.
|
||||||
|
* include/grub/misc.h (grub_reboot): Don't mark as kernel function.
|
||||||
|
* grub-core/lib/i386/reboot.c: New file.
|
||||||
|
|
||||||
2011-10-18 Vladimir Serbinenko <phcoder@gmail.com>
|
2011-10-18 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
Make grub_prefix into module to fix the arbitrary limit and save
|
Make grub_prefix into module to fix the arbitrary limit and save
|
||||||
|
|
|
||||||
|
|
@ -633,6 +633,20 @@ module = {
|
||||||
emu = lib/emu/halt.c;
|
emu = lib/emu/halt.c;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
module = {
|
||||||
|
name = reboot;
|
||||||
|
i386 = lib/i386/reboot.c;
|
||||||
|
i386 = lib/i386/reboot_trampoline.S;
|
||||||
|
ia64_efi = lib/efi/reboot.c;
|
||||||
|
x86_64_efi = lib/efi/reboot.c;
|
||||||
|
powerpc_ieee1275 = lib/ieee1275/reboot.c;
|
||||||
|
sparc64_ieee1275 = lib/ieee1275/reboot.c;
|
||||||
|
mips_arc = lib/mips/arc/reboot.c;
|
||||||
|
mips_loongson = lib/mips/loongson/reboot.c;
|
||||||
|
mips_qemu_mips = lib/mips/qemu_mips/reboot.c;
|
||||||
|
common = commands/reboot.c;
|
||||||
|
};
|
||||||
|
|
||||||
module = {
|
module = {
|
||||||
name = hashsum;
|
name = hashsum;
|
||||||
common = commands/hashsum.c;
|
common = commands/hashsum.c;
|
||||||
|
|
@ -733,11 +747,6 @@ module = {
|
||||||
common = commands/read.c;
|
common = commands/read.c;
|
||||||
};
|
};
|
||||||
|
|
||||||
module = {
|
|
||||||
name = reboot;
|
|
||||||
common = commands/reboot.c;
|
|
||||||
};
|
|
||||||
|
|
||||||
module = {
|
module = {
|
||||||
name = search;
|
name = search;
|
||||||
common = commands/search_wrap.c;
|
common = commands/search_wrap.c;
|
||||||
|
|
|
||||||
|
|
@ -163,18 +163,6 @@ grub_exit (void)
|
||||||
for (;;) ;
|
for (;;) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* On i386, a firmware-independant grub_reboot() is provided by realmode.S. */
|
|
||||||
#ifndef __i386__
|
|
||||||
void
|
|
||||||
grub_reboot (void)
|
|
||||||
{
|
|
||||||
grub_efi_fini ();
|
|
||||||
efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
|
|
||||||
GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
|
|
||||||
for (;;) ;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
grub_err_t
|
grub_err_t
|
||||||
grub_efi_set_virtual_address_map (grub_efi_uintn_t memory_map_size,
|
grub_efi_set_virtual_address_map (grub_efi_uintn_t memory_map_size,
|
||||||
grub_efi_uintn_t descriptor_size,
|
grub_efi_uintn_t descriptor_size,
|
||||||
|
|
|
||||||
|
|
@ -51,5 +51,3 @@ codestart:
|
||||||
movl %eax, EXT_C(grub_efi_system_table)
|
movl %eax, EXT_C(grub_efi_system_table)
|
||||||
call EXT_C(grub_main)
|
call EXT_C(grub_main)
|
||||||
ret
|
ret
|
||||||
|
|
||||||
#include "../realmode.S"
|
|
||||||
|
|
|
||||||
|
|
@ -39,9 +39,3 @@ _start:
|
||||||
movl %eax, EXT_C(grub_ieee1275_entry_fn)
|
movl %eax, EXT_C(grub_ieee1275_entry_fn)
|
||||||
jmp EXT_C(grub_main)
|
jmp EXT_C(grub_main)
|
||||||
|
|
||||||
/*
|
|
||||||
* prot_to_real and associated structures (but NOT real_to_prot, that is
|
|
||||||
* only needed for BIOS gates).
|
|
||||||
*/
|
|
||||||
#include "../realmode.S"
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -465,7 +465,10 @@ FUNCTION(grub_exit)
|
||||||
.code16
|
.code16
|
||||||
/* Tell the BIOS a boot failure. If this does not work, reboot. */
|
/* Tell the BIOS a boot failure. If this does not work, reboot. */
|
||||||
int $0x18
|
int $0x18
|
||||||
jmp cold_reboot
|
/* set 0x472 to 0x0000 for cold boot (0x1234 for warm boot) */
|
||||||
|
movw $0x0472, %di
|
||||||
|
movw %ax, (%di)
|
||||||
|
ljmp $0xf000, $0xfff0
|
||||||
.code32
|
.code32
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -225,18 +225,3 @@ realcseg:
|
||||||
DATA32 ret
|
DATA32 ret
|
||||||
|
|
||||||
.code32
|
.code32
|
||||||
|
|
||||||
/*
|
|
||||||
* grub_reboot()
|
|
||||||
*
|
|
||||||
* Reboot the system. At the moment, rely on BIOS.
|
|
||||||
*/
|
|
||||||
FUNCTION(grub_reboot)
|
|
||||||
call prot_to_real
|
|
||||||
.code16
|
|
||||||
cold_reboot:
|
|
||||||
/* set 0x472 to 0x0000 for cold boot (0x1234 for warm boot) */
|
|
||||||
movw $0x0472, %di
|
|
||||||
movw %ax, (%di)
|
|
||||||
ljmp $0xf000, $0xfff0
|
|
||||||
.code32
|
|
||||||
|
|
|
||||||
|
|
@ -456,16 +456,6 @@ grub_ieee1275_encode_devname (const char *path)
|
||||||
return encoding;
|
return encoding;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* On i386, a firmware-independant grub_reboot() is provided by realmode.S. */
|
|
||||||
#ifndef __i386__
|
|
||||||
void
|
|
||||||
grub_reboot (void)
|
|
||||||
{
|
|
||||||
grub_ieee1275_interpret ("reset-all", 0);
|
|
||||||
for (;;) ;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Resolve aliases. */
|
/* Resolve aliases. */
|
||||||
char *
|
char *
|
||||||
grub_ieee1275_canonicalise_devname (const char *path)
|
grub_ieee1275_canonicalise_devname (const char *path)
|
||||||
|
|
|
||||||
|
|
@ -195,15 +195,3 @@ grub_exit (void)
|
||||||
while (1);
|
while (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
grub_reboot (void)
|
|
||||||
{
|
|
||||||
GRUB_ARC_FIRMWARE_VECTOR->restart ();
|
|
||||||
|
|
||||||
grub_millisleep (1500);
|
|
||||||
|
|
||||||
grub_printf ("Reboot failed\n");
|
|
||||||
grub_refresh ();
|
|
||||||
while (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
#include <grub/mips/loongson.h>
|
#include <grub/mips/loongson.h>
|
||||||
#include <grub/cs5536.h>
|
#include <grub/cs5536.h>
|
||||||
#include <grub/term.h>
|
#include <grub/term.h>
|
||||||
#include <grub/machine/ec.h>
|
|
||||||
#include <grub/cpu/memory.h>
|
#include <grub/cpu/memory.h>
|
||||||
|
|
||||||
extern void grub_video_sm712_init (void);
|
extern void grub_video_sm712_init (void);
|
||||||
|
|
@ -266,37 +265,6 @@ grub_exit (void)
|
||||||
grub_halt ();
|
grub_halt ();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
grub_reboot (void)
|
|
||||||
{
|
|
||||||
switch (grub_arch_machine)
|
|
||||||
{
|
|
||||||
case GRUB_ARCH_MACHINE_FULOONG2E:
|
|
||||||
grub_outb (grub_inb (0xbfe00104) & ~4, 0xbfe00104);
|
|
||||||
grub_outb (grub_inb (0xbfe00104) | 4, 0xbfe00104);
|
|
||||||
break;
|
|
||||||
case GRUB_ARCH_MACHINE_FULOONG2F:
|
|
||||||
{
|
|
||||||
grub_pci_device_t dev;
|
|
||||||
if (!grub_cs5536_find (&dev))
|
|
||||||
break;
|
|
||||||
grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_RESET,
|
|
||||||
grub_cs5536_read_msr (dev,
|
|
||||||
GRUB_CS5536_MSR_DIVIL_RESET)
|
|
||||||
| 1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case GRUB_ARCH_MACHINE_YEELOONG:
|
|
||||||
grub_write_ec (GRUB_MACHINE_EC_COMMAND_REBOOT);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
grub_millisleep (1500);
|
|
||||||
|
|
||||||
grub_printf ("Reboot failed\n");
|
|
||||||
grub_refresh ();
|
|
||||||
while (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern char _end[];
|
extern char _end[];
|
||||||
grub_addr_t grub_modbase = (grub_addr_t) _end;
|
grub_addr_t grub_modbase = (grub_addr_t) _end;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -99,12 +99,6 @@ grub_halt (void)
|
||||||
while (1);
|
while (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
grub_reboot (void)
|
|
||||||
{
|
|
||||||
while (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
grub_err_t
|
grub_err_t
|
||||||
grub_machine_mmap_iterate (grub_memory_hook_t hook)
|
grub_machine_mmap_iterate (grub_memory_hook_t hook)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
32
grub-core/lib/efi/reboot.c
Normal file
32
grub-core/lib/efi/reboot.c
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/efi/api.h>
|
||||||
|
#include <grub/efi/efi.h>
|
||||||
|
#include <grub/mm.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
#include <grub/kernel.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
grub_reboot (void)
|
||||||
|
{
|
||||||
|
grub_machine_fini ();
|
||||||
|
efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
|
||||||
|
GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
|
||||||
|
for (;;) ;
|
||||||
|
}
|
||||||
59
grub-core/lib/i386/reboot.c
Normal file
59
grub-core/lib/i386/reboot.c
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/relocator.h>
|
||||||
|
#include <grub/cpu/relocator.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
#include <grub/mm.h>
|
||||||
|
#include <grub/cpu/reboot.h>
|
||||||
|
#include <grub/i386/floppy.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
grub_reboot (void)
|
||||||
|
{
|
||||||
|
struct grub_relocator *relocator = NULL;
|
||||||
|
grub_relocator_chunk_t ch;
|
||||||
|
grub_err_t err;
|
||||||
|
void *buf;
|
||||||
|
struct grub_relocator16_state state;
|
||||||
|
grub_uint16_t segment;
|
||||||
|
|
||||||
|
relocator = grub_relocator_new ();
|
||||||
|
if (!relocator)
|
||||||
|
while (1);
|
||||||
|
err = grub_relocator_alloc_chunk_align (relocator, &ch, 0x1000, 0x1000,
|
||||||
|
grub_reboot_end - grub_reboot_start,
|
||||||
|
16, GRUB_RELOCATOR_PREFERENCE_NONE);
|
||||||
|
if (err)
|
||||||
|
while (1);
|
||||||
|
buf = get_virtual_current_address (ch);
|
||||||
|
grub_memcpy (buf, grub_reboot_start, grub_reboot_end - grub_reboot_start);
|
||||||
|
|
||||||
|
segment = ((grub_addr_t) get_physical_target_address (ch)) >> 4;
|
||||||
|
state.gs = state.fs = state.es = state.ds = state.ss = segment;
|
||||||
|
state.sp = 0;
|
||||||
|
state.cs = segment;
|
||||||
|
state.ip = 0;
|
||||||
|
|
||||||
|
grub_stop_floppy ();
|
||||||
|
|
||||||
|
err = grub_relocator16_boot (relocator, state);
|
||||||
|
|
||||||
|
while (1);
|
||||||
|
}
|
||||||
|
|
||||||
33
grub-core/lib/i386/reboot_trampoline.S
Normal file
33
grub-core/lib/i386/reboot_trampoline.S
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/symbol.h>
|
||||||
|
#include <grub/i386/reboot.h>
|
||||||
|
|
||||||
|
.p2align 4
|
||||||
|
|
||||||
|
VARIABLE(grub_reboot_start)
|
||||||
|
.code16
|
||||||
|
|
||||||
|
/* set 0x472 to 0x0000 for cold boot (0x1234 for warm boot) */
|
||||||
|
movw $0x0472, %di
|
||||||
|
movw %ax, (%di)
|
||||||
|
ljmp $0xf000, $0xfff0
|
||||||
|
|
||||||
|
.code32
|
||||||
|
VARIABLE(grub_reboot_end)
|
||||||
27
grub-core/lib/ieee1275/reboot.c
Normal file
27
grub-core/lib/ieee1275/reboot.c
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/ieee1275/ieee1275.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
grub_reboot (void)
|
||||||
|
{
|
||||||
|
grub_ieee1275_interpret ("reset-all", 0);
|
||||||
|
for (;;) ;
|
||||||
|
}
|
||||||
34
grub-core/lib/mips/arc/reboot.c
Normal file
34
grub-core/lib/mips/arc/reboot.c
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/arc/arc.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
#include <grub/time.h>
|
||||||
|
#include <grub/term.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
grub_reboot (void)
|
||||||
|
{
|
||||||
|
GRUB_ARC_FIRMWARE_VECTOR->restart ();
|
||||||
|
|
||||||
|
grub_millisleep (1500);
|
||||||
|
|
||||||
|
grub_printf ("Reboot failed\n");
|
||||||
|
grub_refresh ();
|
||||||
|
while (1);
|
||||||
|
}
|
||||||
57
grub-core/lib/mips/loongson/reboot.c
Normal file
57
grub-core/lib/mips/loongson/reboot.c
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/machine/ec.h>
|
||||||
|
#include <grub/machine/kernel.h>
|
||||||
|
#include <grub/machine/memory.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
#include <grub/pci.h>
|
||||||
|
#include <grub/cs5536.h>
|
||||||
|
#include <grub/time.h>
|
||||||
|
#include <grub/term.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
grub_reboot (void)
|
||||||
|
{
|
||||||
|
switch (grub_arch_machine)
|
||||||
|
{
|
||||||
|
case GRUB_ARCH_MACHINE_FULOONG2E:
|
||||||
|
grub_outb (grub_inb (0xbfe00104) & ~4, 0xbfe00104);
|
||||||
|
grub_outb (grub_inb (0xbfe00104) | 4, 0xbfe00104);
|
||||||
|
break;
|
||||||
|
case GRUB_ARCH_MACHINE_FULOONG2F:
|
||||||
|
{
|
||||||
|
grub_pci_device_t dev;
|
||||||
|
if (!grub_cs5536_find (&dev))
|
||||||
|
break;
|
||||||
|
grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_RESET,
|
||||||
|
grub_cs5536_read_msr (dev,
|
||||||
|
GRUB_CS5536_MSR_DIVIL_RESET)
|
||||||
|
| 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case GRUB_ARCH_MACHINE_YEELOONG:
|
||||||
|
grub_write_ec (GRUB_MACHINE_EC_COMMAND_REBOOT);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
grub_millisleep (1500);
|
||||||
|
|
||||||
|
grub_printf ("Reboot failed\n");
|
||||||
|
grub_refresh ();
|
||||||
|
while (1);
|
||||||
|
}
|
||||||
25
grub-core/lib/mips/qemu_mips/reboot.c
Normal file
25
grub-core/lib/mips/qemu_mips/reboot.c
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
grub_reboot (void)
|
||||||
|
{
|
||||||
|
while (1);
|
||||||
|
}
|
||||||
|
|
@ -82,4 +82,7 @@ int grub_device_mapper_supported (void);
|
||||||
|
|
||||||
char *grub_find_root_device_from_mountinfo (const char *dir, char **relroot);
|
char *grub_find_root_device_from_mountinfo (const char *dir, char **relroot);
|
||||||
|
|
||||||
|
void EXPORT_FUNC(grub_reboot) (void);
|
||||||
|
|
||||||
|
|
||||||
#endif /* GRUB_EMU_MISC_H */
|
#endif /* GRUB_EMU_MISC_H */
|
||||||
|
|
|
||||||
28
include/grub/i386/reboot.h
Normal file
28
include/grub/i386/reboot.h
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef GRUB_REBOOT_H
|
||||||
|
#define GRUB_REBOOT_H 1
|
||||||
|
|
||||||
|
#ifndef ASM_FILE
|
||||||
|
|
||||||
|
extern grub_uint8_t grub_reboot_end[], grub_reboot_start[];
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -19,6 +19,10 @@
|
||||||
#ifndef GRUB_EC_MACHINE_HEADER
|
#ifndef GRUB_EC_MACHINE_HEADER
|
||||||
#define GRUB_EC_MACHINE_HEADER 1
|
#define GRUB_EC_MACHINE_HEADER 1
|
||||||
|
|
||||||
|
#include <grub/types.h>
|
||||||
|
#include <grub/cpu/io.h>
|
||||||
|
#include <grub/pci.h>
|
||||||
|
|
||||||
#define GRUB_MACHINE_EC_MAGIC_PORT1 0x381
|
#define GRUB_MACHINE_EC_MAGIC_PORT1 0x381
|
||||||
#define GRUB_MACHINE_EC_MAGIC_PORT2 0x382
|
#define GRUB_MACHINE_EC_MAGIC_PORT2 0x382
|
||||||
#define GRUB_MACHINE_EC_DATA_PORT 0x383
|
#define GRUB_MACHINE_EC_DATA_PORT 0x383
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
#ifndef ASM_FILE
|
#ifndef ASM_FILE
|
||||||
|
|
||||||
void EXPORT_FUNC (grub_reboot) (void);
|
|
||||||
void EXPORT_FUNC (grub_halt) (void);
|
void EXPORT_FUNC (grub_halt) (void);
|
||||||
void grub_qemu_init_cirrus (void);
|
void grub_qemu_init_cirrus (void);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -343,7 +343,7 @@ grub_div_roundup (unsigned int x, unsigned int y)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reboot the machine. */
|
/* Reboot the machine. */
|
||||||
void EXPORT_FUNC (grub_reboot) (void) __attribute__ ((noreturn));
|
void grub_reboot (void) __attribute__ ((noreturn));
|
||||||
|
|
||||||
#ifdef GRUB_MACHINE_PCBIOS
|
#ifdef GRUB_MACHINE_PCBIOS
|
||||||
/* Halt the system, using APM if possible. If NO_APM is true, don't
|
/* Halt the system, using APM if possible. If NO_APM is true, don't
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue