From 6997c32365ac5a61b298a9e165ed32497c8cbc25 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Wed, 12 Apr 2017 14:17:25 +0200 Subject: s390: add support for IBM z14 machines Add detection for machine type 0x3906 and set the ELF platform name to z14. Add the miscellaneous-instruction-extension 2 facility to the list of facilities for z14. And allow to generate code that only runs on a z14 machine. Signed-off-by: Martin Schwidefsky --- arch/s390/tools/gen_facilities.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/s390/tools/gen_facilities.c') diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c index 025ea20fc4b4..3e878ecf522c 100644 --- a/arch/s390/tools/gen_facilities.c +++ b/arch/s390/tools/gen_facilities.c @@ -53,6 +53,9 @@ static struct facility_def facility_defs[] = { #endif #ifdef CONFIG_HAVE_MARCH_Z13_FEATURES 53, /* load-and-zero-rightmost-byte, etc. */ +#endif +#ifdef CONFIG_HAVE_MARCH_Z14_FEATURES + 58, /* miscellaneous-instruction-extension 2 */ #endif -1 /* END */ } -- cgit v1.2.3-59-g8ed1b From ba7944114ad3c2273611c95d6571c0924010a105 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 18 Aug 2017 09:02:01 +0200 Subject: s390/facilities: fix typo There really is no "general extension" facility available. Use the correct name "general instructions extension" facility instead. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- arch/s390/tools/gen_facilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/s390/tools/gen_facilities.c') diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c index 3e878ecf522c..29d72bf8ed2b 100644 --- a/arch/s390/tools/gen_facilities.c +++ b/arch/s390/tools/gen_facilities.c @@ -41,7 +41,7 @@ static struct facility_def facility_defs[] = { 27, /* mvcos */ 32, /* compare and swap and store */ 33, /* compare and swap and store 2 */ - 34, /* general extension facility */ + 34, /* general instructions extension */ 35, /* execute extensions */ #endif #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES -- cgit v1.2.3-59-g8ed1b