qeth: Support VEPA mode

The existing port isolation mode 'forward' will now verify that the adjacent
switch port supports the required reflective relay (RR) mode. This patch adds
the required error handling for the cases where enabling port isolation mode
'forward' can now fail.
Furthermore, once established, we never fall back from one of the port
isolation modes to a non-isolated mode without further user-interaction.
This includes cases where the isolation mode was enabled successfully, but
ceases to work e.g. due to configuration changes at the switch port.
Finally, configuring an isolation mode with the device being offline
will make onlining the device fail permanently upon errors encountered until
either errors are resolved or the isolation mode is changed by the user to a
different mode.

Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Reviewed-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 73195553f84b..d690166efeaf 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1025,9 +1025,14 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
 
 contin:
         if ((card->info.type == QETH_CARD_TYPE_OSD) ||
-            (card->info.type == QETH_CARD_TYPE_OSX))
+            (card->info.type == QETH_CARD_TYPE_OSX)) {
                 /* configure isolation level */
-                qeth_set_access_ctrl_online(card);
+                rc = qeth_set_access_ctrl_online(card, 0);
+                if (rc) {
+                        rc = -ENODEV;
+                        goto out_remove;
+                }
+        }
 
         if (card->info.type != QETH_CARD_TYPE_OSN &&
             card->info.type != QETH_CARD_TYPE_OSM)
@@ -1144,12 +1149,9 @@ static int qeth_l2_recover(void *ptr)
                 dev_info(&card->gdev->dev,
                         "Device successfully recovered!\n");
         else {
-                if (rtnl_trylock()) {
-                        dev_close(card->dev);
-                        rtnl_unlock();
-                        dev_warn(&card->gdev->dev, "The qeth device driver "
+                qeth_close_dev(card);
+                dev_warn(&card->gdev->dev, "The qeth device driver "
                                 "failed to recover an error on the device\n");
-                }
         }
         qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
         qeth_clear_thread_running_bit(card, QETH_RECOVER_THREAD);