diff mbox series

[v1,2/2] x86: call32: Append appropriate suffixes

Message ID 20200728095626.28445-2-andriy.shevchenko@linux.intel.com
State Accepted
Commit 940185910f9821226c673d3ee5535afab31b9865
Delegated to: Bin Meng
Headers show
Series [v1,1/2] x86: sipi_vector: Append appropriate suffixes | expand

Commit Message

Andy Shevchenko July 28, 2020, 9:56 a.m. UTC
Assembler is not happy:

arch/x86/cpu/call32.S: Assembler messages:
arch/x86/cpu/call32.S:36: Warning: no instruction mnemonic suffix given and no register operands; using default for `retf'

Fix this by adding appropriate suffixes to the assembler commands.

Fixes: 6f92ed8f1abf ("x86: Add a way to call 32-bit code from 64-bit mode")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/x86/cpu/call32.S | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Bin Meng Aug. 1, 2020, 12:27 a.m. UTC | #1
On Tue, Jul 28, 2020 at 5:56 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> Assembler is not happy:
>
> arch/x86/cpu/call32.S: Assembler messages:
> arch/x86/cpu/call32.S:36: Warning: no instruction mnemonic suffix given and no register operands; using default for `retf'
>
> Fix this by adding appropriate suffixes to the assembler commands.
>
> Fixes: 6f92ed8f1abf ("x86: Add a way to call 32-bit code from 64-bit mode")
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  arch/x86/cpu/call32.S | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Bin Meng Aug. 3, 2020, 2:45 a.m. UTC | #2
On Sat, Aug 1, 2020 at 8:27 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> On Tue, Jul 28, 2020 at 5:56 PM Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> >
> > Assembler is not happy:
> >
> > arch/x86/cpu/call32.S: Assembler messages:
> > arch/x86/cpu/call32.S:36: Warning: no instruction mnemonic suffix given and no register operands; using default for `retf'
> >
> > Fix this by adding appropriate suffixes to the assembler commands.
> >
> > Fixes: 6f92ed8f1abf ("x86: Add a way to call 32-bit code from 64-bit mode")
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > ---
> >  arch/x86/cpu/call32.S | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> >
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

applied to u-boot-x86, thanks!
diff mbox series

Patch

diff --git a/arch/x86/cpu/call32.S b/arch/x86/cpu/call32.S
index e185b9a42b03..e641e781c04c 100644
--- a/arch/x86/cpu/call32.S
+++ b/arch/x86/cpu/call32.S
@@ -32,8 +32,7 @@  cpu_call32:
 	push	%rdi	/* 32-bit code segment */
 	lea	compat(%rip), %rax
 	push	%rax
-	.byte	0x48	/* REX prefix to force 64-bit far return */
-	retf
+	retfq
 .code32
 compat:
 	/*
@@ -60,4 +59,4 @@  compat:
 	/* Jump to the required target */
 	pushl	%edi	/* 32-bit code segment */
 	pushl	%esi	/* 32-bit target address */
-	retf
+	retfl