vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

xnu: supply ramsize to the kernel.

Browse source 
Without this info recent kernels crash as they allocate no heap.
This commit is contained in:
Vladimir Serbinenko 2016-02-11 11:58:28 +01:00
parent 67dba97e45
commit 2d425ffdd5
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
grub-core/loader/i386/xnu.c
View file

@ -897,6 +897,28 @@ grub_xnu_set_video (struct grub_xnu_boot_params_common *params)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
static int
total_ram_hook (grub_uint64_t addr __attribute__ ((unused)), grub_uint64_t size,
grub_memory_type_t type,
void *data)
{
grub_uint64_t *result = data;
if (type != GRUB_MEMORY_AVAILABLE)
return 0;
*result += size;
return 0;
}
static grub_uint64_t
get_total_ram (void)
{
grub_uint64_t result = 0;
grub_mmap_iterate (total_ram_hook, &result);
return result;
}
/* Boot xnu. */ /* Boot xnu. */
grub_err_t grub_err_t
grub_xnu_boot (void) grub_xnu_boot (void)
@ -973,6 +995,7 @@ grub_xnu_boot (void)
{ {
bootparams_common = &bootparams->v2.common; bootparams_common = &bootparams->v2.common;
bootparams->v2.fsbfreq = fsbfreq; bootparams->v2.fsbfreq = fsbfreq;
bootparams->v2.ram_size = get_total_ram();
} }
else else
bootparams_common = &bootparams->v1.common; bootparams_common = &bootparams->v1.common;

3
include/grub/i386/xnu.h
View file

@ -89,7 +89,8 @@ struct grub_xnu_boot_params_v2
grub_uint64_t efi_runtime_first_page_virtual; grub_uint64_t efi_runtime_first_page_virtual;
grub_uint32_t efi_system_table; grub_uint32_t efi_system_table;
grub_uint32_t unused2[11]; grub_uint32_t unused2[9];
grub_uint64_t ram_size;
grub_uint64_t fsbfreq; grub_uint64_t fsbfreq;
grub_uint32_t unused3[734]; grub_uint32_t unused3[734];
} GRUB_PACKED; } GRUB_PACKED;