diff options
author | Ursula Braun <ursula.braun@de.ibm.com> | 2010-01-10 21:50:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-13 23:34:56 -0500 |
commit | 84b66683dba002f4cce2aaf78bf45debfaf22795 (patch) | |
tree | bd26657a46dc210e700051f91d3c4ec9c41acc03 /drivers/s390 | |
parent | 76b11f8e270f04851774ff64b16e29e5a43d3a1a (diff) |
qeth: avoid recovery during device online setting
If a qeth device is set online, several initialisation steps are
performed. If a failure in one of these steps occurs, the qeth
device is reset into DOWN state. If due to the failure a qeth recovery
is scheduled and started in another thread, this might cause all kinds
of conflicts, even a kernel panic. The patch forbids scheduling of a
qeth recovery while online processing is performed till the card is in
state SOFTSETUP.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/net/qeth_l2_main.c | 1 | ||||
-rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 74ba388a159f..c3258b0dd649 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c | |||
@@ -927,7 +927,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode) | |||
927 | QETH_DBF_TEXT(SETUP, 2, "setonlin"); | 927 | QETH_DBF_TEXT(SETUP, 2, "setonlin"); |
928 | QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *)); | 928 | QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *)); |
929 | 929 | ||
930 | qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1); | ||
931 | recover_flag = card->state; | 930 | recover_flag = card->state; |
932 | rc = qeth_core_hardsetup_card(card); | 931 | rc = qeth_core_hardsetup_card(card); |
933 | if (rc) { | 932 | if (rc) { |
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 337d03fb045d..5475834ab916 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c | |||
@@ -3338,8 +3338,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode) | |||
3338 | QETH_DBF_TEXT(SETUP, 2, "setonlin"); | 3338 | QETH_DBF_TEXT(SETUP, 2, "setonlin"); |
3339 | QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *)); | 3339 | QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *)); |
3340 | 3340 | ||
3341 | qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1); | ||
3342 | |||
3343 | recover_flag = card->state; | 3341 | recover_flag = card->state; |
3344 | rc = qeth_core_hardsetup_card(card); | 3342 | rc = qeth_core_hardsetup_card(card); |
3345 | if (rc) { | 3343 | if (rc) { |