mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 18:11:56 +00:00
a06f916b7a
Rather than clipping the number of CPUs using the compile-time NR_CPUS constant, use the runtime nr_cpu_ids value instead. This allows the nr_cpus command line option to work as expected. Cc: <stable@kernel.org> Reported-by: Mark Salter <msalter@redhat.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
81 lines
2.0 KiB
C
81 lines
2.0 KiB
C
/*
|
|
* linux/arch/arm/mach-realview/platsmp.c
|
|
*
|
|
* Copyright (C) 2002 ARM Ltd.
|
|
* All Rights Reserved
|
|
*
|
|
* 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/errno.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/hardware/gic.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/unified.h>
|
|
|
|
#include <mach/board-eb.h>
|
|
#include <mach/board-pb11mp.h>
|
|
#include <mach/board-pbx.h>
|
|
|
|
#include "core.h"
|
|
|
|
extern void versatile_secondary_startup(void);
|
|
|
|
static void __iomem *scu_base_addr(void)
|
|
{
|
|
if (machine_is_realview_eb_mp())
|
|
return __io_address(REALVIEW_EB11MP_SCU_BASE);
|
|
else if (machine_is_realview_pb11mp())
|
|
return __io_address(REALVIEW_TC11MP_SCU_BASE);
|
|
else if (machine_is_realview_pbx() &&
|
|
(core_tile_pbx11mp() || core_tile_pbxa9mp()))
|
|
return __io_address(REALVIEW_PBX_TILE_SCU_BASE);
|
|
else
|
|
return (void __iomem *)0;
|
|
}
|
|
|
|
/*
|
|
* Initialise the CPU possible map early - this describes the CPUs
|
|
* which may be present or become present in the system.
|
|
*/
|
|
void __init smp_init_cpus(void)
|
|
{
|
|
void __iomem *scu_base = scu_base_addr();
|
|
unsigned int i, ncores;
|
|
|
|
ncores = scu_base ? scu_get_core_count(scu_base) : 1;
|
|
|
|
/* sanity check */
|
|
if (ncores > nr_cpu_ids) {
|
|
pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",
|
|
ncores, nr_cpu_ids);
|
|
ncores = nr_cpu_ids;
|
|
}
|
|
|
|
for (i = 0; i < ncores; i++)
|
|
set_cpu_possible(i, true);
|
|
|
|
set_smp_cross_call(gic_raise_softirq);
|
|
}
|
|
|
|
void __init platform_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
|
|
scu_enable(scu_base_addr());
|
|
|
|
/*
|
|
* Write the address of secondary startup into the
|
|
* system-wide flags register. The BootMonitor waits
|
|
* until it receives a soft interrupt, and then the
|
|
* secondary CPU branches to this address.
|
|
*/
|
|
__raw_writel(BSYM(virt_to_phys(versatile_secondary_startup)),
|
|
__io_address(REALVIEW_SYS_FLAGSSET));
|
|
}
|