Enable ARM Trusted Firmware for U-Boot
Subsystems (7)
v3 cover Enable ARM Trusted Firmware for U-Boot
From: "Ang, Chee Hong" <[email protected]>
v3 changes:
[v3 03/21] arm: socfpga: Add function for checking description from FIT image
- documented the 'weak' function in commit message
[v3 05/21] arm: socfpga: Override 'lowlevel_init' to support ATF
- changed the source file name to 'lowlevel_init_64.S'
- removed a redundant '#ifdef' in the 'lowlevel_init' function
[v3 06/21] configs: socfpga: Enable FIT image loading with ATF support
- removed CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y from defconfigs
- documented the change of address in CONFIG_SYS_TEXT_BASE in commit message
[v3 08/21] arm: socfpga: Add SMC helper function for Intel SOCFPGA (64bits)
- replaced for-loops with memcpys
[v3 09/21] arm: socfpga: Define SMC function identifiers for PSCI SiP services
- update the license header date to '2017-2020'
- fixed the indentations
[v3 10/21] arm: socfpga: Add secure register access helper functions for SoC 64bits
- remove inner 'ifdef' in Makefile
v2:
https://lists.denx.de/pipermail/u-boot/2020-February/400704.html
These patchsets have dependency on:
https://lists.denx.de/pipermail/u-boot/2019-September/384906.html
Chee Hong Ang (21):
configs: agilex: Remove CONFIG_OF_EMBED
arm: socfpga: add fit source file for pack itb with ATF
arm: socfpga: Add function for checking description from FIT image
arm: socfpga: Load FIT image with ATF support
arm: socfpga: Override 'lowlevel_init' to support ATF
configs: socfpga: Enable FIT image loading with ATF support
arm: socfpga: Disable "spin-table" method for booting Linux
arm: socfpga: Add SMC helper function for Intel SOCFPGA (64bits)
arm: socfpga: Define SMC function identifiers for PSCI SiP services
arm: socfpga: Add secure register access helper functions for SoC
64bits
arm: socfpga: Secure register access for clock manager (SoC 64bits)
arm: socfpga: Secure register access in PHY mode setup
arm: socfpga: Secure register access for reading PLL frequency
mmc: dwmmc: socfpga: Secure register access in MMC driver
net: designware: socfpga: Secure register access in MAC driver
arm: socfpga: Secure register access in Reset Manager driver
arm: socfpga: stratix10: Initialize timer in SPL
arm: socfpga: Bridge reset invokes SMC service calls in EL2
arm: socfpga: stratix10: Add ATF support to FPGA reconfig driver
arm: socfpga: mailbox: Add 'SYSTEM_RESET' PSCI support to
mbox_reset_cold()
configs: socfpga: Add defconfig for Agilex and Stratix 10 without ATF
support
arch/arm/mach-socfpga/Kconfig | 2 -
arch/arm/mach-socfpga/Makefile | 6 +
arch/arm/mach-socfpga/board.c | 10 +
arch/arm/mach-socfpga/clock_manager_agilex.c | 5 +-
arch/arm/mach-socfpga/clock_manager_s10.c | 5 +-
arch/arm/mach-socfpga/include/mach/misc.h | 3 +
.../mach-socfpga/include/mach/secure_reg_helper.h | 20 ++
arch/arm/mach-socfpga/lowlevel_init_64.S | 81 +++++
arch/arm/mach-socfpga/mailbox_s10.c | 4 +
arch/arm/mach-socfpga/misc_s10.c | 43 ++-
arch/arm/mach-socfpga/reset_manager_s10.c | 31 +-
arch/arm/mach-socfpga/secure_reg_helper.c | 57 ++++
arch/arm/mach-socfpga/timer_s10.c | 3 +-
arch/arm/mach-socfpga/wrap_pll_config_s10.c | 9 +-
board/altera/soc64/its/fit_spl_atf.its | 52 +++
configs/socfpga_agilex_defconfig | 8 +-
...lex_defconfig => socfpga_agilex_nofw_defconfig} | 2 +-
configs/socfpga_stratix10_defconfig | 7 +-
..._defconfig => socfpga_stratix10_nofw_defconfig} | 2 +-
drivers/fpga/stratix10.c | 141 +++++++-
drivers/mmc/socfpga_dw_mmc.c | 7 +-
drivers/net/dwmac_socfpga.c | 5 +-
include/configs/socfpga_soc64_common.h | 4 +
include/linux/intel-smc.h | 374 +++++++++++++++++++++
24 files changed, 843 insertions(+), 38 deletions(-)
create mode 100644 arch/arm/mach-socfpga/include/mach/secure_reg_helper.h
create mode 100644 arch/arm/mach-socfpga/lowlevel_init_64.S
create mode 100644 arch/arm/mach-socfpga/secure_reg_helper.c
create mode 100644 board/altera/soc64/its/fit_spl_atf.its
copy configs/{socfpga_agilex_defconfig => socfpga_agilex_nofw_defconfig} (97%)
copy configs/{socfpga_stratix10_defconfig => socfpga_stratix10_nofw_defconfig} (97%)
create mode 100644 include/linux/intel-smc.hSignature · 1 line
2.7.4
PATCH v3 1/21 configs: agilex: Remove CONFIG_OF_EMBED
From: Chee Hong Ang <[email protected]>
CONFIG_OF_EMBED was primarily enabled to support the agilex spl hex file requirements. Since this option now produces a warning during build, and the spl hex can be created using alternate methods, CONFIG_OF_EMBED is no longer needed.
--- configs/socfpga_agilex_defconfig | 1 - 1 file changed, 1 deletion(-)
configs/socfpga_agilex_defconfig +0 -1
@@ -29,7 +29,6 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y
Signature · 1 line
2.7.4
PATCH v3 2/21 arm: socfpga: add fit source file for pack itb with ATF
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Generate a FIT image for Intel SOCFPGA(64bits) which include U-boot proper, ATF and DTB for U-boot proper.
--- board/altera/soc64/its/fit_spl_atf.its | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 board/altera/soc64/its/fit_spl_atf.its
board/altera/soc64/its/fit_spl_atf.its new file +52 -0
@@ -0,0 +1,52 @@ +/* + * Copyright (C) 2019 Intel Corporation. All rights reserved + * + * SPDX-License-Identifier: GPL-2.0 + */ + +/dts-v1/; + +/ { + description = "FIT image with U-Boot proper, ATF bl31, DTB"; + #address-cells = <1>; + + images { + uboot { + description = "U-Boot (64-bit)"; + data = /incbin/("../../../../u-boot-nodtb.bin"); + type = "standalone"; + os = "U-Boot"; + arch = "arm64"; + compression = "none"; + load = <0x00200000>; + }; + + atf { + description = "ARM Trusted Firmware"; + data = /incbin/("../../../../bl31.bin"); + type = "firmware"; + os = "arm-trusted-firmware"; + arch = "arm64"; + compression = "none"; + load = <0x00001000>; + entry = <0x00001000>; + }; + + fdt { + description = "Stratix 10 flat device-tree"; + data = /incbin/("../../../../u-boot.dtb"); + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "conf"; + conf { + description = "Intel Stratix 10"; + firmware = "atf"; + loadables = "uboot"; + fdt = "fdt"; + }; + }; +};
Signature · 1 line
2.7.4
PATCH v3 3/21 arm: socfpga: Add function for checking description from FIT image
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Add board_fit_config_name_match() for matching board name with device tree files in FIT image. This will ensure correct DTB file is loaded for different board type. Currently, we are not supporting multiple device tree files in FIT image therefore this function basically do nothing for now.
Users are allowed to override this 'weak' function in their specific board implementation.
--- arch/arm/mach-socfpga/board.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/mach-socfpga/board.c +10 -0
@@ -86,3 +86,13 @@ int g_dnl_board_usb_cable_connected(void) return 1; }#endif + +#ifdef CONFIG_SPL_BUILD +__weak int board_fit_config_name_match (const char *name) +{ +/* Just empty function now - can't decide what to choose */ +debug ("%s: %s\n" , __func__, name); + +return 0 ; +} +#endif
Signature · 1 line
2.7.4
PATCH v3 4/21 arm: socfpga: Load FIT image with ATF support
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Instead of loading u-boot proper image (u-boot.img), SPL now loads FIT image (u-boot.itb) which includes u-boot proper, ATF and u-boot proper's DTB.
--- include/configs/socfpga_soc64_common.h | 4 ++++ 1 file changed, 4 insertions(+)
include/configs/socfpga_soc64_common.h +4 -0
@@ -197,6 +197,10 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +#ifdef CONFIG_SPL_LOAD_FIT +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.itb" +#else #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +#endif #endif /* __CONFIG_SOCFPGA_SOC64_COMMON_H__ */
Signature · 1 line
2.7.4
PATCH v3 5/21 arm: socfpga: Override 'lowlevel_init' to support ATF
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Override 'lowlevel_init' to support booting ATF from SPL on Intel SOCFPGA (64bits) platforms.
--- arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/lowlevel_init_64.S | 81 ++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 arch/arm/mach-socfpga/lowlevel_init_64.S
arch/arm/mach-socfpga/Makefile +2 -0
@@ -29,6 +29,7 @@ endif ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 obj-y += clock_manager_s10.o +obj-y += lowlevel_init_64.o obj-y += mailbox_s10.o obj-y += misc_s10.o obj-y += mmu-arm64_s10.o
@@ -41,6 +42,7 @@ endif ifdef CONFIG_TARGET_SOCFPGA_AGILEX obj-y += clock_manager_agilex.o +obj-y += lowlevel_init_64.o obj-y += mailbox_s10.o obj-y += misc_s10.o obj-y += mmu-arm64_s10.o
arch/arm/mach-socfpga/lowlevel_init_64.S new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 6/21 configs: socfpga: Enable FIT image loading with ATF support
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
SPL now loads ATF (BL31), U-Boot proper and DTB from FIT image. The new boot flow with ATF support is as follow:
SPL -> ATF (BL31) -> U-Boot proper -> OS (Linux)
U-Boot proper now starts at 0x200000 (CONFIG_SYS_TEXT_BASE). ATF will occupy the address range starting from 0x1000.
--- configs/socfpga_agilex_defconfig | 7 ++++++- configs/socfpga_stratix10_defconfig | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
configs/socfpga_agilex_defconfig +6 -1
@@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x1000 +CONFIG_SYS_TEXT_BASE=0x200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200
@@ -10,10 +10,15 @@ CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y CONFIG_IDENT_STRING="socfpga_agilex" CONFIG_SPL_FS_FAT=y CONFIG_SPL_TEXT_BASE=0xFFE00000 +CONFIG_FIT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_SOURCE="board/altera/soc64/its/fit_spl_atf.its" CONFIG_BOOTDELAY=5 CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000 +CONFIG_SPL_ATF=y +CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " CONFIG_CMD_MEMTEST=y
configs/socfpga_stratix10_defconfig +6 -1
@@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_SOCFPGA=y -CONFIG_SYS_TEXT_BASE=0x1000 +CONFIG_SYS_TEXT_BASE=0x200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200
@@ -10,9 +10,14 @@ CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y CONFIG_IDENT_STRING="socfpga_stratix10" CONFIG_SPL_FS_FAT=y CONFIG_SPL_TEXT_BASE=0xFFE00000 +CONFIG_FIT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_SOURCE="board/altera/soc64/its/fit_spl_atf.its" CONFIG_BOOTDELAY=5 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x3C00000 +CONFIG_SPL_ATF=y +CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # " CONFIG_CMD_MEMTEST=y
Signature · 1 line
2.7.4
PATCH v3 7/21 arm: socfpga: Disable "spin-table" method for booting Linux
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Standard PSCI function "CPU_ON" provided by ATF is now used by Linux kernel to bring up the secondary CPUs to enable SMP booting in Linux on SoC 64bits platform.
--- arch/arm/mach-socfpga/Kconfig | 2 -- 1 file changed, 2 deletions(-)
arch/arm/mach-socfpga/Kconfig +0 -2
@@ -33,7 +33,6 @@ config TARGET_SOCFPGA_AGILEX bool select ARMV8_MULTIENTRY select ARMV8_SET_SMPEN - select ARMV8_SPIN_TABLE select CLK select NCORE_CACHE select SPL_CLK if SPL
@@ -77,7 +76,6 @@ config TARGET_SOCFPGA_STRATIX10 bool select ARMV8_MULTIENTRY select ARMV8_SET_SMPEN - select ARMV8_SPIN_TABLE select FPGA_STRATIX10 choice
Signature · 1 line
2.7.4
PATCH v3 8/21 arm: socfpga: Add SMC helper function for Intel SOCFPGA (64bits)
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Allow U-Boot proper running in non-secure mode (EL2) to invoke SMC call to ATF's PSCI runtime services such as System Manager's registers access, 2nd phase bitstream FPGA reconfiguration, Remote System Update (RSU) and etc.
--- arch/arm/mach-socfpga/include/mach/misc.h | 3 +++ arch/arm/mach-socfpga/misc_s10.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+)
arch/arm/mach-socfpga/include/mach/misc.h +3 -0
@@ -43,4 +43,7 @@ void do_bridge_reset(int enable, unsigned int mask);void socfpga_pl310_clear (void );void socfpga_get_managers_addr (void ); +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +int invoke_smc (u32 func_id,u64 *args,int arg_len,u64 *ret_arg,int ret_len); +#endif #endif /* _SOCFPGA_MISC_H_ */
arch/arm/mach-socfpga/misc_s10.c +20 -0
@@ -164,3 +164,23 @@ void do_bridge_reset(int enable, unsigned int mask)socfpga_bridges_reset (enable); } + +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +int invoke_smc (u32 func_id,u64 *args,int arg_len,u64 *ret_arg,int ret_len) +{ +struct pt_regs regs; + +memset (®s,0 ,sizeof (regs)); + regs.regs[0 ] = func_id; + +if (args) +memcpy (®s.regs[1 ], &args[0 ], arg_len *sizeof (u64)); + +smc_call (®s); + +if (ret_arg) +memcpy (&ret_arg[0 ], ®s.regs[1 ], ret_len *sizeof (u64)); + +return regs.regs[0 ]; +} +#endif
Signature · 1 line
2.7.4
PATCH v3 9/21 arm: socfpga: Define SMC function identifiers for PSCI SiP services
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
This header file defines the Secure Monitor Call (SMC) message protocol for ATF (BL31) PSCI runtime services. It includes all the PSCI SiP function identifiers for the secure runtime services provided by ATF. The secure runtime services include System Manager's registers access, 2nd phase bitstream FPGA reconfiguration, Remote System Update (RSU) and etc.
--- include/linux/intel-smc.h | 374 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 374 insertions(+) create mode 100644 include/linux/intel-smc.h
include/linux/intel-smc.h new file +374 -0
@@ -0,0 +1,374 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2017-2020, Intel Corporation +*/ + +#ifndef __INTEL_SMC_H +#define __INTEL_SMC_H + +#include <linux/arm-smccc.h> +#include <linux/bitops.h> + +/* +* This file defines the Secure Monitor Call (SMC) message protocol used for +* service layer driver in normal world (EL1) to communicate with secure +* monitor software in Secure Monitor Exception Level 3 (EL3). +* +* This file is shared with secure firmware (FW) which is out of kernel tree. +* +* An ARM SMC instruction takes a function identifier and up to 6 64-bit +* register values as arguments, and can return up to 4 64-bit register +* value. The operation of the secure monitor is determined by the parameter +* values passed in through registers. + +* EL1 and EL3 communicates pointer as physical address rather than the +* virtual address. +*/ + +/* +* Functions specified by ARM SMC Calling convention: +* +* FAST call executes atomic operations, returns when the requested operation +* has completed. +* STD call starts a operation which can be preempted by a non-secure +* interrupt. The call can return before the requested operation has +* completed. +* +* a0..a7 is used as register names in the descriptions below, on arm32 +* that translates to r0..r7 and on arm64 to w0..w7. +*/ + +#define INTEL_SIP_SMC_STD_CALL_VAL (func_num) \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_64, \ + ARM_SMCCC_OWNER_SIP, (func_num)) + +#define INTEL_SIP_SMC_FAST_CALL_VAL (func_num) \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_64, \ + ARM_SMCCC_OWNER_SIP, (func_num)) + +/* +* Return values in INTEL_SIP_SMC_* call +* +* INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION: +* Secure monitor software doesn't recognize the request. +* +* INTEL_SIP_SMC_STATUS_OK: +* FPGA configuration completed successfully, +* In case of FPGA configuration write operation, it means secure monitor +* software can accept the next chunk of FPGA configuration data. +* +* INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY: +* In case of FPGA configuration write operation, it means secure monitor +* software is still processing previous data & can't accept the next chunk +* of data. Service driver needs to issue +* INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE call to query the +* completed block(s). +* +* INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR: +* There is error during the FPGA configuration process. +* +* INTEL_SIP_SMC_REG_ERROR: +* There is error during a read or write operation of the protected +* registers. +*/ +#define INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION 0xFFFFFFFF +#define INTEL_SIP_SMC_STATUS_OK 0x0 +#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY 0x1 +#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_REJECTED 0x2 +#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR 0x4 +#define INTEL_SIP_SMC_REG_ERROR 0x5 +#define INTEL_SIP_SMC_RSU_ERROR 0x7 + +/* +* Request INTEL_SIP_SMC_FPGA_CONFIG_START +* +* Sync call used by service driver at EL1 to request the FPGA in EL3 to +* be prepare to receive a new configuration. +* +* Call register usage: +* a0: INTEL_SIP_SMC_FPGA_CONFIG_START. +* a1: flag for full or partial configuration +* 0 full reconfiguration. +* 1 partial reconfiguration. +* a2-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK, or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. +* a1-3: not used. +*/ +#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_START 1 +#define INTEL_SIP_SMC_FPGA_CONFIG_START \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_START) + +/* +* Request INTEL_SIP_SMC_FPGA_CONFIG_WRITE +* +* Async call used by service driver at EL1 to provide FPGA configuration data +* to secure world. +* +* Call register usage: +* a0: INTEL_SIP_SMC_FPGA_CONFIG_WRITE. +* a1: 64bit physical address of the configuration data memory block +* a2: Size of configuration data block. +* a3-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or +* INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. +* a1: 64bit physical address of 1st completed memory block if any completed +* block, otherwise zero value. +* a2: 64bit physical address of 2nd completed memory block if any completed +* block, otherwise zero value. +* a3: 64bit physical address of 3rd completed memory block if any completed +* block, otherwise zero value. +*/ +#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_WRITE 2 +#define INTEL_SIP_SMC_FPGA_CONFIG_WRITE \ + INTEL_SIP_SMC_STD_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_WRITE) + +/* +* Request INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE +* +* Sync call used by service driver at EL1 to track the completed write +* transactions. This request is called after INTEL_SIP_SMC_FPGA_CONFIG_WRITE +* call returns INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY. +* +* Call register usage: +* a0: INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE. +* a1-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or +* INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. +* a1: 64bit physical address of 1st completed memory block. +* a2: 64bit physical address of 2nd completed memory block if +* any completed block, otherwise zero value. +* a3: 64bit physical address of 3rd completed memory block if +* any completed block, otherwise zero value. +*/ +#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE 3 +#define INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE \ +INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE) + +/* +* Request INTEL_SIP_SMC_FPGA_CONFIG_ISDONE +* +* Sync call used by service driver at EL1 to inform secure world that all +* data are sent, to check whether or not the secure world had completed +* the FPGA configuration process. +* Set 1 in 2nd argument (a1) to query the status of the first phase FPGA +* configuration by sending MBOX_CONFIG_STATUS to SDM. Otherwise this sync +* call always query the status of 2nd phase FPGA reconfiguration by sending +* MBOX_RECONFIG_STATUS to SDM. +* +* Call register usage: +* a0: INTEL_SIP_SMC_FPGA_CONFIG_ISDONE. +* a1: set 1 to send MBOX_CONFIG_STATUS otherwise send MBOX_RECONFIG_STATUS +* a2-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or +* INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. +* a1-3: not used. +*/ +#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_ISDONE 4 +#define INTEL_SIP_SMC_FPGA_CONFIG_ISDONE \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_ISDONE) + +/* +* Request INTEL_SIP_SMC_FPGA_CONFIG_GET_MEM +* +* Sync call used by service driver at EL1 to query the physical address of +* memory block reserved by secure monitor software. +* +* Call register usage: +* a0:INTEL_SIP_SMC_FPGA_CONFIG_GET_MEM. +* a1-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR. +* a1: start of physical address of reserved memory block. +* a2: size of reserved memory block. +* a3: not used. +*/ +#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_GET_MEM 5 +#define INTEL_SIP_SMC_FPGA_CONFIG_GET_MEM \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_GET_MEM) + +/* +* Request INTEL_SIP_SMC_REG_READ +* +* Read a protected register using SMCCC +* +* Call register usage: +* a0: INTEL_SIP_SMC_REG_READ. +* a1: register address. +* a2-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_REG_ERROR. +* a1: Value in the register +* a2-3: not used. +*/ +#define INTEL_SIP_SMC_FUNCID_REG_READ 7 +#define INTEL_SIP_SMC_REG_READ \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_READ) + +/* +* Request INTEL_SIP_SMC_REG_WRITE +* +* Write a protected register using SMCCC +* +* Call register usage: +* a0: INTEL_SIP_SMC_REG_WRITE. +* a1: register address +* a2: value to program into register. +* a3-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_REG_ERROR. +* a1-3: not used. +*/ +#define INTEL_SIP_SMC_FUNCID_REG_WRITE 8 +#define INTEL_SIP_SMC_REG_WRITE \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_WRITE) + +/* +* Request INTEL_SIP_SMC_FUNCID_REG_UPDATE +* +* Update one or more bits in a protected register using a +* read-modify-write operation. +* +* Call register usage: +* a0: INTEL_SIP_SMC_REG_UPDATE. +* a1: register address +* a2: Write Mask. +* a3: Value to write. +* a4-7: not used. +* +* Return status: +* a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_REG_ERROR. +* a1-3: Not used. +*/ +#define INTEL_SIP_SMC_FUNCID_REG_UPDATE 9 +#define INTEL_SIP_SMC_REG_UPDATE \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_REG_UPDATE) + +/* +* Request INTEL_SIP_SMC_RSU_STATUS +* +* Sync call used by service driver at EL1 to query the RSU status +* +* Call register usage: +* a0 INTEL_SIP_SMC_RSU_STATUS +* a1-7 not used +* +* Return status +* a0: Current Image +* a1: Last Failing Image +* a2: Version [width 32 bit] | State [width 32 bit] +* a3: Error details [width 32 bit] | Error location [width 32 bit] +* +* Or +* +* a0: INTEL_SIP_SMC_RSU_ERROR +*/ +#define INTEL_SIP_SMC_FUNCID_RSU_STATUS 11 +#define INTEL_SIP_SMC_RSU_STATUS \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_STATUS) + +/* +* Request INTEL_SIP_SMC_RSU_UPDATE +* +* Sync call used by service driver at EL1 to tell you next reboot is RSU_UPDATE +* +* Call register usage: +* a0 INTEL_SIP_SMC_RSU_UPDATE +* a1 64bit physical address of the configuration data memory in flash +* a2-7 not used +* +* Return status +* a0 INTEL_SIP_SMC_STATUS_OK +*/ +#define INTEL_SIP_SMC_FUNCID_RSU_UPDATE 12 +#define INTEL_SIP_SMC_RSU_UPDATE \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_UPDATE) + +/* +* Request INTEL_SIP_SMC_ECC_DBE +* +* Sync call used by service driver at EL1 alert EL3 that a Double Bit +* ECC error has occurred. +* +* Call register usage: +* a0 INTEL_SIP_SMC_ECC_DBE +* a1 SysManager Double Bit Error value +* a2-7 not used +* +* Return status +* a0 INTEL_SIP_SMC_STATUS_OK +*/ +#define INTEL_SIP_SMC_FUNCID_ECC_DBE 13 +#define INTEL_SIP_SMC_ECC_DBE \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_ECC_DBE) + +/* +* Request INTEL_SIP_SMC_RSU_NOTIFY +* +* Sync call used by service driver at EL1 to report HPS software execution +* stage +* +* Call register usage: +* a0 INTEL_SIP_SMC_RSU_NOTIFY +* a1 32bit HPS software execution stage +* a2-7 not used +* +* Return status +* a0 INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_REG_ERROR. +*/ +#define INTEL_SIP_SMC_FUNCID_RSU_NOTIFY 14 +#define INTEL_SIP_SMC_RSU_NOTIFY \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_NOTIFY) + +/* +* Request INTEL_SIP_SMC_RSU_RETRY_COUNTER +* +* Sync call used by service driver at EL1 to query the RSU retry counter +* +* Call register usage: +* a0 INTEL_SIP_SMC_RSU_RETRY_COUNTER +* a1-7 not used +* +* Return status +* a0 INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_RSU_ERROR. +* a1 retry counter +*/ +#define INTEL_SIP_SMC_FUNCID_RSU_RETRY_COUNTER 15 +#define INTEL_SIP_SMC_RSU_RETRY_COUNTER \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_RETRY_COUNTER) + +/* +* Request INTEL_SIP_SMC_MBOX_SEND_CMD +* +* Sync call used by service driver at EL1 to send mailbox command to SDM +* +* Call register usage: +* a0 INTEL_SIP_SMC_MBOX_SEND_CMD +* a1 Mailbox command +* a2 64bit physical address pointer to command's arguments +* a3 Length of the argument +* a4 Urgent command enable = 1 / disable = 0 +* a5 64bit physical address pointer to a buffer for receiving responses +* a6 Length of the buffer +* +* Return status +* a0 INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_RSU_ERROR. +* a1 Status of mailbox response +* a2 64bit physical address pointer to a buffer for receiving responses +* a3 Received length in the buffer +*/ +#define INTEL_SIP_SMC_FUNCID_MBOX_SEND_CMD 30 +#define INTEL_SIP_SMC_MBOX_SEND_CMD \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_MBOX_SEND_CMD) + +#endif
Signature · 1 line
2.7.4
PATCH v3 10/21 arm: socfpga: Add secure register access helper functions for SoC 64bits
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
These secure register access functions allow U-Boot proper running at EL2 (non-secure) to access System Manager's secure registers by calling the ATF's PSCI runtime services (EL3/secure). If these helper functions are called from secure mode (EL3), the helper function will direct access the secure registers without calling the ATF's PSCI runtime services.
--- arch/arm/mach-socfpga/Makefile | 4 ++ .../mach-socfpga/include/mach/secure_reg_helper.h | 20 ++++++++ arch/arm/mach-socfpga/secure_reg_helper.c | 57 ++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_reg_helper.h create mode 100644 arch/arm/mach-socfpga/secure_reg_helper.c
arch/arm/mach-socfpga/Makefile +4 -0
@@ -53,6 +53,10 @@ obj-y += wrap_pinmux_config_s10.o obj-y += wrap_pll_config_s10.o endif +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_SPL_ATF) +=secure_reg_helper.o +endif + ifdef CONFIG_SPL_BUILD ifdef CONFIG_TARGET_SOCFPGA_GEN5 obj-y += spl_gen5.o
arch/arm/mach-socfpga/include/mach/secure_reg_helper.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (C) 2019 Intel Corporation <www.intel.com> +* +*/ + +#ifndef _SECURE_REG_HELPER_H_ +#define _SECURE_REG_HELPER_H_ + +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +u32 socfpga_secure_reg_read32 (phys_addr_t reg_addr); +void socfpga_secure_reg_write32 (u32 val,phys_addr_t reg_addr); +void socfpga_secure_reg_update32 (phys_addr_t reg_addr,u32 mask,u32 val); +#else +#define socfpga_secure_reg_read32 readl +#define socfpga_secure_reg_write32 writel +#define socfpga_secure_reg_update32 clrsetbits_le32 +#endif + +#endif /* _SECURE_REG_HELPER_H_ */
arch/arm/mach-socfpga/secure_reg_helper.c new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 11/21 arm: socfpga: Secure register access for clock manager (SoC 64bits)
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Allow clock manager driver to access the System Manager's Boot Scratch Register 0 in non-secure mode (EL2) on SoC 64bits platform.
--- arch/arm/mach-socfpga/clock_manager_agilex.c | 5 +++-- arch/arm/mach-socfpga/clock_manager_s10.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/mach-socfpga/clock_manager_agilex.c +3 -2
@@ -12,6 +12,7 @@#include <asm/arch/system_manager.h> #include <asm/io.h> #include <dt-bindings/clock/agilex-clock.h> +#include <asm/arch/secure_reg_helper.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -65,8 +66,8 @@ unsigned int cm_get_l4_sys_free_clk_hz(void)u32 cm_get_qspi_controller_clk_hz (void ) { -return readl (socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_BOOT_SCRATCH_COLD0 ); +return socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_BOOT_SCRATCH_COLD0 ); }void cm_print_clock_quick_summary (void )
arch/arm/mach-socfpga/clock_manager_s10.c +3 -2
@@ -9,6 +9,7 @@#include <asm/arch/clock_manager.h> #include <asm/arch/handoff_s10.h> #include <asm/arch/system_manager.h> +#include <asm/arch/secure_reg_helper.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -385,8 +386,8 @@ unsigned int cm_get_l4_sp_clk_hz(void)unsigned int cm_get_qspi_controller_clk_hz (void ) { -return readl (socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_BOOT_SCRATCH_COLD0 ); +return socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_BOOT_SCRATCH_COLD0 ); }unsigned int cm_get_spi_controller_clk_hz (void )
Signature · 1 line
2.7.4
PATCH v3 12/21 arm: socfpga: Secure register access in PHY mode setup
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Allow access to System Manager's EMAC control register from non-secure mode during PHY mode setup.
--- arch/arm/mach-socfpga/misc_s10.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-socfpga/misc_s10.c +4 -3
@@ -18,6 +18,7 @@#include <asm/pl310.h> #include <linux/libfdt.h> #include <asm/arch/mailbox_s10.h> +#include <asm/arch/secure_reg_helper.h> #include <dt-bindings/reset/altr,rst-mgr-s10.h>
@@ -65,9 +66,9 @@ static u32 socfpga_phymode_setup(u32 gmac_index, const char *phymode)else return -EINVAL ; -clrsetbits_le32 (socfpga_get_sysmgr_addr () +SYSMGR_SOC64_EMAC0 + - gmac_index, -SYSMGR_EMACGRP_CTRL_PHYSEL_MASK , modereg); +socfpga_secure_reg_update32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_EMAC0 + gmac_index, +SYSMGR_EMACGRP_CTRL_PHYSEL_MASK , modereg);return 0 ; }
Signature · 1 line
2.7.4
PATCH v3 13/21 arm: socfpga: Secure register access for reading PLL frequency
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Allow reading external oscillator and FPGA clock's frequency from System Manager's Boot Scratch Register 1 and Boot Scratch Register 2 in non-secure mode (EL2) on SoC 64bits platform.
--- arch/arm/mach-socfpga/wrap_pll_config_s10.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/arm/mach-socfpga/wrap_pll_config_s10.c +5 -4
@@ -9,6 +9,7 @@#include <asm/io.h> #include <asm/arch/handoff_s10.h> #include <asm/arch/system_manager.h> +#include <asm/arch/secure_reg_helper.h> const struct cm_config *const cm_get_default_config (void ) {
@@ -39,8 +40,8 @@ const unsigned int cm_get_osc_clk_hz(void)writel (clock,socfpga_get_sysmgr_addr () +SYSMGR_SOC64_BOOT_SCRATCH_COLD1 );#endif -return readl (socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_BOOT_SCRATCH_COLD1 ); +return socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_BOOT_SCRATCH_COLD1 ); }const unsigned int cm_get_intosc_clk_hz (void )
@@ -56,6 +57,6 @@ const unsigned int cm_get_fpga_clk_hz(void)writel (clock,socfpga_get_sysmgr_addr () +SYSMGR_SOC64_BOOT_SCRATCH_COLD2 );#endif -return readl (socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_BOOT_SCRATCH_COLD2 ); +return socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_BOOT_SCRATCH_COLD2 ); }
Signature · 1 line
2.7.4
PATCH v3 14/21 mmc: dwmmc: socfpga: Secure register access in MMC driver
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Allow MMC driver to access System Manager's SDMMC control register in non-secure mode (EL2).
--- drivers/mmc/socfpga_dw_mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/socfpga_dw_mmc.c +5 -2
@@ -5,6 +5,7 @@#include <common.h> #include <asm/arch/clock_manager.h> +#include <asm/arch/secure_reg_helper.h> #include <asm/arch/system_manager.h> #include <clk.h> #include <dm.h>
@@ -57,10 +58,12 @@ static void socfpga_dwmci_clksel(struct dwmci_host *host)debug ("%s: drvsel %d smplsel %d\n" , __func__, priv->drvsel, priv->smplsel); -writel (sdmmc_mask,socfpga_get_sysmgr_addr () +SYSMGR_SDMMC ); +socfpga_secure_reg_write32 (sdmmc_mask,socfpga_get_sysmgr_addr () + +SYSMGR_SDMMC );debug ("%s: SYSMGR_SDMMCGRP_CTRL_REG = 0x%x\n" , __func__, -readl (socfpga_get_sysmgr_addr () +SYSMGR_SDMMC )); +socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SDMMC ));/* Enable SDMMC clock */ setbits_le32(socfpga_get_clkmgr_addr() + CLKMGR_PERPLL_EN,
Signature · 1 line
2.7.4
PATCH v3 15/21 net: designware: socfpga: Secure register access in MAC driver
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Allow MAC driver to access System Manager's EMAC control registers in non-secure mode.
--- drivers/net/dwmac_socfpga.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/dwmac_socfpga.c +3 -2
@@ -17,6 +17,7 @@#include <dm/device_compat.h> #include <linux/err.h> +#include <asm/arch/secure_reg_helper.h> #include <asm/arch/system_manager.h> struct dwmac_socfpga_platdata {
@@ -98,8 +99,8 @@ static int dwmac_socfpga_probe(struct udevice *dev)reset_assert_bulk (&reset_bulk); modemask =SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << pdata->reg_shift; -clrsetbits_le32 (pdata->phy_intf, modemask, - modereg << pdata->reg_shift); +socfpga_secure_reg_update32 ((phys_addr_t )pdata->phy_intf, modemask, + modereg << pdata->reg_shift);reset_release_bulk (&reset_bulk);
Signature · 1 line
2.7.4
PATCH v3 16/21 arm: socfpga: Secure register access in Reset Manager driver
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Allow socfpga_bridges_reset() function in Reset Manager driver to access System Manager's register in non-secure mode (EL2).
--- arch/arm/mach-socfpga/reset_manager_s10.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
arch/arm/mach-socfpga/reset_manager_s10.c +18 -13
@@ -7,6 +7,7 @@#include <common.h> #include <asm/io.h> #include <asm/arch/reset_manager.h> +#include <asm/arch/secure_reg_helper.h> #include <asm/arch/system_manager.h> #include <dt-bindings/reset/altr,rst-mgr-s10.h>
@@ -56,34 +57,37 @@ void socfpga_bridges_reset(int enable) {if (enable) {/* clear idle request to all bridges */ -setbits_le32 (socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_NOC_IDLEREQ_CLR , ~0 ); +socfpga_secure_reg_update32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLEREQ_CLR , + ~0 , ~0 );/* Release all bridges from reset state */ clrbits_le32 (socfpga_get_rstmgr_addr () +RSTMGR_SOC64_BRGMODRST , ~0 );/* Poll until all idleack to 0 */ -while (readl (socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_NOC_IDLEACK )) +while (socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLEACK )) ; }else {/* set idle request to all bridges */ -writel (~0 , -socfpga_get_sysmgr_addr () + -SYSMGR_SOC64_NOC_IDLEREQ_SET ); +socfpga_secure_reg_write32 (~0 ,socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLEREQ_SET );/* Enable the NOC timeout */ -writel (1 ,socfpga_get_sysmgr_addr () +SYSMGR_SOC64_NOC_TIMEOUT ); +socfpga_secure_reg_write32 (1 ,socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_TIMEOUT );/* Poll until all idleack to 1 */ -while ((readl (socfpga_get_sysmgr_addr () +SYSMGR_SOC64_NOC_IDLEACK ) ^ - (SYSMGR_NOC_H2F_MSK |SYSMGR_NOC_LWH2F_MSK ))) +while ((socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLEACK ) ^ (SYSMGR_NOC_H2F_MSK | +SYSMGR_NOC_LWH2F_MSK ))) ;/* Poll until all idlestatus to 1 */ -while ((readl (socfpga_get_sysmgr_addr () +SYSMGR_SOC64_NOC_IDLESTATUS ) ^ - (SYSMGR_NOC_H2F_MSK |SYSMGR_NOC_LWH2F_MSK ))) +while ((socfpga_secure_reg_read32 (socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_IDLESTATUS ) ^ (SYSMGR_NOC_H2F_MSK | +SYSMGR_NOC_LWH2F_MSK ))) ;/* Reset all bridges (except NOR DDR scheduler & F2S) */
@@ -92,7 +96,8 @@ void socfpga_bridges_reset(int enable) RSTMGR_BRGMODRST_FPGA2SOC_MASK));/* Disable NOC timeout */ -writel (0 ,socfpga_get_sysmgr_addr () +SYSMGR_SOC64_NOC_TIMEOUT ); +socfpga_secure_reg_write32 (0 ,socfpga_get_sysmgr_addr () + +SYSMGR_SOC64_NOC_TIMEOUT ); } }
Signature · 1 line
2.7.4
PATCH v3 17/21 arm: socfpga: stratix10: Initialize timer in SPL
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Initialize timer in SPL running in secure mode (EL3) and skip timer initialization in U-Boot proper running in non-secure mode (EL2).
--- arch/arm/mach-socfpga/timer_s10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/timer_s10.c +2 -1
@@ -13,6 +13,7 @@*/ int timer_init (void ) { +#ifdef CONFIG_SPL_BUILD int enable =0x3 ;/* timer enable + output signal masked */ int loadval = ~0 ;
@@ -21,6 +22,6 @@ int timer_init(void)/* enable processor pysical counter */ asmvolatile ("msr cntp_ctl_el0, %0" : :"r" (enable)); asmvolatile ("msr cntp_tval_el0, %0" : :"r" (loadval)); - +#endif return 0 ; }
Signature · 1 line
2.7.4
PATCH v3 18/21 arm: socfpga: Bridge reset invokes SMC service calls in EL2
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
In EL3, do_bridge_reset() directly send mailbox commands to SDM to query the FPGA configuration status. If running in non-secure mode (EL2), it invokes SMC service calls to ATF (EL3) to perform the query.
--- arch/arm/mach-socfpga/misc_s10.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/misc_s10.c +15 -1
@@ -17,6 +17,7 @@#include <asm/arch/misc.h> #include <asm/pl310.h> #include <linux/libfdt.h> +#include <linux/intel-smc.h> #include <asm/arch/mailbox_s10.h> #include <asm/arch/secure_reg_helper.h>
@@ -154,11 +155,24 @@ void do_bridge_reset(int enable, unsigned int mask) {/* Check FPGA status before bridge enable */ if (enable) { +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +u64 arg =1 ; + +/* Send MBOX_RECONFIG_STATUS to SDM */ +int ret =invoke_smc (INTEL_SIP_SMC_FPGA_CONFIG_ISDONE ,NULL ,0 , +NULL ,0 ); + +if (ret && ret !=INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY ) { +/* Send MBOX_CONFIG_STATUS to SDM */ + ret =invoke_smc (INTEL_SIP_SMC_FPGA_CONFIG_ISDONE , + &arg,1 ,NULL ,0 ); + } +#else int ret =mbox_get_fpga_config_status (MBOX_RECONFIG_STATUS );if (ret && ret !=MBOX_CFGSTAT_STATE_CONFIG ) ret =mbox_get_fpga_config_status (MBOX_CONFIG_STATUS ); - +#endif if (ret)return ; }
Signature · 1 line
2.7.4
PATCH v3 19/21 arm: socfpga: stratix10: Add ATF support to FPGA reconfig driver
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
FPGA recpnfiguration driver will call the ATF's PSCI runtime services if it's running in non-secure mode (EL2).
--- drivers/fpga/stratix10.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-)
drivers/fpga/stratix10.c +140 -1
@@ -5,11 +5,148 @@#include <common.h> #include <altera.h> -#include <asm/arch/mailbox_s10.h> #define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS 60000#define RECONFIG_STATUS_INTERVAL_DELAY_US 1000000 +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF) + +#include <asm/arch/misc.h> +#include <linux/intel-smc.h> + +#define BITSTREAM_CHUNK_SIZE 0xFFFF0 +#define RECONFIG_STATUS_POLL_RETRY_MAX 100 + +/* + * Polling the FPGA configuration status. + * Return 0 for success, non-zero for error. + */ +static int reconfig_status_polling_resp(void) +{ + int ret; + unsigned long start = get_timer(0); + + while (1) { + ret = invoke_smc(INTEL_SIP_SMC_FPGA_CONFIG_ISDONE, NULL, 0, + NULL, 0); + + if (!ret) + return 0; /* configuration success */ + + if (ret != INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY) + return ret; + + if (get_timer(start) > RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS) + break; /* time out */ + + puts("."); + udelay(RECONFIG_STATUS_INTERVAL_DELAY_US); + } + + return -ETIMEDOUT; +} + +static int send_bistream(const void *rbf_data, size_t rbf_size) +{ + int i; + u64 res_buf[3]; + u64 args[2]; + u32 xfer_count = 0; + int ret, wr_ret = 0, retry = 0; + size_t buf_size = (rbf_size > BITSTREAM_CHUNK_SIZE) ? + BITSTREAM_CHUNK_SIZE : rbf_size; + + while (rbf_size || xfer_count) { + if (!wr_ret && rbf_size) { + args[0] = (u64)rbf_data; + args[1] = buf_size; + wr_ret = invoke_smc(INTEL_SIP_SMC_FPGA_CONFIG_WRITE, + args, 2, NULL, 0); + + debug("wr_ret = %d, rbf_data = %p, buf_size = %08lx\n", + wr_ret, rbf_data, buf_size); + + if (wr_ret == INTEL_SIP_SMC_FPGA_CONFIG_STATUS_REJECTED) + continue; + + rbf_size -= buf_size; + rbf_data += buf_size; + + if (buf_size >= rbf_size) + buf_size = rbf_size; + + xfer_count++; + puts("."); + } else { + ret = invoke_smc( + INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE, + NULL, 0, res_buf, 3); + if (!ret) { + for (i = 0; i < 3; i++) { + if (!res_buf[i]) + break; + xfer_count--; + wr_ret = 0; + retry = 0; + } + } else if (ret != + INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY) + return ret; + else if (!xfer_count) + return INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR; + + if (++retry >= RECONFIG_STATUS_POLL_RETRY_MAX) + return -ETIMEDOUT; + + udelay(20000); + } + } + + return 0; +} + +/* + * This is the interface used by FPGA driver. + * Return 0 for success, non-zero for error. + */ +int stratix10_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) +{ + int ret; + + debug("Invoking FPGA_CONFIG_START...\n"); + + ret = invoke_smc(INTEL_SIP_SMC_FPGA_CONFIG_START, NULL, 0, NULL, 0); + + if (ret) { + puts("Failure in RECONFIG mailbox command!\n"); + return ret; + } + + ret = send_bistream(rbf_data, rbf_size); + if (ret) { + printf("Error sending bitstream!\n"); + return ret; + } + + /* Make sure we don't send MBOX_RECONFIG_STATUS too fast */ + udelay(RECONFIG_STATUS_INTERVAL_DELAY_US); + + debug("Polling with MBOX_RECONFIG_STATUS...\n"); + ret = reconfig_status_polling_resp(); + if (ret) { + printf("FPGA reconfiguration failed!"); + return ret; + } + + puts("FPGA reconfiguration OK!\n"); + + return ret; +} + +#else + +#include <asm/arch/mailbox_s10.h> + static const struct mbox_cfgstat_state { int err_no; const char *error_name;
@@ -281,3 +418,5 @@ int stratix10_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) return ret; } + +#endif
Signature · 1 line
2.7.4
PATCH v3 20/21 arm: socfpga: mailbox: Add 'SYSTEM_RESET' PSCI support to mbox_reset_cold()
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
mbox_reset_cold() will invoke ATF's PSCI service when running in non-secure mode (EL2).
--- arch/arm/mach-socfpga/mailbox_s10.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/mach-socfpga/mailbox_s10.c +4 -0
@@ -330,6 +330,9 @@ error:int mbox_reset_cold (void ) { +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +psci_system_reset (); +#else int ret; ret = mbox_send_cmd(MBOX_ID_UBOOT, MBOX_REBOOT_HPS, MBOX_CMD_DIRECT,
@@ -338,6 +341,7 @@ int mbox_reset_cold(void)/* mailbox sent failure, wait for watchdog to kick in */ hang(); } +#endif return 0 ; }
Signature · 1 line
2.7.4
PATCH v3 21/21 configs: socfpga: Add defconfig for Agilex and Stratix 10 without ATF support
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Booting Agilex and Stratix 10 without ATF support.
SPL -> U-Boot proper -> OS (Linux)
--- configs/socfpga_agilex_nofw_defconfig | 59 ++++++++++++++++++++++++++++++ configs/socfpga_stratix10_nofw_defconfig | 63 ++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 configs/socfpga_agilex_nofw_defconfig create mode 100644 configs/socfpga_stratix10_nofw_defconfig
configs/socfpga_agilex_nofw_defconfig new file +59 -0
@@ -0,0 +1,59 @@ +CONFIG_ARM=y +CONFIG_ARCH_SOCFPGA=y +CONFIG_SYS_TEXT_BASE=0x1000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_ENV_SIZE=0x1000 +CONFIG_ENV_OFFSET=0x200 +CONFIG_DM_GPIO=y +CONFIG_NR_DRAM_BANKS=2 +CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y +CONFIG_IDENT_STRING="socfpga_agilex" +CONFIG_SPL_FS_FAT=y +# CONFIG_PSCI_RESET is not set +CONFIG_SPL_TEXT_BASE=0xFFE00000 +CONFIG_BOOTDELAY=5 +CONFIG_SPL_CACHE=y +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000 +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # " +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_SPL_ALTERA_SDRAM=y +CONFIG_DWAPB_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_DW=y +CONFIG_DM_MMC=y +CONFIG_MMC_DW=y +CONFIG_SF_DEFAULT_MODE=0x2003 +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHY_MICREL=y +CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_MII=y +CONFIG_DM_RESET=y +CONFIG_SPI=y +CONFIG_CADENCE_QSPI=y +CONFIG_DESIGNWARE_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_DWC2=y +CONFIG_USB_STORAGE=y +# CONFIG_SPL_USE_TINY_PRINTF is not set
configs/socfpga_stratix10_nofw_defconfig new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.7.4