2005-07-12 Hollis Blanchard <hollis@penguinppc.org>
* disk/powerpc/ieee1275/ofdisk.c (grub_ofdisk_open): dprintf the device path and resulting ihandle. (grub_ofdisk_close): dprintf the ihandle being closed. (grub_ofdisk_read): dprintf function parameters. * kern/mm.c (grub_mm_init_region): Likewise. * loader/powerpc/ieee1275/linux.c: Remove extra whitespace. (grub_linux_boot): dprintf the Linux entry point, initrd address and size, and boot arguments. (grub_rescue_cmd_linux): dprintf each ELF segment's address and size before loading into memory. (grub_rescue_cmd_initrd): dprintf the initrd's address and size before loading into memory.
This commit is contained in:
hollisb
parent
7ef504d8e0
commit
09f9923fbb
7 changed files with 145 additions and 138 deletions
|
|
@ -48,11 +48,17 @@ grub_linux_boot (void)
|
|||
{
|
||||
kernel_entry_t linuxmain;
|
||||
grub_size_t actual;
|
||||
|
||||
|
||||
/* Set the command line arguments. */
|
||||
grub_ieee1275_set_property (grub_ieee1275_chosen, "bootargs", linux_args,
|
||||
grub_strlen (linux_args) + 1, &actual);
|
||||
|
||||
|
||||
grub_dprintf ("loader", "Entry point: 0x%x\n", linux_addr);
|
||||
grub_dprintf ("loader", "Initrd at: 0x%x, size 0x%x\n", initrd_addr,
|
||||
initrd_size);
|
||||
grub_dprintf ("loader", "Boot arguments: %s\n", linux_args);
|
||||
grub_dprintf ("loader", "Jumping to Linux...\n");
|
||||
|
||||
/* Boot the kernel. */
|
||||
linuxmain = (kernel_entry_t) linux_addr;
|
||||
linuxmain ((void *) initrd_addr, initrd_size, grub_ieee1275_entry_fn, 0, 0);
|
||||
|
|
@ -65,16 +71,16 @@ grub_linux_release_mem (void)
|
|||
{
|
||||
grub_free (linux_args);
|
||||
linux_args = 0;
|
||||
|
||||
|
||||
if (linux_addr && grub_ieee1275_release (linux_addr, linux_size))
|
||||
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Can not release memory");
|
||||
|
||||
|
||||
if (initrd_addr && grub_ieee1275_release (initrd_addr, initrd_size))
|
||||
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Can not release memory");
|
||||
|
||||
|
||||
linux_addr = 0;
|
||||
initrd_addr = 0;
|
||||
|
||||
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
|
@ -82,12 +88,12 @@ static grub_err_t
|
|||
grub_linux_unload (void)
|
||||
{
|
||||
grub_err_t err;
|
||||
|
||||
|
||||
err = grub_linux_release_mem ();
|
||||
grub_dl_unref (my_mod);
|
||||
|
||||
|
||||
loaded = 0;
|
||||
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
@ -97,12 +103,12 @@ grub_rescue_cmd_linux (int argc, char *argv[])
|
|||
grub_file_t file = 0;
|
||||
Elf32_Ehdr ehdr;
|
||||
Elf32_Phdr *phdrs = 0;
|
||||
int i;
|
||||
int i;
|
||||
int offset = 0;
|
||||
grub_addr_t entry;
|
||||
int found_addr = 0;
|
||||
int size;
|
||||
|
||||
|
||||
grub_dl_ref (my_mod);
|
||||
|
||||
if (argc == 0)
|
||||
|
|
@ -110,23 +116,23 @@ grub_rescue_cmd_linux (int argc, char *argv[])
|
|||
grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
||||
file = grub_file_open (argv[0]);
|
||||
if (! file)
|
||||
goto fail;
|
||||
|
||||
|
||||
if (grub_file_read (file, (char *) &ehdr, sizeof (ehdr)) != sizeof (ehdr))
|
||||
{
|
||||
grub_error (GRUB_ERR_READ_ERROR, "cannot read the linux elf header");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
||||
if (grub_dl_check_header (&ehdr, sizeof(ehdr)))
|
||||
{
|
||||
grub_error (GRUB_ERR_UNKNOWN_OS, "No valid ELF header found");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
||||
if (ehdr.e_type != ET_EXEC)
|
||||
{
|
||||
grub_error (GRUB_ERR_UNKNOWN_OS,
|
||||
|
|
@ -146,10 +152,10 @@ grub_rescue_cmd_linux (int argc, char *argv[])
|
|||
|
||||
phdrs = (Elf32_Phdr *) grub_malloc (ehdr.e_phnum * ehdr.e_phentsize);
|
||||
grub_file_read (file, (void *) phdrs, ehdr.e_phnum * ehdr.e_phentsize);
|
||||
|
||||
|
||||
/* Release the previously used memory. */
|
||||
grub_loader_unset ();
|
||||
|
||||
|
||||
/* Determine the amount of memory that is required. */
|
||||
linux_size = 0;
|
||||
for (i = 0; i < ehdr.e_phnum; i++)
|
||||
|
|
@ -158,10 +164,10 @@ grub_rescue_cmd_linux (int argc, char *argv[])
|
|||
/* XXX: Is this calculation correct? */
|
||||
linux_size += phdr->p_memsz + phdr->p_filesz;
|
||||
}
|
||||
|
||||
|
||||
/* Reserve memory for the kernel. */
|
||||
linux_size += 0x100000;
|
||||
|
||||
|
||||
/* For some vmlinux kernels the address set above won't work. Just
|
||||
try some other addresses just like yaboot does. */
|
||||
for (linux_addr = entry; linux_addr < entry + 200 * 0x100000; linux_addr += 0x100000)
|
||||
|
|
@ -177,7 +183,7 @@ grub_rescue_cmd_linux (int argc, char *argv[])
|
|||
goto fail;
|
||||
}
|
||||
entry = linux_addr;
|
||||
|
||||
|
||||
/* Load every loadable segment in memory. */
|
||||
for (i = 0; i < ehdr.e_phnum; i++)
|
||||
{
|
||||
|
|
@ -185,43 +191,48 @@ grub_rescue_cmd_linux (int argc, char *argv[])
|
|||
|
||||
if (phdr->p_type == PT_LOAD)
|
||||
{
|
||||
void *segment_addr = ((char *) entry) + offset;
|
||||
|
||||
if (grub_file_seek (file, phdr->p_offset) == -1)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_OS, "Invalid offset in program header");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (grub_file_read (file, (void *) (((char *) entry) + offset) , phdr->p_filesz)
|
||||
|
||||
grub_dprintf ("loader", "Loading segment %d at %p, size 0x%x\n", i,
|
||||
segment_addr, phdr->p_filesz);
|
||||
|
||||
if (grub_file_read (file, segment_addr, phdr->p_filesz)
|
||||
!= (grub_ssize_t) phdr->p_filesz)
|
||||
goto fail;
|
||||
|
||||
|
||||
if (phdr->p_filesz < phdr->p_memsz)
|
||||
grub_memset ((char *) (((char *) entry) + offset) + phdr->p_filesz, 0,
|
||||
grub_memset ((char *) (((char *) entry) + offset) + phdr->p_filesz, 0,
|
||||
phdr->p_memsz - phdr->p_filesz);
|
||||
|
||||
offset += phdr->p_filesz;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
size = 0;
|
||||
for (i = 0; i < argc; i++)
|
||||
size += grub_strlen (argv[i]);
|
||||
|
||||
|
||||
linux_args = grub_malloc (size + argc + 1);
|
||||
if (!linux_args)
|
||||
goto fail;
|
||||
|
||||
|
||||
for (i = 1; i < argc; i++)
|
||||
{
|
||||
grub_strcat (linux_args, argv[i]);
|
||||
grub_strcat (linux_args, " ");
|
||||
}
|
||||
|
||||
|
||||
fail:
|
||||
|
||||
if (file)
|
||||
grub_file_close (file);
|
||||
|
||||
|
||||
grub_free (phdrs);
|
||||
|
||||
if (grub_errno != GRUB_ERR_NONE)
|
||||
|
|
@ -236,7 +247,7 @@ grub_rescue_cmd_linux (int argc, char *argv[])
|
|||
initrd_addr = 0;
|
||||
loaded = 1;
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -246,13 +257,13 @@ grub_rescue_cmd_initrd (int argc, char *argv[])
|
|||
grub_file_t file = 0;
|
||||
grub_ssize_t size;
|
||||
grub_addr_t addr;
|
||||
|
||||
|
||||
if (argc == 0)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
||||
if (!loaded)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
|
||||
|
|
@ -262,26 +273,28 @@ grub_rescue_cmd_initrd (int argc, char *argv[])
|
|||
file = grub_file_open (argv[0]);
|
||||
if (! file)
|
||||
goto fail;
|
||||
|
||||
|
||||
addr = linux_addr + linux_size;
|
||||
size = grub_file_size (file);
|
||||
|
||||
|
||||
if (grub_claimmap (addr, size) == -1)
|
||||
{
|
||||
grub_error (GRUB_ERR_OUT_OF_MEMORY, "Can not claim memory");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
||||
grub_dprintf ("loader", "Loading initrd at 0x%x, size 0x%x\n", addr, size);
|
||||
|
||||
if (grub_file_read (file, (void *) addr, size) != size)
|
||||
{
|
||||
grub_ieee1275_release (addr, size);
|
||||
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
||||
initrd_addr = addr;
|
||||
initrd_size = size;
|
||||
|
||||
|
||||
fail:
|
||||
if (file)
|
||||
grub_file_close (file);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue