1 files changed, 25 insertions, 12 deletions

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index ae1bf231d089..b3a56dc5f68a 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -122,7 +122,7 @@ cio_get_options (struct subchannel *sch)
  * Use tpi to get a pending interrupt, call the interrupt handler and
  * return a pointer to the subchannel structure.
  */
-static inline int
+static int
 cio_tpi(void)
 {
         struct tpi_info *tpi_info;
@@ -152,7 +152,7 @@ cio_tpi(void)
         return 1;
 }
 
-static inline int
+static int
 cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)
 {
         char dbf_text[15];
@@ -585,7 +585,7 @@ cio_validate_subchannel (struct subchannel *sch, struct subchannel_id schid)
                  * This device must not be known to Linux. So we simply
                  * say that there is no device and return ENODEV.
                  */
-                CIO_MSG_EVENT(0, "Blacklisted device detected "
+                CIO_MSG_EVENT(4, "Blacklisted device detected "
                               "at devno %04X, subchannel set %x\n",
                               sch->schib.pmcw.dev, sch->schid.ssid);
                 err = -ENODEV;
@@ -646,7 +646,7 @@ do_IRQ (struct pt_regs *regs)
                  * Make sure that the i/o interrupt did not "overtake"
                  * the last HZ timer interrupt.
                  */
-                account_ticks();
+                account_ticks(S390_lowcore.int_clock);
         /*
          * Get interrupt information from lowcore
          */
@@ -832,7 +832,7 @@ cio_get_console_subchannel(void)
 }
 
 #endif
-static inline int
+static int
 __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)
 {
         int retry, cc;
@@ -850,7 +850,20 @@ __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)
         return -EBUSY; /* uhm... */
 }
 
-static inline int
+/* we can't use the normal udelay here, since it enables external interrupts */
+
+static void udelay_reset(unsigned long usecs)
+{
+        uint64_t start_cc, end_cc;
+
+        asm volatile ("STCK %0" : "=m" (start_cc));
+        do {
+                cpu_relax();
+                asm volatile ("STCK %0" : "=m" (end_cc));
+        } while (((end_cc - start_cc)/4096) < usecs);
+}
+
+static int
 __clear_subchannel_easy(struct subchannel_id schid)
 {
         int retry;
@@ -865,7 +878,7 @@ __clear_subchannel_easy(struct subchannel_id schid)
                         if (schid_equal(&ti.schid, &schid))
                                 return 0;
                 }
-                udelay(100);
+                udelay_reset(100);
         }
         return -EBUSY;
 }
@@ -882,11 +895,11 @@ static int stsch_reset(struct subchannel_id schid, volatile struct schib *addr)
         int rc;
 
         pgm_check_occured = 0;
-        s390_reset_pgm_handler = cio_reset_pgm_check_handler;
+        s390_base_pgm_handler_fn = cio_reset_pgm_check_handler;
         rc = stsch(schid, addr);
-        s390_reset_pgm_handler = NULL;
+        s390_base_pgm_handler_fn = NULL;
 
-        /* The program check handler could have changed pgm_check_occured */
+        /* The program check handler could have changed pgm_check_occured. */
         barrier();
 
         if (pgm_check_occured)
@@ -944,7 +957,7 @@ static void css_reset(void)
         /* Reset subchannels. */
         for_each_subchannel(__shutdown_subchannel_easy,  NULL);
         /* Reset channel paths. */
-        s390_reset_mcck_handler = s390_reset_chpids_mcck_handler;
+        s390_base_mcck_handler_fn = s390_reset_chpids_mcck_handler;
         /* Enable channel report machine checks. */
         __ctl_set_bit(14, 28);
         /* Temporarily reenable machine checks. */
@@ -969,7 +982,7 @@ static void css_reset(void)
         local_mcck_disable();
         /* Disable channel report machine checks. */
         __ctl_clear_bit(14, 28);
-        s390_reset_mcck_handler = NULL;
+        s390_base_mcck_handler_fn = NULL;
 }
 
 static struct reset_call css_reset_call = {