summaryrefslogtreecommitdiff
path: root/drivers/firmware/efi/libstub/gop.c
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2019-12-24 18:10:07 +0300
committerIngo Molnar <mingo@kernel.org>2019-12-25 12:49:16 +0300
commit2732ea0d5c0a67ec86bfbde2bd68b6152e23ec4e (patch)
tree46b819245ac67d0a279a10701fa2a5b784bbc29b /drivers/firmware/efi/libstub/gop.c
parenta8147dba75b188bff87d4ad072db84a0b70d716d (diff)
downloadlinux-2732ea0d5c0a67ec86bfbde2bd68b6152e23ec4e.tar.xz
efi/libstub: Use a helper to iterate over a EFI handle array
Iterating over a EFI handle array is a bit finicky, since we have to take mixed mode into account, where handles are only 32-bit while the native efi_handle_t type is 64-bit. So introduce a helper, and replace the various occurrences of this pattern. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Cc: Arvind Sankar <nivedita@alum.mit.edu> Cc: Borislav Petkov <bp@alien8.de> Cc: James Morse <james.morse@arm.com> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: https://lkml.kernel.org/r/20191224151025.32482-8-ardb@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/libstub/gop.c')
-rw-r--r--drivers/firmware/efi/libstub/gop.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c
index 94045ab7dd3d..5f4fbc2ac687 100644
--- a/drivers/firmware/efi/libstub/gop.c
+++ b/drivers/firmware/efi/libstub/gop.c
@@ -91,7 +91,6 @@ setup_gop(efi_system_table_t *sys_table_arg, struct screen_info *si,
efi_guid_t *proto, unsigned long size, void **handles)
{
efi_graphics_output_protocol_t *gop, *first_gop;
- unsigned long nr_gops;
u16 width, height;
u32 pixels_per_scan_line;
u32 ext_lfb_base;
@@ -99,22 +98,18 @@ setup_gop(efi_system_table_t *sys_table_arg, struct screen_info *si,
efi_pixel_bitmask_t pixel_info;
int pixel_format;
efi_status_t status;
+ efi_handle_t h;
int i;
- bool is64 = efi_is_64bit();
first_gop = NULL;
gop = NULL;
- nr_gops = size / (is64 ? sizeof(u64) : sizeof(u32));
- for (i = 0; i < nr_gops; i++) {
+ for_each_efi_handle(h, handles, size, i) {
efi_graphics_output_protocol_mode_t *mode;
efi_graphics_output_mode_info_t *info = NULL;
efi_guid_t conout_proto = EFI_CONSOLE_OUT_DEVICE_GUID;
bool conout_found = false;
void *dummy = NULL;
- efi_handle_t h = (efi_handle_t)(unsigned long)
- (is64 ? ((u64 *)handles)[i]
- : ((u32 *)handles)[i]);
efi_physical_addr_t current_fb_base;
status = efi_call_early(handle_protocol, h,