Skip to contentSkip to conversation

Cleanup subarch definitions in Linux/i386

PATCH In review Zachary Amsden 2 participants 3 messages Mar 30, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Cleanup subarch definitions in Linux/i386

There is some redundant code and unnecessary function calls where inlines would be more appropriate in many of the sub-arches of i386. In addition, some subarches do not compile with certain kernel config options, which needed to be fixed. I have attempted to clean up the subarch implementation of i386 by removing the requirement of implementing a complete setup.c; instead, architectures are free to define only the hooks they actually need in the subarch headers, by introducing mach-xxx/mach_hooks.h and putting the generic definitions in arch_hooks.h.

I have tested this as best as I can, and all of the subarches continue to compile (in fact, even better with the config fixes). I don't have all of the hardware combinations to actually test the generated kernels, but in general, this is fairly straightforward code movement. One liberty I took was removing the sub-arch hook for mca_nmi_handler, as it is clear this does not apply to any other subarch than Voyager.

I created a new file, arch/i386/default.c, which has the default functions that are appropriate for all kernel compiles, which removes the redundant need to redefine IPI mechanisms in all architectures that provide a setup.c file. This was required, since Voyager chooses to override the entire functionality of smp.c.

Comments, suggestions, anything welcome. I think this is a much cleaner approach, and both new and existing sub-architectures will benefit. I am sorry this patch is so large, but it is very difficult to separate into multiple steps that still allow all the subarches to compile.

Zach

arch/i386/Kconfig +2 -2
Index: linux-2.6.16.1/arch/i386/Kconfig
===================================================================
@@ -218,7 +218,7 @@ config NR_CPUS
 
 config SCHED_SMT
 	bool "SMT (Hyperthreading) scheduler support"
-	depends on SMP
+	depends on SMP && !X86_VOYAGER
 	default off
 	help
 	  SMT scheduler support improves the CPU scheduler's decision making
@@ -689,7 +689,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
 	bool "kexec system call (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && (!X86_VOYAGER && SMP)
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot
arch/i386/Makefile +5 -10
Index: linux-2.6.16.1/arch/i386/Makefile
===================================================================
@@ -45,37 +45,32 @@ CFLAGS				+= $(shell if [ $(call cc-vers
 
 CFLAGS += $(cflags-y)
 
-# Default subarch .c files
-mcore-y  := mach-default
+# Default subarch .c files (none)
+mcore-y  := 
 
 # Voyager subarch support
 mflags-$(CONFIG_X86_VOYAGER)	:= -Iinclude/asm-i386/mach-voyager
-mcore-$(CONFIG_X86_VOYAGER)	:= mach-voyager
+mcore-$(CONFIG_X86_VOYAGER)	:= arch/i386/mach-voyager/
 
 # VISWS subarch support
 mflags-$(CONFIG_X86_VISWS)	:= -Iinclude/asm-i386/mach-visws
-mcore-$(CONFIG_X86_VISWS)	:= mach-visws
+mcore-$(CONFIG_X86_VISWS)	:= arch/i386/mach-visws/
 
 # NUMAQ subarch support
 mflags-$(CONFIG_X86_NUMAQ)	:= -Iinclude/asm-i386/mach-numaq
-mcore-$(CONFIG_X86_NUMAQ)	:= mach-default
 
 # BIGSMP subarch support
 mflags-$(CONFIG_X86_BIGSMP)	:= -Iinclude/asm-i386/mach-bigsmp
-mcore-$(CONFIG_X86_BIGSMP)	:= mach-default
 
 #Summit subarch support
 mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
-mcore-$(CONFIG_X86_SUMMIT)  := mach-default
 
 # generic subarchitecture
 mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
-mcore-$(CONFIG_X86_GENERICARCH) := mach-default
 core-$(CONFIG_X86_GENERICARCH) += arch/i386/mach-generic/
 
 # ES7000 subarch support
 mflags-$(CONFIG_X86_ES7000)	:= -Iinclude/asm-i386/mach-es7000
-mcore-$(CONFIG_X86_ES7000)	:= mach-default
 core-$(CONFIG_X86_ES7000)	:= arch/i386/mach-es7000/
 
 # default subarch .h files
@@ -86,7 +81,7 @@ head-y := arch/i386/kernel/head.o arch/i
 libs-y 					+= arch/i386/lib/
 core-y					+= arch/i386/kernel/ \
 					   arch/i386/mm/ \
-					   arch/i386/$(mcore-y)/ \
+					   $(mcore-y) \
 					   arch/i386/crypto/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/i386/math-emu/
 drivers-$(CONFIG_PCI)			+= arch/i386/pci/
arch/i386/kernel/Makefile +1 -1
Index: linux-2.6.16.1/arch/i386/kernel/Makefile
===================================================================
@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
 		pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
-		quirks.o i8237.o topology.o
+		quirks.o i8237.o topology.o default.o
 
 obj-y				+= cpu/
 obj-y				+= timers/
arch/i386/kernel/default.c +48 -0

48 lines not on this page · raw message

arch/i386/kernel/i8259.c +3 -0
Index: linux-2.6.16.1/arch/i386/kernel/i8259.c
===================================================================
@@ -419,6 +419,9 @@ void __init init_IRQ(void)
 	/* setup after call gates are initialised (usually add in
 	 * the architecture specific gates)
 	 */
+#ifdef CONFIG_X86_LOCAL_APIC
+	apic_intr_init();
+#endif
 	intr_init_hook();
 
 	/*
arch/i386/kernel/mca.c +12 -0
Index: linux-2.6.16.1/arch/i386/kernel/mca.c
===================================================================
@@ -463,6 +463,18 @@ static int mca_handle_nmi_callback(struc
 	return 0;
 }
 
+
+#ifdef CONFIG_X86_VOYAGER
+/*
+ * Voyager wants to do something smarter with NMIs.  Rather than add an
+ * arch hook for this, keep the MCA code together where it is in context.
+ * No other subarch requires an MCA NMI hook, and most don't support MCA.
+ */
+extern void mca_nmi_hook(void);
+#else
+#define mca_nmi_hook() printk("NMI generated from unknown source!\n");
+#endif
+
 void mca_handle_nmi(void)
 {
 	/* First try - scan the various adapters and see if a specific
arch/i386/mach-default/Makefile +0 -5
Index: linux-2.6.16.1/arch/i386/mach-default/Makefile
===================================================================
@@ -1,5 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-obj-y				:= setup.o
arch/i386/mach-default/setup.c +0 -132

132 lines not on this page · raw message

arch/i386/mach-visws/setup.c +1 -26
Index: linux-2.6.16.1/arch/i386/mach-visws/setup.c
===================================================================
@@ -13,8 +13,6 @@
 #include "cobalt.h"
 #include "piix4.h"
 
-int no_broadcast;
-
 char visws_board_type = -1;
 char visws_board_rev = -1;
 
@@ -94,30 +92,7 @@ void __init visws_get_board_type_and_rev
 		"unknown")), visws_board_rev);
 }
 
-void __init pre_intr_init_hook(void)
-{
-	init_VISWS_APIC_irqs();
-}
-
-void __init intr_init_hook(void)
-{
-#ifdef CONFIG_X86_LOCAL_APIC
-	apic_intr_init();
-#endif
-}
-
-void __init pre_setup_arch_hook()
-{
-	visws_get_board_type_and_rev();
-}
-
-static struct irqaction irq0 = {
-	.handler =	timer_interrupt,
-	.flags =	SA_INTERRUPT,
-	.name =		"timer",
-};
-
-void __init time_init_hook(void)
+void __init visws_time_init_hook(void)
 {
 	printk(KERN_INFO "Starting Cobalt Timer system clock\n");
 
arch/i386/mach-visws/traps.c +1 -1
Index: linux-2.6.16.1/arch/i386/mach-visws/traps.c
===================================================================
@@ -62,7 +62,7 @@ static __init void cobalt_init(void)
 		co_apic_read(CO_APIC_ID));
 }
 
-void __init trap_init_hook(void)
+void __init visws_trap_init_hook(void)
 {
 	lithium_init();
 	cobalt_init();
arch/i386/mach-voyager/Makefile +1 -1
Index: linux-2.6.16.1/arch/i386/mach-voyager/Makefile
===================================================================
@@ -3,6 +3,6 @@
 #
 
 EXTRA_CFLAGS	+= -I../kernel
-obj-y			:= setup.o voyager_basic.o voyager_thread.o
+obj-y			:= voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)	+= voyager_smp.o voyager_cat.o
arch/i386/mach-voyager/setup.c +0 -47

47 lines not on this page · raw message

include/asm-i386/acpi.h +1 -0
Index: linux-2.6.16.1/include/asm-i386/acpi.h
===================================================================
@@ -31,6 +31,7 @@
 #include <acpi/pdc_intel.h>
 
 #include <asm/system.h>		/* defines cmpxchg */
+#include <asm/processor.h>	/* defines boot_cpu_data */
 
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long
include/asm-i386/arch_hooks.h +94 -7

113 lines not on this page · raw message

include/asm-i386/mach-default/mach_hooks.h +6 -0
Index: linux-2.6.16.1/include/asm-i386/mach-default/mach_hooks.h
===================================================================
@@ -0,0 +1,6 @@
+#ifndef _MACH_HOOKS_H
+#define _MACH_HOOKS_H
+
+/* Fall back to the default hooks in include/asm-i386/arch_hooks.h */
+
+#endif
include/asm-i386/mach-visws/mach_hooks.h +15 -0
Index: linux-2.6.16.1/include/asm-i386/mach-visws/mach_hooks.h
===================================================================
@@ -0,0 +1,15 @@
+#ifndef MACH_HOOKS_H
+#define MACH_HOOKS_H
+
+#define pre_intr_init_hook() init_VISWS_APIC_irqs()
+
+extern void visws_get_board_type_and_rev(void);
+#define pre_setup_arch_hook() visws_get_board_type_and_rev()
+
+extern void visws_time_init_hook(void);
+#define time_init_hook() visws_time_init_hook()
+
+extern void visws_trap_init_hook(void);
+#define trap_init_hook() visws_trap_init_hook()
+
+#endif
include/asm-i386/mach-voyager/mach_hooks.h +38 -0
Index: linux-2.6.16.1/include/asm-i386/mach-voyager/mach_hooks.h
===================================================================
@@ -0,0 +1,38 @@
+#ifndef MACH_HOOKS_H
+#define MACH_HOOKS_H
+
+/**
+ * intr_init_hook - post gate setup interrupt initialisation
+ *
+ * Description:
+ *	Fill in any interrupts that may have been left out by the general
+ *	init_IRQ() routine.  interrupts having to do with the machine rather
+ *	than the devices on the I/O bus (like APIC interrupts in intel MP
+ *	systems) are started here.
+ **/
+static inline void voyager_intr_init_hook(void)
+{
+#ifdef CONFIG_SMP
+	smp_intr_init();
+#endif
+	legacy_intr_init_hook();
+}
+
+#define intr_init_hook() voyager_intr_init_hook()
+
+
+/**
+ * pre_setup_arch_hook - hook called prior to any setup_arch() execution
+ *
+ * Description:
+ *	generally used to activate any machine specific identification
+ *	routines that may be needed before setup_arch() runs. 
+ *	Voyagers run their CPUs from independent clocks, so disable
+ *	the TSC code because we can't sync them
+ **/
+#define pre_setup_arch_hook()	\
+do { 				\
+	tsc_disable = 1;	\
+} while (0)
+
+#endif
#1 lore raw
Quoted 4 lines · * Zachary Amsden ([email protected]) wrote:

Comments, suggestions, anything welcome. I think this is a much cleaner approach, and both new and existing sub-architectures will benefit. I am sorry this patch is so large, but it is very difficult to separate into multiple steps that still allow all the subarches to compile.

Zach, looks nice. Saves Xen a partial copy of setup.c. Did you have further/similar consolidations in mind?

Quoted 5 lines
arch/i386/Makefile +0 -0
@@ -45,37 +45,32 @@ CFLAGS				+= $(shell if [ $(call cc-vers
 
 CFLAGS += $(cflags-y)

arch/i386/Makefile CFLAGS += $(shell if [ $(call cc-vers · line 53

Quoted 10 lines
arch/i386/Makefile +3 -3
 
-# Default subarch .c files
-mcore-y  := mach-default
+# Default subarch .c files (none)
+mcore-y  := 
 
 # Voyager subarch support
 mflags-$(CONFIG_X86_VOYAGER)	:= -Iinclude/asm-i386/mach-voyager
-mcore-$(CONFIG_X86_VOYAGER)	:= mach-voyager
+mcore-$(CONFIG_X86_VOYAGER)	:= arch/i386/mach-voyager/

Is this intended to make way for possible fine tuning? Smth like:

mcore-$(CONFIG_X86_VOYAGER) += arch/i386/another_default.o
(hmm, not sure if that would even work)

Or just an aesthetic change?

include/asm-i386/acpi.h line 34

Quoted 7 lines
include/asm-i386/acpi.h +1 -0
@@ -31,6 +31,7 @@
 #include <acpi/pdc_intel.h>
 
 #include <asm/system.h>		/* defines cmpxchg */
+#include <asm/processor.h>	/* defines boot_cpu_data */

that one necessary?

Quoted 7 lines
include/asm-i386/acpi.h +0 -0
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long

Index: linux-2.6.16.1/include/asm-i386/arch_hooks.h
===================================================================

include/asm-i386/arch_hooks.h line 9

Quoted 9 lines
include/asm-i386/arch_hooks.h +5 -0
@@ -1,7 +1,13 @@
 #ifndef _ASM_ARCH_HOOKS_H
 #define _ASM_ARCH_HOOKS_H
 
+#include <linux/config.h>
+#include <linux/smp.h>
+#include <linux/init.h>
 #include <linux/interrupt.h>
+#include <asm/acpi.h>
+#include <asm/arch_hooks.h>

extraneous include

include/asm-i386/mach-default/mach_hooks.h line 2

Quoted 5 lines
include/asm-i386/mach-default/mach_hooks.h +2 -0
@@ -0,0 +1,6 @@
+#ifndef _MACH_HOOKS_H
+#define _MACH_HOOKS_H

should probably be consistent (_MACH_HOOKS_H vs. MACH_HOOKS_H)

Quoted 5 lines
include/asm-i386/mach-visws/mach_hooks.h +2 -0
@@ -0,0 +1,15 @@
+#ifndef MACH_HOOKS_H
+#define MACH_HOOKS_H
#2 lore raw
Quoted 4 lines · Chris Wright
Quoted 2 lines · * Zachary Amsden ([email protected]) wrote:

Comments, suggestions, anything welcome. I think this is a much cleaner approach, and both new and existing sub-architectures will benefit. I am sorry this patch is so large, but it is very difficult to separate into multiple steps that still allow all the subarches to compile.

Thanks for looking over these. There is a bit more cleanup on top of this, mostly due to the include mess. I have attached another patch.

Quoted 3 lines

Zach, looks nice. Saves Xen a partial copy of setup.c. Did you have further/similar consolidations in mind?

Exactly.

Quoted 20 lines
Quoted 7 lines
arch/i386/Makefile +0 -0
@@ -45,37 +45,32 @@ CFLAGS				+= $(shell if [ $(call cc-vers
 
 CFLAGS += $(cflags-y)
 

arch/i386/Makefile CFLAGS += $(shell if [ $(call cc-vers · line 54

Quoted 10 lines
arch/i386/Makefile +3 -3
-# Default subarch .c files
-mcore-y  := mach-default
+# Default subarch .c files (none)
+mcore-y  := 
 
 # Voyager subarch support
 mflags-$(CONFIG_X86_VOYAGER)	:= -Iinclude/asm-i386/mach-voyager
-mcore-$(CONFIG_X86_VOYAGER)	:= mach-voyager
+mcore-$(CONFIG_X86_VOYAGER)	:= arch/i386/mach-voyager/
 

Is this intended to make way for possible fine tuning? Smth like:

Quoted 5 lines

mcore-$(CONFIG_X86_VOYAGER) += arch/i386/another_default.o
(hmm, not sure if that would even work)

Or just an aesthetic change?

No - it was required in order to leave the subarch blank for the default case. Including "arch/i386//" wasn't so happy in the makefile.

Quoted 6 lines
Quoted 6 lines
include/asm-i386/acpi.h +0 -0
@@ -31,6 +31,7 @@
 #include <acpi/pdc_intel.h>
 
Quoted 6 lines

include/asm-i386/acpi.h line 35

Quoted 3 lines
include/asm-i386/acpi.h +1 -0
 #include <asm/system.h>		/* defines cmpxchg */
+#include <asm/processor.h>	/* defines boot_cpu_data */
 

that one necessary?

Needed for mach-generic subarch to compile with CPU defined as I386 -- the definition of cmpxchg on older CPUs depends on boot_cpu_data. Removing this opens a giant rat hole. This ginourmous rat hole is quite annoying. What goes in system.h vs. processor.h is so poorly defined. I had to hoist boot_cpu_data into system.h as the cleanest way to fix this without introducing circular dependencies - processor.h already depends on system.h for alternative_input(), read_cr4(), write_cr4(), write_cr3(), and there is no end to this mess. Trying to move dependent processor.h pieces into system.h didn't work, since the include/linux headers make the assumption that they can include asm/processor.h to determine if the architecture already has a prefetch instruction defined. What a nightmare. Trying to move system.h pieces into processor.h also doesn't work, since you basically need to move the whole file.

Maybe that is the way to go, but I would rather not go there now.

Quoted 10 lines
Quoted 10 lines
include/asm-i386/acpi.h +0 -0
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long

Index: linux-2.6.16.1/include/asm-i386/arch_hooks.h
===================================================================

include/asm-i386/arch_hooks.h +0 -0
@@ -1,7 +1,13 @@
 #ifndef _ASM_ARCH_HOOKS_H
 #define _ASM_ARCH_HOOKS_H
 
Quoted 10 lines

include/asm-i386/arch_hooks.h line 10

Quoted 7 lines
include/asm-i386/arch_hooks.h +5 -0
+#include <linux/config.h>
+#include <linux/smp.h>
+#include <linux/init.h>
 #include <linux/interrupt.h>
+#include <asm/acpi.h>
+#include <asm/arch_hooks.h>
 

extraneous include

Yes, somewhat extraneous.

Quoted 10 lines

include/asm-i386/mach-default/mach_hooks.h line 2

Quoted 7 lines
include/asm-i386/mach-default/mach_hooks.h +2 -0
@@ -0,0 +1,6 @@
+#ifndef _MACH_HOOKS_H
+#define _MACH_HOOKS_H

should probably be consistent (_MACH_HOOKS_H vs. MACH_HOOKS_H)

Patch attached.

Tidy up the subarch cleanup patch with nits noticed by Chris Wright.

include/asm-i386/arch_hooks.h +0 -4
Index: linux-2.6.16.1/include/asm-i386/arch_hooks.h
===================================================================
@@ -1,13 +1,9 @@
 #ifndef _ASM_ARCH_HOOKS_H
 #define _ASM_ARCH_HOOKS_H
 
-#include <linux/config.h>
-#include <linux/smp.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <asm/acpi.h>
 #include <asm/arch_hooks.h>
-#include <asm/desc.h>
 
 /*
  *	linux/include/asm/arch_hooks.h
include/asm-i386/acpi.h +0 -1
Index: linux-2.6.16.1/include/asm-i386/acpi.h
===================================================================
@@ -31,7 +31,6 @@
 #include <acpi/pdc_intel.h>
 
 #include <asm/system.h>		/* defines cmpxchg */
-#include <asm/processor.h>	/* defines boot_cpu_data */
 
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long
include/asm-i386/processor.h +0 -72

97 lines not on this page · raw message

include/asm-i386/system.h +70 -2

82 lines not on this page · raw message

include/asm-i386/mach-visws/mach_hooks.h +2 -2
Index: linux-2.6.16.1/include/asm-i386/mach-visws/mach_hooks.h
===================================================================
@@ -1,5 +1,5 @@
-#ifndef MACH_HOOKS_H
-#define MACH_HOOKS_H
+#ifndef _MACH_HOOKS_H
+#define _MACH_HOOKS_H
 
 #define pre_intr_init_hook() init_VISWS_APIC_irqs()
 
include/asm-i386/mach-voyager/mach_hooks.h +2 -2
Index: linux-2.6.16.1/include/asm-i386/mach-voyager/mach_hooks.h
===================================================================
@@ -1,5 +1,5 @@
-#ifndef MACH_HOOKS_H
-#define MACH_HOOKS_H
+#ifndef _MACH_HOOKS_H
+#define _MACH_HOOKS_H
 
 /**
  * intr_init_hook - post gate setup interrupt initialisation