Skip to contentSkip to conversation

s390: ctc patches for 2.6.25 (4th try)

PATCH In review Ursula Braun 2 participants 5 messages Feb 7, 2008 – Feb 11, 2008

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover s390: ctc patches for 2.6.25 (4th try)

Signature · 28 lines
Jeff,

this resend includes improvements proposed by Christoph Hellwig:
  netiucv changes are postponed to a future patch
  drivers/s390/net/fsm.h is not changed
  drivers/s390/net/Makefile is adapted
  changed indentation of cpp directives
  removed forward declaration of chx_rxidle
  removed kerneldoc-like keywords
  removed unnecessary type casts
  kept local variable of type struct ctcm_priv

We kept the filenames in the top of file comments, since this is common
to drivers/s390-parts.
And we kept the ccw_device_halt call due to different usages
in different drivers.

The following patches are intended for 2.6.25. Besides clean-ups
they replace the old ctc driver by a reworked ctcm driver.
This ctcm driver supports the channel-to-channel connections of the
old ctc driver plus an additional MPC protocol to provide SNA
connectivity.

Patch 1/3: clean-ups in Kconfig
Patch 2/3: reworked ctc driver
Patch 3/3: removal of old ctc driver

Regards,    Ursula Braun
#1 lore raw

PATCH 1/3 drivers/s390/net: Kconfig brush up

From: Peter Tiedemann <[email protected]>
From: Ursula Braun <[email protected]>

adapt drivers/s390/net/Kconfig to current IBM wording and further cosmetics

---
 drivers/s390/net/Kconfig |   43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)
drivers/s390/net/Kconfig +22 -21
Index: linux-2.6-uschi/drivers/s390/net/Kconfig
===================================================================
@@ -5,22 +5,23 @@ config LCS
 	tristate "Lan Channel Station Interface"
 	depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)
 	help
-	   Select this option if you want to use LCS networking  on IBM S/390
-  	   or zSeries. This device driver supports Token Ring (IEEE 802.5),
-  	   FDDI (IEEE 802.7) and Ethernet. 
-	   This option is also available as a module which will be
-	   called lcs.ko. If you do not know what it is, it's safe to say "Y".
+	   Select this option if you want to use LCS networking on IBM System z.
+	   This device driver supports Token Ring (IEEE 802.5),
+	   FDDI (IEEE 802.7) and Ethernet.
+	   To compile as a module, choose M. The module name is lcs.ko.
+	   If you do not know what it is, it's safe to choose Y.
 
 config CTC
 	tristate "CTC device support"
 	depends on CCW && NETDEVICES
 	help
-	  Select this option if you want to use channel-to-channel networking
-	  on IBM S/390 or zSeries. This device driver supports real CTC
-	  coupling using ESCON. It also supports virtual CTCs when running
-	  under VM. It will use the channel device configuration if this is
-	  available.  This option is also available as a module which will be
-	  called ctc.ko.  If you do not know what it is, it's safe to say "Y".
+	  Select this option if you want to use channel-to-channel
+	  point-to-point networking on IBM System z.
+	  This device driver supports real CTC coupling using ESCON.
+	  It also supports virtual CTCs when running under VM.
+	  To compile as a module, choose M. The module name is ctc.ko.
+	  To compile into the kernel, choose Y.
+	  If you do not need any channel-to-channel connection, choose N.
 
 config NETIUCV
 	tristate "IUCV network device support (VM only)"
@@ -29,9 +30,9 @@ config NETIUCV
 	  Select this option if you want to use inter-user communication
 	  vehicle networking under VM or VIF. It enables a fast communication
 	  link between VM guests. Using ifconfig a point-to-point connection
-	  can be established to the Linux for zSeries and S7390 system
-	  running on the other VM guest. This option is also available
-	  as a module which will be called netiucv.ko. If unsure, say "Y".
+	  can be established to the Linux on IBM System z
+	  running on the other VM guest. To compile as a module, choose M.
+	  The module name is netiucv.ko. If unsure, choose Y.
 
 config SMSGIUCV
 	tristate "IUCV special message support (VM only)"
@@ -47,22 +48,22 @@ config CLAW
 	  This driver supports channel attached CLAW devices.
 	  CLAW is Common Link Access for Workstation.  Common devices
           that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices.
-	  To compile as a module choose M here:  The module will be called
-	  claw.ko to compile into the kernel choose Y
+	  To compile as a module, choose M. The module name is claw.ko.
+	  To compile into the kernel, choose Y.
 
 config QETH
 	tristate "Gigabit Ethernet device support"
 	depends on CCW && NETDEVICES && IP_MULTICAST && QDIO
 	help
-	  This driver supports the IBM S/390 and zSeries OSA Express adapters
+	  This driver supports the IBM System z OSA Express adapters
 	  in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN
 	  interfaces in QDIO and HIPER mode.
 	
-	  For details please refer to the documentation provided by IBM at   
-	  <http://www10.software.ibm.com/developerworks/opensource/linux390>
+	  For details please refer to the documentation provided by IBM at
+	  <http://www.ibm.com/developerworks/linux/linux390>
 
-	  To compile this driver as a module, choose M here: the
-	  module will be called qeth.ko.
+	  To compile this driver as a module, choose M.
+	  The module name is qeth.ko.
 
 
 comment "Gigabit Ethernet default settings"
#2 lore raw

Re: [patch 1/3] drivers/s390/net: Kconfig brush up

applied 1-3 to #upstream (2.6.26)

Even the initial revision was outside the merge window, so it was never going to make 2.6.25, thus I waited a bit for further comments and revisions

#3 lore raw

PATCH 2/3 ctcm: infrastructure for replaced ctc driver

In reply to Ursula Braun

From: Peter Tiedemann <[email protected]>

ctcm driver supports the channel-to-channel connections of the old ctc driver plus an additional MPC protocol to provide SNA connectivity.

This new ctcm driver replaces the existing ctc driver.

---

 drivers/s390/net/Kconfig      |   12 
 drivers/s390/net/Makefile     |    5 
 drivers/s390/net/ctcm_dbug.c  |   67 +
 drivers/s390/net/ctcm_dbug.h  |  158 ++
 drivers/s390/net/ctcm_fsms.c  | 2347 +++++++++++++++++++++++++++++++++++++++
 drivers/s390/net/ctcm_fsms.h  |  359 ++++++
 drivers/s390/net/ctcm_main.c  | 1772 ++++++++++++++++++++++++++++++
 drivers/s390/net/ctcm_main.h  |  287 ++++
 drivers/s390/net/ctcm_mpc.c   | 2472 ++++++++++++++++++++++++++++++++++++++++++
 drivers/s390/net/ctcm_mpc.h   |  239 ++++
 drivers/s390/net/ctcm_sysfs.c |  210 +++
 11 files changed, 7920 insertions(+), 8 deletions(-)
drivers/s390/net/Makefile +2 -3
Index: linux-2.6-uschi/drivers/s390/net/Makefile
===================================================================
@@ -2,11 +2,10 @@
 # S/390 network devices
 #
 
-ctc-objs := ctcmain.o ctcdbug.o
-
+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_NETIUCV) += netiucv.o fsm.o
 obj-$(CONFIG_SMSGIUCV) += smsgiucv.o
-obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o
 obj-$(CONFIG_LCS) += lcs.o cu3088.o
 obj-$(CONFIG_CLAW) += claw.o cu3088.o
 qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o 
drivers/s390/net/Kconfig +7 -5
Index: linux-2.6-uschi/drivers/s390/net/Kconfig
===================================================================
@@ -11,15 +11,17 @@ config LCS
 	   To compile as a module, choose M. The module name is lcs.ko.
 	   If you do not know what it is, it's safe to choose Y.
 
-config CTC
-	tristate "CTC device support"
+config CTCM
+	tristate "CTC and MPC SNA device support"
 	depends on CCW && NETDEVICES
 	help
 	  Select this option if you want to use channel-to-channel
 	  point-to-point networking on IBM System z.
 	  This device driver supports real CTC coupling using ESCON.
 	  It also supports virtual CTCs when running under VM.
-	  To compile as a module, choose M. The module name is ctc.ko.
+	  This driver also supports channel-to-channel MPC SNA devices.
+	  MPC is an SNA protocol device used by Communication Server for Linux.
+	  To compile as a module, choose M. The module name is ctcm.ko.
 	  To compile into the kernel, choose Y.
 	  If you do not need any channel-to-channel connection, choose N.
 
@@ -84,7 +86,7 @@ config QETH_VLAN
 	  802.1q VLAN support in the qeth device driver.
 
 config CCWGROUP
- 	tristate
-	default (LCS || CTC || QETH)
+	tristate
+	default (LCS || CTCM || QETH)
 
 endmenu
drivers/s390/net/ctcm_dbug.c new file +67 -0

67 lines not on this page · raw message

drivers/s390/net/ctcm_dbug.h new file +158 -0

158 lines not on this page · raw message

drivers/s390/net/ctcm_fsms.h new file +359 -0

359 lines not on this page · raw message

drivers/s390/net/ctcm_main.c new file +1772 -0

1,772 lines not on this page · raw message

drivers/s390/net/ctcm_main.h new file +287 -0

287 lines not on this page · raw message

drivers/s390/net/ctcm_mpc.c new file +2472 -0

315 lines not on this page · raw message

drivers/s390/net/ctcm_mpc.h new file +239 -0

239 lines not on this page · raw message

drivers/s390/net/ctcm_sysfs.c new file +210 -0

210 lines not on this page · raw message

drivers/s390/net/ctcm_fsms.c new file +2347 -0

2,347 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#4 lore raw

PATCH 3/3 ctc: removal of the old ctc driver

In reply to Ursula Braun

From: Peter Tiedemann <[email protected]>

ctc driver is replaced by a new ctcm driver.
The ctcm driver supports the channel-to-channel connections of the old ctc driver plus an additional MPC protocol to provide SNA connectivity.
This patch removes the functions of the old ctc driver.

---
 drivers/s390/net/ctcdbug.c |   80 -
 drivers/s390/net/ctcdbug.h |  125 -
 drivers/s390/net/ctcmain.c | 3062 ---------------------------------------------
 drivers/s390/net/ctcmain.h |  270 ---
 4 files changed, 3537 deletions(-)
drivers/s390/net/ctcdbug.c deleted +0 -80
Index: linux-2.6-uschi/drivers/s390/net/ctcdbug.c
===================================================================
@@ -1,80 +0,0 @@
-/*
- *
- * linux/drivers/s390/net/ctcdbug.c
- *
- * CTC / ESCON network driver - s390 dbf exploit.
- *
- * Copyright 2000,2003 IBM Corporation
- *
- *    Author(s): Original Code written by
- *			  Peter Tiedemann ([email protected])
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "ctcdbug.h"
-
-/**
- * Debug Facility Stuff
- */
-debug_info_t *ctc_dbf_setup = NULL;
-debug_info_t *ctc_dbf_data = NULL;
-debug_info_t *ctc_dbf_trace = NULL;
-
-DEFINE_PER_CPU(char[256], ctc_dbf_txt_buf);
-
-void
-ctc_unregister_dbf_views(void)
-{
-	if (ctc_dbf_setup)
-		debug_unregister(ctc_dbf_setup);
-	if (ctc_dbf_data)
-		debug_unregister(ctc_dbf_data);
-	if (ctc_dbf_trace)
-		debug_unregister(ctc_dbf_trace);
-}
-int
-ctc_register_dbf_views(void)
-{
-	ctc_dbf_setup = debug_register(CTC_DBF_SETUP_NAME,
-					CTC_DBF_SETUP_PAGES,
-					CTC_DBF_SETUP_NR_AREAS,
-					CTC_DBF_SETUP_LEN);
-	ctc_dbf_data = debug_register(CTC_DBF_DATA_NAME,
-				       CTC_DBF_DATA_PAGES,
-				       CTC_DBF_DATA_NR_AREAS,
-				       CTC_DBF_DATA_LEN);
-	ctc_dbf_trace = debug_register(CTC_DBF_TRACE_NAME,
-					CTC_DBF_TRACE_PAGES,
-					CTC_DBF_TRACE_NR_AREAS,
-					CTC_DBF_TRACE_LEN);
-
-	if ((ctc_dbf_setup == NULL) || (ctc_dbf_data == NULL) ||
-	    (ctc_dbf_trace == NULL)) {
-		ctc_unregister_dbf_views();
-		return -ENOMEM;
-	}
-	debug_register_view(ctc_dbf_setup, &debug_hex_ascii_view);
-	debug_set_level(ctc_dbf_setup, CTC_DBF_SETUP_LEVEL);
-
-	debug_register_view(ctc_dbf_data, &debug_hex_ascii_view);
-	debug_set_level(ctc_dbf_data, CTC_DBF_DATA_LEVEL);
-
-	debug_register_view(ctc_dbf_trace, &debug_hex_ascii_view);
-	debug_set_level(ctc_dbf_trace, CTC_DBF_TRACE_LEVEL);
-
-	return 0;
-}
-
drivers/s390/net/ctcdbug.h deleted +0 -125

125 lines not on this page · raw message

drivers/s390/net/ctcmain.c deleted +0 -3062

2,795 lines not on this page · raw message

drivers/s390/net/ctcmain.h deleted +0 -270

270 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.