mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-04 18:41:03 +00:00
0b8f6378cb
The Arria10 SPL is a complete mess of calls to functions which are called in the wrong context and it is surprise it works at all. This patch tries to clean that mess up by shuffling the function calls around and moving the calls into the correct context. Due to the delicate nature of the reordering, this is done in one huge patch. The following changes happen in this patch: - Security policy init and NIC301 happens first in board_init_f() - The clock init happens very early in board_init_f() in SPL only - arch_early_init_r() only registers the FPGA, just like on Gen5 - arch_early_init_r() is never called from any _f() function - Dedicated FPGA pins are inited in board_init_f() as on Gen5 Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <chin.liang.see@intel.com> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Ley Foon Tan <ley.foon.tan@intel.com>
103 lines
2.6 KiB
C
103 lines
2.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (C) 2016-2017 Intel Corporation
|
|
*/
|
|
|
|
#include <altera.h>
|
|
#include <common.h>
|
|
#include <errno.h>
|
|
#include <fdtdec.h>
|
|
#include <miiphy.h>
|
|
#include <netdev.h>
|
|
#include <ns16550.h>
|
|
#include <watchdog.h>
|
|
#include <asm/arch/misc.h>
|
|
#include <asm/arch/pinmux.h>
|
|
#include <asm/arch/reset_manager.h>
|
|
#include <asm/arch/reset_manager_arria10.h>
|
|
#include <asm/arch/sdram_arria10.h>
|
|
#include <asm/arch/system_manager.h>
|
|
#include <asm/arch/nic301.h>
|
|
#include <asm/io.h>
|
|
#include <asm/pl310.h>
|
|
|
|
#define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q1_3 0x08
|
|
#define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q2_11 0x58
|
|
#define PINMUX_UART0_TX_SHARED_IO_OFFSET_Q3_3 0x68
|
|
#define PINMUX_UART1_TX_SHARED_IO_OFFSET_Q1_7 0x18
|
|
#define PINMUX_UART1_TX_SHARED_IO_OFFSET_Q3_7 0x78
|
|
#define PINMUX_UART1_TX_SHARED_IO_OFFSET_Q4_3 0x98
|
|
|
|
static struct socfpga_system_manager *sysmgr_regs =
|
|
(struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS;
|
|
#if defined(CONFIG_SPL_BUILD)
|
|
static struct pl310_regs *const pl310 =
|
|
(struct pl310_regs *)CONFIG_SYS_PL310_BASE;
|
|
static const struct socfpga_noc_fw_ocram *noc_fw_ocram_base =
|
|
(void *)SOCFPGA_SDR_FIREWALL_OCRAM_ADDRESS;
|
|
|
|
/*
|
|
+ * This function initializes security policies to be consistent across
|
|
+ * all logic units in the Arria 10.
|
|
+ *
|
|
+ * The idea is to set all security policies to be normal, nonsecure
|
|
+ * for all units.
|
|
+ */
|
|
void socfpga_init_security_policies(void)
|
|
{
|
|
/* Put OCRAM in non-secure */
|
|
writel(0x003f0000, &noc_fw_ocram_base->region0);
|
|
writel(0x1, &noc_fw_ocram_base->enable);
|
|
|
|
/* Put DDR in non-secure */
|
|
writel(0xffff0000, SOCFPGA_SDR_FIREWALL_L3_ADDRESS + 0xc);
|
|
writel(0x1, SOCFPGA_SDR_FIREWALL_L3_ADDRESS);
|
|
|
|
/* Enable priviledged and non-priviledged access to L4 peripherals */
|
|
writel(~0, SOCFPGA_NOC_L4_PRIV_FLT_OFST);
|
|
|
|
/* Enable secure and non-secure transactions to bridges */
|
|
writel(~0, SOCFPGA_NOC_FW_H2F_SCR_OFST);
|
|
writel(~0, SOCFPGA_NOC_FW_H2F_SCR_OFST + 4);
|
|
|
|
writel(0x0007FFFF, &sysmgr_regs->ecc_intmask_set);
|
|
}
|
|
|
|
void socfpga_sdram_remap_zero(void)
|
|
{
|
|
/* Configure the L2 controller to make SDRAM start at 0 */
|
|
writel(0x1, &pl310->pl310_addr_filter_start);
|
|
}
|
|
#endif
|
|
|
|
int arch_early_init_r(void)
|
|
{
|
|
/* Add device descriptor to FPGA device table */
|
|
socfpga_fpga_add();
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Print CPU information
|
|
*/
|
|
#if defined(CONFIG_DISPLAY_CPUINFO)
|
|
int print_cpuinfo(void)
|
|
{
|
|
const u32 bsel =
|
|
SYSMGR_GET_BOOTINFO_BSEL(readl(&sysmgr_regs->bootinfo));
|
|
|
|
puts("CPU: Altera SoCFPGA Arria 10\n");
|
|
|
|
printf("BOOT: %s\n", bsel_str[bsel].name);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
void do_bridge_reset(int enable)
|
|
{
|
|
if (enable)
|
|
socfpga_reset_deassert_bridges_handoff();
|
|
else
|
|
socfpga_bridges_reset();
|
|
}
|