aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/setup.c
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2019-02-06 08:22:11 +0100
committerHeiko Carstens <heiko.carstens@de.ibm.com>2019-09-13 12:19:14 +0200
commita0e2251132995b962281aa80ab54a9288f9e0b6b (patch)
treebf23cbba43986c2be02acf7e3bd3152539231489 /arch/s390/kernel/setup.c
parents390/crypto: Support for SHA3 via CPACF (MSA6) (diff)
downloadlinux-dev-a0e2251132995b962281aa80ab54a9288f9e0b6b.tar.xz
linux-dev-a0e2251132995b962281aa80ab54a9288f9e0b6b.zip
s390: add support for IBM z15 machines
Add detection for machine types 0x8562 and 8x8561 and set the ELF platform name to z15. Add the miscellaneous-instruction-extension 3 facility to the list of facilities for z15. And allow to generate code that only runs on a z15 machine. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r--arch/s390/kernel/setup.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 3e4b4a48a597..f63a9f378b37 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -981,6 +981,10 @@ static int __init setup_hwcaps(void)
case 0x3907:
strcpy(elf_platform, "z14");
break;
+ case 0x8561:
+ case 0x8562:
+ strcpy(elf_platform, "z15");
+ break;
}
/*