10 files changed, 102 insertions, 60 deletions

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 89ece1c235aa..66e21dd23154 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -357,6 +357,7 @@ static int mon_close(struct inode *inode, struct file *filp)
         atomic_set(&monpriv->msglim_count, 0);
         monpriv->write_index  = 0;
         monpriv->read_index   = 0;
+        dev_set_drvdata(monreader_device, NULL);
 
         for (i = 0; i < MON_MSGLIM; i++)
                 kfree(monpriv->msg_array[i]);
diff --git a/drivers/s390/char/sclp_async.c b/drivers/s390/char/sclp_async.c
index a4f68e5b9c96..b44462a6c6d3 100644
--- a/drivers/s390/char/sclp_async.c
+++ b/drivers/s390/char/sclp_async.c
@@ -26,7 +26,6 @@ static struct sclp_async_sccb *sccb;
 static int sclp_async_send_wait(char *message);
 static struct ctl_table_header *callhome_sysctl_header;
 static DEFINE_SPINLOCK(sclp_async_lock);
-static char nodename[64];
 #define SCLP_NORMAL_WRITE       0x00
 
 struct async_evbuf {
@@ -52,9 +51,10 @@ static struct sclp_register sclp_async_register = {
 static int call_home_on_panic(struct notifier_block *self,
                               unsigned long event, void *data)
 {
-                strncat(data, nodename, strlen(nodename));
-                sclp_async_send_wait(data);
-                return NOTIFY_DONE;
+        strncat(data, init_utsname()->nodename,
+                sizeof(init_utsname()->nodename));
+        sclp_async_send_wait(data);
+        return NOTIFY_DONE;
 }
 
 static struct notifier_block call_home_panic_nb = {
@@ -68,15 +68,14 @@ static int proc_handler_callhome(struct ctl_table *ctl, int write,
 {
         unsigned long val;
         int len, rc;
-        char buf[2];
+        char buf[3];
 
-        if (!*count | (*ppos && !write)) {
+        if (!*count || (*ppos && !write)) {
                 *count = 0;
                 return 0;
         }
         if (!write) {
-                len =  sprintf(buf, "%d\n", callhome_enabled);
-                buf[len] = '\0';
+                len = snprintf(buf, sizeof(buf), "%d\n", callhome_enabled);
                 rc = copy_to_user(buffer, buf, sizeof(buf));
                 if (rc != 0)
                         return -EFAULT;
@@ -171,39 +170,29 @@ static int __init sclp_async_init(void)
         rc = sclp_register(&sclp_async_register);
         if (rc)
                 return rc;
-        callhome_sysctl_header = register_sysctl_table(kern_dir_table);
-        if (!callhome_sysctl_header) {
-                rc = -ENOMEM;
-                goto out_sclp;
-        }
-        if (!(sclp_async_register.sclp_receive_mask & EVTYP_ASYNC_MASK)) {
-                rc = -EOPNOTSUPP;
+        rc = -EOPNOTSUPP;
+        if (!(sclp_async_register.sclp_receive_mask & EVTYP_ASYNC_MASK))
                 goto out_sclp;
-        }
         rc = -ENOMEM;
+        callhome_sysctl_header = register_sysctl_table(kern_dir_table);
+        if (!callhome_sysctl_header)
+                goto out_sclp;
         request = kzalloc(sizeof(struct sclp_req), GFP_KERNEL);
-        if (!request)
-                goto out_sys;
         sccb = (struct sclp_async_sccb *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
-        if (!sccb)
+        if (!request || !sccb)
                 goto out_mem;
-        rc =  atomic_notifier_chain_register(&panic_notifier_list,
-                                             &call_home_panic_nb);
-        if (rc)
-                goto out_mem;
-
-        strncpy(nodename, init_utsname()->nodename, 64);
-        return 0;
-
+        rc = atomic_notifier_chain_register(&panic_notifier_list,
+                                            &call_home_panic_nb);
+        if (!rc)
+                goto out;
 out_mem:
         kfree(request);
         free_page((unsigned long) sccb);
-out_sys:
         unregister_sysctl_table(callhome_sysctl_header);
 out_sclp:
         sclp_unregister(&sclp_async_register);
+out:
         return rc;
-
 }
 module_init(sclp_async_init);
 
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index 84c191c1cd62..05909a7df8b3 100644
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -20,9 +20,12 @@
 
 #include "sclp.h"
 
+static void (*old_machine_restart)(char *);
+static void (*old_machine_halt)(void);
+static void (*old_machine_power_off)(void);
+
 /* Shutdown handler. Signal completion of shutdown by loading special PSW. */
-static void
-do_machine_quiesce(void)
+static void do_machine_quiesce(void)
 {
         psw_t quiesce_psw;
 
@@ -33,23 +36,48 @@ do_machine_quiesce(void)
 }
 
 /* Handler for quiesce event. Start shutdown procedure. */
-static void
-sclp_quiesce_handler(struct evbuf_header *evbuf)
+static void sclp_quiesce_handler(struct evbuf_header *evbuf)
 {
-        _machine_restart = (void *) do_machine_quiesce;
-        _machine_halt = do_machine_quiesce;
-        _machine_power_off = do_machine_quiesce;
+        if (_machine_restart != (void *) do_machine_quiesce) {
+                old_machine_restart = _machine_restart;
+                old_machine_halt = _machine_halt;
+                old_machine_power_off = _machine_power_off;
+                _machine_restart = (void *) do_machine_quiesce;
+                _machine_halt = do_machine_quiesce;
+                _machine_power_off = do_machine_quiesce;
+        }
         ctrl_alt_del();
 }
 
+/* Undo machine restart/halt/power_off modification on resume */
+static void sclp_quiesce_pm_event(struct sclp_register *reg,
+                                  enum sclp_pm_event sclp_pm_event)
+{
+        switch (sclp_pm_event) {
+        case SCLP_PM_EVENT_RESTORE:
+                if (old_machine_restart) {
+                        _machine_restart = old_machine_restart;
+                        _machine_halt = old_machine_halt;
+                        _machine_power_off = old_machine_power_off;
+                        old_machine_restart = NULL;
+                        old_machine_halt = NULL;
+                        old_machine_power_off = NULL;
+                }
+                break;
+        case SCLP_PM_EVENT_FREEZE:
+        case SCLP_PM_EVENT_THAW:
+                break;
+        }
+}
+
 static struct sclp_register sclp_quiesce_event = {
         .receive_mask = EVTYP_SIGQUIESCE_MASK,
-        .receiver_fn = sclp_quiesce_handler
+        .receiver_fn = sclp_quiesce_handler,
+        .pm_event_fn = sclp_quiesce_pm_event
 };
 
 /* Initialize quiesce driver. */
-static int __init
-sclp_quiesce_init(void)
+static int __init sclp_quiesce_init(void)
 {
         return sclp_register(&sclp_quiesce_event);
 }
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 102000d1af6f..3012355f8304 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -158,7 +158,12 @@ static int smsg_pm_restore_thaw(struct device *dev)
                 smsg_path->flags = 0;
                 rc = iucv_path_connect(smsg_path, &smsg_handler, "*MSG    ",
                                        NULL, NULL, NULL);
-                printk(KERN_ERR "iucv_path_connect returned with rc %i\n", rc);
+#ifdef CONFIG_PM_DEBUG
+                if (rc)
+                        printk(KERN_ERR
+                               "iucv_path_connect returned with rc %i\n", rc);
+#endif
+                cpcmd("SET SMSG IUCV", NULL, 0, NULL);
         }
         return 0;
 }
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 0f79f3af4f54..2889e5f2dfd3 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -128,12 +128,13 @@ out_ccwdev:
 static void __init zfcp_init_device_setup(char *devstr)
 {
         char *token;
-        char *str;
+        char *str, *str_saved;
         char busid[ZFCP_BUS_ID_SIZE];
         u64 wwpn, lun;
 
         /* duplicate devstr and keep the original for sysfs presentation*/
-        str = kmalloc(strlen(devstr) + 1, GFP_KERNEL);
+        str_saved = kmalloc(strlen(devstr) + 1, GFP_KERNEL);
+        str = str_saved;
         if (!str)
                 return;
 
@@ -152,12 +153,12 @@ static void __init zfcp_init_device_setup(char *devstr)
         if (!token || strict_strtoull(token, 0, (unsigned long long *) &lun))
                 goto err_out;
 
-        kfree(str);
+        kfree(str_saved);
         zfcp_init_device_configure(busid, wwpn, lun);
         return;
 
- err_out:
-        kfree(str);
+err_out:
+        kfree(str_saved);
         pr_err("%s is not a valid SCSI device\n", devstr);
 }
 
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 73d366ba31e5..f73e2180f333 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -858,10 +858,7 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
                 if (fc_host_port_type(adapter->scsi_host) == FC_PORTTYPE_PTP)
                         return zfcp_erp_open_ptp_port(act);
                 if (!port->d_id) {
-                        zfcp_port_get(port);
-                        if (!queue_work(adapter->work_queue,
-                                        &port->gid_pn_work))
-                                zfcp_port_put(port);
+                        zfcp_fc_trigger_did_lookup(port);
                         return ZFCP_ERP_EXIT;
                 }
                 return zfcp_erp_port_strategy_open_port(act);
@@ -869,12 +866,11 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
         case ZFCP_ERP_STEP_PORT_OPENING:
                 /* D_ID might have changed during open */
                 if (p_status & ZFCP_STATUS_COMMON_OPEN) {
-                        if (port->d_id)
-                                return ZFCP_ERP_SUCCEEDED;
-                        else {
-                                act->step = ZFCP_ERP_STEP_PORT_CLOSING;
-                                return ZFCP_ERP_CONTINUES;
+                        if (!port->d_id) {
+                                zfcp_fc_trigger_did_lookup(port);
+                                return ZFCP_ERP_EXIT;
                         }
+                        return ZFCP_ERP_SUCCEEDED;
                 }
                 if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {
                         port->d_id = 0;
@@ -889,19 +885,21 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
 static int zfcp_erp_port_strategy(struct zfcp_erp_action *erp_action)
 {
         struct zfcp_port *port = erp_action->port;
+        int p_status = atomic_read(&port->status);
 
-        if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_NOESC)
+        if ((p_status & ZFCP_STATUS_COMMON_NOESC) &&
+            !(p_status & ZFCP_STATUS_COMMON_OPEN))
                 goto close_init_done;
 
         switch (erp_action->step) {
         case ZFCP_ERP_STEP_UNINITIALIZED:
                 zfcp_erp_port_strategy_clearstati(port);
-                if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_OPEN)
+                if (p_status & ZFCP_STATUS_COMMON_OPEN)
                         return zfcp_erp_port_strategy_close(erp_action);
                 break;
 
         case ZFCP_ERP_STEP_PORT_CLOSING:
-                if (atomic_read(&port->status) & ZFCP_STATUS_COMMON_OPEN)
+                if (p_status & ZFCP_STATUS_COMMON_OPEN)
                         return ZFCP_ERP_FAILED;
                 break;
         }
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index 629edec70405..b3f28deb4505 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -96,6 +96,7 @@ extern int zfcp_fc_scan_ports(struct zfcp_adapter *);
 extern void _zfcp_fc_scan_ports_later(struct work_struct *);
 extern void zfcp_fc_incoming_els(struct zfcp_fsf_req *);
 extern void zfcp_fc_port_did_lookup(struct work_struct *);
+extern void zfcp_fc_trigger_did_lookup(struct zfcp_port *);
 extern void zfcp_fc_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *);
 extern void zfcp_fc_test_link(struct zfcp_port *);
 extern void zfcp_fc_link_test_work(struct work_struct *);
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index 722f22de8753..df23bcead23d 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -361,6 +361,17 @@ out:
 }
 
 /**
+ * zfcp_fc_trigger_did_lookup - trigger the d_id lookup using a GID_PN request
+ * @port: The zfcp_port to lookup the d_id for.
+ */
+void zfcp_fc_trigger_did_lookup(struct zfcp_port *port)
+{
+        zfcp_port_get(port);
+        if (!queue_work(port->adapter->work_queue, &port->gid_pn_work))
+                zfcp_port_put(port);
+}
+
+/**
  * zfcp_fc_plogi_evaluate - evaluate PLOGI playload
  * @port: zfcp_port structure
  * @plogi: plogi payload
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 38a7e4a6b639..4e41baa0c141 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1079,7 +1079,7 @@ static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req,
         /* common settings for ct/gs and els requests */
         req->qtcb->bottom.support.service_class = FSF_CLASS_3;
         req->qtcb->bottom.support.timeout = 2 * R_A_TOV;
-        zfcp_fsf_start_timer(req, 2 * R_A_TOV + 10);
+        zfcp_fsf_start_timer(req, (2 * R_A_TOV + 10) * HZ);
 
         return 0;
 }
@@ -1475,9 +1475,16 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                 plogi = (struct fsf_plogi *) req->qtcb->bottom.support.els;
                 if (req->qtcb->bottom.support.els1_length >=
                     FSF_PLOGI_MIN_LEN) {
-                        if (plogi->serv_param.wwpn != port->wwpn)
+                        if (plogi->serv_param.wwpn != port->wwpn) {
                                 port->d_id = 0;
-                        else {
+                                dev_warn(&port->adapter->ccw_device->dev,
+                                         "A port opened with WWPN 0x%016Lx "
+                                         "returned data that identifies it as "
+                                         "WWPN 0x%016Lx\n",
+                                         (unsigned long long) port->wwpn,
+                                         (unsigned long long)
+                                          plogi->serv_param.wwpn);
+                        } else {
                                 port->wwnn = plogi->serv_param.wwnn;
                                 zfcp_fc_plogi_evaluate(port, plogi);
                         }
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 079a8cf518a3..d31000886ca8 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -224,6 +224,7 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev,
 
         zfcp_erp_unit_reopen(unit, 0, "syuas_1", NULL);
         zfcp_erp_wait(unit->port->adapter);
+        flush_work(&unit->scsi_work);
         zfcp_unit_put(unit);
 out:
         mutex_unlock(&zfcp_data.config_mutex);