2 files changed, 12 insertions, 2 deletions

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 44d7cc2f9738..1aaddea673e0 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -680,9 +680,10 @@ int chsc_determine_base_channel_path_desc(struct chp_id chpid,
 {
         struct chsc_response_struct *chsc_resp;
         struct chsc_scpd *scpd_area;
+        unsigned long flags;
         int ret;
 
-        spin_lock_irq(&chsc_page_lock);
+        spin_lock_irqsave(&chsc_page_lock, flags);
         scpd_area = chsc_page;
         ret = chsc_determine_channel_path_desc(chpid, 0, 0, 0, 0, scpd_area);
         if (ret)
@@ -690,7 +691,7 @@ int chsc_determine_base_channel_path_desc(struct chp_id chpid,
         chsc_resp = (void *)&scpd_area->response;
         memcpy(desc, &chsc_resp->data, sizeof(*desc));
 out:
-        spin_unlock_irq(&chsc_page_lock);
+        spin_unlock_irqrestore(&chsc_page_lock, flags);
         return ret;
 }
 
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 5e1235c6aba0..771576bb2928 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -1030,7 +1030,16 @@ subsys_initcall_sync(channel_subsystem_init_sync);
 
 void channel_subsystem_reinit(void)
 {
+        struct channel_path *chp;
+        struct chp_id chpid;
+
         chsc_enable_facility(CHSC_SDA_OC_MSS);
+        chp_id_for_each(&chpid) {
+                chp = chpid_to_chp(chpid);
+                if (!chp)
+                        continue;
+                chsc_determine_base_channel_path_desc(chpid, &chp->desc);
+        }
 }
 
 #ifdef CONFIG_PROC_FS