diff options
author | Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 2011-10-30 10:16:04 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-10-30 10:16:15 -0400 |
commit | de400d6b78d15a73023485f050bc6b1709dc7a79 (patch) | |
tree | 2d2e7233a76982db4cf12ff0859054a33e46a911 /drivers/s390/char/con3215.c | |
parent | ce949717b559709423c1ef716a9db16d1dcadaed (diff) |
[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>
Diffstat (limited to 'drivers/s390/char/con3215.c')
-rw-r--r-- | drivers/s390/char/con3215.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 694464c65fcd..934458ad55e5 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * Dan Morrison, IBM Corporation <dmorriso@cse.buffalo.edu> | 9 | * Dan Morrison, IBM Corporation <dmorriso@cse.buffalo.edu> |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/kernel_stat.h> | ||
13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
15 | #include <linux/kdev_t.h> | 14 | #include <linux/kdev_t.h> |
@@ -362,7 +361,6 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm, | |||
362 | int cstat, dstat; | 361 | int cstat, dstat; |
363 | int count; | 362 | int count; |
364 | 363 | ||
365 | kstat_cpu(smp_processor_id()).irqs[IOINT_C15]++; | ||
366 | raw = dev_get_drvdata(&cdev->dev); | 364 | raw = dev_get_drvdata(&cdev->dev); |
367 | req = (struct raw3215_req *) intparm; | 365 | req = (struct raw3215_req *) intparm; |
368 | cstat = irb->scsw.cmd.cstat; | 366 | cstat = irb->scsw.cmd.cstat; |
@@ -776,6 +774,7 @@ static struct ccw_driver raw3215_ccw_driver = { | |||
776 | .freeze = &raw3215_pm_stop, | 774 | .freeze = &raw3215_pm_stop, |
777 | .thaw = &raw3215_pm_start, | 775 | .thaw = &raw3215_pm_start, |
778 | .restore = &raw3215_pm_start, | 776 | .restore = &raw3215_pm_start, |
777 | .int_class = IOINT_C15, | ||
779 | }; | 778 | }; |
780 | 779 | ||
781 | #ifdef CONFIG_TN3215_CONSOLE | 780 | #ifdef CONFIG_TN3215_CONSOLE |