mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 01:51:34 +00:00
65fddcfca8
The replacement of <asm/pgrable.h> with <linux/pgtable.h> made the include
of the latter in the middle of asm includes. Fix this up with the aid of
the below script and manual adjustments here and there.
import sys
import re
if len(sys.argv) is not 3:
print "USAGE: %s <file> <header>" % (sys.argv[0])
sys.exit(1)
hdr_to_move="#include <linux/%s>" % sys.argv[2]
moved = False
in_hdrs = False
with open(sys.argv[1], "r") as f:
lines = f.readlines()
for _line in lines:
line = _line.rstrip('
')
if line == hdr_to_move:
continue
if line.startswith("#include <linux/"):
in_hdrs = True
elif not moved and in_hdrs:
moved = True
print hdr_to_move
print line
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200514170327.31389-4-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
339 lines
8.2 KiB
C
339 lines
8.2 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/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/pgtable.h>
|
|
|
|
#include <asm/numachip/numachip.h>
|
|
#include <asm/numachip/numachip_csr.h>
|
|
|
|
|
|
#include "local.h"
|
|
|
|
u8 numachip_system __read_mostly;
|
|
static const struct apic apic_numachip1;
|
|
static const struct apic apic_numachip2;
|
|
static void (*numachip_apic_icr_write)(int apicid, unsigned int val) __read_mostly;
|
|
|
|
static unsigned int numachip1_get_apic_id(unsigned long x)
|
|
{
|
|
unsigned long value;
|
|
unsigned int id = (x >> 24) & 0xff;
|
|
|
|
if (static_cpu_has(X86_FEATURE_NODEID_MSR)) {
|
|
rdmsrl(MSR_FAM10H_NODE_ID, value);
|
|
id |= (value << 2) & 0xff00;
|
|
}
|
|
|
|
return id;
|
|
}
|
|
|
|
static u32 numachip1_set_apic_id(unsigned int id)
|
|
{
|
|
return (id & 0xff) << 24;
|
|
}
|
|
|
|
static unsigned int numachip2_get_apic_id(unsigned long x)
|
|
{
|
|
u64 mcfg;
|
|
|
|
rdmsrl(MSR_FAM10H_MMIO_CONF_BASE, mcfg);
|
|
return ((mcfg >> (28 - 8)) & 0xfff00) | (x >> 24);
|
|
}
|
|
|
|
static u32 numachip2_set_apic_id(unsigned int id)
|
|
{
|
|
return id << 24;
|
|
}
|
|
|
|
static int numachip_apic_id_valid(u32 apicid)
|
|
{
|
|
/* Trust what bootloader passes in MADT */
|
|
return 1;
|
|
}
|
|
|
|
static int numachip_apic_id_registered(void)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
|
|
{
|
|
return initial_apic_id >> index_msb;
|
|
}
|
|
|
|
static void numachip1_apic_icr_write(int apicid, unsigned int val)
|
|
{
|
|
write_lcsr(CSR_G3_EXT_IRQ_GEN, (apicid << 16) | val);
|
|
}
|
|
|
|
static void numachip2_apic_icr_write(int apicid, unsigned int val)
|
|
{
|
|
numachip2_write32_lcsr(NUMACHIP2_APIC_ICR, (apicid << 12) | val);
|
|
}
|
|
|
|
static int numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)
|
|
{
|
|
numachip_apic_icr_write(phys_apicid, APIC_DM_INIT);
|
|
numachip_apic_icr_write(phys_apicid, APIC_DM_STARTUP |
|
|
(start_rip >> 12));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void numachip_send_IPI_one(int cpu, int vector)
|
|
{
|
|
int local_apicid, apicid = per_cpu(x86_cpu_to_apicid, cpu);
|
|
unsigned int dmode;
|
|
|
|
preempt_disable();
|
|
local_apicid = __this_cpu_read(x86_cpu_to_apicid);
|
|
|
|
/* Send via local APIC where non-local part matches */
|
|
if (!((apicid ^ local_apicid) >> NUMACHIP_LAPIC_BITS)) {
|
|
unsigned long flags;
|
|
|
|
local_irq_save(flags);
|
|
__default_send_IPI_dest_field(apicid, vector,
|
|
APIC_DEST_PHYSICAL);
|
|
local_irq_restore(flags);
|
|
preempt_enable();
|
|
return;
|
|
}
|
|
preempt_enable();
|
|
|
|
dmode = (vector == NMI_VECTOR) ? APIC_DM_NMI : APIC_DM_FIXED;
|
|
numachip_apic_icr_write(apicid, dmode | vector);
|
|
}
|
|
|
|
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 numachip1_probe(void)
|
|
{
|
|
return apic == &apic_numachip1;
|
|
}
|
|
|
|
static int __init numachip2_probe(void)
|
|
{
|
|
return apic == &apic_numachip2;
|
|
}
|
|
|
|
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 (boot_cpu_has(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)
|
|
{
|
|
/* Map the LCSR area and set up the apic_icr_write function */
|
|
switch (numachip_system) {
|
|
case 1:
|
|
init_extra_mapping_uc(NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_SIZE);
|
|
numachip_apic_icr_write = numachip1_apic_icr_write;
|
|
break;
|
|
case 2:
|
|
init_extra_mapping_uc(NUMACHIP2_LCSR_BASE, NUMACHIP2_LCSR_SIZE);
|
|
numachip_apic_icr_write = numachip2_apic_icr_write;
|
|
break;
|
|
default:
|
|
return 0;
|
|
}
|
|
|
|
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 numachip1_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
|
|
{
|
|
if ((strncmp(oem_id, "NUMASC", 6) != 0) ||
|
|
(strncmp(oem_table_id, "NCONNECT", 8) != 0))
|
|
return 0;
|
|
|
|
numachip_system = 1;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int numachip2_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
|
|
{
|
|
if ((strncmp(oem_id, "NUMASC", 6) != 0) ||
|
|
(strncmp(oem_table_id, "NCONECT2", 8) != 0))
|
|
return 0;
|
|
|
|
numachip_system = 2;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* APIC IPIs are queued */
|
|
static void numachip_apic_wait_icr_idle(void)
|
|
{
|
|
}
|
|
|
|
/* APIC NMI IPIs are queued */
|
|
static u32 numachip_safe_apic_wait_icr_idle(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static const struct apic apic_numachip1 __refconst = {
|
|
.name = "NumaConnect system",
|
|
.probe = numachip1_probe,
|
|
.acpi_madt_oem_check = numachip1_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 */
|
|
|
|
.disable_esr = 0,
|
|
.dest_logical = 0,
|
|
.check_apicid_used = NULL,
|
|
|
|
.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 = numachip1_get_apic_id,
|
|
.set_apic_id = numachip1_set_apic_id,
|
|
|
|
.calc_dest_apicid = apic_default_calc_apicid,
|
|
|
|
.send_IPI = numachip_send_IPI_one,
|
|
.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,
|
|
.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 = numachip_apic_wait_icr_idle,
|
|
.safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle,
|
|
};
|
|
|
|
apic_driver(apic_numachip1);
|
|
|
|
static const struct apic apic_numachip2 __refconst = {
|
|
.name = "NumaConnect2 system",
|
|
.probe = numachip2_probe,
|
|
.acpi_madt_oem_check = numachip2_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 */
|
|
|
|
.disable_esr = 0,
|
|
.dest_logical = 0,
|
|
.check_apicid_used = NULL,
|
|
|
|
.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 = numachip2_get_apic_id,
|
|
.set_apic_id = numachip2_set_apic_id,
|
|
|
|
.calc_dest_apicid = apic_default_calc_apicid,
|
|
|
|
.send_IPI = numachip_send_IPI_one,
|
|
.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,
|
|
.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 = numachip_apic_wait_icr_idle,
|
|
.safe_wait_icr_idle = numachip_safe_apic_wait_icr_idle,
|
|
};
|
|
|
|
apic_driver(apic_numachip2);
|