s390/net: updates 2019-08-20
Subsystems (4)
cover s390/net: updates 2019-08-20
Hi Dave,
please apply the following patches to net-next. This series brings a mix of cleanups and small improvements for various parts of qeth's control path. Also, a minor cleanup for ctcm and lcs.
Thanks,
Julian
Julian Wiedmann (9):
s390/qeth: use node_descriptor struct
s390/qeth: propagate length of processed cmd IO data to callback s390/qeth: use correct length field in SNMP cmd callback s390/qeth: keep cmd alive after IO completion s390/qeth: merge qeth_reply struct into qeth_cmd_buffer s390/qeth: get vnicc sub-cmd type from reply data s390/qeth: streamline control code for promisc mode s390/ctcm: don't use intparm for channel IO
s390/lcs: don't use intparm for channel IO
drivers/s390/net/ctcm_fsms.c | 42 ++--- drivers/s390/net/ctcm_main.c | 6 +- drivers/s390/net/ctcm_mpc.c | 6 +- drivers/s390/net/lcs.c | 6 +- drivers/s390/net/qeth_core.h | 36 ++--- drivers/s390/net/qeth_core_main.c | 261 ++++++++++++++---------------- drivers/s390/net/qeth_core_mpc.h | 1 - drivers/s390/net/qeth_l2_main.c | 62 +++---- drivers/s390/net/qeth_l3_main.c | 24 +-- 9 files changed, 197 insertions(+), 247 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/9 s390/qeth: use node_descriptor struct
Rather than fumbling with hard-coded offsets, use the proper struct to access the retrieved RCD information.
--- drivers/s390/net/qeth_core.h | 2 +- drivers/s390/net/qeth_core_main.c | 31 +++++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 9 deletions(-)
drivers/s390/net/qeth_core.h +1 -1
@@ -651,7 +651,7 @@ struct qeth_card_blkt {struct qeth_card_info {unsigned short unit_addr2;unsigned short cula; -unsigned short chpid; +u8 chpid;__u16 func_level;char mcl_level[QETH_MCL_LENGTH +1 ];u8 open_when_online:1 ;
drivers/s390/net/qeth_core_main.c +23 -8
@@ -1775,19 +1775,32 @@ static int qeth_send_control_data(struct qeth_card *card,return rc; } +struct qeth_node_desc { +struct node_descriptor nd1; +struct node_descriptor nd2; +struct node_descriptor nd3; +}; +static void qeth_read_conf_data_cb (struct qeth_card *card,struct qeth_cmd_buffer *iob) { -unsigned char *prcd = iob->data; +struct qeth_node_desc *nd = (struct qeth_node_desc *) iob->data; +u8 *tag;QETH_CARD_TEXT (card,2 ,"cfgunit" ); - card->info.chpid = prcd[30 ]; - card->info.unit_addr2 = prcd[31 ]; - 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 ; + card->info.is_vm_nic = nd->nd1.plant[0 ] == _ascebc['V' ] && + nd->nd1.plant[1 ] == _ascebc['M' ]; + tag = (u8 *)&nd->nd1.tag; + card->info.chpid = tag[0 ]; + card->info.unit_addr2 = tag[1 ]; + + tag = (u8 *)&nd->nd2.tag; + card->info.cula = tag[1 ]; + + card->info.use_v1_blkt = nd->nd3.model[0 ] ==0xF0 && + nd->nd3.model[1 ] ==0xF0 && + nd->nd3.model[2 ] >=0xF1 && + nd->nd3.model[2 ] <=0xF4 ;qeth_notify_reply (iob->reply,0 );qeth_put_cmd (iob);
@@ -1803,6 +1816,8 @@ static int qeth_read_conf_data(struct qeth_card *card) ciw =ccw_device_get_ciw (channel->ccwdev,CIW_TYPE_RCD );if (!ciw || ciw->cmd ==0 )return -EOPNOTSUPP ; +if (ciw->count <sizeof (struct qeth_node_desc )) +return -EINVAL ; iob =qeth_alloc_cmd (channel, ciw->count,1 ,QETH_RCD_TIMEOUT );if (!iob)
Signature · 1 line
2.17.1
PATCH 2/9 s390/qeth: propagate length of processed cmd IO data to callback
In reply to Julian WiedmannWhen an cmd IO completes in qeth_irq(), calculate how much data was processed by the device and pass this value to the cmd's callback.
This allows cmds that retrieve data from the device to check whether sufficient data was received, so we do that in qeth_read_conf_data_cb().
--- drivers/s390/net/qeth_core.h | 3 ++- drivers/s390/net/qeth_core_main.c | 40 ++++++++++++++++++++++++------- drivers/s390/net/qeth_l2_main.c | 3 ++- 3 files changed, 35 insertions(+), 11 deletions(-)
drivers/s390/net/qeth_core.h +2 -1
@@ -580,7 +580,8 @@ struct qeth_cmd_buffer {long timeout;unsigned char *data;void (*finalize)(struct qeth_card *card,struct qeth_cmd_buffer *iob); -void (*callback)(struct qeth_card *card,struct qeth_cmd_buffer *iob); +void (*callback)(struct qeth_card *card,struct qeth_cmd_buffer *iob, +unsigned int data_length); };static inline void qeth_get_cmd (struct qeth_cmd_buffer *iob)
drivers/s390/net/qeth_core_main.c +31 -9
@@ -63,7 +63,8 @@ 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_cmd_buffer *iob); +struct qeth_cmd_buffer *iob, +unsigned int data_length);static void qeth_free_buffer_pool (struct qeth_card *);static int qeth_qdio_establish (struct qeth_card *);static void qeth_free_qdio_queues (struct qeth_card *card);
@@ -702,7 +703,8 @@ void qeth_put_cmd(struct qeth_cmd_buffer *iob)EXPORT_SYMBOL_GPL (qeth_put_cmd);static void qeth_release_buffer_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +struct qeth_cmd_buffer *iob, +unsigned int data_length) {qeth_put_cmd (iob); }
@@ -745,7 +747,8 @@ struct qeth_cmd_buffer *qeth_alloc_cmd(struct qeth_channel *channel,EXPORT_SYMBOL_GPL (qeth_alloc_cmd);static void qeth_issue_next_read_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +struct qeth_cmd_buffer *iob, +unsigned int data_length) {struct qeth_ipa_cmd *cmd =NULL ;struct qeth_reply *reply =NULL ;
@@ -1072,8 +1075,16 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm, } } -if (iob && iob->callback) - iob->callback (card, iob); +if (iob) { +/* sanity check: */ +if (irb->scsw.cmd.count > iob->length) { +qeth_cancel_cmd (iob, -EIO ); + goto out; + } +if (iob->callback) + iob->callback (card, iob, + iob->length - irb->scsw.cmd.count); + } out:wake_up (&card->wait_q);
@@ -1782,12 +1793,20 @@ struct qeth_node_desc { };static void qeth_read_conf_data_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +struct qeth_cmd_buffer *iob, +unsigned int data_length) {struct qeth_node_desc *nd = (struct qeth_node_desc *) iob->data; +int rc =0 ;u8 *tag;QETH_CARD_TEXT (card,2 ,"cfgunit" ); + +if (data_length <sizeof (*nd)) { + rc = -EINVAL ; + goto out; + } + card->info.is_vm_nic = nd->nd1.plant[0 ] == _ascebc['V' ] && nd->nd1.plant[1 ] == _ascebc['M' ]; tag = (u8 *)&nd->nd1.tag;
@@ -1802,7 +1821,8 @@ static void qeth_read_conf_data_cb(struct qeth_card *card, nd->nd3.model[2 ] >=0xF1 && nd->nd3.model[2 ] <=0xF4 ; -qeth_notify_reply (iob->reply,0 ); +out: +qeth_notify_reply (iob->reply, rc);qeth_put_cmd (iob); }
@@ -1865,7 +1885,8 @@ static int qeth_idx_check_activate_response(struct qeth_card *card, }static void qeth_idx_activate_read_channel_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +struct qeth_cmd_buffer *iob, +unsigned int data_length) {struct qeth_channel *channel = iob->channel;u16 peer_level;
@@ -1898,7 +1919,8 @@ static void qeth_idx_activate_read_channel_cb(struct qeth_card *card, }static void qeth_idx_activate_write_channel_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +struct qeth_cmd_buffer *iob, +unsigned int data_length) {struct qeth_channel *channel = iob->channel;u16 peer_level;
drivers/s390/net/qeth_l2_main.c +2 -1
@@ -1000,7 +1000,8 @@ struct qeth_discipline qeth_l2_discipline = {EXPORT_SYMBOL_GPL (qeth_l2_discipline);static void qeth_osn_assist_cb (struct qeth_card *card, -struct qeth_cmd_buffer *iob) +struct qeth_cmd_buffer *iob, +unsigned int data_length) {qeth_notify_reply (iob->reply,0 );qeth_put_cmd (iob);
Signature · 1 line
2.17.1
PATCH 3/9 s390/qeth: use correct length field in SNMP cmd callback
In reply to Julian Wiedmannqeth_snmp_command_cb() is the only cmd callback that pulls the reply's data length from a low-level transport header field. This requires additional complexity (ie. reply->offset) to make the header accessible to what is supposed to be a pure IPA cmd callback.
Adapter cmds have a length field in their sub-cmd header, get the data length from there instead.
--- drivers/s390/net/qeth_core.h | 1 - drivers/s390/net/qeth_core_main.c | 42 ++++++++++++------------------- 2 files changed, 16 insertions(+), 27 deletions(-)
drivers/s390/net/qeth_core.h +0 -1
@@ -634,7 +634,6 @@ struct qeth_reply {int (*callback)(struct qeth_card *,struct qeth_reply *,unsigned long );u32 seqno; -unsigned long offset;int rc;void *param;refcount_t refcnt;
drivers/s390/net/qeth_core_main.c +16 -26
68 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 4/9 s390/qeth: keep cmd alive after IO completion
In reply to Julian WiedmannCurrent code releases the cmd struct after its initial IO has completed. Any reply processing is done independently, using a separate qeth_reply struct.
In preparation for merging the cmd and reply structs together, take an additional reference on the cmd object so that it stays around all the way until qeth_send_control_data() returns.
--- drivers/s390/net/qeth_core_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/s390/net/qeth_core_main.c +7 -2
@@ -1742,6 +1742,9 @@ static int qeth_send_control_data(struct qeth_card *card,qeth_enqueue_reply (card, reply); +/* This pairs with iob->callback, and keeps the iob alive after IO: */ +qeth_get_cmd (iob); +QETH_CARD_TEXT (card,6 ,"noirqpnd" );spin_lock_irq (get_ccwdev_lock (channel->ccwdev)); rc = ccw_device_start_timeout(channel->ccwdev, __ccw_from_cmd(iob),
@@ -1752,11 +1755,10 @@ static int qeth_send_control_data(struct qeth_card *card, CARD_DEVID(card), rc);QETH_CARD_TEXT_ (card,2 ," err%d" , rc);qeth_dequeue_reply (card, reply); -qeth_put_reply (reply);qeth_put_cmd (iob);atomic_set (&channel->irq_pending,0 );wake_up (&card->wait_q); -return rc; + goto out; } timeout = wait_for_completion_interruptible_timeout(&reply->received,
@@ -1777,7 +1779,10 @@ static int qeth_send_control_data(struct qeth_card *card,if (!rc) rc = reply->rc; + +out:qeth_put_reply (reply); +qeth_put_cmd (iob);return rc; }
Signature · 1 line
2.17.1
PATCH 5/9 s390/qeth: merge qeth_reply struct into qeth_cmd_buffer
In reply to Julian WiedmannExcept for card->read_cmd, every cmd we issue now passes through qeth_send_control_data() and allocates a qeth_reply struct. The way we use this struct requires additional refcounting, and pointer tracking.
Clean up things by moving most of qeth_reply's content into the main cmd struct. This keeps things in one place, saves us the additional refcounting and simplifies the overall code flow.
A nice little benefit is that we can now match incoming replies against the pending requests themselves, without caching the requests' seqnos.
The qeth_reply struct stays around for a little bit longer in a shrunk form, to avoid touching every single callback.
--- drivers/s390/net/qeth_core.h | 26 +++--- drivers/s390/net/qeth_core_main.c | 126 +++++++++++------------------- drivers/s390/net/qeth_core_mpc.h | 1 - drivers/s390/net/qeth_l2_main.c | 2 +- 4 files changed, 58 insertions(+), 97 deletions(-)
drivers/s390/net/qeth_core.h +12 -14
@@ -572,16 +572,26 @@ struct qeth_channel {atomic_t irq_pending; }; +struct qeth_reply { +int (*callback)(struct qeth_card *card,struct qeth_reply *reply, +unsigned long data); +void *param; +}; +struct qeth_cmd_buffer { +struct list_head list; +struct completion done; +spinlock_t lock;unsigned int length;refcount_t ref_count;struct qeth_channel *channel; -struct qeth_reply *reply; +struct qeth_reply reply;long timeout;unsigned char *data;void (*finalize)(struct qeth_card *card,struct qeth_cmd_buffer *iob);void (*callback)(struct qeth_card *card,struct qeth_cmd_buffer *iob,unsigned int data_length); +int rc; };static inline void qeth_get_cmd (struct qeth_cmd_buffer *iob)
@@ -627,18 +637,6 @@ struct qeth_seqno {__u16 ipa; }; -struct qeth_reply { -struct list_head list; -struct completion received; -spinlock_t lock; -int (*callback)(struct qeth_card *,struct qeth_reply *, -unsigned long ); -u32 seqno; -int rc; -void *param; -refcount_t refcnt; -}; -struct qeth_card_blkt {int time_total;int inter_packet;
@@ -994,6 +992,7 @@ struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *card,struct qeth_cmd_buffer *qeth_get_diag_cmd (struct qeth_card *card,enum qeth_diags_cmds sub_cmd,unsigned int data_length); +void qeth_notify_cmd (struct qeth_cmd_buffer *iob,int reason);void qeth_put_cmd (struct qeth_cmd_buffer *iob); struct sk_buff *qeth_core_get_next_skb(struct qeth_card *,
@@ -1008,7 +1007,6 @@ 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_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); int qeth_query_switch_attributes(struct qeth_card *card,
drivers/s390/net/qeth_core_main.c +45 -81
287 lines not on this page · raw message
drivers/s390/net/qeth_core_mpc.h +0 -1
@@ -27,7 +27,6 @@ extern unsigned char IPA_PDU_HEADER[];#define QETH_TIMEOUT (10 * HZ)#define QETH_IPA_TIMEOUT (45 * HZ) -#define QETH_IDX_COMMAND_SEQNO 0xffff0000#define QETH_CLEAR_CHANNEL_PARM -10#define QETH_HALT_CHANNEL_PARM -11
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -1003,7 +1003,7 @@ static void qeth_osn_assist_cb(struct qeth_card *card,struct qeth_cmd_buffer *iob, unsigned int data_length) { - qeth_notify_reply(iob->reply, 0); + qeth_notify_cmd(iob, 0);qeth_put_cmd (iob); }
Signature · 1 line
2.17.1
PATCH 6/9 s390/qeth: get vnicc sub-cmd type from reply data
In reply to Julian WiedmannWhen processing the reply for a vnicc cmd, there's no need to remember which specific sub-cmd type we initially sent. The reply itself contains all the needed information.
--- drivers/s390/net/qeth_l2_main.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
drivers/s390/net/qeth_l2_main.c +5 -16
@@ -1704,7 +1704,6 @@ static int qeth_l2_vnicc_makerc(struct qeth_card *card, u16 ipa_rc)/* generic VNICC request call back control */ struct _qeth_l2_vnicc_request_cbctl { - u32 sub_cmd; struct { union{ u32 *sup_cmds;
@@ -1722,6 +1721,7 @@ static int qeth_l2_vnicc_request_cb(struct qeth_card *card, (struct _qeth_l2_vnicc_request_cbctl *) reply->param;struct qeth_ipa_cmd *cmd = (struct qeth_ipa_cmd *) data;struct qeth_ipacmd_vnicc *rep = &cmd->data.vnicc; +u32 sub_cmd = cmd->data.vnicc.hdr.sub_command;QETH_CARD_TEXT (card,2 ,"vniccrcb" );if (cmd->hdr.return_code)
@@ -1730,10 +1730,9 @@ static int qeth_l2_vnicc_request_cb(struct qeth_card *card, card->options.vnicc.sup_chars = rep->vnicc_cmds.supported; card->options.vnicc.cur_chars = rep->vnicc_cmds.enabled; -if (cbctl->sub_cmd ==IPA_VNICC_QUERY_CMDS ) +if (sub_cmd ==IPA_VNICC_QUERY_CMDS ) *cbctl->result.sup_cmds = rep->data.query_cmds.sup_cmds; - -if (cbctl->sub_cmd ==IPA_VNICC_GET_TIMEOUT ) +else if (sub_cmd ==IPA_VNICC_GET_TIMEOUT ) *cbctl->result.timeout = rep->data.getset_timeout.timeout;return 0 ;
@@ -1761,7 +1760,6 @@ static struct qeth_cmd_buffer *qeth_l2_vnicc_build_cmd(struct qeth_card *card,/* VNICC query VNIC characteristics request */ static int qeth_l2_vnicc_query_chars (struct qeth_card *card) { -struct _qeth_l2_vnicc_request_cbctl cbctl;struct qeth_cmd_buffer *iob;QETH_CARD_TEXT (card,2 ,"vniccqch" );
@@ -1769,10 +1767,7 @@ static int qeth_l2_vnicc_query_chars(struct qeth_card *card)if (!iob)return -ENOMEM ; -/* prepare callback control */ - cbctl.sub_cmd =IPA_VNICC_QUERY_CHARS ; - -return qeth_send_ipa_cmd (card, iob, qeth_l2_vnicc_request_cb, &cbctl); +return qeth_send_ipa_cmd (card, iob, qeth_l2_vnicc_request_cb,NULL ); }/* VNICC query sub commands request */
@@ -1791,7 +1786,6 @@ static int qeth_l2_vnicc_query_cmds(struct qeth_card *card, u32 vnic_char,__ipa_cmd (iob)->data.vnicc.data.query_cmds.vnic_char = vnic_char;/* prepare callback control */ - cbctl.sub_cmd =IPA_VNICC_QUERY_CMDS ; cbctl.result.sup_cmds = sup_cmds;return qeth_send_ipa_cmd (card, iob, qeth_l2_vnicc_request_cb, &cbctl);
@@ -1801,7 +1795,6 @@ static int qeth_l2_vnicc_query_cmds(struct qeth_card *card, u32 vnic_char,static int qeth_l2_vnicc_set_char (struct qeth_card *card,u32 vnic_char,u32 cmd) { -struct _qeth_l2_vnicc_request_cbctl cbctl;struct qeth_cmd_buffer *iob;QETH_CARD_TEXT (card,2 ,"vniccedc" );
@@ -1811,10 +1804,7 @@ static int qeth_l2_vnicc_set_char(struct qeth_card *card, u32 vnic_char,__ipa_cmd (iob)->data.vnicc.data.set_char.vnic_char = vnic_char; -/* prepare callback control */ - cbctl.sub_cmd = cmd; - -return qeth_send_ipa_cmd (card, iob, qeth_l2_vnicc_request_cb, &cbctl); +return qeth_send_ipa_cmd (card, iob, qeth_l2_vnicc_request_cb,NULL ); }/* VNICC get/set timeout for characteristic request */
@@ -1838,7 +1828,6 @@ static int qeth_l2_vnicc_getset_timeout(struct qeth_card *card, u32 vnicc, getset_timeout->timeout = *timeout;/* prepare callback control */ - cbctl.sub_cmd = cmd;if (cmd ==IPA_VNICC_GET_TIMEOUT ) cbctl.result.timeout = timeout;
Signature · 1 line
2.17.1
PATCH 7/9 s390/qeth: streamline control code for promisc mode
In reply to Julian WiedmannWe have logic to determine the desired promisc mode in _each_ code path. Change things around so that there is a clean split between
(a) high-level code that selects the new mode, and (b) implementations of the various mechanisms to program this mode.
This also keeps qeth_promisc_to_bridge() from polluting the debug logs on each RX modeset.
--- drivers/s390/net/qeth_core.h | 4 ++-- drivers/s390/net/qeth_core_main.c | 15 +++---------- drivers/s390/net/qeth_l2_main.c | 36 +++++++++++++++---------------- drivers/s390/net/qeth_l3_main.c | 24 ++++++--------------- 4 files changed, 30 insertions(+), 49 deletions(-)
drivers/s390/net/qeth_core.h +2 -2
@@ -653,6 +653,7 @@ struct qeth_card_info {__u16 func_level;char mcl_level[QETH_MCL_LENGTH +1 ]; u8 open_when_online:1; + u8 promisc_mode:1; u8 use_v1_blkt:1; u8 is_vm_nic:1;int mac_bits;
@@ -662,7 +663,6 @@ struct qeth_card_info {int unique_id;bool layer_enforced;struct qeth_card_blkt blkt; -enum qeth_ipa_promisc_modes promisc_mode;__u32 diagass_support;__u32 hwtrap; };
@@ -1004,7 +1004,7 @@ void qeth_clear_ipacmd_list(struct qeth_card *);int qeth_qdio_clear_card (struct qeth_card *,int );void qeth_clear_working_pool_list (struct qeth_card *);void qeth_drain_output_queues (struct qeth_card *card); -void qeth_setadp_promisc_mode (struct qeth_card *); +void qeth_setadp_promisc_mode (struct qeth_card *card,bool enable);int qeth_setadpparms_change_macaddr (struct qeth_card *);void qeth_tx_timeout (struct net_device *); void qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
drivers/s390/net/qeth_core_main.c +3 -12
@@ -4015,23 +4015,14 @@ static int qeth_setadp_promisc_mode_cb(struct qeth_card *card,return (cmd->hdr.return_code) ? -EIO :0 ; } -void qeth_setadp_promisc_mode (struct qeth_card *card) +void qeth_setadp_promisc_mode (struct qeth_card *card,bool enable) { -enum qeth_ipa_promisc_modes mode; -struct net_device *dev = card->dev; +enum qeth_ipa_promisc_modes mode = enable ?SET_PROMISC_MODE_ON : +SET_PROMISC_MODE_OFF ;struct qeth_cmd_buffer *iob;struct qeth_ipa_cmd *cmd;QETH_CARD_TEXT (card,4 ,"setprom" ); - -if (((dev->flags &IFF_PROMISC ) && - (card->info.promisc_mode ==SET_PROMISC_MODE_ON )) || - (!(dev->flags &IFF_PROMISC ) && - (card->info.promisc_mode ==SET_PROMISC_MODE_OFF ))) -return ; - mode =SET_PROMISC_MODE_OFF ; -if (dev->flags &IFF_PROMISC ) - mode =SET_PROMISC_MODE_ON ;QETH_CARD_TEXT_ (card,4 ,"mode:%x" , mode); iob = qeth_get_adapter_cmd(card, IPA_SETADP_SET_PROMISC_MODE,
drivers/s390/net/qeth_l2_main.c +18 -18
@@ -439,23 +439,14 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)return 0 ; } -static void qeth_promisc_to_bridge (struct qeth_card *card) +static void qeth_l2_promisc_to_bridge (struct qeth_card *card,bool enable) { -struct net_device *dev = card->dev; -enum qeth_ipa_promisc_modes promisc_mode;int role;int rc;QETH_CARD_TEXT (card,3 ,"pmisc2br" ); -if (!card->options.sbp.reflect_promisc) -return ; - promisc_mode = (dev->flags &IFF_PROMISC ) ?SET_PROMISC_MODE_ON - :SET_PROMISC_MODE_OFF ; -if (promisc_mode == card->info.promisc_mode) -return ; - -if (promisc_mode ==SET_PROMISC_MODE_ON ) { +if (enable) {if (card->options.sbp.reflect_promisc_primary) role =QETH_SBP_ROLE_PRIMARY ;else
@@ -464,14 +455,26 @@ static void qeth_promisc_to_bridge(struct qeth_card *card) role =QETH_SBP_ROLE_NONE ; rc =qeth_bridgeport_setrole (card, role); -QETH_CARD_TEXT_ (card,2 ,"bpm%c%04x" , - (promisc_mode ==SET_PROMISC_MODE_ON ) ?'+' :'-' , rc); +QETH_CARD_TEXT_ (card,2 ,"bpm%c%04x" , enable ?'+' :'-' , rc);if (!rc) { card->options.sbp.role = role; - card->info.promisc_mode = promisc_mode; + card->info.promisc_mode = enable; } +} + +static void qeth_l2_set_promisc_mode (struct qeth_card *card) +{ +bool enable = card->dev->flags &IFF_PROMISC ; + +if (card->info.promisc_mode == enable) +return ; +if (qeth_adp_supported (card,IPA_SETADP_SET_PROMISC_MODE )) +qeth_setadp_promisc_mode (card, enable); +else if (card->options.sbp.reflect_promisc) +qeth_l2_promisc_to_bridge (card, enable); } +/* New MAC address is added to the hash table and marked to be written on card * only if there is not in the hash table storage already *
@@ -539,10 +542,7 @@ static void qeth_l2_rx_mode_work(struct work_struct *work) } } -if (qeth_adp_supported (card,IPA_SETADP_SET_PROMISC_MODE )) -qeth_setadp_promisc_mode (card); -else -qeth_promisc_to_bridge (card); +qeth_l2_set_promisc_mode (card); } static int qeth_l2_xmit_osn(struct qeth_card *card, struct sk_buff *skb,
drivers/s390/net/qeth_l3_main.c +7 -17
@@ -1435,27 +1435,19 @@ static void qeth_l3_stop_card(struct qeth_card *card)flush_workqueue (card->event_wq); } -/* -* test for and Switch promiscuous mode (on or off) -* either for guestlan or HiperSocket Sniffer -*/ -static void -qeth_l3_handle_promisc_mode (struct qeth_card *card) +static void qeth_l3_set_promisc_mode (struct qeth_card *card) { -struct net_device *dev = card->dev; +bool enable = card->dev->flags &IFF_PROMISC ; -if (((dev->flags &IFF_PROMISC ) && - (card->info.promisc_mode ==SET_PROMISC_MODE_ON )) || - (!(dev->flags &IFF_PROMISC ) && - (card->info.promisc_mode ==SET_PROMISC_MODE_OFF ))) +if (card->info.promisc_mode == enable)return ;if (IS_VM_NIC (card)) {/* Guestlan trace */ if (qeth_adp_supported (card,IPA_SETADP_SET_PROMISC_MODE )) -qeth_setadp_promisc_mode (card); +qeth_setadp_promisc_mode (card, enable); }else if (card->options.sniffer &&/* HiperSockets trace */ qeth_adp_supported (card,IPA_SETADP_SET_DIAG_ASSIST )) { -if (dev->flags &IFF_PROMISC ) { +if (enable) {QETH_CARD_TEXT (card,3 ,"+promisc" );qeth_diags_trace (card,QETH_DIAGS_CMD_TRACE_ENABLE ); }else {
@@ -1502,11 +1494,9 @@ static void qeth_l3_rx_mode_work(struct work_struct *work) addr->disp_flag =QETH_DISP_ADDR_DELETE ; } } - -if (!qeth_adp_supported (card,IPA_SETADP_SET_PROMISC_MODE )) -return ; } -qeth_l3_handle_promisc_mode (card); + +qeth_l3_set_promisc_mode (card); }static int qeth_l3_arp_makerc (u16 rc)
Signature · 1 line
2.17.1
PATCH 8/9 s390/ctcm: don't use intparm for channel IO
In reply to Julian Wiedmannctcm passes an intparm when calling ccw_device_*(), even though ctcm_irq_handler() later makes no use of this.
To reduce the confusion, consistently pass 0 as intparm instead.
--- drivers/s390/net/ctcm_fsms.c | 42 ++++++++++++++---------------------- drivers/s390/net/ctcm_main.c | 6 ++---- drivers/s390/net/ctcm_mpc.c | 6 ++---- 3 files changed, 20 insertions(+), 34 deletions(-)
drivers/s390/net/ctcm_fsms.c +16 -26
@@ -307,8 +307,7 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg) ch->ccw[1 ].count = ch->trans_skb->len;fsm_addtimer (&ch->timer,CTCM_TIME_5_SEC ,CTC_EVENT_TIMER , ch); ch->prof.send_stamp = jiffies; - rc =ccw_device_start (ch->cdev, &ch->ccw[0 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[0 ],0 ,0xff ,0 ); ch->prof.doios_multi++;if (rc !=0 ) { priv->stats.tx_dropped += i;
@@ -417,8 +416,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)if (ctcm_checkalloc_buffer (ch))return ; ch->ccw[1 ].count = ch->max_bufsize; - rc =ccw_device_start (ch->cdev, &ch->ccw[0 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[0 ],0 ,0xff ,0 );if (rc !=0 )ctcm_ccw_check_rc (ch, rc,"normal RX" ); }
@@ -478,8 +476,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)fsm_newstate (fi, (CHANNEL_DIRECTION (ch->flags) ==CTCM_READ ) ?CTC_STATE_RXINIT :CTC_STATE_TXINIT ); - rc =ccw_device_start (ch->cdev, &ch->ccw[0 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[0 ],0 ,0xff ,0 );if (rc !=0 ) {fsm_deltimer (&ch->timer);fsm_newstate (fi,CTC_STATE_SETUPWAIT );
@@ -527,8 +524,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg)return ; ch->ccw[1 ].count = ch->max_bufsize;fsm_newstate (fi,CTC_STATE_RXIDLE ); - rc =ccw_device_start (ch->cdev, &ch->ccw[0 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[0 ],0 ,0xff ,0 );if (rc !=0 ) {fsm_newstate (fi,CTC_STATE_RXINIT );ctcm_ccw_check_rc (ch, rc,"initial RX" );
@@ -571,8 +567,7 @@ static void ctcm_chx_setmode(fsm_instance *fi, int event, void *arg)/* Such conditional locking is undeterministic in * static view. => ignore sparse warnings here. */ - rc =ccw_device_start (ch->cdev, &ch->ccw[6 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[6 ],0 ,0xff ,0 );if (event ==CTC_EVENT_TIMER )/* see above comments */ spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);if (rc !=0 ) {
@@ -637,7 +632,7 @@ static void ctcm_chx_start(fsm_instance *fi, int event, void *arg)fsm_newstate (fi,CTC_STATE_STARTWAIT );fsm_addtimer (&ch->timer,1000 ,CTC_EVENT_TIMER , ch);spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); - rc =ccw_device_halt (ch->cdev, (unsigned long )ch); + rc =ccw_device_halt (ch->cdev,0 );spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);if (rc !=0 ) {if (rc != -EBUSY )
@@ -672,7 +667,7 @@ static void ctcm_chx_haltio(fsm_instance *fi, int event, void *arg)* static view. => ignore sparse warnings here. */ oldstate =fsm_getstate (fi);fsm_newstate (fi,CTC_STATE_TERM ); - rc =ccw_device_halt (ch->cdev, (unsigned long )ch); + rc =ccw_device_halt (ch->cdev,0 );if (event ==CTC_EVENT_STOP )spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);
@@ -799,7 +794,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg)fsm_addtimer (&ch->timer,CTCM_TIME_5_SEC ,CTC_EVENT_TIMER , ch);if (!IS_MPC (ch) && (CHANNEL_DIRECTION (ch->flags) ==CTCM_READ )) { -int rc =ccw_device_halt (ch->cdev, (unsigned long )ch); +int rc =ccw_device_halt (ch->cdev,0 );if (rc !=0 )ctcm_ccw_check_rc (ch, rc,"HaltIO in chx_setuperr" );
@@ -851,7 +846,7 @@ static void ctcm_chx_restart(fsm_instance *fi, int event, void *arg)/* Such conditional locking is a known problem for * sparse because its undeterministic in static view. * Warnings should be ignored here. */ - rc =ccw_device_halt (ch->cdev, (unsigned long )ch); + rc =ccw_device_halt (ch->cdev,0 );if (event ==CTC_EVENT_TIMER )spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);if (rc !=0 ) {
@@ -947,8 +942,8 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg) ch2 = priv->channel[CTCM_WRITE ];fsm_newstate (ch2->fsm,CTC_STATE_DTERM ); -ccw_device_halt (ch->cdev, (unsigned long )ch); -ccw_device_halt (ch2->cdev, (unsigned long )ch2); +ccw_device_halt (ch->cdev,0 ); +ccw_device_halt (ch2->cdev,0 ); }/**
@@ -1041,8 +1036,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg)ctcmpc_dumpit ((char *)&ch->ccw[3 ],sizeof (struct ccw1 ) *3 ); - rc =ccw_device_start (ch->cdev, &ch->ccw[3 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[3 ],0 ,0xff ,0 );if (event ==CTC_EVENT_TIMER )spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);
@@ -1361,8 +1355,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) ch->prof.send_stamp = jiffies;if (do_debug_ccw)ctcmpc_dumpit ((char *)&ch->ccw[0 ],sizeof (struct ccw1 ) *3 ); - rc =ccw_device_start (ch->cdev, &ch->ccw[0 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[0 ],0 ,0xff ,0 ); ch->prof.doios_multi++;if (rc !=0 ) { priv->stats.tx_dropped += i;
@@ -1462,8 +1455,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)if (dolock)spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); - rc =ccw_device_start (ch->cdev, &ch->ccw[0 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[0 ],0 ,0xff ,0 );if (dolock)/* see remark about conditional locking */ spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);
@@ -1569,8 +1561,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, int event, void *arg)if (event ==CTC_EVENT_START )/* see remark about conditional locking */ spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); - rc =ccw_device_start (ch->cdev, &ch->ccw[0 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[0 ],0 ,0xff ,0 );if (event ==CTC_EVENT_START )spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);
@@ -1825,8 +1816,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg)spin_lock_irqsave (get_ccwdev_lock (wch->cdev), saveflags); wch->prof.send_stamp = jiffies; - rc =ccw_device_start (wch->cdev, &wch->ccw[3 ], - (unsigned long ) wch,0xff ,0 ); + rc =ccw_device_start (wch->cdev, &wch->ccw[3 ],0 ,0xff ,0 );spin_unlock_irqrestore (get_ccwdev_lock (wch->cdev), saveflags); if ((grp->sweep_req_pend_num == 0) &&
drivers/s390/net/ctcm_main.c +2 -4
@@ -569,8 +569,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)fsm_addtimer (&ch->timer,CTCM_TIME_5_SEC ,CTC_EVENT_TIMER , ch);spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); ch->prof.send_stamp = jiffies; - rc =ccw_device_start (ch->cdev, &ch->ccw[ccw_idx], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[ccw_idx],0 ,0xff ,0 );spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);if (ccw_idx ==3 ) ch->prof.doios_single++;
@@ -833,8 +832,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); ch->prof.send_stamp = jiffies; - rc =ccw_device_start (ch->cdev, &ch->ccw[ccw_idx], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[ccw_idx],0 ,0xff ,0 );spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);if (ccw_idx ==3 ) ch->prof.doios_single++;
drivers/s390/net/ctcm_mpc.c +2 -4
@@ -1523,8 +1523,7 @@ void mpc_action_send_discontact(unsigned long thischan)unsigned long saveflags =0 ;spin_lock_irqsave (get_ccwdev_lock (ch->cdev), saveflags); - rc =ccw_device_start (ch->cdev, &ch->ccw[15 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[15 ],0 ,0xff ,0 );spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);if (rc !=0 ) {
@@ -1797,8 +1796,7 @@ static void mpc_action_side_xid(fsm_instance *fsm, void *arg, int side) }fsm_addtimer (&ch->timer,5000 ,CTC_EVENT_TIMER , ch); - rc =ccw_device_start (ch->cdev, &ch->ccw[8 ], - (unsigned long )ch,0xff ,0 ); + rc =ccw_device_start (ch->cdev, &ch->ccw[8 ],0 ,0xff ,0 );if (gotlock)/* see remark above about conditional locking */ spin_unlock_irqrestore (get_ccwdev_lock (ch->cdev), saveflags);
Signature · 1 line
2.17.1
PATCH 9/9 s390/lcs: don't use intparm for channel IO
In reply to Julian Wiedmannlcs passes an intparm when calling ccw_device_*(), even though lcs_irq() later makes no use of this.
To reduce the confusion, consistently pass 0 as intparm instead.
--- drivers/s390/net/lcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/s390/net/lcs.c +3 -3
@@ -504,7 +504,7 @@ lcs_clear_channel(struct lcs_channel *channel)LCS_DBF_TEXT (4 ,trace,"clearch" );LCS_DBF_TEXT_ (4 , trace,"%s" ,dev_name (&channel->ccwdev->dev));spin_lock_irqsave (get_ccwdev_lock (channel->ccwdev), flags); - rc =ccw_device_clear (channel->ccwdev, (addr_t ) channel); + rc =ccw_device_clear (channel->ccwdev,0 );spin_unlock_irqrestore (get_ccwdev_lock (channel->ccwdev), flags);if (rc) { LCS_DBF_TEXT_(4, trace, "ecsc%s",
@@ -532,7 +532,7 @@ lcs_stop_channel(struct lcs_channel *channel)LCS_DBF_TEXT_ (4 , trace,"%s" ,dev_name (&channel->ccwdev->dev)); channel->state =LCS_CH_STATE_INIT ;spin_lock_irqsave (get_ccwdev_lock (channel->ccwdev), flags); - rc =ccw_device_halt (channel->ccwdev, (addr_t ) channel); + rc =ccw_device_halt (channel->ccwdev,0 );spin_unlock_irqrestore (get_ccwdev_lock (channel->ccwdev), flags);if (rc) { LCS_DBF_TEXT_(4, trace, "ehsc%s",
@@ -1427,7 +1427,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) channel->state =LCS_CH_STATE_SUSPENDED ;if (irb->scsw.cmd.fctl &SCSW_FCTL_HALT_FUNC ) {if (irb->scsw.cmd.cc !=0 ) { -ccw_device_halt (channel->ccwdev, (addr_t ) channel); +ccw_device_halt (channel->ccwdev,0 );return ; }/* The channel has been stopped by halt_IO. */
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Tue, 20 Aug 2019 16:46:34 +0200
Quoted 3 lines
please apply the following patches to net-next. This series brings a mix of cleanups and small improvements for various parts of qeth's control path. Also, a minor cleanup for ctcm and lcs.
Looks good, series applied, thanks.