Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-07-19 23:10:59 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-07-19 23:18:47 +0200
commitb89c6928e80840d07fbdf44910e366f1adf7aeff (patch)
tree4da0f9afb53e04b2e58332d3bead4e4bead31113
parent33adda78569d540b856f37d61ecfd8cf0ee98107 (diff)
s390: report new CPU capabilities (jsc#SLE-6907 FATE#327564
LTC#175887).
-rw-r--r--patches.suse/s390-report-new-cpu-capabilities66
-rw-r--r--series.conf1
2 files changed, 67 insertions, 0 deletions
diff --git a/patches.suse/s390-report-new-cpu-capabilities b/patches.suse/s390-report-new-cpu-capabilities
new file mode 100644
index 0000000000..6b3e2927c0
--- /dev/null
+++ b/patches.suse/s390-report-new-cpu-capabilities
@@ -0,0 +1,66 @@
+From: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Date: Tue, 5 Feb 2019 16:15:01 +0100
+Subject: s390: report new CPU capabilities
+Git-commit: a8fd61688dfad6fdce95fa64cacd8a66595697b8
+Patch-mainline: v5.2-rc1
+References: jsc#SLE-6907 FATE#327564 LTC#175887
+
+Add hardware capability bits and features tags to /proc/cpuinfo
+for 4 new CPU features:
+ "Vector-Enhancements Facility 2" (tag "vxe2", hwcap 2^15)
+ "Vector-Packed-Decimal-Enhancement Facility" (tag "vxp", hwcap 2^16)
+ "Enhanced-Sort Facility" (tag "sort", hwcap 2^17)
+ "Deflate-Conversion Facility" (tag "dflt", hwcap 2^18)
+
+Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/include/asm/elf.h | 4 ++++
+ arch/s390/kernel/processor.c | 3 ++-
+ arch/s390/kernel/setup.c | 8 ++++++++
+ 3 files changed, 14 insertions(+), 1 deletion(-)
+
+--- a/arch/s390/include/asm/elf.h
++++ b/arch/s390/include/asm/elf.h
+@@ -106,6 +106,10 @@
+ #define HWCAP_S390_VXRS_BCD 4096
+ #define HWCAP_S390_VXRS_EXT 8192
+ #define HWCAP_S390_GS 16384
++#define HWCAP_S390_VXRS_EXT2 32768
++#define HWCAP_S390_VXRS_PDE 65536
++#define HWCAP_S390_SORT 131072
++#define HWCAP_S390_DFLT 262144
+
+ /* Internal bits, not exposed via elf */
+ #define HWCAP_INT_SIE 1UL
+--- a/arch/s390/kernel/processor.c
++++ b/arch/s390/kernel/processor.c
+@@ -108,7 +108,8 @@ static void show_cpu_summary(struct seq_
+ {
+ static const char *hwcap_str[] = {
+ "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp",
+- "edat", "etf3eh", "highgprs", "te", "vx", "vxd", "vxe", "gs"
++ "edat", "etf3eh", "highgprs", "te", "vx", "vxd", "vxe", "gs",
++ "vxe2", "vxp", "sort", "dflt"
+ };
+ static const char * const int_hwcap_str[] = {
+ "sie"
+--- a/arch/s390/kernel/setup.c
++++ b/arch/s390/kernel/setup.c
+@@ -785,7 +785,15 @@ static int __init setup_hwcaps(void)
+ elf_hwcap |= HWCAP_S390_VXRS_EXT;
+ if (test_facility(135))
+ elf_hwcap |= HWCAP_S390_VXRS_BCD;
++ if (test_facility(148))
++ elf_hwcap |= HWCAP_S390_VXRS_EXT2;
++ if (test_facility(152))
++ elf_hwcap |= HWCAP_S390_VXRS_PDE;
+ }
++ if (test_facility(150))
++ elf_hwcap |= HWCAP_S390_SORT;
++ if (test_facility(151))
++ elf_hwcap |= HWCAP_S390_DFLT;
+
+ /*
+ * Guarded storage support HWCAP_S390_GS is bit 12.
diff --git a/series.conf b/series.conf
index 3f89bdcd85..6dd38a3ecd 100644
--- a/series.conf
+++ b/series.conf
@@ -46586,6 +46586,7 @@
patches.arch/s390-protvirt-add-memory-sharing-for-diag-308-set-store
patches.arch/s390-protvirt-block-kernel-command-line-alteration
patches.suse/s390-cpum_cf_diag-add-support-for-cpu-mf-svn-6
+ patches.suse/s390-report-new-cpu-capabilities
patches.arch/s390-pci-mark-command-line-parser-data-_initdata
patches.arch/s390-pci-remove-unused-define
patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c