s390/qeth: updates 2020-03-18
Subsystems (4)
PATCH 7/11 s390/qeth: add SW timestamping support for IQD devices
In reply to Julian WiedmannThis adds support for SOF_TIMESTAMPING_TX_SOFTWARE.
No support for non-IQD devices, since they orphan the skb in their xmit path.
To play nice with TX bulking, set the timestamp when the buffer that contains the skb(s) is actually flushed out to HW.
--- drivers/s390/net/qeth_core_main.c | 6 +++++- drivers/s390/net/qeth_ethtool.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/s390/net/qeth_core_main.c +5 -1
@@ -3355,6 +3355,7 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,for (i = index; i < index + count; ++i) {unsigned int bidx =QDIO_BUFNR (i); +struct sk_buff *skb; buf = queue->bufs[bidx]; buf->buffer->element[buf->next_element_to_fill - 1].eflags |=
@@ -3363,8 +3364,11 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,if (queue->bufstates) queue->bufstates[bidx].user = buf; -if (IS_IQD (queue->card)) +if (IS_IQD (card)) { + skb_queue_walk(&buf->skb_list, skb) +skb_tx_timestamp (skb);continue ; + }if (!queue->do_pack) { if ((atomic_read(&queue->used_buffers) >=
drivers/s390/net/qeth_ethtool.c +12 -0
@@ -204,6 +204,17 @@ static int qeth_set_channels(struct net_device *dev,return qeth_set_real_num_tx_queues (card, channels->tx_count); } +static int qeth_get_ts_info (struct net_device *dev, +struct ethtool_ts_info *info) +{ +struct qeth_card *card = dev->ml_priv; + +if (!IS_IQD (card)) +return -EOPNOTSUPP ; + +return ethtool_op_get_ts_info (dev, info); +} +static int qeth_get_tunable (struct net_device *dev,const struct ethtool_tunable *tuna,void *data) {
@@ -440,6 +451,7 @@ const struct ethtool_ops qeth_ethtool_ops = { .get_drvinfo = qeth_get_drvinfo, .get_channels = qeth_get_channels, .set_channels = qeth_set_channels, + .get_ts_info = qeth_get_ts_info, .get_tunable = qeth_get_tunable, .set_tunable = qeth_set_tunable, .get_link_ksettings = qeth_get_link_ksettings,
Signature · 1 line
2.17.1
PATCH 8/11 s390/qeth: don't report hard-coded driver version
In reply to Julian WiedmannVersions are meaningless for an in-kernel driver. Instead use the UTS_RELEASE that is set by ethtool_get_drvinfo().
--- drivers/s390/net/qeth_ethtool.c | 1 - 1 file changed, 1 deletion(-)
drivers/s390/net/qeth_ethtool.c +0 -1
@@ -153,7 +153,6 @@ static void qeth_get_drvinfo(struct net_device *dev,strlcpy (info->driver,IS_LAYER2 (card) ?"qeth_l2" :"qeth_l3" ,sizeof (info->driver)); -strlcpy (info->version,"1.0" ,sizeof (info->version));strlcpy (info->fw_version, card->info.mcl_level,sizeof (info->fw_version)); snprintf(info->bus_info, sizeof(info->bus_info), "%s/%s/%s",
Signature · 1 line
2.17.1
PATCH 9/11 s390/qeth: add phys_to_virt() translation for AOB
In reply to Julian WiedmannData addresses in the AOB are absolute, and need to be translated before being fed into kmem_cache_free(). Currently this phys_to_virt() is a no-op. Also see commit 2db01da8d25f ("s390/qdio: fill SBALEs with absolute addresses").
--- drivers/s390/net/qeth_core_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/s390/net/qeth_core_main.c +4 -3
@@ -538,9 +538,10 @@ static void qeth_qdio_handle_aob(struct qeth_card *card,for (i =0 ; i < aob->sb_count && i <QETH_MAX_BUFFER_ELEMENTS (card); i++) { -if (aob->sba[i] && buffer->is_header[i]) -kmem_cache_free (qeth_core_header_cache, - (void *) aob->sba[i]); +void *data =phys_to_virt (aob->sba[i]); + +if (data && buffer->is_header[i]) +kmem_cache_free (qeth_core_header_cache, data); }atomic_set (&buffer->state,QETH_QDIO_BUF_HANDLED_DELAYED );
Signature · 1 line
2.17.1
PATCH 1/11 s390/qeth: use memory reserves to back RX buffers
In reply to Julian WiedmannUse dev_alloc_page() for backing the RX buffers with pages. This way we pick up __GFP_MEMALLOC.
--- drivers/s390/net/qeth_core_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/net/qeth_core_main.c +2 -2
@@ -244,7 +244,7 @@ static struct qeth_buffer_pool_entry *qeth_alloc_pool_entry(unsigned int pages)return NULL ;for (i =0 ; i < pages; i++) { - entry->elements[i] =alloc_page (GFP_KERNEL ); + entry->elements[i] =__dev_alloc_page (GFP_KERNEL );if (!entry->elements[i]) {qeth_free_pool_entry (entry);
@@ -2654,7 +2654,7 @@ static struct qeth_buffer_pool_entry *qeth_find_free_buffer_pool_entry( struct qeth_buffer_pool_entry, list);for (i =0 ; i <QETH_MAX_BUFFER_ELEMENTS (card); ++i) {if (page_count (entry->elements[i]) >1 ) { -struct page *page =alloc_page (GFP_ATOMIC ); +struct page *page =dev_alloc_page ();if (!page)return NULL ;
Signature · 1 line
2.17.1
PATCH 2/11 s390/qeth: use memory reserves in TX slow path
In reply to Julian WiedmannWhen falling back to an allocation from the HW header cache, check if the skb is eligible for using memory reserves.
This only makes a difference if the cache is empty and needs to be refilled.
--- drivers/s390/net/qeth_core_main.c | 6 ++++-- drivers/s390/net/qeth_l2_main.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/s390/net/qeth_core_main.c +4 -2
@@ -3705,6 +3705,7 @@ static int qeth_add_hw_header(struct qeth_qdio_out_q *queue, unsigned int hdr_len, unsigned int proto_len, unsigned int *elements) { + gfp_t gfp = GFP_ATOMIC | (skb_pfmemalloc(skb) ? __GFP_MEMALLOC : 0);const unsigned int contiguous = proto_len ? proto_len :1 ;const unsigned int max_elements = queue->max_elements;unsigned int __elements;
@@ -3760,10 +3761,11 @@ static int qeth_add_hw_header(struct qeth_qdio_out_q *queue, *hdr =skb_push (skb, hdr_len);return hdr_len; } -/* fall back */ + +/* Fall back to cache element with known-good alignment: */ if (hdr_len + proto_len >QETH_HDR_CACHE_OBJ_SIZE )return -E2BIG ; - *hdr =kmem_cache_alloc (qeth_core_header_cache,GFP_ATOMIC ); + *hdr =kmem_cache_alloc (qeth_core_header_cache, gfp);if (!*hdr)return -ENOMEM ;/* Copy protocol headers behind HW header: */
drivers/s390/net/qeth_l2_main.c +2 -1
@@ -499,6 +499,7 @@ static void qeth_l2_rx_mode_work(struct work_struct *work)static int qeth_l2_xmit_osn (struct qeth_card *card,struct sk_buff *skb,struct qeth_qdio_out_q *queue) { +gfp_t gfp =GFP_ATOMIC | (skb_pfmemalloc (skb) ? __GFP_MEMALLOC :0 );struct qeth_hdr *hdr = (struct qeth_hdr *)skb->data;addr_t end = (addr_t)(skb->data +sizeof (*hdr));addr_t start = (addr_t )skb->data;
@@ -511,7 +512,7 @@ static int qeth_l2_xmit_osn(struct qeth_card *card, struct sk_buff *skb,if (qeth_get_elements_for_range (start, end) >1 ) {/* Misaligned HW header, move it to its own buffer element. */ - hdr =kmem_cache_alloc (qeth_core_header_cache,GFP_ATOMIC ); + hdr =kmem_cache_alloc (qeth_core_header_cache, gfp);if (!hdr)return -ENOMEM ; hd_len =sizeof (*hdr);
Signature · 1 line
2.17.1
cover s390/qeth: updates 2020-03-18
Hi Dave,
please apply the following patch series for qeth to netdev's net-next tree.
This consists of three parts:
1) support for __GFP_MEMALLOC,
2) several ethtool enhancements (.set_channels, SW Timestamping),
3) the usual cleanups.
Thanks,
Julian
Julian Wiedmann (11):
s390/qeth: use memory reserves to back RX buffers s390/qeth: use memory reserves in TX slow path s390/qeth: remove prio-queueing support for z/VM NICs s390/qeth: allow configuration of TX queues for z/VM NICs s390/qeth: allow configuration of TX queues for IQD devices s390/qeth: balance the TX queue selection for IQD devices s390/qeth: add SW timestamping support for IQD devices s390/qeth: don't report hard-coded driver version s390/qeth: add phys_to_virt() translation for AOB s390/qeth: remove gratuitous NULL checks s390/qeth: use dev->reg_state
drivers/s390/net/qeth_core.h | 7 +- drivers/s390/net/qeth_core_main.c | 131 ++++++++++++++++++++++-------- drivers/s390/net/qeth_core_sys.c | 2 +- drivers/s390/net/qeth_ethtool.c | 43 +++++++++- drivers/s390/net/qeth_l2_main.c | 32 ++++---- drivers/s390/net/qeth_l3_main.c | 29 +++---- 6 files changed, 174 insertions(+), 70 deletions(-)
Signature · 1 line
2.17.1
PATCH 3/11 s390/qeth: remove prio-queueing support for z/VM NICs
z/VM NICs don't offer HW QoS for TX rings. So just use netdev_pick_tx() to distribute the connections equally over all enabled TX queues.
We start with just 1 enabled TX queue (this matches the typical configuration without prio-queueing). A follow-on patch will allow users to enable additional TX queues.
--- drivers/s390/net/qeth_core.h | 1 + drivers/s390/net/qeth_core_main.c | 56 +++++++++++++++++++------------ drivers/s390/net/qeth_core_sys.c | 2 +- drivers/s390/net/qeth_l2_main.c | 8 ++++- drivers/s390/net/qeth_l3_main.c | 7 +++- 5 files changed, 49 insertions(+), 25 deletions(-)
drivers/s390/net/qeth_core.h +1 -0
@@ -1053,6 +1053,7 @@ int qeth_configure_cq(struct qeth_card *, enum qeth_cq);int qeth_hw_trap (struct qeth_card *,enum qeth_diags_trap_action );void qeth_trace_features (struct qeth_card *);int qeth_setassparms_cb (struct qeth_card *,struct qeth_reply *,unsigned long ); +int qeth_setup_netdev (struct qeth_card *card);int qeth_set_features (struct net_device *,netdev_features_t );void qeth_enable_hw_features (struct net_device *dev);netdev_features_t qeth_fix_features (struct net_device *,netdev_features_t );
drivers/s390/net/qeth_core_main.c +34 -22
99 lines not on this page · raw message
drivers/s390/net/qeth_core_sys.c +1 -1
@@ -176,7 +176,7 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev,struct qeth_card *card =dev_get_drvdata (dev);int rc =0 ; -if (IS_IQD (card)) +if (IS_IQD (card) ||IS_VM_NIC (card))return -EOPNOTSUPP ;mutex_lock (&card->conf_mutex);
drivers/s390/net/qeth_l2_main.c +7 -1
@@ -571,7 +571,9 @@ static u16 qeth_l2_select_queue(struct net_device *dev, struct sk_buff *skb,return qeth_iqd_select_queue (dev, skb,qeth_get_ether_cast_type (skb), sb_dev); -return qeth_get_priority_queue (card, skb); + +return IS_VM_NIC (card) ?netdev_pick_tx (dev, skb, sb_dev) : +qeth_get_priority_queue (card, skb); }static const struct device_type qeth_l2_devtype = {
@@ -659,6 +661,10 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok) goto add_napi; } + rc =qeth_setup_netdev (card); +if (rc) +return rc; + card->dev->needed_headroom =sizeof (struct qeth_hdr ); card->dev->netdev_ops = &qeth_l2_netdev_ops; card->dev->priv_flags |=IFF_UNICAST_FLT ;
drivers/s390/net/qeth_l3_main.c +6 -1
@@ -1880,7 +1880,8 @@ static u16 qeth_l3_osa_select_queue(struct net_device *dev, struct sk_buff *skb, {struct qeth_card *card = dev->ml_priv; -return qeth_get_priority_queue (card, skb); +return IS_VM_NIC (card) ?netdev_pick_tx (dev, skb, sb_dev) : +qeth_get_priority_queue (card, skb); }static const struct net_device_ops qeth_l3_netdev_ops = {
@@ -1922,6 +1923,10 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok)unsigned int headroom;int rc; + rc =qeth_setup_netdev (card); +if (rc) +return rc; +if (IS_OSD (card) ||IS_OSX (card)) {if ((card->info.link_type ==QETH_LINK_TYPE_LANE_TR ) || (card->info.link_type ==QETH_LINK_TYPE_HSTR )) {
Signature · 1 line
2.17.1
PATCH 4/11 s390/qeth: allow configuration of TX queues for z/VM NICs
In reply to Julian WiedmannAdd support for ETHTOOL_SCHANNELS to change the count of active TX queues.
Since all TX queue structs are pre-allocated and -registered, we just need to trivially adjust dev->real_num_tx_queues.
--- drivers/s390/net/qeth_ethtool.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/s390/net/qeth_ethtool.c +17 -0
@@ -175,6 +175,22 @@ static void qeth_get_channels(struct net_device *dev, channels->combined_count =0 ; } +static int qeth_set_channels (struct net_device *dev, +struct ethtool_channels *channels) +{ +struct qeth_card *card = dev->ml_priv; + +if (IS_IQD (card) || !IS_VM_NIC (card)) +return -EOPNOTSUPP ; + +if (channels->rx_count ==0 || channels->tx_count ==0 ) +return -EINVAL ; +if (channels->tx_count > card->qdio.no_out_queues) +return -EINVAL ; + +return netif_set_real_num_tx_queues (dev, channels->tx_count); +} +static int qeth_get_tunable (struct net_device *dev,const struct ethtool_tunable *tuna,void *data) {
@@ -410,6 +426,7 @@ const struct ethtool_ops qeth_ethtool_ops = { .get_sset_count = qeth_get_sset_count, .get_drvinfo = qeth_get_drvinfo, .get_channels = qeth_get_channels, + .set_channels = qeth_set_channels, .get_tunable = qeth_get_tunable, .set_tunable = qeth_set_tunable, .get_link_ksettings = qeth_get_link_ksettings,
Signature · 1 line
2.17.1
PATCH 5/11 s390/qeth: allow configuration of TX queues for IQD devices
In reply to Julian WiedmannSimilar to the support for z/VM NICs, but we need to take extra care about the dedicated mcast queue:
1. netdev_pick_tx() is unaware of this limitation and might select the mcast txq. Catch this.
2. require at least _two_ TX queues - one for ucast, one for mcast.
3. when reducing the number of TX queues, there's a potential race where netdev_cap_txqueue() over-rules the selected txq index and falls back to index 0. This would place ucast traffic on the mcast queue, and result in TX errors.
So for IQD, reject a reduction while the interface is running.
--- drivers/s390/net/qeth_core_main.c | 6 +++++- drivers/s390/net/qeth_ethtool.c | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-)
drivers/s390/net/qeth_core_main.c +5 -1
@@ -6644,9 +6644,13 @@ EXPORT_SYMBOL_GPL(qeth_get_stats64);u16 qeth_iqd_select_queue (struct net_device *dev,struct sk_buff *skb,u8 cast_type,struct net_device *sb_dev) { +u16 txq; +if (cast_type !=RTN_UNICAST )return QETH_IQD_MCAST_TXQ ; -return QETH_IQD_MIN_UCAST_TXQ ; + + txq =netdev_pick_tx (dev, skb, sb_dev); +return (txq ==QETH_IQD_MCAST_TXQ ) ?QETH_IQD_MIN_UCAST_TXQ : txq; }EXPORT_SYMBOL_GPL (qeth_iqd_select_queue);
drivers/s390/net/qeth_ethtool.c +16 -3
@@ -180,14 +180,27 @@ static int qeth_set_channels(struct net_device *dev, {struct qeth_card *card = dev->ml_priv; -if (IS_IQD (card) || !IS_VM_NIC (card)) -return -EOPNOTSUPP ; -if (channels->rx_count ==0 || channels->tx_count ==0 )return -EINVAL ;if (channels->tx_count > card->qdio.no_out_queues)return -EINVAL ; +if (IS_IQD (card)) { +if (channels->tx_count <QETH_IQD_MIN_TXQ ) +return -EINVAL ; + +/* Reject downgrade while running. It could push displaced +* ucast flows onto txq0, which is reserved for mcast. +*/ +if (netif_running (dev) && + channels->tx_count < dev->real_num_tx_queues) +return -EPERM ; + }else { +/* OSA still uses the legacy prio-queue mechanism: */ +if (!IS_VM_NIC (card)) +return -EOPNOTSUPP ; + } +return netif_set_real_num_tx_queues (dev, channels->tx_count); }
Signature · 1 line
2.17.1
PATCH 6/11 s390/qeth: balance the TX queue selection for IQD devices
In reply to Julian WiedmannFor ucast traffic, qeth_iqd_select_queue() falls back to netdev_pick_tx(). This will potentially use skb_tx_hash() to distribute the flow over all active TX queues - so txq 0 is a valid selection, and qeth_iqd_select_queue() needs to check for this and put it on some other queue. As a result, the distribution for ucast flows is unbalanced and hits QETH_IQD_MIN_UCAST_TXQ heavier than the other queues.
Open-coding a custom variant of skb_tx_hash() isn't an option, since netdev_pick_tx() also gives us eg. access to XPS. But we can pull a little trick: add a single TC class that excludes the mcast txq, and thus encourage skb_tx_hash() to not pick the mcast txq.
--- drivers/s390/net/qeth_core.h | 1 + drivers/s390/net/qeth_core_main.c | 45 ++++++++++++++++++++++++++++++- drivers/s390/net/qeth_ethtool.c | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-)
drivers/s390/net/qeth_core.h +1 -0
@@ -1061,6 +1061,7 @@ netdev_features_t qeth_features_check(struct sk_buff *skb,struct net_device *dev, netdev_features_t features);void qeth_get_stats64 (struct net_device *dev,struct rtnl_link_stats64 *stats); +int qeth_set_real_num_tx_queues (struct qeth_card *card,unsigned int count);u16 qeth_iqd_select_queue (struct net_device *dev,struct sk_buff *skb,u8 cast_type,struct net_device *sb_dev);int qeth_open (struct net_device *dev);
drivers/s390/net/qeth_core_main.c +44 -1
63 lines not on this page · raw message
drivers/s390/net/qeth_ethtool.c +1 -1
@@ -201,7 +201,7 @@ static int qeth_set_channels(struct net_device *dev,return -EOPNOTSUPP ; } -return netif_set_real_num_tx_queues (dev, channels->tx_count); +return qeth_set_real_num_tx_queues (card, channels->tx_count); } static int qeth_get_tunable(struct net_device *dev,
Signature · 1 line
2.17.1
PATCH 10/11 s390/qeth: remove gratuitous NULL checks
In reply to Julian Wiedmannqeth_do_ioctl() is only reached through our own net_device_ops, so we can trust that dev->ml_priv still contains what we put there earlier.
qeth_bridgeport_an_set() is an internal function that doesn't require such sanity checks.
--- drivers/s390/net/qeth_core_main.c | 3 --- drivers/s390/net/qeth_l2_main.c | 2 -- 2 files changed, 5 deletions(-)
drivers/s390/net/qeth_core_main.c +0 -3
@@ -6264,9 +6264,6 @@ int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)struct mii_ioctl_data *mii_data;int rc =0 ; -if (!card) -return -ENODEV ; -switch (cmd) {case SIOC_QETH_ADP_SET_SNMP_CONTROL : rc =qeth_snmp_command (card, rq->ifr_ifru.ifru_data);
drivers/s390/net/qeth_l2_main.c +0 -2
@@ -1519,8 +1519,6 @@ int qeth_bridgeport_an_set(struct qeth_card *card, int enable)struct ccw_device *ddev;struct subchannel_id schid; -if (!card) -return -EINVAL ;if (!card->options.sbp.supported_funcs)return -EOPNOTSUPP ; ddev =CARD_DDEV (card);
Signature · 1 line
2.17.1
PATCH 11/11 s390/qeth: use dev->reg_state
In reply to Julian WiedmannTo check whether a netdevice has already been registered, look at NETREG_REGISTERED to replace some hacks I added a while ago.
--- drivers/s390/net/qeth_core.h | 5 ----- drivers/s390/net/qeth_l2_main.c | 19 ++++++++----------- drivers/s390/net/qeth_l3_main.c | 22 +++++++++------------- 3 files changed, 17 insertions(+), 29 deletions(-)
drivers/s390/net/qeth_core.h +0 -5
@@ -847,11 +847,6 @@ struct qeth_trap_id {/*some helper functions*/ #define QETH_CARD_IFNAME (card) (((card)->dev)? (card)->dev->name : "") -static inline bool qeth_netdev_is_registered (struct net_device *dev) -{ -return dev->netdev_ops !=NULL ; -} -static inline u16 qeth_iqd_translate_txq (struct net_device *dev,u16 txq) {if (txq ==QETH_IQD_MCAST_TXQ )
drivers/s390/net/qeth_l2_main.c +8 -11
@@ -613,7 +613,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)qeth_set_offline (card, false);cancel_work_sync (&card->close_dev_work); -if (qeth_netdev_is_registered (card->dev)) +if (card->dev->reg_state ==NETREG_REGISTERED )unregister_netdev (card->dev); }
@@ -651,7 +651,7 @@ static const struct net_device_ops qeth_osn_netdev_ops = { .ndo_tx_timeout = qeth_tx_timeout, }; -static int qeth_l2_setup_netdev (struct qeth_card *card,bool carrier_ok) +static int qeth_l2_setup_netdev (struct qeth_card *card) {int rc;
@@ -711,13 +711,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok) add_napi:netif_napi_add (card->dev, &card->napi, qeth_poll,QETH_NAPI_WEIGHT ); - rc =register_netdev (card->dev); -if (!rc && carrier_ok) -netif_carrier_on (card->dev); - -if (rc) - card->dev->netdev_ops =NULL ; -return rc; +return register_netdev (card->dev); }static void qeth_l2_trace_features (struct qeth_card *card)
@@ -790,10 +784,13 @@ static int qeth_l2_set_online(struct qeth_card *card)qeth_set_allowed_threads (card,0xffffffff ,0 ); -if (!qeth_netdev_is_registered (dev)) { - rc =qeth_l2_setup_netdev (card, carrier_ok); +if (dev->reg_state !=NETREG_REGISTERED ) { + rc =qeth_l2_setup_netdev (card);if (rc) goto out_remove; + +if (carrier_ok) +netif_carrier_on (dev); }else {rtnl_lock ();if (carrier_ok)
drivers/s390/net/qeth_l3_main.c +9 -13
@@ -1918,7 +1918,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = { .ndo_neigh_setup = qeth_l3_neigh_setup, }; -static int qeth_l3_setup_netdev (struct qeth_card *card,bool carrier_ok) +static int qeth_l3_setup_netdev (struct qeth_card *card) {unsigned int headroom;int rc;
@@ -1972,7 +1972,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok) rc =qeth_l3_iqd_read_initial_mac (card);if (rc) - goto out; +return rc; }else return -ENODEV ;
@@ -1987,14 +1987,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card, bool carrier_ok) PAGE_SIZE * (QETH_MAX_BUFFER_ELEMENTS(card) - 1));netif_napi_add (card->dev, &card->napi, qeth_poll,QETH_NAPI_WEIGHT ); - rc =register_netdev (card->dev); -if (!rc && carrier_ok) -netif_carrier_on (card->dev); - -out: -if (rc) - card->dev->netdev_ops =NULL ; -return rc; +return register_netdev (card->dev); }static const struct device_type qeth_l3_devtype = {
@@ -2041,7 +2034,7 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)qeth_set_offline (card, false);cancel_work_sync (&card->close_dev_work); -if (qeth_netdev_is_registered (card->dev)) +if (card->dev->reg_state ==NETREG_REGISTERED )unregister_netdev (card->dev);flush_workqueue (card->cmd_wq);
@@ -2088,10 +2081,13 @@ static int qeth_l3_set_online(struct qeth_card *card)qeth_set_allowed_threads (card,0xffffffff ,0 );qeth_l3_recover_ip (card); -if (!qeth_netdev_is_registered (dev)) { - rc =qeth_l3_setup_netdev (card, carrier_ok); +if (dev->reg_state !=NETREG_REGISTERED ) { + rc =qeth_l3_setup_netdev (card);if (rc) goto out_remove; + +if (carrier_ok) +netif_carrier_on (dev); }else {rtnl_lock ();if (carrier_ok)
Signature · 1 line
2.17.1
Re: [PATCH net-next 08/11] s390/qeth: don't report hard-coded driver version
In reply to Julian WiedmannQuoted 9 lines · Julian Wiedmann
Versions are meaningless for an in-kernel driver. Instead use the
UTS_RELEASEthat is set byethtool_get_drvinfo().Cc Leon Romanovsky <[email protected]>Signed-off-by Julian Wiedmann <[email protected]>--- drivers/s390/net/qeth_ethtool.c | 1 - 1 file changed, 1 deletion(-)
Thanks a lot for the patch,
David Miller
maintainerFrom: Julian Wiedmann <[email protected]>
Date: Wed, 18 Mar 2020 13:54:44 +0100
Quoted 7 lines
please apply the following patch series for qeth to netdev's net-next tree.
This consists of three parts:
1) support for__GFP_MEMALLOC,
2) several ethtool enhancements (.set_channels, SW Timestamping),
3) the usual cleanups.
Series applied, thanks.