Commit 013e9843 authored Sep 13, 2024 by Heiko Carstens Committed by Jason A. Donenfeld Sep 13, 2024

s390/alternatives: Remove ALT_FACILITY_EARLY



Patch all alternatives which depend on facilities from the decompressor.
There is no technical reason which enforces to split patching of such
alternatives to the decompressor and the kernel.

This simplifies alternative handling a bit, since one alternative type is
removed.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

parent 26d49596

arch/s390/include/asm/alternative.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -39,11 +39,7 @@
		#define ALT_TYPE_SHIFT 20
		#define ALT_CTX_SHIFT 28

		#define ALT_FACILITY_EARLY(facility) (ALT_CTX_EARLY << ALT_CTX_SHIFT \| \
		ALT_TYPE_FACILITY << ALT_TYPE_SHIFT \| \
		(facility) << ALT_DATA_SHIFT)

		#define ALT_FACILITY(facility) (ALT_CTX_LATE << ALT_CTX_SHIFT \| \
		#define ALT_FACILITY(facility) (ALT_CTX_EARLY << ALT_CTX_SHIFT \| \
		ALT_TYPE_FACILITY << ALT_TYPE_SHIFT \| \
		(facility) << ALT_DATA_SHIFT)

arch/s390/kernel/entry.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ _LPP_OFFSET = __LC_LPP

		.macro LPSWEY address, lpswe
		ALTERNATIVE_2 "b \lpswe;nopr", \
		".insn siy,0xeb0000000071,\address,0", ALT_FACILITY_EARLY(193), \
		".insn siy,0xeb0000000071,\address,0", ALT_FACILITY(193), \
		__stringify(.insn siy,0xeb0000000071,LOWCORE_ALT_ADDRESS+\address,0), \
		ALT_LOWCORE
		.endm