s390: networking patches for 2.6.33
Subsystems (5)
cover s390: networking patches for 2.6.33
Hi Dave,
here is a set of networking patches for 2.6.33.
shortlog:
Frank Blaschka (1)
ctcm: suspend has to wait for outstanding I/O
Ursula Braun (3)
iucv: add work_queue cleanup for suspend
s390: remove cu3088 layer for lcs and ctcm
netiucv: displayed TX bytes value much too high
Thanks,
Ursula
PATCH 1/4 iucv: add work_queue cleanup for suspend
From: Ursula Braun <[email protected]>
If iucv_work_queue is not empty during kernel freeze, a kernel panic occurs. This suspend-patch adds flushing of the work queue for pending connection requests and severing of remaining pending connections.
---
net/iucv/iucv.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
net/iucv/iucv.c +13 -3
@@ -1768,7 +1768,6 @@ static void iucv_tasklet_fn(unsigned lon*/ static void iucv_work_fn (struct work_struct *work) { -typedef void iucv_irq_fn (struct iucv_irq_data *);LIST_HEAD (work_queue);struct iucv_irq_list *p, *n;
@@ -1878,14 +1877,25 @@ int iucv_path_table_empty(void)static int iucv_pm_freeze (struct device *dev) {int cpu; +struct iucv_irq_list *p, *n;int rc =0 ;#ifdef CONFIG_PM_DEBUG printk (KERN_WARNING "iucv_pm_freeze\n" );#endif +if (iucv_pm_state !=IUCV_PM_FREEZING ) { +for_each_cpu_mask_nr (cpu, iucv_irq_cpumask) +smp_call_function_single (cpu, iucv_block_cpu_almost, +NULL ,1 ); +cancel_work_sync (&iucv_work); +list_for_each_entry_safe (p, n, &iucv_work_queue, list) { +list_del_init (&p->list); +iucv_sever_pathid (p->data.ippathid, + iucv_error_no_listener); +kfree (p); + } + } iucv_pm_state =IUCV_PM_FREEZING ; -for_each_cpu_mask_nr (cpu, iucv_irq_cpumask) -smp_call_function_single (cpu, iucv_block_cpu_almost,NULL ,1 );if (dev->driver && dev->driver->pm && dev->driver->pm->freeze) rc = dev->driver->pm->freeze (dev);if (iucv_path_table_empty ())
PATCH 2/4 ctcm: suspend has to wait for outstanding I/O
In reply to Ursula BraunFrom: Frank Blaschka <[email protected]>
State transition to DEV_STATE_STOPPED indicates all outstanding I/O has finished. Add wait queue to wait for this state.
---
drivers/s390/net/ctcm_main.c | 5 +++++ drivers/s390/net/fsm.c | 1 + drivers/s390/net/fsm.h | 2 ++ 3 files changed, 8 insertions(+)
drivers/s390/net/ctcm_main.c +5 -0
@@ -1720,6 +1720,11 @@ static int ctcm_pm_suspend(struct ccwgroreturn 0 ;netif_device_detach (priv->channel[READ ]->netdev);ctcm_close (priv->channel[READ ]->netdev); +if (!wait_event_timeout (priv->fsm->wait_q, +fsm_getstate (priv->fsm) ==DEV_STATE_STOPPED ,CTCM_TIME_5_SEC )) { +netif_device_attach (priv->channel[READ ]->netdev); +return -EBUSY ; + }ccw_device_set_offline (gdev->cdev[1 ]);ccw_device_set_offline (gdev->cdev[0 ]);return 0 ;
drivers/s390/net/fsm.c +1 -0
@@ -27,6 +27,7 @@ init_fsm(char *name, const char **state_return NULL ; }strlcpy (this->name, name,sizeof (this->name)); +init_waitqueue_head (&this->wait_q); f =kzalloc (sizeof (fsm), order);if (f ==NULL ) {
drivers/s390/net/fsm.h +2 -0
@@ -66,6 +66,7 @@ typedef struct fsm_instance_t {char name[16 ];void *userdata;int userint; +wait_queue_head_t wait_q;#if FSM_DEBUG_HISTORY int history_index;int history_size;
@@ -197,6 +198,7 @@ fsm_newstate(fsm_instance *fi, int newstprintk (KERN_DEBUG "fsm(%s): New state %s\n" , fi->name, fi->f->state_names[newstate]);#endif +wake_up (&fi->wait_q); }/**
PATCH 3/4 s390: remove cu3088 layer for lcs and ctcm
In reply to Ursula BraunFrom: Ursula Braun <[email protected]>
The cu3088-driver used as common base for lcs- and ctcm-devices makes it difficult to assign the appropriate driver to an lcs-device or a ctcm-device. This patch eliminates the cu3088-driver and thus the root device "cu3088". Path /sys/devices/cu3088 is replaced with the pathes /sys/devices/lcs and /sys/devices/ctcm.
Patch is based on a proposal from Cornelia Huck.
---
drivers/s390/net/Makefile | 6 - drivers/s390/net/claw.c | 82 ++++++++++++++++++++--- drivers/s390/net/claw.h | 12 +++ drivers/s390/net/ctcm_fsms.c | 1 drivers/s390/net/ctcm_fsms.h | 1 drivers/s390/net/ctcm_main.c | 104 +++++++++++++++++++++++------ drivers/s390/net/ctcm_main.h | 20 +++++ drivers/s390/net/ctcm_mpc.c | 1 drivers/s390/net/ctcm_sysfs.c | 11 ++- drivers/s390/net/cu3088.c | 148 ------------------------------------------ drivers/s390/net/cu3088.h | 41 ----------- drivers/s390/net/lcs.c | 101 ++++++++++++++++++++++++---- drivers/s390/net/lcs.h | 18 +++++ 13 files changed, 304 insertions(+), 242 deletions(-)
drivers/s390/net/claw.c +72 -10
@@ -90,7 +90,6 @@#include <linux/timer.h> #include <linux/types.h> -#include "cu3088.h" #include "claw.h" /*
@@ -258,6 +257,9 @@ static int claw_pm_prepare(struct ccwgroreturn -EPERM ; } +/* the root device for claw group devices */ +static struct device *claw_root_dev; +/* ccwgroup table */ static struct ccwgroup_driver claw_group_driver = {
@@ -272,6 +274,47 @@ static struct ccwgroup_driver claw_group .prepare = claw_pm_prepare, }; +static struct ccw_device_id claw_ids[] = { + {CCW_DEVICE (0x3088 ,0x61 ), .driver_info = claw_channel_type_claw}, + {}, +}; +MODULE_DEVICE_TABLE (ccw, claw_ids); + +static struct ccw_driver claw_ccw_driver = { + .owner =THIS_MODULE , + .name ="claw" , + .ids = claw_ids, + .probe = ccwgroup_probe_ccwdev, + .remove = ccwgroup_remove_ccwdev, +}; + +static ssize_t +claw_driver_group_store (struct device_driver *ddrv,const char *buf, +size_t count) +{ +int err; + err =ccwgroup_create_from_string (claw_root_dev, + claw_group_driver.driver_id, + &claw_ccw_driver,3 , buf); +return err ? err : count; +} + +static DRIVER_ATTR(group, 0200, NULL, claw_driver_group_store); + +static struct attribute *claw_group_attrs[] = { + &driver_attr_group.attr, +NULL , +}; + +static struct attribute_group claw_group_attr_group = { + .attrs = claw_group_attrs, +}; + +static struct attribute_group *claw_group_attr_groups[] = { + &claw_group_attr_group, +NULL , +}; +/* * Key functions */
@@ -3326,7 +3369,11 @@ claw_remove_files(struct device *dev) static void __exitclaw_cleanup (void ) { -unregister_cu3088_discipline (&claw_group_driver); +driver_remove_file (&claw_group_driver.driver, + &driver_attr_group); +ccwgroup_driver_unregister (&claw_group_driver); +ccw_driver_unregister (&claw_ccw_driver); +root_device_unregister (claw_root_dev);claw_unregister_debug_facility ();pr_info ("Driver unloaded\n" );
@@ -3348,16 +3395,31 @@ claw_init(void)if (ret) {pr_err ("Registering with the S/390 debug feature" " failed with error code %d\n" , ret); -return ret; + goto out_err; }CLAW_DBF_TEXT (2 , setup,"init_mod" ); - ret =register_cu3088_discipline (&claw_group_driver); -if (ret) { -CLAW_DBF_TEXT (2 , setup,"init_bad" ); -claw_unregister_debug_facility (); -pr_err ("Registering with the cu3088 device driver failed " -"with error code %d\n" , ret); - } + claw_root_dev =root_device_register ("qeth" ); + ret =IS_ERR (claw_root_dev) ?PTR_ERR (claw_root_dev) :0 ; +if (ret) + goto register_err; + ret =ccw_driver_register (&claw_ccw_driver); +if (ret) + goto ccw_err; + claw_group_driver.driver.groups = claw_group_attr_groups; + ret =ccwgroup_driver_register (&claw_group_driver); +if (ret) + goto ccwgroup_err; +return 0 ; + +ccwgroup_err: +ccw_driver_unregister (&claw_ccw_driver); +ccw_err: +root_device_unregister (claw_root_dev); +register_err: +CLAW_DBF_TEXT (2 , setup,"init_bad" ); +claw_unregister_debug_facility (); +out_err: +pr_err ("Initializing the claw device driver failed\n" );return ret; }
drivers/s390/net/claw.h +12 -0
@@ -129,6 +129,18 @@ static inline int claw_dbf_passes(debug_ } \ }while (0 ) +/** +* Enum for classifying detected devices. +*/ +enum claw_channel_types { +/* Device is not a channel */ + claw_channel_type_none, + +/* Device is a CLAW channel device */ + claw_channel_type_claw +}; + +/******************************************************* * Define Control Blocks * * *
drivers/s390/net/ctcm_fsms.c +0 -1
@@ -44,7 +44,6 @@#include <asm/idals.h> #include "fsm.h" -#include "cu3088.h" #include "ctcm_dbug.h" #include "ctcm_main.h"
drivers/s390/net/ctcm_fsms.h +0 -1
@@ -39,7 +39,6 @@#include <asm/idals.h> #include "fsm.h" -#include "cu3088.h" #include "ctcm_main.h" /*
drivers/s390/net/ctcm_main.c +84 -20
166 lines not on this page · raw message
drivers/s390/net/ctcm_main.h +18 -2
@@ -16,7 +16,6 @@#include <linux/netdevice.h> #include "fsm.h" -#include "cu3088.h" #include "ctcm_dbug.h" #include "ctcm_mpc.h"
@@ -66,6 +65,23 @@ctcmpc_dumpit (buf, len); \ }while (0 ) +/** +* Enum for classifying detected devices +*/ +enum ctcm_channel_types { +/* Device is not a channel */ + ctcm_channel_type_none, + +/* Device is a CTC/A */ + ctcm_channel_type_parallel, + +/* Device is a FICON channel */ + ctcm_channel_type_ficon, + +/* Device is a ESCON channel */ + ctcm_channel_type_escon +}; +/* * CCW commands, used in this driver. */
@@ -121,7 +137,7 @@ struct channel {* Type of this channel. * CTC/A or Escon for valid channels. */ -enum channel_types type; +enum ctcm_channel_types type;/* * Misc. flags. See CHANNEL_FLAGS_... below */
drivers/s390/net/ctcm_mpc.c +0 -1
@@ -53,7 +53,6 @@#include <linux/moduleparam.h> #include <asm/idals.h> -#include "cu3088.h" #include "ctcm_mpc.h" #include "ctcm_main.h" #include "ctcm_fsms.h"
drivers/s390/net/ctcm_sysfs.c +10 -1
@@ -158,6 +158,15 @@ static ssize_t ctcm_proto_store(struct dreturn count; } +const char *ctcm_type[] = { +"not a channel" , +"CTC/A" , +"FICON channel" , +"ESCON channel" , +"unknown channel type" , +"unsupported channel type" , +}; +static ssize_t ctcm_type_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -168,7 +177,7 @@ static ssize_t ctcm_type_show(struct devreturn -ENODEV ;return sprintf (buf,"%s\n" , - cu3088_type[cgdev->cdev[0 ]->id.driver_info]); + ctcm_type[cgdev->cdev[0 ]->id.driver_info]); } static DEVICE_ATTR(buffer, 0644, ctcm_buffer_show, ctcm_buffer_write);
drivers/s390/net/cu3088.c +0 -148
148 lines not on this page · raw message
drivers/s390/net/cu3088.h +0 -41
41 lines not on this page · raw message
drivers/s390/net/lcs.c +87 -14
156 lines not on this page · raw message
drivers/s390/net/lcs.h +18 -0
@@ -36,6 +36,24 @@ static inline int lcs_dbf_passes(debug_i#define CARD_FROM_DEV (cdev) \ (struct lcs_card *) dev_get_drvdata( \ &((struct ccwgroup_device *)dev_get_drvdata(&cdev->dev))->dev); + +/** +* Enum for classifying detected devices. +*/ +enum lcs_channel_types { +/* Device is not a channel */ + lcs_channel_type_none, + +/* Device is a 2216 channel */ + lcs_channel_type_parallel, + +/* Device is a 2216 channel */ + lcs_channel_type_2216, + +/* Device is a OSA2 card */ + lcs_channel_type_osa2 +}; +/** * CCW commands used in this driver */
drivers/s390/net/Makefile +3 -3
@@ -3,11 +3,11 @@ # ctcm-y += ctcm_main.o ctcm_fsms.o ctcm_mpc.o ctcm_sysfs.o ctcm_dbug.o -obj-$(CONFIG_CTCM) += ctcm.o fsm.o cu3088.o +obj-$(CONFIG_CTCM) += ctcm.o fsm.o obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o obj-$(CONFIG_SMSGIUCV) += smsgiucv.o -obj-$(CONFIG_LCS) += lcs.o cu3088.o -obj-$(CONFIG_CLAW) += claw.o cu3088.o +obj-$(CONFIG_LCS) += lcs.o +obj-$(CONFIG_CLAW) += claw.o qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o obj-$(CONFIG_QETH) += qeth.o qeth_l2-y += qeth_l2_main.o
PATCH 4/4 netiucv: displayed TX bytes value much too high
In reply to Ursula BraunFrom: Ursula Braun <[email protected]>
tx_bytes value must be updated by skb length before skb is freed.
---
drivers/s390/net/netiucv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/net/netiucv.c +2 -2
@@ -739,13 +739,13 @@ static void conn_action_txdone(fsm_instaif (single_flag) {if ((skb =skb_dequeue (&conn->commit_queue))) {atomic_dec (&skb->users); -dev_kfree_skb_any (skb);if (privptr) { privptr->stats.tx_packets++; privptr->stats.tx_bytes += (skb->len -NETIUCV_HDRLEN - -NETIUCV_HDRLEN ); + -NETIUCV_HDRLEN ); } +dev_kfree_skb_any (skb); } } conn->tx_buff->data = conn->tx_buff->head;
David Miller
maintainerFrom: Ursula Braun <[email protected]>
Date: Fri, 13 Nov 2009 08:46:26 +0100
Quoted 10 lines
here is a set of networking patches for 2.6.33.
shortlog:
Frank Blaschka (1)
ctcm: suspend has to wait for outstanding I/OUrsula Braun (3)
iucv: addwork_queuecleanup for suspend
s390: remove cu3088 layer for lcs and ctcm
netiucv: displayed TX bytes value much too high
All applied, thanks.