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

* grub-core/kern/efi/mm.c (grub_efi_finish_boot_services):

Browse source 
Try terminating EFI services several times due to quirks in some
	implementations.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-26 11:34:56 +01:00
parent 33028f4c0b
commit e75fdee420
2 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-03-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/efi/mm.c (grub_efi_finish_boot_services):
Try terminating EFI services several times due to quirks in some
implementations.
2013-03-26 Colin Watson <cjwatson@ubuntu.com> 2013-03-26 Colin Watson <cjwatson@ubuntu.com>
* grub-core/commands/acpihalt.c (skip_ext_op): Add support for * grub-core/commands/acpihalt.c (skip_ext_op): Add support for

46
grub-core/kern/efi/mm.c
View file

@ -160,27 +160,41 @@ grub_efi_finish_boot_services (grub_efi_uintn_t *outbuf_size, void *outbuf,
apple, sizeof (apple)) == 0); apple, sizeof (apple)) == 0);
#endif #endif
if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key, while (1)
&finish_desc_size, &finish_desc_version) < 0) {
return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map"); if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
&finish_desc_size, &finish_desc_version) < 0)
return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
if (outbuf && *outbuf_size < finish_mmap_size) if (outbuf && *outbuf_size < finish_mmap_size)
return grub_error (GRUB_ERR_IO, "memory map buffer is too small"); return grub_error (GRUB_ERR_IO, "memory map buffer is too small");
finish_mmap_buf = grub_malloc (finish_mmap_size); finish_mmap_buf = grub_malloc (finish_mmap_size);
if (!finish_mmap_buf) if (!finish_mmap_buf)
return grub_errno; return grub_errno;
if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key, if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
&finish_desc_size, &finish_desc_version) <= 0) &finish_desc_size, &finish_desc_version) <= 0)
return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map"); {
grub_free (finish_mmap_buf);
return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
}
b = grub_efi_system_table->boot_services; b = grub_efi_system_table->boot_services;
status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle, status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle,
finish_key); finish_key);
if (status != GRUB_EFI_SUCCESS) if (status == GRUB_EFI_SUCCESS)
return grub_error (GRUB_ERR_IO, "couldn't terminate EFI services"); break;
if (status != GRUB_EFI_INVALID_PARAMETER)
{
grub_free (finish_mmap_buf);
return grub_error (GRUB_ERR_IO, "couldn't terminate EFI services");
}
grub_free (finish_mmap_buf);
grub_printf ("Trying to terminate EFI services again\n");
}
grub_efi_is_finished = 1; grub_efi_is_finished = 1;
if (outbuf_size) if (outbuf_size)
*outbuf_size = finish_mmap_size; *outbuf_size = finish_mmap_size;