Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (81 commits)
  [S390] remove duplicated #includes
  [S390] cpumask: use mm_cpumask() wrapper
  [S390] cpumask: Use accessors code.
  [S390] cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.
  [S390] cpumask: remove cpu_coregroup_map
  [S390] fix clock comparator save area usage
  [S390] Add hwcap flag for the etf3 enhancement facility
  [S390] Ensure that ipl panic notifier is called late.
  [S390] fix dfp elf hwcap/facility bit detection
  [S390] smp: perform initial cpu reset before starting a cpu
  [S390] smp: fix memory leak on __cpu_up
  [S390] ipl: Improve checking logic and remove switch defaults.
  [S390] s390dbf: Remove needless check for NULL pointer.
  [S390] s390dbf: Remove redundant initilizations.
  [S390] use kzfree()
  [S390] BUG to BUG_ON changes
  [S390] zfcpdump: Prevent zcore from beeing built as a kernel module.
  [S390] Use csum_partial in checksum.h
  [S390] cleanup lowcore.h
  [S390] eliminate ipl_device from lowcore
  ...

1 files changed, 47 insertions, 11 deletions

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 427d11d88069..0085d8901792 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -18,8 +18,8 @@
 #include <linux/list.h>
 #include <linux/reboot.h>
 #include <asm/isc.h>
+#include <asm/crw.h>
 
-#include "../s390mach.h"
 #include "css.h"
 #include "cio.h"
 #include "cio_debug.h"
@@ -83,6 +83,25 @@ static int call_fn_unknown_sch(struct subchannel_id schid, void *data)
         return rc;
 }
 
+static int call_fn_all_sch(struct subchannel_id schid, void *data)
+{
+        struct cb_data *cb = data;
+        struct subchannel *sch;
+        int rc = 0;
+
+        sch = get_subchannel_by_schid(schid);
+        if (sch) {
+                if (cb->fn_known_sch)
+                        rc = cb->fn_known_sch(sch, cb->data);
+                put_device(&sch->dev);
+        } else {
+                if (cb->fn_unknown_sch)
+                        rc = cb->fn_unknown_sch(schid, cb->data);
+        }
+
+        return rc;
+}
+
 int for_each_subchannel_staged(int (*fn_known)(struct subchannel *, void *),
                                int (*fn_unknown)(struct subchannel_id,
                                void *), void *data)
@@ -90,13 +109,17 @@ int for_each_subchannel_staged(int (*fn_known)(struct subchannel *, void *),
         struct cb_data cb;
         int rc;
 
-        cb.set = idset_sch_new();
-        if (!cb.set)
-                return -ENOMEM;
-        idset_fill(cb.set);
         cb.data = data;
         cb.fn_known_sch = fn_known;
         cb.fn_unknown_sch = fn_unknown;
+
+        cb.set = idset_sch_new();
+        if (!cb.set)
+                /* fall back to brute force scanning in case of oom */
+                return for_each_subchannel(call_fn_all_sch, &cb);
+
+        idset_fill(cb.set);
+
         /* Process registered subchannels. */
         rc = bus_for_each_dev(&css_bus_type, NULL, &cb, call_fn_known_sch);
         if (rc)
@@ -510,6 +533,17 @@ static int reprobe_subchannel(struct subchannel_id schid, void *data)
         return ret;
 }
 
+static void reprobe_after_idle(struct work_struct *unused)
+{
+        /* Make sure initial subchannel scan is done. */
+        wait_event(ccw_device_init_wq,
+                   atomic_read(&ccw_device_init_count) == 0);
+        if (need_reprobe)
+                css_schedule_reprobe();
+}
+
+static DECLARE_WORK(reprobe_idle_work, reprobe_after_idle);
+
 /* Work function used to reprobe all unregistered subchannels. */
 static void reprobe_all(struct work_struct *unused)
 {
@@ -517,10 +551,12 @@ static void reprobe_all(struct work_struct *unused)
 
         CIO_MSG_EVENT(4, "reprobe start\n");
 
-        need_reprobe = 0;
         /* Make sure initial subchannel scan is done. */
-        wait_event(ccw_device_init_wq,
-                   atomic_read(&ccw_device_init_count) == 0);
+        if (atomic_read(&ccw_device_init_count) != 0) {
+                queue_work(ccw_device_work, &reprobe_idle_work);
+                return;
+        }
+        need_reprobe = 0;
         ret = for_each_subchannel_staged(NULL, reprobe_subchannel, NULL);
 
         CIO_MSG_EVENT(4, "reprobe done (rc=%d, need_reprobe=%d)\n", ret,
@@ -619,7 +655,7 @@ css_generate_pgid(struct channel_subsystem *css, u32 tod_high)
                 css->global_pgid.pgid_high.ext_cssid.cssid = css->cssid;
         } else {
 #ifdef CONFIG_SMP
-                css->global_pgid.pgid_high.cpu_addr = hard_smp_processor_id();
+                css->global_pgid.pgid_high.cpu_addr = stap();
 #else
                 css->global_pgid.pgid_high.cpu_addr = 0;
 #endif
@@ -765,7 +801,7 @@ init_channel_subsystem (void)
         if (ret)
                 goto out;
 
-        ret = s390_register_crw_handler(CRW_RSC_SCH, css_process_crw);
+        ret = crw_register_handler(CRW_RSC_SCH, css_process_crw);
         if (ret)
                 goto out;
 
@@ -845,7 +881,7 @@ out_unregister:
 out_bus:
         bus_unregister(&css_bus_type);
 out:
-        s390_unregister_crw_handler(CRW_RSC_CSS);
+        crw_unregister_handler(CRW_RSC_CSS);
         chsc_free_sei_area();
         kfree(slow_subchannel_set);
         pr_alert("The CSS device driver initialization failed with "