mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 02:52:56 +00:00
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>
101 lines
2.5 KiB
C
101 lines
2.5 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.
|
|
*
|
|
* Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/smp.h>
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/bmips.h>
|
|
#include <asm/smp-ops.h>
|
|
#include <asm/mipsregs.h>
|
|
#include <bcm63xx_board.h>
|
|
#include <bcm63xx_cpu.h>
|
|
#include <bcm63xx_io.h>
|
|
#include <bcm63xx_regs.h>
|
|
|
|
void __init prom_init(void)
|
|
{
|
|
u32 reg, mask;
|
|
|
|
bcm63xx_cpu_init();
|
|
|
|
/* stop any running watchdog */
|
|
bcm_wdt_writel(WDT_STOP_1, WDT_CTL_REG);
|
|
bcm_wdt_writel(WDT_STOP_2, WDT_CTL_REG);
|
|
|
|
/* disable all hardware blocks clock for now */
|
|
if (BCMCPU_IS_3368())
|
|
mask = CKCTL_3368_ALL_SAFE_EN;
|
|
else if (BCMCPU_IS_6328())
|
|
mask = CKCTL_6328_ALL_SAFE_EN;
|
|
else if (BCMCPU_IS_6338())
|
|
mask = CKCTL_6338_ALL_SAFE_EN;
|
|
else if (BCMCPU_IS_6345())
|
|
mask = CKCTL_6345_ALL_SAFE_EN;
|
|
else if (BCMCPU_IS_6348())
|
|
mask = CKCTL_6348_ALL_SAFE_EN;
|
|
else if (BCMCPU_IS_6358())
|
|
mask = CKCTL_6358_ALL_SAFE_EN;
|
|
else if (BCMCPU_IS_6362())
|
|
mask = CKCTL_6362_ALL_SAFE_EN;
|
|
else if (BCMCPU_IS_6368())
|
|
mask = CKCTL_6368_ALL_SAFE_EN;
|
|
else
|
|
mask = 0;
|
|
|
|
reg = bcm_perf_readl(PERF_CKCTL_REG);
|
|
reg &= ~mask;
|
|
bcm_perf_writel(reg, PERF_CKCTL_REG);
|
|
|
|
/* do low level board init */
|
|
board_prom_init();
|
|
|
|
/* set up SMP */
|
|
if (!register_bmips_smp_ops()) {
|
|
/*
|
|
* BCM6328 might not have its second CPU enabled, while BCM3368
|
|
* and BCM6358 need special handling for their shared TLB, so
|
|
* disable SMP for now.
|
|
*/
|
|
if (BCMCPU_IS_6328()) {
|
|
reg = bcm_readl(BCM_6328_OTP_BASE +
|
|
OTP_USER_BITS_6328_REG(3));
|
|
|
|
if (reg & OTP_6328_REG3_TP1_DISABLED)
|
|
bmips_smp_enabled = 0;
|
|
} else if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
|
|
bmips_smp_enabled = 0;
|
|
}
|
|
|
|
if (!bmips_smp_enabled)
|
|
return;
|
|
|
|
/*
|
|
* The bootloader has set up the CPU1 reset vector at
|
|
* 0xa000_0200.
|
|
* This conflicts with the special interrupt vector (IV).
|
|
* The bootloader has also set up CPU1 to respond to the wrong
|
|
* IPI interrupt.
|
|
* Here we will start up CPU1 in the background and ask it to
|
|
* reconfigure itself then go back to sleep.
|
|
*/
|
|
memcpy((void *)0xa0000200, &bmips_smp_movevec, 0x20);
|
|
__sync();
|
|
set_c0_cause(C_SW0);
|
|
cpumask_set_cpu(1, &bmips_booted_mask);
|
|
|
|
/*
|
|
* FIXME: we really should have some sort of hazard barrier here
|
|
*/
|
|
}
|
|
}
|
|
|
|
void __init prom_free_prom_memory(void)
|
|
{
|
|
}
|