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

* grub-core/loader/i386/linux.c (grub_linux_boot): Supply target rather

Browse source 
than source address for efi mmap buffer.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-25 16:58:25 +02:00
parent 723f63f2f8
commit 3c62402d08
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c (grub_linux_boot): Supply target rather
than source address for efi mmap buffer.
2011-04-25 Vladimir Serbinenko <phcoder@gmail.com> 2011-04-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/amiga.c (amiga_partition_map_iterate): Fix a * grub-core/partmap/amiga.c (amiga_partition_map_iterate): Fix a

10
grub-core/loader/i386/linux.c
View file

@ -549,6 +549,7 @@ grub_linux_boot (void)
#ifdef GRUB_MACHINE_EFI #ifdef GRUB_MACHINE_EFI
{ {
grub_efi_uintn_t efi_desc_size; grub_efi_uintn_t efi_desc_size;
grub_size_t efi_mmap_target;
grub_efi_uint32_t efi_desc_version; grub_efi_uint32_t efi_desc_version;
err = grub_efi_finish_boot_services (&efi_mmap_size, efi_mmap_buf, NULL, err = grub_efi_finish_boot_services (&efi_mmap_size, efi_mmap_buf, NULL,
&efi_desc_size, &efi_desc_version); &efi_desc_size, &efi_desc_version);
@ -556,23 +557,24 @@ grub_linux_boot (void)
return err; return err;
/* Note that no boot services are available from here. */ /* 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. */ /* Pass EFI parameters. */
if (grub_le_to_cpu16 (params->version) >= 0x0206) if (grub_le_to_cpu16 (params->version) >= 0x0206)
{ {
params->v0206.efi_mem_desc_size = efi_desc_size; params->v0206.efi_mem_desc_size = efi_desc_size;
params->v0206.efi_mem_desc_version = efi_desc_version; 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; params->v0206.efi_mmap_size = efi_mmap_size;
#ifdef __x86_64__ #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 #endif
} }
else if (grub_le_to_cpu16 (params->version) >= 0x0204) else if (grub_le_to_cpu16 (params->version) >= 0x0204)
{ {
params->v0204.efi_mem_desc_size = efi_desc_size; params->v0204.efi_mem_desc_size = efi_desc_size;
params->v0204.efi_mem_desc_version = efi_desc_version; 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; params->v0204.efi_mmap_size = efi_mmap_size;
} }
} }