Re: [U-Boot] [PATCH v2] x86: use EFI calling convention for efi_main on x86_64

2018-05-31 Thread Ivan Gorinov 
On Thu, May 31, 2018 at 11:26:50AM +0300, Andy Shevchenko wrote:
> > Save efi_main() arguments in the startup code on x86_64;
> > use EFI calling convention for _relocate() on x86_64;
> > remove unused _relocate() arguments;
> > consistently use EFI calling convention for efi_main() everywhere.
> 
> I think it rather requires more explanation here what EFI calling
> convetion is and how it differs in _relloc() with changes you did.
> (Btw, the mail has no changelog provided)

Added in v3.

> > diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
> > index c828093..3eb8eeb 100644
> > --- a/lib/efi/efi_app.c
> > +++ b/lib/efi/efi_app.c
> > @@ -96,7 +96,8 @@ static void free_memory(struct efi_priv *priv)
> >   * U-Boot. If it returns, EFI will continue. Another way to get back to EFI
> >   * is via reset_cpu().
> >   */
> > -efi_status_t efi_main(efi_handle_t image, struct efi_system_table 
> > *sys_table)
> > +efi_status_t EFIAPI efi_main(efi_handle_t image,
> > +struct efi_system_table *sys_table)
> 
> Perhaps still leave at one line?

That one line would exceed the limit of 80 columns on a punch card.

> 
> >  {
> > struct efi_priv local_priv, *priv = _priv;
> > efi_status_t ret;
> > diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
> > index 3138739..399d16b 100644
> > --- a/lib/efi/efi_stub.c
> > +++ b/lib/efi/efi_stub.c
> > @@ -268,7 +268,8 @@ static void add_entry_addr(struct efi_priv *priv, enum 
> > efi_entry_t type,
> >   * This function is called by our EFI start-up code. It handles running
> >   * U-Boot. If it returns, EFI will continue.
> >   */
> > -efi_status_t efi_main(efi_handle_t image, struct efi_system_table 
> > *sys_table)
> > +efi_status_t EFIAPI efi_main(efi_handle_t image,
> > +struct efi_system_table *sys_table)
> 
> Ditto.
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH v2] x86: use EFI calling convention for efi_main on x86_64

2018-05-31 Thread Andy Shevchenko 
On Thu, May 31, 2018 at 1:31 AM, Ivan Gorinov  wrote:
> Save efi_main() arguments in the startup code on x86_64;
> use EFI calling convention for _relocate() on x86_64;
> remove unused _relocate() arguments;
> consistently use EFI calling convention for efi_main() everywhere.

I think it rather requires more explanation here what EFI calling
convetion is and how it differs in _relloc() with changes you did.
(Btw, the mail has no changelog provided)

>

One nit below, in any case FWIW,

Reviewed-by: Andy Shevchenko 

> Signed-off-by: Ivan Gorinov 
> ---
>  arch/x86/lib/crt0_x86_64_efi.S  | 21 ++---
>  arch/x86/lib/reloc_x86_64_efi.c |  3 +--
>  lib/efi/efi_app.c   |  3 ++-
>  lib/efi/efi_stub.c  |  3 ++-
>  4 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/arch/x86/lib/crt0_x86_64_efi.S b/arch/x86/lib/crt0_x86_64_efi.S
> index 989799f..3abb5e3 100644
> --- a/arch/x86/lib/crt0_x86_64_efi.S
> +++ b/arch/x86/lib/crt0_x86_64_efi.S
> @@ -3,7 +3,7 @@
>   * crt0-efi-x86_64.S - x86_64 EFI startup code.
>   * Copyright (C) 1999 Hewlett-Packard Co.
>   * Contributed by David Mosberger .
> - * Copyright (C) 2005 Intel Co.
> + * Copyright (C) 2005 Intel Corporation
>   * Contributed by Fenghua Yu .
>   *
>   * All rights reserved.
> @@ -14,26 +14,25 @@
> .globl _start
>  _start:
> subq $8, %rsp
> +
> pushq %rcx
> pushq %rdx
>
> -0:
> -   lea image_base(%rip), %rdi
> -   lea _DYNAMIC(%rip), %rsi
> +   lea image_base(%rip), %rcx
> +   lea _DYNAMIC(%rip), %rdx
>
> -   popq %rcx
> -   popq %rdx
> -   pushq %rcx
> -   pushq %rdx
> call _relocate
>
> -   popq %rdi
> -   popq %rsi
> +   popq %rdx
> +   popq %rcx
> +
> +   testq %rax, %rax
> +   jnz _exit
>
> call efi_main
> +_exit:
> addq $8, %rsp
>
> -.exit:
> ret
>
> /*
> diff --git a/arch/x86/lib/reloc_x86_64_efi.c b/arch/x86/lib/reloc_x86_64_efi.c
> index 34c5b2e..59d6f8d 100644
> --- a/arch/x86/lib/reloc_x86_64_efi.c
> +++ b/arch/x86/lib/reloc_x86_64_efi.c
> @@ -14,8 +14,7 @@
>  #include 
>  #include 
>
> -efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image,
> -  struct efi_system_table *systab)
> +efi_status_t EFIAPI _relocate(long ldbase, Elf64_Dyn *dyn)
>  {
> long relsz = 0, relent = 0;
> Elf64_Rel *rel = 0;
> diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
> index c828093..3eb8eeb 100644
> --- a/lib/efi/efi_app.c
> +++ b/lib/efi/efi_app.c
> @@ -96,7 +96,8 @@ static void free_memory(struct efi_priv *priv)
>   * U-Boot. If it returns, EFI will continue. Another way to get back to EFI
>   * is via reset_cpu().
>   */
> -efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table)
> +efi_status_t EFIAPI efi_main(efi_handle_t image,
> +struct efi_system_table *sys_table)

Perhaps still leave at one line?

>  {
> struct efi_priv local_priv, *priv = _priv;
> efi_status_t ret;
> diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
> index 3138739..399d16b 100644
> --- a/lib/efi/efi_stub.c
> +++ b/lib/efi/efi_stub.c
> @@ -268,7 +268,8 @@ static void add_entry_addr(struct efi_priv *priv, enum 
> efi_entry_t type,
>   * This function is called by our EFI start-up code. It handles running
>   * U-Boot. If it returns, EFI will continue.
>   */
> -efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table)
> +efi_status_t EFIAPI efi_main(efi_handle_t image,
> +struct efi_system_table *sys_table)

Ditto.

>  {
> struct efi_priv local_priv, *priv = _priv;
> struct efi_boot_services *boot = sys_table->boottime;
> --
> 2.7.4
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot



-- 
With Best Regards,
Andy Shevchenko
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH v2] x86: use EFI calling convention for efi_main on x86_64

2018-05-30 Thread Ivan Gorinov 
Save efi_main() arguments in the startup code on x86_64;
use EFI calling convention for _relocate() on x86_64;
remove unused _relocate() arguments;
consistently use EFI calling convention for efi_main() everywhere.

Signed-off-by: Ivan Gorinov 
---
 arch/x86/lib/crt0_x86_64_efi.S  | 21 ++---
 arch/x86/lib/reloc_x86_64_efi.c |  3 +--
 lib/efi/efi_app.c   |  3 ++-
 lib/efi/efi_stub.c  |  3 ++-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/x86/lib/crt0_x86_64_efi.S b/arch/x86/lib/crt0_x86_64_efi.S
index 989799f..3abb5e3 100644
--- a/arch/x86/lib/crt0_x86_64_efi.S
+++ b/arch/x86/lib/crt0_x86_64_efi.S
@@ -3,7 +3,7 @@
  * crt0-efi-x86_64.S - x86_64 EFI startup code.
  * Copyright (C) 1999 Hewlett-Packard Co.
  * Contributed by David Mosberger .
- * Copyright (C) 2005 Intel Co.
+ * Copyright (C) 2005 Intel Corporation
  * Contributed by Fenghua Yu .
  *
  * All rights reserved.
@@ -14,26 +14,25 @@
.globl _start
 _start:
subq $8, %rsp
+
pushq %rcx
pushq %rdx
 
-0:
-   lea image_base(%rip), %rdi
-   lea _DYNAMIC(%rip), %rsi
+   lea image_base(%rip), %rcx
+   lea _DYNAMIC(%rip), %rdx
 
-   popq %rcx
-   popq %rdx
-   pushq %rcx
-   pushq %rdx
call _relocate
 
-   popq %rdi
-   popq %rsi
+   popq %rdx
+   popq %rcx
+
+   testq %rax, %rax
+   jnz _exit
 
call efi_main
+_exit:
addq $8, %rsp
 
-.exit:
ret
 
/*
diff --git a/arch/x86/lib/reloc_x86_64_efi.c b/arch/x86/lib/reloc_x86_64_efi.c
index 34c5b2e..59d6f8d 100644
--- a/arch/x86/lib/reloc_x86_64_efi.c
+++ b/arch/x86/lib/reloc_x86_64_efi.c
@@ -14,8 +14,7 @@
 #include 
 #include 
 
-efi_status_t _relocate(long ldbase, Elf64_Dyn *dyn, efi_handle_t image,
-  struct efi_system_table *systab)
+efi_status_t EFIAPI _relocate(long ldbase, Elf64_Dyn *dyn)
 {
long relsz = 0, relent = 0;
Elf64_Rel *rel = 0;
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index c828093..3eb8eeb 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -96,7 +96,8 @@ static void free_memory(struct efi_priv *priv)
  * U-Boot. If it returns, EFI will continue. Another way to get back to EFI
  * is via reset_cpu().
  */
-efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table)
+efi_status_t EFIAPI efi_main(efi_handle_t image,
+struct efi_system_table *sys_table)
 {
struct efi_priv local_priv, *priv = _priv;
efi_status_t ret;
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index 3138739..399d16b 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -268,7 +268,8 @@ static void add_entry_addr(struct efi_priv *priv, enum 
efi_entry_t type,
  * This function is called by our EFI start-up code. It handles running
  * U-Boot. If it returns, EFI will continue.
  */
-efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table)
+efi_status_t EFIAPI efi_main(efi_handle_t image,
+struct efi_system_table *sys_table)
 {
struct efi_priv local_priv, *priv = _priv;
struct efi_boot_services *boot = sys_table->boottime;
-- 
2.7.4

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot