Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-07-19 17:10:24 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-07-19 22:49:01 +0200
commit2cd8a186e52ab26320832f456b4981054e84219b (patch)
treeccc844511e3b95a8d709ecfb2de18f9ee4d99101
parent06855697680e7e2d9a31cd22679758eb6562c9fc (diff)
s390/cpum_cf_diag: Add support for CPU-MF SVN 6 (jsc#SLE-6904
-rw-r--r--patches.suse/s390-cpum_cf_diag-add-support-for-cpu-mf-svn-648
-rw-r--r--series.conf1
2 files changed, 49 insertions, 0 deletions
diff --git a/patches.suse/s390-cpum_cf_diag-add-support-for-cpu-mf-svn-6 b/patches.suse/s390-cpum_cf_diag-add-support-for-cpu-mf-svn-6
new file mode 100644
index 0000000000..96888939cb
--- /dev/null
+++ b/patches.suse/s390-cpum_cf_diag-add-support-for-cpu-mf-svn-6
@@ -0,0 +1,48 @@
+From: Thomas-Mich Richter <tmricht@linux.ibm.com>
+Date: Tue, 23 Apr 2019 11:36:27 +0200
+Subject: s390/cpum_cf_diag: Add support for CPU-MF SVN 6
+Git-commit: 1c410fd6a561af452aba282b1cd3cabef2080d72
+Patch-mainline: v5.2-rc1
+References: jsc#SLE-6904 FATE#327581
+
+Add support for the CPU-Measurement Facility counter
+second version number 6. This number is used to detect some
+more counters in the crypto counter set and the extended
+counter set.
+
+Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
+Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/kernel/perf_cpum_cf_diag.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/arch/s390/kernel/perf_cpum_cf_diag.c b/arch/s390/kernel/perf_cpum_cf_diag.c
+index b6854812d2ed..d4e031f7b9c8 100644
+--- a/arch/s390/kernel/perf_cpum_cf_diag.c
++++ b/arch/s390/kernel/perf_cpum_cf_diag.c
+@@ -306,15 +306,20 @@ static size_t cf_diag_ctrset_size(enum cpumf_ctr_set ctrset,
+ ctrset_size = 2;
+ break;
+ case CPUMF_CTR_SET_CRYPTO:
+- ctrset_size = 16;
++ if (info->csvn >= 1 && info->csvn <= 5)
++ ctrset_size = 16;
++ else if (info->csvn == 6)
++ ctrset_size = 20;
+ break;
+ case CPUMF_CTR_SET_EXT:
+ if (info->csvn == 1)
+ ctrset_size = 32;
+ else if (info->csvn == 2)
+ ctrset_size = 48;
+- else if (info->csvn >= 3)
++ else if (info->csvn >= 3 && info->csvn <= 5)
+ ctrset_size = 128;
++ else if (info->csvn == 6)
++ ctrset_size = 160;
+ break;
+ case CPUMF_CTR_SET_MT_DIAG:
+ if (info->csvn > 3)
+
diff --git a/series.conf b/series.conf
index f546878955..e4d2c07c0c 100644
--- a/series.conf
+++ b/series.conf
@@ -46584,6 +46584,7 @@
patches.arch/s390-uv-introduce-guest-side-ultravisor-code
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.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