lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

S390: Add PCI_MIO and SIE HWCAPs

Browse Source 
Both new HWCAPs were introduced in these kernel commits:
- 7e8403ecaf884f307b627f3c371475913dd29292
  "s390: add HWCAP_S390_PCI_MIO to ELF hwcaps"
- 7e82523f2583e9813e4109df3656707162541297
  "s390/hwcaps: make sie capability regular hwcap"

Also note that the kernel commit 511ad531afd4090625def4d9aba1f5227bd44b8e
"s390/hwcaps: shorten HWCAP defines" has shortened the prefix of the macros
from "HWCAP_S390_" to "HWCAP_".  For compatibility reasons, we do not
change the prefix in public glibc header file.
This commit is contained in:
Stefan Liebler
2021-10-05 16:14:10 +02:00
parent 27b6edbb09
commit f2e06656d0
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/s390/dl-procinfo.c
View File

@@ -45,13 +45,13 @@
#if !defined PROCINFO_DECL && defined SHARED #if !defined PROCINFO_DECL && defined SHARED
._dl_s390_cap_flags ._dl_s390_cap_flags
#else #else
PROCINFO_CLASS const char _dl_s390_cap_flags[21][9] PROCINFO_CLASS const char _dl_s390_cap_flags[23][9]
#endif #endif
#ifndef PROCINFO_DECL #ifndef PROCINFO_DECL
= { = {
"esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh",
"highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt", "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt",
"vxp2", "nnpa" "vxp2", "nnpa", "pcimio", "sie"
} }
#endif #endif
#if !defined SHARED || defined PROCINFO_DECL #if !defined SHARED || defined PROCINFO_DECL

4
sysdeps/s390/dl-procinfo.h
View File

@@ -20,7 +20,7 @@
#define _DL_PROCINFO_H 1 #define _DL_PROCINFO_H 1
#include <ldsodefs.h> #include <ldsodefs.h>
#define _DL_HWCAP_COUNT 21 #define _DL_HWCAP_COUNT 23
#define _DL_PLATFORMS_COUNT 10 #define _DL_PLATFORMS_COUNT 10
@@ -62,6 +62,8 @@ enum
HWCAP_S390_DFLT = 1 << 18, HWCAP_S390_DFLT = 1 << 18,
HWCAP_S390_VXRS_PDE2 = 1 << 19, HWCAP_S390_VXRS_PDE2 = 1 << 19,
HWCAP_S390_NNPA = 1 << 20, HWCAP_S390_NNPA = 1 << 20,
HWCAP_S390_PCI_MIO = 1 << 21,
HWCAP_S390_SIE = 1 << 22,
}; };
#define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \ #define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \

7
sysdeps/unix/sysv/linux/s390/bits/hwcap.h
View File

@@ -22,6 +22,11 @@
/* /*
* The following must match the kernels asm/elf.h. * The following must match the kernels asm/elf.h.
* Note: The kernel commit 511ad531afd4090625def4d9aba1f5227bd44b8e
* "s390/hwcaps: shorten HWCAP defines" has shortened the prefix of the macros
* from "HWCAP_S390_" to "HWCAP_". For compatibility reasons, we do not
* change the prefix in public glibc header file.
*
* Note that these are *not* the same as the STORE FACILITY LIST bits. * Note that these are *not* the same as the STORE FACILITY LIST bits.
*/ */
#define HWCAP_S390_ESAN3 1 #define HWCAP_S390_ESAN3 1
@@ -48,3 +53,5 @@
#define HWCAP_S390_DFLT 262144 #define HWCAP_S390_DFLT 262144
#define HWCAP_S390_VXRS_PDE2 524288 #define HWCAP_S390_VXRS_PDE2 524288
#define HWCAP_S390_NNPA 1048576 #define HWCAP_S390_NNPA 1048576
#define HWCAP_S390_PCI_MIO 2097152
#define HWCAP_S390_SIE 4194304