Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 06:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: disk: install FILE_SYSTEM_PROTOCOL only if available

Browse source 
In the current implementation, EFI_SIMPLEFILE_SYSTEM_PROTOCOL is always
installed to all the partitions even if some of them may house no file
system.

With this patch, that protocol will be installed only if any file system
exists.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
AKASHI Takahiro 2019-10-07 14:59:38 +09:00 committed by Heinrich Schuchardt
parent b7cd95627b
commit 867400677c
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/efi_loader/efi_disk.c
View file

@ -9,6 +9,7 @@
#include <blk.h> #include <blk.h>
#include <dm.h> #include <dm.h>
#include <efi_loader.h> #include <efi_loader.h>
#include <fs.h>
#include <part.h> #include <part.h>
#include <malloc.h> #include <malloc.h>
@ -262,6 +263,27 @@ efi_fs_from_path(struct efi_device_path *full_path)
return handler->protocol_interface; return handler->protocol_interface;
} }
/**
* efi_fs_exists() - check if a partition bears a file system
*
* @desc: block device descriptor
* @part: partition number
* Return: 1 if a file system exists on the partition
* 0 otherwise
*/
static int efi_fs_exists(struct blk_desc *desc, int part)
{
if (fs_set_blk_dev_with_part(desc, part))
return 0;
if (fs_get_type() == FS_TYPE_ANY)
return 0;
fs_close();
return 1;
}
/* /*
* Create a handle for a partition or disk * Create a handle for a partition or disk
* *
@ -315,7 +337,7 @@ static efi_status_t efi_disk_add_dev(
diskobj->dp); diskobj->dp);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
return ret; return ret;
if (part >= 1) { if (part >= 1 && efi_fs_exists(desc, part)) {
diskobj->volume = efi_simple_file_system(desc, part, diskobj->volume = efi_simple_file_system(desc, part,
diskobj->dp); diskobj->dp);
ret = efi_add_protocol(&diskobj->header, ret = efi_add_protocol(&diskobj->header,