Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d38c6a7 authored by Andre Przywara's avatar Andre Przywara Committed by Sami Tolvanen
Browse files

UPSTREAM: Revert "arm64: alternatives: add enable parameter to conditional asm macros" 



Commit 77ee306c0aea9 ("arm64: alternatives: add enable parameter to
conditional asm macros") extended the alternative assembly macros.
Unfortunately this does not really work as one would expect, as the
enable parameter in fact correctly protects the alternative section
magic, but not the actual code sequences.
This results in having both the original instruction(s) _and_  the
alternative ones, if enable if false.
Since there is no user of this macros anyway, just revert it.

This reverts commit 77ee306c0aea9a219daec256ad25982944affef8.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>

Bug: 31432001
Change-Id: I608104891335dfa2dacdb364754ae2658088ddf2
(cherry picked from commit b82bfa4793cd0f8fde49b85e0ad66906682e7447)
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent b6cdea34

arch/arm64/include/asm/alternative.h

+3 −9
Original line number Diff line number Diff line
@@ -96,13 +96,11 @@ void free_alternatives_memory(void); 
 * The code that follows this macro will be assembled and linked as

 * normal. There are no restrictions on this code.

 */

.macro alternative_if_not cap, enable = 1

	.if \enable

.macro alternative_if_not cap

	.pushsection .altinstructions, "a"

	altinstruction_entry 661f, 663f, \cap, 662f-661f, 664f-663f

	.popsection

661:

	.endif

.endm



/*
@@ -119,22 +117,18 @@ void free_alternatives_memory(void); 
 *    alternative sequence it is defined in (branches into an

 *    alternative sequence are not fixed up).

 */

.macro alternative_else, enable = 1

	.if \enable

.macro alternative_else

662:	.pushsection .altinstr_replacement, "ax"

663:

	.endif

.endm



/*

 * Complete an alternative code sequence.

 */

.macro alternative_endif, enable = 1

	.if \enable

.macro alternative_endif

664:	.popsection

	.org	. - (664b-663b) + (662b-661b)

	.org	. - (662b-661b) + (664b-663b)

	.endif

.endm



#define _ALTERNATIVE_CFG(insn1, insn2, cap, cfg, ...)	\