s390/qeth: updates 2019-06-11
Subsystems (4)
cover s390/qeth: updates 2019-06-11
Hi Dave,
please apply the following patch series for qeth to net-next. This brings all sorts of cleanups and minor improvements, primarily for the control IO path.
Thanks,
Julian
Julian Wiedmann (13):
s390/qeth: don't mask TX errors on IQD devices s390/qeth: use mm helpers
s390/qeth: simplify DOWN state handling s390/qeth: restart pending READ cmd from callback s390/qeth: clean up setting of BLKT defaults s390/qeth: remove qeth_wait_for_buffer() s390/qeth: remove OSN-specific IO code s390/qeth: convert device-specific trace entries s390/qeth: remove 'channel' parameter from callbacks s390/qeth: add support for dynamically allocated cmds s390/qeth: convert RCD code to common IO infrastructure s390/qeth: command-chain the IDX sequence s390/qeth: allocate a single cmd on read channel
drivers/s390/net/qeth_core.h | 27 +- drivers/s390/net/qeth_core_main.c | 614 ++++++++++++++---------------- drivers/s390/net/qeth_core_mpc.h | 2 - drivers/s390/net/qeth_l2_main.c | 83 ++-- drivers/s390/net/qeth_l3_main.c | 41 +- 5 files changed, 351 insertions(+), 416 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/13 s390/qeth: don't mask TX errors on IQD devices
Current code suppresses debug entries when an TX buffer completes in ERROR state with no error indication set in SBALF15.
This was introduced back with
commit 58490f18071d ("qeth: HiperSockets SIGA retry support on CC=2."). But qeth no longer retries after CC=2, and this sort of suppression make no sense anymore. Remove it.
--- drivers/s390/net/qeth_core_main.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/s390/net/qeth_core_main.c +0 -7
@@ -3236,13 +3236,6 @@ static void qeth_handle_send_error(struct qeth_card *card,int sbalf15 = buffer->buffer->element[15 ].sflags;QETH_CARD_TEXT (card,6 ,"hdsnderr" ); -if (IS_IQD (card)) { -if (sbalf15 ==0 ) { - qdio_err =0 ; - }else { - qdio_err =1 ; - } - }qeth_check_qdio_errors (card, buffer->buffer, qdio_err,"qouterr" );if (!qdio_err)
Signature · 1 line
2.17.1
PATCH 2/13 s390/qeth: use mm helpers
In reply to Julian WiedmannSlightly reduce the complexity of the core xmit path, by replacing some open-coded logic with the corresponding helpers.
--- drivers/s390/net/qeth_core_main.c | 33 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-)
drivers/s390/net/qeth_core_main.c +16 -17
@@ -20,6 +20,7 @@#include <linux/ip.h> #include <linux/tcp.h> #include <linux/mii.h> +#include <linux/mm.h> #include <linux/kthread.h> #include <linux/slab.h> #include <linux/if_vlan.h>
@@ -3723,8 +3724,8 @@ static int qeth_add_hw_header(struct qeth_qdio_out_q *queue, __elements =1 +qeth_count_elements (skb, proto_len); else __elements =qeth_count_elements (skb,0 ); - }else if (!proto_len &&qeth_get_elements_for_range (start, end) ==1 ) { -/* Push HW header into a new page. */ + }else if (!proto_len &&PAGE_ALIGNED (skb->data)) { +/* Push HW header into preceding page, flush with skb->data. */ push_ok = true; __elements =1 +qeth_count_elements (skb,0 ); }else {
@@ -3778,18 +3779,16 @@ static void __qeth_fill_buffer(struct sk_buff *skb,int element = buf->next_element_to_fill;int length =skb_headlen (skb) - offset;char *data = skb->data + offset; -int length_here, cnt; +unsigned int elem_length, cnt;/* map linear part into buffer element(s) */ while (length >0 ) { -/* length_here is the remaining amount of data in this page */ - length_here =PAGE_SIZE - ((unsigned long ) data %PAGE_SIZE ); -if (length < length_here) - length_here = length; + elem_length = min_t(unsigned int, length, +PAGE_SIZE -offset_in_page (data)); buffer->element[element].addr = data; - buffer->element[element].length = length_here; - length -= length_here; + buffer->element[element].length = elem_length; + length -= elem_length;if (is_first_elem) { is_first_elem = false;if (length ||skb_is_nonlinear (skb))
@@ -3802,7 +3801,8 @@ static void __qeth_fill_buffer(struct sk_buff *skb, buffer->element[element].eflags =SBAL_EFLAGS_MIDDLE_FRAG ; } - data += length_here; + + data += elem_length; element++; }
@@ -3813,17 +3813,16 @@ static void __qeth_fill_buffer(struct sk_buff *skb, data =skb_frag_address (frag); length =skb_frag_size (frag);while (length >0 ) { - length_here =PAGE_SIZE - - ((unsigned long ) data %PAGE_SIZE ); -if (length < length_here) - length_here = length; + elem_length = min_t(unsigned int, length, +PAGE_SIZE -offset_in_page (data)); buffer->element[element].addr = data; - buffer->element[element].length = length_here; + buffer->element[element].length = elem_length; buffer->element[element].eflags =SBAL_EFLAGS_MIDDLE_FRAG ; - length -= length_here; - data += length_here; + + length -= elem_length; + data += elem_length; element++; } }
Signature · 1 line
2.17.1
PATCH 3/13 s390/qeth: simplify DOWN state handling
In reply to Julian WiedmannWhen the tear down sequence in qeth_l?_stop_card() has finished, the card is guaranteed to be in DOWN state and we don't have to check for it again.
With this insight we can also remove the redundant setting of card->state in qeth_l?_set_online()'s error path.
--- drivers/s390/net/qeth_l2_main.c | 7 ++----- drivers/s390/net/qeth_l3_main.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-)
drivers/s390/net/qeth_l2_main.c +2 -5
@@ -292,11 +292,9 @@ static void qeth_l2_stop_card(struct qeth_card *card)qeth_clear_working_pool_list (card); card->state =CARD_STATE_DOWN ; } -if (card->state ==CARD_STATE_DOWN ) { -qeth_clear_cmd_buffers (&card->read); -qeth_clear_cmd_buffers (&card->write); - } +qeth_clear_cmd_buffers (&card->read); +qeth_clear_cmd_buffers (&card->write);flush_workqueue (card->event_wq); card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED ; }
@@ -882,7 +880,6 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)ccw_device_set_offline (CARD_WDEV (card));ccw_device_set_offline (CARD_RDEV (card));qdio_free (CARD_DDEV (card)); - card->state =CARD_STATE_DOWN ;mutex_unlock (&card->conf_mutex);mutex_unlock (&card->discipline_mutex);
drivers/s390/net/qeth_l3_main.c +2 -5
@@ -1436,11 +1436,9 @@ static void qeth_l3_stop_card(struct qeth_card *card)qeth_clear_working_pool_list (card); card->state =CARD_STATE_DOWN ; } -if (card->state ==CARD_STATE_DOWN ) { -qeth_clear_cmd_buffers (&card->read); -qeth_clear_cmd_buffers (&card->write); - } +qeth_clear_cmd_buffers (&card->read); +qeth_clear_cmd_buffers (&card->write);flush_workqueue (card->event_wq); }
@@ -2420,7 +2418,6 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev)ccw_device_set_offline (CARD_WDEV (card));ccw_device_set_offline (CARD_RDEV (card));qdio_free (CARD_DDEV (card)); - card->state =CARD_STATE_DOWN ;mutex_unlock (&card->conf_mutex);mutex_unlock (&card->discipline_mutex);
Signature · 1 line
2.17.1
PATCH 4/13 s390/qeth: restart pending READ cmd from callback
In reply to Julian WiedmannThe completion of a pending READ cmd is processed via qeth_issue_next_read_cb(). Let this callback also start the next READ cmd, instead of hardcoding that step into the IRQ handler.
While at it remove the check of the channel state, __qeth_issue_next_read() already does this.
--- drivers/s390/net/qeth_core_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/s390/net/qeth_core_main.c +1 -3
@@ -851,6 +851,7 @@ static void qeth_issue_next_read_cb(struct qeth_card *card,QETH_PDU_HEADER_SEQ_NO (iob->data), QETH_SEQ_NO_LENGTH);qeth_release_buffer (channel, iob); +__qeth_issue_next_read (card); } static int qeth_set_thread_start_bit(struct qeth_card *card,
@@ -1115,9 +1116,6 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm, }if (channel == &card->data)return ; -if (channel == &card->read && - channel->state ==CH_STATE_UP ) -__qeth_issue_next_read (card);if (iob && iob->callback) iob->callback (card, iob->channel, iob);
Signature · 1 line
2.17.1
PATCH 5/13 s390/qeth: clean up setting of BLKT defaults
In reply to Julian WiedmannWhen called from qeth_core_probe_device(), qeth_determine_capabilities() initializes the device's BLKT defaults. From all other callers, the ccw_device has already been set online and the BLKT setting is skipped.
Clean this up by extracting the BLKT setting into a separate helper that gets called from the right place.
--- drivers/s390/net/qeth_core.h | 1 + drivers/s390/net/qeth_core_main.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/s390/net/qeth_core.h +1 -0
@@ -665,6 +665,7 @@ struct qeth_card_info {__u16 func_level;char mcl_level[QETH_MCL_LENGTH +1 ]; u8 open_when_online:1; + u8 use_v1_blkt:1; u8 is_vm_nic:1;int mac_bits;enum qeth_card_types type;
drivers/s390/net/qeth_core_main.c +6 -5
@@ -1633,6 +1633,8 @@ static void qeth_configure_unitaddr(struct qeth_card *card, char *prcd) card->info.cula = prcd[63 ]; card->info.is_vm_nic = ((prcd[0x10 ] == _ascebc['V' ]) && (prcd[0x11 ] == _ascebc['M' ])); + card->info.use_v1_blkt = prcd[74 ] ==0xF0 && prcd[75 ] ==0xF0 && + prcd[76 ] >=0xF1 && prcd[76 ] <=0xF4 ; }static enum qeth_discipline_id qeth_vm_detect_layer (struct qeth_card *card)
@@ -1716,12 +1718,11 @@ static enum qeth_discipline_id qeth_enforce_discipline(struct qeth_card *card)return disc; } -static void qeth_configure_blkt_default (struct qeth_card *card,char *prcd) +static void qeth_set_blkt_defaults (struct qeth_card *card) {QETH_DBF_TEXT (SETUP ,2 ,"cfgblkt" ); -if (prcd[74 ] ==0xF0 && prcd[75 ] ==0xF0 && - prcd[76 ] >=0xF1 && prcd[76 ] <=0xF4 ) { +if (card->info.use_v1_blkt) { card->info.blkt.time_total =0 ; card->info.blkt.inter_packet =0 ; card->info.blkt.inter_packet_jumbo =0 ;
@@ -4761,8 +4762,6 @@ static void qeth_determine_capabilities(struct qeth_card *card) goto out_offline; }qeth_configure_unitaddr (card, prcd); -if (ddev_offline) -qeth_configure_blkt_default (card, prcd);kfree (prcd); rc =qdio_get_ssqd_desc (ddev, &card->ssqd);
@@ -5660,6 +5659,8 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)if (rc) goto err_chp_desc;qeth_determine_capabilities (card); +qeth_set_blkt_defaults (card); + enforced_disc =qeth_enforce_discipline (card);switch (enforced_disc) {case QETH_DISCIPLINE_UNDETERMINED :
Signature · 1 line
2.17.1
PATCH 6/13 s390/qeth: remove qeth_wait_for_buffer()
In reply to Julian WiedmannThe basic MPC initialization sequence is strictly sequential, and waiting for an available cmd buffer should never be necessary. So this change only affects the OSN path, where dangling waiters on an unbounded wait_event() are not desirable. Switch to qeth_get_buffers(), and let OSN callers deal with -ENOMEM.
--- drivers/s390/net/qeth_core.h | 2 +- drivers/s390/net/qeth_core_main.c | 58 +++++++++++++++++-------------- drivers/s390/net/qeth_l2_main.c | 5 ++- 3 files changed, 37 insertions(+), 28 deletions(-)
drivers/s390/net/qeth_core.h +1 -1
@@ -998,7 +998,7 @@ void qeth_tx_timeout(struct net_device *);void qeth_release_buffer (struct qeth_channel *,struct qeth_cmd_buffer *);void qeth_prepare_ipa_cmd (struct qeth_card *card,struct qeth_cmd_buffer *iob,u16 cmd_length); -struct qeth_cmd_buffer *qeth_wait_for_buffer (struct qeth_channel *); +struct qeth_cmd_buffer *qeth_get_buffer (struct qeth_channel *channel);int qeth_query_switch_attributes (struct qeth_card *card,struct qeth_switch_info *sw_info); int qeth_query_card_info(struct qeth_card *card,
drivers/s390/net/qeth_core_main.c +32 -26
117 lines not on this page · raw message
drivers/s390/net/qeth_l2_main.c +4 -1
@@ -1084,7 +1084,10 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len)QETH_CARD_TEXT (card,2 ,"osnsdmc" );if (!qeth_card_hw_is_reachable (card))return -ENODEV ; - iob =qeth_wait_for_buffer (&card->write); + iob =qeth_get_buffer (&card->write); +if (!iob) +return -ENOMEM ; +qeth_prepare_ipa_cmd (card, iob, (u16 ) data_len);memcpy (__ipa_cmd (iob), data, data_len);return qeth_osn_send_ipa_cmd (card, iob);
Signature · 1 line
2.17.1
PATCH 7/13 s390/qeth: remove OSN-specific IO code
In reply to Julian WiedmannOSN currently provides a custom code path to submit IPA cmds, without waiting for the cmd response. Replace it with qeth_send_ipa_cmd(), which uses the common qeth_send_control_data() IO infrastructure.
By setting a custom iob->callback, we can now provide feedback to the caller about whether the cmd has been successfully submitted to HW. Since the callback then immediately wakes up the reply-waiter object, we maintain the old behaviour of returning early without waiting for the response.
--- drivers/s390/net/qeth_core.h | 1 + drivers/s390/net/qeth_core_main.c | 3 ++- drivers/s390/net/qeth_l2_main.c | 43 +++++-------------------------- 3 files changed, 10 insertions(+), 37 deletions(-)
drivers/s390/net/qeth_core.h +1 -0
@@ -996,6 +996,7 @@ void qeth_setadp_promisc_mode(struct qeth_card *);int qeth_setadpparms_change_macaddr (struct qeth_card *);void qeth_tx_timeout (struct net_device *);void qeth_release_buffer (struct qeth_channel *,struct qeth_cmd_buffer *); +void qeth_notify_reply (struct qeth_reply *reply,int reason);void qeth_prepare_ipa_cmd (struct qeth_card *card,struct qeth_cmd_buffer *iob,u16 cmd_length);struct qeth_cmd_buffer *qeth_get_buffer (struct qeth_channel *channel);
drivers/s390/net/qeth_core_main.c +2 -1
@@ -577,11 +577,12 @@ static void qeth_dequeue_reply(struct qeth_card *card, struct qeth_reply *reply)spin_unlock_irq (&card->lock); } -static void qeth_notify_reply (struct qeth_reply *reply,int reason) +void qeth_notify_reply (struct qeth_reply *reply,int reason) { reply->rc = reason;complete (&reply->received); } +EXPORT_SYMBOL_GPL (qeth_notify_reply);static void qeth_issue_ipa_msg (struct qeth_ipa_cmd *cmd,int rc,struct qeth_card *card)
drivers/s390/net/qeth_l2_main.c +7 -36
56 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 8/13 s390/qeth: convert device-specific trace entries
In reply to Julian WiedmannThe vast majority of SETUP-classified trace entries can be moved to their device-specific trace file. This reduces pollution of the global SETUP file, and provides a consistent trace view of all activity on the device.
--- drivers/s390/net/qeth_core_main.c | 196 ++++++++++++++---------------- drivers/s390/net/qeth_l2_main.c | 28 ++--- drivers/s390/net/qeth_l3_main.c | 35 +++--- 3 files changed, 122 insertions(+), 137 deletions(-)
drivers/s390/net/qeth_core_main.c +94 -102
@@ -292,7 +292,7 @@ static int qeth_cq_init(struct qeth_card *card)int rc;if (card->options.cq ==QETH_CQ_ENABLED ) { -QETH_DBF_TEXT (SETUP ,2 ,"cqinit" ); +QETH_CARD_TEXT (card,2 ,"cqinit" );qdio_reset_buffers (card->qdio.c_q->qdio_bufs,QDIO_MAX_BUFFERS_PER_Q ); card->qdio.c_q->next_buf_to_init =127 ;
@@ -300,7 +300,7 @@ static int qeth_cq_init(struct qeth_card *card) card->qdio.no_in_queues -1 ,0 , 127);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"1err%d" , rc); goto out; } }
@@ -317,7 +317,7 @@ static int qeth_alloc_cq(struct qeth_card *card)int i;struct qdio_outbuf_state *outbuf_states; -QETH_DBF_TEXT (SETUP ,2 ,"cqon" ); +QETH_CARD_TEXT (card,2 ,"cqon" ); card->qdio.c_q =qeth_alloc_qdio_queue ();if (!card->qdio.c_q) { rc =-1 ;
@@ -339,11 +339,11 @@ static int qeth_alloc_cq(struct qeth_card *card) outbuf_states +=QDIO_MAX_BUFFERS_PER_Q ; } }else { -QETH_DBF_TEXT (SETUP ,2 ,"nocq" ); +QETH_CARD_TEXT (card,2 ,"nocq" ); card->qdio.c_q =NULL ; card->qdio.no_in_queues =1 ; } -QETH_DBF_TEXT_ (SETUP ,2 ,"iqc%d" , card->qdio.no_in_queues); +QETH_CARD_TEXT_ (card,2 ,"iqc%d" , card->qdio.no_in_queues); rc =0 ; out:return rc;
@@ -1297,7 +1297,7 @@ static int qeth_update_from_chp_desc(struct qeth_card *card)struct channel_path_desc_fmt0 *chp_dsc;int rc =0 ; -QETH_DBF_TEXT (SETUP ,2 ,"chp_desc" ); +QETH_CARD_TEXT (card,2 ,"chp_desc" ); ccwdev = card->data.ccwdev; chp_dsc =ccw_device_get_chp_desc (ccwdev,0 );
@@ -1311,14 +1311,14 @@ static int qeth_update_from_chp_desc(struct qeth_card *card) rc =qeth_osa_set_output_queues (card, chp_dsc->chpp &0x02 );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); +QETH_CARD_TEXT_ (card,2 ,"nr:%x" , card->qdio.no_out_queues); +QETH_CARD_TEXT_ (card,2 ,"lvl:%02x" , card->info.func_level);return rc; }static void qeth_init_qdio_info (struct qeth_card *card) { -QETH_DBF_TEXT (SETUP ,4 ,"intqdinf" ); +QETH_CARD_TEXT (card,4 ,"intqdinf" );atomic_set (&card->qdio.state,QETH_QDIO_UNINITIALIZED ); card->qdio.do_prio_queueing =QETH_PRIOQ_DEFAULT ; card->qdio.default_out_queue =QETH_DEFAULT_QUEUE ;
@@ -1384,8 +1384,7 @@ static void qeth_start_kernel_thread(struct work_struct *work)static void qeth_buffer_reclaim_work (struct work_struct *);static void qeth_setup_card (struct qeth_card *card) { -QETH_DBF_TEXT (SETUP ,2 ,"setupcrd" ); -QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,2 ,"setupcrd" ); card->info.type =CARD_RDEV (card)->id.driver_info; card->state =CARD_STATE_DOWN ;
@@ -1619,7 +1618,7 @@ static int qeth_read_conf_data(struct qeth_card *card, void **buffer,static void qeth_configure_unitaddr (struct qeth_card *card,char *prcd) { -QETH_DBF_TEXT (SETUP ,2 ,"cfgunit" ); +QETH_CARD_TEXT (card,2 ,"cfgunit" ); card->info.chpid = prcd[30 ]; card->info.unit_addr2 = prcd[31 ]; card->info.cula = prcd[63 ];
@@ -1638,7 +1637,7 @@ static enum qeth_discipline_id qeth_vm_detect_layer(struct qeth_card *card)char userid[80 ];int rc =0 ; -QETH_DBF_TEXT (SETUP ,2 ,"vmlayer" ); +QETH_CARD_TEXT (card,2 ,"vmlayer" );cpcmd ("QUERY USERID" , userid,sizeof (userid), &rc);if (rc)
@@ -1681,7 +1680,7 @@ static enum qeth_discipline_id qeth_vm_detect_layer(struct qeth_card *card)kfree (response);kfree (request);if (rc) -QETH_DBF_TEXT_ (SETUP ,2 ,"err%x" , rc); +QETH_CARD_TEXT_ (card,2 ,"err%x" , rc);return disc; }
@@ -1698,13 +1697,13 @@ static enum qeth_discipline_id qeth_enforce_discipline(struct qeth_card *card)switch (disc) {case QETH_DISCIPLINE_LAYER2 : -QETH_DBF_TEXT (SETUP ,3 ,"force l2" ); +QETH_CARD_TEXT (card,3 ,"force l2" );break ;case QETH_DISCIPLINE_LAYER3 : -QETH_DBF_TEXT (SETUP ,3 ,"force l3" ); +QETH_CARD_TEXT (card,3 ,"force l3" );break ;default : -QETH_DBF_TEXT (SETUP ,3 ,"force no" ); +QETH_CARD_TEXT (card,3 ,"force no" ); }return disc;
@@ -1712,7 +1711,7 @@ static enum qeth_discipline_id qeth_enforce_discipline(struct qeth_card *card)static void qeth_set_blkt_defaults (struct qeth_card *card) { -QETH_DBF_TEXT (SETUP ,2 ,"cfgblkt" ); +QETH_CARD_TEXT (card,2 ,"cfgblkt" );if (card->info.use_v1_blkt) { card->info.blkt.time_total =0 ;
@@ -1902,8 +1901,8 @@ static int qeth_idx_check_activate_response(struct qeth_card *card,return 0 ;/* negative reply: */ -QETH_DBF_TEXT_ (SETUP ,2 ,"idxneg%c" , -QETH_IDX_ACT_CAUSE_CODE (iob->data)); +QETH_CARD_TEXT_ (card,2 ,"idxneg%c" , +QETH_IDX_ACT_CAUSE_CODE (iob->data));switch (QETH_IDX_ACT_CAUSE_CODE (iob->data)) {case QETH_IDX_ACT_ERR_EXCL :
@@ -1929,7 +1928,7 @@ static void qeth_idx_query_read_cb(struct qeth_card *card,u16 peer_level;int rc; -QETH_DBF_TEXT (SETUP ,2 ,"idxrdcb" ); +QETH_CARD_TEXT (card,2 ,"idxrdcb" ); rc =qeth_idx_check_activate_response (card, channel, iob);if (rc)
@@ -1962,7 +1961,7 @@ static void qeth_idx_query_write_cb(struct qeth_card *card,u16 peer_level;int rc; -QETH_DBF_TEXT (SETUP ,2 ,"idxwrcb" ); +QETH_CARD_TEXT (card,2 ,"idxwrcb" ); rc =qeth_idx_check_activate_response (card, channel, iob);if (rc)
@@ -2023,7 +2022,7 @@ static int qeth_idx_activate_read_channel(struct qeth_card *card)struct qeth_cmd_buffer *iob;int rc; -QETH_DBF_TEXT (SETUP ,2 ,"idxread" ); +QETH_CARD_TEXT (card,2 ,"idxread" ); iob =qeth_get_buffer (channel);if (!iob)
@@ -2056,7 +2055,7 @@ static int qeth_idx_activate_write_channel(struct qeth_card *card)struct qeth_cmd_buffer *iob;int rc; -QETH_DBF_TEXT (SETUP ,2 ,"idxwrite" ); +QETH_CARD_TEXT (card,2 ,"idxwrite" ); iob =qeth_get_buffer (channel);if (!iob)
@@ -2088,7 +2087,7 @@ static int qeth_cm_enable_cb(struct qeth_card *card, struct qeth_reply *reply, {struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"cmenblcb" ); +QETH_CARD_TEXT (card,2 ,"cmenblcb" ); iob = (struct qeth_cmd_buffer *) data; memcpy(&card->token.cm_filter_r,
@@ -2102,7 +2101,7 @@ static int qeth_cm_enable(struct qeth_card *card)int rc;struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"cmenable" ); +QETH_CARD_TEXT (card,2 ,"cmenable" ); iob =qeth_mpc_get_cmd_buffer (card);if (!iob)
@@ -2124,7 +2123,7 @@ static int qeth_cm_setup_cb(struct qeth_card *card, struct qeth_reply *reply, {struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"cmsetpcb" ); +QETH_CARD_TEXT (card,2 ,"cmsetpcb" ); iob = (struct qeth_cmd_buffer *) data; memcpy(&card->token.cm_connection_r,
@@ -2138,7 +2137,7 @@ static int qeth_cm_setup(struct qeth_card *card)int rc;struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"cmsetup" ); +QETH_CARD_TEXT (card,2 ,"cmsetup" ); iob =qeth_mpc_get_cmd_buffer (card);if (!iob)
@@ -2218,7 +2217,7 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply,__u8 link_type;struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"ulpenacb" ); +QETH_CARD_TEXT (card,2 ,"ulpenacb" ); iob = (struct qeth_cmd_buffer *) data; memcpy(&card->token.ulp_filter_r,
@@ -2239,7 +2238,7 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply, card->info.link_type = link_type; }else card->info.link_type =0 ; -QETH_DBF_TEXT_ (SETUP ,2 ,"link%d" , card->info.link_type); +QETH_CARD_TEXT_ (card,2 ,"link%d" , card->info.link_type);return 0 ; }
@@ -2257,8 +2256,7 @@ static int qeth_ulp_enable(struct qeth_card *card)u16 max_mtu;int rc; -/*FIXME: trace view callbacks*/ -QETH_DBF_TEXT (SETUP ,2 ,"ulpenabl" ); +QETH_CARD_TEXT (card,2 ,"ulpenabl" ); iob =qeth_mpc_get_cmd_buffer (card);if (!iob)
@@ -2283,7 +2281,7 @@ static int qeth_ulp_setup_cb(struct qeth_card *card, struct qeth_reply *reply, {struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"ulpstpcb" ); +QETH_CARD_TEXT (card,2 ,"ulpstpcb" ); iob = (struct qeth_cmd_buffer *) data; memcpy(&card->token.ulp_connection_r,
@@ -2291,7 +2289,7 @@ static int qeth_ulp_setup_cb(struct qeth_card *card, struct qeth_reply *reply, QETH_MPC_TOKEN_LENGTH);if (!strncmp ("00S" ,QETH_ULP_SETUP_RESP_CONNECTION_TOKEN (iob->data),3 )) { -QETH_DBF_TEXT (SETUP ,2 ,"olmlimit" ); +QETH_CARD_TEXT (card,2 ,"olmlimit" );dev_err (&card->gdev->dev,"A connection could not be " "established because of an OLM limit\n" );return -EMLINK ;
@@ -2306,7 +2304,7 @@ static int qeth_ulp_setup(struct qeth_card *card)struct qeth_cmd_buffer *iob;struct ccw_dev_id dev_id; -QETH_DBF_TEXT (SETUP ,2 ,"ulpsetup" ); +QETH_CARD_TEXT (card,2 ,"ulpsetup" ); iob =qeth_mpc_get_cmd_buffer (card);if (!iob)
@@ -2375,13 +2373,13 @@ static int qeth_alloc_qdio_queues(struct qeth_card *card) {int i, j; -QETH_DBF_TEXT (SETUP ,2 ,"allcqdbf" ); +QETH_CARD_TEXT (card,2 ,"allcqdbf" );if (atomic_cmpxchg (&card->qdio.state,QETH_QDIO_UNINITIALIZED ,QETH_QDIO_ALLOCATED ) !=QETH_QDIO_UNINITIALIZED )return 0 ; -QETH_DBF_TEXT (SETUP ,2 ,"inq" ); +QETH_CARD_TEXT (card,2 ,"inq" ); card->qdio.in_q =qeth_alloc_qdio_queue ();if (!card->qdio.in_q) goto out_nomem;
@@ -2395,8 +2393,8 @@ static int qeth_alloc_qdio_queues(struct qeth_card *card) card->qdio.out_qs[i] =qeth_alloc_output_queue ();if (!card->qdio.out_qs[i]) goto out_freeoutq; -QETH_DBF_TEXT_ (SETUP ,2 ,"outq %i" , i); -QETH_DBF_HEX (SETUP ,2 , &card->qdio.out_qs[i],sizeof (void *)); +QETH_CARD_TEXT_ (card,2 ,"outq %i" , i); +QETH_CARD_HEX (card,2 , &card->qdio.out_qs[i],sizeof (void *)); card->qdio.out_qs[i]->card = card; card->qdio.out_qs[i]->queue_no = i;/* give outbound qeth_qdio_buffers their qdio_buffers */
@@ -2487,7 +2485,7 @@ static void qeth_create_qib_param_field_blkt(struct qeth_card *card,static int qeth_qdio_activate (struct qeth_card *card) { -QETH_DBF_TEXT (SETUP ,3 ,"qdioact" ); +QETH_CARD_TEXT (card,3 ,"qdioact" );return qdio_activate (CARD_DDEV (card)); }
@@ -2496,7 +2494,7 @@ static int qeth_dm_act(struct qeth_card *card)int rc;struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"dmact" ); +QETH_CARD_TEXT (card,2 ,"dmact" ); iob =qeth_mpc_get_cmd_buffer (card);if (!iob)
@@ -2515,52 +2513,52 @@ static int qeth_mpc_initialize(struct qeth_card *card) {int rc; -QETH_DBF_TEXT (SETUP ,2 ,"mpcinit" ); +QETH_CARD_TEXT (card,2 ,"mpcinit" ); rc =qeth_issue_next_read (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"1err%d" , rc);return rc; } rc =qeth_cm_enable (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"2err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"2err%d" , rc); goto out_qdio; } rc =qeth_cm_setup (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"3err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"3err%d" , rc); goto out_qdio; } rc =qeth_ulp_enable (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"4err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"4err%d" , rc); goto out_qdio; } rc =qeth_ulp_setup (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"5err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"5err%d" , rc); goto out_qdio; } rc =qeth_alloc_qdio_queues (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"5err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"5err%d" , rc); goto out_qdio; } rc =qeth_qdio_establish (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"6err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"6err%d" , rc);qeth_free_qdio_queues (card); goto out_qdio; } rc =qeth_qdio_activate (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"7err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"7err%d" , rc); goto out_qdio; } rc =qeth_dm_act (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"8err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"8err%d" , rc); goto out_qdio; }
@@ -2713,7 +2711,7 @@ int qeth_init_qdio_queues(struct qeth_card *card)unsigned int i;int rc; -QETH_DBF_TEXT (SETUP ,2 ,"initqdqs" ); +QETH_CARD_TEXT (card,2 ,"initqdqs" );/* inbound queue */ qdio_reset_buffers (card->qdio.in_q->qdio_bufs,QDIO_MAX_BUFFERS_PER_Q );
@@ -2727,7 +2725,7 @@ int qeth_init_qdio_queues(struct qeth_card *card) rc =do_QDIO (CARD_DDEV (card),QDIO_FLAG_SYNC_INPUT ,0 ,0 , card->qdio.in_buf_pool.buf_count -1 );if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"1err%d" , rc);return rc; }
@@ -2885,7 +2883,7 @@ static int qeth_send_startlan(struct qeth_card *card) {struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT (SETUP ,2 ,"strtlan" ); +QETH_CARD_TEXT (card,2 ,"strtlan" ); iob =qeth_get_ipacmd_buffer (card,IPA_CMD_STARTLAN ,0 );if (!iob)
@@ -2913,7 +2911,7 @@ static int qeth_query_setadapterparms_cb(struct qeth_card *card,if (cmd->data.setadapterparms.data.query_cmds_supp.lan_type &0x7f ) { card->info.link_type = cmd->data.setadapterparms.data.query_cmds_supp.lan_type; -QETH_DBF_TEXT_ (SETUP ,2 ,"lnk %d" , card->info.link_type); +QETH_CARD_TEXT_ (card,2 ,"lnk %d" , card->info.link_type); } card->options.adp.supported_funcs = cmd->data.setadapterparms.data.query_cmds_supp.supported_cmds;
@@ -2958,7 +2956,7 @@ static int qeth_query_ipassists_cb(struct qeth_card *card, {struct qeth_ipa_cmd *cmd; -QETH_DBF_TEXT (SETUP ,2 ,"qipasscb" ); +QETH_CARD_TEXT (card,2 ,"qipasscb" ); cmd = (struct qeth_ipa_cmd *) data;
@@ -2967,7 +2965,7 @@ static int qeth_query_ipassists_cb(struct qeth_card *card,break ;case IPA_RC_NOTSUPP :case IPA_RC_L2_UNSUPPORTED_CMD : -QETH_DBF_TEXT (SETUP ,2 ,"ipaunsup" ); +QETH_CARD_TEXT (card,2 ,"ipaunsup" ); card->options.ipa4.supported_funcs |=IPA_SETADAPTERPARMS ; card->options.ipa6.supported_funcs |=IPA_SETADAPTERPARMS ;return -EOPNOTSUPP ;
@@ -2995,7 +2993,7 @@ static int qeth_query_ipassists(struct qeth_card *card,int rc;struct qeth_cmd_buffer *iob; -QETH_DBF_TEXT_ (SETUP ,2 ,"qipassi%i" , prot); +QETH_CARD_TEXT_ (card,2 ,"qipassi%i" , prot); iob =qeth_get_ipacmd_buffer (card,IPA_CMD_QIPASSIST , prot);if (!iob)return -ENOMEM ;
@@ -3061,7 +3059,7 @@ static int qeth_query_setdiagass(struct qeth_card *card)struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd; -QETH_DBF_TEXT (SETUP ,2 ,"qdiagass" ); +QETH_CARD_TEXT (card,2 ,"qdiagass" ); iob =qeth_get_ipacmd_buffer (card,IPA_CMD_SET_DIAG_ASS ,0 );if (!iob)return -ENOMEM ;
@@ -3114,7 +3112,7 @@ int qeth_hw_trap(struct qeth_card *card, enum qeth_diags_trap_action action)struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd; -QETH_DBF_TEXT (SETUP ,2 ,"diagtrap" ); +QETH_CARD_TEXT (card,2 ,"diagtrap" ); iob =qeth_get_ipacmd_buffer (card,IPA_CMD_SET_DIAG_ASS ,0 );if (!iob)return -ENOMEM ;
@@ -4226,10 +4224,8 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,qeth_setadpparms_inspect_rc (cmd); access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl; -QETH_DBF_TEXT_ (SETUP ,2 ,"setaccb" ); -QETH_DBF_TEXT_ (SETUP ,2 ,"%s" , card->gdev->dev.kobj.name); -QETH_DBF_TEXT_ (SETUP ,2 ,"rc=%d" , - cmd->data.setadapterparms.hdr.return_code); +QETH_CARD_TEXT_ (card,2 ,"rc=%d" , + cmd->data.setadapterparms.hdr.return_code);if (cmd->data.setadapterparms.hdr.return_code !=SET_ACCESS_CTRL_RC_SUCCESS ) QETH_DBF_MESSAGE(3, "ERR:SET_ACCESS_CTRL(%#x) on device %x: %#x\n",
@@ -4309,9 +4305,6 @@ static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,QETH_CARD_TEXT (card,4 ,"setacctl" ); -QETH_DBF_TEXT_ (SETUP ,2 ,"setacctl" ); -QETH_DBF_TEXT_ (SETUP ,2 ,"%s" , card->gdev->dev.kobj.name); - iob =qeth_get_adapter_cmd (card,IPA_SETADP_SET_ACCESS_CONTROL ,sizeof (struct qeth_ipacmd_setadpparms_hdr ) +sizeof (struct qeth_set_access_ctrl ));
@@ -4323,7 +4316,7 @@ static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card, rc =qeth_send_ipa_cmd (card, iob, qeth_setadpparms_set_access_ctrl_cb, &fallback); -QETH_DBF_TEXT_ (SETUP ,2 ,"rc=%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"rc=%d" , rc);return rc; }
@@ -4699,7 +4692,7 @@ int qeth_vm_request_mac(struct qeth_card *card)struct ccw_dev_id id;int rc; -QETH_DBF_TEXT (SETUP ,2 ,"vmreqmac" ); +QETH_CARD_TEXT (card,2 ,"vmreqmac" ); request =kzalloc (sizeof (*request),GFP_KERNEL |GFP_DMA ); response =kzalloc (sizeof (*response),GFP_KERNEL |GFP_DMA );
@@ -4724,13 +4717,13 @@ int qeth_vm_request_mac(struct qeth_card *card)if (request->resp_buf_len <sizeof (*response) || response->version != request->resp_version) { rc = -EIO ; -QETH_DBF_TEXT (SETUP ,2 ,"badresp" ); -QETH_DBF_HEX (SETUP ,2 , &request->resp_buf_len, -sizeof (request->resp_buf_len)); +QETH_CARD_TEXT (card,2 ,"badresp" ); +QETH_CARD_HEX (card,2 , &request->resp_buf_len, +sizeof (request->resp_buf_len)); }else if (!is_valid_ether_addr (response->mac)) { rc = -EINVAL ; -QETH_DBF_TEXT (SETUP ,2 ,"badmac" ); -QETH_DBF_HEX (SETUP ,2 , response->mac,ETH_ALEN ); +QETH_CARD_TEXT (card,2 ,"badmac" ); +QETH_CARD_HEX (card,2 , response->mac,ETH_ALEN ); }else {ether_addr_copy (card->dev->dev_addr, response->mac); }
@@ -4750,13 +4743,13 @@ static void qeth_determine_capabilities(struct qeth_card *card)struct ccw_device *ddev;int ddev_offline =0 ; -QETH_DBF_TEXT (SETUP ,2 ,"detcapab" ); +QETH_CARD_TEXT (card,2 ,"detcapab" ); ddev =CARD_DDEV (card);if (!ddev->online) { ddev_offline =1 ; rc =ccw_device_set_online (ddev);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"3err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"3err%d" , rc); goto out; } }
@@ -4765,7 +4758,7 @@ static void qeth_determine_capabilities(struct qeth_card *card)if (rc) {QETH_DBF_MESSAGE (2 ,"qeth_read_conf_data on device %x returned %i\n" ,CARD_DEVID (card), rc); -QETH_DBF_TEXT_ (SETUP ,2 ,"5err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"5err%d" , rc); goto out_offline; }qeth_configure_unitaddr (card, prcd);
@@ -4773,13 +4766,13 @@ static void qeth_determine_capabilities(struct qeth_card *card) rc =qdio_get_ssqd_desc (ddev, &card->ssqd);if (rc) -QETH_DBF_TEXT_ (SETUP ,2 ,"6err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"6err%d" , rc); -QETH_DBF_TEXT_ (SETUP ,2 ,"qfmt%d" , card->ssqd.qfmt); -QETH_DBF_TEXT_ (SETUP ,2 ,"ac1:%02x" , card->ssqd.qdioac1); -QETH_DBF_TEXT_ (SETUP ,2 ,"ac2:%04x" , card->ssqd.qdioac2); -QETH_DBF_TEXT_ (SETUP ,2 ,"ac3:%04x" , card->ssqd.qdioac3); -QETH_DBF_TEXT_ (SETUP ,2 ,"icnt%d" , card->ssqd.icnt); +QETH_CARD_TEXT_ (card,2 ,"qfmt%d" , card->ssqd.qfmt); +QETH_CARD_TEXT_ (card,2 ,"ac1:%02x" , card->ssqd.qdioac1); +QETH_CARD_TEXT_ (card,2 ,"ac2:%04x" , card->ssqd.qdioac2); +QETH_CARD_TEXT_ (card,2 ,"ac3:%04x" , card->ssqd.qdioac3); +QETH_CARD_TEXT_ (card,2 ,"icnt%d" , card->ssqd.icnt);if (!((card->ssqd.qfmt !=QDIO_IQDIO_QFMT ) || ((card->ssqd.qdioac1 &CHSC_AC1_INITIATE_INPUTQ ) ==0 ) || ((card->ssqd.qdioac3 &CHSC_AC3_FORMAT2_CQ_AVAILABLE ) ==0 ))) {
@@ -4827,7 +4820,7 @@ static int qeth_qdio_establish(struct qeth_card *card)int i, j, k;int rc =0 ; -QETH_DBF_TEXT (SETUP ,2 ,"qdioest" ); +QETH_CARD_TEXT (card,2 ,"qdioest" ); qib_param_field =kzalloc (QDIO_MAX_BUFFERS_PER_Q ,GFP_KERNEL );
@@ -4931,8 +4924,7 @@ static int qeth_qdio_establish(struct qeth_card *card)static void qeth_core_free_card (struct qeth_card *card) { -QETH_DBF_TEXT (SETUP ,2 ,"freecrd" ); -QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,2 ,"freecrd" );qeth_clean_channel (&card->read);qeth_clean_channel (&card->write);qeth_clean_channel (&card->data);
@@ -4984,7 +4976,7 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok)int retries =3 ;int rc; -QETH_DBF_TEXT (SETUP ,2 ,"hrdsetup" ); +QETH_CARD_TEXT (card,2 ,"hrdsetup" );atomic_set (&card->force_alloc_skb,0 ); rc =qeth_update_from_chp_desc (card);if (rc)
@@ -5009,10 +5001,10 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) goto retriable; retriable:if (rc == -ERESTARTSYS ) { -QETH_DBF_TEXT (SETUP ,2 ,"break1" ); +QETH_CARD_TEXT (card,2 ,"break1" );return rc; }else if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"1err%d" , rc);if (--retries <0 ) goto out;else
@@ -5024,10 +5016,10 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) rc =qeth_idx_activate_read_channel (card);if (rc == -EINTR ) { -QETH_DBF_TEXT (SETUP ,2 ,"break2" ); +QETH_CARD_TEXT (card,2 ,"break2" );return rc; }else if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"3err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"3err%d" , rc);if (--retries <0 ) goto out;else
@@ -5036,10 +5028,10 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) rc =qeth_idx_activate_write_channel (card);if (rc == -EINTR ) { -QETH_DBF_TEXT (SETUP ,2 ,"break3" ); +QETH_CARD_TEXT (card,2 ,"break3" );return rc; }else if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"4err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"4err%d" , rc);if (--retries <0 ) goto out;else
@@ -5048,13 +5040,13 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok) card->read_or_write_problem =0 ; rc =qeth_mpc_initialize (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"5err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"5err%d" , rc); goto out; } rc =qeth_send_startlan (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"6err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"6err%d" , rc);if (rc == -ENETDOWN ) {dev_warn (&card->gdev->dev,"The LAN is offline\n" ); *carrier_ok = false;
@@ -5081,14 +5073,14 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok)if (qeth_is_supported (card,IPA_SETADAPTERPARMS )) { rc =qeth_query_setadapterparms (card);if (rc <0 ) { -QETH_DBF_TEXT_ (SETUP ,2 ,"7err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"7err%d" , rc); goto out; } }if (qeth_adp_supported (card,IPA_SETADP_SET_DIAG_ASSIST )) { rc =qeth_query_setdiagass (card);if (rc <0 ) { -QETH_DBF_TEXT_ (SETUP ,2 ,"8err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"8err%d" , rc); goto out; } }
@@ -5705,7 +5697,7 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev) {struct qeth_card *card =dev_get_drvdata (&gdev->dev); -QETH_DBF_TEXT (SETUP ,2 ,"removedv" ); +QETH_CARD_TEXT (card,2 ,"removedv" );if (card->discipline) { card->discipline->remove (gdev);
@@ -6102,8 +6094,8 @@ int qeth_set_features(struct net_device *dev, netdev_features_t features)netdev_features_t changed = dev->features ^ features;int rc =0 ; -QETH_DBF_TEXT (SETUP ,2 ,"setfeat" ); -QETH_DBF_HEX (SETUP ,2 , &features,sizeof (features)); +QETH_CARD_TEXT (card,2 ,"setfeat" ); +QETH_CARD_HEX (card,2 , &features,sizeof (features));if ((changed &NETIF_F_IP_CSUM )) { rc = qeth_set_ipa_csum(card, features & NETIF_F_IP_CSUM,
@@ -6149,7 +6141,7 @@ netdev_features_t qeth_fix_features(struct net_device *dev, {struct qeth_card *card = dev->ml_priv; -QETH_DBF_TEXT (SETUP ,2 ,"fixfeat" ); +QETH_CARD_TEXT (card,2 ,"fixfeat" );if (!qeth_is_supported (card,IPA_OUTBOUND_CHECKSUM )) features &= ~NETIF_F_IP_CSUM ;if (!qeth_is_supported6 (card,IPA_OUTBOUND_CHECKSUM_V6 ))
@@ -6162,7 +6154,7 @@ netdev_features_t qeth_fix_features(struct net_device *dev,if (!qeth_is_supported6 (card,IPA_OUTBOUND_TSO )) features &= ~NETIF_F_TSO6 ; -QETH_DBF_HEX (SETUP ,2 , &features,sizeof (features)); +QETH_CARD_HEX (card,2 , &features,sizeof (features));return features; }EXPORT_SYMBOL_GPL (qeth_fix_features);
drivers/s390/net/qeth_l2_main.c +12 -16
@@ -274,8 +274,7 @@ static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev,static void qeth_l2_stop_card (struct qeth_card *card) { -QETH_DBF_TEXT (SETUP ,2 ,"stopcard" ); -QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,2 ,"stopcard" );qeth_set_allowed_threads (card,0 ,1 );
@@ -352,8 +351,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) {int rc =0 ; -QETH_DBF_TEXT (SETUP ,2 ,"l2reqmac" ); -QETH_DBF_TEXT_ (SETUP ,2 ,"doL2%s" ,CARD_BUS_ID (card)); +QETH_CARD_TEXT (card,2 ,"l2reqmac" );if (MACHINE_IS_VM ) { rc =qeth_vm_request_mac (card);
@@ -361,7 +359,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) goto out;QETH_DBF_MESSAGE (2 ,"z/VM MAC Service failed on device %x: %#x\n" ,CARD_DEVID (card), rc); -QETH_DBF_TEXT_ (SETUP ,2 ,"err%04x" , rc); +QETH_CARD_TEXT_ (card,2 ,"err%04x" , rc);/* fall back to alternative mechanism: */ }
@@ -371,7 +369,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) goto out;QETH_DBF_MESSAGE (2 ,"READ_MAC Assist failed on device %x: %#x\n" ,CARD_DEVID (card), rc); -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%04x" , rc); +QETH_CARD_TEXT_ (card,2 ,"1err%04x" , rc);/* fall back once more: */ }
@@ -381,7 +379,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)eth_hw_addr_random (card->dev); out: -QETH_DBF_HEX (SETUP ,2 , card->dev->dev_addr, card->dev->addr_len); +QETH_CARD_HEX (card,2 , card->dev->dev_addr, card->dev->addr_len);return 0 ; }
@@ -465,7 +463,7 @@ static void qeth_promisc_to_bridge(struct qeth_card *card) role =QETH_SBP_ROLE_NONE ; rc =qeth_bridgeport_setrole (card, role); -QETH_DBF_TEXT_ (SETUP ,2 ,"bpm%c%04x" , +QETH_CARD_TEXT_ (card,2 ,"bpm%c%04x" , (promisc_mode ==SET_PROMISC_MODE_ON ) ?'+' :'-' , rc);if (!rc) { card->options.sbp.role = role;
@@ -794,12 +792,11 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)mutex_lock (&card->discipline_mutex);mutex_lock (&card->conf_mutex); -QETH_DBF_TEXT (SETUP ,2 ,"setonlin" ); -QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,2 ,"setonlin" ); rc =qeth_core_hardsetup_card (card, &carrier_ok);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"2err%04x" , rc); +QETH_CARD_TEXT_ (card,2 ,"2err%04x" , rc); rc = -ENODEV ; goto out_remove; }
@@ -830,7 +827,7 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)qeth_print_status_message (card);/* softsetup */ -QETH_DBF_TEXT (SETUP ,2 ,"softsetp" ); +QETH_CARD_TEXT (card,2 ,"softsetp" );if (IS_OSD (card) ||IS_OSX (card)) { rc =qeth_l2_start_ipassists (card);
@@ -840,7 +837,7 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) rc =qeth_init_qdio_queues (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"6err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"6err%d" , rc); rc = -ENODEV ; goto out_remove; }
@@ -894,8 +891,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,mutex_lock (&card->discipline_mutex);mutex_lock (&card->conf_mutex); -QETH_DBF_TEXT (SETUP ,3 ,"setoffl" ); -QETH_DBF_HEX (SETUP ,3 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,3 ,"setoffl" );if ((!recovery_mode && card->info.hwtrap) || card->info.hwtrap ==2 ) {qeth_hw_trap (card,QETH_DIAGS_TRAP_DISARM );
@@ -916,7 +912,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,if (!rc) rc = (rc2) ? rc2 : rc3;if (rc) -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"1err%d" , rc);qdio_free (CARD_DDEV (card));/* let user_space know that device is offline */
drivers/s390/net/qeth_l3_main.c +16 -19
@@ -742,7 +742,7 @@ static int qeth_l3_setadapter_parms(struct qeth_card *card) {int rc =0 ; -QETH_DBF_TEXT (SETUP ,2 ,"setadprm" ); +QETH_CARD_TEXT (card,2 ,"setadprm" );if (qeth_adp_supported (card,IPA_SETADP_ALTER_MAC_ADDRESS )) { rc =qeth_setadpparms_change_macaddr (card);
@@ -979,7 +979,7 @@ static int qeth_l3_iqd_read_initial_mac(struct qeth_card *card)struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd; -QETH_DBF_TEXT (SETUP ,2 ,"hsrmac" ); +QETH_CARD_TEXT (card,2 ,"hsrmac" ); iob =qeth_get_ipacmd_buffer (card,IPA_CMD_CREATE_ADDR ,QETH_PROT_IPV6 );
@@ -1017,7 +1017,7 @@ static int qeth_l3_get_unique_id(struct qeth_card *card)struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd; -QETH_DBF_TEXT (SETUP ,2 ,"guniqeid" ); +QETH_CARD_TEXT (card,2 ,"guniqeid" );if (!qeth_is_supported (card,IPA_IPV6 )) { card->info.unique_id = UNIQUE_ID_IF_CREATE_ADDR_FAILED |
@@ -1044,7 +1044,7 @@ qeth_diags_trace_cb(struct qeth_card *card, struct qeth_reply *reply,struct qeth_ipa_cmd *cmd;__u16 rc; -QETH_DBF_TEXT (SETUP ,2 ,"diastrcb" ); +QETH_CARD_TEXT (card,2 ,"diastrcb" ); cmd = (struct qeth_ipa_cmd *)data; rc = cmd->hdr.return_code;
@@ -1100,7 +1100,7 @@ qeth_diags_trace(struct qeth_card *card, enum qeth_diags_trace_cmds diags_cmd)struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd; -QETH_DBF_TEXT (SETUP ,2 ,"diagtrac" ); +QETH_CARD_TEXT (card,2 ,"diagtrac" ); iob =qeth_get_ipacmd_buffer (card,IPA_CMD_SET_DIAG_ASS ,0 );if (!iob)
@@ -1413,8 +1413,7 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,static void qeth_l3_stop_card (struct qeth_card *card) { -QETH_DBF_TEXT (SETUP ,2 ,"stopcard" ); -QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,2 ,"stopcard" );qeth_set_allowed_threads (card,0 ,1 );
@@ -2335,12 +2334,11 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev)mutex_lock (&card->discipline_mutex);mutex_lock (&card->conf_mutex); -QETH_DBF_TEXT (SETUP ,2 ,"setonlin" ); -QETH_DBF_HEX (SETUP ,2 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,2 ,"setonlin" ); rc =qeth_core_hardsetup_card (card, &carrier_ok);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"2err%04x" , rc); +QETH_CARD_TEXT_ (card,2 ,"2err%04x" , rc); rc = -ENODEV ; goto out_remove; }
@@ -2356,28 +2354,28 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev)qeth_print_status_message (card);/* softsetup */ -QETH_DBF_TEXT (SETUP ,2 ,"softsetp" ); +QETH_CARD_TEXT (card,2 ,"softsetp" ); rc =qeth_l3_setadapter_parms (card);if (rc) -QETH_DBF_TEXT_ (SETUP ,2 ,"2err%04x" , rc); +QETH_CARD_TEXT_ (card,2 ,"2err%04x" , rc);if (!card->options.sniffer) { rc =qeth_l3_start_ipassists (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"3err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"3err%d" , rc); goto out_remove; } rc =qeth_l3_setrouting_v4 (card);if (rc) -QETH_DBF_TEXT_ (SETUP ,2 ,"4err%04x" , rc); +QETH_CARD_TEXT_ (card,2 ,"4err%04x" , rc); rc =qeth_l3_setrouting_v6 (card);if (rc) -QETH_DBF_TEXT_ (SETUP ,2 ,"5err%04x" , rc); +QETH_CARD_TEXT_ (card,2 ,"5err%04x" , rc); } rc =qeth_init_qdio_queues (card);if (rc) { -QETH_DBF_TEXT_ (SETUP ,2 ,"6err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"6err%d" , rc); rc = -ENODEV ; goto out_remove; }
@@ -2432,8 +2430,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,mutex_lock (&card->discipline_mutex);mutex_lock (&card->conf_mutex); -QETH_DBF_TEXT (SETUP ,3 ,"setoffl" ); -QETH_DBF_HEX (SETUP ,3 , &card,sizeof (void *)); +QETH_CARD_TEXT (card,3 ,"setoffl" );if ((!recovery_mode && card->info.hwtrap) || card->info.hwtrap ==2 ) {qeth_hw_trap (card,QETH_DIAGS_TRAP_DISARM );
@@ -2459,7 +2456,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,if (!rc) rc = (rc2) ? rc2 : rc3;if (rc) -QETH_DBF_TEXT_ (SETUP ,2 ,"1err%d" , rc); +QETH_CARD_TEXT_ (card,2 ,"1err%d" , rc);qdio_free (CARD_DDEV (card));/* let user_space know that device is offline */
Signature · 1 line
2.17.1
PATCH 9/13 s390/qeth: remove 'channel' parameter from callbacks
In reply to Julian WiedmannEach cmd buffer maintains a pointer to the IO channel that it was/will be issued on. So when dealing with cmd buffers, we don't need to pass around a separate channel pointer.
--- drivers/s390/net/qeth_core.h | 5 ++-- drivers/s390/net/qeth_core_main.c | 38 ++++++++++++++----------------- drivers/s390/net/qeth_l2_main.c | 5 ++-- 3 files changed, 21 insertions(+), 27 deletions(-)
drivers/s390/net/qeth_core.h +2 -3
@@ -585,8 +585,7 @@ struct qeth_cmd_buffer {unsigned char *data;void (*finalize)(struct qeth_card *card,struct qeth_cmd_buffer *iob,unsigned int length); -void (*callback)(struct qeth_card *card,struct qeth_channel *channel, -struct qeth_cmd_buffer *iob); +void (*callback)(struct qeth_card *card,struct qeth_cmd_buffer *iob); };static inline struct qeth_ipa_cmd *__ipa_cmd (struct qeth_cmd_buffer *iob)
@@ -995,7 +994,7 @@ void qeth_drain_output_queues(struct qeth_card *card);void qeth_setadp_promisc_mode (struct qeth_card *);int qeth_setadpparms_change_macaddr (struct qeth_card *);void qeth_tx_timeout (struct net_device *); -void qeth_release_buffer (struct qeth_channel *,struct qeth_cmd_buffer *); +void qeth_release_buffer (struct qeth_cmd_buffer *iob);void qeth_notify_reply (struct qeth_reply *reply,int reason);void qeth_prepare_ipa_cmd (struct qeth_card *card,struct qeth_cmd_buffer *iob,u16 cmd_length);
drivers/s390/net/qeth_core_main.c +17 -21
@@ -63,7 +63,6 @@ static struct device *qeth_core_root_dev;static struct lock_class_key qdio_out_skb_queue_key;static void qeth_issue_next_read_cb (struct qeth_card *card, -struct qeth_channel *channel,struct qeth_cmd_buffer *iob);static void qeth_free_buffer_pool (struct qeth_card *);static int qeth_qdio_establish (struct qeth_card *);
@@ -521,7 +520,7 @@ static int __qeth_issue_next_read(struct qeth_card *card)QETH_DBF_MESSAGE (2 ,"error %i on device %x when starting next read ccw!\n" , rc,CARD_DEVID (card));atomic_set (&channel->irq_pending,0 ); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob); card->read_or_write_problem =1 ;qeth_schedule_recovery (card);wake_up (&card->wait_q);
@@ -713,9 +712,9 @@ static struct qeth_cmd_buffer *__qeth_get_buffer(struct qeth_channel *channel)return NULL ; } -void qeth_release_buffer (struct qeth_channel *channel, -struct qeth_cmd_buffer *iob) +void qeth_release_buffer (struct qeth_cmd_buffer *iob) { +struct qeth_channel *channel = iob->channel;unsigned long flags;spin_lock_irqsave (&channel->iob_lock, flags);
@@ -731,10 +730,9 @@ void qeth_release_buffer(struct qeth_channel *channel,EXPORT_SYMBOL_GPL (qeth_release_buffer);static void qeth_release_buffer_cb (struct qeth_card *card, -struct qeth_channel *channel,struct qeth_cmd_buffer *iob) { -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob); }static void qeth_cancel_cmd (struct qeth_cmd_buffer *iob,int rc)
@@ -743,7 +741,7 @@ static void qeth_cancel_cmd(struct qeth_cmd_buffer *iob, int rc)if (reply)qeth_notify_reply (reply, rc); -qeth_release_buffer (iob->channel, iob); +qeth_release_buffer (iob); }struct qeth_cmd_buffer *qeth_get_buffer (struct qeth_channel *channel)
@@ -763,13 +761,12 @@ void qeth_clear_cmd_buffers(struct qeth_channel *channel)int cnt;for (cnt =0 ; cnt <QETH_CMD_BUFFER_NO ; cnt++) -qeth_release_buffer (channel, &channel->iob[cnt]); +qeth_release_buffer (&channel->iob[cnt]); channel->io_buf_no =0 ; }EXPORT_SYMBOL_GPL (qeth_clear_cmd_buffers);static void qeth_issue_next_read_cb (struct qeth_card *card, -struct qeth_channel *channel,struct qeth_cmd_buffer *iob) {struct qeth_ipa_cmd *cmd =NULL ;
@@ -842,7 +839,7 @@ static void qeth_issue_next_read_cb(struct qeth_card *card,memcpy (&card->seqno.pdu_hdr_ack,QETH_PDU_HEADER_SEQ_NO (iob->data),QETH_SEQ_NO_LENGTH ); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob);__qeth_issue_next_read (card); }
@@ -1110,7 +1107,7 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,return ;if (iob && iob->callback) - iob->callback (card, iob->channel, iob); + iob->callback (card, iob); out:wake_up (&card->wait_q);
@@ -1834,7 +1831,7 @@ static int qeth_send_control_data(struct qeth_card *card, int len, reply =qeth_alloc_reply (card);if (!reply) { -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob);return -ENOMEM ; } reply->callback = reply_cb;
@@ -1849,7 +1846,7 @@ static int qeth_send_control_data(struct qeth_card *card, int len, timeout);if (timeout <=0 ) {qeth_put_reply (reply); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob);return (timeout == -ERESTARTSYS ) ? -EINTR : -ETIME ; }
@@ -1869,7 +1866,7 @@ static int qeth_send_control_data(struct qeth_card *card, int len,QETH_CARD_TEXT_ (card,2 ," err%d" , rc);qeth_dequeue_reply (card, reply);qeth_put_reply (reply); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob);atomic_set (&channel->irq_pending,0 );wake_up (&card->wait_q);return rc;
@@ -1922,9 +1919,9 @@ static int qeth_idx_check_activate_response(struct qeth_card *card, }static void qeth_idx_query_read_cb (struct qeth_card *card, -struct qeth_channel *channel,struct qeth_cmd_buffer *iob) { +struct qeth_channel *channel = iob->channel;u16 peer_level;int rc;
@@ -1951,13 +1948,13 @@ static void qeth_idx_query_read_cb(struct qeth_card *card, out:qeth_notify_reply (iob->reply, rc); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob); }static void qeth_idx_query_write_cb (struct qeth_card *card, -struct qeth_channel *channel,struct qeth_cmd_buffer *iob) { +struct qeth_channel *channel = iob->channel;u16 peer_level;int rc;
@@ -1978,7 +1975,7 @@ static void qeth_idx_query_write_cb(struct qeth_card *card, out:qeth_notify_reply (iob->reply, rc); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob); } static void qeth_idx_finalize_query_cmd(struct qeth_card *card,
@@ -1989,11 +1986,10 @@ static void qeth_idx_finalize_query_cmd(struct qeth_card *card, }static void qeth_idx_activate_cb (struct qeth_card *card, -struct qeth_channel *channel,struct qeth_cmd_buffer *iob) {qeth_notify_reply (iob->reply,0 ); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob); } static void qeth_idx_setup_activate_cmd(struct qeth_card *card,
@@ -2852,7 +2848,7 @@ int qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,QETH_CARD_TEXT (card,4 ,"sendipa" );if (card->read_or_write_problem) { -qeth_release_buffer (iob->channel, iob); +qeth_release_buffer (iob);return -EIO ; }
drivers/s390/net/qeth_l2_main.c +2 -3
@@ -1030,11 +1030,10 @@ struct qeth_discipline qeth_l2_discipline = {EXPORT_SYMBOL_GPL (qeth_l2_discipline);static void qeth_osn_assist_cb (struct qeth_card *card, -struct qeth_channel *channel,struct qeth_cmd_buffer *iob) {qeth_notify_reply (iob->reply,0 ); -qeth_release_buffer (channel, iob); +qeth_release_buffer (iob); }int qeth_osn_assist (struct net_device *dev,void *data,int data_len)
@@ -1812,7 +1811,7 @@ static int qeth_l2_vnicc_request(struct qeth_card *card, req->getset_timeout.vnic_char = cbctl->param.vnic_char;break ;default : -qeth_release_buffer (iob->channel, iob); +qeth_release_buffer (iob);return -EOPNOTSUPP ; }
Signature · 1 line
2.17.1
PATCH 10/13 s390/qeth: add support for dynamically allocated cmds
In reply to Julian Wiedmannqeth currently uses a fixed set of statically allocated cmd buffers for the read and write IO channels. This (1) doesn't play well with the single RCD cmd we need to issue on the data channel, (2) doesn't provide the necessary flexibility for certain IDX improvements, and (3) is also rather wasteful since the buffers are idle most of the time.
Add a new type of cmd buffer that is dynamically allocated, and keeps its ccw chain in the DMA data area. Since this touches most callers of qeth_setup_ccw(), also add a new CCW flags parameter for future usage.
--- drivers/s390/net/qeth_core.h | 9 +++++ drivers/s390/net/qeth_core_main.c | 56 ++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 9 deletions(-)
drivers/s390/net/qeth_core.h +9 -0
@@ -560,6 +560,7 @@ enum qeth_prot_versions {enum qeth_cmd_buffer_state {BUF_STATE_FREE ,BUF_STATE_LOCKED , +BUF_STATE_MALLOC , };enum qeth_cq {
@@ -579,6 +580,7 @@ struct qeth_channel;struct qeth_cmd_buffer {enum qeth_cmd_buffer_state state; +unsigned int length;struct qeth_channel *channel;struct qeth_reply *reply;long timeout;
@@ -608,6 +610,13 @@ struct qeth_channel {int io_buf_no; }; +static inline struct ccw1 *__ccw_from_cmd (struct qeth_cmd_buffer *iob) +{ +if (iob->state !=BUF_STATE_MALLOC ) +return iob->channel->ccw; +return (struct ccw1 *)(iob->data +ALIGN (iob->length,8 )); +} +static inline bool qeth_trylock_channel (struct qeth_channel *channel) {return atomic_cmpxchg (&channel->irq_pending,0 ,1 ) ==0 ;
drivers/s390/net/qeth_core_main.c +47 -9
114 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 11/13 s390/qeth: convert RCD code to common IO infrastructure
In reply to Julian WiedmannThe RCD code is the last remaining IO path that doesn't use the qeth_send_control_data() infrastructure. Doing so allows us to remove all sorts of custom state machinery and logic in the IRQ handler.
Instead of introducing statically allocated cmd buffers for this single IO on the data channel, use the new qeth_alloc_cmd() helper.
--- drivers/s390/net/qeth_core.h | 2 - drivers/s390/net/qeth_core_main.c | 132 +++++++++++------------------- drivers/s390/net/qeth_core_mpc.h | 2 - 3 files changed, 46 insertions(+), 90 deletions(-)
drivers/s390/net/qeth_core.h +0 -2
@@ -537,8 +537,6 @@ enum qeth_channel_states {CH_STATE_DOWN ,CH_STATE_HALTED , CH_STATE_STOPPED, -CH_STATE_RCD , - CH_STATE_RCD_DONE, };/** * card state machine
drivers/s390/net/qeth_core_main.c +46 -86
204 lines not on this page · raw message
drivers/s390/net/qeth_core_mpc.h +0 -2
@@ -31,14 +31,12 @@ extern unsigned char IPA_PDU_HEADER[];#define QETH_CLEAR_CHANNEL_PARM -10#define QETH_HALT_CHANNEL_PARM -11 -#define QETH_RCD_PARM -12static inline bool qeth_intparm_is_iob (unsigned long intparm) {switch (intparm) {case QETH_CLEAR_CHANNEL_PARM :case QETH_HALT_CHANNEL_PARM : -case QETH_RCD_PARM :case 0 :return false; }
Signature · 1 line
2.17.1
PATCH 12/13 s390/qeth: command-chain the IDX sequence
In reply to Julian WiedmannThe current IDX sequence first sends one WRITE cmd to activate the device, and then sends a second cmd that READs the response.
Using qeth_alloc_cmd(), we can combine this into a single IO with two command-chained CCWs.
--- drivers/s390/net/qeth_core_main.c | 58 ++++++++----------------------- 1 file changed, 14 insertions(+), 44 deletions(-)
drivers/s390/net/qeth_core_main.c +14 -44
@@ -1709,9 +1709,6 @@ static void qeth_idx_finalize_cmd(struct qeth_card *card,struct qeth_cmd_buffer *iob, unsigned int length) { - qeth_setup_ccw(__ccw_from_cmd(iob), CCW_CMD_WRITE, 0, length, - iob->data); - memcpy(QETH_TRANSPORT_HEADER_SEQ_NO(iob->data), &card->seqno.trans_hdr,QETH_SEQ_NO_LENGTH );if (iob->channel == &card->write)
@@ -1731,6 +1728,8 @@ static void qeth_mpc_finalize_cmd(struct qeth_card *card,struct qeth_cmd_buffer *iob, unsigned int length) { + qeth_setup_ccw(__ccw_from_cmd(iob), CCW_CMD_WRITE, 0, length, + iob->data);qeth_idx_finalize_cmd (card, iob, length); memcpy(QETH_PDU_HEADER_SEQ_NO(iob->data),
@@ -1920,8 +1919,8 @@ static int qeth_idx_check_activate_response(struct qeth_card *card, } } -static void qeth_idx_query_read_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +static void qeth_idx_activate_read_channel_cb (struct qeth_card *card, +struct qeth_cmd_buffer *iob) {struct qeth_channel *channel = iob->channel;u16 peer_level;
@@ -1953,8 +1952,8 @@ static void qeth_idx_query_read_cb(struct qeth_card *card,qeth_release_buffer (iob); } -static void qeth_idx_query_write_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +static void qeth_idx_activate_write_channel_cb (struct qeth_card *card, +struct qeth_cmd_buffer *iob) {struct qeth_channel *channel = iob->channel;u16 peer_level;
@@ -1980,30 +1979,19 @@ static void qeth_idx_query_write_cb(struct qeth_card *card,qeth_release_buffer (iob); } -static void qeth_idx_finalize_query_cmd (struct qeth_card *card, -struct qeth_cmd_buffer *iob, -unsigned int length) -{ -qeth_setup_ccw (__ccw_from_cmd (iob),CCW_CMD_READ ,0 , length, iob->data); -} - -static void qeth_idx_activate_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) -{ -qeth_notify_reply (iob->reply,0 ); -qeth_release_buffer (iob); -} -static void qeth_idx_setup_activate_cmd (struct qeth_card *card,struct qeth_cmd_buffer *iob) {u16 addr = (card->info.cula <<8 ) + card->info.unit_addr2;u8 port = ((u8 )card->dev->dev_port) |0x80 ; +struct ccw1 *ccw =__ccw_from_cmd (iob);struct ccw_dev_id dev_id; +qeth_setup_ccw (&ccw[0 ],CCW_CMD_WRITE ,CCW_FLAG_CC ,IDX_ACTIVATE_SIZE , + iob->data); +qeth_setup_ccw (&ccw[1 ],CCW_CMD_READ ,0 , iob->length, iob->data);ccw_device_get_id (CARD_DDEV (card), &dev_id); iob->finalize = qeth_idx_finalize_cmd; - iob->callback = qeth_idx_activate_cb;memcpy (QETH_IDX_ACT_PNO (iob->data), &port,1 ); memcpy(QETH_IDX_ACT_ISSUER_RM_TOKEN(iob->data),
@@ -2022,27 +2010,18 @@ static int qeth_idx_activate_read_channel(struct qeth_card *card)QETH_CARD_TEXT (card,2 ,"idxread" ); - iob =qeth_get_buffer (channel); + iob =qeth_alloc_cmd (channel,QETH_BUFSIZE ,2 ,QETH_TIMEOUT );if (!iob)return -ENOMEM ;memcpy (iob->data,IDX_ACTIVATE_READ ,IDX_ACTIVATE_SIZE );qeth_idx_setup_activate_cmd (card, iob); + iob->callback = qeth_idx_activate_read_channel_cb; rc =qeth_send_control_data (card,IDX_ACTIVATE_SIZE , iob,NULL ,NULL );if (rc)return rc; - iob =qeth_get_buffer (channel); -if (!iob) -return -ENOMEM ; - - iob->finalize = qeth_idx_finalize_query_cmd; - iob->callback = qeth_idx_query_read_cb; - rc =qeth_send_control_data (card,QETH_BUFSIZE , iob,NULL ,NULL ); -if (rc) -return rc; - channel->state =CH_STATE_UP ;return 0 ; }
@@ -2055,27 +2034,18 @@ static int qeth_idx_activate_write_channel(struct qeth_card *card)QETH_CARD_TEXT (card,2 ,"idxwrite" ); - iob =qeth_get_buffer (channel); + iob =qeth_alloc_cmd (channel,QETH_BUFSIZE ,2 ,QETH_TIMEOUT );if (!iob)return -ENOMEM ;memcpy (iob->data,IDX_ACTIVATE_WRITE ,IDX_ACTIVATE_SIZE );qeth_idx_setup_activate_cmd (card, iob); + iob->callback = qeth_idx_activate_write_channel_cb; rc =qeth_send_control_data (card,IDX_ACTIVATE_SIZE , iob,NULL ,NULL );if (rc)return rc; - iob =qeth_get_buffer (channel); -if (!iob) -return -ENOMEM ; - - iob->finalize = qeth_idx_finalize_query_cmd; - iob->callback = qeth_idx_query_write_cb; - rc =qeth_send_control_data (card,QETH_BUFSIZE , iob,NULL ,NULL ); -if (rc) -return rc; - channel->state =CH_STATE_UP ;return 0 ; }
Signature · 1 line
2.17.1
PATCH 13/13 s390/qeth: allocate a single cmd on read channel
In reply to Julian WiedmannWe statically allocate 8 cmd buffers on the read channel, when the only IO left that's still using them is the long-running READ. Replace this with a single allocated cmd, that gets restarted whenever the READ completed.
This introduces refcounting for allocated cmds, so that the READ cmd can survive the IO completion.
--- drivers/s390/net/qeth_core.h | 7 ++++ drivers/s390/net/qeth_core_main.c | 54 ++++++++++++++++++------------- drivers/s390/net/qeth_l2_main.c | 1 - drivers/s390/net/qeth_l3_main.c | 1 - 4 files changed, 39 insertions(+), 24 deletions(-)
drivers/s390/net/qeth_core.h +7 -0
@@ -579,6 +579,7 @@ struct qeth_channel;struct qeth_cmd_buffer {enum qeth_cmd_buffer_state state;unsigned int length; +refcount_t ref_count;struct qeth_channel *channel;struct qeth_reply *reply;long timeout;
@@ -588,6 +589,11 @@ struct qeth_cmd_buffer {void (*callback)(struct qeth_card *card,struct qeth_cmd_buffer *iob); }; +static inline void qeth_get_cmd (struct qeth_cmd_buffer *iob) +{ +refcount_inc (&iob->ref_count); +} +static inline struct qeth_ipa_cmd *__ipa_cmd (struct qeth_cmd_buffer *iob) {return (struct qeth_ipa_cmd *)(iob->data +IPA_PDU_HEADER_SIZE );
@@ -771,6 +777,7 @@ struct qeth_card {enum qeth_card_states state;spinlock_t lock;struct ccwgroup_device *gdev; +struct qeth_cmd_buffer *read_cmd;struct qeth_channel read;struct qeth_channel write;struct qeth_channel data;
drivers/s390/net/qeth_core_main.c +32 -22
105 lines not on this page · raw message
drivers/s390/net/qeth_l2_main.c +0 -1
@@ -292,7 +292,6 @@ static void qeth_l2_stop_card(struct qeth_card *card) card->state =CARD_STATE_DOWN ; } -qeth_clear_cmd_buffers (&card->read);qeth_clear_cmd_buffers (&card->write);flush_workqueue (card->event_wq); card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED ;
drivers/s390/net/qeth_l3_main.c +0 -1
@@ -1436,7 +1436,6 @@ static void qeth_l3_stop_card(struct qeth_card *card) card->state =CARD_STATE_DOWN ; } -qeth_clear_cmd_buffers (&card->read);qeth_clear_cmd_buffers (&card->write);flush_workqueue (card->event_wq); }
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Tue, 11 Jun 2019 18:37:47 +0200
Quoted 3 lines
please apply the following patch series for qeth to net-next. This brings all sorts of cleanups and minor improvements, primarily for the control IO path.
Series applied.