2008-02-19 18:18:52 -05:00
|
|
|
/*
|
2005-04-16 18:20:36 -04:00
|
|
|
* APIC driver for "bigsmp" XAPIC machines with more than 8 virtual CPUs.
|
|
|
|
* Drives the local APIC in "clustered mode".
|
|
|
|
*/
|
|
|
|
#define APIC_DEFINITION 1
|
|
|
|
#include <linux/threads.h>
|
|
|
|
#include <linux/cpumask.h>
|
|
|
|
#include <asm/mpspec.h>
|
|
|
|
#include <asm/genapic.h>
|
|
|
|
#include <asm/fixmap.h>
|
|
|
|
#include <asm/apicdef.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/dmi.h>
|
2008-07-25 05:17:21 -04:00
|
|
|
#include <asm/bigsmp/apicdef.h>
|
2008-07-11 21:43:10 -04:00
|
|
|
#include <linux/smp.h>
|
2008-07-25 05:17:21 -04:00
|
|
|
#include <asm/bigsmp/apic.h>
|
|
|
|
#include <asm/bigsmp/ipi.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#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 06:12:49 -05:00
|
|
|
#include <asm/mach-default/mach_wakecpu.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
static int dmi_bigsmp; /* can be set by dmi scanners */
|
|
|
|
|
2007-10-03 15:15:40 -04:00
|
|
|
static int hp_ht_bigsmp(const struct dmi_system_id *d)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
|
|
|
|
dmi_bigsmp = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-03 15:15:40 -04:00
|
|
|
static const struct dmi_system_id bigsmp_dmi_table[] = {
|
2008-02-19 18:18:52 -05:00
|
|
|
{ hp_ht_bigsmp, "HP ProLiant DL760 G2",
|
|
|
|
{ DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
|
|
|
|
DMI_MATCH(DMI_BIOS_VERSION, "P44-"),}
|
|
|
|
},
|
|
|
|
|
|
|
|
{ hp_ht_bigsmp, "HP ProLiant DL740",
|
|
|
|
{ DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
|
|
|
|
DMI_MATCH(DMI_BIOS_VERSION, "P47-"),}
|
|
|
|
},
|
2005-04-16 18:20:36 -04:00
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
2008-12-16 20:33:52 -05:00
|
|
|
static void vector_allocation_domain(int cpu, cpumask_t *retmask)
|
2008-08-19 23:50:28 -04:00
|
|
|
{
|
2008-12-16 20:33:52 -05:00
|
|
|
cpus_clear(*retmask);
|
|
|
|
cpu_set(cpu, *retmask);
|
2008-08-19 23:50:28 -04:00
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-05-23 16:58:23 -04:00
|
|
|
static int probe_bigsmp(void)
|
2008-02-19 18:18:52 -05:00
|
|
|
{
|
2005-09-03 18:56:31 -04:00
|
|
|
if (def_to_bigsmp)
|
2008-06-08 21:29:22 -04:00
|
|
|
dmi_bigsmp = 1;
|
2005-09-03 18:56:31 -04:00
|
|
|
else
|
|
|
|
dmi_check_system(bigsmp_dmi_table);
|
2008-02-19 18:18:52 -05:00
|
|
|
return dmi_bigsmp;
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2009-01-27 21:32:03 -05:00
|
|
|
struct genapic apic_bigsmp = {
|
|
|
|
|
|
|
|
.name = "bigsmp",
|
|
|
|
.probe = probe_bigsmp,
|
2009-01-27 21:43:47 -05:00
|
|
|
.acpi_madt_oem_check = NULL,
|
2009-01-27 21:43:47 -05:00
|
|
|
.apic_id_registered = bigsmp_apic_id_registered,
|
2009-01-27 21:32:03 -05:00
|
|
|
|
2009-01-27 22:16:01 -05:00
|
|
|
.irq_delivery_mode = dest_Fixed,
|
|
|
|
/* phys delivery to target CPU: */
|
|
|
|
.irq_dest_mode = 0,
|
2009-01-27 21:32:03 -05:00
|
|
|
|
2009-01-27 22:30:40 -05:00
|
|
|
.target_cpus = bigsmp_target_cpus,
|
2009-01-27 23:08:44 -05:00
|
|
|
.disable_esr = 1,
|
2009-01-27 23:13:04 -05:00
|
|
|
.apic_destination_logical = 0,
|
2009-01-27 21:32:03 -05: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,
|
|
|
|
};
|