deceb3ecd3
* conf/i386-pc.rmk (kernel_img_SOURCES): Add `kern/i386/pc/mmap.c'.
* include/grub/i386/pc/init.h (GRUB_MACHINE_MEMORY_AVAILABLE)
(GRUB_MACHINE_MEMORY_RESERVED): New macros.
(grub_machine_mmap_iterate): New function declaration.
* include/grub/multiboot.h (struct grub_multiboot_mmap_entry): New
structure.
(GRUB_MMAP_MEMORY_AVAILABLE, GRUB_MMAP_MEMORY_RESERVED): New
macros.
* kern/i386/pc/init.c (grub_machine_init): Replace hardcoded region
type check value with `GRUB_MACHINE_MEMORY_AVAILABLE'.
Move e820 parsing from here ...
* kern/i386/pc/mmap.c: New file.
(grub_machine_mmap_iterate): ... to here.
* include/grub/i386/coreboot/memory.h: Remove `<grub/err.h>'.
(GRUB_LINUXBIOS_MEMORY_AVAILABLE): Rename (for consistency) to ...
(GRUB_MACHINE_MEMORY_AVAILABLE): ... this. Update all users.
(grub_available_iterate): Redeclare to return `void', and redeclare
its hook to use grub_uint64_t as addr and size parameters, and rename
to ...
(grub_machine_mmap_iterate): ... this. Update all users.
* kern/i386/coreboot/mmap.c (grub_mmap_iterate): Simplify parser loop
to make it more readable. Rename to ...
(grub_machine_mmap_iterate): ... this.
* loader/i386/pc/multiboot.c (mmap_addr, mmap_length): New variables.
(grub_get_multiboot_mmap_len, grub_fill_multiboot_mmap): New functions.
(grub_multiboot): Allocate an extra region after the payload, and fill
it with a Multiboot memory map. Adjust a.out loader to calculate size
with the extra space.
(grub_multiboot_load_elf32): Adjust elf32 loader to calculate size
with the extra space.
97 lines
2.9 KiB
C
97 lines
2.9 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2007,2008 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <grub/machine/memory.h>
|
|
#include <grub/types.h>
|
|
#include <grub/err.h>
|
|
#include <grub/misc.h>
|
|
|
|
static grub_err_t
|
|
grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t))
|
|
{
|
|
grub_linuxbios_table_header_t table_header;
|
|
grub_linuxbios_table_item_t table_item;
|
|
|
|
auto int check_signature (grub_linuxbios_table_header_t);
|
|
int check_signature (grub_linuxbios_table_header_t tbl_header)
|
|
{
|
|
if (! grub_memcmp (tbl_header->signature, "LBIO", 4))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Assuming table_header is aligned to its size (8 bytes). */
|
|
|
|
for (table_header = (grub_linuxbios_table_header_t) 0x500;
|
|
table_header < (grub_linuxbios_table_header_t) 0x1000; table_header++)
|
|
if (check_signature (table_header))
|
|
goto signature_found;
|
|
|
|
for (table_header = (grub_linuxbios_table_header_t) 0xf0000;
|
|
table_header < (grub_linuxbios_table_header_t) 0x100000; table_header++)
|
|
if (check_signature (table_header))
|
|
goto signature_found;
|
|
|
|
grub_fatal ("Could not find coreboot table\n");
|
|
|
|
signature_found:
|
|
|
|
table_item =
|
|
(grub_linuxbios_table_item_t) ((long) table_header +
|
|
(long) table_header->size);
|
|
for (; table_item->size;
|
|
table_item = (grub_linuxbios_table_item_t) ((long) table_item + (long) table_item->size))
|
|
if (hook (table_item))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
|
|
{
|
|
mem_region_t mem_region;
|
|
|
|
auto int iterate_linuxbios_table (grub_linuxbios_table_item_t);
|
|
int iterate_linuxbios_table (grub_linuxbios_table_item_t table_item)
|
|
{
|
|
if (table_item->tag != GRUB_LINUXBIOS_MEMBER_MEMORY)
|
|
return 0;
|
|
|
|
mem_region =
|
|
(mem_region_t) ((long) table_item +
|
|
sizeof (struct grub_linuxbios_table_item));
|
|
while ((long) mem_region < (long) table_item + (long) table_item->size)
|
|
{
|
|
if (hook (mem_region->addr, mem_region->size,
|
|
/* Multiboot mmaps match with the coreboot mmap definition.
|
|
Therefore, we can just pass type through. */
|
|
mem_region->type))
|
|
return 1;
|
|
|
|
mem_region++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
grub_linuxbios_table_iterate (iterate_linuxbios_table);
|
|
|
|
return 0;
|
|
}
|