[S390] fix mismatch in summation of I/O IRQ statistics

Current IRQ statistics support does not show detail counts for I/O
interrupts which are processed internally only. The result is a
summation count which is way off such as this one:

           CPU0       CPU1       CPU2
I/O:       1331        710        442
[...]
QAI:         15         16         16   [I/O] QDIO Adapter Interrupt
QDI:          1          0          0   [I/O] QDIO Interrupt
DAS:        706        645        381   [I/O] DASD
C15:         26         10          0   [I/O] 3215
C70:          0          0          0   [I/O] 3270
TAP:          0          0          0   [I/O] Tape
VMR:          0          0          0   [I/O] Unit Record Devices
LCS:          0          0          0   [I/O] LCS
CLW:          0          0          0   [I/O] CLAW
CTC:          0          0          0   [I/O] CTC
APB:          0          0          0   [I/O] AP Bus

Fix this by moving I/O interrupt accounting into the common I/O layer.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

3 files changed, 5 insertions, 2 deletions

diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
index 623f2fb71774..9381c92cc779 100644
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/mod_devicetable.h>
 #include <asm/fcx.h>
+#include <asm/irq.h>
 
 /* structs from asm/cio.h */
 struct irb;
@@ -127,6 +128,7 @@ enum uc_todo {
  * @restore: callback for restoring after hibernation
  * @uc_handler: callback for unit check handler
  * @driver: embedded device driver structure
+ * @int_class: interruption class to use for accounting interrupts
  */
 struct ccw_driver {
         struct ccw_device_id *ids;
@@ -144,6 +146,7 @@ struct ccw_driver {
         int (*restore)(struct ccw_device *);
         enum uc_todo (*uc_handler) (struct ccw_device *, struct irb *);
         struct device_driver driver;
+        enum interruption_class int_class;
 };
 
 extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index ba7b01c726a3..1f686059f293 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -17,8 +17,8 @@ enum interruption_class {
         EXTINT_SCP,
         EXTINT_IUC,
         EXTINT_CPM,
+        IOINT_CIO,
         IOINT_QAI,
-        IOINT_QDI,
         IOINT_DAS,
         IOINT_C15,
         IOINT_C70,
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 1f4050d45f78..d382f9db3df5 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -42,8 +42,8 @@ static const struct irq_class intrclass_names[] = {
         {.name = "SCP", .desc = "[EXT] Service Call" },
         {.name = "IUC", .desc = "[EXT] IUCV" },
         {.name = "CPM", .desc = "[EXT] CPU Measurement" },
+        {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt" },
         {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
-        {.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" },