2008-02-20 00:02:58 +01:00
|
|
|
/*
|
2007-10-20 01:13:56 +02:00
|
|
|
* Default generic APIC driver. This handles up to 8 CPUs.
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
|
|
|
#define APIC_DEFINITION 1
|
|
|
|
#include <linux/threads.h>
|
|
|
|
#include <linux/cpumask.h>
|
|
|
|
#include <asm/mpspec.h>
|
|
|
|
#include <asm/mach-default/mach_apicdef.h>
|
|
|
|
#include <asm/genapic.h>
|
|
|
|
#include <asm/fixmap.h>
|
|
|
|
#include <asm/apicdef.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/mach-default/mach_apic.h>
|
|
|
|
#include <asm/mach-default/mach_ipi.h>
|
|
|
|
#include <asm/mach-default/mach_mpparse.h>
|
x86: fix wakeup_cpu with numaq/es7000, v2
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>
2008-11-16 12:12:49 +01:00
|
|
|
#include <asm/mach-default/mach_wakecpu.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* should be called last. */
|
2007-01-11 01:52:44 +01:00
|
|
|
static int probe_default(void)
|
2008-02-20 00:02:58 +01:00
|
|
|
{
|
2005-04-17 00:20:36 +02:00
|
|
|
return 1;
|
2008-02-20 00:02:58 +01:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-28 03:32:03 +01:00
|
|
|
struct genapic apic_default = {
|
|
|
|
|
|
|
|
.name = "default",
|
|
|
|
.probe = probe_default,
|
2009-01-28 03:43:47 +01:00
|
|
|
.acpi_madt_oem_check = NULL,
|
2009-01-28 03:43:47 +01:00
|
|
|
.apic_id_registered = default_apic_id_registered,
|
2009-01-28 03:32:03 +01:00
|
|
|
|
2009-01-28 04:16:01 +01:00
|
|
|
.irq_delivery_mode = dest_LowestPrio,
|
|
|
|
/* logical delivery broadcast to all CPUs: */
|
|
|
|
.irq_dest_mode = 1,
|
2009-01-28 03:32:03 +01:00
|
|
|
|
2009-01-28 04:30:40 +01:00
|
|
|
.target_cpus = default_target_cpus,
|
2009-01-28 05:08:44 +01:00
|
|
|
.disable_esr = 0,
|
2009-01-28 05:29:25 +01:00
|
|
|
.dest_logical = APIC_DEST_LOGICAL,
|
2009-01-28 03:32:03 +01:00
|
|
|
.check_apicid_used = check_apicid_used,
|
|
|
|
.check_apicid_present = check_apicid_present,
|
|
|
|
|
|
|
|
.no_balance_irq = NO_BALANCE_IRQ,
|
|
|
|
.no_ioapic_check = 0,
|
|
|
|
|
|
|
|
.vector_allocation_domain = vector_allocation_domain,
|
|
|
|
.init_apic_ldr = init_apic_ldr,
|
|
|
|
|
|
|
|
.ioapic_phys_id_map = ioapic_phys_id_map,
|
|
|
|
.setup_apic_routing = setup_apic_routing,
|
|
|
|
.multi_timer_check = multi_timer_check,
|
|
|
|
.apicid_to_node = apicid_to_node,
|
|
|
|
.cpu_to_logical_apicid = cpu_to_logical_apicid,
|
|
|
|
.cpu_present_to_apicid = cpu_present_to_apicid,
|
|
|
|
.apicid_to_cpu_present = apicid_to_cpu_present,
|
|
|
|
.setup_portio_remap = setup_portio_remap,
|
|
|
|
.check_phys_apicid_present = check_phys_apicid_present,
|
|
|
|
.enable_apic_mode = enable_apic_mode,
|
|
|
|
.phys_pkg_id = phys_pkg_id,
|
|
|
|
.mps_oem_check = mps_oem_check,
|
|
|
|
|
|
|
|
.get_apic_id = get_apic_id,
|
|
|
|
.set_apic_id = NULL,
|
|
|
|
.apic_id_mask = APIC_ID_MASK,
|
|
|
|
|
|
|
|
.cpu_mask_to_apicid = cpu_mask_to_apicid,
|
|
|
|
.cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,
|
|
|
|
|
|
|
|
.send_IPI_mask = send_IPI_mask,
|
|
|
|
.send_IPI_mask_allbutself = NULL,
|
|
|
|
.send_IPI_allbutself = send_IPI_allbutself,
|
|
|
|
.send_IPI_all = send_IPI_all,
|
|
|
|
.send_IPI_self = NULL,
|
|
|
|
|
|
|
|
.wakeup_cpu = NULL,
|
|
|
|
.trampoline_phys_low = TRAMPOLINE_PHYS_LOW,
|
|
|
|
.trampoline_phys_high = TRAMPOLINE_PHYS_HIGH,
|
|
|
|
.wait_for_init_deassert = wait_for_init_deassert,
|
|
|
|
.smp_callin_clear_local_apic = smp_callin_clear_local_apic,
|
|
|
|
.store_NMI_vector = store_NMI_vector,
|
|
|
|
.restore_NMI_vector = restore_NMI_vector,
|
|
|
|
.inquire_remote_apic = inquire_remote_apic,
|
|
|
|
};
|