b7157acf42
As suggested by Suresh Siddha and Yinghai Lu: For x2apic pre-enabled systems, apic driver is set already early through early_acpi_boot_init()/early_acpi_process_madt()/ acpi_parse_madt()/default_acpi_madt_oem_check() path so that apic_id_valid() checking will be sufficient during MADT and SRAT parsing. For non-x2apic pre-enabled systems, all apic ids should be less than 255. This allows us to substitute the checks in arch/x86/kernel/acpi/boot.c::acpi_parse_x2apic() and arch/x86/mm/srat.c::acpi_numa_x2apic_affinity_init() with apic->apic_id_valid(). In addition we can avoid feigning the x2apic cpu feature in the NumaChip apic code. The following apic drivers have separate apic_id_valid() functions which will accept x2apic type IDs : x2apic_phys x2apic_cluster x2apic_uv_x apic_numachip Signed-off-by: Steffen Persvold <sp@numascale.com> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: Daniel J Blueman <daniel@numascale-asia.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Jack Steiner <steiner@sgi.com> Link: http://lkml.kernel.org/r/1331925935-13372-1-git-send-email-sp@numascale.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
68 lines
1.2 KiB
C
68 lines
1.2 KiB
C
/*
|
|
* Common bits for X2APIC cluster/physical modes.
|
|
*/
|
|
|
|
#ifndef _ASM_X86_X2APIC_H
|
|
#define _ASM_X86_X2APIC_H
|
|
|
|
#include <asm/apic.h>
|
|
#include <asm/ipi.h>
|
|
#include <linux/cpumask.h>
|
|
|
|
/*
|
|
* Need to use more than cpu 0, because we need more vectors
|
|
* when MSI-X are used.
|
|
*/
|
|
static const struct cpumask *x2apic_target_cpus(void)
|
|
{
|
|
return cpu_online_mask;
|
|
}
|
|
|
|
static int x2apic_apic_id_valid(int apicid)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static int x2apic_apic_id_registered(void)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* For now each logical cpu is in its own vector allocation domain.
|
|
*/
|
|
static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask)
|
|
{
|
|
cpumask_clear(retmask);
|
|
cpumask_set_cpu(cpu, retmask);
|
|
}
|
|
|
|
static void
|
|
__x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest)
|
|
{
|
|
unsigned long cfg = __prepare_ICR(0, vector, dest);
|
|
native_x2apic_icr_write(cfg, apicid);
|
|
}
|
|
|
|
static unsigned int x2apic_get_apic_id(unsigned long id)
|
|
{
|
|
return id;
|
|
}
|
|
|
|
static unsigned long x2apic_set_apic_id(unsigned int id)
|
|
{
|
|
return id;
|
|
}
|
|
|
|
static int x2apic_phys_pkg_id(int initial_apicid, int index_msb)
|
|
{
|
|
return initial_apicid >> index_msb;
|
|
}
|
|
|
|
static void x2apic_send_IPI_self(int vector)
|
|
{
|
|
apic_write(APIC_SELF_IPI, vector);
|
|
}
|
|
|
|
#endif /* _ASM_X86_X2APIC_H */
|