[S390] cio: Cleanup crw interface.

Eliminate the need for the machine check handler to call into
the common I/O layer directly by introducing an interface to
register handlers for crws per rsc.

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

1 files changed, 42 insertions, 7 deletions

diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 297f1653b52b..672d9731c525 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -18,6 +18,7 @@
 #include <asm/chpid.h>
 #include <asm/sclp.h>
 
+#include "../s390mach.h"
 #include "cio.h"
 #include "css.h"
 #include "ioasm.h"
@@ -476,24 +477,52 @@ void *chp_get_chp_desc(struct chp_id chpid)
 
 /**
  * chp_process_crw - process channel-path status change
- * @id: channel-path ID number
- * @status: non-zero if channel-path has become available, zero otherwise
+ * @crw0: channel report-word to handler
+ * @crw1: second channel-report word (always NULL)
+ * @overflow: crw overflow indication
  *
  * Handle channel-report-words indicating that the status of a channel-path
  * has changed.
  */
-void chp_process_crw(int id, int status)
+static void chp_process_crw(struct crw *crw0, struct crw *crw1,
+                            int overflow)
 {
         struct chp_id chpid;
 
+        if (overflow) {
+                css_schedule_eval_all();
+                return;
+        }
+        CIO_CRW_EVENT(2, "CRW reports slct=%d, oflw=%d, "
+                      "chn=%d, rsc=%X, anc=%d, erc=%X, rsid=%X\n",
+                      crw0->slct, crw0->oflw, crw0->chn, crw0->rsc, crw0->anc,
+                      crw0->erc, crw0->rsid);
+        /*
+         * Check for solicited machine checks. These are
+         * created by reset channel path and need not be
+         * handled here.
+         */
+        if (crw0->slct) {
+                CIO_CRW_EVENT(2, "solicited machine check for "
+                              "channel path %02X\n", crw0->rsid);
+                return;
+        }
         chp_id_init(&chpid);
-        chpid.id = id;
-        if (status) {
+        chpid.id = crw0->rsid;
+        switch (crw0->erc) {
+        case CRW_ERC_IPARM: /* Path has come. */
                 if (!chp_is_registered(chpid))
                         chp_new(chpid);
                 chsc_chp_online(chpid);
-        } else
+                break;
+        case CRW_ERC_PERRI: /* Path has gone. */
+        case CRW_ERC_PERRN:
                 chsc_chp_offline(chpid);
+                break;
+        default:
+                CIO_CRW_EVENT(2, "Don't know how to handle erc=%x\n",
+                              crw0->erc);
+        }
 }
 
 int chp_ssd_get_mask(struct chsc_ssd_info *ssd, struct res_acc_data *data)
@@ -674,10 +703,16 @@ static int cfg_wait_idle(void)
 static int __init chp_init(void)
 {
         struct chp_id chpid;
+        int ret;
 
+        ret = s390_register_crw_handler(CRW_RSC_CPATH, chp_process_crw);
+        if (ret)
+                return ret;
         chp_wq = create_singlethread_workqueue("cio_chp");
-        if (!chp_wq)
+        if (!chp_wq) {
+                s390_unregister_crw_handler(CRW_RSC_CPATH);
                 return -ENOMEM;
+        }
         INIT_WORK(&cfg_work, cfg_func);
         init_waitqueue_head(&cfg_wait_queue);
         if (info_update())