s390: qeth fixes 2.6.27-rc6
Subsystems (4)
cover s390: qeth fixes 2.6.27-rc6
Hi Jeff,
our internal regression found 2 more qeth bugs.
shortlog:
Ursula Braun (2)
qeth: use firmware MAC-address for layer2 hsi-devices
qeth: avoid qeth recovery problems
Thanks,
Frank
PATCH 1/2 qeth: use firmware MAC-address for layer2 hsi-devices
From: Ursula Braun <[email protected]>
Real HiperSocket devices in layer2 mode have a firmware-created MAC-address. This change enables the qeth driver to use this firmware MAC-address for layer2 HiperSocket devices.
---
drivers/s390/net/qeth_l2_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/s390/net/qeth_l2_main.c +2 -1
@@ -559,7 +559,8 @@ static int qeth_l2_request_initial_mac(s "device %s: x%x\n", CARD_BUS_ID(card), rc); } -if (card->info.guestlan) { +if ((card->info.type ==QETH_CARD_TYPE_IQD ) || + (card->info.guestlan)) { rc =qeth_setadpparms_change_macaddr (card);if (rc) { QETH_DBF_MESSAGE(2, "couldn't get MAC address on "
PATCH 2/2 qeth: avoid qeth recovery problems
In reply to [email protected]From: Ursula Braun <[email protected]>
Do not touch IFF_UP flag during qeth recovery, but invoke dev_close() in case of failing recovery.
Cancel outstanding control commands in case of Data Checks or Channel Checks.
Do not invoke qeth_l2_del_all_mc() in case of a hard stop to speed up removal of qeth devices.
---
drivers/s390/net/qeth_core_main.c | 4 +++- drivers/s390/net/qeth_l2_main.c | 11 +++++++---- drivers/s390/net/qeth_l3_main.c | 8 +++++--- 3 files changed, 15 insertions(+), 8 deletions(-)
drivers/s390/net/qeth_core_main.c +3 -1
@@ -760,7 +760,7 @@if (sense[SENSE_COMMAND_REJECT_BYTE ] &SENSE_COMMAND_REJECT_FLAG ) {QETH_DBF_TEXT (TRACE ,2 ,"CMDREJi" ); -return 0 ; +return 1 ; }if ((sense[2 ] ==0xaf ) && (sense[3 ] ==0xfe )) {QETH_DBF_TEXT (TRACE ,2 ,"AFFE" );
@@ -884,6 +884,7 @@ } rc =qeth_get_problem (cdev, irb);if (rc) { +qeth_clear_ipacmd_list (card);qeth_schedule_recovery (card); goto out; }
@@ -4147,6 +4148,7 @@unsigned long flags;struct qeth_card *card =dev_get_drvdata (&gdev->dev); +QETH_DBF_TEXT (SETUP ,2 ,"removedv" );if (card->discipline.ccwgdriver) { card->discipline.ccwgdriver->remove (gdev);qeth_core_free_discipline (card);
drivers/s390/net/qeth_l2_main.c +7 -4
@@ -395,7 +395,8 @@ }if (card->state ==CARD_STATE_SOFTSETUP ) {qeth_l2_process_vlans (card,1 ); -qeth_l2_del_all_mc (card); +if (!card->use_hard_stop) +qeth_l2_del_all_mc (card);qeth_clear_ipacmd_list (card); card->state =CARD_STATE_HARDSETUP ; }
@@ -826,7 +827,6 @@ } card->data.state =CH_STATE_UP ; card->state =CARD_STATE_UP ; - card->dev->flags |=IFF_UP ;netif_start_queue (dev);if (!card->lan_online &&netif_carrier_ok (dev))
@@ -841,7 +841,6 @@QETH_DBF_TEXT (TRACE ,4 ,"qethstop" );netif_tx_disable (dev); - card->dev->flags &= ~IFF_UP ;if (card->state ==CARD_STATE_UP ) card->state =CARD_STATE_SOFTSETUP ;return 0 ;
@@ -1138,9 +1137,13 @@if (!rc)PRINT_INFO ("Device %s successfully recovered!\n" ,CARD_BUS_ID (card)); -else +else { +rtnl_lock (); +dev_close (card->dev); +rtnl_unlock ();PRINT_INFO ("Device %s could not be recovered!\n" ,CARD_BUS_ID (card)); + }return 0 ; }
drivers/s390/net/qeth_l3_main.c +5 -3
@@ -2795,7 +2795,6 @@return -ENODEV ; card->data.state =CH_STATE_UP ; card->state =CARD_STATE_UP ; - card->dev->flags |=IFF_UP ;netif_start_queue (dev);if (!card->lan_online &&netif_carrier_ok (dev))
@@ -2809,7 +2808,6 @@QETH_DBF_TEXT (TRACE ,4 ,"qethstop" );netif_tx_disable (dev); - card->dev->flags &= ~IFF_UP ;if (card->state ==CARD_STATE_UP ) card->state =CARD_STATE_SOFTSETUP ;return 0 ;
@@ -3218,9 +3216,13 @@if (!rc)PRINT_INFO ("Device %s successfully recovered!\n" ,CARD_BUS_ID (card)); -else +else { +rtnl_lock (); +dev_close (card->dev); +rtnl_unlock ();PRINT_INFO ("Device %s could not be recovered!\n" ,CARD_BUS_ID (card)); + }return 0 ; }
Re: [patch 2/2] qeth: avoid qeth recovery problems
Quoted 115 lines · [email protected] wrote:
From: Ursula Braun <[email protected]>
Do not touch
IFF_UPflag during qeth recovery, but invokedev_close()in case of failing recovery.
Cancel outstanding control commands in case of Data Checks or Channel Checks.
Do not invokeqeth_l2_del_all_mc()in case of a hard stop to speed up removal of qeth devices.Signed-off-by Ursula Braun <[email protected]>Signed-off-by Frank Blaschka <[email protected]>---
drivers/s390/net/qeth_core_main.c | 4 +++- drivers/s390/net/qeth_l2_main.c | 11 +++++++---- drivers/s390/net/qeth_l3_main.c | 8 +++++--- 3 files changed, 15 insertions(+), 8 deletions(-)Index:
git_linus/drivers/s390/net/qeth_core_main.c
===================================================================drivers/s390/net/qeth_core_main.c +3
-1@@ -760,7 +760,7 @@if (sense[SENSE_COMMAND_REJECT_BYTE ] &SENSE_COMMAND_REJECT_FLAG ) {QETH_DBF_TEXT (TRACE ,2 ,"CMDREJi" ); -return 0 ; +return 1 ; }if ((sense[2 ] ==0xaf ) && (sense[3 ] ==0xfe )) {QETH_DBF_TEXT (TRACE ,2 ,"AFFE" );@@ -884,6 +884,7 @@ } rc =qeth_get_problem (cdev, irb);if (rc) { +qeth_clear_ipacmd_list (card);qeth_schedule_recovery (card); goto out; }@@ -4147,6 +4148,7 @@unsigned long flags;struct qeth_card *card =dev_get_drvdata (&gdev->dev); +QETH_DBF_TEXT (SETUP ,2 ,"removedv" );if (card->discipline.ccwgdriver) { card->discipline.ccwgdriver->remove (gdev);qeth_core_free_discipline (card);Index:
git_linus/drivers/s390/net/qeth_l2_main.c
===================================================================drivers/s390/net/qeth_l2_main.c +7
-4@@ -395,7 +395,8 @@ }if (card->state ==CARD_STATE_SOFTSETUP ) {qeth_l2_process_vlans (card,1 ); -qeth_l2_del_all_mc (card); +if (!card->use_hard_stop) +qeth_l2_del_all_mc (card);qeth_clear_ipacmd_list (card); card->state =CARD_STATE_HARDSETUP ; }@@ -826,7 +827,6 @@ } card->data.state =CH_STATE_UP ; card->state =CARD_STATE_UP ; - card->dev->flags |=IFF_UP ;netif_start_queue (dev);if (!card->lan_online &&netif_carrier_ok (dev))@@ -841,7 +841,6 @@QETH_DBF_TEXT (TRACE ,4 ,"qethstop" );netif_tx_disable (dev); - card->dev->flags &= ~IFF_UP ;if (card->state ==CARD_STATE_UP ) card->state =CARD_STATE_SOFTSETUP ;return 0 ;@@ -1138,9 +1137,13 @@if (!rc)PRINT_INFO ("Device %s successfully recovered!\n" ,CARD_BUS_ID (card)); -else +else { +rtnl_lock (); +dev_close (card->dev); +rtnl_unlock ();PRINT_INFO ("Device %s could not be recovered!\n" ,CARD_BUS_ID (card)); + }return 0 ; }Index:
git_linus/drivers/s390/net/qeth_l3_main.c
===================================================================drivers/s390/net/qeth_l3_main.c +0
-2@@ -2795,7 +2795,6 @@return -ENODEV ; card->data.state =CH_STATE_UP ; card->state =CARD_STATE_UP ; - card->dev->flags |=IFF_UP ;netif_start_queue (dev);if (!card->lan_online &&netif_carrier_ok (dev))@@ -2809,7 +2808,6 @@QETH_DBF_TEXT (TRACE ,4 ,"qethstop" );netif_tx_disable (dev); - card->dev->flags &= ~IFF_UP ;if (card->state ==CARD_STATE_UP ) card->state =CARD_STATE_SOFTSETUP ;return 0 ;@@ -3218,9 +3216,13 @@if (!rc) PRINT_INFO("Device %s successfully recovered!\n",
drivers/s390/net/qeth_l3_main.c line 3226
Quoted 10 lines
drivers/s390/net/qeth_l3_main.c +5
-1CARD_BUS_ID(card)); - else + else { +rtnl_lock (); +dev_close (card->dev); +rtnl_unlock ();PRINT_INFO ("Device %s could not be recovered!\n" ,CARD_BUS_ID (card)); + }return 0 ;
applied 1-2