mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 17:41:44 +00:00
8bd26e3a7e
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
This removes all the ARM uses of the __cpuinit macros from C code,
and all __CPUINIT from assembly code. It also had two ".previous"
section statements that were paired off against __CPUINIT
(aka .section ".cpuinit.text") that also get removed here.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
103 lines
2.7 KiB
C
103 lines
2.7 KiB
C
/*
|
|
* Copyright 2010-2011 Calxeda, Inc.
|
|
* Copyright 2012 Pavel Machek <pavel@denx.de>
|
|
* Based on platsmp.c, Copyright (C) 2002 ARM Ltd.
|
|
* Copyright (C) 2012 Altera Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/smp_plat.h>
|
|
|
|
#include "core.h"
|
|
|
|
static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;
|
|
|
|
if (cpu1start_addr) {
|
|
memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
|
|
|
|
__raw_writel(virt_to_phys(socfpga_secondary_startup),
|
|
(sys_manager_base_addr + (cpu1start_addr & 0x000000ff)));
|
|
|
|
flush_cache_all();
|
|
smp_wmb();
|
|
outer_clean_range(0, trampoline_size);
|
|
|
|
/* This will release CPU #1 out of reset.*/
|
|
__raw_writel(0, rst_manager_base_addr + 0x10);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Initialise the CPU possible map early - this describes the CPUs
|
|
* which may be present or become present in the system.
|
|
*/
|
|
static void __init socfpga_smp_init_cpus(void)
|
|
{
|
|
unsigned int i, ncores;
|
|
|
|
ncores = scu_get_core_count(socfpga_scu_base_addr);
|
|
|
|
for (i = 0; i < ncores; i++)
|
|
set_cpu_possible(i, true);
|
|
|
|
/* sanity check */
|
|
if (ncores > num_possible_cpus()) {
|
|
pr_warn("socfpga: no. of cores (%d) greater than configured"
|
|
"maximum of %d - clipping\n", ncores, num_possible_cpus());
|
|
ncores = num_possible_cpus();
|
|
}
|
|
|
|
for (i = 0; i < ncores; i++)
|
|
set_cpu_possible(i, true);
|
|
}
|
|
|
|
static void __init socfpga_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
scu_enable(socfpga_scu_base_addr);
|
|
}
|
|
|
|
/*
|
|
* platform-specific code to shutdown a CPU
|
|
*
|
|
* Called with IRQs disabled
|
|
*/
|
|
static void socfpga_cpu_die(unsigned int cpu)
|
|
{
|
|
cpu_do_idle();
|
|
|
|
/* We should have never returned from idle */
|
|
panic("cpu %d unexpectedly exit from shutdown\n", cpu);
|
|
}
|
|
|
|
struct smp_operations socfpga_smp_ops __initdata = {
|
|
.smp_init_cpus = socfpga_smp_init_cpus,
|
|
.smp_prepare_cpus = socfpga_smp_prepare_cpus,
|
|
.smp_boot_secondary = socfpga_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_die = socfpga_cpu_die,
|
|
#endif
|
|
};
|