s390/qeth: remove OSN-specific IO code

OSN currently provides a custom code path to submit IPA cmds, without
waiting for the cmd response. Replace it with qeth_send_ipa_cmd(), which
uses the common qeth_send_control_data() IO infrastructure.

By setting a custom iob->callback, we can now provide feedback to the
caller about whether the cmd has been successfully submitted to HW.
Since the callback then immediately wakes up the reply-waiter object, we
maintain the old behaviour of returning early without waiting for the
response.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 14e8ab34ab2f963401df80a0a26308c7d725b594..be50e701b74409657b21c3ead5edea66e3f109f2 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -996,6 +996,7 @@ void qeth_setadp_promisc_mode(struct qeth_card *);
 int qeth_setadpparms_change_macaddr(struct qeth_card *);
 void qeth_tx_timeout(struct net_device *);
 void qeth_release_buffer(struct qeth_channel *, struct qeth_cmd_buffer *);
+void qeth_notify_reply(struct qeth_reply *reply, int reason);
 void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
                          u16 cmd_length);
 struct qeth_cmd_buffer *qeth_get_buffer(struct qeth_channel *channel);

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 3d25cff404fea6ad61a659f097f2e706fa5133b9..2ad51afa6747f37d79a5e512b25b43c3621d39df 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -577,11 +577,12 @@ static void qeth_dequeue_reply(struct qeth_card *card, struct qeth_reply *reply)
        spin_unlock_irq(&card->lock);
 }
 
-static void qeth_notify_reply(struct qeth_reply *reply, int reason)
+void qeth_notify_reply(struct qeth_reply *reply, int reason)
 {
        reply->rc = reason;
        complete(&reply->received);
 }
+EXPORT_SYMBOL_GPL(qeth_notify_reply);
 
 static void qeth_issue_ipa_msg(struct qeth_ipa_cmd *cmd, int rc,
                struct qeth_card *card)

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 5fa217382480236089609bdba0456cf240f6513d..7db2c5672e028fa8bb6b86ff8007ed85d5bf53f8 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1033,42 +1033,12 @@ struct qeth_discipline qeth_l2_discipline = {
 };
 EXPORT_SYMBOL_GPL(qeth_l2_discipline);
 
-static int qeth_osn_send_control_data(struct qeth_card *card, int len,
-                          struct qeth_cmd_buffer *iob)
+static void qeth_osn_assist_cb(struct qeth_card *card,
+                              struct qeth_channel *channel,
+                              struct qeth_cmd_buffer *iob)
 {
-       struct qeth_channel *channel = iob->channel;
-       int rc = 0;
-
-       QETH_CARD_TEXT(card, 5, "osndctrd");
-
-       wait_event(card->wait_q, qeth_trylock_channel(channel));
-       iob->finalize(card, iob, len);
-       QETH_DBF_HEX(CTRL, 2, iob->data, min(len, QETH_DBF_CTRL_LEN));
-       QETH_CARD_TEXT(card, 6, "osnoirqp");
-       spin_lock_irq(get_ccwdev_lock(channel->ccwdev));
-       rc = ccw_device_start_timeout(channel->ccwdev, channel->ccw,
-                                     (addr_t) iob, 0, 0, iob->timeout);
-       spin_unlock_irq(get_ccwdev_lock(channel->ccwdev));
-       if (rc) {
-               QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: "
-                          "ccw_device_start rc = %i\n", rc);
-               QETH_CARD_TEXT_(card, 2, " err%d", rc);
-               qeth_release_buffer(channel, iob);
-               atomic_set(&channel->irq_pending, 0);
-               wake_up(&card->wait_q);
-       }
-       return rc;
-}
-
-static int qeth_osn_send_ipa_cmd(struct qeth_card *card,
-                                struct qeth_cmd_buffer *iob)
-{
-       u16 length;
-
-       QETH_CARD_TEXT(card, 4, "osndipa");
-
-       memcpy(&length, QETH_IPA_PDU_LEN_TOTAL(iob->data), 2);
-       return qeth_osn_send_control_data(card, length, iob);
+       qeth_notify_reply(iob->reply, 0);
+       qeth_release_buffer(channel, iob);
 }
 
 int qeth_osn_assist(struct net_device *dev, void *data, int data_len)
@@ -1090,7 +1060,8 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len)
 
        qeth_prepare_ipa_cmd(card, iob, (u16) data_len);
        memcpy(__ipa_cmd(iob), data, data_len);
-       return qeth_osn_send_ipa_cmd(card, iob);
+       iob->callback = qeth_osn_assist_cb;
+       return qeth_send_ipa_cmd(card, iob, NULL, NULL);
 }
 EXPORT_SYMBOL(qeth_osn_assist);