2001169405
* conf/i386/efi.rmk (pkglib_MODULES): add pci.mod and lspci.mod. (appleldr_mod_SOURCE): New variavle. (appleldr_mod_CFLAGS): Likewise. (appleldr_mod_LDFLAGS): Likewise. (pci_mod_SOURCES): Likewise. (pci_mod_CFLAGS): Likewise. (pci_mod_LDFLAGS): Likewise. (lspci_mod_SOURCES): Likewise. (lspci_mod_CFLAGS): Likewise. (lspci_mod_LDFLAGS): Likewise. * conf/x86_64-efi.rmk: New file. * disk/efi/efidisk.c (grub_efidisk_read): Wrap efi calls with efi_call_N macro. (grub_efidisk_write): Likewise. * include/efi/api.h (efi_call_0): New macro. (efi_call_1): Likewise. (efi_call_2): Likewise. (efi_call_3): Likewise. (efi_call_4): Likewise. (efi_call_5): Likewise. (efi_call_6): Likewise. * include/grub/efi/chainloader.h (grub_chainloader_cmd): Rename to grub_rescue_cmd_chainloader. * include/grub/efi/pe32.h (GRUB_PE32_MACHINE_X86_64): New macro. (grub_pe32_optional_header): Change some fields based on i386 or x86_64 platform. (GRUB_PE32_PE32_MAGIC): Likewise. * include/grub/efi/uga_draw.h: New file. * include/grub/elf.h (STN_ABS): New constant. (R_X86_64_NONE): Relocation constant for x86_64. (R_X86_64_64): Likewise. (R_X86_64_PC32): Likewise. (R_X86_64_GOT32): Likewise. (R_X86_64_PLT32): Likewise. (R_X86_64_COPY): Likewise. (R_X86_64_GLOB_DAT): Likewise. (R_X86_64_JUMP_SLOT): Likewise. (R_X86_64_RELATIVE): Likewise. (R_X86_64_GOTPCREL): Likewise. (R_X86_64_32): Likewise. (R_X86_64_32S): Likewise. (R_X86_64_16): Likewise. (R_X86_64_PC16): Likewise. (R_X86_64_8): Likewise. (R_X86_64_PC8): Likewise. * include/grub/i386/efi/pci.h: New file. * include/grub/i386/linux.h (GRUB_LINUX_EFI_SIGNATURE): Change it value based on platform. (GRUB_LINUX_EFI_SIGNATURE_0204): New constant. (GRUB_E820_RAM): Likewise. (GRUB_E820_RESERVED): Likewise. (GRUB_E820_ACPI): Likewise. (GRUB_E820_NVS): Likewise. (GRUB_E820_EXEC_CODE): Likewise. (GRUB_E820_MAX_ENTRY): Likewise. (grub_e820_mmap): New structure. (linux_kernel_header): Change the efi field according to different kernel version, also field from linux_kernel_header. * include/grub/kernel.h (grub_module_info): Add padding for x86_64. * include/grub/pci.h (GRUB_PCI_ADDR_SPACE_MASK): New constant. (GRUB_PCI_ADDR_SPACE_MEMORY): Likewise. (GRUB_PCI_ADDR_SPACE_IO): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_MASK): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_32): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_1M): Likewise. (GRUB_PCI_ADDR_MEM_TYPE_64): Likewise. (GRUB_PCI_ADDR_MEM_PREFETCH): Likewise. (GRUB_PCI_ADDR_MEM_MASK): Likewise. (GRUB_PCI_ADDR_IO_MASK): Likewise. * include/grub/x86_64/efi/kernel.h: New file. * include/grub/x86_64/efi/loader.h: Likewise. * include/grub/x86_64/efi/machine.h: Likewise. * include/grub/x86_64/efi/pci.h: Likewise. * include/grub/x86_64/efi/time.h: Likewise. * include/grub/x86_64/linux.h: Likewise. * include/grub/x86_64/setjmp.h: Likewise. * include/grub/x86_64/time.h: Likewise. * include/grub/x86_64/types.h: Likewise. * kern/dl.c (GRUB_CPU_SIZEOF_VOID_P): Changed to GRUB_TARGET_SIZEOF_VOID_P. * kern/efi/efi.c (grub_efi_locate_protocol): Wrap efi calls. (grub_efi_locate_handle): Likewise. (grub_efi_open_protocol): Likewise. (grub_efi_set_text_mode): Likewise. (grub_efi_stall): Likewise. (grub_exit): Likewise. (grub_reboot): Likewise. (grub_halt): Likewise. (grub_efi_exit_boot_services): Likewise. (grub_get_rtc): Likewise. * kern/efi/mm.c (MEMORY_MAP_SIZE): Change to 0x3000 for new models. (GRUB_CPU_SIZEOF_VOID_P): Changed to GRUB_TARGET_SIZEOF_VOID_P. (grub_efi_allocate_pages): Wrap efi calls. (grub_efi_free_pages): Wrap efi calls. (grub_efi_get_memory_map): Wrap efi calls. * kern/x86_64/dl.c: New file. * kern/x86_64/efi/callwrap.S: Likewise. * kern/x86_64/efi/startup.S: Likewise. * loader/efi/appleloader.c: Likewise. * loader/efi/chainloader.c (cmdline): New variable. (grub_chainloader_unload): Wrap efi calls. (grub_chainloader_boot): Likewise. (grub_rescue_cmd_chainloader): Wrap efi calls, handle command line. * loader/efi/chainloader_normal.c (chainloader_command): Change grub_chainloader_cmd to grub_rescue_cmd_chainloader, pass command line. * loader/i386/efi/linux.c (allocate_pages): Change allocation method. (grub_e820_add_region): New function. (grub_linux_boot): Construct e820 map from efi map, handle x86_64 booting. (grub_find_video_card): New function. (grub_linux_setup_video): New function. (grub_rescue_cmd_linux): Probe for video information. * normal/x86_64/setjmp.S: New file. * term/efi/console.c (map_char): New function. (grub_console_putchar): Map unicode char. (grub_console_checkkey): Wrap efi calls. (grub_console_getkey): Likewise. (grub_console_getwh): Likewise. (grub_console_gotoxy): Likewise. (grub_console_cls): Likewise. (grub_console_setcolorstate): Likewise. (grub_console_setcursor): Likewise. * util/i386/efi/grub-mkimage.c: Add support for x86_64.
375 lines
7.9 KiB
C
375 lines
7.9 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2006,2007 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/term.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/types.h>
|
|
#include <grub/err.h>
|
|
#include <grub/efi/efi.h>
|
|
#include <grub/efi/api.h>
|
|
#include <grub/efi/console.h>
|
|
|
|
static grub_uint8_t
|
|
grub_console_standard_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_YELLOW,
|
|
GRUB_EFI_BACKGROUND_BLACK);
|
|
static grub_uint8_t
|
|
grub_console_normal_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_LIGHTGRAY,
|
|
GRUB_EFI_BACKGROUND_BLACK);
|
|
static grub_uint8_t
|
|
grub_console_highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_BLACK,
|
|
GRUB_EFI_BACKGROUND_LIGHTGRAY);
|
|
|
|
static int read_key = -1;
|
|
|
|
static grub_uint32_t
|
|
map_char (grub_uint32_t c)
|
|
{
|
|
if (c > 0x7f)
|
|
{
|
|
/* Map some unicode characters to the EFI character. */
|
|
switch (c)
|
|
{
|
|
case 0x2190: /* left arrow */
|
|
c = 0x25c4;
|
|
break;
|
|
case 0x2191: /* up arrow */
|
|
c = 0x25b2;
|
|
break;
|
|
case 0x2192: /* right arrow */
|
|
c = 0x25ba;
|
|
break;
|
|
case 0x2193: /* down arrow */
|
|
c = 0x25bc;
|
|
break;
|
|
case 0x2501: /* horizontal line */
|
|
c = 0x2500;
|
|
break;
|
|
case 0x2503: /* vertical line */
|
|
c = 0x2502;
|
|
break;
|
|
case 0x250F: /* upper-left corner */
|
|
c = 0x250c;
|
|
break;
|
|
case 0x2513: /* upper-right corner */
|
|
c = 0x2510;
|
|
break;
|
|
case 0x2517: /* lower-left corner */
|
|
c = 0x2514;
|
|
break;
|
|
case 0x251B: /* lower-right corner */
|
|
c = 0x2518;
|
|
break;
|
|
|
|
default:
|
|
c = '?';
|
|
break;
|
|
}
|
|
}
|
|
|
|
return c;
|
|
}
|
|
|
|
static void
|
|
grub_console_putchar (grub_uint32_t c)
|
|
{
|
|
grub_efi_char16_t str[2];
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
o = grub_efi_system_table->con_out;
|
|
|
|
/* For now, do not try to use a surrogate pair. */
|
|
if (c > 0xffff)
|
|
c = '?';
|
|
|
|
str[0] = (grub_efi_char16_t) map_char (c & 0xffff);
|
|
str[1] = 0;
|
|
|
|
/* Should this test be cached? */
|
|
if (c > 0x7f && efi_call_2 (o->test_string, o, str) != GRUB_EFI_SUCCESS)
|
|
return;
|
|
|
|
efi_call_2 (o->output_string, o, str);
|
|
}
|
|
|
|
static grub_ssize_t
|
|
grub_console_getcharwidth (grub_uint32_t c __attribute__ ((unused)))
|
|
{
|
|
/* For now, every printable character has the width 1. */
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
grub_console_checkkey (void)
|
|
{
|
|
grub_efi_simple_input_interface_t *i;
|
|
grub_efi_input_key_t key;
|
|
grub_efi_status_t status;
|
|
|
|
if (read_key >= 0)
|
|
return 1;
|
|
|
|
i = grub_efi_system_table->con_in;
|
|
status = efi_call_2 (i->read_key_stroke, i, &key);
|
|
#if 0
|
|
switch (status)
|
|
{
|
|
case GRUB_EFI_SUCCESS:
|
|
{
|
|
grub_uint16_t xy;
|
|
|
|
xy = grub_getxy ();
|
|
grub_gotoxy (0, 0);
|
|
grub_printf ("scan_code=%x,unicode_char=%x ",
|
|
(unsigned) key.scan_code,
|
|
(unsigned) key.unicode_char);
|
|
grub_gotoxy (xy >> 8, xy & 0xff);
|
|
}
|
|
break;
|
|
|
|
case GRUB_EFI_NOT_READY:
|
|
//grub_printf ("not ready ");
|
|
break;
|
|
|
|
default:
|
|
//grub_printf ("device error ");
|
|
break;
|
|
}
|
|
#endif
|
|
|
|
if (status == GRUB_EFI_SUCCESS)
|
|
{
|
|
switch (key.scan_code)
|
|
{
|
|
case 0x00:
|
|
read_key = key.unicode_char;
|
|
break;
|
|
case 0x01:
|
|
read_key = 16;
|
|
break;
|
|
case 0x02:
|
|
read_key = 14;
|
|
break;
|
|
case 0x03:
|
|
read_key = 6;
|
|
break;
|
|
case 0x04:
|
|
read_key = 2;
|
|
break;
|
|
case 0x05:
|
|
read_key = 1;
|
|
break;
|
|
case 0x06:
|
|
read_key = 5;
|
|
break;
|
|
case 0x07:
|
|
break;
|
|
case 0x08:
|
|
read_key = 4;
|
|
break;
|
|
case 0x09:
|
|
break;
|
|
case 0x0a:
|
|
break;
|
|
case 0x0b:
|
|
read_key = 24;
|
|
break;
|
|
case 0x0c:
|
|
read_key = 1;
|
|
break;
|
|
case 0x0d:
|
|
read_key = 5;
|
|
break;
|
|
case 0x17:
|
|
read_key = '\e';
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return read_key;
|
|
}
|
|
|
|
static int
|
|
grub_console_getkey (void)
|
|
{
|
|
grub_efi_simple_input_interface_t *i;
|
|
grub_efi_boot_services_t *b;
|
|
grub_efi_uintn_t index;
|
|
grub_efi_status_t status;
|
|
int key;
|
|
|
|
if (read_key >= 0)
|
|
{
|
|
key = read_key;
|
|
read_key = -1;
|
|
return key;
|
|
}
|
|
|
|
i = grub_efi_system_table->con_in;
|
|
b = grub_efi_system_table->boot_services;
|
|
|
|
do
|
|
{
|
|
status = efi_call_3 (b->wait_for_event, 1, &(i->wait_for_key), &index);
|
|
if (status != GRUB_EFI_SUCCESS)
|
|
return -1;
|
|
|
|
grub_console_checkkey ();
|
|
}
|
|
while (read_key < 0);
|
|
|
|
key = read_key;
|
|
read_key = -1;
|
|
return key;
|
|
}
|
|
|
|
static grub_uint16_t
|
|
grub_console_getwh (void)
|
|
{
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
grub_efi_uintn_t columns, rows;
|
|
|
|
o = grub_efi_system_table->con_out;
|
|
if (efi_call_4 (o->query_mode, o, o->mode->mode, &columns, &rows) != GRUB_EFI_SUCCESS)
|
|
{
|
|
/* Why does this fail? */
|
|
columns = 80;
|
|
rows = 25;
|
|
}
|
|
|
|
return ((columns << 8) | rows);
|
|
}
|
|
|
|
static grub_uint16_t
|
|
grub_console_getxy (void)
|
|
{
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
o = grub_efi_system_table->con_out;
|
|
return ((o->mode->cursor_column << 8) | o->mode->cursor_row);
|
|
}
|
|
|
|
static void
|
|
grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y)
|
|
{
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
o = grub_efi_system_table->con_out;
|
|
efi_call_3 (o->set_cursor_position, o, x, y);
|
|
}
|
|
|
|
static void
|
|
grub_console_cls (void)
|
|
{
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
grub_efi_int32_t orig_attr;
|
|
|
|
o = grub_efi_system_table->con_out;
|
|
orig_attr = o->mode->attribute;
|
|
efi_call_2 (o->set_attributes, o, GRUB_EFI_BACKGROUND_BLACK);
|
|
efi_call_1 (o->clear_screen, o);
|
|
efi_call_2 (o->set_attributes, o, orig_attr);
|
|
}
|
|
|
|
static void
|
|
grub_console_setcolorstate (grub_term_color_state state)
|
|
{
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
o = grub_efi_system_table->con_out;
|
|
|
|
switch (state) {
|
|
case GRUB_TERM_COLOR_STANDARD:
|
|
efi_call_2 (o->set_attributes, o, grub_console_standard_color);
|
|
break;
|
|
case GRUB_TERM_COLOR_NORMAL:
|
|
efi_call_2 (o->set_attributes, o, grub_console_normal_color);
|
|
break;
|
|
case GRUB_TERM_COLOR_HIGHLIGHT:
|
|
efi_call_2 (o->set_attributes, o, grub_console_highlight_color);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
grub_console_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
|
|
{
|
|
grub_console_normal_color = normal_color;
|
|
grub_console_highlight_color = highlight_color;
|
|
}
|
|
|
|
static void
|
|
grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
|
|
{
|
|
*normal_color = grub_console_normal_color;
|
|
*highlight_color = grub_console_highlight_color;
|
|
}
|
|
|
|
static void
|
|
grub_console_setcursor (int on)
|
|
{
|
|
grub_efi_simple_text_output_interface_t *o;
|
|
|
|
o = grub_efi_system_table->con_out;
|
|
efi_call_2 (o->enable_cursor, o, on);
|
|
}
|
|
|
|
static struct grub_term grub_console_term =
|
|
{
|
|
.name = "console",
|
|
.init = 0,
|
|
.fini = 0,
|
|
.putchar = grub_console_putchar,
|
|
.getcharwidth = grub_console_getcharwidth,
|
|
.checkkey = grub_console_checkkey,
|
|
.getkey = grub_console_getkey,
|
|
.getwh = grub_console_getwh,
|
|
.getxy = grub_console_getxy,
|
|
.gotoxy = grub_console_gotoxy,
|
|
.cls = grub_console_cls,
|
|
.setcolorstate = grub_console_setcolorstate,
|
|
.setcolor = grub_console_setcolor,
|
|
.getcolor = grub_console_getcolor,
|
|
.setcursor = grub_console_setcursor,
|
|
.flags = 0,
|
|
.next = 0
|
|
};
|
|
|
|
void
|
|
grub_console_init (void)
|
|
{
|
|
/* FIXME: it is necessary to consider the case where no console control
|
|
is present but the default is already in text mode. */
|
|
if (! grub_efi_set_text_mode (1))
|
|
{
|
|
grub_error (GRUB_ERR_BAD_DEVICE, "cannot set text mode");
|
|
return;
|
|
}
|
|
|
|
grub_term_register (&grub_console_term);
|
|
grub_term_set_current (&grub_console_term);
|
|
}
|
|
|
|
void
|
|
grub_console_fini (void)
|
|
{
|
|
grub_term_unregister (&grub_console_term);
|
|
}
|