s390: qeth patches for 2.6.35
Subsystems (4)
cover s390: qeth patches for 2.6.35
Hi Dave,
here are some qeth patches for 2.6.35 (net-next).
shortlog:
Ursula Braun (1)
qeth: new message if OLM limit is reached
Frank Blaschka (2)
qeth: exploit HW TX checksumming
qeth: synchronize configuration interface
Thanks,
Frank
PATCH 1/3 qeth: exploit HW TX checksumming
From: Frank Blaschka <[email protected]>
OSA supports HW TX checksumming in layer 3 mode. Enable this feature and remove software fallback used for TSO. Cleanup checksum bits to indicate OSA can do checksumming only for IPv4 TCP and UDP.
---
drivers/s390/net/qeth_core.h | 3 - drivers/s390/net/qeth_l3_main.c | 92 +++++++++++++++++++++++++++++----------- 2 files changed, 69 insertions(+), 26 deletions(-)
drivers/s390/net/qeth_core.h +2 -1
@@ -351,7 +351,7 @@ enum qeth_header_ids {#define QETH_HDR_EXT_SRC_MAC_ADDR 0x08#define QETH_HDR_EXT_CSUM_HDR_REQ 0x10#define QETH_HDR_EXT_CSUM_TRANSP_REQ 0x20 -#define QETH_HDR_EXT_UDP_TSO 0x40/*bit off for TCP*/ +#define QETH_HDR_EXT_UDP 0x40/*bit off for TCP*/ static inline int qeth_is_last_sbale (struct qdio_buffer_element *sbale) {
@@ -630,6 +630,7 @@ struct qeth_card_info {int unique_id;struct qeth_card_blkt blkt;__u32 csum_mask; +__u32 tx_csum_mask;enum qeth_ipa_promisc_modes promisc_mode; };
drivers/s390/net/qeth_l3_main.c +67 -25
156 lines not on this page · raw message
PATCH 2/3 qeth: new message if OLM limit is reached
In reply to [email protected]From: Ursula Braun <[email protected]>
z/OS may activate Optimized Latency Mode (OLM) for a connection through an OSA Express3 adapter, which reduces the number of allowed concurrent connections, if adapter is used in shared mode. Create a meaningful message, if activation of an OSA-connection fails due to an active OLM-connection on the shared OSA-adapter.
---
drivers/s390/net/qeth_core_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/s390/net/qeth_core_main.c +9 -1
@@ -1976,6 +1976,7 @@ static int qeth_ulp_setup_cb(struct qeth unsigned long data) {struct qeth_cmd_buffer *iob; +int rc =0 ;QETH_DBF_TEXT (SETUP ,2 ,"ulpstpcb" );
@@ -1983,8 +1984,15 @@ static int qeth_ulp_setup_cb(struct qethmemcpy (&card->token.ulp_connection_r,QETH_ULP_SETUP_RESP_CONNECTION_TOKEN (iob->data),QETH_MPC_TOKEN_LENGTH ); +if (!strncmp ("00S" ,QETH_ULP_SETUP_RESP_CONNECTION_TOKEN (iob->data), +3 )) { +QETH_DBF_TEXT (SETUP ,2 ,"olmlimit" ); +dev_err (&card->gdev->dev,"A connection could not be " +"established because of an OLM limit\n" ); + rc = -EMLINK ; + }QETH_DBF_TEXT_ (SETUP ,2 ," rc%d" , iob->rc); -return 0 ; +return rc; }static int qeth_ulp_setup (struct qeth_card *card)
PATCH 3/3 qeth: synchronize configuration interface
In reply to [email protected]From: Frank Blaschka <[email protected]>
Synchronize access to the drivers configuration interface. Also do not allow configuration changes during online/offline transition.
---
drivers/s390/net/qeth_core.h | 1 drivers/s390/net/qeth_core_main.c | 1 drivers/s390/net/qeth_core_sys.c | 148 ++++++++++++++--------- drivers/s390/net/qeth_l2_main.c | 8 + drivers/s390/net/qeth_l3_main.c | 8 + drivers/s390/net/qeth_l3_sys.c | 244 +++++++++++++++++++++----------------- 6 files changed, 242 insertions(+), 168 deletions(-)
drivers/s390/net/qeth_core.h +1 -0
@@ -740,6 +740,7 @@ struct qeth_card {atomic_t force_alloc_skb;struct service_level qeth_service_level;struct qdio_ssqd_desc ssqd; +struct mutex conf_mutex; };struct qeth_card_list_struct {
drivers/s390/net/qeth_core_main.c +1 -0
@@ -1100,6 +1100,7 @@ static int qeth_setup_card(struct qeth_cspin_lock_init (&card->lock);spin_lock_init (&card->ip_lock);spin_lock_init (&card->thread_mask_lock); +mutex_init (&card->conf_mutex); card->thread_start_mask =0 ; card->thread_allowed_mask =0 ; card->thread_running_mask =0 ;
drivers/s390/net/qeth_core_sys.c +91 -57
294 lines not on this page · raw message
drivers/s390/net/qeth_l2_main.c +7 -1
@@ -924,6 +924,7 @@ static int __qeth_l2_set_online(struct cenum qeth_card_states recover_flag;BUG_ON (!card); +mutex_lock (&card->conf_mutex);QETH_DBF_TEXT (SETUP ,2 ,"setonlin" );QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *));
@@ -956,7 +957,7 @@ static int __qeth_l2_set_online(struct cdev_warn (&card->gdev->dev,"The LAN is offline\n" ); card->lan_online =0 ; -return 0 ; + goto out; } rc = -ENODEV ; goto out_remove;
@@ -995,6 +996,8 @@ static int __qeth_l2_set_online(struct c }/* let user_space know that device is online */ kobject_uevent (&gdev->dev.kobj,KOBJ_CHANGE ); +out: +mutex_unlock (&card->conf_mutex);return 0 ; out_remove:
@@ -1007,6 +1010,7 @@ out_remove: card->state =CARD_STATE_RECOVER ; else card->state = CARD_STATE_DOWN; +mutex_unlock (&card->conf_mutex);return rc; }
@@ -1022,6 +1026,7 @@ static int __qeth_l2_set_offline(structint rc =0 , rc2 =0 , rc3 =0 ;enum qeth_card_states recover_flag; +mutex_lock (&card->conf_mutex);QETH_DBF_TEXT (SETUP ,3 ,"setoffl" );QETH_DBF_HEX (SETUP ,3 , &card,sizeof (void *));
@@ -1040,6 +1045,7 @@ static int __qeth_l2_set_offline(struct card->state =CARD_STATE_RECOVER ;/* let user_space know that device is offline */ kobject_uevent (&cgdev->dev.kobj,KOBJ_CHANGE ); +mutex_unlock (&card->conf_mutex);return 0 ; }
drivers/s390/net/qeth_l3_main.c +7 -1
@@ -3378,6 +3378,7 @@ static int __qeth_l3_set_online(struct cenum qeth_card_states recover_flag;BUG_ON (!card); +mutex_lock (&card->conf_mutex);QETH_DBF_TEXT (SETUP ,2 ,"setonlin" );QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *));
@@ -3409,7 +3410,7 @@ static int __qeth_l3_set_online(struct cdev_warn (&card->gdev->dev,"The LAN is offline\n" ); card->lan_online =0 ; -return 0 ; + goto out; } rc = -ENODEV ; goto out_remove;
@@ -3456,6 +3457,8 @@ static int __qeth_l3_set_online(struct c }/* let user_space know that device is online */ kobject_uevent (&gdev->dev.kobj,KOBJ_CHANGE ); +out: +mutex_unlock (&card->conf_mutex);return 0 ; out_remove: card->use_hard_stop =1 ;
@@ -3467,6 +3470,7 @@ out_remove: card->state =CARD_STATE_RECOVER ; else card->state = CARD_STATE_DOWN; +mutex_unlock (&card->conf_mutex);return rc; }
@@ -3482,6 +3486,7 @@ static int __qeth_l3_set_offline(structint rc =0 , rc2 =0 , rc3 =0 ;enum qeth_card_states recover_flag; +mutex_lock (&card->conf_mutex);QETH_DBF_TEXT (SETUP ,3 ,"setoffl" );QETH_DBF_HEX (SETUP ,3 , &card,sizeof (void *));
@@ -3500,6 +3505,7 @@ static int __qeth_l3_set_offline(struct card->state =CARD_STATE_RECOVER ;/* let user_space know that device is offline */ kobject_uevent (&cgdev->dev.kobj,KOBJ_CHANGE ); +mutex_unlock (&card->conf_mutex);return 0 ; }
drivers/s390/net/qeth_l3_sys.c +135 -109
474 lines not on this page · raw message
David Miller
maintainerFrom: [email protected]
Date: Wed, 12 May 2010 07:34:44 +0200
Quoted 9 lines
here are some qeth patches for 2.6.35 (net-next).
shortlog:
Ursula Braun (1)
qeth: new message if OLM limit is reachedFrank Blaschka (2)
qeth: exploit HW TX checksumming
qeth: synchronize configuration interface
Looks good, all applied, thanks!