569712b2b0
Impact: fix secondary-CPU wakeup/init path with numaq and es7000
While looking at wakeup_secondary_cpu for WAKE_SECONDARY_VIA_NMI:
|#ifdef WAKE_SECONDARY_VIA_NMI
|/*
| * Poke the other CPU in the eye via NMI to wake it up. Remember that the normal
| * INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
| * won't ... remember to clear down the APIC, etc later.
| */
|static int __devinit
|wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip)
|{
| unsigned long send_status, accept_status = 0;
| int maxlvt;
|...
| if (APIC_INTEGRATED(apic_version[phys_apicid])) {
| maxlvt = lapic_get_maxlvt();
I noticed that there is no warning about undefined phys_apicid...
because WAKE_SECONDARY_VIA_NMI and WAKE_SECONDARY_VIA_INIT can not be
defined at the same time. So NUMAQ is using wrong wakeup_secondary_cpu.
WAKE_SECONDARY_VIA_NMI, WAKE_SECONDARY_VIA_INIT and
WAKE_SECONDARY_VIA_MIP are variants of a weird and fragile
preprocessor-driven "HAL" mechanisms to specify the kind of secondary-CPU
wakeup strategy a given x86 kernel will use.
The vast majority of systems want to use INIT for secondary wakeup - NUMAQ
uses an NMI, (old-style-) ES7000 uses 'MIP' (a firmware driven in-memory
flag to let secondaries continue).
So convert these mechanisms to x86_quirks and add a
->wakeup_secondary_cpu() method to specify the rare exception
to the sane default.
Extend genapic accordingly as well, for 32-bit.
While looking further, I noticed that functions in wakecup.h for numaq
and es7000 are different to the default in mach_wakecpu.h - but smpboot.c
will only use default mach_wakecpu.h with smphook.h.
So we need to add mach_wakecpu.h for mach_generic, to properly support
numaq and es7000, and vectorize the following SMP init methods:
int trampoline_phys_low;
int trampoline_phys_high;
void (*wait_for_init_deassert)(atomic_t *deassert);
void (*smp_callin_clear_local_apic)(void);
void (*store_NMI_vector)(unsigned short *high, unsigned short *low);
void (*restore_NMI_vector)(unsigned short *high, unsigned short *low);
void (*inquire_remote_apic)(int apicid);
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
62 lines
1.3 KiB
C
62 lines
1.3 KiB
C
/* two abstractions specific to kernel/smpboot.c, mainly to cater to visws
|
|
* which needs to alter them. */
|
|
|
|
static inline void smpboot_clear_io_apic_irqs(void)
|
|
{
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
io_apic_irqs = 0;
|
|
#endif
|
|
}
|
|
|
|
static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
|
|
{
|
|
CMOS_WRITE(0xa, 0xf);
|
|
local_flush_tlb();
|
|
pr_debug("1.\n");
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) =
|
|
start_eip >> 4;
|
|
pr_debug("2.\n");
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) =
|
|
start_eip & 0xf;
|
|
pr_debug("3.\n");
|
|
}
|
|
|
|
static inline void smpboot_restore_warm_reset_vector(void)
|
|
{
|
|
/*
|
|
* Install writable page 0 entry to set BIOS data area.
|
|
*/
|
|
local_flush_tlb();
|
|
|
|
/*
|
|
* Paranoid: Set warm reset code and vector here back
|
|
* to default values.
|
|
*/
|
|
CMOS_WRITE(0, 0xf);
|
|
|
|
*((volatile long *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0;
|
|
}
|
|
|
|
static inline void __init smpboot_setup_io_apic(void)
|
|
{
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
/*
|
|
* Here we can be sure that there is an IO-APIC in the system. Let's
|
|
* go and set it up:
|
|
*/
|
|
if (!skip_ioapic_setup && nr_ioapics)
|
|
setup_IO_APIC();
|
|
else {
|
|
nr_ioapics = 0;
|
|
localise_nmi_watchdog();
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static inline void smpboot_clear_io_apic(void)
|
|
{
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
nr_ioapics = 0;
|
|
#endif
|
|
}
|