From 46b635b6abcf2ee106d36f2e84e942f56030c8f5 Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Fri, 26 Feb 2021 15:00:56 +0100 Subject: s390/cpumf: rename header file to hwctrset.h Signed-off-by: Thomas Richter Suggested-by: Hendrick Brueckner Acked-by: Heiko Carstens Signed-off-by: Heiko Carstens --- arch/s390/include/uapi/asm/hwctrset.h | 51 ++++++++++++++++++++++++++ arch/s390/include/uapi/asm/perf_cpum_cf_diag.h | 51 -------------------------- arch/s390/kernel/perf_cpum_cf_diag.c | 2 +- 3 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 arch/s390/include/uapi/asm/hwctrset.h delete mode 100644 arch/s390/include/uapi/asm/perf_cpum_cf_diag.h (limited to 'arch/s390') diff --git a/arch/s390/include/uapi/asm/hwctrset.h b/arch/s390/include/uapi/asm/hwctrset.h new file mode 100644 index 000000000000..3d8284b95f87 --- /dev/null +++ b/arch/s390/include/uapi/asm/hwctrset.h @@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Copyright IBM Corp. 2021 + * Interface implementation for communication with the CPU Measurement + * counter facility device driver. + * + * Author(s): Thomas Richter + * + * Define for ioctl() commands to communicate with the CPU Measurement + * counter facility device driver. + */ + +#ifndef _PERF_CPUM_CF_DIAG_H +#define _PERF_CPUM_CF_DIAG_H + +#include +#include + +#define S390_HWCTR_DEVICE "hwctr" +#define S390_HWCTR_START_VERSION 1 + +struct s390_ctrset_start { /* Set CPUs to operate on */ + __u64 version; /* Version of interface */ + __u64 data_bytes; /* # of bytes required */ + __u64 cpumask_len; /* Length of CPU mask in bytes */ + __u64 *cpumask; /* Pointer to CPU mask */ + __u64 counter_sets; /* Bit mask of counter sets to get */ +}; + +struct s390_ctrset_setdata { /* Counter set data */ + __u32 set; /* Counter set number */ + __u32 no_cnts; /* # of counters stored in cv[] */ + __u64 cv[0]; /* Counter values (variable length) */ +}; + +struct s390_ctrset_cpudata { /* Counter set data per CPU */ + __u32 cpu_nr; /* CPU number */ + __u32 no_sets; /* # of counters sets in data[] */ + struct s390_ctrset_setdata data[0]; +}; + +struct s390_ctrset_read { /* Structure to get all ctr sets */ + __u64 no_cpus; /* Total # of CPUs data taken from */ + struct s390_ctrset_cpudata data[0]; +}; + +#define S390_HWCTR_MAGIC 'C' /* Random magic # for ioctls */ +#define S390_HWCTR_START _IOWR(S390_HWCTR_MAGIC, 1, struct s390_ctrset_start) +#define S390_HWCTR_STOP _IO(S390_HWCTR_MAGIC, 2) +#define S390_HWCTR_READ _IOWR(S390_HWCTR_MAGIC, 3, struct s390_ctrset_read) +#endif diff --git a/arch/s390/include/uapi/asm/perf_cpum_cf_diag.h b/arch/s390/include/uapi/asm/perf_cpum_cf_diag.h deleted file mode 100644 index 3d8284b95f87..000000000000 --- a/arch/s390/include/uapi/asm/perf_cpum_cf_diag.h +++ /dev/null @@ -1,51 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* - * Copyright IBM Corp. 2021 - * Interface implementation for communication with the CPU Measurement - * counter facility device driver. - * - * Author(s): Thomas Richter - * - * Define for ioctl() commands to communicate with the CPU Measurement - * counter facility device driver. - */ - -#ifndef _PERF_CPUM_CF_DIAG_H -#define _PERF_CPUM_CF_DIAG_H - -#include -#include - -#define S390_HWCTR_DEVICE "hwctr" -#define S390_HWCTR_START_VERSION 1 - -struct s390_ctrset_start { /* Set CPUs to operate on */ - __u64 version; /* Version of interface */ - __u64 data_bytes; /* # of bytes required */ - __u64 cpumask_len; /* Length of CPU mask in bytes */ - __u64 *cpumask; /* Pointer to CPU mask */ - __u64 counter_sets; /* Bit mask of counter sets to get */ -}; - -struct s390_ctrset_setdata { /* Counter set data */ - __u32 set; /* Counter set number */ - __u32 no_cnts; /* # of counters stored in cv[] */ - __u64 cv[0]; /* Counter values (variable length) */ -}; - -struct s390_ctrset_cpudata { /* Counter set data per CPU */ - __u32 cpu_nr; /* CPU number */ - __u32 no_sets; /* # of counters sets in data[] */ - struct s390_ctrset_setdata data[0]; -}; - -struct s390_ctrset_read { /* Structure to get all ctr sets */ - __u64 no_cpus; /* Total # of CPUs data taken from */ - struct s390_ctrset_cpudata data[0]; -}; - -#define S390_HWCTR_MAGIC 'C' /* Random magic # for ioctls */ -#define S390_HWCTR_START _IOWR(S390_HWCTR_MAGIC, 1, struct s390_ctrset_start) -#define S390_HWCTR_STOP _IO(S390_HWCTR_MAGIC, 2) -#define S390_HWCTR_READ _IOWR(S390_HWCTR_MAGIC, 3, struct s390_ctrset_read) -#endif diff --git a/arch/s390/kernel/perf_cpum_cf_diag.c b/arch/s390/kernel/perf_cpum_cf_diag.c index 5eebc912df5a..bc302b86ce28 100644 --- a/arch/s390/kernel/perf_cpum_cf_diag.c +++ b/arch/s390/kernel/perf_cpum_cf_diag.c @@ -26,7 +26,7 @@ #include #include -#include +#include #define CF_DIAG_CTRSET_DEF 0xfeef /* Counter set header mark */ /* interval in seconds */ -- cgit v1.2.3