[S390] 3270: add support for irq statistics

Add support for 3270 I/O interrupt statistics in /proc/interrupts.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index d52533df6ac88e852e4281db9b9f78564b84ba74..65e63c02b0f92e4602c08c648c8c0ccf5adf5e52 100644 (file)
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -19,6 +19,7 @@ enum interruption_class {
        IOINT_QDI,
        IOINT_DAS,
        IOINT_C15,
+       IOINT_C70,
        NMI_NMI,
        NR_IRQS,
 };

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index e7914e4adc48d4b043f19b2d5e5981ced114f9fe..8c241416576f3506c38a3a46dc6d63903a974a9a 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -36,6 +36,7 @@ static const struct irq_class intrclass_names[] = {
        {.name = "QDI", .desc = "[I/O] QDIO Interrupt" },
        {.name = "DAS", .desc = "[I/O] DASD" },
        {.name = "C15", .desc = "[I/O] 3215" },
+       {.name = "C70", .desc = "[I/O] 3270" },
        {.name = "NMI", .desc = "[NMI] Machine Check" },
 };
 

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 2a4c566456e70d577dd0d7680022e80d8e528ded..96ba2fd1c8ad04added98cc56eb75aa4d3f61469 100644 (file)
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -7,6 +7,7 @@
  *     Copyright IBM Corp. 2003, 2009
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -329,6 +330,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
        struct raw3270_request *rq;
        int rc;
 
+       kstat_cpu(smp_processor_id()).irqs[IOINT_C70]++;
        rp = dev_get_drvdata(&cdev->dev);
        if (!rp)
                return;