diff -uNr linux-2.5.48.x86kexec/arch/i386/kernel/apic.c linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/apic.c --- linux-2.5.48.x86kexec/arch/i386/kernel/apic.c Fri Oct 18 11:59:14 2002 +++ linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/apic.c Mon Nov 18 00:05:27 2002 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -154,6 +155,36 @@ outb(0x70, 0x22); outb(0x00, 0x23); } + else { + /* Go back to Virtual Wire compatibility mode */ + unsigned long value; + + /* For the spurious interrupt use vector F, and enable it */ + value = apic_read(APIC_SPIV); + value &= ~APIC_VECTOR_MASK; + value |= APIC_SPIV_APIC_ENABLED; + value |= 0xf; + apic_write_around(APIC_SPIV, value); + + /* For LVT0 make it edge triggered, active high, external and enabled */ + value = apic_read(APIC_LVT0); + value &= ~(APIC_MODE_MASK | APIC_SEND_PENDING | + APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR | + APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED ); + value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING; + value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_EXINT); + apic_write_around(APIC_LVT0, value); + + /* For LVT1 make it edge triggered, active high, nmi and enabled */ + value = apic_read(APIC_LVT1); + value &= ~( + APIC_MODE_MASK | APIC_SEND_PENDING | + APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR | + APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED); + value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING; + value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_NMI); + apic_write_around(APIC_LVT1, value); + } } void disable_local_APIC(void) @@ -1128,6 +1159,26 @@ printk (KERN_INFO "APIC error on CPU%d: %02lx(%02lx)\n", smp_processor_id(), v , v1); irq_exit(); +} + +void stop_apics(void) +{ + /* By resetting the APIC's we disable the nmi watchdog */ +#if CONFIG_SMP + /* + * Stop all CPUs and turn off local APICs and the IO-APIC, so + * other OSs see a clean IRQ state. + */ + smp_send_stop(); +#else + disable_local_APIC(); +#endif +#if defined(CONFIG_X86_IO_APIC) + if (smp_found_config) { + disable_IO_APIC(); + } +#endif + disconnect_bsp_APIC(); } /* diff -uNr linux-2.5.48.x86kexec/arch/i386/kernel/dmi_scan.c linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/dmi_scan.c --- linux-2.5.48.x86kexec/arch/i386/kernel/dmi_scan.c Wed Oct 30 19:58:04 2002 +++ linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/dmi_scan.c Mon Nov 18 00:05:27 2002 @@ -219,31 +219,6 @@ return 0; } -/* - * Some machines require the "reboot=s" commandline option, this quirk makes that automatic. - */ -static __init int set_smp_reboot(struct dmi_blacklist *d) -{ -#ifdef CONFIG_SMP - extern int reboot_smp; - if (reboot_smp == 0) - { - reboot_smp = 1; - printk(KERN_INFO "%s series board detected. Selecting SMP-method for reboots.\n", d->ident); - } -#endif - return 0; -} - -/* - * Some machines require the "reboot=b,s" commandline option, this quirk makes that automatic. - */ -static __init int set_smp_bios_reboot(struct dmi_blacklist *d) -{ - set_smp_reboot(d); - set_bios_reboot(d); - return 0; -} /* * Some bioses have a broken protected mode poweroff and need to use realmode @@ -534,7 +509,7 @@ MATCH(DMI_BIOS_VERSION, "4.60 PGMA"), MATCH(DMI_BIOS_DATE, "134526184"), NO_MATCH } }, - { set_smp_bios_reboot, "Dell PowerEdge 1300", { /* Handle problems with rebooting on Dell 1300's */ + { set_bios_reboot, "Dell PowerEdge 1300", { /* Handle problems with rebooting on Dell 1300's */ MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"), NO_MATCH, NO_MATCH diff -uNr linux-2.5.48.x86kexec/arch/i386/kernel/i8259.c linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/i8259.c --- linux-2.5.48.x86kexec/arch/i386/kernel/i8259.c Fri Oct 11 22:22:19 2002 +++ linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/i8259.c Mon Nov 18 00:05:27 2002 @@ -246,10 +246,21 @@ return 0; } +static void i8259A_shutdown(struct device *dev) +{ + /* Put the i8259A into a quiescent state that + * the kernel initialization code can get it + * out of. + */ + outb(0xff, 0x21); /* mask all of 8259A-1 */ + outb(0xff, 0xA1); /* mask all of 8259A-1 */ +} + static struct device_driver i8259A_driver = { .name = "pic", .bus = &system_bus_type, .resume = i8259A_resume, + .shutdown = i8259A_shutdown, }; static struct sys_device device_i8259A = { diff -uNr linux-2.5.48.x86kexec/arch/i386/kernel/io_apic.c linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/io_apic.c --- linux-2.5.48.x86kexec/arch/i386/kernel/io_apic.c Sat Oct 19 00:57:56 2002 +++ linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/io_apic.c Mon Nov 18 00:05:27 2002 @@ -1115,8 +1115,6 @@ * Clear the IO-APIC before rebooting: */ clear_IO_APIC(); - - disconnect_bsp_APIC(); } /* diff -uNr linux-2.5.48.x86kexec/arch/i386/kernel/machine_kexec.c linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/machine_kexec.c --- linux-2.5.48.x86kexec/arch/i386/kernel/machine_kexec.c Sun Nov 17 22:53:09 2002 +++ linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/machine_kexec.c Mon Nov 18 00:05:27 2002 @@ -104,6 +104,8 @@ void *reboot_code_buffer; relocate_new_kernel_t rnk; + stop_apics(); + /* Interrupts aren't acceptable while we reboot */ local_irq_disable(); reboot_code_buffer = image->reboot_code_buffer; diff -uNr linux-2.5.48.x86kexec/arch/i386/kernel/reboot.c linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/reboot.c --- linux-2.5.48.x86kexec/arch/i386/kernel/reboot.c Fri Oct 11 22:21:36 2002 +++ linux-2.5.48.x86kexec-hwfixes/arch/i386/kernel/reboot.c Mon Nov 18 00:05:27 2002 @@ -8,6 +8,7 @@ #include #include #include +#include /* * Power off function, if any @@ -19,8 +20,7 @@ int reboot_thru_bios; #ifdef CONFIG_SMP -int reboot_smp = 0; -static int reboot_cpu = -1; +int reboot_cpu = -1; /* specifies the internal linux cpu id, not the apicid */ /* shamelessly grabbed from lib/vsprintf.c for readability */ #define is_digit(c) ((c) >= '0' && (c) <= '9') #endif @@ -42,7 +42,6 @@ break; #ifdef CONFIG_SMP case 's': /* "smp" reboot by executing reset on BSP or other CPU*/ - reboot_smp = 1; if (is_digit(*(str+1))) { reboot_cpu = (int) (*(str+1) - '0'); if (is_digit(*(str+2))) @@ -223,42 +222,7 @@ void machine_restart(char * __unused) { -#if CONFIG_SMP - int cpuid; - - cpuid = GET_APIC_ID(apic_read(APIC_ID)); - - if (reboot_smp) { - - /* check to see if reboot_cpu is valid - if its not, default to the BSP */ - if ((reboot_cpu == -1) || - (reboot_cpu > (NR_CPUS -1)) || - !(phys_cpu_present_map & (1<= NR_CPUS) && + test_bit(reboot_cpu, &cpu_online_map)) { + reboot_cpu_id = reboot_cpu; + } + + /* Make certain the the cpu I'm rebooting on is online */ + if (!test_bit(reboot_cpu_id, &cpu_online_map)) { + reboot_cpu_id = smp_processor_id(); + } + + /* Make certain I only run on the appropriate processor */ + set_cpus_allowed(current, 1 << reboot_cpu_id); + + /* O.k. Now that I'm on the appropriate processor stop + * all of the others. + */ smp_call_function(stop_this_cpu, NULL, 1, 0); local_irq_disable(); diff -uNr linux-2.5.48.x86kexec/include/asm-i386/apic.h linux-2.5.48.x86kexec-hwfixes/include/asm-i386/apic.h --- linux-2.5.48.x86kexec/include/asm-i386/apic.h Sat Oct 19 00:58:02 2002 +++ linux-2.5.48.x86kexec-hwfixes/include/asm-i386/apic.h Mon Nov 18 00:05:27 2002 @@ -96,6 +96,9 @@ #define NMI_LOCAL_APIC 2 #define NMI_INVALID 3 +extern void stop_apics(void); +#else +static inline void stop_apics(void) { } #endif /* CONFIG_X86_LOCAL_APIC */ #endif /* __ASM_APIC_H */ diff -uNr linux-2.5.48.x86kexec/include/asm-i386/apicdef.h linux-2.5.48.x86kexec-hwfixes/include/asm-i386/apicdef.h --- linux-2.5.48.x86kexec/include/asm-i386/apicdef.h Fri Oct 18 11:59:27 2002 +++ linux-2.5.48.x86kexec-hwfixes/include/asm-i386/apicdef.h Mon Nov 18 00:05:27 2002 @@ -88,6 +88,7 @@ #define APIC_LVT_REMOTE_IRR (1<<14) #define APIC_INPUT_POLARITY (1<<13) #define APIC_SEND_PENDING (1<<12) +#define APIC_MODE_MASK 0x700 #define GET_APIC_DELIVERY_MODE(x) (((x)>>8)&0x7) #define SET_APIC_DELIVERY_MODE(x,y) (((x)&~0x700)|((y)<<8)) #define APIC_MODE_FIXED 0x0