s390/cio: fix irq stats for early interrupts on ccw consoles

Interrupts which happen on ccw consoles prior to their registration
with the driver core are not accounted to the respective device
driver. Fix this by setting the proper interrupt class during
initialization of ccw consoles.

Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index da431992fd8e..d8d9b5b5cc56 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1571,6 +1571,18 @@ out:
         return rc;
 }
 
+static void ccw_device_set_int_class(struct ccw_device *cdev)
+{
+        struct ccw_driver *cdrv = cdev->drv;
+
+        /* Note: we interpret class 0 in this context as an uninitialized
+         * field since it translates to a non-I/O interrupt class. */
+        if (cdrv->int_class != 0)
+                cdev->private->int_class = cdrv->int_class;
+        else
+                cdev->private->int_class = IRQIO_CIO;
+}
+
 #ifdef CONFIG_CCW_CONSOLE
 int __init ccw_device_enable_console(struct ccw_device *cdev)
 {
@@ -1635,6 +1647,7 @@ struct ccw_device * __init ccw_device_create_console(struct ccw_driver *drv)
         }
         cdev->drv = drv;
         set_io_private(sch, io_priv);
+        ccw_device_set_int_class(cdev);
         return cdev;
 }
 
@@ -1732,15 +1745,8 @@ ccw_device_probe (struct device *dev)
         int ret;
 
         cdev->drv = cdrv; /* to let the driver call _set_online */
-        /* Note: we interpret class 0 in this context as an uninitialized
-         * field since it translates to a non-I/O interrupt class. */
-        if (cdrv->int_class != 0)
-                cdev->private->int_class = cdrv->int_class;
-        else
-                cdev->private->int_class = IRQIO_CIO;
-
+        ccw_device_set_int_class(cdev);
         ret = cdrv->probe ? cdrv->probe(cdev) : -ENODEV;
-
         if (ret) {
                 cdev->drv = NULL;
                 cdev->private->int_class = IRQIO_CIO;