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.
121 lines
3.3 KiB
C
121 lines
3.3 KiB
C
/* dl-x86_64.c - arch-dependent part of loadable module support */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,2005,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/dl.h>
|
|
#include <grub/elf.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/err.h>
|
|
|
|
/* Check if EHDR is a valid ELF header. */
|
|
grub_err_t
|
|
grub_arch_dl_check_header (void *ehdr)
|
|
{
|
|
Elf64_Ehdr *e = ehdr;
|
|
|
|
/* Check the magic numbers. */
|
|
if (e->e_ident[EI_CLASS] != ELFCLASS64
|
|
|| e->e_ident[EI_DATA] != ELFDATA2LSB
|
|
|| e->e_machine != EM_X86_64)
|
|
return grub_error (GRUB_ERR_BAD_OS, "invalid arch specific ELF magic");
|
|
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
/* Relocate symbols. */
|
|
grub_err_t
|
|
grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
|
|
{
|
|
Elf64_Ehdr *e = ehdr;
|
|
Elf64_Shdr *s;
|
|
Elf64_Sym *symtab;
|
|
Elf64_Word entsize;
|
|
unsigned i;
|
|
|
|
/* Find a symbol table. */
|
|
for (i = 0, s = (Elf64_Shdr *) ((char *) e + e->e_shoff);
|
|
i < e->e_shnum;
|
|
i++, s = (Elf64_Shdr *) ((char *) s + e->e_shentsize))
|
|
if (s->sh_type == SHT_SYMTAB)
|
|
break;
|
|
|
|
if (i == e->e_shnum)
|
|
return grub_error (GRUB_ERR_BAD_MODULE, "no symtab found");
|
|
|
|
symtab = (Elf64_Sym *) ((char *) e + s->sh_offset);
|
|
entsize = s->sh_entsize;
|
|
|
|
for (i = 0, s = (Elf64_Shdr *) ((char *) e + e->e_shoff);
|
|
i < e->e_shnum;
|
|
i++, s = (Elf64_Shdr *) ((char *) s + e->e_shentsize))
|
|
if (s->sh_type == SHT_RELA)
|
|
{
|
|
grub_dl_segment_t seg;
|
|
|
|
/* Find the target segment. */
|
|
for (seg = mod->segment; seg; seg = seg->next)
|
|
if (seg->section == s->sh_info)
|
|
break;
|
|
|
|
if (seg)
|
|
{
|
|
Elf64_Rela *rel, *max;
|
|
|
|
for (rel = (Elf64_Rela *) ((char *) e + s->sh_offset),
|
|
max = rel + s->sh_size / s->sh_entsize;
|
|
rel < max;
|
|
rel++)
|
|
{
|
|
Elf64_Word *addr32;
|
|
Elf64_Xword *addr64;
|
|
Elf64_Sym *sym;
|
|
|
|
if (seg->size < rel->r_offset)
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
|
"reloc offset is out of the segment");
|
|
|
|
addr32 = (Elf64_Word *) ((char *) seg->addr + rel->r_offset);
|
|
addr64 = (Elf64_Xword *) addr32;
|
|
sym = (Elf64_Sym *) ((char *) symtab
|
|
+ entsize * ELF64_R_SYM (rel->r_info));
|
|
|
|
switch (ELF64_R_TYPE (rel->r_info))
|
|
{
|
|
case R_X86_64_64:
|
|
*addr64 = rel->r_addend + sym->st_value;
|
|
break;
|
|
|
|
case R_X86_64_PC32:
|
|
*addr32 = rel->r_addend + sym->st_value -
|
|
(Elf64_Xword) seg->addr - rel->r_offset;
|
|
break;
|
|
|
|
case R_X86_64_32:
|
|
case R_X86_64_32S:
|
|
*addr32 = rel->r_addend + sym->st_value;
|
|
break;
|
|
|
|
default:
|
|
grub_fatal ("Unrecognized relocation: %d\n", ELF64_R_TYPE (rel->r_info));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return GRUB_ERR_NONE;
|
|
}
|