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:44:47 +0200
commit1b78d8f9c6e778d06920f501dcc4d10d1e2cb8b5 (patch)
tree55901576439ecb7347c3ac19beaa44e4214e5037
parentf8b1268a0146cd1daef8a9959b5dbcf43c56455d (diff)
s390/cpu_mf: move struct cpu_cf_events and per-CPU variable
to header file (jsc#SLE-6904 FATE#327581).
-rw-r--r--patches.suse/s390-cpu_mf-move-struct-cpu_cf_events-and-per-cpu-variable-to-header-file58
-rw-r--r--series.conf1
2 files changed, 59 insertions, 0 deletions
diff --git a/patches.suse/s390-cpu_mf-move-struct-cpu_cf_events-and-per-cpu-variable-to-header-file b/patches.suse/s390-cpu_mf-move-struct-cpu_cf_events-and-per-cpu-variable-to-header-file
new file mode 100644
index 0000000000..91180056f5
--- /dev/null
+++ b/patches.suse/s390-cpu_mf-move-struct-cpu_cf_events-and-per-cpu-variable-to-header-file
@@ -0,0 +1,58 @@
+From: Hendrik Brueckner <brueckner@linux.ibm.com>
+Date: Wed, 8 Aug 2018 10:12:22 +0200
+Subject: s390/cpu_mf: move struct cpu_cf_events and per-CPU variable to header
+ file
+Git-commit: f944bcdf5b8431c68be8bdd13259d27412e45c14
+Patch-mainline: v5.1-rc1
+References: jsc#SLE-6904 FATE#327581
+
+Make the struct cpu_cf_events and the respective per-CPU variable available
+to in-kernel users. Access to this per-CPU variable shall be done between
+the calls to __kernel_cpumcf_begin() and __kernel_cpumcf_end().
+
+Signed-off-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/include/asm/cpu_mcf.h | 9 +++++++++
+ arch/s390/kernel/perf_cpum_cf.c | 11 ++---------
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+--- a/arch/s390/include/asm/cpu_mcf.h
++++ b/arch/s390/include/asm/cpu_mcf.h
+@@ -49,6 +49,15 @@ static inline void ctr_set_stop(u64 *sta
+ *state &= ~(cpumf_ctr_ctl[ctr_set] << CPUMF_LCCTL_ACTCTL_SHIFT);
+ }
+
++struct cpu_cf_events {
++ struct cpumf_ctr_info info;
++ atomic_t ctr_set[CPUMF_CTR_SET_MAX];
++ u64 state, tx_state;
++ unsigned int flags;
++ unsigned int txn_flags;
++};
++DECLARE_PER_CPU(struct cpu_cf_events, cpu_cf_events);
++
+ int __kernel_cpumcf_begin(void);
+ void __kernel_cpumcf_end(void);
+
+--- a/arch/s390/kernel/perf_cpum_cf.c
++++ b/arch/s390/kernel/perf_cpum_cf.c
+@@ -21,15 +21,8 @@
+ #include <asm/irq.h>
+ #include <asm/cpu_mcf.h>
+
+-/* Local CPUMF event structure */
+-struct cpu_cf_events {
+- struct cpumf_ctr_info info;
+- atomic_t ctr_set[CPUMF_CTR_SET_MAX];
+- u64 state, tx_state;
+- unsigned int flags;
+- unsigned int txn_flags;
+-};
+-static DEFINE_PER_CPU(struct cpu_cf_events, cpu_cf_events) = {
++/* Per-CPU event structure for the counter facility */
++DEFINE_PER_CPU(struct cpu_cf_events, cpu_cf_events) = {
+ .ctr_set = {
+ [CPUMF_CTR_SET_BASIC] = ATOMIC_INIT(0),
+ [CPUMF_CTR_SET_USER] = ATOMIC_INIT(0),
diff --git a/series.conf b/series.conf
index 6df2d5e95d..d5d3ead9b1 100644
--- a/series.conf
+++ b/series.conf
@@ -45468,6 +45468,7 @@
patches.suse/s390-cpum_cf-move-counter-set-controls-to-a-new-header-file
patches.suse/s390-cpum_cf-prepare-for-in-kernel-counter-measurements
patches.suse/s390-cpum_cf-rename-per-cpu-counter-facility-structure-and-variables
+ patches.suse/s390-cpu_mf-move-struct-cpu_cf_events-and-per-cpu-variable-to-header-file
patches.fixes/0001-s390-vfio_ap-link-the-vfio_ap-devices-to-the-vfio_ap.patch
patches.drivers/clocksource-drivers-sun5i-Fail-gracefully-when-clock.patch
patches.drivers/clocksource-drivers-exynos_mct-Move-one-shot-check-f.patch