Six Voyager patches for 2.5.53

James Bottomley (James.Bottomley@SteelEye.com)
Sat, 28 Dec 2002 17:24:45 -0600

Messages sorted by: [ date ][ thread ][ subject ][ author ]
Next message: Jeff Dike: "Re: [PATCH] Allow UML kernel to run in a separate host address space"
Previous message: Stephen Satchell: "RE: Want a random entropy source?"

This is a multipart MIME message.

--==_Exmh_9143007530
Content-Type: text/plain; charset=us-ascii

The following six patches are bring voyager up to date in 2.5.53.

They're also available in a bitkeeper repository at

http://linux-voyager.bkbits.net/voyager-for-linus-2.5

The patches are:

voyager:

- Update the voyager core (remove irq stacks which crept in from -ac and tidy
up a few loose ends.

- Also creates a new subarch menu as suggested by Adrian Bunk. (I'll add NUMAQ
and Summit to this in a following patch).

sysrq:

- Move the voyager sysrq from 'c' to 'v' and move it into the voyager code.
Suggested by Randy Dunlap.

trampoline:

- Make trampoline a subarch option for those which need the trampoline, but
not any of the rest of the SMP stuff (so that voyager can use it easily)

subarch:

- One line fix to move a hyperthreading define under CONFIG_X86_HT

tsc:

- Update the TSC code to allow runtime disabling from the subarch code.

- Also move the tsc options into the kernel/timer code.

boot_cs:

- Move the boot code to have a much smaller GDT (this is necessary for voyager
to boot). This code has been in the -ac tree for a while with no ill effects.

James

--==_Exmh_9143007530
Content-Type: text/plain ; name="voyager.diff"; charset=us-ascii
Content-Description: voyager.diff
Content-Disposition: attachment; filename="voyager.diff"

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet v2.5.53 -> 1.952
# arch/i386/boot/setup.S 1.16 -> 1.17
# arch/i386/Kconfig 1.14 -> 1.15
# arch/i386/Makefile 1.34 -> 1.35
# arch/i386/mach-voyager/voyager_smp.c 1.1 -> 1.2
# include/asm-i386/smp.h 1.17 -> 1.18
# include/asm-i386/hw_irq.h 1.15 -> 1.16
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/23 torvalds@home.transmeta.com 1.951
# Linux v2.5.53
# --------------------------------------------
# 02/12/27 jejb@raven.il.steeleye.com 1.952
# Enable Voyager in current kernel
# --------------------------------------------
#
diff -Nru a/arch/i386/Kconfig b/arch/i386/Kconfig
--- a/arch/i386/Kconfig Sat Dec 28 17:11:27 2002
+++ b/arch/i386/Kconfig Sat Dec 28 17:11:27 2002
@@ -39,6 +39,33 @@
menu "Processor type and features"

choice
+ prompt "Subarchitecture Type"
+ default PC
+
+config PC
+ bool PC
+ help
+ Choose this option if your computer is a standard PC or compatible.
+
+config VOYAGER
+ bool "NCR Voyager Architecture"
+ ---help---
+ Voyager is a MCA based 32 way capable SMP architecture proprietary
+ to NCR Corp. Machine classes 345x/35xx/4100/51xx are voyager based.
+
+ *** WARNING ***
+
+ If you do not specifically know you have a Voyager based machine,
+ say N here otherwise the kernel you build will not be bootable.
+
+# Visual Workstation support is utterly broken.
+# If you want to see it working mail an VW540 to hch@infradead.org 8)
+#bool 'SGI Visual Workstation support' CONFIG_VISWS
+
+endchoice
+
+
+choice
prompt "Processor family"
default M686

@@ -337,6 +364,7 @@

config X86_UP_APIC
bool "Local APIC support on uniprocessors" if !SMP
+ depends on !VOYAGER
---help---
A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU
@@ -690,6 +718,7 @@

menu "Power management options (ACPI, APM)"
+ depends on !VOYAGER

config PM
bool "Power Management support"
@@ -990,9 +1019,6 @@

menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"

-# Visual Workstation support is utterly broken.
-# If you want to see it working mail an VW540 to hch@infradead.org 8)
-#bool 'SGI Visual Workstation support' CONFIG_VISWS
config X86_VISWS_APIC
bool
depends on VISWS
@@ -1000,11 +1026,12 @@

config X86_LOCAL_APIC
bool
- depends on !VISWS && SMP || VISWS
+ depends on ((!VISWS && SMP) || VISWS) && !VOYAGER
default y

config PCI
bool "PCI support" if !VISWS
+ depends on !VOYAGER
default y if VISWS
help
Find out whether you have a PCI motherboard. PCI is the name of a
@@ -1019,7 +1046,7 @@

config X86_IO_APIC
bool
- depends on !VISWS && SMP
+ depends on !VISWS && SMP && !VOYAGER
default y

choice
@@ -1063,6 +1090,7 @@

config SCx200
tristate "NatSemi SCx200 support"
+ depends on !VOYAGER
help
This provides basic support for the National Semiconductor SCx200
processor. Right now this is just a driver for the GPIO pins.
@@ -1076,6 +1104,7 @@

config ISA
bool "ISA support"
+ depends on !VOYAGER
help
Find out whether you have ISA slots on your motherboard. ISA is the
name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -1101,13 +1130,17 @@

config MCA
bool "MCA support"
- depends on !VISWS
+ depends on !VISWS && !VOYAGER
help
MicroChannel Architecture is found in some IBM PS/2 machines and
laptops. It is a bus system similar to PCI or ISA. See
<file:Documentation/mca.txt> (and especially the web page given
there) before attempting to build an MCA bus kernel.

+config MCA
+ depends on VOYAGER
+ default y if VOYAGER
+
source "drivers/mca/Kconfig"

config HOTPLUG
@@ -1574,12 +1607,12 @@

config X86_EXTRA_IRQS
bool
- depends on X86_LOCAL_APIC
+ depends on X86_LOCAL_APIC || VOYAGER
default y

config X86_FIND_SMP_CONFIG
bool
- depends on X86_LOCAL_APIC
+ depends on X86_LOCAL_APIC || VOYAGER
default y

config X86_MPPARSE
@@ -1597,15 +1630,16 @@

config X86_SMP
bool
- depends on SMP
+ depends on SMP && !VOYAGER
default y

config X86_HT
bool
- depends on SMP
+ depends on SMP && !VOYAGER
default y

config X86_BIOS_REBOOT
bool
+ depends on !VOYAGER
default y

diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile
--- a/arch/i386/Makefile Sat Dec 28 17:11:27 2002
+++ b/arch/i386/Makefile Sat Dec 28 17:11:27 2002
@@ -51,6 +51,10 @@
#default subarch .c files
mcore-y := mach-default

+#Voyager subarch support
+mflags-$(CONFIG_VOYAGER) := -Iinclude/asm-i386/mach-voyager
+mcore-$(CONFIG_VOYAGER) := mach-voyager
+
#VISWS subarch support
mflags-$(CONFIG_VISWS) := -Iinclude/asm-i386/mach-visws
mcore-$(CONFIG_VISWS) := mach-visws
diff -Nru a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S
--- a/arch/i386/boot/setup.S Sat Dec 28 17:11:27 2002
+++ b/arch/i386/boot/setup.S Sat Dec 28 17:11:27 2002
@@ -476,6 +476,24 @@
movsb
popw %ds
no_mca:
+#ifdef CONFIG_VOYAGER
+ movb $0xff, 0x40 # flag on config found
+ movb $0xc0, %al
+ mov $0xff, %ah
+ int $0x15 # put voyager config info at es:di
+ jc no_voyager
+ movw $0x40, %si # place voyager info in apm table
+ cld
+ movw $7, %cx
+voyager_rep:
+ movb %es:(%di), %al
+ movb %al,(%si)
+ incw %di
+ incw %si
+ decw %cx
+ jnz voyager_rep
+no_voyager:
+#endif
# Check for PS/2 pointing device
movw %cs, %ax # aka SETUPSEG
subw $DELTA_INITSEG, %ax # aka INITSEG
@@ -740,6 +758,7 @@
A20_ENABLE_LOOPS = 255 # Total loops to try

+#ifndef CONFIG_VOYAGER
a20_try_loop:

# First, see if we are on a system with no A20 gate.
@@ -758,11 +777,14 @@
jnz a20_done

# Try enabling A20 through the keyboard controller
+#endif /* CONFIG_VOYAGER */
a20_kbc:
call empty_8042

+#ifndef CONFIG_VOYAGER
call a20_test # Just in case the BIOS worked
jnz a20_done # but had a delayed reaction.
+#endif

movb $0xD1, %al # command write
outb %al, $0x64
@@ -772,6 +794,7 @@
outb %al, $0x60
call empty_8042

+#ifndef CONFIG_VOYAGER
# Wait until a20 really *is* enabled; it can take a fair amount of
# time on certain systems; Toshiba Tecras are known to have this
# problem.
@@ -819,6 +842,7 @@
# If we get here, all is good
a20_done:

+#endif /* CONFIG_VOYAGER */
# set up gdt and idt
lidt idt_48 # load idt with 0,0
xorl %eax, %eax # Compute gdt_base
@@ -985,6 +1009,7 @@
.string "INT15 refuses to access high mem, giving up."

+#ifndef CONFIG_VOYAGER
# This routine tests whether or not A20 is enabled. If so, it
# exits with zf = 0.
#
@@ -1014,6 +1039,8 @@
popw %ax
popw %cx
ret
+
+#endif /* CONFIG_VOYAGER */

# This routine checks that the keyboard command queue is empty
# (after emptying the output buffers)
diff -Nru a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyag
er_smp.c
--- a/arch/i386/mach-voyager/voyager_smp.c Sat Dec 28 17:11:27 2002
+++ b/arch/i386/mach-voyager/voyager_smp.c Sat Dec 28 17:11:27 2002
@@ -50,11 +50,6 @@
* indexed physically */
struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned;

-/* Per CPU interrupt stacks */
-extern union thread_union init_irq_union;
-union thread_union *irq_stacks[NR_CPUS] __cacheline_aligned =
- { &init_irq_union, };
-
/* physical ID of the CPU used to boot the system */
unsigned char boot_cpu_id;

@@ -450,6 +445,7 @@
struct cpuinfo_x86 *c=&cpu_data[id];

*c = boot_cpu_data;
+
identify_cpu(c);
}

@@ -512,6 +508,11 @@
/* if we're a quad, we may need to bootstrap other CPUs */
do_quad_bootstrap();

+ /* FIXME: this is rather a poor hack to prevent the CPU
+ * activating softirqs while it's supposed to be waiting for
+ * permission to proceed. Without this, the new per CPU stuff
+ * in the softirqs will fail */
+ local_irq_disable();
set_bit(cpuid, &cpu_callin_map);

/* signal that we're done */
@@ -519,6 +520,7 @@

while (!test_bit(cpuid, &smp_commenced_mask))
rep_nop();
+ local_irq_enable();

local_flush_tlb();

@@ -533,29 +535,7 @@
struct pt_regs regs;
/* don't care about the eip and regs settings since we'll
* never reschedule the forked task. */
- return do_fork(CLONE_VM|CLONE_IDLETASK, 0, &regs, 0, NULL);
-}
-
-
-static void __init setup_irq_stack(struct task_struct *p, int cpu)
-{
- unsigned long stk;
-
- stk = __get_free_pages(GFP_KERNEL, THREAD_ORDER+1);
- if (!stk)
- panic("I can't seem to allocate my irq stack. Oh well, giving up.");
-
- irq_stacks[cpu] = (void *)stk;
- memset(irq_stacks[cpu], 0, THREAD_SIZE);
- irq_stacks[cpu]->thread_info.cpu = cpu;
- irq_stacks[cpu]->thread_info.preempt_count = 1;
- /* interrupts are not preemptable */
- p->thread_info->irq_stack = irq_stacks[cpu];
-
- /* If we want to make the irq stack more than one unit
- * deep, we can chain then off of the irq_stack pointer
- * here.
- */
+ return do_fork(CLONE_VM|CLONE_IDLETASK, 0, &regs, 0, NULL, NULL);
}

@@ -617,20 +597,17 @@
if(IS_ERR(idle))
panic("failed fork for CPU%d", cpu);

- setup_irq_stack(idle, cpu);
-
init_idle(idle, cpu);

idle->thread.eip = (unsigned long) start_secondary;
unhash_process(idle);
-
- /* The -4 is to correct for the fact that the stack pointer
- * is used to find the location of the thread_info structure
- * by masking off several of the LSBs. Without the -4, esp
- * is pointing to the page after the one the stack is on.
- */
- stack_start.esp = (void *)(THREAD_SIZE - 4 + (char *)idle->thread_info);
-
+ /* init_tasks (in sched.c) is indexed logically */
+#if 0
+ // for AC kernels
+ stack_start.esp = (THREAD_SIZE + (__u8 *)TSK_TO_KSTACK(idle));
+#else
+ stack_start.esp = (void *) (1024 + PAGE_SIZE + (char *)idle->thread_info);
+#endif
/* Note: Don't modify initial ss override */
VDEBUG(("VOYAGER SMP: Booting CPU%d at 0x%lx[%x:%x], stack %p\n", cpu,
(unsigned long)hijack_source.val, hijack_source.idt.Segment,
@@ -764,6 +741,9 @@

/* enable our own CPIs */
vic_enable_cpi();
+
+ set_bit(boot_cpu_id, &cpu_online_map);
+ set_bit(boot_cpu_id, &cpu_callout_map);

/* loop over all the extended VIC CPUs and boot them. The
* Quad CPUs must be bootstrapped by their extended VIC cpu */
@@ -1312,12 +1292,9 @@
static inline void
wrapper_smp_local_timer_interrupt(struct pt_regs *regs)
{
- __u8 cpu = smp_processor_id();
-
irq_enter();
smp_local_timer_interrupt(regs);
irq_exit();
-
}

/* local (per CPU) timer interrupt. It does both profiling and
diff -Nru a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h
--- a/include/asm-i386/hw_irq.h Sat Dec 28 17:11:27 2002
+++ b/include/asm-i386/hw_irq.h Sat Dec 28 17:11:27 2002
@@ -131,7 +131,7 @@

#endif /* CONFIG_PROFILING */

-#ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */
+#if defined(CONFIG_SMP) && !defined(CONFIG_VOYAGER) /*more of this file
should probably be ifdefed SMP */
static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
{
if (IO_APIC_IRQ(i))
send_IPI_self(IO_APIC_VECTOR(i));
diff -Nru a/include/asm-i386/smp.h b/include/asm-i386/smp.h
--- a/include/asm-i386/smp.h Sat Dec 28 17:11:27 2002
+++ b/include/asm-i386/smp.h Sat Dec 28 17:11:27 2002
@@ -6,6 +6,7 @@
*/
#ifndef __ASSEMBLY__
#include <linux/config.h>
+#include <linux/kernel.h>
#include <linux/threads.h>
#endif

@@ -83,11 +84,22 @@
#define cpu_possible(cpu) (cpu_callout_map & (1<<(cpu)))
#define cpu_online(cpu) (cpu_online_map & (1<<(cpu)))

+#define for_each_cpu(cpu, mask) \
+ for(mask = cpu_online_map; \
+ cpu = __ffs(mask), mask != 0; \
+ mask &= ~(1<<cpu))
+
extern inline unsigned int num_online_cpus(void)
{
return hweight32(cpu_online_map);
}

+/* We don't mark CPUs online until __cpu_up(), so we need another measure */
+static inline int num_booting_cpus(void)
+{
+ return hweight32(cpu_callout_map);
+}
+
extern inline int any_online_cpu(unsigned int mask)
{
if (mask & cpu_online_map)
@@ -95,7 +107,7 @@

return -1;
}
-
+#ifdef CONFIG_X86_LOCAL_APIC
static __inline int hard_smp_processor_id(void)
{
/* we don't want to mark this access volatile - bad code generation */
@@ -108,12 +120,7 @@
return GET_APIC_LOGICAL_ID(*(unsigned long *)(APIC_BASE+APIC_LDR));
}

-/* We don't mark CPUs online until __cpu_up(), so we need another measure */
-static inline int num_booting_cpus(void)
-{
- return hweight32(cpu_callout_map);
-}
-
+#endif
#endif /* !__ASSEMBLY__ */

#define NO_PROC_ID 0xFF /* No processor magic marker */

--==_Exmh_9143007530
Content-Type: text/plain ; name="sysrq.diff"; charset=us-ascii
Content-Description: sysrq.diff
Content-Disposition: attachment; filename="sysrq.diff"

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet v2.5.53 -> 1.952
# arch/i386/mach-voyager/voyager_basic.c 1.1 -> 1.2
# Documentation/sysrq.txt 1.5 -> 1.6
# drivers/char/sysrq.c 1.24 -> 1.25
# include/asm-i386/voyager.h 1.1 -> 1.2
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/12/23 torvalds@home.transmeta.com 1.951
# Linux v2.5.53
# --------------------------------------------
# 02/12/27 jejb@raven.il.steeleye.com 1.952
# Move voyager sysrq to V key and remove from char/sysrq.c
#
# Patch suggested by Randy Dunlap
# --------------------------------------------
#
diff -Nru a/Documentation/sysrq.txt b/Documentation/sysrq.txt
--- a/Documentation/sysrq.txt Sat Dec 28 17:10:59 2002
+++ b/Documentation/sysrq.txt Sat Dec 28 17:10:59 2002
@@ -59,6 +59,8 @@

'm' - Will dump current memory info to your console.

+'v' - Dumps Voyager SMP processor info to your console.
+
'0'-'9' - Sets the console log level, controlling which kernel messages
will be printed to your console. ('0', for example would make
it so that only emergency messages like PANICs or OOPSes would
diff -Nru a/arch/i386/mach-voyager/voyager_basic.c
b/arch/i386/mach-voyager/voyager_basic.c
--- a/arch/i386/mach-voyager/voyager_basic.c Sat Dec 28 17:10:59 2002
+++ b/arch/i386/mach-voyager/voyager_basic.c Sat Dec 28 17:10:59 2002
@@ -21,6 +21,7 @@
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/reboot.h>
+#include <linux/sysrq.h>
#include <asm/io.h>
#include <asm/pgalloc.h>
#include <asm/voyager.h>
@@ -41,6 +42,21 @@

struct voyager_SUS *voyager_SUS = NULL;

+#ifdef CONFIG_SMP
+static void
+voyager_dump(int dummy1, struct pt_regs *dummy2, struct tty_struct *dummy3)
+{
+ /* get here via a sysrq */
+ voyager_smp_dump();
+}
+
+static struct sysrq_key_op sysrq_voyager_dump_op = {
+ .handler = voyager_dump,
+ .help_msg = "Voyager",
+ .action_msg = "Dump Voyager Status\n",
+};
+#endif
+
void
voyager_detect(struct voyager_bios_info *bios)
{
@@ -62,6 +78,9 @@
printk("\n**WARNING**: Voyager HAL only supports Levels 4 and 5
Architectures at the moment\n\n");
/* install the power off handler */
pm_power_off = voyager_power_off;
+#ifdef CONFIG_SMP
+ register_sysrq_key('v', &sysrq_voyager_dump_op);
+#endif
} else {
printk("\n\n**WARNING**: No Voyager Subsystem Found\n");
}
@@ -141,15 +160,6 @@
pg0[0] = old;
local_flush_tlb();
return retval;
-}
-
-void
-voyager_dump()
-{
- /* get here via a sysrq */
-#ifdef CONFIG_SMP
- voyager_smp_dump();
-#endif
}

/* voyager specific handling code for timer interrupts. Used to hand
diff -Nru a/drivers/char/sysrq.c b/drivers/char/sysrq.c
--- a/drivers/char/sysrq.c Sat Dec 28 17:10:59 2002
+++ b/drivers/char/sysrq.c Sat Dec 28 17:10:59 2002
@@ -36,10 +36,6 @@

#include <asm/ptrace.h>

-#ifdef CONFIG_VOYAGER
-#include <asm/voyager.h>
-#endif
-
extern void reset_vc(unsigned int);
extern struct list_head super_blocks;

@@ -324,14 +320,6 @@
.action_msg = "Terminate All Tasks",
};

-#ifdef CONFIG_VOYAGER
-static struct sysrq_key_op sysrq_voyager_dump_op = {
- .handler = voyager_dump,
- .help_msg = "voyager",
- .action_msg = "Dump Voyager Status\n",
-};
-#endif
-
static void sysrq_handle_kill(int key, struct pt_regs *pt_regs,
struct tty_struct *tty)
{
@@ -365,11 +353,7 @@
it is handled specially on the sparc
and will never arrive */
/* b */ &sysrq_reboot_op,
-#ifdef CONFIG_VOYAGER
-/* c */ &sysrq_voyager_dump_op,
-#else
-/* c */ NULL,
-#endif
+/* c */ NULL,
/* d */ NULL,
/* e */ &sysrq_term_op,
/* f */ NULL,
@@ -397,7 +381,7 @@
/* s */ &sysrq_sync_op,
/* t */ &sysrq_showstate_op,
/* u */ &sysrq_mountro_op,
-/* v */ NULL,
+/* v */ NULL, /* May be assigned at init time by SMP VOYAGER */
/* w */ NULL,
/* x */ NULL,
/* y */ NULL,
diff -Nru a/include/asm-i386/voyager.h b/include/asm-i386/voyager.h
--- a/include/asm-i386/voyager.h Sat Dec 28 17:11:00 2002
+++ b/include/asm-i386/voyager.h Sat Dec 28 17:11:00 2002
@@ -504,7 +504,6 @@
extern int voyager_memory_detect(int region, __u32 *addr, __u32 *length);
extern void voyager_smp_intr_init(void);
extern __u8 voyager_extended_cmos_read(__u16 cmos_address);
-extern void voyager_dump(void);
extern void voyager_smp_dump(void);
extern void voyager_timer_interrupt(struct pt_regs *regs);
extern void smp_local_timer_interrupt(struct pt_regs * regs);

--==_Exmh_9143007530
Content-Type: text/plain ; name="trampoline.diff"; charset=us-ascii
Content-Description: trampoline.diff
Content-Disposition: attachment; filename="trampoline.diff"

--==_Exmh_9143007530
Content-Type: text/plain ; name="subarch.diff"; charset=us-ascii
Content-Description: subarch.diff
Content-Disposition: attachment; filename="subarch.diff"

--==_Exmh_9143007530
Content-Type: text/plain ; name="tsc.diff"; charset=us-ascii
Content-Description: tsc.diff
Content-Disposition: attachment; filename="tsc.diff"

--==_Exmh_9143007530
Content-Type: text/plain ; name="boot_cs.diff"; charset=us-ascii
Content-Description: boot_cs.diff
Content-Disposition: attachment; filename="boot_cs.diff"

--==_Exmh_9143007530--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Jeff Dike: "Re: [PATCH] Allow UML kernel to run in a separate host address space"
Previous message: Stephen Satchell: "RE: Want a random entropy source?"