Skip to contentSkip to conversation

2.5.38 s390 fixes: 04_config.

PATCH New Martin Schwidefsky 1 participant 1 message Sep 24, 2002

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

PATCH 1/1 2.5.38 s390 fixes: 04_config.

Remove some configuration options that don't really make sense.

Documentation/s390/CommonIO +0 -3
diff -urN linux-2.5.38/Documentation/s390/CommonIO linux-2.5.38-s390/Documentation/s390/CommonIO
@@ -123,9 +123,6 @@
 
 * /proc/chpids
 
-  This entry will only show up if you specified CONFIG_CHSC=y during kernel
-  config.
-
   This entry serves a dual purpose:
  
   - show which chpids are currently known to Linux and their status (online,
arch/s390/Config.help +0 -14
diff -urN linux-2.5.38/arch/s390/Config.help linux-2.5.38-s390/arch/s390/Config.help
@@ -160,25 +160,11 @@
   Select "vm_reader" if you are running under VM/ESA and want
   to IPL the image from the emulated card reader.
 
-CONFIG_FAST_IRQ
-  Select this option in order to get the interrupts processed faster
-  on your S/390 or zSeries machine.  If selected, after an interrupt
-  is processed, the channel subsystem will be asked for other pending
-  interrupts which will also be processed before leaving the interrupt
-  context.  This speeds up the I/O a lot. Say "Y".
-
 CONFIG_MACHCHK_WARNING
   Select this option if you want the machine check handler on IBM S/390 or 
   zSeries to process warning machine checks (e.g. on power failures). 
   If unsure, say "Y".
 
-CONFIG_CHSC
-  Select this option if you want the s390 common I/O layer to use information
-  obtained by channel subsystem calls. This will enable Linux to process link
-  failures and resource accessibility events. Moreover, if you have procfs
-  enabled, you'll be able to toggle chpids logically offline and online. Even
-  if you don't understand what this means, you should say "Y".
-
 CONFIG_PROCESS_DEBUG
   Say Y to print all process fault locations to the console.  This is
   a debugging option; you probably do not want to set it unless you
arch/s390/Makefile +4 -7
diff -urN linux-2.5.38/arch/s390/Makefile linux-2.5.38-s390/arch/s390/Makefile
@@ -23,15 +23,12 @@
 
 HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
 
-SUBDIRS += arch/s390/mm arch/s390/kernel arch/s390/lib drivers/s390
-CORE_FILES := arch/s390/mm/mm.o arch/s390/kernel/kernel.o $(CORE_FILES)
-LIBS := $(TOPDIR)/arch/s390/lib/lib.a $(LIBS) $(TOPDIR)/arch/s390/lib/lib.a
-
-DRIVERS += drivers/s390/built-in.o
+libs-y		+= arch/s390/lib/
+core-y		+= arch/s390/kernel/ arch/s390/mm/
+drivers-y	+= drivers/s390/
 
 ifeq ($(CONFIG_MATHEMU),y)
-  SUBDIRS += arch/s390/math-emu
-  DRIVERS += arch/s390/math-emu/math-emu.o
+  core-y	+= arch/s390/math-emu/
 endif
 
 all: image listing
arch/s390/config.in +6 -10
diff -urN linux-2.5.38/arch/s390/config.in linux-2.5.38-s390/arch/s390/config.in
@@ -17,22 +17,19 @@
 source init/Config.in
 
 mainmenu_option next_comment
+comment 'Base setup'
 comment 'Processor type and features'
 bool 'Symmetric multi-processing support' CONFIG_SMP
 bool 'IEEE FPU emulation' CONFIG_MATHEMU
-endmenu
 
-mainmenu_option next_comment
-comment 'Base setup'
-bool 'Fast IRQ handling' CONFIG_FAST_IRQ
+comment 'I/O subsystem configuration'
 bool 'Process warning machine checks' CONFIG_MACHCHK_WARNING
-bool 'Use chscs for Common I/O' CONFIG_CHSC
-
 tristate 'QDIO support' CONFIG_QDIO
-  if [ "$CONFIG_QDIO" != "n" ]; then
-    bool '   Performance statistics in /proc' CONFIG_QDIO_PERF_STATS
-  fi
+if [ "$CONFIG_QDIO" != "n" ]; then
+  bool '   Performance statistics in /proc' CONFIG_QDIO_PERF_STATS
+fi
 
+comment 'Misc'
 bool 'Builtin IPL record support' CONFIG_IPL
 if [ "$CONFIG_IPL" = "y" ]; then
   choice 'IPL method generated into head.S' \
@@ -68,7 +65,6 @@
 mainmenu_option next_comment
 comment 'Kernel hacking'
 
-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
 #if [ "$CONFIG_CTC" = "y" ]; then
 #  bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
 #fi
arch/s390/defconfig +25 -18

111 lines not on this page · raw message

arch/s390/kernel/Makefile +0 -2
diff -urN linux-2.5.38/arch/s390/kernel/Makefile linux-2.5.38-s390/arch/s390/kernel/Makefile
@@ -5,8 +5,6 @@
 EXTRA_TARGETS	:= head.o init_task.o
 EXTRA_AFLAGS	:= -traditional
 
-O_TARGET	:= kernel.o
-
 export-objs	:= debug.o ebcdic.o s390_ext.o smp.o s390_ksyms.o
 obj-y	:= entry.o bitmap.o traps.o time.o process.o \
             setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
arch/s390/math-emu/Makefile +0 -1
diff -urN linux-2.5.38/arch/s390/math-emu/Makefile linux-2.5.38-s390/arch/s390/math-emu/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the FPU instruction emulation.
 #
 
-O_TARGET := math-emu.o
 obj-$(CONFIG_MATHEMU) := math.o qrnnd.o
 
 EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
arch/s390/mm/Makefile +0 -2
diff -urN linux-2.5.38/arch/s390/mm/Makefile linux-2.5.38-s390/arch/s390/mm/Makefile
@@ -7,8 +7,6 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := mm.o
-
 obj-y	 := init.o fault.o ioremap.o extable.o
 
 include $(TOPDIR)/Rules.make
arch/s390x/Config.help +0 -14
diff -urN linux-2.5.38/arch/s390x/Config.help linux-2.5.38-s390/arch/s390x/Config.help
@@ -159,25 +159,11 @@
   Select "vm_reader" if you are running under VM/ESA and want
   to IPL the image from the emulated card reader.
 
-CONFIG_FAST_IRQ
-  Select this option in order to get the interrupts processed faster
-  on your S/390 or zSeries machine.  If selected, after an interrupt
-  is processed, the channel subsystem will be asked for other pending
-  interrupts which will also be processed before leaving the interrupt
-  context.  This speeds up the I/O a lot. Say "Y".
-
 CONFIG_MACHCHK_WARNING
   Select this option if you want the machine check handler on IBM S/390 or
   zSeries to process warning machine checks (e.g. on power failures). 
   If unsure, say "Y".
 
-CONFIG_CHSC
-  Select this option if you want the s390 common I/O layer to use information
-  obtained by channel subsystem calls. This will enable Linux to process link
-  failures and resource accessibility events. Moreover, if you have procfs
-  enabled, you'll be able to toggle chpids logically offline and online. Even
-  if you don't understand what this means, you should say "Y".
-
 CONFIG_S390_SUPPORT
   Select this option if you want to enable your system kernel to
   handle system-calls from ELF binaries for 31 bit ESA.  This option
arch/s390x/Makefile +3 -4
diff -urN linux-2.5.38/arch/s390x/Makefile linux-2.5.38-s390/arch/s390x/Makefile
@@ -24,10 +24,9 @@
 
 HEAD := arch/s390x/kernel/head.o arch/s390x/kernel/init_task.o
 
-SUBDIRS += arch/s390x/mm arch/s390x/kernel arch/s390x/lib drivers/s390
-CORE_FILES := arch/s390x/mm/mm.o arch/s390x/kernel/kernel.o $(CORE_FILES)
-DRIVERS := $(DRIVERS) drivers/s390/built-in.o
-LIBS := $(TOPDIR)/arch/s390x/lib/lib.a $(LIBS) $(TOPDIR)/arch/s390x/lib/lib.a
+libs-y		+= arch/s390x/lib/
+core-y		+= arch/s390x/kernel/ arch/s390x/mm/
+drivers-y	+= drivers/s390/
 
 all: image listing
 
arch/s390x/boot/Makefile +0 -2
diff -urN linux-2.5.38/arch/s390x/boot/Makefile linux-2.5.38-s390/arch/s390x/boot/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the linux s390-specific parts of the memory manager.
 #
 
-O_TARGET := 
-
 EXTRA_AFLAGS := -traditional
 
 include $(TOPDIR)/Rules.make
arch/s390x/config.in +7 -10
diff -urN linux-2.5.38/arch/s390x/config.in linux-2.5.38-s390/arch/s390x/config.in
@@ -17,31 +17,29 @@
 source init/Config.in
 
 mainmenu_option next_comment
+comment 'Base setup'
 comment 'Processor type and features'
 bool 'Symmetric multi-processing support' CONFIG_SMP
 bool 'Kernel support for 31 bit emulation' CONFIG_S390_SUPPORT
 if [ "$CONFIG_S390_SUPPORT" = "y" ]; then
   tristate 'Kernel support for 31 bit ELF binaries' CONFIG_BINFMT_ELF32 
 fi
-endmenu
 
-mainmenu_option next_comment
-comment 'Base setup'
-bool 'Fast IRQ handling' CONFIG_FAST_IRQ
+comment 'I/O subsystem configuration'
 bool 'Process warning machine checks' CONFIG_MACHCHK_WARNING
-bool 'Use chscs for Common I/O' CONFIG_CHSC
-  
 tristate 'QDIO support' CONFIG_QDIO
-  if [ "$CONFIG_QDIO" != "n" ]; then
-    bool '   Performance statistics in /proc' CONFIG_QDIO_PERF_STATS
-  fi
+if [ "$CONFIG_QDIO" != "n" ]; then
+  bool '   Performance statistics in /proc' CONFIG_QDIO_PERF_STATS
+fi
 
+comment 'Misc'
 bool 'Builtin IPL record support' CONFIG_IPL
 if [ "$CONFIG_IPL" = "y" ]; then
   choice 'IPL method generated into head.S' \
           "tape                   CONFIG_IPL_TAPE \
            vm_reader              CONFIG_IPL_VM" tape
 fi
+
 define_bool CONFIG_KCORE_ELF y
 tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
@@ -71,7 +69,6 @@
 mainmenu_option next_comment
 comment 'Kernel hacking'
 
-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
 #if [ "$CONFIG_CTC" = "y" ]; then
 #  bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
 #fi
arch/s390x/defconfig +29 -22

128 lines not on this page · raw message

arch/s390x/kernel/Makefile +0 -2
diff -urN linux-2.5.38/arch/s390x/kernel/Makefile linux-2.5.38-s390/arch/s390x/kernel/Makefile
@@ -5,8 +5,6 @@
 EXTRA_TARGETS	:= head.o init_task.o
 EXTRA_AFLAGS	:= -traditional
 
-O_TARGET	:= kernel.o
-
 export-objs	:= debug.o ebcdic.o s390_ext.o smp.o s390_ksyms.o \
 		   exec32.o
 
arch/s390x/mm/Makefile +0 -2
diff -urN linux-2.5.38/arch/s390x/mm/Makefile linux-2.5.38-s390/arch/s390x/mm/Makefile
@@ -7,8 +7,6 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
 
-O_TARGET := mm.o
-
 obj-y	 := init.o fault.o ioremap.o extable.o
 
 include $(TOPDIR)/Rules.make
drivers/s390/Makefile +2 -0
diff -urN linux-2.5.38/drivers/s390/Makefile linux-2.5.38-s390/drivers/s390/Makefile
@@ -9,4 +9,6 @@
 obj-y += s390mach.o s390dyn.o sysinfo.o
 obj-y += block/ char/ misc/ net/ cio/
 
+drivers-y += drivers/s390/built-in.o
+
 include $(TOPDIR)/Rules.make
drivers/s390/cio/Makefile +1 -2
diff -urN linux-2.5.38/drivers/s390/cio/Makefile linux-2.5.38-s390/drivers/s390/cio/Makefile
@@ -3,9 +3,8 @@
 #
 
 obj-y := cio_debug.o # make sure this always comes first
-obj-y += airq.o blacklist.o cio.o ioinfo.o misc.o requestirq.o s390io.o
+obj-y += airq.o blacklist.o cio.o ioinfo.o misc.o requestirq.o s390io.o chsc.o
 
-obj-$(CONFIG_CHSC) += chsc.o
 obj-$(CONFIG_PROC_FS) += proc.o
 
 export-objs += airq.o cio.o ioinfo.o requestirq.o s390io.o
drivers/s390/cio/cio.c +3 -8
diff -urN linux-2.5.38/drivers/s390/cio/cio.c linux-2.5.38-s390/drivers/s390/cio/cio.c
@@ -969,10 +969,7 @@
 		return;
 	}
 	/* endif */
-#ifdef CONFIG_FAST_IRQ
 	do {
-#endif				/* CONFIG_FAST_IRQ */
-
 		/*
 		 * Non I/O-subchannel thin interrupts are processed differently
 		 */
@@ -1008,16 +1005,14 @@
 			irq_exit ();
 		}
 
-#ifdef CONFIG_FAST_IRQ
-
 		/*
 		 * Are more interrupts pending?
 		 * If so, the tpi instruction will update the lowcore 
 		 * to hold the info for the next interrupt.
+		 * We don't do this for VM because a tpi drops the cpu
+		 * out of the sie which costs more cycles than it saves.
 		 */
-	} while (tpi (NULL) != 0);
-
-#endif				/* CONFIG_FAST_IRQ */
+	} while (!MACHINE_IS_VM && tpi (NULL) != 0);
 
 	return;
 }
drivers/s390/cio/misc.c +1 -3
diff -urN linux-2.5.38/drivers/s390/cio/misc.c linux-2.5.38-s390/drivers/s390/cio/misc.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/s390io.c
  *   S/390 common I/O routines
- *   $Revision: 1.4 $
+ *   $Revision: 1.5 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
@@ -212,9 +212,7 @@
 
 			CRW_DEBUG(KERN_NOTICE, 2, 
 				  "source is channel subsystem\n");
-#ifdef CONFIG_CHSC
 			s390_process_css();
-#endif
 			break;
 
 		default:
drivers/s390/cio/s390io.c +0 -12
diff -urN linux-2.5.38/drivers/s390/cio/s390io.c linux-2.5.38-s390/drivers/s390/cio/s390io.c
@@ -995,10 +995,8 @@
 	int ccode2;		/* condition code for other I/O routines */
 	schib_t *p_schib;
 	int ret;
-#ifdef CONFIG_CHSC
 	int      chp = 0;
 	int      mask;
-#endif /* CONFIG_CHSC */
 
 	char dbf_txt[15];
 
@@ -1121,7 +1119,6 @@
 	ioinfo[irq]->opm = ioinfo[irq]->schib.pmcw.pim
 	    & ioinfo[irq]->schib.pmcw.pam & ioinfo[irq]->schib.pmcw.pom;
 
-#ifdef CONFIG_CHSC
 	if (ioinfo[irq]->opm) {
 		for (chp=0;chp<=7;chp++) {
 			mask = 0x80 >> chp;
@@ -1133,7 +1130,6 @@
 			}
 		}
 	}
-#endif /* CONFIG_CHSC */
 
 	CIO_DEBUG_IFMSG(KERN_INFO, 0,
 			"Detected device %04X "
@@ -1700,11 +1696,9 @@
 	int ccode;
 	__u8 pathmask;
 	__u8 domask;
-#ifdef CONFIG_CHSC
 	int chp;
 	int mask;
 	int old_opm = 0;
-#endif /* CONFIG_CHSC */
 
 	int ret = 0;
 	int i;
@@ -1720,9 +1714,7 @@
 	if (ioinfo[irq]->st) 
 		return -ENODEV;
 
-#ifdef CONFIG_CHSC
 	old_opm = ioinfo[irq]->opm;
-#endif /* CONFIG_CHSC */
 	ccode = stsch (irq, &(ioinfo[irq]->schib));
 
 	if (ccode) {
@@ -1735,7 +1727,6 @@
 		ioinfo[irq]->ui.flags.pgid_supp = 0;
 		ret = 0;
 
-#ifdef CONFIG_CHSC
 		/*
 		 * disable if chpid is logically offline
 		 */
@@ -1781,14 +1772,12 @@
 		} else {
 			ret = 0;
 		}
-#endif /* CONFIG_CHSC */
 		return ret;
 	}
 
 	ioinfo[irq]->opm = ioinfo[irq]->schib.pmcw.pim
 	    & ioinfo[irq]->schib.pmcw.pam & ioinfo[irq]->schib.pmcw.pom;
 
-#ifdef CONFIG_CHSC
 	if (ioinfo[irq]->opm) {
 		for (chp=0;chp<=7;chp++) {
 			mask = 0x80 >> chp;
@@ -1830,7 +1819,6 @@
 				pdevreg->oper_func( irq, pdevreg);
 
 	}
-#endif /* CONFIG_CHSC */
 
 	if ( ioinfo[irq]->ui.flags.pgid_supp == 0 )
 		return( 0);	/* just exit ... */