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