From: Heiko Carstens <hca@linux.ibm.com>
Date: Tue, 2 Feb 2021 12:46:47 +0000 (+0100)
Subject: s390/entry: use cpu alternative for stck/stckf
X-Git-Tag: v5.12-rc1~138^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78f6570946228d0e1dac5f42f398e3e07924b945;p=thirdparty%2Fkernel%2Flinux.git

s390/entry: use cpu alternative for stck/stckf

Use a cpu alternative to switch between stck and stckf instead of
making it compile time dependent. This will also make kernels compiled
for old machines, but running on newer machines, use stckf.

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 785425b59ac19..9b3aea98f886c 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -106,12 +106,10 @@ _LPP_OFFSET	= __LC_LPP
 2:	la	%r11,STACK_FRAME_OVERHEAD(%r15)
 	.endm
 
+	# Use STORE CLOCK by default, switch to STORE CLOCK FAST if available.
 	.macro STCK savearea
-#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
-	.insn	s,0xb27c0000,\savearea		# store clock fast
-#else
-	.insn	s,0xb2050000,\savearea		# store clock
-#endif
+	ALTERNATIVE ".insn	s,0xb2050000,\savearea", \
+		    ".insn	s,0xb27c0000,\savearea", 25
 	.endm
 
 	/*