merge mainline into backtrace
This commit is contained in:
commit
245f4582f9
871 changed files with 102908 additions and 16407 deletions
|
@ -19,8 +19,8 @@
|
|||
#include <grub/loader.h>
|
||||
#include <grub/i386/bsd.h>
|
||||
#include <grub/i386/cpuid.h>
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/memory.h>
|
||||
#include <grub/i386/memory.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/dl.h>
|
||||
|
@ -33,6 +33,10 @@
|
|||
#include <grub/extcmd.h>
|
||||
#include <grub/i18n.h>
|
||||
#include <grub/ns8250.h>
|
||||
#include <grub/bsdlabel.h>
|
||||
#include <grub/crypto.h>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
#include <grub/video.h>
|
||||
#ifdef GRUB_MACHINE_PCBIOS
|
||||
|
@ -65,7 +69,7 @@ static void *kern_chunk_src;
|
|||
static grub_uint32_t bootflags;
|
||||
static int is_elf_kernel, is_64bit;
|
||||
static grub_uint32_t openbsd_root;
|
||||
struct grub_relocator *relocator = NULL;
|
||||
static struct grub_relocator *relocator = NULL;
|
||||
static struct grub_openbsd_ramdisk_descriptor openbsd_ramdisk;
|
||||
|
||||
struct bsd_tag
|
||||
|
@ -252,7 +256,7 @@ struct grub_e820_mmap
|
|||
#define GRUB_E820_RESERVED 2
|
||||
#define GRUB_E820_ACPI 3
|
||||
#define GRUB_E820_NVS 4
|
||||
#define GRUB_E820_EXEC_CODE 5
|
||||
#define GRUB_E820_BADRAM 5
|
||||
|
||||
static void
|
||||
generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
|
||||
|
@ -261,37 +265,30 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
|
|||
struct grub_e820_mmap *mmap = buf;
|
||||
struct grub_e820_mmap prev, cur;
|
||||
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_memory_type_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
|
||||
grub_uint32_t type)
|
||||
grub_memory_type_t type)
|
||||
{
|
||||
cur.addr = addr;
|
||||
cur.size = size;
|
||||
switch (type)
|
||||
{
|
||||
case GRUB_MACHINE_MEMORY_AVAILABLE:
|
||||
case GRUB_MEMORY_AVAILABLE:
|
||||
cur.type = GRUB_E820_RAM;
|
||||
break;
|
||||
|
||||
#ifdef GRUB_MACHINE_MEMORY_ACPI
|
||||
case GRUB_MACHINE_MEMORY_ACPI:
|
||||
case GRUB_MEMORY_ACPI:
|
||||
cur.type = GRUB_E820_ACPI;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef GRUB_MACHINE_MEMORY_NVS
|
||||
case GRUB_MACHINE_MEMORY_NVS:
|
||||
case GRUB_MEMORY_NVS:
|
||||
cur.type = GRUB_E820_NVS;
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
#ifdef GRUB_MACHINE_MEMORY_CODE
|
||||
case GRUB_MACHINE_MEMORY_CODE:
|
||||
#endif
|
||||
#ifdef GRUB_MACHINE_MEMORY_RESERVED
|
||||
case GRUB_MACHINE_MEMORY_RESERVED:
|
||||
#endif
|
||||
case GRUB_MEMORY_CODE:
|
||||
case GRUB_MEMORY_RESERVED:
|
||||
cur.type = GRUB_E820_RESERVED;
|
||||
break;
|
||||
}
|
||||
|
@ -453,7 +450,8 @@ grub_freebsd_list_modules (void)
|
|||
{
|
||||
struct bsd_tag *tag;
|
||||
|
||||
grub_printf (" %-18s %-18s%14s%14s\n", "name", "type", "addr", "size");
|
||||
grub_printf (" %-18s %-18s%14s%14s\n", _("name"), _("type"), _("addr"),
|
||||
_("size"));
|
||||
|
||||
for (tag = tags; tag; tag = tag->next)
|
||||
{
|
||||
|
@ -518,7 +516,8 @@ grub_netbsd_list_modules (void)
|
|||
{
|
||||
struct netbsd_module *mod;
|
||||
|
||||
grub_printf (" %-18s%14s%14s%14s\n", "name", "type", "addr", "size");
|
||||
grub_printf (" %-18s%14s%14s%14s\n", _("name"), _("type"), _("addr"),
|
||||
_("size"));
|
||||
|
||||
for (mod = netbsd_mods; mod; mod = mod->next)
|
||||
grub_printf (" %-18s 0x%08x 0x%08x 0x%08x", mod->mod.name,
|
||||
|
@ -528,6 +527,8 @@ grub_netbsd_list_modules (void)
|
|||
/* This function would be here but it's under different license. */
|
||||
#include "bsd_pagetable.c"
|
||||
|
||||
static grub_uint32_t freebsd_bootdev, freebsd_biosdev;
|
||||
|
||||
static grub_err_t
|
||||
grub_freebsd_boot (void)
|
||||
{
|
||||
|
@ -535,7 +536,6 @@ grub_freebsd_boot (void)
|
|||
grub_uint8_t *p, *p0;
|
||||
grub_addr_t p_target;
|
||||
grub_size_t p_size = 0;
|
||||
grub_uint32_t bootdev, biosdev, unit, slice, part;
|
||||
grub_err_t err;
|
||||
grub_size_t tag_buf_len = 0;
|
||||
|
||||
|
@ -571,11 +571,7 @@ grub_freebsd_boot (void)
|
|||
bi.version = FREEBSD_BOOTINFO_VERSION;
|
||||
bi.length = sizeof (bi);
|
||||
|
||||
grub_bsd_get_device (&biosdev, &unit, &slice, &part);
|
||||
bootdev = (FREEBSD_B_DEVMAGIC + ((slice + 1) << FREEBSD_B_SLICESHIFT) +
|
||||
(unit << FREEBSD_B_UNITSHIFT) + (part << FREEBSD_B_PARTSHIFT));
|
||||
|
||||
bi.boot_device = biosdev;
|
||||
bi.boot_device = freebsd_biosdev;
|
||||
|
||||
p_size = 0;
|
||||
grub_env_iterate (iterate_env_count);
|
||||
|
@ -748,7 +744,7 @@ grub_freebsd_boot (void)
|
|||
state.ebp = stack_target;
|
||||
stack[0] = entry; /* "Return" address. */
|
||||
stack[1] = bootflags | FREEBSD_RB_BOOTINFO;
|
||||
stack[2] = bootdev;
|
||||
stack[2] = freebsd_bootdev;
|
||||
stack[3] = 0;
|
||||
stack[4] = 0;
|
||||
stack[5] = 0;
|
||||
|
@ -954,6 +950,88 @@ grub_netbsd_add_modules (void)
|
|||
return err;
|
||||
}
|
||||
|
||||
/*
|
||||
* Adds NetBSD bootinfo bootdisk and bootwedge. The partition identified
|
||||
* in these bootinfo fields is the root device.
|
||||
*/
|
||||
static void
|
||||
grub_netbsd_add_boot_disk_and_wedge (void)
|
||||
{
|
||||
grub_device_t dev;
|
||||
grub_disk_t disk;
|
||||
grub_partition_t part;
|
||||
grub_uint32_t biosdev;
|
||||
grub_uint32_t partmapsector;
|
||||
union {
|
||||
grub_uint64_t raw[GRUB_DISK_SECTOR_SIZE / 8];
|
||||
struct grub_partition_bsd_disk_label label;
|
||||
} buf;
|
||||
grub_uint8_t *hash;
|
||||
grub_uint64_t ctx[(GRUB_MD_MD5->contextsize + 7) / 8];
|
||||
|
||||
dev = grub_device_open (0);
|
||||
if (! (dev && dev->disk && dev->disk->partition))
|
||||
goto fail;
|
||||
|
||||
disk = dev->disk;
|
||||
part = disk->partition;
|
||||
|
||||
if (disk->dev && disk->dev->id == GRUB_DISK_DEVICE_BIOSDISK_ID)
|
||||
biosdev = (grub_uint32_t) disk->id & 0xff;
|
||||
else
|
||||
biosdev = 0xff;
|
||||
|
||||
/* Absolute sector of the partition map describing this partition. */
|
||||
partmapsector = grub_partition_get_start (part->parent) + part->offset;
|
||||
|
||||
disk->partition = part->parent;
|
||||
if (grub_disk_read (disk, part->offset, 0, GRUB_DISK_SECTOR_SIZE, buf.raw)
|
||||
!= GRUB_ERR_NONE)
|
||||
goto fail;
|
||||
disk->partition = part;
|
||||
|
||||
/* Fill bootwedge. */
|
||||
{
|
||||
struct grub_netbsd_btinfo_bootwedge biw;
|
||||
|
||||
grub_memset (&biw, 0, sizeof (biw));
|
||||
biw.biosdev = biosdev;
|
||||
biw.startblk = grub_partition_get_start (part);
|
||||
biw.nblks = part->len;
|
||||
biw.matchblk = partmapsector;
|
||||
biw.matchnblks = 1;
|
||||
|
||||
GRUB_MD_MD5->init (&ctx);
|
||||
GRUB_MD_MD5->write (&ctx, buf.raw, GRUB_DISK_SECTOR_SIZE);
|
||||
GRUB_MD_MD5->final (&ctx);
|
||||
hash = GRUB_MD_MD5->read (&ctx);
|
||||
memcpy (biw.matchhash, hash, 16);
|
||||
|
||||
grub_bsd_add_meta (NETBSD_BTINFO_BOOTWEDGE, &biw, sizeof (biw));
|
||||
}
|
||||
|
||||
/* Fill bootdisk if this a NetBSD disk label. */
|
||||
if (part->partmap != NULL &&
|
||||
(grub_strcmp (part->partmap->name, "netbsd") == 0) &&
|
||||
buf.label.magic == grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC))
|
||||
{
|
||||
struct grub_netbsd_btinfo_bootdisk bid;
|
||||
|
||||
grub_memset (&bid, 0, sizeof (bid));
|
||||
bid.labelsector = partmapsector;
|
||||
bid.label.type = buf.label.type;
|
||||
bid.label.checksum = buf.label.checksum;
|
||||
memcpy (bid.label.packname, buf.label.packname, 16);
|
||||
bid.biosdev = biosdev;
|
||||
bid.partition = part->number;
|
||||
grub_bsd_add_meta (NETBSD_BTINFO_BOOTDISK, &bid, sizeof (bid));
|
||||
}
|
||||
|
||||
fail:
|
||||
if (dev)
|
||||
grub_device_close (dev);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_netbsd_boot (void)
|
||||
{
|
||||
|
@ -974,7 +1052,7 @@ grub_netbsd_boot (void)
|
|||
if (err)
|
||||
{
|
||||
grub_print_error ();
|
||||
grub_printf ("Booting however\n");
|
||||
grub_puts_ (N_("Booting in blind mode"));
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
@ -1330,6 +1408,11 @@ grub_bsd_load (int argc, char *argv[])
|
|||
goto fail;
|
||||
|
||||
relocator = grub_relocator_new ();
|
||||
if (!relocator)
|
||||
{
|
||||
grub_file_close (file);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
elf = grub_elf_file (file);
|
||||
if (elf)
|
||||
|
@ -1351,7 +1434,7 @@ grub_bsd_load (int argc, char *argv[])
|
|||
fail:
|
||||
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
grub_dl_unref (my_mod);
|
||||
grub_dl_unref (my_mod);
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
@ -1378,6 +1461,8 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
|||
|
||||
if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
|
||||
{
|
||||
grub_uint32_t unit, slice, part;
|
||||
|
||||
kern_end = ALIGN_PAGE (kern_end);
|
||||
if (is_elf_kernel)
|
||||
{
|
||||
|
@ -1421,6 +1506,10 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
|||
if (err)
|
||||
return err;
|
||||
}
|
||||
grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part);
|
||||
freebsd_bootdev = (FREEBSD_B_DEVMAGIC + ((slice + 1) << FREEBSD_B_SLICESHIFT) +
|
||||
(unit << FREEBSD_B_UNITSHIFT) + (part << FREEBSD_B_PARTSHIFT));
|
||||
|
||||
grub_loader_set (grub_freebsd_boot, grub_bsd_unload, 0);
|
||||
}
|
||||
|
||||
|
@ -1566,6 +1655,9 @@ grub_cmd_netbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
|||
grub_memset (&serial, 0, sizeof (serial));
|
||||
grub_strcpy (serial.devname, "com");
|
||||
|
||||
serial.addr = grub_ns8250_hw_get_port (0);
|
||||
serial.speed = 9600;
|
||||
|
||||
if (ctxt->state[NETBSD_SERIAL_ARG].arg)
|
||||
{
|
||||
ptr = ctxt->state[NETBSD_SERIAL_ARG].arg;
|
||||
|
@ -1588,7 +1680,7 @@ grub_cmd_netbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
|||
return grub_errno;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &serial, sizeof (serial));
|
||||
}
|
||||
else
|
||||
|
@ -1601,6 +1693,8 @@ grub_cmd_netbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
|||
grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &cons, sizeof (cons));
|
||||
}
|
||||
|
||||
grub_netbsd_add_boot_disk_and_wedge ();
|
||||
|
||||
grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 0);
|
||||
}
|
||||
|
||||
|
@ -1615,7 +1709,7 @@ grub_cmd_freebsd_loadenv (grub_command_t cmd __attribute__ ((unused)),
|
|||
char *buf = 0, *curr, *next;
|
||||
int len;
|
||||
|
||||
if (kernel_type == KERNEL_TYPE_NONE)
|
||||
if (! grub_loader_is_loaded ())
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"you need to load the kernel first");
|
||||
|
||||
|
@ -1848,7 +1942,7 @@ grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
|
|||
grub_file_t file = 0;
|
||||
grub_err_t err;
|
||||
|
||||
if (kernel_type == KERNEL_TYPE_NONE)
|
||||
if (! grub_loader_is_loaded ())
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT,
|
||||
"you need to load the kernel first");
|
||||
|
||||
|
@ -1969,7 +2063,7 @@ GRUB_MOD_INIT (bsd)
|
|||
|
||||
cmd_openbsd_ramdisk = grub_register_command ("kopenbsd_ramdisk",
|
||||
grub_cmd_openbsd_ramdisk, 0,
|
||||
"Load kOpenBSD ramdisk. ");
|
||||
N_("Load kOpenBSD ramdisk."));
|
||||
|
||||
my_mod = mod;
|
||||
}
|
||||
|
|
|
@ -195,6 +195,11 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
|
|||
chunk_size = s->sh_addr + s->sh_size;
|
||||
}
|
||||
|
||||
if (chunk_size < sizeof (e))
|
||||
chunk_size = sizeof (e);
|
||||
chunk_size += e.e_phnum * e.e_phentsize;
|
||||
chunk_size += e.e_shnum * e.e_shentsize;
|
||||
|
||||
{
|
||||
grub_relocator_chunk_t ch;
|
||||
|
||||
|
@ -394,12 +399,10 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
|
|||
grub_err_t err;
|
||||
Elf_Ehdr e;
|
||||
Elf_Shdr *s, *symsh, *strsh;
|
||||
char *shdr;
|
||||
char *shdr = NULL;
|
||||
unsigned symsize, strsize;
|
||||
Elf_Sym *sym;
|
||||
void *sym_chunk;
|
||||
grub_uint8_t *curload;
|
||||
const char *str;
|
||||
grub_size_t chunk_size;
|
||||
Elf_Ehdr *e2;
|
||||
struct grub_netbsd_btinfo_symtab symtab;
|
||||
|
@ -473,7 +476,6 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
|
|||
|
||||
if (grub_file_seek (file, symsh->sh_offset) == (grub_off_t) -1)
|
||||
return grub_errno;
|
||||
sym = (Elf_Sym *) curload;
|
||||
if (grub_file_read (file, curload, symsize) != (grub_ssize_t) symsize)
|
||||
{
|
||||
if (! grub_errno)
|
||||
|
@ -484,7 +486,6 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
|
|||
|
||||
if (grub_file_seek (file, strsh->sh_offset) == (grub_off_t) -1)
|
||||
return grub_errno;
|
||||
str = (char *) curload;
|
||||
if (grub_file_read (file, curload, strsize) != (grub_ssize_t) strsize)
|
||||
{
|
||||
if (! grub_errno)
|
||||
|
@ -515,7 +516,7 @@ SUFFIX(grub_openbsd_find_ramdisk) (grub_file_t file,
|
|||
grub_err_t err;
|
||||
Elf_Ehdr e;
|
||||
Elf_Shdr *s;
|
||||
char *shdr;
|
||||
char *shdr = NULL;
|
||||
|
||||
err = read_headers (file, &e, &shdr);
|
||||
if (err)
|
||||
|
|
|
@ -53,7 +53,7 @@ static void
|
|||
fill_bsd64_pagetable (grub_uint8_t *src, grub_addr_t target)
|
||||
{
|
||||
grub_uint64_t *pt2, *pt3, *pt4;
|
||||
grub_addr_t pt2t, pt3t, pt4t;
|
||||
grub_addr_t pt2t, pt3t;
|
||||
int i;
|
||||
|
||||
#define PG_V 0x001
|
||||
|
@ -65,7 +65,6 @@ fill_bsd64_pagetable (grub_uint8_t *src, grub_addr_t target)
|
|||
pt3 = (grub_uint64_t *) (src + 4096);
|
||||
pt2 = (grub_uint64_t *) (src + 8192);
|
||||
|
||||
pt4t = target;
|
||||
pt3t = target + 4096;
|
||||
pt2t = target + 8192;
|
||||
|
||||
|
|
145
grub-core/loader/i386/coreboot/chainloader.c
Normal file
145
grub-core/loader/i386/coreboot/chainloader.c
Normal file
|
@ -0,0 +1,145 @@
|
|||
/*
|
||||
* 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/loader.h>
|
||||
#include <grub/memory.h>
|
||||
#include <grub/i386/memory.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/elfload.h>
|
||||
#include <grub/video.h>
|
||||
#include <grub/relocator.h>
|
||||
#include <grub/i386/relocator.h>
|
||||
#include <grub/command.h>
|
||||
#include <grub/i18n.h>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
static grub_addr_t entry;
|
||||
static struct grub_relocator *relocator = NULL;
|
||||
|
||||
static grub_err_t
|
||||
grub_chain_boot (void)
|
||||
{
|
||||
struct grub_relocator32_state state;
|
||||
|
||||
grub_video_set_mode ("text", 0, 0);
|
||||
|
||||
state.eip = entry;
|
||||
return grub_relocator32_boot (relocator, state);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_chain_unload (void)
|
||||
{
|
||||
grub_relocator_unload (relocator);
|
||||
relocator = NULL;
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_chain_elf32_hook (Elf32_Phdr * phdr, grub_addr_t * addr, int *do_load)
|
||||
{
|
||||
grub_err_t err;
|
||||
grub_relocator_chunk_t ch;
|
||||
|
||||
if (phdr->p_type != PT_LOAD)
|
||||
{
|
||||
*do_load = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
*do_load = 1;
|
||||
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
|
||||
phdr->p_paddr, phdr->p_memsz);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
*addr = (grub_addr_t) get_virtual_current_address (ch);
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_chain (grub_command_t cmd __attribute__ ((unused)),
|
||||
int argc, char *argv[])
|
||||
{
|
||||
grub_err_t err;
|
||||
grub_file_t file;
|
||||
grub_elf_t elf;
|
||||
|
||||
if (argc != 1)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "filename expected");
|
||||
|
||||
grub_loader_unset ();
|
||||
|
||||
file = grub_file_open (argv[0]);
|
||||
if (!file)
|
||||
return grub_errno;
|
||||
|
||||
relocator = grub_relocator_new ();
|
||||
if (!relocator)
|
||||
{
|
||||
grub_file_close (file);
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
elf = grub_elf_file (file);
|
||||
if (!elf)
|
||||
{
|
||||
grub_relocator_unload (relocator);
|
||||
relocator = 0;
|
||||
grub_file_close (file);
|
||||
}
|
||||
|
||||
if (!grub_elf_is_elf32 (elf))
|
||||
{
|
||||
grub_relocator_unload (relocator);
|
||||
relocator = 0;
|
||||
grub_elf_close (elf);
|
||||
}
|
||||
|
||||
entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
|
||||
|
||||
err = grub_elf32_load (elf, grub_chain_elf32_hook, 0, 0);
|
||||
|
||||
grub_elf_close (elf);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
grub_loader_set (grub_chain_boot, grub_chain_unload, 0);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_command_t cmd_chain;
|
||||
|
||||
GRUB_MOD_INIT (chain)
|
||||
{
|
||||
cmd_chain = grub_register_command ("chainloader", grub_cmd_chain,
|
||||
N_("FILE"), N_("Load another payload"));
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI (chain)
|
||||
{
|
||||
grub_unregister_command (cmd_chain);
|
||||
grub_chain_unload ();
|
||||
}
|
|
@ -17,7 +17,6 @@
|
|||
*/
|
||||
|
||||
#include <grub/loader.h>
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/memory.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/file.h>
|
||||
|
@ -34,24 +33,33 @@
|
|||
#include <grub/command.h>
|
||||
#include <grub/i386/relocator.h>
|
||||
#include <grub/i18n.h>
|
||||
#include <grub/lib/cmdline.h>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
#ifdef GRUB_MACHINE_PCBIOS
|
||||
#include <grub/i386/pc/vesa_modes_table.h>
|
||||
#endif
|
||||
|
||||
#ifdef GRUB_MACHINE_EFI
|
||||
#include <grub/efi/efi.h>
|
||||
#define HAS_VGA_TEXT 0
|
||||
#define DEFAULT_VIDEO_MODE "800x600"
|
||||
#define DEFAULT_VIDEO_MODE "auto"
|
||||
#define ACCEPTS_PURE_TEXT 0
|
||||
#elif defined (GRUB_MACHINE_IEEE1275)
|
||||
#include <grub/ieee1275/ieee1275.h>
|
||||
#define HAS_VGA_TEXT 0
|
||||
#define DEFAULT_VIDEO_MODE "text"
|
||||
#define ACCEPTS_PURE_TEXT 1
|
||||
#else
|
||||
#include <grub/i386/pc/vbe.h>
|
||||
#include <grub/i386/pc/console.h>
|
||||
#define HAS_VGA_TEXT 1
|
||||
#define DEFAULT_VIDEO_MODE "text"
|
||||
#define ACCEPTS_PURE_TEXT 1
|
||||
#endif
|
||||
|
||||
#define GRUB_LINUX_CL_OFFSET 0x1000
|
||||
#define GRUB_LINUX_CL_END_OFFSET 0x2000
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
|
||||
|
@ -68,6 +76,7 @@ static grub_uint32_t prot_mode_pages;
|
|||
static grub_uint32_t initrd_pages;
|
||||
static struct grub_relocator *relocator = NULL;
|
||||
static void *efi_mmap_buf;
|
||||
static grub_size_t maximal_cmdline_size;
|
||||
#ifdef GRUB_MACHINE_EFI
|
||||
static grub_efi_uintn_t efi_mmap_size;
|
||||
#else
|
||||
|
@ -89,175 +98,6 @@ static struct idt_descriptor idt_desc =
|
|||
};
|
||||
#endif
|
||||
|
||||
#ifdef GRUB_MACHINE_PCBIOS
|
||||
struct linux_vesafb_res
|
||||
{
|
||||
grub_uint16_t width;
|
||||
grub_uint16_t height;
|
||||
};
|
||||
|
||||
struct linux_vesafb_mode
|
||||
{
|
||||
grub_uint8_t res_index;
|
||||
grub_uint8_t depth;
|
||||
};
|
||||
|
||||
enum vga_modes
|
||||
{
|
||||
VGA_320_200,
|
||||
VGA_640_400,
|
||||
VGA_640_480,
|
||||
VGA_800_500,
|
||||
VGA_800_600,
|
||||
VGA_896_672,
|
||||
VGA_1024_640,
|
||||
VGA_1024_768,
|
||||
VGA_1152_720,
|
||||
VGA_1280_1024,
|
||||
VGA_1440_900,
|
||||
VGA_1600_1200,
|
||||
};
|
||||
|
||||
static struct linux_vesafb_res linux_vesafb_res[] =
|
||||
{
|
||||
{ 320, 200 },
|
||||
{ 640, 400 },
|
||||
{ 640, 480 },
|
||||
{ 800, 500 },
|
||||
{ 800, 600 },
|
||||
{ 896, 672 },
|
||||
{ 1024, 640 },
|
||||
{ 1024, 768 },
|
||||
{ 1152, 720 },
|
||||
{ 1280, 1024 },
|
||||
{ 1440, 900 },
|
||||
{ 1600, 1200 },
|
||||
};
|
||||
|
||||
/* This is the reverse of the table in [linux]/Documentation/fb/vesafb.txt
|
||||
plus a few more modes based on the table in
|
||||
http://en.wikipedia.org/wiki/VESA_BIOS_Extensions */
|
||||
struct linux_vesafb_mode linux_vesafb_modes[] =
|
||||
{
|
||||
{ VGA_640_400, 8 }, /* 0x300 */
|
||||
{ VGA_640_480, 8 }, /* 0x301 */
|
||||
{ VGA_800_600, 4 }, /* 0x302 */
|
||||
{ VGA_800_600, 8 }, /* 0x303 */
|
||||
{ VGA_1024_768, 4 }, /* 0x304 */
|
||||
{ VGA_1024_768, 8 }, /* 0x305 */
|
||||
{ VGA_1280_1024, 4 }, /* 0x306 */
|
||||
{ VGA_1280_1024, 8 }, /* 0x307 */
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ VGA_320_200, 15 }, /* 0x30d */
|
||||
{ VGA_320_200, 16 }, /* 0x30e */
|
||||
{ VGA_320_200, 24 }, /* 0x30f */
|
||||
{ VGA_640_480, 15 }, /* 0x310 */
|
||||
{ VGA_640_480, 16 }, /* 0x311 */
|
||||
{ VGA_640_480, 24 }, /* 0x312 */
|
||||
{ VGA_800_600, 15 }, /* 0x313 */
|
||||
{ VGA_800_600, 16 }, /* 0x314 */
|
||||
{ VGA_800_600, 24 }, /* 0x315 */
|
||||
{ VGA_1024_768, 15 }, /* 0x316 */
|
||||
{ VGA_1024_768, 16 }, /* 0x317 */
|
||||
{ VGA_1024_768, 24 }, /* 0x318 */
|
||||
{ VGA_1280_1024, 15 }, /* 0x319 */
|
||||
{ VGA_1280_1024, 16 }, /* 0x31a */
|
||||
{ VGA_1280_1024, 24 }, /* 0x31b */
|
||||
{ VGA_1600_1200, 8 }, /* 0x31c */
|
||||
{ VGA_1600_1200, 15 }, /* 0x31d */
|
||||
{ VGA_1600_1200, 16 }, /* 0x31e */
|
||||
{ VGA_1600_1200, 24 }, /* 0x31f */
|
||||
{ 0, 0 },
|
||||
{ VGA_640_400, 15 }, /* 0x321 */
|
||||
{ VGA_640_400, 16 }, /* 0x322 */
|
||||
{ VGA_640_400, 24 }, /* 0x323 */
|
||||
{ VGA_640_400, 32 }, /* 0x324 */
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ VGA_640_480, 32 }, /* 0x329 */
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ VGA_896_672, 8 }, /* 0x32f */
|
||||
{ VGA_896_672, 15 }, /* 0x330 */
|
||||
{ VGA_896_672, 16 }, /* 0x331 */
|
||||
{ VGA_896_672, 24 }, /* 0x332 */
|
||||
{ VGA_896_672, 32 }, /* 0x333 */
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ VGA_1600_1200, 32 }, /* 0x342 */
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ 0, 0 },
|
||||
{ VGA_1440_900, 8 }, /* 0x360 */
|
||||
{ VGA_1440_900, 15 }, /* 0x361 */
|
||||
{ VGA_1440_900, 16 }, /* 0x362 */
|
||||
{ VGA_1440_900, 24 }, /* 0x363 */
|
||||
{ VGA_1440_900, 32 }, /* 0x364 */
|
||||
{ VGA_1152_720, 8 }, /* 0x365 */
|
||||
{ VGA_1152_720, 15 }, /* 0x366 */
|
||||
{ VGA_1152_720, 16 }, /* 0x367 */
|
||||
{ VGA_1152_720, 24 }, /* 0x368 */
|
||||
{ VGA_1152_720, 32 }, /* 0x369 */
|
||||
{ VGA_1024_640, 8 }, /* 0x36a */
|
||||
{ VGA_1024_640, 15 }, /* 0x36b */
|
||||
{ VGA_1024_640, 16 }, /* 0x36c */
|
||||
{ VGA_1024_640, 24 }, /* 0x36d */
|
||||
{ VGA_1024_640, 32 }, /* 0x36e */
|
||||
{ VGA_800_500, 8 }, /* 0x36f */
|
||||
{ VGA_800_500, 15 }, /* 0x370 */
|
||||
{ VGA_800_500, 16 }, /* 0x371 */
|
||||
{ VGA_800_500, 24 }, /* 0x372 */
|
||||
{ VGA_800_500, 32 }, /* 0x373 */
|
||||
};
|
||||
#endif
|
||||
|
||||
static inline grub_size_t
|
||||
page_align (grub_size_t size)
|
||||
{
|
||||
|
@ -290,7 +130,10 @@ find_efi_mmap_size (void)
|
|||
grub_free (mmap);
|
||||
|
||||
if (ret < 0)
|
||||
grub_fatal ("cannot get memory map");
|
||||
{
|
||||
grub_error (GRUB_ERR_IO, "cannot get memory map");
|
||||
return 0;
|
||||
}
|
||||
else if (ret > 0)
|
||||
break;
|
||||
|
||||
|
@ -301,7 +144,8 @@ find_efi_mmap_size (void)
|
|||
later, and EFI itself may allocate more. */
|
||||
mmap_size += (1 << 12);
|
||||
|
||||
return page_align (mmap_size);
|
||||
mmap_size = page_align (mmap_size);
|
||||
return mmap_size;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -312,10 +156,11 @@ find_mmap_size (void)
|
|||
{
|
||||
grub_size_t count = 0, mmap_size;
|
||||
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_memory_type_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr __attribute__ ((unused)),
|
||||
grub_uint64_t size __attribute__ ((unused)),
|
||||
grub_uint32_t type __attribute__ ((unused)))
|
||||
grub_memory_type_t type __attribute__ ((unused)))
|
||||
{
|
||||
count++;
|
||||
return 0;
|
||||
|
@ -350,12 +195,14 @@ allocate_pages (grub_size_t prot_size)
|
|||
grub_err_t err;
|
||||
|
||||
/* Make sure that each size is aligned to a page boundary. */
|
||||
real_size = GRUB_LINUX_CL_END_OFFSET;
|
||||
real_size = GRUB_LINUX_CL_OFFSET + maximal_cmdline_size;
|
||||
prot_size = page_align (prot_size);
|
||||
mmap_size = find_mmap_size ();
|
||||
|
||||
#ifdef GRUB_MACHINE_EFI
|
||||
efi_mmap_size = find_efi_mmap_size ();
|
||||
if (efi_mmap_size == 0)
|
||||
return grub_errno;
|
||||
#endif
|
||||
|
||||
grub_dprintf ("linux", "real_size = %x, prot_size = %x, mmap_size = %x\n",
|
||||
|
@ -379,12 +226,14 @@ allocate_pages (grub_size_t prot_size)
|
|||
/* FIXME: Should request low memory from the heap when this feature is
|
||||
implemented. */
|
||||
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_memory_type_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
|
||||
grub_memory_type_t type)
|
||||
{
|
||||
/* We must put real mode code in the traditional space. */
|
||||
|
||||
if (type == GRUB_MACHINE_MEMORY_AVAILABLE
|
||||
if (type == GRUB_MEMORY_AVAILABLE
|
||||
&& addr <= 0x90000)
|
||||
{
|
||||
if (addr < 0x10000)
|
||||
|
@ -447,7 +296,7 @@ allocate_pages (grub_size_t prot_size)
|
|||
return err;
|
||||
}
|
||||
|
||||
static void
|
||||
static grub_err_t
|
||||
grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
|
||||
grub_uint64_t start, grub_uint64_t size,
|
||||
grub_uint32_t type)
|
||||
|
@ -455,7 +304,10 @@ grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
|
|||
int n = *e820_num;
|
||||
|
||||
if (n >= GRUB_E820_MAX_ENTRY)
|
||||
grub_fatal ("Too many e820 memory map entries");
|
||||
{
|
||||
return grub_error (GRUB_ERR_OUT_OF_RANGE,
|
||||
"Too many e820 memory map entries");
|
||||
}
|
||||
|
||||
if ((n > 0) && (e820_map[n - 1].addr + e820_map[n - 1].size == start) &&
|
||||
(e820_map[n - 1].type == type))
|
||||
|
@ -467,6 +319,7 @@ grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
|
|||
e820_map[n].type = type;
|
||||
(*e820_num)++;
|
||||
}
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
|
@ -475,6 +328,13 @@ grub_linux_setup_video (struct linux_kernel_params *params)
|
|||
struct grub_video_mode_info mode_info;
|
||||
void *framebuffer;
|
||||
grub_err_t err;
|
||||
grub_video_driver_id_t driver_id;
|
||||
const char *gfxlfbvar = grub_env_get ("gfxpayloadforcelfb");
|
||||
|
||||
driver_id = grub_video_get_driver_id ();
|
||||
|
||||
if (driver_id == GRUB_VIDEO_DRIVER_NONE)
|
||||
return 1;
|
||||
|
||||
err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
|
||||
|
||||
|
@ -501,12 +361,42 @@ grub_linux_setup_video (struct linux_kernel_params *params)
|
|||
params->reserved_mask_size = mode_info.reserved_mask_size;
|
||||
params->reserved_field_pos = mode_info.reserved_field_pos;
|
||||
|
||||
if (gfxlfbvar && (gfxlfbvar[0] == '1' || gfxlfbvar[0] == 'y'))
|
||||
params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
|
||||
else
|
||||
{
|
||||
switch (driver_id)
|
||||
{
|
||||
case GRUB_VIDEO_DRIVER_VBE:
|
||||
params->lfb_size >>= 16;
|
||||
params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
|
||||
break;
|
||||
|
||||
case GRUB_VIDEO_DRIVER_EFI_UGA:
|
||||
case GRUB_VIDEO_DRIVER_EFI_GOP:
|
||||
params->have_vga = GRUB_VIDEO_LINUX_TYPE_EFIFB;
|
||||
break;
|
||||
|
||||
/* FIXME: check if better id is available. */
|
||||
case GRUB_VIDEO_DRIVER_SM712:
|
||||
case GRUB_VIDEO_DRIVER_SIS315PRO:
|
||||
case GRUB_VIDEO_DRIVER_VGA:
|
||||
case GRUB_VIDEO_DRIVER_CIRRUS:
|
||||
case GRUB_VIDEO_DRIVER_BOCHS:
|
||||
case GRUB_VIDEO_DRIVER_RADEON_FULOONG2E:
|
||||
/* Make gcc happy. */
|
||||
case GRUB_VIDEO_DRIVER_SDL:
|
||||
case GRUB_VIDEO_DRIVER_NONE:
|
||||
params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef GRUB_MACHINE_PCBIOS
|
||||
/* VESA packed modes may come with zeroed mask sizes, which need
|
||||
to be set here according to DAC Palette width. If we don't,
|
||||
this results in Linux displaying a black screen. */
|
||||
if (mode_info.bpp <= 8)
|
||||
if (driver_id == GRUB_VIDEO_DRIVER_VBE && mode_info.bpp <= 8)
|
||||
{
|
||||
struct grub_vbe_info_block controller_info;
|
||||
int status;
|
||||
|
@ -537,14 +427,15 @@ grub_linux_boot (void)
|
|||
struct linux_kernel_params *params;
|
||||
int e820_num;
|
||||
grub_err_t err = 0;
|
||||
char *modevar, *tmp;
|
||||
const char *modevar;
|
||||
char *tmp;
|
||||
struct grub_relocator32_state state;
|
||||
|
||||
params = real_mode_mem;
|
||||
|
||||
#ifdef GRUB_MACHINE_IEEE1275
|
||||
{
|
||||
char *bootpath;
|
||||
const char *bootpath;
|
||||
grub_ssize_t len;
|
||||
|
||||
bootpath = grub_env_get ("root");
|
||||
|
@ -559,46 +450,43 @@ grub_linux_boot (void)
|
|||
grub_dprintf ("linux", "code32_start = %x\n",
|
||||
(unsigned) params->code32_start);
|
||||
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_memory_type_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
|
||||
grub_memory_type_t type)
|
||||
{
|
||||
grub_uint32_t e820_type;
|
||||
switch (type)
|
||||
{
|
||||
case GRUB_MACHINE_MEMORY_AVAILABLE:
|
||||
grub_e820_add_region (params->e820_map, &e820_num,
|
||||
addr, size, GRUB_E820_RAM);
|
||||
case GRUB_MEMORY_AVAILABLE:
|
||||
e820_type = GRUB_E820_RAM;
|
||||
break;
|
||||
|
||||
#ifdef GRUB_MACHINE_MEMORY_ACPI
|
||||
case GRUB_MACHINE_MEMORY_ACPI:
|
||||
grub_e820_add_region (params->e820_map, &e820_num,
|
||||
addr, size, GRUB_E820_ACPI);
|
||||
case GRUB_MEMORY_ACPI:
|
||||
e820_type = GRUB_E820_ACPI;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef GRUB_MACHINE_MEMORY_NVS
|
||||
case GRUB_MACHINE_MEMORY_NVS:
|
||||
grub_e820_add_region (params->e820_map, &e820_num,
|
||||
addr, size, GRUB_E820_NVS);
|
||||
case GRUB_MEMORY_NVS:
|
||||
e820_type = GRUB_E820_NVS;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef GRUB_MACHINE_MEMORY_CODE
|
||||
case GRUB_MACHINE_MEMORY_CODE:
|
||||
grub_e820_add_region (params->e820_map, &e820_num,
|
||||
addr, size, GRUB_E820_EXEC_CODE);
|
||||
case GRUB_MEMORY_BADRAM:
|
||||
e820_type = GRUB_E820_BADRAM;
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
grub_e820_add_region (params->e820_map, &e820_num,
|
||||
addr, size, GRUB_E820_RESERVED);
|
||||
e820_type = GRUB_E820_RESERVED;
|
||||
}
|
||||
if (grub_e820_add_region (params->e820_map, &e820_num,
|
||||
addr, size, e820_type))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
e820_num = 0;
|
||||
grub_mmap_iterate (hook);
|
||||
if (grub_mmap_iterate (hook))
|
||||
return grub_errno;
|
||||
params->mmap_size = e820_num;
|
||||
|
||||
modevar = grub_env_get ("gfxpayload");
|
||||
|
@ -610,28 +498,30 @@ grub_linux_boot (void)
|
|||
tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
|
||||
if (! tmp)
|
||||
return grub_errno;
|
||||
#if ACCEPTS_PURE_TEXT
|
||||
err = grub_video_set_mode (tmp, 0, 0);
|
||||
#else
|
||||
err = grub_video_set_mode (tmp, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
|
||||
#endif
|
||||
grub_free (tmp);
|
||||
}
|
||||
else
|
||||
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0, 0);
|
||||
|
||||
{
|
||||
#if ACCEPTS_PURE_TEXT
|
||||
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0, 0);
|
||||
#else
|
||||
err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
|
||||
GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
|
||||
#endif
|
||||
}
|
||||
if (err)
|
||||
{
|
||||
grub_print_error ();
|
||||
grub_printf ("Booting however\n");
|
||||
grub_puts_ (N_("Booting in blind mode"));
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
if (! grub_linux_setup_video (params))
|
||||
{
|
||||
/* Use generic framebuffer unless VESA is known to be supported. */
|
||||
if (params->have_vga != GRUB_VIDEO_LINUX_TYPE_VESA)
|
||||
params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
|
||||
else
|
||||
params->lfb_size >>= 16;
|
||||
}
|
||||
else
|
||||
if (grub_linux_setup_video (params))
|
||||
{
|
||||
#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
|
||||
params->have_vga = GRUB_VIDEO_LINUX_TYPE_TEXT;
|
||||
|
@ -685,6 +575,7 @@ grub_linux_boot (void)
|
|||
#ifdef GRUB_MACHINE_EFI
|
||||
{
|
||||
grub_efi_uintn_t efi_desc_size;
|
||||
grub_size_t efi_mmap_target;
|
||||
grub_efi_uint32_t efi_desc_version;
|
||||
err = grub_efi_finish_boot_services (&efi_mmap_size, efi_mmap_buf, NULL,
|
||||
&efi_desc_size, &efi_desc_version);
|
||||
|
@ -692,23 +583,24 @@ grub_linux_boot (void)
|
|||
return err;
|
||||
|
||||
/* Note that no boot services are available from here. */
|
||||
|
||||
efi_mmap_target = real_mode_target
|
||||
+ ((grub_uint8_t *) efi_mmap_buf - (grub_uint8_t *) real_mode_mem);
|
||||
/* Pass EFI parameters. */
|
||||
if (grub_le_to_cpu16 (params->version) >= 0x0206)
|
||||
{
|
||||
params->v0206.efi_mem_desc_size = efi_desc_size;
|
||||
params->v0206.efi_mem_desc_version = efi_desc_version;
|
||||
params->v0206.efi_mmap = (grub_uint32_t) (unsigned long) efi_mmap_buf;
|
||||
params->v0206.efi_mmap = efi_mmap_target;
|
||||
params->v0206.efi_mmap_size = efi_mmap_size;
|
||||
#ifdef __x86_64__
|
||||
params->v0206.efi_mmap_hi = (grub_uint32_t) ((grub_uint64_t) efi_mmap_buf >> 32);
|
||||
params->v0206.efi_mmap_hi = (efi_mmap_target >> 32);
|
||||
#endif
|
||||
}
|
||||
else if (grub_le_to_cpu16 (params->version) >= 0x0204)
|
||||
{
|
||||
params->v0204.efi_mem_desc_size = efi_desc_size;
|
||||
params->v0204.efi_mem_desc_version = efi_desc_version;
|
||||
params->v0204.efi_mmap = (grub_uint32_t) (unsigned long) efi_mmap_buf;
|
||||
params->v0204.efi_mmap = efi_mmap_target;
|
||||
params->v0204.efi_mmap_size = efi_mmap_size;
|
||||
}
|
||||
}
|
||||
|
@ -742,7 +634,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
grub_size_t real_size, prot_size;
|
||||
grub_ssize_t len;
|
||||
int i;
|
||||
char *dest;
|
||||
|
||||
grub_dl_ref (my_mod);
|
||||
|
||||
|
@ -797,6 +688,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
goto fail;
|
||||
}
|
||||
|
||||
if (grub_le_to_cpu16 (lh.version) >= 0x0206)
|
||||
maximal_cmdline_size = grub_le_to_cpu32 (lh.cmdline_size) + 1;
|
||||
else
|
||||
maximal_cmdline_size = 256;
|
||||
|
||||
if (maximal_cmdline_size < 128)
|
||||
maximal_cmdline_size = 128;
|
||||
|
||||
setup_sects = lh.setup_sects;
|
||||
|
||||
/* If SETUP_SECTS is not set, set it to the default (4). */
|
||||
|
@ -810,7 +709,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
goto fail;
|
||||
|
||||
params = (struct linux_kernel_params *) real_mode_mem;
|
||||
grub_memset (params, 0, GRUB_LINUX_CL_END_OFFSET);
|
||||
grub_memset (params, 0, GRUB_LINUX_CL_OFFSET + maximal_cmdline_size);
|
||||
grub_memcpy (¶ms->setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
|
||||
|
||||
params->ps_mouse = params->padding10 = 0;
|
||||
|
@ -822,7 +721,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
goto fail;
|
||||
}
|
||||
|
||||
params->type_of_loader = (LINUX_LOADER_ID_GRUB << 4);
|
||||
params->type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
|
||||
|
||||
/* These two are used (instead of cmd_line_ptr) by older versions of Linux,
|
||||
and otherwise ignored. */
|
||||
|
@ -882,17 +781,19 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
/* Video mode selection support. */
|
||||
char *val = argv[i] + 4;
|
||||
unsigned vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
|
||||
struct linux_vesafb_mode *linux_mode;
|
||||
struct grub_vesa_mode_table_entry *linux_mode;
|
||||
grub_err_t err;
|
||||
char *buf;
|
||||
|
||||
grub_dl_load ("vbe");
|
||||
|
||||
if (grub_strcmp (val, "normal") == 0)
|
||||
vid_mode = GRUB_LINUX_VID_MODE_NORMAL;
|
||||
else if (grub_strcmp (val, "ext") == 0)
|
||||
vid_mode = GRUB_LINUX_VID_MODE_EXTENDED;
|
||||
else if (grub_strcmp (val, "ask") == 0)
|
||||
{
|
||||
grub_printf ("Legacy `ask' parameter no longer supported.\n");
|
||||
grub_puts_ (N_("Legacy `ask' parameter no longer supported."));
|
||||
|
||||
/* We usually would never do this in a loader, but "vga=ask" means user
|
||||
requested interaction, so it can't hurt to request keyboard input. */
|
||||
|
@ -908,9 +809,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
case 0:
|
||||
case GRUB_LINUX_VID_MODE_NORMAL:
|
||||
grub_env_set ("gfxpayload", "text");
|
||||
grub_printf ("%s is deprecated. "
|
||||
"Use set gfxpayload=text before "
|
||||
"linux command instead.\n",
|
||||
grub_printf_ (N_("%s is deprecated. "
|
||||
"Use set gfxpayload=text before "
|
||||
"linux command instead.\n"),
|
||||
argv[i]);
|
||||
break;
|
||||
|
||||
|
@ -918,44 +819,37 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
case GRUB_LINUX_VID_MODE_EXTENDED:
|
||||
/* FIXME: support 80x50 text. */
|
||||
grub_env_set ("gfxpayload", "text");
|
||||
grub_printf ("%s is deprecated. "
|
||||
"Use set gfxpayload=text before "
|
||||
"linux command instead.\n",
|
||||
grub_printf_ (N_("%s is deprecated. "
|
||||
"Use set gfxpayload=text before "
|
||||
"linux command instead.\n"),
|
||||
argv[i]);
|
||||
break;
|
||||
default:
|
||||
/* Ignore invalid values. */
|
||||
if (vid_mode < GRUB_LINUX_VID_MODE_VESA_START ||
|
||||
vid_mode >= GRUB_LINUX_VID_MODE_VESA_START +
|
||||
ARRAY_SIZE (linux_vesafb_modes))
|
||||
if (vid_mode < GRUB_VESA_MODE_TABLE_START ||
|
||||
vid_mode > GRUB_VESA_MODE_TABLE_END)
|
||||
{
|
||||
grub_env_set ("gfxpayload", "text");
|
||||
grub_printf ("%s is deprecated. Mode %d isn't recognized. "
|
||||
"Use set gfxpayload=WIDTHxHEIGHT[xDEPTH] before "
|
||||
"linux command instead.\n",
|
||||
grub_printf_ (N_("%s is deprecated. Mode %d isn't recognized. "
|
||||
"Use set gfxpayload=WIDTHxHEIGHT[xDEPTH] "
|
||||
"before linux command instead.\n"),
|
||||
argv[i], vid_mode);
|
||||
break;
|
||||
}
|
||||
|
||||
/* We can't detect VESA, but user is implicitly telling us that it
|
||||
is built-in because `vga=' parameter was used. */
|
||||
params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
|
||||
|
||||
linux_mode
|
||||
= &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
|
||||
linux_mode = &grub_vesa_mode_table[vid_mode
|
||||
- GRUB_VESA_MODE_TABLE_START];
|
||||
|
||||
buf = grub_xasprintf ("%ux%ux%u,%ux%u",
|
||||
linux_vesafb_res[linux_mode->res_index].width,
|
||||
linux_vesafb_res[linux_mode->res_index].height,
|
||||
linux_mode->width, linux_mode->height,
|
||||
linux_mode->depth,
|
||||
linux_vesafb_res[linux_mode->res_index].width,
|
||||
linux_vesafb_res[linux_mode->res_index].height);
|
||||
linux_mode->width, linux_mode->height);
|
||||
if (! buf)
|
||||
goto fail;
|
||||
|
||||
grub_printf ("%s is deprecated. "
|
||||
"Use set gfxpayload=%s before "
|
||||
"linux command instead.\n",
|
||||
grub_printf_ (N_("%s is deprecated. "
|
||||
"Use set gfxpayload=%s before "
|
||||
"linux command instead.\n"),
|
||||
argv[i], buf);
|
||||
err = grub_env_set ("gfxpayload", buf);
|
||||
grub_free (buf);
|
||||
|
@ -1004,22 +898,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
params->loadflags |= GRUB_LINUX_FLAG_QUIET;
|
||||
}
|
||||
|
||||
|
||||
/* Specify the boot file. */
|
||||
dest = grub_stpcpy ((char *) real_mode_mem + GRUB_LINUX_CL_OFFSET,
|
||||
"BOOT_IMAGE=");
|
||||
dest = grub_stpcpy (dest, argv[0]);
|
||||
|
||||
/* Copy kernel parameters. */
|
||||
for (i = 1;
|
||||
i < argc
|
||||
&& dest + grub_strlen (argv[i]) + 1 < ((char *) real_mode_mem
|
||||
+ GRUB_LINUX_CL_END_OFFSET);
|
||||
i++)
|
||||
{
|
||||
*dest++ = ' ';
|
||||
dest = grub_stpcpy (dest, argv[i]);
|
||||
}
|
||||
/* Create kernel command line. */
|
||||
grub_memcpy ((char *)real_mode_mem + GRUB_LINUX_CL_OFFSET, LINUX_IMAGE,
|
||||
sizeof (LINUX_IMAGE));
|
||||
grub_create_loader_cmdline (argc, argv,
|
||||
(char *)real_mode_mem + GRUB_LINUX_CL_OFFSET
|
||||
+ sizeof (LINUX_IMAGE) - 1,
|
||||
maximal_cmdline_size
|
||||
- (sizeof (LINUX_IMAGE) - 1));
|
||||
|
||||
len = prot_size;
|
||||
if (grub_file_read (file, prot_mode_mem, len) != len)
|
||||
|
|
|
@ -16,10 +16,11 @@
|
|||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/memory.h>
|
||||
#ifdef GRUB_MACHINE_PCBIOS
|
||||
#include <grub/machine/biosnum.h>
|
||||
#include <grub/machine/apm.h>
|
||||
#include <grub/machine/memory.h>
|
||||
#endif
|
||||
#include <grub/multiboot.h>
|
||||
#include <grub/cpu/relocator.h>
|
||||
|
@ -32,6 +33,7 @@
|
|||
#include <grub/relocator.h>
|
||||
#include <grub/video.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/net.h>
|
||||
|
||||
/* The bits in the required part of flags field we don't support. */
|
||||
#define UNSUPPORTED_FLAGS 0x0000fff8
|
||||
|
@ -45,7 +47,7 @@ struct module
|
|||
int cmdline_size;
|
||||
};
|
||||
|
||||
struct module *modules, *modules_last;
|
||||
static struct module *modules, *modules_last;
|
||||
static grub_size_t cmdline_size;
|
||||
static grub_size_t total_modcmd;
|
||||
static unsigned modcnt;
|
||||
|
@ -140,7 +142,7 @@ grub_multiboot_load (grub_file_t file)
|
|||
}
|
||||
|
||||
if (header->bss_end_addr)
|
||||
grub_memset ((grub_uint32_t *) source + load_size, 0,
|
||||
grub_memset ((grub_uint8_t *) source + load_size, 0,
|
||||
header->bss_end_addr - header->load_addr - load_size);
|
||||
|
||||
grub_multiboot_payload_eip = header->entry_addr;
|
||||
|
@ -186,15 +188,36 @@ grub_multiboot_load (grub_file_t file)
|
|||
return err;
|
||||
}
|
||||
|
||||
#if GRUB_MACHINE_HAS_VBE || GRUB_MACHINE_HAS_VGA_TEXT
|
||||
#include <grub/i386/pc/vbe.h>
|
||||
#endif
|
||||
|
||||
static grub_size_t
|
||||
grub_multiboot_get_mbi_size (void)
|
||||
{
|
||||
return sizeof (struct multiboot_info) + ALIGN_UP (cmdline_size, 4)
|
||||
grub_size_t ret;
|
||||
struct grub_net_network_level_interface *net;
|
||||
|
||||
ret = sizeof (struct multiboot_info) + ALIGN_UP (cmdline_size, 4)
|
||||
+ modcnt * sizeof (struct multiboot_mod_list) + total_modcmd
|
||||
+ ALIGN_UP (sizeof(PACKAGE_STRING), 4)
|
||||
+ grub_get_multiboot_mmap_count () * sizeof (struct multiboot_mmap_entry)
|
||||
+ elf_sec_entsize * elf_sec_num
|
||||
+ 256 * sizeof (struct multiboot_color);
|
||||
+ 256 * sizeof (struct multiboot_color)
|
||||
#if GRUB_MACHINE_HAS_VBE || GRUB_MACHINE_HAS_VGA_TEXT
|
||||
+ sizeof (struct grub_vbe_info_block)
|
||||
+ sizeof (struct grub_vbe_mode_info_block)
|
||||
#endif
|
||||
+ ALIGN_UP (sizeof (struct multiboot_apm_info), 4);
|
||||
|
||||
FOR_NET_NETWORK_LEVEL_INTERFACES(net)
|
||||
if (net->dhcp_ack)
|
||||
{
|
||||
ret += net->dhcp_acklen;
|
||||
break;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Fill previously allocated Multiboot mmap. */
|
||||
|
@ -203,28 +226,30 @@ grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
|
|||
{
|
||||
struct multiboot_mmap_entry *mmap_entry = (struct multiboot_mmap_entry *) first_entry;
|
||||
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_memory_type_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
|
||||
grub_memory_type_t type)
|
||||
{
|
||||
mmap_entry->addr = addr;
|
||||
mmap_entry->len = size;
|
||||
switch (type)
|
||||
{
|
||||
case GRUB_MACHINE_MEMORY_AVAILABLE:
|
||||
case GRUB_MEMORY_AVAILABLE:
|
||||
mmap_entry->type = MULTIBOOT_MEMORY_AVAILABLE;
|
||||
break;
|
||||
|
||||
#ifdef GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE
|
||||
case GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE:
|
||||
case GRUB_MEMORY_ACPI:
|
||||
mmap_entry->type = MULTIBOOT_MEMORY_ACPI_RECLAIMABLE;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#ifdef GRUB_MACHINE_MEMORY_NVS
|
||||
case GRUB_MACHINE_MEMORY_NVS:
|
||||
case GRUB_MEMORY_NVS:
|
||||
mmap_entry->type = MULTIBOOT_MEMORY_NVS;
|
||||
break;
|
||||
#endif
|
||||
|
||||
case GRUB_MEMORY_BADRAM:
|
||||
mmap_entry->type = MULTIBOOT_MEMORY_BADRAM;
|
||||
break;
|
||||
|
||||
default:
|
||||
mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;
|
||||
|
@ -239,6 +264,90 @@ grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
|
|||
grub_mmap_iterate (hook);
|
||||
}
|
||||
|
||||
#if GRUB_MACHINE_HAS_VBE || GRUB_MACHINE_HAS_VGA_TEXT
|
||||
|
||||
static grub_err_t
|
||||
fill_vbe_info (struct multiboot_info *mbi, grub_uint8_t *ptrorig,
|
||||
grub_uint32_t ptrdest, int fill_generic)
|
||||
{
|
||||
grub_uint32_t vbe_mode;
|
||||
struct grub_vbe_mode_info_block *mode_info;
|
||||
#if GRUB_MACHINE_HAS_VBE
|
||||
grub_vbe_status_t status;
|
||||
void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
|
||||
|
||||
status = grub_vbe_bios_get_controller_info (scratch);
|
||||
if (status != GRUB_VBE_STATUS_OK)
|
||||
return grub_error (GRUB_ERR_IO, "Can't get controller info.");
|
||||
|
||||
mbi->vbe_control_info = ptrdest;
|
||||
grub_memcpy (ptrorig, scratch, sizeof (struct grub_vbe_info_block));
|
||||
ptrorig += sizeof (struct grub_vbe_info_block);
|
||||
ptrdest += sizeof (struct grub_vbe_info_block);
|
||||
#else
|
||||
mbi->vbe_control_info = 0;
|
||||
#endif
|
||||
|
||||
#if GRUB_MACHINE_HAS_VBE
|
||||
status = grub_vbe_bios_get_mode (scratch);
|
||||
vbe_mode = *(grub_uint32_t *) scratch;
|
||||
if (status != GRUB_VBE_STATUS_OK)
|
||||
return grub_error (GRUB_ERR_IO, "can't get VBE mode");
|
||||
#else
|
||||
vbe_mode = 3;
|
||||
#endif
|
||||
mbi->vbe_mode = vbe_mode;
|
||||
|
||||
mode_info = (struct grub_vbe_mode_info_block *) ptrorig;
|
||||
mbi->vbe_mode_info = ptrdest;
|
||||
/* get_mode_info isn't available for mode 3. */
|
||||
if (vbe_mode == 3)
|
||||
{
|
||||
grub_memset (mode_info, 0, sizeof (struct grub_vbe_mode_info_block));
|
||||
mode_info->memory_model = GRUB_VBE_MEMORY_MODEL_TEXT;
|
||||
mode_info->x_resolution = 80;
|
||||
mode_info->y_resolution = 25;
|
||||
}
|
||||
else
|
||||
{
|
||||
#if GRUB_MACHINE_HAS_VBE
|
||||
status = grub_vbe_bios_get_mode_info (vbe_mode, scratch);
|
||||
if (status != GRUB_VBE_STATUS_OK)
|
||||
return grub_error (GRUB_ERR_IO, "can't get mode info");
|
||||
grub_memcpy (mode_info, scratch,
|
||||
sizeof (struct grub_vbe_mode_info_block));
|
||||
#endif
|
||||
}
|
||||
ptrorig += sizeof (struct grub_vbe_mode_info_block);
|
||||
ptrdest += sizeof (struct grub_vbe_mode_info_block);
|
||||
|
||||
#if GRUB_MACHINE_HAS_VBE
|
||||
grub_vbe_bios_get_pm_interface (&mbi->vbe_interface_seg,
|
||||
&mbi->vbe_interface_off,
|
||||
&mbi->vbe_interface_len);
|
||||
#endif
|
||||
|
||||
mbi->flags |= MULTIBOOT_INFO_VBE_INFO;
|
||||
|
||||
if (fill_generic && mode_info->memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
|
||||
{
|
||||
mbi->framebuffer_addr = 0xb8000;
|
||||
|
||||
mbi->framebuffer_pitch = 2 * mode_info->x_resolution;
|
||||
mbi->framebuffer_width = mode_info->x_resolution;
|
||||
mbi->framebuffer_height = mode_info->y_resolution;
|
||||
|
||||
mbi->framebuffer_bpp = 16;
|
||||
|
||||
mbi->framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT;
|
||||
|
||||
mbi->flags |= MULTIBOOT_INFO_FRAMEBUFFER_INFO;
|
||||
}
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
#endif
|
||||
|
||||
static grub_err_t
|
||||
retrieve_video_parameters (struct multiboot_info *mbi,
|
||||
grub_uint8_t *ptrorig, grub_uint32_t ptrdest)
|
||||
|
@ -259,8 +368,13 @@ retrieve_video_parameters (struct multiboot_info *mbi,
|
|||
grub_video_get_palette (0, ARRAY_SIZE (palette), palette);
|
||||
|
||||
driv_id = grub_video_get_driver_id ();
|
||||
#if GRUB_MACHINE_HAS_VGA_TEXT
|
||||
if (driv_id == GRUB_VIDEO_DRIVER_NONE)
|
||||
return fill_vbe_info (mbi, ptrorig, ptrdest, 1);
|
||||
#else
|
||||
if (driv_id == GRUB_VIDEO_DRIVER_NONE)
|
||||
return GRUB_ERR_NONE;
|
||||
#endif
|
||||
|
||||
err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
|
||||
if (err)
|
||||
|
@ -308,6 +422,11 @@ retrieve_video_parameters (struct multiboot_info *mbi,
|
|||
|
||||
mbi->flags |= MULTIBOOT_INFO_FRAMEBUFFER_INFO;
|
||||
|
||||
#if GRUB_MACHINE_HAS_VBE
|
||||
if (driv_id == GRUB_VIDEO_DRIVER_VBE)
|
||||
return fill_vbe_info (mbi, ptrorig, ptrdest, 0);
|
||||
#endif
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
@ -329,13 +448,13 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
|
|||
bufsize = grub_multiboot_get_mbi_size ();
|
||||
|
||||
err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
|
||||
0, 0xffffffff - bufsize,
|
||||
0x10000, 0x100000 - bufsize,
|
||||
bufsize, 4,
|
||||
GRUB_RELOCATOR_PREFERENCE_NONE);
|
||||
if (err)
|
||||
return err;
|
||||
ptrorig = get_virtual_current_address (ch);
|
||||
ptrdest = (grub_addr_t) get_virtual_current_address (ch);
|
||||
ptrdest = get_physical_target_address (ch);
|
||||
|
||||
*target = ptrdest;
|
||||
|
||||
|
@ -356,6 +475,29 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
|
|||
ptrorig += ALIGN_UP (sizeof(PACKAGE_STRING), 4);
|
||||
ptrdest += ALIGN_UP (sizeof(PACKAGE_STRING), 4);
|
||||
|
||||
#ifdef GRUB_MACHINE_PCBIOS
|
||||
{
|
||||
struct grub_apm_info info;
|
||||
if (grub_apm_get_info (&info))
|
||||
{
|
||||
struct multiboot_apm_info *mbinfo = (void *) ptrorig;
|
||||
|
||||
mbinfo->cseg = info.cseg;
|
||||
mbinfo->offset = info.offset;
|
||||
mbinfo->cseg_16 = info.cseg_16;
|
||||
mbinfo->dseg = info.dseg;
|
||||
mbinfo->flags = info.flags;
|
||||
mbinfo->cseg_len = info.cseg_len;
|
||||
mbinfo->dseg_len = info.dseg_len;
|
||||
mbinfo->cseg_16_len = info.cseg_16_len;
|
||||
mbinfo->version = info.version;
|
||||
|
||||
ptrorig += ALIGN_UP (sizeof (struct multiboot_apm_info), 4);
|
||||
ptrdest += ALIGN_UP (sizeof (struct multiboot_apm_info), 4);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (modcnt)
|
||||
{
|
||||
mbi->flags |= MULTIBOOT_INFO_MODS;
|
||||
|
@ -401,6 +543,20 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
|
|||
mbi->flags |= MULTIBOOT_INFO_BOOTDEV;
|
||||
}
|
||||
|
||||
{
|
||||
struct grub_net_network_level_interface *net;
|
||||
FOR_NET_NETWORK_LEVEL_INTERFACES(net)
|
||||
if (net->dhcp_ack)
|
||||
{
|
||||
grub_memcpy (ptrorig, net->dhcp_ack, net->dhcp_acklen);
|
||||
mbi->drives_addr = ptrdest;
|
||||
mbi->drives_length = net->dhcp_acklen;
|
||||
ptrorig += net->dhcp_acklen;
|
||||
ptrdest += net->dhcp_acklen;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (elf_sec_num)
|
||||
{
|
||||
mbi->u.elf_sec.addr = ptrdest;
|
||||
|
@ -410,6 +566,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
|
|||
mbi->u.elf_sec.shndx = elf_sec_shstrndx;
|
||||
|
||||
mbi->flags |= MULTIBOOT_INFO_ELF_SHDR;
|
||||
|
||||
ptrorig += elf_sec_entsize * elf_sec_num;
|
||||
ptrdest += elf_sec_entsize * elf_sec_num;
|
||||
}
|
||||
|
||||
err = retrieve_video_parameters (mbi, ptrorig, ptrdest);
|
||||
|
@ -419,6 +578,22 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
|
|||
grub_errno = GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
if ((mbi->flags & MULTIBOOT_INFO_FRAMEBUFFER_INFO)
|
||||
&& mbi->framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED)
|
||||
{
|
||||
ptrorig += mbi->framebuffer_palette_num_colors
|
||||
* sizeof (struct multiboot_color);
|
||||
ptrdest += mbi->framebuffer_palette_num_colors
|
||||
* sizeof (struct multiboot_color);
|
||||
}
|
||||
|
||||
#if GRUB_MACHINE_HAS_VBE
|
||||
ptrorig += sizeof (struct grub_vbe_info_block);
|
||||
ptrdest += sizeof (struct grub_vbe_info_block);
|
||||
ptrorig += sizeof (struct grub_vbe_mode_info_block);
|
||||
ptrdest += sizeof (struct grub_vbe_mode_info_block);
|
||||
#endif
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
@ -506,6 +681,7 @@ grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
|
|||
return grub_errno;
|
||||
newmod->start = start;
|
||||
newmod->size = size;
|
||||
newmod->next = 0;
|
||||
|
||||
for (i = 0; i < argc; i++)
|
||||
len += grub_strlen (argv[i]) + 1;
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
*/
|
||||
|
||||
#include <grub/loader.h>
|
||||
#include <grub/machine/loader.h>
|
||||
#include <grub/machine/chainloader.h>
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/device.h>
|
||||
|
@ -27,7 +27,7 @@
|
|||
#include <grub/misc.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/partition.h>
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/memory.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/command.h>
|
||||
#include <grub/msdos_partition.h>
|
||||
|
@ -36,28 +36,110 @@
|
|||
#include <grub/i18n.h>
|
||||
#include <grub/video.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/fat.h>
|
||||
#include <grub/ntfs.h>
|
||||
#include <grub/i386/relocator.h>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
static int boot_drive;
|
||||
static void *boot_part_addr;
|
||||
static grub_addr_t boot_part_addr;
|
||||
static struct grub_relocator *rel;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
GRUB_CHAINLOADER_FORCE = 0x1,
|
||||
GRUB_CHAINLOADER_BPB = 0x2,
|
||||
} grub_chainloader_flags_t;
|
||||
|
||||
static grub_err_t
|
||||
grub_chainloader_boot (void)
|
||||
{
|
||||
struct grub_relocator16_state state = {
|
||||
.edx = boot_drive,
|
||||
.esi = boot_part_addr,
|
||||
.ds = 0,
|
||||
.es = 0,
|
||||
.fs = 0,
|
||||
.gs = 0,
|
||||
.ss = 0,
|
||||
.cs = 0,
|
||||
.sp = GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR,
|
||||
.ip = GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR,
|
||||
.a20 = 0
|
||||
};
|
||||
grub_video_set_mode ("text", 0, 0);
|
||||
grub_chainloader_real_boot (boot_drive, boot_part_addr);
|
||||
|
||||
/* Never reach here. */
|
||||
return GRUB_ERR_NONE;
|
||||
return grub_relocator16_boot (rel, state);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_chainloader_unload (void)
|
||||
{
|
||||
grub_relocator_unload (rel);
|
||||
rel = NULL;
|
||||
grub_dl_unref (my_mod);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
void
|
||||
grub_chainloader_patch_bpb (void *bs, grub_device_t dev, grub_uint8_t dl)
|
||||
{
|
||||
grub_uint32_t part_start = 0;
|
||||
if (dev && dev->disk)
|
||||
part_start = grub_partition_get_start (dev->disk->partition);
|
||||
if (grub_memcmp ((char *) &((struct grub_ntfs_bpb *) bs)->oem_name,
|
||||
"NTFS", 4) == 0)
|
||||
{
|
||||
struct grub_ntfs_bpb *bpb = (struct grub_ntfs_bpb *) bs;
|
||||
bpb->num_hidden_sectors = grub_cpu_to_le32 (part_start);
|
||||
bpb->bios_drive = dl;
|
||||
return;
|
||||
}
|
||||
|
||||
do
|
||||
{
|
||||
struct grub_fat_bpb *bpb = (struct grub_fat_bpb *) bs;
|
||||
if (grub_strncmp((const char *) bpb->version_specific.fat12_or_fat16.fstype, "FAT12", 5)
|
||||
&& grub_strncmp((const char *) bpb->version_specific.fat12_or_fat16.fstype, "FAT16", 5)
|
||||
&& grub_strncmp((const char *) bpb->version_specific.fat32.fstype, "FAT32", 5))
|
||||
break;
|
||||
|
||||
if (grub_le_to_cpu16 (bpb->bytes_per_sector) < 512
|
||||
|| (grub_le_to_cpu16 (bpb->bytes_per_sector)
|
||||
& (grub_le_to_cpu16 (bpb->bytes_per_sector) - 1)))
|
||||
break;
|
||||
|
||||
if (bpb->sectors_per_cluster == 0
|
||||
|| (bpb->sectors_per_cluster & (bpb->sectors_per_cluster - 1)))
|
||||
break;
|
||||
|
||||
if (bpb->num_reserved_sectors == 0)
|
||||
break;
|
||||
if (bpb->num_total_sectors_16 == 0 || bpb->num_total_sectors_32 == 0)
|
||||
break;
|
||||
|
||||
if (bpb->num_fats == 0)
|
||||
break;
|
||||
|
||||
if (bpb->sectors_per_fat_16)
|
||||
{
|
||||
bpb->num_hidden_sectors = grub_cpu_to_le32 (part_start);
|
||||
bpb->version_specific.fat12_or_fat16.num_ph_drive = dl;
|
||||
return;
|
||||
}
|
||||
if (bpb->version_specific.fat32.sectors_per_fat_32)
|
||||
{
|
||||
bpb->num_hidden_sectors = grub_cpu_to_le32 (part_start);
|
||||
bpb->version_specific.fat32.num_ph_drive = dl;
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
while (0);
|
||||
}
|
||||
|
||||
static void
|
||||
grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
|
||||
{
|
||||
|
@ -65,7 +147,12 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
|
|||
grub_uint16_t signature;
|
||||
grub_device_t dev;
|
||||
int drive = -1;
|
||||
void *part_addr = 0;
|
||||
grub_addr_t part_addr = 0;
|
||||
grub_uint8_t *bs, *ptable;
|
||||
|
||||
rel = grub_relocator_new ();
|
||||
if (!rel)
|
||||
goto fail;
|
||||
|
||||
grub_dl_ref (my_mod);
|
||||
|
||||
|
@ -74,8 +161,25 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
|
|||
if (! file)
|
||||
goto fail;
|
||||
|
||||
{
|
||||
grub_relocator_chunk_t ch;
|
||||
grub_err_t err;
|
||||
|
||||
err = grub_relocator_alloc_chunk_addr (rel, &ch, 0x7C00,
|
||||
GRUB_DISK_SECTOR_SIZE);
|
||||
if (err)
|
||||
goto fail;
|
||||
bs = get_virtual_current_address (ch);
|
||||
err = grub_relocator_alloc_chunk_addr (rel, &ch,
|
||||
GRUB_MEMORY_MACHINE_PART_TABLE_ADDR,
|
||||
64);
|
||||
if (err)
|
||||
goto fail;
|
||||
ptable = get_virtual_current_address (ch);
|
||||
}
|
||||
|
||||
/* Read the first block. */
|
||||
if (grub_file_read (file, (void *) 0x7C00, GRUB_DISK_SECTOR_SIZE)
|
||||
if (grub_file_read (file, bs, GRUB_DISK_SECTOR_SIZE)
|
||||
!= GRUB_DISK_SECTOR_SIZE)
|
||||
{
|
||||
if (grub_errno == GRUB_ERR_NONE)
|
||||
|
@ -85,7 +189,7 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
|
|||
}
|
||||
|
||||
/* Check the signature. */
|
||||
signature = *((grub_uint16_t *) (0x7C00 + GRUB_DISK_SECTOR_SIZE - 2));
|
||||
signature = *((grub_uint16_t *) (bs + GRUB_DISK_SECTOR_SIZE - 2));
|
||||
if (signature != grub_le_to_cpu16 (0xaa55)
|
||||
&& ! (flags & GRUB_CHAINLOADER_FORCE))
|
||||
{
|
||||
|
@ -109,15 +213,17 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
|
|||
if (p && grub_strcmp (p->partmap->name, "msdos") == 0)
|
||||
{
|
||||
disk->partition = p->parent;
|
||||
grub_disk_read (disk, p->offset, 446, 64,
|
||||
(void *) GRUB_MEMORY_MACHINE_PART_TABLE_ADDR);
|
||||
part_addr = (void *) (GRUB_MEMORY_MACHINE_PART_TABLE_ADDR
|
||||
+ (p->index << 4));
|
||||
grub_disk_read (disk, p->offset, 446, 64, ptable);
|
||||
part_addr = (GRUB_MEMORY_MACHINE_PART_TABLE_ADDR
|
||||
+ (p->index << 4));
|
||||
disk->partition = p;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (flags & GRUB_CHAINLOADER_BPB)
|
||||
grub_chainloader_patch_bpb ((void *) 0x7C00, dev, drive);
|
||||
|
||||
if (dev)
|
||||
grub_device_close (dev);
|
||||
|
||||
|
@ -144,11 +250,23 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
|
|||
{
|
||||
grub_chainloader_flags_t flags = 0;
|
||||
|
||||
if (argc > 0 && grub_strcmp (argv[0], "--force") == 0)
|
||||
while (argc > 0)
|
||||
{
|
||||
flags |= GRUB_CHAINLOADER_FORCE;
|
||||
argc--;
|
||||
argv++;
|
||||
if (grub_strcmp (argv[0], "--force") == 0)
|
||||
{
|
||||
flags |= GRUB_CHAINLOADER_FORCE;
|
||||
argc--;
|
||||
argv++;
|
||||
continue;
|
||||
}
|
||||
if (grub_strcmp (argv[0], "--bpb") == 0)
|
||||
{
|
||||
flags |= GRUB_CHAINLOADER_BPB;
|
||||
argc--;
|
||||
argv++;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (argc == 0)
|
||||
|
@ -164,7 +282,8 @@ static grub_command_t cmd;
|
|||
GRUB_MOD_INIT(chainloader)
|
||||
{
|
||||
cmd = grub_register_command ("chainloader", grub_cmd_chainloader,
|
||||
0, N_("Load another boot loader."));
|
||||
N_("[--force|--bpb] FILE"),
|
||||
N_("Load another boot loader."));
|
||||
my_mod = mod;
|
||||
}
|
||||
|
||||
|
|
139
grub-core/loader/i386/pc/freedos.c
Normal file
139
grub-core/loader/i386/pc/freedos.c
Normal file
|
@ -0,0 +1,139 @@
|
|||
/* chainloader.c - boot another boot loader */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2002,2004,2007,2009,2010 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/loader.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/device.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/partition.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/command.h>
|
||||
#include <grub/machine/biosnum.h>
|
||||
#include <grub/i18n.h>
|
||||
#include <grub/video.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/cpu/relocator.h>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
static struct grub_relocator *rel;
|
||||
static grub_uint32_t ebx = 0xffffffff;
|
||||
|
||||
#define GRUB_FREEDOS_SEGMENT 0x60
|
||||
#define GRUB_FREEDOS_STACK_SEGMENT 0x1fe0
|
||||
#define GRUB_FREEDOS_STACK_POINTER 0x8000
|
||||
|
||||
static grub_err_t
|
||||
grub_freedos_boot (void)
|
||||
{
|
||||
struct grub_relocator16_state state = {
|
||||
.cs = GRUB_FREEDOS_SEGMENT,
|
||||
.ip = 0,
|
||||
.ds = 0,
|
||||
.es = 0,
|
||||
.fs = 0,
|
||||
.gs = 0,
|
||||
.ss = GRUB_FREEDOS_STACK_SEGMENT,
|
||||
.sp = GRUB_FREEDOS_STACK_POINTER,
|
||||
.ebx = ebx,
|
||||
.edx = 0,
|
||||
.a20 = 1
|
||||
};
|
||||
grub_video_set_mode ("text", 0, 0);
|
||||
|
||||
return grub_relocator16_boot (rel, state);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_freedos_unload (void)
|
||||
{
|
||||
grub_relocator_unload (rel);
|
||||
rel = NULL;
|
||||
grub_dl_unref (my_mod);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_freedos (grub_command_t cmd __attribute__ ((unused)),
|
||||
int argc, char *argv[])
|
||||
{
|
||||
grub_file_t file = 0;
|
||||
grub_err_t err;
|
||||
void *kernelsys;
|
||||
grub_size_t kernelsyssize;
|
||||
|
||||
if (argc == 0)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
|
||||
|
||||
grub_dl_ref (my_mod);
|
||||
|
||||
rel = grub_relocator_new ();
|
||||
if (!rel)
|
||||
goto fail;
|
||||
|
||||
file = grub_file_open (argv[0]);
|
||||
if (! file)
|
||||
goto fail;
|
||||
|
||||
ebx = grub_get_root_biosnumber ();
|
||||
|
||||
kernelsyssize = grub_file_size (file);
|
||||
{
|
||||
grub_relocator_chunk_t ch;
|
||||
err = grub_relocator_alloc_chunk_addr (rel, &ch, GRUB_FREEDOS_SEGMENT << 4,
|
||||
kernelsyssize);
|
||||
if (err)
|
||||
goto fail;
|
||||
kernelsys = get_virtual_current_address (ch);
|
||||
}
|
||||
|
||||
if (grub_file_read (file, kernelsys, kernelsyssize)
|
||||
!= (grub_ssize_t) kernelsyssize)
|
||||
goto fail;
|
||||
|
||||
grub_loader_set (grub_freedos_boot, grub_freedos_unload, 1);
|
||||
return GRUB_ERR_NONE;
|
||||
|
||||
fail:
|
||||
|
||||
if (file)
|
||||
grub_file_close (file);
|
||||
|
||||
grub_freedos_unload ();
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
static grub_command_t cmd;
|
||||
|
||||
GRUB_MOD_INIT(freedos)
|
||||
{
|
||||
cmd = grub_register_command ("freedos", grub_cmd_freedos,
|
||||
0, N_("Load FreeDOS kernel.sys."));
|
||||
my_mod = mod;
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(freedos)
|
||||
{
|
||||
grub_unregister_command (cmd);
|
||||
}
|
|
@ -18,14 +18,13 @@
|
|||
*/
|
||||
|
||||
#include <grub/loader.h>
|
||||
#include <grub/machine/loader.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/device.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/machine/memory.h>
|
||||
#include <grub/memory.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/cpu/linux.h>
|
||||
#include <grub/command.h>
|
||||
|
@ -34,9 +33,11 @@
|
|||
#include <grub/cpu/relocator.h>
|
||||
#include <grub/video.h>
|
||||
#include <grub/i386/floppy.h>
|
||||
#include <grub/lib/cmdline.h>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
#define GRUB_LINUX_CL_OFFSET 0x9000
|
||||
#define GRUB_LINUX_CL_END_OFFSET 0x90FF
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
|
||||
|
@ -46,6 +47,7 @@ static struct grub_relocator *relocator = NULL;
|
|||
static grub_addr_t grub_linux_real_target;
|
||||
static char *grub_linux_real_chunk;
|
||||
static grub_size_t grub_linux16_prot_size;
|
||||
static grub_size_t maximal_cmdline_size;
|
||||
|
||||
static grub_err_t
|
||||
grub_linux16_boot (void)
|
||||
|
@ -58,6 +60,7 @@ grub_linux16_boot (void)
|
|||
state.sp = GRUB_LINUX_SETUP_STACK;
|
||||
state.cs = segment + 0x20;
|
||||
state.ip = 0;
|
||||
state.a20 = 1;
|
||||
|
||||
grub_video_set_mode ("text", 0, 0);
|
||||
|
||||
|
@ -86,7 +89,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
grub_size_t real_size;
|
||||
grub_ssize_t len;
|
||||
int i;
|
||||
char *dest;
|
||||
char *grub_linux_prot_chunk;
|
||||
int grub_linux_is_bzimage;
|
||||
grub_addr_t grub_linux_prot_target;
|
||||
|
@ -126,15 +128,20 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
setup_sects = lh.setup_sects;
|
||||
linux_mem_size = 0;
|
||||
|
||||
maximal_cmdline_size = 256;
|
||||
|
||||
if (lh.header == grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
|
||||
&& grub_le_to_cpu16 (lh.version) >= 0x0200)
|
||||
{
|
||||
grub_linux_is_bzimage = (lh.loadflags & GRUB_LINUX_FLAG_BIG_KERNEL);
|
||||
lh.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
|
||||
|
||||
if (grub_le_to_cpu16 (lh.version) >= 0x0206)
|
||||
maximal_cmdline_size = grub_le_to_cpu32 (lh.cmdline_size) + 1;
|
||||
|
||||
/* Put the real mode part at as a high location as possible. */
|
||||
grub_linux_real_target = grub_mmap_get_lower ()
|
||||
- GRUB_LINUX_SETUP_MOVE_SIZE;
|
||||
- (GRUB_LINUX_CL_OFFSET + maximal_cmdline_size);
|
||||
/* But it must not exceed the traditional area. */
|
||||
if (grub_linux_real_target > GRUB_LINUX_OLD_REAL_MODE_ADDR)
|
||||
grub_linux_real_target = GRUB_LINUX_OLD_REAL_MODE_ADDR;
|
||||
|
@ -151,7 +158,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
{
|
||||
lh.cl_magic = grub_cpu_to_le16 (GRUB_LINUX_CL_MAGIC);
|
||||
lh.cl_offset = grub_cpu_to_le16 (GRUB_LINUX_CL_OFFSET);
|
||||
lh.setup_move_size = grub_cpu_to_le16 (GRUB_LINUX_SETUP_MOVE_SIZE);
|
||||
lh.setup_move_size = grub_cpu_to_le16 (GRUB_LINUX_CL_OFFSET
|
||||
+ maximal_cmdline_size);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -183,12 +191,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
goto fail;
|
||||
}
|
||||
|
||||
if (grub_linux_real_target + GRUB_LINUX_SETUP_MOVE_SIZE
|
||||
if (grub_linux_real_target + GRUB_LINUX_CL_OFFSET + maximal_cmdline_size
|
||||
> grub_mmap_get_lower ())
|
||||
{
|
||||
grub_error (GRUB_ERR_OUT_OF_RANGE,
|
||||
"too small lower memory (0x%x > 0x%x)",
|
||||
grub_linux_real_target + GRUB_LINUX_SETUP_MOVE_SIZE,
|
||||
grub_linux_real_target + GRUB_LINUX_CL_OFFSET
|
||||
+ maximal_cmdline_size,
|
||||
(int) grub_mmap_get_lower ());
|
||||
goto fail;
|
||||
}
|
||||
|
@ -261,7 +270,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
grub_relocator_chunk_t ch;
|
||||
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
|
||||
grub_linux_real_target,
|
||||
GRUB_LINUX_SETUP_MOVE_SIZE);
|
||||
GRUB_LINUX_CL_OFFSET
|
||||
+ maximal_cmdline_size);
|
||||
if (err)
|
||||
return err;
|
||||
grub_linux_real_chunk = get_virtual_current_address (ch);
|
||||
|
@ -286,21 +296,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|||
((GRUB_LINUX_MAX_SETUP_SECTS - setup_sects - 1)
|
||||
<< GRUB_DISK_SECTOR_BITS));
|
||||
|
||||
/* Specify the boot file. */
|
||||
dest = grub_stpcpy (grub_linux_real_chunk + GRUB_LINUX_CL_OFFSET,
|
||||
"BOOT_IMAGE=");
|
||||
dest = grub_stpcpy (dest, argv[0]);
|
||||
|
||||
/* Copy kernel parameters. */
|
||||
for (i = 1;
|
||||
i < argc
|
||||
&& dest + grub_strlen (argv[i]) + 1 < (grub_linux_real_chunk
|
||||
+ GRUB_LINUX_CL_END_OFFSET);
|
||||
i++)
|
||||
{
|
||||
*dest++ = ' ';
|
||||
dest = grub_stpcpy (dest, argv[i]);
|
||||
}
|
||||
/* Create kernel command line. */
|
||||
grub_memcpy ((char *)grub_linux_real_chunk + GRUB_LINUX_CL_OFFSET,
|
||||
LINUX_IMAGE, sizeof (LINUX_IMAGE));
|
||||
grub_create_loader_cmdline (argc, argv,
|
||||
(char *)grub_linux_real_chunk
|
||||
+ GRUB_LINUX_CL_OFFSET + sizeof (LINUX_IMAGE) - 1,
|
||||
maximal_cmdline_size
|
||||
- (sizeof (LINUX_IMAGE) - 1));
|
||||
|
||||
if (grub_linux_is_bzimage)
|
||||
grub_linux_prot_target = GRUB_LINUX_BZIMAGE_ADDR;
|
||||
|
|
|
@ -32,6 +32,9 @@
|
|||
#include <grub/video.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/cpu/relocator.h>
|
||||
#include <grub/machine/chainloader.h>
|
||||
|
||||
GRUB_MOD_LICENSE ("GPLv3+");
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
static struct grub_relocator *rel;
|
||||
|
@ -51,7 +54,8 @@ grub_ntldr_boot (void)
|
|||
.gs = 0,
|
||||
.ss = 0,
|
||||
.sp = 0x7c00,
|
||||
.edx = edx
|
||||
.edx = edx,
|
||||
.a20 = 1
|
||||
};
|
||||
grub_video_set_mode ("text", 0, 0);
|
||||
|
||||
|
@ -110,6 +114,7 @@ grub_cmd_ntldr (grub_command_t cmd __attribute__ ((unused)),
|
|||
grub_device_close (dev);
|
||||
goto fail;
|
||||
}
|
||||
grub_chainloader_patch_bpb (bs, dev, edx);
|
||||
}
|
||||
|
||||
if (dev)
|
||||
|
|
513
grub-core/loader/i386/pc/plan9.c
Normal file
513
grub-core/loader/i386/pc/plan9.c
Normal file
|
@ -0,0 +1,513 @@
|
|||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2010 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/loader.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/err.h>
|
||||
#include <grub/device.h>
|
||||
#include <grub/disk.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/partition.h>
|
||||
#include <grub/msdos_partition.h>
|
||||
#include <grub/scsi.h>
|
||||
#include <grub/dl.h>
|
||||
#include <grub/command.h>
|
||||
#include <grub/i18n.h>
|
||||
#include <grub/video.h>
|
||||
#include <grub/mm.h>
|
||||
#include <grub/cpu/relocator.h>
|
||||
#include <grub/extcmd.h>
|
||||
|
||||
static grub_dl_t my_mod;
|
||||
static struct grub_relocator *rel;
|
||||
static grub_uint32_t eip = 0xffffffff;
|
||||
|
||||
#define GRUB_PLAN9_TARGET 0x100000
|
||||
#define GRUB_PLAN9_ALIGN 4096
|
||||
#define GRUB_PLAN9_CONFIG_ADDR 0x001200
|
||||
#define GRUB_PLAN9_CONFIG_PATH_SIZE 0x000040
|
||||
#define GRUB_PLAN9_CONFIG_MAGIC "ZORT 0\r\n"
|
||||
|
||||
static const struct grub_arg_option options[] =
|
||||
{
|
||||
{"map", 'm', GRUB_ARG_OPTION_REPEATABLE,
|
||||
N_("Override guessed mapping of Plan9 devices."),
|
||||
N_("GRUBDEVICE=PLAN9DEVICE"),
|
||||
ARG_TYPE_STRING},
|
||||
{0, 0, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
struct grub_plan9_header
|
||||
{
|
||||
grub_uint32_t magic;
|
||||
#define GRUB_PLAN9_MAGIC 0x1eb
|
||||
grub_uint32_t text_size;
|
||||
grub_uint32_t data_size;
|
||||
grub_uint32_t bss_size;
|
||||
grub_uint32_t sectiona;
|
||||
grub_uint32_t entry_addr;
|
||||
grub_uint32_t zero;
|
||||
grub_uint32_t sectionb;
|
||||
};
|
||||
|
||||
static grub_err_t
|
||||
grub_plan9_boot (void)
|
||||
{
|
||||
struct grub_relocator32_state state = {
|
||||
.eax = 0,
|
||||
.eip = eip,
|
||||
.ebx = 0,
|
||||
.ecx = 0,
|
||||
.edx = 0,
|
||||
.edi = 0,
|
||||
.esp = 0,
|
||||
.ebp = 0,
|
||||
.esi = 0
|
||||
};
|
||||
grub_video_set_mode ("text", 0, 0);
|
||||
|
||||
return grub_relocator32_boot (rel, state);
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_plan9_unload (void)
|
||||
{
|
||||
grub_relocator_unload (rel);
|
||||
rel = NULL;
|
||||
grub_dl_unref (my_mod);
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_plan9 (grub_extcmd_context_t ctxt, int argc, char *argv[])
|
||||
{
|
||||
grub_file_t file = 0;
|
||||
void *mem;
|
||||
grub_size_t memsize, padsize;
|
||||
struct grub_plan9_header hdr;
|
||||
char *config, *configptr;
|
||||
grub_size_t configsize;
|
||||
char *pmap = NULL;
|
||||
grub_size_t pmapalloc = 256;
|
||||
grub_size_t pmapptr = 0;
|
||||
int noslash = 1;
|
||||
char prefixes[5][10] = {"dos", "plan9", "ntfs", "linux", "linuxswap"};
|
||||
int prefixescnt[5];
|
||||
char *bootdisk = NULL, *bootpart = NULL, *bootpath = NULL;
|
||||
|
||||
auto int fill_partition (grub_disk_t disk,
|
||||
const grub_partition_t partition);
|
||||
int fill_partition (grub_disk_t disk,
|
||||
const grub_partition_t partition)
|
||||
{
|
||||
int file_disk = 0;
|
||||
int pstart, pend;
|
||||
if (!noslash)
|
||||
{
|
||||
if (grub_extend_alloc (pmapptr + 1, &pmapalloc, (void **) &pmap))
|
||||
return 1;
|
||||
pmap[pmapptr++] = '/';
|
||||
}
|
||||
noslash = 0;
|
||||
|
||||
file_disk = file->device->disk && disk->id == file->device->disk->id
|
||||
&& disk->dev->id == file->device->disk->dev->id;
|
||||
|
||||
pstart = pmapptr;
|
||||
if (grub_strcmp (partition->partmap->name, "plan") == 0)
|
||||
{
|
||||
unsigned ptr = partition->index + sizeof ("part ") - 1;
|
||||
grub_err_t err;
|
||||
disk->partition = partition->parent;
|
||||
do
|
||||
{
|
||||
if (grub_extend_alloc (pmapptr + 1, &pmapalloc, (void **) &pmap))
|
||||
return 1;
|
||||
err = grub_disk_read (disk, 1, ptr, 1, pmap + pmapptr);
|
||||
if (err)
|
||||
{
|
||||
disk->partition = 0;
|
||||
return err;
|
||||
}
|
||||
ptr++;
|
||||
pmapptr++;
|
||||
}
|
||||
while (grub_isalpha (pmap[pmapptr - 1])
|
||||
|| grub_isdigit (pmap[pmapptr - 1]));
|
||||
pmapptr--;
|
||||
}
|
||||
else
|
||||
{
|
||||
char name[50];
|
||||
int c = 0;
|
||||
if (grub_strcmp (partition->partmap->name, "msdos") == 0)
|
||||
{
|
||||
switch (partition->msdostype)
|
||||
{
|
||||
case GRUB_PC_PARTITION_TYPE_PLAN9:
|
||||
c = 1;
|
||||
break;
|
||||
case GRUB_PC_PARTITION_TYPE_NTFS:
|
||||
c = 2;
|
||||
break;
|
||||
case GRUB_PC_PARTITION_TYPE_MINIX:
|
||||
case GRUB_PC_PARTITION_TYPE_LINUX_MINIX:
|
||||
case GRUB_PC_PARTITION_TYPE_EXT2FS:
|
||||
c = 3;
|
||||
break;
|
||||
case GRUB_PC_PARTITION_TYPE_LINUX_SWAP:
|
||||
c = 4;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (prefixescnt[c] == 0)
|
||||
grub_strcpy (name, prefixes[c]);
|
||||
else
|
||||
grub_snprintf (name, sizeof (name), "%s.%d", prefixes[c],
|
||||
prefixescnt[c]);
|
||||
prefixescnt[c]++;
|
||||
if (grub_extend_alloc (pmapptr + grub_strlen (name) + 1,
|
||||
&pmapalloc, (void **) &pmap))
|
||||
return 1;
|
||||
grub_strcpy (pmap + pmapptr, name);
|
||||
pmapptr += grub_strlen (name);
|
||||
}
|
||||
pend = pmapptr;
|
||||
if (grub_extend_alloc (pmapptr + 2 + 25 + 5 + 25, &pmapalloc,
|
||||
(void **) &pmap))
|
||||
return 1;
|
||||
pmap[pmapptr++] = ' ';
|
||||
grub_snprintf (pmap + pmapptr, 25 + 5 + 25,
|
||||
"%" PRIuGRUB_UINT64_T " %" PRIuGRUB_UINT64_T,
|
||||
grub_partition_get_start (partition),
|
||||
grub_partition_get_start (partition)
|
||||
+ grub_partition_get_len (partition));
|
||||
if (file_disk && grub_partition_get_start (partition)
|
||||
== grub_partition_get_start (file->device->disk->partition)
|
||||
&& grub_partition_get_len (partition)
|
||||
== grub_partition_get_len (file->device->disk->partition))
|
||||
{
|
||||
grub_free (bootpart);
|
||||
bootpart = grub_strndup (pmap + pstart, pend - pstart);
|
||||
}
|
||||
|
||||
pmapptr += grub_strlen (pmap + pmapptr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
auto int fill_disk (const char *name);
|
||||
int fill_disk (const char *name)
|
||||
{
|
||||
grub_device_t dev;
|
||||
char *plan9name = NULL;
|
||||
unsigned i;
|
||||
int file_disk = 0;
|
||||
|
||||
dev = grub_device_open (name);
|
||||
if (!dev)
|
||||
{
|
||||
grub_print_error ();
|
||||
return 0;
|
||||
}
|
||||
if (!dev->disk)
|
||||
{
|
||||
grub_device_close (dev);
|
||||
return 0;
|
||||
}
|
||||
file_disk = file->device->disk && dev->disk->id == file->device->disk->id
|
||||
&& dev->disk->dev->id == file->device->disk->dev->id;
|
||||
for (i = 0; ctxt->state[0].args && ctxt->state[0].args[i]; i++)
|
||||
if (grub_strncmp (name, ctxt->state[0].args[i], grub_strlen (name)) == 0
|
||||
&& ctxt->state[0].args[i][grub_strlen (name)] == '=')
|
||||
break;
|
||||
if (ctxt->state[0].args && ctxt->state[0].args[i])
|
||||
plan9name = grub_strdup (ctxt->state[0].args[i] + grub_strlen (name) + 1);
|
||||
else
|
||||
switch (dev->disk->dev->id)
|
||||
{
|
||||
case GRUB_DISK_DEVICE_BIOSDISK_ID:
|
||||
if (dev->disk->id & 0x80)
|
||||
plan9name = grub_xasprintf ("sdB%u",
|
||||
(unsigned) (dev->disk->id & 0x7f));
|
||||
else
|
||||
plan9name = grub_xasprintf ("fd%u",
|
||||
(unsigned) (dev->disk->id & 0x7f));
|
||||
break;
|
||||
/* Shouldn't happen as Plan9 doesn't work on these platforms. */
|
||||
case GRUB_DISK_DEVICE_OFDISK_ID:
|
||||
case GRUB_DISK_DEVICE_EFIDISK_ID:
|
||||
|
||||
/* Plan9 doesn't see those. */
|
||||
default:
|
||||
|
||||
/* Not sure how to handle those. */
|
||||
case GRUB_DISK_DEVICE_PXE_ID:
|
||||
case GRUB_DISK_DEVICE_NAND_ID:
|
||||
if (!file_disk)
|
||||
{
|
||||
grub_device_close (dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* if it's the disk the kernel is loaded from we need to name
|
||||
it nevertheless. */
|
||||
plan9name = grub_strdup ("sdZ0");
|
||||
break;
|
||||
|
||||
case GRUB_DISK_DEVICE_ATA_ID:
|
||||
{
|
||||
int unit;
|
||||
if (grub_strlen (dev->disk->name) < sizeof ("ata0") - 1)
|
||||
unit = 0;
|
||||
else
|
||||
unit = grub_strtoul (dev->disk->name + sizeof ("ata0") - 1, 0, 0);
|
||||
plan9name = grub_xasprintf ("sd%c%d", 'C' + unit / 2, unit % 2);
|
||||
}
|
||||
break;
|
||||
case GRUB_DISK_DEVICE_SCSI_ID:
|
||||
if (((dev->disk->id >> GRUB_SCSI_ID_SUBSYSTEM_SHIFT) & 0xff)
|
||||
== GRUB_SCSI_SUBSYSTEM_PATA)
|
||||
{
|
||||
int unit;
|
||||
if (grub_strlen (dev->disk->name) < sizeof ("ata0") - 1)
|
||||
unit = 0;
|
||||
else
|
||||
unit = grub_strtoul (dev->disk->name + sizeof ("ata0") - 1,
|
||||
0, 0);
|
||||
plan9name = grub_xasprintf ("sd%c%d", 'C' + unit / 2, unit % 2);
|
||||
break;
|
||||
}
|
||||
|
||||
/* FIXME: how does Plan9 number controllers?
|
||||
We probably need save the SCSI devices and sort them */
|
||||
plan9name
|
||||
= grub_xasprintf ("sd0%u", (unsigned)
|
||||
((dev->disk->id >> GRUB_SCSI_ID_BUS_SHIFT)
|
||||
& 0xf));
|
||||
break;
|
||||
}
|
||||
if (!plan9name)
|
||||
{
|
||||
grub_print_error ();
|
||||
return 0;
|
||||
}
|
||||
if (grub_extend_alloc (pmapptr + grub_strlen (plan9name)
|
||||
+ sizeof ("part="), &pmapalloc,
|
||||
(void **) &pmap))
|
||||
{
|
||||
grub_free (plan9name);
|
||||
return 1;
|
||||
}
|
||||
grub_strcpy (pmap + pmapptr, plan9name);
|
||||
pmapptr += grub_strlen (plan9name);
|
||||
if (!file_disk)
|
||||
grub_free (plan9name);
|
||||
else
|
||||
{
|
||||
grub_free (bootdisk);
|
||||
bootdisk = plan9name;
|
||||
}
|
||||
grub_strcpy (pmap + pmapptr, "part=");
|
||||
pmapptr += sizeof ("part=") - 1;
|
||||
|
||||
noslash = 1;
|
||||
grub_memset (prefixescnt, 0, sizeof (prefixescnt));
|
||||
if (grub_partition_iterate (dev->disk, fill_partition))
|
||||
return 1;
|
||||
if (grub_extend_alloc (pmapptr + 1, &pmapalloc, (void **) &pmap))
|
||||
return 1;
|
||||
pmap[pmapptr++] = '\n';
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (argc == 0)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
|
||||
|
||||
grub_dl_ref (my_mod);
|
||||
|
||||
rel = grub_relocator_new ();
|
||||
if (!rel)
|
||||
goto fail;
|
||||
|
||||
file = grub_file_open (argv[0]);
|
||||
if (! file)
|
||||
goto fail;
|
||||
|
||||
pmap = grub_malloc (pmapalloc);
|
||||
if (!pmap)
|
||||
goto fail;
|
||||
|
||||
if (grub_disk_dev_iterate (fill_disk))
|
||||
goto fail;
|
||||
|
||||
if (grub_extend_alloc (pmapptr + 1, &pmapalloc,
|
||||
(void **) &pmap))
|
||||
goto fail;
|
||||
pmap[pmapptr] = 0;
|
||||
|
||||
{
|
||||
char *file_name = grub_strchr (argv[0], ')');
|
||||
if (file_name)
|
||||
file_name++;
|
||||
else
|
||||
file_name = argv[0];
|
||||
if (*file_name)
|
||||
file_name++;
|
||||
|
||||
if (bootpart)
|
||||
bootpath = grub_xasprintf ("%s!%s!%s", bootdisk, bootpart, file_name);
|
||||
else
|
||||
bootpath = grub_xasprintf ("%s!%s", bootdisk, file_name);
|
||||
grub_free (bootdisk);
|
||||
grub_free (bootpart);
|
||||
}
|
||||
if (!bootpath)
|
||||
goto fail;
|
||||
|
||||
if (grub_file_read (file, &hdr, sizeof (hdr)) != (grub_ssize_t) sizeof (hdr))
|
||||
goto fail;
|
||||
|
||||
if (grub_be_to_cpu32 (hdr.magic) != GRUB_PLAN9_MAGIC
|
||||
|| hdr.zero)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_OS, "unsupported Plan9");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
memsize = ALIGN_UP (grub_be_to_cpu32 (hdr.text_size) + sizeof (hdr),
|
||||
GRUB_PLAN9_ALIGN);
|
||||
memsize += ALIGN_UP (grub_be_to_cpu32 (hdr.data_size), GRUB_PLAN9_ALIGN);
|
||||
memsize += ALIGN_UP(grub_be_to_cpu32 (hdr.bss_size), GRUB_PLAN9_ALIGN);
|
||||
eip = grub_be_to_cpu32 (hdr.entry_addr) & 0xfffffff;
|
||||
|
||||
/* path */
|
||||
configsize = GRUB_PLAN9_CONFIG_PATH_SIZE;
|
||||
/* magic */
|
||||
configsize += sizeof (GRUB_PLAN9_CONFIG_MAGIC) - 1;
|
||||
{
|
||||
int i;
|
||||
for (i = 1; i < argc; i++)
|
||||
configsize += grub_strlen (argv[i]) + 1;
|
||||
}
|
||||
configsize += (sizeof ("bootfile=") - 1) + grub_strlen (bootpath) + 1;
|
||||
configsize += pmapptr;
|
||||
/* Terminating \0. */
|
||||
configsize++;
|
||||
|
||||
{
|
||||
grub_relocator_chunk_t ch;
|
||||
grub_err_t err;
|
||||
err = grub_relocator_alloc_chunk_addr (rel, &ch, GRUB_PLAN9_CONFIG_ADDR,
|
||||
configsize);
|
||||
if (err)
|
||||
goto fail;
|
||||
config = get_virtual_current_address (ch);
|
||||
}
|
||||
|
||||
grub_memset (config, 0, GRUB_PLAN9_CONFIG_PATH_SIZE);
|
||||
grub_strncpy (config, bootpath, GRUB_PLAN9_CONFIG_PATH_SIZE - 1);
|
||||
|
||||
configptr = config + GRUB_PLAN9_CONFIG_PATH_SIZE;
|
||||
grub_memcpy (configptr, GRUB_PLAN9_CONFIG_MAGIC,
|
||||
sizeof (GRUB_PLAN9_CONFIG_MAGIC) - 1);
|
||||
configptr += sizeof (GRUB_PLAN9_CONFIG_MAGIC) - 1;
|
||||
configptr = grub_stpcpy (configptr, "bootfile=");
|
||||
configptr = grub_stpcpy (configptr, bootpath);
|
||||
*configptr++ = '\n';
|
||||
{
|
||||
int i;
|
||||
for (i = 1; i < argc; i++)
|
||||
{
|
||||
configptr = grub_stpcpy (configptr, argv[i]);
|
||||
*configptr++ = '\n';
|
||||
}
|
||||
}
|
||||
configptr = grub_stpcpy (configptr, pmap);
|
||||
|
||||
{
|
||||
grub_relocator_chunk_t ch;
|
||||
grub_err_t err;
|
||||
|
||||
err = grub_relocator_alloc_chunk_addr (rel, &ch, GRUB_PLAN9_TARGET,
|
||||
memsize);
|
||||
if (err)
|
||||
goto fail;
|
||||
mem = get_virtual_current_address (ch);
|
||||
}
|
||||
|
||||
{
|
||||
grub_uint8_t *ptr;
|
||||
ptr = mem;
|
||||
grub_memcpy (ptr, &hdr, sizeof (hdr));
|
||||
ptr += sizeof (hdr);
|
||||
|
||||
if (grub_file_read (file, ptr, grub_be_to_cpu32 (hdr.text_size))
|
||||
!= (grub_ssize_t) grub_be_to_cpu32 (hdr.text_size))
|
||||
goto fail;
|
||||
ptr += grub_be_to_cpu32 (hdr.text_size);
|
||||
padsize = ALIGN_UP (grub_be_to_cpu32 (hdr.text_size) + sizeof (hdr),
|
||||
GRUB_PLAN9_ALIGN) - grub_be_to_cpu32 (hdr.text_size)
|
||||
- sizeof (hdr);
|
||||
|
||||
grub_memset (ptr, 0, padsize);
|
||||
ptr += padsize;
|
||||
|
||||
if (grub_file_read (file, ptr, grub_be_to_cpu32 (hdr.data_size))
|
||||
!= (grub_ssize_t) grub_be_to_cpu32 (hdr.data_size))
|
||||
goto fail;
|
||||
ptr += grub_be_to_cpu32 (hdr.data_size);
|
||||
padsize = ALIGN_UP (grub_be_to_cpu32 (hdr.data_size), GRUB_PLAN9_ALIGN)
|
||||
- grub_be_to_cpu32 (hdr.data_size);
|
||||
|
||||
grub_memset (ptr, 0, padsize);
|
||||
ptr += padsize;
|
||||
grub_memset (ptr, 0, ALIGN_UP(grub_be_to_cpu32 (hdr.bss_size),
|
||||
GRUB_PLAN9_ALIGN));
|
||||
}
|
||||
grub_loader_set (grub_plan9_boot, grub_plan9_unload, 1);
|
||||
return GRUB_ERR_NONE;
|
||||
|
||||
fail:
|
||||
grub_free (pmap);
|
||||
|
||||
if (file)
|
||||
grub_file_close (file);
|
||||
|
||||
grub_plan9_unload ();
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
static grub_extcmd_t cmd;
|
||||
|
||||
GRUB_MOD_INIT(plan9)
|
||||
{
|
||||
cmd = grub_register_extcmd ("plan9", grub_cmd_plan9,
|
||||
GRUB_COMMAND_OPTIONS_AT_START,
|
||||
N_("KERNEL ARGS"), N_("Load Plan9 kernel."),
|
||||
options);
|
||||
my_mod = mod;
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(plan9)
|
||||
{
|
||||
grub_unregister_extcmd (cmd);
|
||||
}
|
|
@ -49,7 +49,7 @@ struct tbl_alias
|
|||
char *name;
|
||||
};
|
||||
|
||||
struct tbl_alias table_aliases[] =
|
||||
static struct tbl_alias table_aliases[] =
|
||||
{
|
||||
{GRUB_EFI_ACPI_20_TABLE_GUID, "ACPI_20"},
|
||||
{GRUB_EFI_ACPI_TABLE_GUID, "ACPI"},
|
||||
|
@ -219,7 +219,7 @@ struct property_descriptor
|
|||
void *data;
|
||||
};
|
||||
|
||||
struct grub_xnu_devprop_device_descriptor *devices = 0;
|
||||
static struct grub_xnu_devprop_device_descriptor *devices = 0;
|
||||
|
||||
grub_err_t
|
||||
grub_xnu_devprop_remove_property (struct grub_xnu_devprop_device_descriptor *dev,
|
||||
|
@ -452,11 +452,11 @@ grub_cpu_xnu_fill_devprop (void)
|
|||
}
|
||||
|
||||
devprop = grub_xnu_create_value (&(efikey->first_child), "device-properties");
|
||||
if (devprop)
|
||||
{
|
||||
devprop->data = grub_malloc (total_length);
|
||||
devprop->datasize = total_length;
|
||||
}
|
||||
if (!devprop)
|
||||
return grub_errno;
|
||||
|
||||
devprop->data = grub_malloc (total_length);
|
||||
devprop->datasize = total_length;
|
||||
|
||||
ptr = devprop->data;
|
||||
head = ptr;
|
||||
|
@ -700,7 +700,7 @@ grub_cpu_xnu_fill_devicetree (void)
|
|||
return grub_errno;
|
||||
|
||||
/* First see if user supplies the value. */
|
||||
char *fsbvar = grub_env_get ("fsb");
|
||||
const char *fsbvar = grub_env_get ("fsb");
|
||||
if (! fsbvar)
|
||||
*((grub_uint64_t *) curval->data) = 0;
|
||||
else
|
||||
|
@ -951,10 +951,11 @@ grub_err_t
|
|||
grub_xnu_boot (void)
|
||||
{
|
||||
struct grub_xnu_boot_params *bootparams;
|
||||
void *bp_in;
|
||||
grub_addr_t bootparams_target;
|
||||
grub_err_t err;
|
||||
grub_efi_uintn_t memory_map_size = 0;
|
||||
grub_efi_memory_descriptor_t *memory_map;
|
||||
void *memory_map;
|
||||
grub_addr_t memory_map_target;
|
||||
grub_efi_uintn_t map_key = 0;
|
||||
grub_efi_uintn_t descriptor_size = 0;
|
||||
|
@ -1006,9 +1007,10 @@ grub_xnu_boot (void)
|
|||
|
||||
/* Relocate the boot parameters to heap. */
|
||||
err = grub_xnu_heap_malloc (sizeof (*bootparams),
|
||||
(void **) &bootparams, &bootparams_target);
|
||||
&bp_in, &bootparams_target);
|
||||
if (err)
|
||||
return err;
|
||||
bootparams = bp_in;
|
||||
|
||||
/* Set video. */
|
||||
err = grub_xnu_set_video (bootparams);
|
||||
|
@ -1016,7 +1018,7 @@ grub_xnu_boot (void)
|
|||
{
|
||||
grub_print_error ();
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
grub_printf ("Booting in blind mode\n");
|
||||
grub_puts_ (N_("Booting in blind mode"));
|
||||
|
||||
bootparams->lfb_mode = 0;
|
||||
bootparams->lfb_width = 0;
|
||||
|
@ -1035,7 +1037,7 @@ grub_xnu_boot (void)
|
|||
memory map growth. */
|
||||
memory_map_size += 20 * descriptor_size;
|
||||
err = grub_xnu_heap_malloc (memory_map_size,
|
||||
(void **) &memory_map, &memory_map_target);
|
||||
&memory_map, &memory_map_target);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
@ -1109,7 +1111,7 @@ grub_xnu_boot (void)
|
|||
grub_xnu_arg1 = bootparams_target;
|
||||
|
||||
grub_autoefi_set_virtual_address_map (memory_map_size, descriptor_size,
|
||||
descriptor_version,memory_map);
|
||||
descriptor_version, memory_map);
|
||||
|
||||
state.eip = grub_xnu_entry_point;
|
||||
state.eax = grub_xnu_arg1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue