fa3bfd
From 71956c369a72a64ff26ca90198a42f0bf2967217 Mon Sep 17 00:00:00 2001
fa3bfd
From: Stefan Liebler <stli@linux.vnet.ibm.com>
fa3bfd
Date: Thu, 27 Jul 2017 10:53:58 +0200
fa3bfd
Subject: [PATCH 06/10] S390: Add new hwcap values for new cpu architecture -
fa3bfd
 arch12.
fa3bfd
fa3bfd
upstream-commit f21f59124d8a4d22b20e7a926462937d89e8988e
fa3bfd
fa3bfd
The new hwcap values indicate support for:
fa3bfd
- Vector packed decimal facility
fa3bfd
- Vector enhancements facility 1
fa3bfd
- Guarded storage facility
fa3bfd
fa3bfd
Note: arch12 is NOT the official name of the new CPU.
fa3bfd
It refers to the edition number of the Principle of Operations manual.
fa3bfd
fa3bfd
ChangeLog:
fa3bfd
fa3bfd
	* sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags):
fa3bfd
	Add vxd, vxe, gs flag.
fa3bfd
	* sysdeps/s390/dl-procinfo.h: Add HWCAP_S390_VXD, HWCAP_S390_VXE,
fa3bfd
	HWCAP_S390_GS capability.
fa3bfd
	* sysdeps/unix/sysv/linux/s390/bits/hwcap.h
fa3bfd
	(HWCAP_S390_VXD, HWCAP_S390_VXE, HWCAP_S390_GS): Define.
fa3bfd
---
fa3bfd
 sysdeps/s390/dl-procinfo.c                | 5 +++--
fa3bfd
 sysdeps/s390/dl-procinfo.h                | 5 ++++-
fa3bfd
 sysdeps/unix/sysv/linux/s390/bits/hwcap.h | 3 +++
fa3bfd
 3 files changed, 10 insertions(+), 3 deletions(-)
fa3bfd
fa3bfd
diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
fa3bfd
index f353528..aa08eca 100644
fa3bfd
--- a/sysdeps/s390/dl-procinfo.c
fa3bfd
+++ b/sysdeps/s390/dl-procinfo.c
fa3bfd
@@ -46,11 +46,12 @@
fa3bfd
 #if !defined PROCINFO_DECL && defined SHARED
fa3bfd
   ._dl_s390_cap_flags
fa3bfd
 #else
fa3bfd
-PROCINFO_CLASS const char _dl_s390_cap_flags[12][9]
fa3bfd
+PROCINFO_CLASS const char _dl_s390_cap_flags[15][9]
fa3bfd
 #endif
fa3bfd
 #ifndef PROCINFO_DECL
fa3bfd
 = {
fa3bfd
-     "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", "highgprs", "te", "vx"
fa3bfd
+     "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh",
fa3bfd
+     "highgprs", "te", "vx", "vxd", "vxe", "gs"
fa3bfd
   }
fa3bfd
 #endif
fa3bfd
 #if !defined SHARED || defined PROCINFO_DECL
fa3bfd
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
fa3bfd
index 80747f0..748c3d1 100644
fa3bfd
--- a/sysdeps/s390/dl-procinfo.h
fa3bfd
+++ b/sysdeps/s390/dl-procinfo.h
fa3bfd
@@ -21,7 +21,7 @@
fa3bfd
 #define _DL_PROCINFO_H	1
fa3bfd
 #include <ldsodefs.h>
fa3bfd
 
fa3bfd
-#define _DL_HWCAP_COUNT 12
fa3bfd
+#define _DL_HWCAP_COUNT 15
fa3bfd
 
fa3bfd
 #define _DL_PLATFORMS_COUNT	8
fa3bfd
 
fa3bfd
@@ -51,6 +51,9 @@ enum
fa3bfd
   HWCAP_S390_HIGH_GPRS = 1 << 9,
fa3bfd
   HWCAP_S390_TE = 1 << 10,
fa3bfd
   HWCAP_S390_VX = 1 << 11,
fa3bfd
+  HWCAP_S390_VXD = 1 << 12,
fa3bfd
+  HWCAP_S390_VXE = 1 << 13,
fa3bfd
+  HWCAP_S390_GS = 1 << 14,
fa3bfd
 };
fa3bfd
 
fa3bfd
 #define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \
fa3bfd
diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
fa3bfd
index bd2ce3a..58b1929 100644
fa3bfd
--- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
fa3bfd
+++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h
fa3bfd
@@ -36,3 +36,6 @@
fa3bfd
 #define HWCAP_S390_HIGH_GPRS    512
fa3bfd
 #define HWCAP_S390_TE           1024
fa3bfd
 #define HWCAP_S390_VX           2048
fa3bfd
+#define HWCAP_S390_VXD          4096
fa3bfd
+#define HWCAP_S390_VXE          8192
fa3bfd
+#define HWCAP_S390_GS           16384
fa3bfd
-- 
fa3bfd
1.8.3.1
fa3bfd