s390: network patches for net-next
Subsystems (4)
cover s390: network patches for net-next
Hi Dave,
here are some s390 related patches for net-next
shortlog:
Sebastian Ott(2)
qeth: cleanup channel path descriptor function
lcs: ensure proper ccw setup
Wei Yongjun(1)
qeth: fix possible memory leak in qeth_l3_add_[vipa|rxip]()
Peter Senna(2)drivers/s390/net: removes unnecessary semicolon
ctcm: fix error return code
Thanks,
Frank
PATCH 1/5 qeth: cleanup channel path descriptor function
From: Sebastian Ott <[email protected]>
Cleanup the qeth_get_channel_path_desc function and rename it to qeth_update_from_chp_desc. No functional change.
--- drivers/s390/net/qeth_core_main.c | 74 +++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 33 deletions(-)
drivers/s390/net/qeth_core_main.c +41 -33
@@ -1257,7 +1257,30 @@ static void qeth_clean_channel(struct qekfree (channel->iob[cnt].data); } -static void qeth_get_channel_path_desc (struct qeth_card *card) +static void qeth_set_single_write_queues (struct qeth_card *card) +{ +if ((atomic_read (&card->qdio.state) !=QETH_QDIO_UNINITIALIZED ) && + (card->qdio.no_out_queues ==4 )) +qeth_free_qdio_buffers (card); + + card->qdio.no_out_queues =1 ; +if (card->qdio.default_out_queue !=0 ) +dev_info (&card->gdev->dev,"Priority Queueing not supported\n" ); + + card->qdio.default_out_queue =0 ; +} + +static void qeth_set_multiple_write_queues (struct qeth_card *card) +{ +if ((atomic_read (&card->qdio.state) !=QETH_QDIO_UNINITIALIZED ) && + (card->qdio.no_out_queues ==1 )) { +qeth_free_qdio_buffers (card); + card->qdio.default_out_queue =2 ; + } + card->qdio.no_out_queues =4 ; +} + +static void qeth_update_from_chp_desc (struct qeth_card *card) {struct ccw_device *ccwdev; struct channelPath_dsc {
@@ -1274,38 +1297,23 @@ static void qeth_get_channel_path_desc(sQETH_DBF_TEXT (SETUP ,2 ,"chp_desc" ); ccwdev = card->data.ccwdev; - chp_dsc = (struct channelPath_dsc *)ccw_device_get_chp_desc (ccwdev,0 ); -if (chp_dsc !=NULL ) { -if (card->info.type !=QETH_CARD_TYPE_IQD ) { -/* CHPP field bit 6 == 1 -> single queue */ -if ((chp_dsc->chpp &0x02 ) ==0x02 ) { -if ((atomic_read (&card->qdio.state) != -QETH_QDIO_UNINITIALIZED ) && - (card->qdio.no_out_queues ==4 )) -/* change from 4 to 1 outbound queues */ -qeth_free_qdio_buffers (card); - card->qdio.no_out_queues =1 ; -if (card->qdio.default_out_queue !=0 ) -dev_info (&card->gdev->dev, -"Priority Queueing not supported\n" ); - card->qdio.default_out_queue =0 ; - }else { -if ((atomic_read (&card->qdio.state) != -QETH_QDIO_UNINITIALIZED ) && - (card->qdio.no_out_queues ==1 )) { -/* change from 1 to 4 outbound queues */ -qeth_free_qdio_buffers (card); - card->qdio.default_out_queue =2 ; - } - card->qdio.no_out_queues =4 ; - } - } - card->info.func_level =0x4100 + chp_dsc->desc; -kfree (chp_dsc); - } + chp_dsc =ccw_device_get_chp_desc (ccwdev,0 ); +if (!chp_dsc) + goto out; + + card->info.func_level =0x4100 + chp_dsc->desc; +if (card->info.type ==QETH_CARD_TYPE_IQD ) + goto out; + +/* CHPP field bit 6 == 1 -> single queue */ +if ((chp_dsc->chpp &0x02 ) ==0x02 ) +qeth_set_single_write_queues (card); +else +qeth_set_multiple_write_queues (card); +out: +kfree (chp_dsc);QETH_DBF_TEXT_ (SETUP ,2 ,"nr:%x" , card->qdio.no_out_queues);QETH_DBF_TEXT_ (SETUP ,2 ,"lvl:%02x" , card->info.func_level); -return ; }static void qeth_init_qdio_info (struct qeth_card *card)
@@ -1473,7 +1481,7 @@ static int qeth_determine_card_type(stru card->qdio.no_in_queues =1 ; card->info.is_multicast_different = known_devices[i][QETH_MULTICAST_IND ]; -qeth_get_channel_path_desc (card); +qeth_update_from_chp_desc (card);return 0 ; } i++;
@@ -4742,7 +4750,7 @@ int qeth_core_hardsetup_card(struct qethQETH_DBF_TEXT (SETUP ,2 ,"hrdsetup" );atomic_set (&card->force_alloc_skb,0 ); -qeth_get_channel_path_desc (card); +qeth_update_from_chp_desc (card); retry:if (retries) QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",
PATCH 2/5 lcs: ensure proper ccw setup
In reply to [email protected]From: Sebastian Ott <[email protected]>
Make sure that all ccws used for writing are initialized with zeros - especially since the last ccw contains a TIC for which the unused fields have to be zeros.
--- drivers/s390/net/lcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/lcs.c +1 -1
@@ -282,7 +282,7 @@ lcs_setup_write_ccws(struct lcs_card *card)LCS_DBF_TEXT (3 , setup,"iwritccw" );/* Setup write ccws. */ -memset (card->write.ccws,0 ,sizeof (struct ccw1 ) *LCS_NUM_BUFFS +1 ); +memset (card->write.ccws,0 ,sizeof (struct ccw1 ) * (LCS_NUM_BUFFS +1 ));for (cnt =0 ; cnt <LCS_NUM_BUFFS ; cnt++) { card->write.ccws[cnt].cmd_code =LCS_CCW_WRITE ; card->write.ccws[cnt].count =0 ;
Signature · 1 line
1.7.11.7
PATCH 3/5 qeth: fix possible memory leak in qeth_l3_add_[vipa|rxip]()
In reply to [email protected]From: Wei Yongjun <[email protected]>
ipaddr has been allocated in function qeth_l3_add_vipa() but does not free before leaving from the error handling cases. The same problem also exists in function qeth_l3_add_rxip().
spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)
--- drivers/s390/net/qeth_l3_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/s390/net/qeth_l3_main.c +2 -0
@@ -794,6 +794,7 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto, rc = -EEXIST ;spin_unlock_irqrestore (&card->ip_lock, flags);if (rc) { +kfree (ipaddr);return rc; }if (!qeth_l3_add_ip (card, ipaddr))
@@ -858,6 +859,7 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto, rc = -EEXIST ;spin_unlock_irqrestore (&card->ip_lock, flags);if (rc) { +kfree (ipaddr);return rc; }if (!qeth_l3_add_ip (card, ipaddr))
Signature · 1 line
1.7.11.7
PATCH 4/5 drivers/s390/net: removes unnecessary semicolon
In reply to [email protected]From: Peter Senna Tschudin <[email protected]>
removes unnecessary semicolon
Found by Coccinelle: http://coccinelle.lip6.fr/
--- drivers/s390/net/ctcm_fsms.c | 2 +- drivers/s390/net/qeth_core_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/s390/net/ctcm_fsms.c +1 -1
@@ -1523,7 +1523,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) goto done;default :break ; - }; + }fsm_newstate (fi, (CHANNEL_DIRECTION (ch->flags) ==CTCM_READ ) ?CTC_STATE_RXINIT :CTC_STATE_TXINIT );
drivers/s390/net/qeth_core_main.c +2 -2
@@ -489,7 +489,7 @@ static struct qeth_reply *qeth_alloc_reply(struct qeth_card *card)atomic_set (&reply->refcnt,1 );atomic_set (&reply->received,0 ); reply->card = card; - }; + }return reply; }
@@ -2037,7 +2037,7 @@ int qeth_send_control_data(struct qeth_card *card, int len,if (time_after (jiffies, timeout)) goto time_err;cpu_relax (); - }; + } }if (reply->rc == -EIO )
Signature · 1 line
1.7.11.7
PATCH 5/5 ctcm: fix error return code
In reply to [email protected]From: Peter Senna Tschudin <[email protected]>
Convert a nonnegative error return code to a negative one, as returned elsewhere in the function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
--- drivers/s390/net/ctcm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/ctcm_main.c +1 -1
@@ -1454,7 +1454,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type, ch_fsm_len, GFP_KERNEL); }if (ch->fsm ==NULL ) - goto free_return; + goto nomem_return;fsm_newstate (ch->fsm,CTC_STATE_IDLE );
Signature · 1 line
1.7.11.7
David Miller
maintainerFrom: [email protected]
Date: Mon, 24 Sep 2012 16:24:22 +0200
Quoted 8 lines
here are some s390 related patches for net-next
shortlog:
Sebastian Ott(2)
qeth: cleanup channel path descriptor function
lcs: ensure proper ccw setup
Quoted 6 lines
Wei Yongjun(1)
qeth: fix possible memory leak in qeth_l3_add_[vipa|rxip]()Peter Senna(2)
drivers/s390/net: removes unnecessary semicolon
ctcm: fix error return code
All applied, thanks!