forked from Minki/linux
c8a470cab0
On NumaChip systems, the physical processor ID assignment wasn't accounting for the number of nodes in AMD multi-module processors, giving an incorrect sibling map: $ cd /sys/devices/system/cpu/cpu29/topology $ grep . * core_id:5 core_siblings:00000000,ff000000 core_siblings_list:24-31 physical_package_id:3 thread_siblings:00000000,30000000 thread_siblings_list:28-29 This fixes it: $ cd /sys/devices/system/cpu/cpu29/topology $ grep . * core_id:5 core_siblings:00000000,ffff0000 core_siblings_list:16-31 physical_package_id:1 thread_siblings:00000000,30000000 thread_siblings_list:28-29 Signed-off-by: Daniel J Blueman <daniel@numascale.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: <stable@vger.kernel.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Steffen Persvold <sp@numascale.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1426135950-10110-1-git-send-email-daniel@numascale.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
251 lines
5.8 KiB
C
251 lines
5.8 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Numascale NumaConnect-Specific APIC Code
|
|
*
|
|
* Copyright (C) 2011 Numascale AS. All rights reserved.
|
|
*
|
|
* Send feedback to <support@numascale.com>
|
|
*
|
|
*/
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/threads.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/string.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/init.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include <asm/numachip/numachip.h>
|
|
#include <asm/numachip/numachip_csr.h>
|
|
#include <asm/smp.h>
|
|
#include <asm/apic.h>
|
|
#include <asm/ipi.h>
|
|
#include <asm/apic_flat_64.h>
|
|
#include <asm/pgtable.h>
|
|
|
|
static int numachip_system __read_mostly;
|
|
|
|
static const struct apic apic_numachip;
|
|
|
|
static unsigned int get_apic_id(unsigned long x)
|
|
{
|
|
unsigned long value;
|
|
unsigned int id = (x >> 24) & 0xff;
|
|
|
|
if (static_cpu_has_safe(X86_FEATURE_NODEID_MSR)) {
|
|
rdmsrl(MSR_FAM10H_NODE_ID, value);
|
|
id |= (value << 2) & 0xff00;
|
|
}
|
|
|
|
return id;
|
|
}
|
|
|
|
static unsigned long set_apic_id(unsigned int id)
|
|
{
|
|
unsigned long x;
|
|
|
|
x = ((id & 0xffU) << 24);
|
|
return x;
|
|
}
|
|
|
|
static unsigned int read_xapic_id(void)
|
|
{
|
|
return get_apic_id(apic_read(APIC_ID));
|
|
}
|
|
|
|
static int numachip_apic_id_valid(int apicid)
|
|
{
|
|
/* Trust what bootloader passes in MADT */
|
|
return 1;
|
|
}
|
|
|
|
static int numachip_apic_id_registered(void)
|
|
{
|
|
return physid_isset(read_xapic_id(), phys_cpu_present_map);
|
|
}
|
|
|
|
static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
|
|
{
|
|
return initial_apic_id >> index_msb;
|
|
}
|
|
|
|
static int numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)
|
|
{
|
|
union numachip_csr_g3_ext_irq_gen int_gen;
|
|
|
|
int_gen.s._destination_apic_id = phys_apicid;
|
|
int_gen.s._vector = 0;
|
|
int_gen.s._msgtype = APIC_DM_INIT >> 8;
|
|
int_gen.s._index = 0;
|
|
|
|
write_lcsr(CSR_G3_EXT_IRQ_GEN, int_gen.v);
|
|
|
|
int_gen.s._msgtype = APIC_DM_STARTUP >> 8;
|
|
int_gen.s._vector = start_rip >> 12;
|
|
|
|
write_lcsr(CSR_G3_EXT_IRQ_GEN, int_gen.v);
|
|
|
|
atomic_set(&init_deasserted, 1);
|
|
return 0;
|
|
}
|
|
|
|
static void numachip_send_IPI_one(int cpu, int vector)
|
|
{
|
|
union numachip_csr_g3_ext_irq_gen int_gen;
|
|
int apicid = per_cpu(x86_cpu_to_apicid, cpu);
|
|
|
|
int_gen.s._destination_apic_id = apicid;
|
|
int_gen.s._vector = vector;
|
|
int_gen.s._msgtype = (vector == NMI_VECTOR ? APIC_DM_NMI : APIC_DM_FIXED) >> 8;
|
|
int_gen.s._index = 0;
|
|
|
|
write_lcsr(CSR_G3_EXT_IRQ_GEN, int_gen.v);
|
|
}
|
|
|
|
static void numachip_send_IPI_mask(const struct cpumask *mask, int vector)
|
|
{
|
|
unsigned int cpu;
|
|
|
|
for_each_cpu(cpu, mask)
|
|
numachip_send_IPI_one(cpu, vector);
|
|
}
|
|
|
|
static void numachip_send_IPI_mask_allbutself(const struct cpumask *mask,
|
|
int vector)
|
|
{
|
|
unsigned int this_cpu = smp_processor_id();
|
|
unsigned int cpu;
|
|
|
|
for_each_cpu(cpu, mask) {
|
|
if (cpu != this_cpu)
|
|
numachip_send_IPI_one(cpu, vector);
|
|
}
|
|
}
|
|
|
|
static void numachip_send_IPI_allbutself(int vector)
|
|
{
|
|
unsigned int this_cpu = smp_processor_id();
|
|
unsigned int cpu;
|
|
|
|
for_each_online_cpu(cpu) {
|
|
if (cpu != this_cpu)
|
|
numachip_send_IPI_one(cpu, vector);
|
|
}
|
|
}
|
|
|
|
static void numachip_send_IPI_all(int vector)
|
|
{
|
|
numachip_send_IPI_mask(cpu_online_mask, vector);
|
|
}
|
|
|
|
static void numachip_send_IPI_self(int vector)
|
|
{
|
|
apic_write(APIC_SELF_IPI, vector);
|
|
}
|
|
|
|
static int __init numachip_probe(void)
|
|
{
|
|
return apic == &apic_numachip;
|
|
}
|
|
|
|
static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
|
|
{
|
|
u64 val;
|
|
u32 nodes = 1;
|
|
|
|
this_cpu_write(cpu_llc_id, node);
|
|
|
|
/* Account for nodes per socket in multi-core-module processors */
|
|
if (static_cpu_has_safe(X86_FEATURE_NODEID_MSR)) {
|
|
rdmsrl(MSR_FAM10H_NODE_ID, val);
|
|
nodes = ((val >> 3) & 7) + 1;
|
|
}
|
|
|
|
c->phys_proc_id = node / nodes;
|
|
}
|
|
|
|
static int __init numachip_system_init(void)
|
|
{
|
|
if (!numachip_system)
|
|
return 0;
|
|
|
|
init_extra_mapping_uc(NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_SIZE);
|
|
init_extra_mapping_uc(NUMACHIP_GCSR_BASE, NUMACHIP_GCSR_SIZE);
|
|
|
|
x86_cpuinit.fixup_cpu_id = fixup_cpu_id;
|
|
x86_init.pci.arch_init = pci_numachip_init;
|
|
|
|
return 0;
|
|
}
|
|
early_initcall(numachip_system_init);
|
|
|
|
static int numachip_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
|
|
{
|
|
if (!strncmp(oem_id, "NUMASC", 6)) {
|
|
numachip_system = 1;
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct apic apic_numachip __refconst = {
|
|
|
|
.name = "NumaConnect system",
|
|
.probe = numachip_probe,
|
|
.acpi_madt_oem_check = numachip_acpi_madt_oem_check,
|
|
.apic_id_valid = numachip_apic_id_valid,
|
|
.apic_id_registered = numachip_apic_id_registered,
|
|
|
|
.irq_delivery_mode = dest_Fixed,
|
|
.irq_dest_mode = 0, /* physical */
|
|
|
|
.target_cpus = online_target_cpus,
|
|
.disable_esr = 0,
|
|
.dest_logical = 0,
|
|
.check_apicid_used = NULL,
|
|
|
|
.vector_allocation_domain = default_vector_allocation_domain,
|
|
.init_apic_ldr = flat_init_apic_ldr,
|
|
|
|
.ioapic_phys_id_map = NULL,
|
|
.setup_apic_routing = NULL,
|
|
.cpu_present_to_apicid = default_cpu_present_to_apicid,
|
|
.apicid_to_cpu_present = NULL,
|
|
.check_phys_apicid_present = default_check_phys_apicid_present,
|
|
.phys_pkg_id = numachip_phys_pkg_id,
|
|
|
|
.get_apic_id = get_apic_id,
|
|
.set_apic_id = set_apic_id,
|
|
.apic_id_mask = 0xffU << 24,
|
|
|
|
.cpu_mask_to_apicid_and = default_cpu_mask_to_apicid_and,
|
|
|
|
.send_IPI_mask = numachip_send_IPI_mask,
|
|
.send_IPI_mask_allbutself = numachip_send_IPI_mask_allbutself,
|
|
.send_IPI_allbutself = numachip_send_IPI_allbutself,
|
|
.send_IPI_all = numachip_send_IPI_all,
|
|
.send_IPI_self = numachip_send_IPI_self,
|
|
|
|
.wakeup_secondary_cpu = numachip_wakeup_secondary,
|
|
.wait_for_init_deassert = false,
|
|
.inquire_remote_apic = NULL, /* REMRD not supported */
|
|
|
|
.read = native_apic_mem_read,
|
|
.write = native_apic_mem_write,
|
|
.eoi_write = native_apic_mem_write,
|
|
.icr_read = native_apic_icr_read,
|
|
.icr_write = native_apic_icr_write,
|
|
.wait_icr_idle = native_apic_wait_icr_idle,
|
|
.safe_wait_icr_idle = native_safe_apic_wait_icr_idle,
|
|
};
|
|
apic_driver(apic_numachip);
|
|
|