Skip to contentSkip to conversation

x86: sipi_vector: Append appropriate suffixes

PATCH New Andy Shevchenko 2 participants 6 messages Jul 28, 2020 – Aug 3, 2020 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 x86: sipi_vector: Append appropriate suffixes

Assembler is not happy:

arch/x86/cpu/sipi_vector.S: Assembler messages:
arch/x86/cpu/sipi_vector.S:134: Warning: no instruction mnemonic suffix given and no register operands; using default for cmp' arch/x86/cpu/sipi_vector.S:139: Warning: no instruction mnemonic suffix given and no register operands; using default for bts' arch/x86/cpu/sipi_vector.S:157: Warning: no instruction mnemonic suffix given and no register operands; using default for `cmp'

Fix this by adding appropriate suffixes to the assembler commands.

Fixes 45b5a37836d5 ("x86: Add multi-processor init")
---
 arch/x86/cpu/sipi_vector.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/cpu/sipi_vector.S +3 -3
index 40cc27f1e1d0..fa1e6cb19af4 100644
@@ -131,12 +131,12 @@ ap_start:
 	jnz	microcode_done
 
 	/* Determine if parallel microcode loading is allowed */
-	cmp	$0xffffffff, microcode_lock
+	cmpl	$0xffffffff, microcode_lock
 	je	load_microcode
 
 	/* Protect microcode loading */
 lock_microcode:
-	lock bts $0, microcode_lock
+	lock btsl $0, microcode_lock
 	jc	lock_microcode
 
 load_microcode:
@@ -154,7 +154,7 @@ load_microcode:
 	popa
 
 	/* Unconditionally unlock microcode loading */
-	cmp	$0xffffffff, microcode_lock
+	cmpl	$0xffffffff, microcode_lock
 	je	microcode_done
 
 	xor	%eax, %eax
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/2 x86: call32: Append appropriate suffixes

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")
---
 arch/x86/cpu/call32.S | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/cpu/call32.S +2 -3
index e185b9a42b03..e641e781c04c 100644
@@ -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
Signature · 1 line
2.27.0
#2 lore raw

PATCH 2/2 x86: call32: Append appropriate suffixes

Quoted 6 lines · Andy Shevchenko

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'

Quoted 8 lines

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")
---
 arch/x86/cpu/call32.S | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
#3 lore raw

PATCH 2/2 x86: call32: Append appropriate suffixes

Quoted 11 lines · Bin Meng
Quoted 8 lines · Andy Shevchenko

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.

Quoted 8 lines
Quoted 6 lines
Fixes 6f92ed8f1abf ("x86: Add a way to call 32-bit code from 64-bit mode")
---
 arch/x86/cpu/call32.S | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

applied to u-boot-x86, thanks!

#4 lore raw

PATCH 1/2 x86: sipi_vector: Append appropriate suffixes

In reply to Andy Shevchenko
Quoted 8 lines · Andy Shevchenko

Assembler is not happy:

arch/x86/cpu/sipi_vector.S: Assembler messages:
arch/x86/cpu/sipi_vector.S:134: Warning: no instruction mnemonic suffix given and no register operands; using default for cmp' arch/x86/cpu/sipi_vector.S:139: Warning: no instruction mnemonic suffix given and no register operands; using default for bts' arch/x86/cpu/sipi_vector.S:157: Warning: no instruction mnemonic suffix given and no register operands; using default for `cmp'

Quoted 8 lines

Fix this by adding appropriate suffixes to the assembler commands.

Fixes 45b5a37836d5 ("x86: Add multi-processor init")
---
 arch/x86/cpu/sipi_vector.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
#5 lore raw

PATCH 1/2 x86: sipi_vector: Append appropriate suffixes

Quoted 13 lines · Bin Meng
Quoted 10 lines · Andy Shevchenko

Assembler is not happy:

arch/x86/cpu/sipi_vector.S: Assembler messages:
arch/x86/cpu/sipi_vector.S:134: Warning: no instruction mnemonic suffix given and no register operands; using default for cmp' arch/x86/cpu/sipi_vector.S:139: Warning: no instruction mnemonic suffix given and no register operands; using default for bts' arch/x86/cpu/sipi_vector.S:157: Warning: no instruction mnemonic suffix given and no register operands; using default for `cmp'

Fix this by adding appropriate suffixes to the assembler commands.

Quoted 8 lines
Quoted 6 lines
Fixes 45b5a37836d5 ("x86: Add multi-processor init")
---
 arch/x86/cpu/sipi_vector.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

applied to u-boot-x86, thanks!