Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 13e81d45f80b58e57a78daf6850d4f3a6bc20d9e

Authored by Pavel Machek
Committed by Marek Vasut
1 parent 60d804c2f3
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: socfpga: nic301: Add NIC-301 configuration code 

Add code which configures the AMBA NIC-301 and the SCU on the SoCFPGA .
The code sets the access permissions for the CPU to the AMBA slaves such
that the CPU can access them in both secure and non-secure mode.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Pavel Machek <pavel@denx.de>

Showing 1 changed file with 26 additions and 0 deletions Side-by-side Diff

arch/arm/cpu/armv7/socfpga/misc.c
Diff comments   View file @ 13e81d4
... ... @@ -13,6 +13,7 @@
13 13 #include <asm/arch/system_manager.h>
14 14 #include <asm/arch/dwmmc.h>
15 15 #include <asm/arch/nic301.h>
  16 +#include <asm/arch/scu.h>
16 17 #include <asm/pl310.h>
17 18  
18 19 DECLARE_GLOBAL_DATA_PTR;
... ... @@ -23,6 +24,8 @@
23 24 (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS;
24 25 static struct nic301_registers *nic301_regs =
25 26 (struct nic301_registers *)SOCFPGA_L3REGS_ADDRESS;
  27 +static struct scu_registers *scu_regs =
  28 + (struct scu_registers *)SOCFPGA_MPUSCU_ADDRESS;
26 29  
27 30 int dram_init(void)
28 31 {
29 32  
... ... @@ -146,8 +149,31 @@
146 149 return 0;
147 150 }
148 151  
  152 +/*
  153 + * Convert all NIC-301 AMBA slaves from secure to non-secure
  154 + */
  155 +static void socfpga_nic301_slave_ns(void)
  156 +{
  157 + writel(0x1, &nic301_regs->lwhps2fpgaregs);
  158 + writel(0x1, &nic301_regs->hps2fpgaregs);
  159 + writel(0x1, &nic301_regs->acp);
  160 + writel(0x1, &nic301_regs->rom);
  161 + writel(0x1, &nic301_regs->ocram);
  162 + writel(0x1, &nic301_regs->sdrdata);
  163 +}
  164 +
149 165 int misc_init_r(void)
150 166 {
  167 + socfpga_bridges_reset(1);
  168 + socfpga_nic301_slave_ns();
  169 +
  170 + /*
  171 + * Private components security:
  172 + * U-Boot : configure private timer, global timer and cpu component
  173 + * access as non secure for kernel stage (as required by Linux)
  174 + */
  175 + setbits_le32(&scu_regs->sacr, 0xfff);
  176 +
151 177 /* Configure the L2 controller to make SDRAM start at 0 */
152 178 #ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
153 179 writel(0x2, &nic301_regs->remap);