mirror of
https://github.com/torvalds/linux
synced 2024-09-21 11:38:48 +00:00
3a4356c0c0
When CPU1 is brought out of reset, it's MMU is not turned on yet, so it will
only be able to use physical addresses. For systems with that have the
MMU page configured for 0xC0000000, 0x80000000, or 0x40000000
"BIC 0x40000000" will work just fine, as it was just converting the
virtual address of &cpu1start_addr into a physical address, ie. 0xC0000000
became 0x80000000. So for systems where the SDRAM controller was able to do a
wrap-around access, this was working fine, as it was just dropping the MSB,
but for systems where out of bounds memory access is not allowed, this would
not allow CPU1 to correctly fetch &cpu1start_addr.
This patch fixes the secondary_trampoline code to correctly fetch the
physical address of cpu1start_addr directly. The patch will subtract the
correct PAGE_OFFSET from &cpu1start_addr. And since on this platform, the
physical memory will always start at 0x0, subtracting PAGE_OFFSET from
&cpu1start_addr will allow CPU1 to correctly fetch the value of cpu1start_addr.
While at it, change the name of cpu1start_addr to socfpga_cpu1start_addr
to avoid any future naming collisions for multiplatform image.
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
v4: Updated commit log to correctly lay out the usage of PAGE_OFFSET and
add comments to the same effect.
v3: Used PAGE_OFFSET to get the physical address
v2: Correctly get the physical address instead of just a BIC hack.
115 lines
2.9 KiB
C
115 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2012 Altera Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that 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/irqchip.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/reboot.h>
|
|
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "core.h"
|
|
|
|
void __iomem *socfpga_scu_base_addr = ((void __iomem *)(SOCFPGA_SCU_VIRT_BASE));
|
|
void __iomem *sys_manager_base_addr;
|
|
void __iomem *rst_manager_base_addr;
|
|
unsigned long socfpga_cpu1start_addr;
|
|
|
|
static struct map_desc scu_io_desc __initdata = {
|
|
.virtual = SOCFPGA_SCU_VIRT_BASE,
|
|
.pfn = 0, /* run-time */
|
|
.length = SZ_8K,
|
|
.type = MT_DEVICE,
|
|
};
|
|
|
|
static struct map_desc uart_io_desc __initdata = {
|
|
.virtual = 0xfec02000,
|
|
.pfn = __phys_to_pfn(0xffc02000),
|
|
.length = SZ_8K,
|
|
.type = MT_DEVICE,
|
|
};
|
|
|
|
static void __init socfpga_scu_map_io(void)
|
|
{
|
|
unsigned long base;
|
|
|
|
/* Get SCU base */
|
|
asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
|
|
|
|
scu_io_desc.pfn = __phys_to_pfn(base);
|
|
iotable_init(&scu_io_desc, 1);
|
|
}
|
|
|
|
static void __init socfpga_map_io(void)
|
|
{
|
|
socfpga_scu_map_io();
|
|
iotable_init(&uart_io_desc, 1);
|
|
early_printk("Early printk initialized\n");
|
|
}
|
|
|
|
void __init socfpga_sysmgr_init(void)
|
|
{
|
|
struct device_node *np;
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "altr,sys-mgr");
|
|
|
|
if (of_property_read_u32(np, "cpu1-start-addr",
|
|
(u32 *) &socfpga_cpu1start_addr))
|
|
pr_err("SMP: Need cpu1-start-addr in device tree.\n");
|
|
|
|
sys_manager_base_addr = of_iomap(np, 0);
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "altr,rst-mgr");
|
|
rst_manager_base_addr = of_iomap(np, 0);
|
|
}
|
|
|
|
static void __init socfpga_init_irq(void)
|
|
{
|
|
irqchip_init();
|
|
socfpga_sysmgr_init();
|
|
}
|
|
|
|
static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
u32 temp;
|
|
|
|
temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);
|
|
|
|
if (mode == REBOOT_HARD)
|
|
temp |= RSTMGR_CTRL_SWCOLDRSTREQ;
|
|
else
|
|
temp |= RSTMGR_CTRL_SWWARMRSTREQ;
|
|
writel(temp, rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);
|
|
}
|
|
|
|
static const char *altera_dt_match[] = {
|
|
"altr,socfpga",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(SOCFPGA, "Altera SOCFPGA")
|
|
.l2c_aux_val = 0,
|
|
.l2c_aux_mask = ~0,
|
|
.smp = smp_ops(socfpga_smp_ops),
|
|
.map_io = socfpga_map_io,
|
|
.init_irq = socfpga_init_irq,
|
|
.restart = socfpga_cyclone5_restart,
|
|
.dt_compat = altera_dt_match,
|
|
MACHINE_END
|