57c8a661d9
Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> 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 Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
263 lines
6.5 KiB
C
263 lines
6.5 KiB
C
/*
|
|
* linux/arch/arm/kernel/devtree.c
|
|
*
|
|
* Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/export.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/smp.h>
|
|
|
|
#include <asm/cputype.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/page.h>
|
|
#include <asm/prom.h>
|
|
#include <asm/smp_plat.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
extern struct of_cpu_method __cpu_method_of_table[];
|
|
|
|
static const struct of_cpu_method __cpu_method_of_table_sentinel
|
|
__used __section(__cpu_method_of_table_end);
|
|
|
|
|
|
static int __init set_smp_ops_by_method(struct device_node *node)
|
|
{
|
|
const char *method;
|
|
struct of_cpu_method *m = __cpu_method_of_table;
|
|
|
|
if (of_property_read_string(node, "enable-method", &method))
|
|
return 0;
|
|
|
|
for (; m->method; m++)
|
|
if (!strcmp(m->method, method)) {
|
|
smp_set_ops(m->ops);
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
static inline int set_smp_ops_by_method(struct device_node *node)
|
|
{
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
* arm_dt_init_cpu_maps - Function retrieves cpu nodes from the device tree
|
|
* and builds the cpu logical map array containing MPIDR values related to
|
|
* logical cpus
|
|
*
|
|
* Updates the cpu possible mask with the number of parsed cpu nodes
|
|
*/
|
|
void __init arm_dt_init_cpu_maps(void)
|
|
{
|
|
/*
|
|
* Temp logical map is initialized with UINT_MAX values that are
|
|
* considered invalid logical map entries since the logical map must
|
|
* contain a list of MPIDR[23:0] values where MPIDR[31:24] must
|
|
* read as 0.
|
|
*/
|
|
struct device_node *cpu, *cpus;
|
|
int found_method = 0;
|
|
u32 i, j, cpuidx = 1;
|
|
u32 mpidr = is_smp() ? read_cpuid_mpidr() & MPIDR_HWID_BITMASK : 0;
|
|
|
|
u32 tmp_map[NR_CPUS] = { [0 ... NR_CPUS-1] = MPIDR_INVALID };
|
|
bool bootcpu_valid = false;
|
|
cpus = of_find_node_by_path("/cpus");
|
|
|
|
if (!cpus)
|
|
return;
|
|
|
|
for_each_of_cpu_node(cpu) {
|
|
const __be32 *cell;
|
|
int prop_bytes;
|
|
u32 hwid;
|
|
|
|
pr_debug(" * %pOF...\n", cpu);
|
|
/*
|
|
* A device tree containing CPU nodes with missing "reg"
|
|
* properties is considered invalid to build the
|
|
* cpu_logical_map.
|
|
*/
|
|
cell = of_get_property(cpu, "reg", &prop_bytes);
|
|
if (!cell || prop_bytes < sizeof(*cell)) {
|
|
pr_debug(" * %pOF missing reg property\n", cpu);
|
|
of_node_put(cpu);
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Bits n:24 must be set to 0 in the DT since the reg property
|
|
* defines the MPIDR[23:0].
|
|
*/
|
|
do {
|
|
hwid = be32_to_cpu(*cell++);
|
|
prop_bytes -= sizeof(*cell);
|
|
} while (!hwid && prop_bytes > 0);
|
|
|
|
if (prop_bytes || (hwid & ~MPIDR_HWID_BITMASK)) {
|
|
of_node_put(cpu);
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Duplicate MPIDRs are a recipe for disaster.
|
|
* Scan all initialized entries and check for
|
|
* duplicates. If any is found just bail out.
|
|
* temp values were initialized to UINT_MAX
|
|
* to avoid matching valid MPIDR[23:0] values.
|
|
*/
|
|
for (j = 0; j < cpuidx; j++)
|
|
if (WARN(tmp_map[j] == hwid,
|
|
"Duplicate /cpu reg properties in the DT\n")) {
|
|
of_node_put(cpu);
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Build a stashed array of MPIDR values. Numbering scheme
|
|
* requires that if detected the boot CPU must be assigned
|
|
* logical id 0. Other CPUs get sequential indexes starting
|
|
* from 1. If a CPU node with a reg property matching the
|
|
* boot CPU MPIDR is detected, this is recorded so that the
|
|
* logical map built from DT is validated and can be used
|
|
* to override the map created in smp_setup_processor_id().
|
|
*/
|
|
if (hwid == mpidr) {
|
|
i = 0;
|
|
bootcpu_valid = true;
|
|
} else {
|
|
i = cpuidx++;
|
|
}
|
|
|
|
if (WARN(cpuidx > nr_cpu_ids, "DT /cpu %u nodes greater than "
|
|
"max cores %u, capping them\n",
|
|
cpuidx, nr_cpu_ids)) {
|
|
cpuidx = nr_cpu_ids;
|
|
of_node_put(cpu);
|
|
break;
|
|
}
|
|
|
|
tmp_map[i] = hwid;
|
|
|
|
if (!found_method)
|
|
found_method = set_smp_ops_by_method(cpu);
|
|
}
|
|
|
|
/*
|
|
* Fallback to an enable-method in the cpus node if nothing found in
|
|
* a cpu node.
|
|
*/
|
|
if (!found_method)
|
|
set_smp_ops_by_method(cpus);
|
|
|
|
if (!bootcpu_valid) {
|
|
pr_warn("DT missing boot CPU MPIDR[23:0], fall back to default cpu_logical_map\n");
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Since the boot CPU node contains proper data, and all nodes have
|
|
* a reg property, the DT CPU list can be considered valid and the
|
|
* logical map created in smp_setup_processor_id() can be overridden
|
|
*/
|
|
for (i = 0; i < cpuidx; i++) {
|
|
set_cpu_possible(i, true);
|
|
cpu_logical_map(i) = tmp_map[i];
|
|
pr_debug("cpu logical map 0x%x\n", cpu_logical_map(i));
|
|
}
|
|
}
|
|
|
|
bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
|
|
{
|
|
return phys_id == cpu_logical_map(cpu);
|
|
}
|
|
|
|
static const void * __init arch_get_next_mach(const char *const **match)
|
|
{
|
|
static const struct machine_desc *mdesc = __arch_info_begin;
|
|
const struct machine_desc *m = mdesc;
|
|
|
|
if (m >= __arch_info_end)
|
|
return NULL;
|
|
|
|
mdesc++;
|
|
*match = m->dt_compat;
|
|
return m;
|
|
}
|
|
|
|
/**
|
|
* setup_machine_fdt - Machine setup when an dtb was passed to the kernel
|
|
* @dt_phys: physical address of dt blob
|
|
*
|
|
* If a dtb was passed to the kernel in r2, then use it to choose the
|
|
* correct machine_desc and to setup the system.
|
|
*/
|
|
const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
|
|
{
|
|
const struct machine_desc *mdesc, *mdesc_best = NULL;
|
|
|
|
#if defined(CONFIG_ARCH_MULTIPLATFORM) || defined(CONFIG_ARM_SINGLE_ARMV7M)
|
|
DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
|
|
.l2c_aux_val = 0x0,
|
|
.l2c_aux_mask = ~0x0,
|
|
MACHINE_END
|
|
|
|
mdesc_best = &__mach_desc_GENERIC_DT;
|
|
#endif
|
|
|
|
if (!dt_phys || !early_init_dt_verify(phys_to_virt(dt_phys)))
|
|
return NULL;
|
|
|
|
mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach);
|
|
|
|
if (!mdesc) {
|
|
const char *prop;
|
|
int size;
|
|
unsigned long dt_root;
|
|
|
|
early_print("\nError: unrecognized/unsupported "
|
|
"device tree compatible list:\n[ ");
|
|
|
|
dt_root = of_get_flat_dt_root();
|
|
prop = of_get_flat_dt_prop(dt_root, "compatible", &size);
|
|
while (size > 0) {
|
|
early_print("'%s' ", prop);
|
|
size -= strlen(prop) + 1;
|
|
prop += strlen(prop) + 1;
|
|
}
|
|
early_print("]\n\n");
|
|
|
|
dump_machine_table(); /* does not return */
|
|
}
|
|
|
|
/* We really don't want to do this, but sometimes firmware provides buggy data */
|
|
if (mdesc->dt_fixup)
|
|
mdesc->dt_fixup();
|
|
|
|
early_init_dt_scan_nodes();
|
|
|
|
/* Change machine number to match the mdesc we're using */
|
|
__machine_arch_type = mdesc->nr;
|
|
|
|
return mdesc;
|
|
}
|