aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2012-08-28 10:48:47 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 09:45:00 -0400
commit2e73c2cf78f797f3ff299ca39b210bceb40ab804 (patch)
tree22d4751c236bb57d0cff1f2cf5d5734f82e9afc5
parenteadb86ab80545d04a0ee576e92ba4447621cdb02 (diff)
s390/eadm_sch: add support for irq statistics
Add support for EADM interrupt statistics in /proc/interrupts. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/irq.h1
-rw-r--r--arch/s390/kernel/irq.c1
-rw-r--r--drivers/s390/cio/eadm_sch.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 2b9d41899d21..33cc59071581 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -30,6 +30,7 @@ enum interruption_class {
30 IOINT_CLW, 30 IOINT_CLW,
31 IOINT_CTC, 31 IOINT_CTC,
32 IOINT_APB, 32 IOINT_APB,
33 IOINT_ADM,
33 IOINT_CSC, 34 IOINT_CSC,
34 NMI_NMI, 35 NMI_NMI,
35 NR_IRQS, 36 NR_IRQS,
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index dd7630d8aab7..a22fdca6a663 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -55,6 +55,7 @@ static const struct irq_class intrclass_names[] = {
55 {.name = "CLW", .desc = "[I/O] CLAW" }, 55 {.name = "CLW", .desc = "[I/O] CLAW" },
56 {.name = "CTC", .desc = "[I/O] CTC" }, 56 {.name = "CTC", .desc = "[I/O] CTC" },
57 {.name = "APB", .desc = "[I/O] AP Bus" }, 57 {.name = "APB", .desc = "[I/O] AP Bus" },
58 {.name = "ADM", .desc = "[I/O] EADM Subchannel" },
58 {.name = "CSC", .desc = "[I/O] CHSC Subchannel" }, 59 {.name = "CSC", .desc = "[I/O] CHSC Subchannel" },
59 {.name = "NMI", .desc = "[NMI] Machine Check" }, 60 {.name = "NMI", .desc = "[NMI] Machine Check" },
60}; 61};
diff --git a/drivers/s390/cio/eadm_sch.c b/drivers/s390/cio/eadm_sch.c
index 3fc882f66689..6c9673400464 100644
--- a/drivers/s390/cio/eadm_sch.c
+++ b/drivers/s390/cio/eadm_sch.c
@@ -5,6 +5,7 @@
5 * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com> 5 * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
6 */ 6 */
7 7
8#include <linux/kernel_stat.h>
8#include <linux/workqueue.h> 9#include <linux/workqueue.h>
9#include <linux/spinlock.h> 10#include <linux/spinlock.h>
10#include <linux/device.h> 11#include <linux/device.h>
@@ -138,6 +139,8 @@ static void eadm_subchannel_irq(struct subchannel *sch)
138 EADM_LOG(6, "irq"); 139 EADM_LOG(6, "irq");
139 EADM_LOG_HEX(6, irb, sizeof(*irb)); 140 EADM_LOG_HEX(6, irb, sizeof(*irb));
140 141
142 kstat_cpu(smp_processor_id()).irqs[IOINT_ADM]++;
143
141 if ((scsw->stctl & (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND)) 144 if ((scsw->stctl & (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND))
142 && scsw->eswf == 1 && irb->esw.eadm.erw.r) 145 && scsw->eswf == 1 && irb->esw.eadm.erw.r)
143 error = -EIO; 146 error = -EIO;