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>
46 lines
1.2 KiB
C
46 lines
1.2 KiB
C
#ifndef __ASM_NUMAQ_WAKECPU_H
|
|
#define __ASM_NUMAQ_WAKECPU_H
|
|
|
|
/* This file copes with machines that wakeup secondary CPUs by NMIs */
|
|
|
|
#define TRAMPOLINE_PHYS_LOW (0x8)
|
|
#define TRAMPOLINE_PHYS_HIGH (0xa)
|
|
|
|
/* We don't do anything here because we use NMI's to boot instead */
|
|
static inline void wait_for_init_deassert(atomic_t *deassert)
|
|
{
|
|
}
|
|
|
|
/*
|
|
* Because we use NMIs rather than the INIT-STARTUP sequence to
|
|
* bootstrap the CPUs, the APIC may be in a weird state. Kick it.
|
|
*/
|
|
static inline void smp_callin_clear_local_apic(void)
|
|
{
|
|
clear_local_APIC();
|
|
}
|
|
|
|
static inline void store_NMI_vector(unsigned short *high, unsigned short *low)
|
|
{
|
|
printk("Storing NMI vector\n");
|
|
*high =
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH));
|
|
*low =
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW));
|
|
}
|
|
|
|
static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
|
|
{
|
|
printk("Restoring NMI vector\n");
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) =
|
|
*high;
|
|
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) =
|
|
*low;
|
|
}
|
|
|
|
static inline void inquire_remote_apic(int apicid)
|
|
{
|
|
}
|
|
|
|
#endif /* __ASM_NUMAQ_WAKECPU_H */
|