s390/qeth: issue STARTLAN as first IPA command

[ Upstream commit 1034051045d125579ab1e8fcd5a724eeb0e70149 ]

STARTLAN needs to be the first IPA command after MPC initialization
completes.
So move the qeth_send_startlan() call from the layer disciplines
into the core path, right after the MPC handshake.
While at it, replace the magic LAN OFFLINE return code
with the existing enum.

Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Reviewed-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Reviewed-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 741f3ee..5006cb6 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -909,7 +909,6 @@ void qeth_clear_thread_running_bit(struct qeth_card *, unsigned long);
 int qeth_core_hardsetup_card(struct qeth_card *);
 void qeth_print_status_message(struct qeth_card *);
 int qeth_init_qdio_queues(struct qeth_card *);
-int qeth_send_startlan(struct qeth_card *);
 int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *,
                  int (*reply_cb)
                  (struct qeth_card *, struct qeth_reply *, unsigned long),

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index d10bf3d..e5b9506 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -2955,7 +2955,7 @@ int qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
 }
 EXPORT_SYMBOL_GPL(qeth_send_ipa_cmd);
 
-int qeth_send_startlan(struct qeth_card *card)
+static int qeth_send_startlan(struct qeth_card *card)
 {
        int rc;
        struct qeth_cmd_buffer *iob;
@@ -2968,7 +2968,6 @@ int qeth_send_startlan(struct qeth_card *card)
        rc = qeth_send_ipa_cmd(card, iob, NULL, NULL);
        return rc;
 }
-EXPORT_SYMBOL_GPL(qeth_send_startlan);
 
 static int qeth_default_setadapterparms_cb(struct qeth_card *card,
                struct qeth_reply *reply, unsigned long data)
@@ -5080,6 +5079,20 @@ retriable:
                goto out;
        }
 
+       rc = qeth_send_startlan(card);
+       if (rc) {
+               QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
+               if (rc == IPA_RC_LAN_OFFLINE) {
+                       dev_warn(&card->gdev->dev,
+                               "The LAN is offline\n");
+                       card->lan_online = 0;
+               } else {
+                       rc = -ENODEV;
+                       goto out;
+               }
+       } else
+               card->lan_online = 1;
+
        card->options.ipa4.supported_funcs = 0;
        card->options.ipa6.supported_funcs = 0;
        card->options.adp.supported_funcs = 0;
@@ -5091,14 +5104,14 @@ retriable:
        if (qeth_is_supported(card, IPA_SETADAPTERPARMS)) {
                rc = qeth_query_setadapterparms(card);
                if (rc < 0) {
-                       QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
+                       QETH_DBF_TEXT_(SETUP, 2, "7err%d", rc);
                        goto out;
                }
        }
        if (qeth_adp_supported(card, IPA_SETADP_SET_DIAG_ASSIST)) {
                rc = qeth_query_setdiagass(card);
                if (rc < 0) {
-                       QETH_DBF_TEXT_(SETUP, 2, "7err%d", rc);
+                       QETH_DBF_TEXT_(SETUP, 2, "8err%d", rc);
                        goto out;
                }
        }

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index bf1e0e3..58bcb3c 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1203,21 +1203,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        /* softsetup */
        QETH_DBF_TEXT(SETUP, 2, "softsetp");
 
-       rc = qeth_send_startlan(card);
-       if (rc) {
-               QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-               if (rc == 0xe080) {
-                       dev_warn(&card->gdev->dev,
-                               "The LAN is offline\n");
-                       card->lan_online = 0;
-                       goto contin;
-               }
-               rc = -ENODEV;
-               goto out_remove;
-       } else
-               card->lan_online = 1;
-
-contin:
        if ((card->info.type == QETH_CARD_TYPE_OSD) ||
            (card->info.type == QETH_CARD_TYPE_OSX)) {
                if (qeth_l2_start_ipassists(card))

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 285fe0b..bf3c1b2 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3298,21 +3298,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        /* softsetup */
        QETH_DBF_TEXT(SETUP, 2, "softsetp");
 
-       rc = qeth_send_startlan(card);
-       if (rc) {
-               QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
-               if (rc == 0xe080) {
-                       dev_warn(&card->gdev->dev,
-                               "The LAN is offline\n");
-                       card->lan_online = 0;
-                       goto contin;
-               }
-               rc = -ENODEV;
-               goto out_remove;
-       } else
-               card->lan_online = 1;
-
-contin:
        rc = qeth_l3_setadapter_parms(card);
        if (rc)
                QETH_DBF_TEXT_(SETUP, 2, "2err%04x", rc);