![Mike Rapoport](/assets/img/avatar_default.png)
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>
171 lines
3.6 KiB
C
171 lines
3.6 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/kernel.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/pm.h>
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/time.h>
|
|
#include <asm/reboot.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <bcm63xx_board.h>
|
|
#include <bcm63xx_cpu.h>
|
|
#include <bcm63xx_regs.h>
|
|
#include <bcm63xx_io.h>
|
|
#include <bcm63xx_gpio.h>
|
|
|
|
void bcm63xx_machine_halt(void)
|
|
{
|
|
pr_info("System halted\n");
|
|
while (1)
|
|
;
|
|
}
|
|
|
|
static void bcm6348_a1_reboot(void)
|
|
{
|
|
u32 reg;
|
|
|
|
/* soft reset all blocks */
|
|
pr_info("soft-resetting all blocks ...\n");
|
|
reg = bcm_perf_readl(PERF_SOFTRESET_REG);
|
|
reg &= ~SOFTRESET_6348_ALL;
|
|
bcm_perf_writel(reg, PERF_SOFTRESET_REG);
|
|
mdelay(10);
|
|
|
|
reg = bcm_perf_readl(PERF_SOFTRESET_REG);
|
|
reg |= SOFTRESET_6348_ALL;
|
|
bcm_perf_writel(reg, PERF_SOFTRESET_REG);
|
|
mdelay(10);
|
|
|
|
/* Jump to the power on address. */
|
|
pr_info("jumping to reset vector.\n");
|
|
/* set high vectors (base at 0xbfc00000 */
|
|
set_c0_status(ST0_BEV | ST0_ERL);
|
|
/* run uncached in kseg0 */
|
|
change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
|
|
__flush_cache_all();
|
|
/* remove all wired TLB entries */
|
|
write_c0_wired(0);
|
|
__asm__ __volatile__(
|
|
"jr\t%0"
|
|
:
|
|
: "r" (0xbfc00000));
|
|
while (1)
|
|
;
|
|
}
|
|
|
|
void bcm63xx_machine_reboot(void)
|
|
{
|
|
u32 reg, perf_regs[2] = { 0, 0 };
|
|
unsigned int i;
|
|
|
|
/* mask and clear all external irq */
|
|
switch (bcm63xx_get_cpu_id()) {
|
|
case BCM3368_CPU_ID:
|
|
perf_regs[0] = PERF_EXTIRQ_CFG_REG_3368;
|
|
break;
|
|
case BCM6328_CPU_ID:
|
|
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6328;
|
|
break;
|
|
case BCM6338_CPU_ID:
|
|
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338;
|
|
break;
|
|
case BCM6345_CPU_ID:
|
|
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6345;
|
|
break;
|
|
case BCM6348_CPU_ID:
|
|
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348;
|
|
break;
|
|
case BCM6358_CPU_ID:
|
|
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6358;
|
|
break;
|
|
case BCM6362_CPU_ID:
|
|
perf_regs[0] = PERF_EXTIRQ_CFG_REG_6362;
|
|
break;
|
|
}
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
if (!perf_regs[i])
|
|
break;
|
|
|
|
reg = bcm_perf_readl(perf_regs[i]);
|
|
if (BCMCPU_IS_6348()) {
|
|
reg &= ~EXTIRQ_CFG_MASK_ALL_6348;
|
|
reg |= EXTIRQ_CFG_CLEAR_ALL_6348;
|
|
} else {
|
|
reg &= ~EXTIRQ_CFG_MASK_ALL;
|
|
reg |= EXTIRQ_CFG_CLEAR_ALL;
|
|
}
|
|
bcm_perf_writel(reg, perf_regs[i]);
|
|
}
|
|
|
|
if (BCMCPU_IS_6348() && (bcm63xx_get_cpu_rev() == 0xa1))
|
|
bcm6348_a1_reboot();
|
|
|
|
pr_info("triggering watchdog soft-reset...\n");
|
|
if (BCMCPU_IS_6328()) {
|
|
bcm_wdt_writel(1, WDT_SOFTRESET_REG);
|
|
} else {
|
|
reg = bcm_perf_readl(PERF_SYS_PLL_CTL_REG);
|
|
reg |= SYS_PLL_SOFT_RESET;
|
|
bcm_perf_writel(reg, PERF_SYS_PLL_CTL_REG);
|
|
}
|
|
while (1)
|
|
;
|
|
}
|
|
|
|
static void __bcm63xx_machine_reboot(char *p)
|
|
{
|
|
bcm63xx_machine_reboot();
|
|
}
|
|
|
|
/*
|
|
* return system type in /proc/cpuinfo
|
|
*/
|
|
const char *get_system_type(void)
|
|
{
|
|
static char buf[128];
|
|
snprintf(buf, sizeof(buf), "bcm63xx/%s (0x%04x/0x%02X)",
|
|
board_get_name(),
|
|
bcm63xx_get_cpu_id(), bcm63xx_get_cpu_rev());
|
|
return buf;
|
|
}
|
|
|
|
void __init plat_time_init(void)
|
|
{
|
|
mips_hpt_frequency = bcm63xx_get_cpu_freq() / 2;
|
|
}
|
|
|
|
void __init plat_mem_setup(void)
|
|
{
|
|
add_memory_region(0, bcm63xx_get_memory_size(), BOOT_MEM_RAM);
|
|
|
|
_machine_halt = bcm63xx_machine_halt;
|
|
_machine_restart = __bcm63xx_machine_reboot;
|
|
pm_power_off = bcm63xx_machine_halt;
|
|
|
|
set_io_port_base(0);
|
|
ioport_resource.start = 0;
|
|
ioport_resource.end = ~0;
|
|
|
|
board_setup();
|
|
}
|
|
|
|
int __init bcm63xx_register_devices(void)
|
|
{
|
|
/* register gpiochip */
|
|
bcm63xx_gpio_init();
|
|
|
|
return board_register_devices();
|
|
}
|
|
|
|
arch_initcall(bcm63xx_register_devices);
|