s390/irq: split irq stats for cpu-measurement alert facilities

CPU-measurement alerts are generated for different CPU-measurement
facilities, for example, the sampling and counter facilities.
Split the irq stats according to available facilities.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

4 files changed, 6 insertions, 4 deletions

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 5289cacd4861..2b9d41899d21 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -17,7 +17,8 @@ enum interruption_class {
         EXTINT_VRT,
         EXTINT_SCP,
         EXTINT_IUC,
-        EXTINT_CPM,
+        EXTINT_CMS,
+        EXTINT_CMC,
         IOINT_CIO,
         IOINT_QAI,
         IOINT_DAS,
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 8a22c27219dd..b4f4a7133fa1 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -42,7 +42,8 @@ static const struct irq_class intrclass_names[] = {
         {.name = "VRT", .desc = "[EXT] Virtio" },
         {.name = "SCP", .desc = "[EXT] Service Call" },
         {.name = "IUC", .desc = "[EXT] IUCV" },
-        {.name = "CPM", .desc = "[EXT] CPU Measurement" },
+        {.name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling" },
+        {.name = "CMC", .desc = "[EXT] CPU-Measurement: Counter" },
         {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt" },
         {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
         {.name = "DAS", .desc = "[I/O] DASD" },
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index cb019f429e88..9871b1971ed7 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -225,7 +225,7 @@ static void cpumf_measurement_alert(struct ext_code ext_code,
         if (!(alert & CPU_MF_INT_CF_MASK))
                 return;
 
-        kstat_cpu(smp_processor_id()).irqs[EXTINT_CPM]++;
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_CMC]++;
         cpuhw = &__get_cpu_var(cpu_hw_events);
 
         /* Measurement alerts are shared and might happen when the PMU
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index c6646de07bf4..a4a89fa980d6 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -235,7 +235,7 @@ static void hws_ext_handler(struct ext_code ext_code,
         if (!(param32 & CPU_MF_INT_SF_MASK))
                 return;
 
-        kstat_cpu(smp_processor_id()).irqs[EXTINT_CPM]++;
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_CMS]++;
         atomic_xchg(&cb->ext_params, atomic_read(&cb->ext_params) | param32);
 
         if (hws_wq)