[PULL] efi patch queue 2017-07-29

Message ID 20170728223102.65450-1-agraf@suse.de
State New
Headers show

Pull-request

git://github.com/agraf/u-boot.git tags/signed-efi-next

Message

Alexander Graf July 28, 2017, 10:31 p.m.
Hi Tom,

This is my current patch queue for efi.  Please pull.

Alex


The following changes since commit 8d3a25685e4aac7070365a2b3c53c2c81b27930f:

  Merge git://git.denx.de/u-boot-dm (2017-07-11 20:28:46 -0400)

are available in the git repository at:

  git://github.com/agraf/u-boot.git tags/signed-efi-next

for you to fetch changes up to af65db85b82b161f037e0889ae58bf461217b3f1:

  efi_loader: indent entry/exit prints to show nesting level (2017-07-29 00:18:46 +0200)

----------------------------------------------------------------
Patch queue for efi - 2017-07-29

A lot of EFI greatness this time around. Thanks a lot to the
two amazing new contributors

  Heinrich Schuchardt and
  Rob Clark

we now gain

  - stable objects across multiple bootefi invocations
  - fixes for shim
  - fixes for ipxe
  - protocol installation
  - device path conversion to/from text
  - working "lsefi" support in grub
  - working notifiers
  - various bug fixes

----------------------------------------------------------------
Alexander Graf (2):
      efi_loader: Improve install_configuration_table
      efi_loader: Fix configuration table override

Heinrich Schuchardt (1):
      efi_loader: initalize EFI object list only once

Rob Clark (15):
      efi_loader: EFI file paths should be DOS style
      efi_loader: move guidcmp to header
      efi_loader: gop: fixes for CONFIG_DM_VIDEO without CONFIG_LCD
      efi_loader: workaround for grub lsefi bug
      efi_loader: log EFI return values too
      efi_loader: add helper macro to construct protocol objects
      efi_loader: expose protocols via GUID
      efi_loader: remove double EFI_EXIT() with efi_unsupported
      efi_loader: remove more double EFI_EXIT() in efi_disk.c
      efi_loader: fix bug in efi_get_memory_map
      efi_loader: add some missing breaks
      efi_loader: only evaluate EFI_EXIT()'s ret once
      efi_loader: Add an EFI_CALL() macro
      efi_loader: add checking for incorrect use of EFI_ENTRY/EXIT
      efi_loader: indent entry/exit prints to show nesting level

xypron.glpk@gmx.de (30):
      efi_loader: refactor efi_open_protocol
      efi_loader: efi_open_protocol: parameter checks
      efi_loader: implement InstallProtocolInterface
      efi_loader: implement UninstallProtocolInterface
      efi_loader: refactor efi_install_protocol_interface
      efi_loader: refactor efi_uninstall_protocol_interface
      efi_loader: implement InstallMultipleProtocolInterfaces
      efi_loader: refactor efi_locate_handle
      efi_loader: implement LocateHandleBuffer
      efi_loader: provide a sufficient number of protocols
      efi_loader: reimplement efi_locate_protocol
      efi_loader: implement EFI_DEVICE_PATH_TO_TEXT_PROTOCOL
      bootefi: allow return without EFI_BOOT_SERVICES.Exit
      efi_loader: define all known status codes
      efi_loader: provide meaningful status code
      efi_loader: disk: iterate only over valid block devices
      efi_memory: avoid NULL dereference in efi_free_pool
      efi_loader: use struct efi_event * instead of void *
      efi_loader: implement multiple event support
      efi_loader: correct size for tpl level
      efi_loader: refactor efi_create_event
      efi_loader: refactor efi_set_timer
      efi_console: set up events
      efi_loader: correctly implement 100ns conversion
      efi_memory: do parameter checks first
      efi_memory: return MapKey
      efi_loader: implement ConvertDeviceNodeToText
      efi_console: use EFIAPI for callback functions
      efi_loader: parameter types for CreateEvent, SetTimer
      efi_loader: implement ProtocolsPerHandle

 cmd/bootefi.c                            | 135 +++---
 include/efi.h                            |  50 ++-
 include/efi_api.h                        |  86 +++-
 include/efi_loader.h                     | 125 ++++--
 lib/efi_loader/Makefile                  |   3 +-
 lib/efi_loader/efi_boottime.c            | 706 +++++++++++++++++++++++++------
 lib/efi_loader/efi_console.c             |  55 ++-
 lib/efi_loader/efi_device_path_to_text.c | 130 ++++++
 lib/efi_loader/efi_disk.c                |  39 +-
 lib/efi_loader/efi_gop.c                 |   9 +-
 lib/efi_loader/efi_image_loader.c        |   8 -
 lib/efi_loader/efi_memory.c              |  11 +-
 lib/efi_loader/efi_net.c                 |  30 +-
 13 files changed, 1057 insertions(+), 330 deletions(-)
 create mode 100644 lib/efi_loader/efi_device_path_to_text.c

Comments

Mark Kettenis July 29, 2017, 4:34 p.m. | #1
> From: Tom Rini <trini@konsulko.com>
> Date: Sat, 29 Jul 2017 11:43:21 -0400
> 
> Otherwise we get a warning about assignment about making a pointer from
> int without a cast.

That (uintptr_t *) cast makes no sense.  Either leave the member as a
"void *" and use a (void *) cast, or change it to uintptr_t and use a
(uintptr_t) cast.

Cheers,

Mark

> Cc: Alexander Graf <agraf@suse.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  lib/efi_loader/efi_gop.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
> index 806cfaeea181..bd7ccccb93ff 100644
> --- a/lib/efi_loader/efi_gop.c
> +++ b/lib/efi_loader/efi_gop.c
> @@ -131,7 +131,7 @@ int efi_gop_register(void)
>  	struct efi_gop_obj *gopobj;
>  	u32 bpix, col, row;
>  	u64 fb_base, fb_size;
> -	void *fb;
> +	uintptr_t *fb;
>  
>  #ifdef CONFIG_DM_VIDEO
>  	struct udevice *vdev;
> @@ -155,7 +155,7 @@ int efi_gop_register(void)
>  	row = panel_info.vl_row;
>  	fb_base = gd->fb_base;
>  	fb_size = lcd_get_size(&line_len);
> -	fb = gd->fb_base;
> +	fb = (uintptr_t *)gd->fb_base;
>  #endif
>  
>  	switch (bpix) {
> -- 
> 1.9.1
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
> 
>
Tom Rini July 31, 2017, 3:21 p.m. | #2
On Sat, Jul 29, 2017 at 12:31:02AM +0200, Alexander Graf wrote:

> Hi Tom,

> 

> This is my current patch queue for efi.  Please pull.

> 

> Alex

> 

> 

> The following changes since commit 8d3a25685e4aac7070365a2b3c53c2c81b27930f:

> 

>   Merge git://git.denx.de/u-boot-dm (2017-07-11 20:28:46 -0400)

> 

> are available in the git repository at:

> 

>   git://github.com/agraf/u-boot.git tags/signed-efi-next

> 

> for you to fetch changes up to af65db85b82b161f037e0889ae58bf461217b3f1:

> 

>   efi_loader: indent entry/exit prints to show nesting level (2017-07-29 00:18:46 +0200)

> 


Applied to u-boot/master, thanks!

-- 
Tom