Enable ARM Trusted Firmware for U-Boot
Subsystems (8)
v4 cover Enable ARM Trusted Firmware for U-Boot
From: "Ang, Chee Hong" <[email protected]>
v4 changes:
[PATCH v4 11/21] misc: altera_sysmgr: Add Altera System Manager
- Add System Manager driver (UCLASS_MISC) to handle secure access for SoC64
[PATCH v4 13/21] mmc: dwmmc: socfpga: MMC driver access System Manager via 'altera_sysmgr'
- DW MMC driver access System Manager via the System Manager driver
[PATCH v4 14/21] arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC
- DW MMC driver get DRVSEL & SMPLSEL clock settings from device tree
[PATCH v4 15/21] net: designware: socfpga: MAC driver access System via 'altera_sysmgr'
- DW MAC driver access System Manager via the System Manager driver
v3:
https://lists.denx.de/pipermail/u-boot/2020-February/400986.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: soc64: Remove PHY interface setup from misc arch init
misc: altera_sysmgr: Add Altera System Manager driver
arch: arm: socfpga: Enable driver model for misc drivers.
mmc: dwmmc: socfpga: MMC driver access System Manager via
'altera_sysmgr'
arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC node in device
tree
net: designware: socfpga: MAC driver access System Manager via
'altera_sysmgr'
arm: socfpga: Add ATF support for Reset Manager driver
arm: socfpga: stratix10: Initialize timer in SPL
arm: socfpga: Add ATF support to query FPGA configuration status
arm: socfpga: stratix10: Add ATF support for 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/Kconfig | 2 +
arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 1 +
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 1 +
arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 1 +
arch/arm/dts/socfpga_cyclone5.dtsi | 1 +
arch/arm/dts/socfpga_stratix10.dtsi | 1 -
arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 7 +
arch/arm/dts/socfpga_stratix10_socdk.dts | 2 -
arch/arm/mach-socfpga/Kconfig | 2 -
arch/arm/mach-socfpga/Makefile | 2 +
arch/arm/mach-socfpga/board.c | 10 +
arch/arm/mach-socfpga/include/mach/misc.h | 3 +
arch/arm/mach-socfpga/lowlevel_init_64.S | 81 +++++
arch/arm/mach-socfpga/mailbox_s10.c | 4 +
arch/arm/mach-socfpga/misc_s10.c | 121 ++-----
arch/arm/mach-socfpga/reset_manager_s10.c | 10 +
arch/arm/mach-socfpga/timer_s10.c | 3 +-
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/misc/Makefile | 1 +
drivers/misc/altera_sysmgr.c | 115 ++++++
drivers/mmc/socfpga_dw_mmc.c | 63 +++-
drivers/net/dwmac_socfpga.c | 37 +-
include/configs/socfpga_soc64_common.h | 4 +
include/linux/intel-smc.h | 393 +++++++++++++++++++++
29 files changed, 955 insertions(+), 122 deletions(-)
create mode 100644 arch/arm/mach-socfpga/lowlevel_init_64.S
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 drivers/misc/altera_sysmgr.c
create mode 100644 include/linux/intel-smc.hSignature · 1 line
2.7.4
PATCH v4 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 v4 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 SoC64"; + 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 = "U-Boot SoC64 flat device-tree"; + data = /incbin/("../../../../u-boot.dtb"); + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "conf"; + conf { + description = "Intel SoC64 FPGA"; + firmware = "atf"; + loadables = "uboot"; + fdt = "fdt"; + }; + }; +};
Signature · 1 line
2.7.4
PATCH v4 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 v4 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 v4 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 make sure secondary CPUs trapped in ATF instead of SPL. After ATF is initialized, it will signal the secondary CPUs to jump from SPL to ATF waiting to be 'activated' by Linux OS via PSCI call.
--- 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 v4 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 v4 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 v4 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 v4 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 | 393 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 393 insertions(+) create mode 100644 include/linux/intel-smc.h
include/linux/intel-smc.h new file +393 -0
@@ -0,0 +1,393 @@ +/* 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_STATUS_BUSY 0x1 +#define INTEL_SIP_SMC_STATUS_REJECTED 0x2 +#define INTEL_SIP_SMC_STATUS_ERROR 0x4 + +/* +* 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_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_STATUS_BUSY, +* INTEL_SIP_SMC_STATUS_REJECTED or INTEL_SIP_SMC_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_STATUS_BUSY or +* INTEL_SIP_SMC_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_STATUS_BUSY or +* INTEL_SIP_SMC_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_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_STATUS_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_STATUS_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_STATUS_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_STATUS_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_STATUS_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_STATUS_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 +* +* 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: +* 0 - Disable +* 1 - Enable +* 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_STATUS_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) + +/* +* Request INTEL_SIP_SMC_HPS_SET_BRIDGES +* +* Enable/disable the SoC FPGA bridges +* +* Call register usage: +* a0 INTEL_SIP_SMC_HPS_SET_BRIDGES +* a1 Set bridges status: +* 0 - Disable +* 1 - Enable +* a2-7 not used +* +* Return status +* a0 INTEL_SIP_SMC_STATUS_OK +*/ +#define INTEL_SIP_SMC_FUNCID_HPS_SET_BRIDGES 60 +#define INTEL_SIP_SMC_HPS_SET_BRIDGES \ + INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_HPS_SET_BRIDGES) + +#endif
Signature · 1 line
2.7.4
PATCH v4 10/21 arm: socfpga: soc64: Remove PHY interface setup from misc arch init
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
'dwmac_socfpga' driver will setup the PHY interface during probe. PHY interface setup in arch_misc_init() is no longer needed.
--- arch/arm/mach-socfpga/misc_s10.c | 85 +--------------------------------------- 1 file changed, 1 insertion(+), 84 deletions(-)
arch/arm/mach-socfpga/misc_s10.c +1 -84
@@ -8,18 +8,10 @@#include <common.h> #include <env.h> #include <errno.h> -#include <fdtdec.h> -#include <miiphy.h> -#include <netdev.h> #include <asm/io.h> -#include <asm/arch/reset_manager.h> -#include <asm/arch/system_manager.h> #include <asm/arch/misc.h> -#include <asm/pl310.h> -#include <linux/libfdt.h> #include <asm/arch/mailbox_s10.h> - -#include <dt-bindings/reset/altr,rst-mgr-s10.h> +#include <asm/arch/reset_manager.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -44,80 +36,6 @@ static Altera_desc altera_fpga[] = { };/* -* DesignWare Ethernet initialization -*/ -#ifdef CONFIG_ETH_DESIGNWARE - -static u32 socfpga_phymode_setup (u32 gmac_index,const char *phymode) -{ -u32 modereg; - -if (!phymode) -return -EINVAL ; - -if (!strcmp (phymode,"mii" ) || !strcmp (phymode,"gmii" ) || - !strcmp (phymode,"sgmii" )) - modereg =SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII ; -else if (!strcmp (phymode,"rgmii" )) - modereg =SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII ; -else if (!strcmp (phymode,"rmii" )) - modereg =SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RMII ; -else -return -EINVAL ; - -clrsetbits_le32 (socfpga_get_sysmgr_addr () +SYSMGR_SOC64_EMAC0 + - gmac_index, -SYSMGR_EMACGRP_CTRL_PHYSEL_MASK , modereg); - -return 0 ; -} - -static int socfpga_set_phymode (void ) -{ -const void *fdt = gd->fdt_blob; -struct fdtdec_phandle_args args; -const char *phy_mode; -u32 gmac_index; -int nodes[3 ];/* Max. 3 GMACs */ -int ret, count; -int i, node; - - count =fdtdec_find_aliases_for_id (fdt,"ethernet" , -COMPAT_ALTERA_SOCFPGA_DWMAC , - nodes,ARRAY_SIZE (nodes)); -for (i =0 ; i < count; i++) { - node = nodes[i]; -if (node <=0 ) -continue ; - - ret =fdtdec_parse_phandle_with_args (fdt, node,"resets" , -"#reset-cells" ,1 ,0 , - &args); -if (ret || args.args_count !=1 ) { -debug ("GMAC%i: Failed to parse DT 'resets'!\n" , i); -continue ; - } - - gmac_index = args.args[0 ] -EMAC0_RESET ; - - phy_mode =fdt_getprop (fdt, node,"phy-mode" ,NULL ); - ret =socfpga_phymode_setup (gmac_index, phy_mode); -if (ret) { -debug ("GMAC%i: Failed to parse DT 'phy-mode'!\n" , i); -continue ; - } - } - -return 0 ; -} -#else -static int socfpga_set_phymode (void ) -{ -return 0 ; -}; -#endif - -/* * Print CPU information */ #if defined(CONFIG_DISPLAY_CPUINFO )
@@ -137,7 +55,6 @@ int arch_misc_init(void)sprintf (qspi_string,"<0x%08x>" ,cm_get_qspi_controller_clk_hz ());env_set ("qspi_clock" , qspi_string); -socfpga_set_phymode (); return 0; }#endif
Signature · 1 line
2.7.4
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
This driver (misc uclass) handle the read/write access to System Manager. For 64 bits platforms, processor needs to be in secure mode to has write access to most of the System Manager's registers (except boot scratch registers). When the processor is running in EL2 (non-secure), this driver will invoke the SMC call to ATF to perform write access to the System Manager's registers. All other drivers that require access to System Manager should go through this driver.
--- drivers/misc/Makefile | 1 + drivers/misc/altera_sysmgr.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 drivers/misc/altera_sysmgr.c
drivers/misc/Makefile +1 -0
@@ -29,6 +29,7 @@ endif endif obj-$(CONFIG_ALI152X) += ali512x.o obj-$(CONFIG_ALTERA_SYSID) += altera_sysid.o +obj-$(CONFIG_ARCH_SOCFPGA) += altera_sysmgr.o obj-$(CONFIG_ATSHA204A) += atsha204a-i2c.o obj-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.o obj-$(CONFIG_DS4510) += ds4510.o
drivers/misc/altera_sysmgr.c new file +115 -0
115 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
Am 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
drivers/misc/altera_sysmgr.c
Quoted 35 lines
From: Chee Hong Ang <[email protected]>
This driver (misc uclass) handle the read/write access to System Manager. For 64 bits platforms, processor needs to be in secure mode to has write access to most of the System Manager's registers (except boot scratch registers). When the processor is running in EL2 (non-secure), this driver will invoke the SMC call to ATF to perform write access to the System Manager's registers. All other drivers that require access to System Manager should go through this driver.
Signed-off-by Chee Hong Ang <[email protected]>--- drivers/misc/Makefile | 1 + drivers/misc/altera_sysmgr.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 drivers/misc/altera_sysmgr.cdrivers/misc/Makefile +1
-0@@ -29,6 +29,7 @@ endif endif obj-$(CONFIG_ALI152X) += ali512x.o obj-$(CONFIG_ALTERA_SYSID) += altera_sysid.o +obj-$(CONFIG_ARCH_SOCFPGA) += altera_sysmgr.o obj-$(CONFIG_ATSHA204A) += atsha204a-i2c.o obj-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.o obj-$(CONFIG_DS4510) += ds4510.odrivers/misc/altera_sysmgr.c new file +0
-0
I think this file should have something in the name specifying it is for s10/agilex. I will post a misc/sysmgr for gen5 that needs a specific name, too
Quoted 21 lines
drivers/misc/altera_sysmgr.c new file +20
-0@@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +*/ + +#include <common.h> +#include <command.h> +#include <dm.h> +#include <errno.h> +#include <misc.h> +#include <asm/io.h> +#include <asm/arch/misc.h> +#include <linux/intel-smc.h> + +#define IS_OUT_OF_SYSMGR (addr, range) ((addr) > (range)) + +struct altera_sysmgr_priv { +fdt_addr_t base_addr; +fdt_addr_t base_size; +};
drivers/misc/altera_sysmgr.c line 30
Quoted 10 lines
drivers/misc/altera_sysmgr.c new file +10
-0+ +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +static int secure_write32 (u32 val,fdt_addr_t addr) +{ +int ret; +u64 args[2 ]; + + args[0 ] = (u64 )addr; + args[1 ] = val; + ret =invoke_smc (INTEL_SIP_SMC_REG_WRITE , args,2 ,NULL ,0 );
Hmm, so you're just using misc_ops to still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnelling reads and writes?
In my gen5 series to abstract the gen5 sysmgr, I have used 'ioctl' and 'call' from misc_ops to have an API.
Regards,
Simon
Quoted 86 lines
drivers/misc/altera_sysmgr.c new file +85
-0+if (ret) +return -EIO ; + +return 0 ; +} +#endif + +static int write32 (u32 val,fdt_addr_t addr) +{ +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +return secure_write32 (val, addr); +#else +writel (val, addr); + +return 0 ; +#endif +} + +static int altera_sysmgr_read (struct udevice *dev, +int offset,void *buf,int size) +{ +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + + *(u32 *)buf =readl (addr); + +return 0 ; +} + +static int altera_sysmgr_write (struct udevice *dev,int offset, +const void *buf,int size) +{ +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + +return write32 (*(u32 *)buf, addr); +} + +static int altera_sysmgr_probe (struct udevice *dev) +{ +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr; +fdt_size_t size; + + addr =ofnode_get_addr_size_index (dev_ofnode (dev),0 , &size); + +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + + priv->base_addr = addr; + priv->base_size = size; + +return 0 ; +} + +static const struct misc_ops altera_sysmgr_ops = { + .read = altera_sysmgr_read, + .write = altera_sysmgr_write, +}; + +static const struct udevice_id altera_sysmgr_ids[] = { + { .compatible ="altr,sys-mgr" }, + {} +}; + +U_BOOT_DRIVER (altera_sysmgr) = { + .name ="altr,sys-mgr" , + .id =UCLASS_MISC , + .of_match = altera_sysmgr_ids, + .priv_auto_alloc_size =sizeof (struct altera_sysmgr_priv ), + .probe = altera_sysmgr_probe, + .ops = &altera_sysmgr_ops, +};
Ang
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
Quoted 43 lines
-----Original Message-----
From: Simon Goldschmidt <[email protected]>
Sent: Wednesday, March 11, 2020 12:17 AM
To: Ang, Chee Hong <[email protected]>
Cc: u-boot at lists.denx.de; Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Westergreen, Dalon <[email protected]>; Gong, Richard <[email protected]>
Subject: Re: [PATCH v4 11/21] misc:altera_sysmgr: Add Altera System Manager driverAm 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 31 lines
From: Chee Hong Ang <[email protected]>
This driver (misc uclass) handle the read/write access to System Manager. For 64 bits platforms, processor needs to be in secure mode to has write access to most of the System Manager's registers (except boot scratch registers). When the processor is running in EL2 (non-secure), this driver will invoke the SMC call to ATF to perform write access to the System Manager's registers.
All other drivers that require access to System Manager should go through this driver.Signed-off-by Chee Hong Ang <[email protected]>--- drivers/misc/Makefile | 1 + drivers/misc/altera_sysmgr.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 drivers/misc/altera_sysmgr.cdrivers/misc/Makefile index renamed from drivers/misc/Makefile +0
-02b843de..9fa2411 100644
drivers/misc/Makefile +1
-0@@ -29,6 +29,7 @@ endif endif obj-$(CONFIG_ALI152X) += ali512x.o obj-$(CONFIG_ALTERA_SYSID) += altera_sysid.o +obj-$(CONFIG_ARCH_SOCFPGA) += altera_sysmgr.o obj-$(CONFIG_ATSHA204A) += atsha204a-i2c.o obj-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.o obj-$(CONFIG_DS4510) += ds4510.o
Quoted 8 lines
drivers/misc/altera_sysmgr.c
Quoted 5 lines
(quoted diff) +0
-0
b/drivers/misc/altera_sysmgr.cnew file mode 100644 index 0000000..b36ecaedrivers/misc/altera_sysmgr.c new file +0
-0I think this file should have something in the name specifying it is for s10/agilex. I will post a misc/sysmgr for gen5 that needs a specific name, too
Gen5/A10/S10/Agilex are using same DW MMC/MAC drivers and these drivers access system manager. Therefore, this driver is enabled for all platforms. Gen5/A10, S10/Agilex all are using it. Can I know what does your gen5 sysmgr driver do ?
I can change the name to avoid conflict but Gen5 will have 2 sysmgr drivers for different purposes. Are you OK with that ?
Quoted 124 lines
Quoted 20 lines
drivers/misc/altera_sysmgr.c new file +18
-0@@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> */ + +#include <common.h> +#include <command.h> +#include <dm.h> +#include <errno.h> +#include <misc.h> +#include <asm/io.h> +#include <asm/arch/misc.h> +#include <linux/intel-smc.h> + +#define IS_OUT_OF_SYSMGR (addr, range) ((addr) > (range)) + +struct altera_sysmgr_priv { +fdt_addr_t base_addr; +fdt_addr_t base_size;drivers/misc/altera_sysmgr.c line 28
Quoted 10 lines
drivers/misc/altera_sysmgr.c new file +10
-0+}; + +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF) static int +secure_write32 (u32 val,fdt_addr_t addr) { +int ret; +u64 args[2 ]; + + args[0 ] = (u64 )addr; + args[1 ] = val; + ret =invoke_smc (INTEL_SIP_SMC_REG_WRITE , args,2 ,NULL ,0 );Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnelling reads and writes?In my gen5 series to abstract the gen5 sysmgr, I have used 'ioctl' and 'call' from
misc_opsto have an API.Regards,
SimonQuoted 83 lines
drivers/misc/altera_sysmgr.c new file +82
-0+if (ret) +return -EIO ; + +return 0 ; +} +#endif + +static int write32 (u32 val,fdt_addr_t addr) {#if +!defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +return secure_write32 (val, addr); +#else +writel (val, addr); + +return 0 ; +#endif +} + +static int altera_sysmgr_read (struct udevice *dev, +int offset,void *buf,int size) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + + *(u32 *)buf =readl (addr); + +return 0 ; +} + +static int altera_sysmgr_write (struct udevice *dev,int offset, +const void *buf,int size) +{ +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + +return write32 (*(u32 *)buf, addr); +} + +static int altera_sysmgr_probe (struct udevice *dev) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr; +fdt_size_t size; + + addr =ofnode_get_addr_size_index (dev_ofnode (dev),0 , &size); + +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + + priv->base_addr = addr; + priv->base_size = size; + +return 0 ; +} + +static const struct misc_ops altera_sysmgr_ops = { + .read = altera_sysmgr_read, + .write = altera_sysmgr_write, +}; + +static const struct udevice_id altera_sysmgr_ids[] = { + { .compatible ="altr,sys-mgr" }, + {} +}; + +U_BOOT_DRIVER (altera_sysmgr) = { + .name ="altr,sys-mgr" , + .id =UCLASS_MISC , + .of_match = altera_sysmgr_ids, + .priv_auto_alloc_size =sizeof (struct altera_sysmgr_priv ), + .probe = altera_sysmgr_probe, + .ops = &altera_sysmgr_ops, +};
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
Am 10.03.2020 um 17:42 schrieb Ang, Chee Hong:
Quoted 51 lines
Quoted 43 lines
-----Original Message-----
From: Simon Goldschmidt <[email protected]>
Sent: Wednesday, March 11, 2020 12:17 AM
To: Ang, Chee Hong <[email protected]>
Cc: u-boot at lists.denx.de; Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Westergreen, Dalon <[email protected]>; Gong, Richard <[email protected]>
Subject: Re: [PATCH v4 11/21] misc:altera_sysmgr: Add Altera System Manager driverAm 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 31 lines
From: Chee Hong Ang <[email protected]>
This driver (misc uclass) handle the read/write access to System Manager. For 64 bits platforms, processor needs to be in secure mode to has write access to most of the System Manager's registers (except boot scratch registers). When the processor is running in EL2 (non-secure), this driver will invoke the SMC call to ATF to perform write access to the System Manager's registers.
All other drivers that require access to System Manager should go through this driver.Signed-off-by Chee Hong Ang <[email protected]>--- drivers/misc/Makefile | 1 + drivers/misc/altera_sysmgr.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 drivers/misc/altera_sysmgr.cdrivers/misc/Makefile index renamed from drivers/misc/Makefile +0
-02b843de..9fa2411 100644
drivers/misc/Makefile +1
-0@@ -29,6 +29,7 @@ endif endif obj-$(CONFIG_ALI152X) += ali512x.o obj-$(CONFIG_ALTERA_SYSID) += altera_sysid.o +obj-$(CONFIG_ARCH_SOCFPGA) += altera_sysmgr.o obj-$(CONFIG_ATSHA204A) += atsha204a-i2c.o obj-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.o obj-$(CONFIG_DS4510) += ds4510.oQuoted 8 lines
drivers/misc/altera_sysmgr.c
Quoted 5 lines
(quoted diff) +0
-0
b/drivers/misc/altera_sysmgr.cnew file mode 100644 index 0000000..b36ecaedrivers/misc/altera_sysmgr.c new file +0
-0I think this file should have something in the name specifying it is for s10/agilex. I will post a misc/sysmgr for gen5 that needs a specific name, too
Quoted 2 lines
Gen5/A10/S10/Agilex are using same DW MMC/MAC drivers and these drivers access system manager. Therefore, this driver is enabled for all platforms. Gen5/A10, S10/Agilex all are using it.
Ah, I missed that part of the series. I'm still reading it. Making gen5 use misc_read/misc_write seems a bit strange, but I can't think of a better way right now, either...
Quoted 1 line
Can I know what does your gen5 sysmgr driver do ?
I moved "pin init", "freezereq" and "get fpga ID" there to have less ad-hoc code in the main SPL file...
The series where it's in targets moving as much as I can to DM drivers. Sadly, I still haven't found a way to make it fit into the gen5 SRAM, which is why I haven't posted it, yet...
Quoted 2 lines
I can change the name to avoid conflict but Gen5 will have 2 sysmgr drivers for different purposes. Are you OK with that ?
Hmm, I don't think that will work. That would mean binding 2 drivers to one ofnode. I can split the gen5 driver later and implement read/write like it's needed if this one gets applied as is.
Quoted 125 lines
Quoted 124 lines
Quoted 20 lines
drivers/misc/altera_sysmgr.c new file +18
-0@@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> */ + +#include <common.h> +#include <command.h> +#include <dm.h> +#include <errno.h> +#include <misc.h> +#include <asm/io.h> +#include <asm/arch/misc.h> +#include <linux/intel-smc.h> + +#define IS_OUT_OF_SYSMGR (addr, range) ((addr) > (range)) + +struct altera_sysmgr_priv { +fdt_addr_t base_addr; +fdt_addr_t base_size;drivers/misc/altera_sysmgr.c line 28
Quoted 10 lines
drivers/misc/altera_sysmgr.c new file +10
-0+}; + +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF) static int +secure_write32 (u32 val,fdt_addr_t addr) { +int ret; +u64 args[2 ]; + + args[0 ] = (u64 )addr; + args[1 ] = val; + ret =invoke_smc (INTEL_SIP_SMC_REG_WRITE , args,2 ,NULL ,0 );Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnelling reads and writes?In my gen5 series to abstract the gen5 sysmgr, I have used 'ioctl' and 'call' from
misc_opsto have an API.Regards,
SimonQuoted 83 lines
drivers/misc/altera_sysmgr.c new file +82
-0+if (ret) +return -EIO ; + +return 0 ; +} +#endif + +static int write32 (u32 val,fdt_addr_t addr) {#if +!defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +return secure_write32 (val, addr); +#else +writel (val, addr); + +return 0 ; +#endif +} + +static int altera_sysmgr_read (struct udevice *dev, +int offset,void *buf,int size) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + + *(u32 *)buf =readl (addr); + +return 0 ; +} + +static int altera_sysmgr_write (struct udevice *dev,int offset, +const void *buf,int size) +{ +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + +return write32 (*(u32 *)buf, addr); +} + +static int altera_sysmgr_probe (struct udevice *dev) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr; +fdt_size_t size; + + addr =ofnode_get_addr_size_index (dev_ofnode (dev),0 , &size); + +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + + priv->base_addr = addr; + priv->base_size = size; + +return 0 ; +} + +static const struct misc_ops altera_sysmgr_ops = { + .read = altera_sysmgr_read, + .write = altera_sysmgr_write, +}; + +static const struct udevice_id altera_sysmgr_ids[] = { + { .compatible ="altr,sys-mgr" }, + {} +}; + +U_BOOT_DRIVER (altera_sysmgr) = { + .name ="altr,sys-mgr" , + .id =UCLASS_MISC , + .of_match = altera_sysmgr_ids, + .priv_auto_alloc_size =sizeof (struct altera_sysmgr_priv ), + .probe = altera_sysmgr_probe, + .ops = &altera_sysmgr_ops, +};
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
In reply to AngAm 10.03.2020 um 17:42 schrieb Ang, Chee Hong:
Quoted 51 lines
Quoted 43 lines
-----Original Message-----
From: Simon Goldschmidt <[email protected]>
Sent: Wednesday, March 11, 2020 12:17 AM
To: Ang, Chee Hong <[email protected]>
Cc: u-boot at lists.denx.de; Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Westergreen, Dalon <[email protected]>; Gong, Richard <[email protected]>
Subject: Re: [PATCH v4 11/21] misc:altera_sysmgr: Add Altera System Manager driverAm 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 31 lines
From: Chee Hong Ang <[email protected]>
This driver (misc uclass) handle the read/write access to System Manager. For 64 bits platforms, processor needs to be in secure mode to has write access to most of the System Manager's registers (except boot scratch registers). When the processor is running in EL2 (non-secure), this driver will invoke the SMC call to ATF to perform write access to the System Manager's registers.
All other drivers that require access to System Manager should go through this driver.Signed-off-by Chee Hong Ang <[email protected]>--- drivers/misc/Makefile | 1 + drivers/misc/altera_sysmgr.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 drivers/misc/altera_sysmgr.cdrivers/misc/Makefile index renamed from drivers/misc/Makefile +0
-02b843de..9fa2411 100644
drivers/misc/Makefile +1
-0@@ -29,6 +29,7 @@ endif endif obj-$(CONFIG_ALI152X) += ali512x.o obj-$(CONFIG_ALTERA_SYSID) += altera_sysid.o +obj-$(CONFIG_ARCH_SOCFPGA) += altera_sysmgr.o obj-$(CONFIG_ATSHA204A) += atsha204a-i2c.o obj-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.o obj-$(CONFIG_DS4510) += ds4510.oQuoted 8 lines
drivers/misc/altera_sysmgr.c
Quoted 5 lines
(quoted diff) +0
-0
b/drivers/misc/altera_sysmgr.cnew file mode 100644 index 0000000..b36ecaedrivers/misc/altera_sysmgr.c new file +0
-0I think this file should have something in the name specifying it is for s10/agilex. I will post a misc/sysmgr for gen5 that needs a specific name, too
Quoted 39 lines
Gen5/A10/S10/Agilex are using same DW MMC/MAC drivers and these drivers access system manager. Therefore, this driver is enabled for all platforms. Gen5/A10, S10/Agilex all are using it. Can I know what does your gen5 sysmgr driver do ?
I can change the name to avoid conflict but Gen5 will have 2 sysmgr drivers for different purposes. Are you OK with that ?Quoted 34 lines
Quoted 20 lines
drivers/misc/altera_sysmgr.c new file +18
-0@@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> */ + +#include <common.h> +#include <command.h> +#include <dm.h> +#include <errno.h> +#include <misc.h> +#include <asm/io.h> +#include <asm/arch/misc.h> +#include <linux/intel-smc.h> + +#define IS_OUT_OF_SYSMGR (addr, range) ((addr) > (range)) + +struct altera_sysmgr_priv { +fdt_addr_t base_addr; +fdt_addr_t base_size;drivers/misc/altera_sysmgr.c line 28
Quoted 10 lines
drivers/misc/altera_sysmgr.c new file +10
-0+}; + +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF) static int +secure_write32 (u32 val,fdt_addr_t addr) { +int ret; +u64 args[2 ]; + + args[0 ] = (u64 )addr; + args[1 ] = val; + ret =invoke_smc (INTEL_SIP_SMC_REG_WRITE , args,2 ,NULL ,0 );Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnelling reads and writes?
Any response to this?
Thanks,
Simon
Quoted 91 lines
Quoted 90 lines
In my gen5 series to abstract the gen5 sysmgr, I have used 'ioctl' and 'call' from
misc_opsto have an API.Regards,
SimonQuoted 83 lines
drivers/misc/altera_sysmgr.c new file +82
-0+if (ret) +return -EIO ; + +return 0 ; +} +#endif + +static int write32 (u32 val,fdt_addr_t addr) {#if +!defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +return secure_write32 (val, addr); +#else +writel (val, addr); + +return 0 ; +#endif +} + +static int altera_sysmgr_read (struct udevice *dev, +int offset,void *buf,int size) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + + *(u32 *)buf =readl (addr); + +return 0 ; +} + +static int altera_sysmgr_write (struct udevice *dev,int offset, +const void *buf,int size) +{ +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + +return write32 (*(u32 *)buf, addr); +} + +static int altera_sysmgr_probe (struct udevice *dev) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr; +fdt_size_t size; + + addr =ofnode_get_addr_size_index (dev_ofnode (dev),0 , &size); + +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + + priv->base_addr = addr; + priv->base_size = size; + +return 0 ; +} + +static const struct misc_ops altera_sysmgr_ops = { + .read = altera_sysmgr_read, + .write = altera_sysmgr_write, +}; + +static const struct udevice_id altera_sysmgr_ids[] = { + { .compatible ="altr,sys-mgr" }, + {} +}; + +U_BOOT_DRIVER (altera_sysmgr) = { + .name ="altr,sys-mgr" , + .id =UCLASS_MISC , + .of_match = altera_sysmgr_ids, + .priv_auto_alloc_size =sizeof (struct altera_sysmgr_priv ), + .probe = altera_sysmgr_probe, + .ops = &altera_sysmgr_ops, +};
Ang
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
Quoted 96 lines
Am 10.03.2020 um 17:42 schrieb Ang, Chee Hong:
Quoted 42 lines
Quoted 42 lines
-----Original Message-----
From: Simon Goldschmidt <[email protected]>
Sent: Wednesday, March 11, 2020 12:17 AM
To: Ang, Chee Hong <[email protected]>
Cc: u-boot at lists.denx.de; Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Westergreen, Dalon <[email protected]>; Gong, Richard <[email protected]>
Subject: Re: [PATCH v4 11/21] misc:altera_sysmgr: Add Altera System Manager driverAm 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 30 lines
From: Chee Hong Ang <[email protected]>
This driver (misc uclass) handle the read/write access to System Manager. For 64 bits platforms, processor needs to be in secure mode to has write access to most of the System Manager's registers (except boot scratch registers). When the processor is running in EL2 (non-secure), this driver will invoke the SMC call to ATF to perform write access to the System Manager's registers. All other drivers that require access to System Manager should go through this driver.
Signed-off-by Chee Hong Ang <[email protected]>--- drivers/misc/Makefile | 1 + drivers/misc/altera_sysmgr.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 drivers/misc/altera_sysmgr.cdrivers/misc/Makefile index renamed from drivers/misc/Makefile +0
-02b843de..9fa2411 100644
drivers/misc/Makefile +1
-0@@ -29,6 +29,7 @@ endif endif obj-$(CONFIG_ALI152X) += ali512x.o obj-$(CONFIG_ALTERA_SYSID) += altera_sysid.o +obj-$(CONFIG_ARCH_SOCFPGA) += altera_sysmgr.o obj-$(CONFIG_ATSHA204A) += atsha204a-i2c.o obj-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.oQuoted 8 lines
Quoted 8 lines
drivers/misc/altera_sysmgr.c
Quoted 6 lines
drivers/misc/Makefile +0
-0obj-$(CONFIG_DS4510) += ds4510.o(quoted diff) +0
-0
b/drivers/misc/altera_sysmgr.cnew file mode 100644 index 0000000..b36ecaedrivers/misc/altera_sysmgr.c new file +0
-0I think this file should have something in the name specifying it is for
s10/agilex.
Quoted 2 lines
Quoted 1 line
I will post a misc/sysmgr for gen5 that needs a specific name, too
Gen5/A10/S10/Agilex are using same DW MMC/MAC drivers and these drivers
access system manager.
Quoted 1 line
Therefore, this driver is enabled for all platforms. Gen5/A10, S10/Agilex all are
using it.
Quoted 2 lines
Can I know what does your gen5 sysmgr driver do ?
I can change the name to avoid conflict but Gen5 will have 2 sysmgr drivers fordifferent purposes.
Quoted 36 lines
Are you OK with that ?
Quoted 35 lines
Quoted 21 lines
drivers/misc/altera_sysmgr.c new file +19
-0@@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> */ + +#include <common.h> +#include <command.h> +#include <dm.h> +#include <errno.h> +#include <misc.h> +#include <asm/io.h> +#include <asm/arch/misc.h> +#include <linux/intel-smc.h> + +#define IS_OUT_OF_SYSMGR (addr, range) ((addr) > (range)) + +struct altera_sysmgr_priv { +fdt_addr_t base_addr; +fdt_addr_t base_size; +};drivers/misc/altera_sysmgr.c line 29
Quoted 10 lines
drivers/misc/altera_sysmgr.c new file +10
-0+ +#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF) static +int +secure_write32 (u32 val,fdt_addr_t addr) { +int ret; +u64 args[2 ]; + + args[0 ] = (u64 )addr; + args[1 ] = val; + ret =invoke_smc (INTEL_SIP_SMC_REG_WRITE , args,2 ,NULL ,0 );Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnelling
Quoted 3 lines
reads and writes?
Any response to this?
Sorry, I missed this one
Actually I have created higher level API in ATF but I switch back to generic writes
because the higher level API in ATF doesn't apply to Gen5/A10 platforms.
Here is what I will do in my revision in system manager driver:
1) drop misc_read/misc_write and use misc_ioctl instead in system manager
2) misc_ioctl() will support configuring EMAC/SDMMC
3) For SoC64 running at EL2 (non-secure), misc_iotctl() will invoke the ATF's 'high level' API
4) For Gen/A10 and SoC64 running at EL3 (secure), the driver just configure the EMAC/SDMMC registers in misc_iotcl() Is this better ?
Quoted 94 lines
Thanks,
SimonQuoted 90 lines
Quoted 89 lines
In my gen5 series to abstract the gen5 sysmgr, I have used 'ioctl' and 'call' from
misc_opsto have an API.Regards,
SimonQuoted 82 lines
drivers/misc/altera_sysmgr.c new file +81
-0+if (ret) +return -EIO ; + +return 0 ; +} +#endif + +static int write32 (u32 val,fdt_addr_t addr) {#if +!defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +return secure_write32 (val, addr); +#else +writel (val, addr); + +return 0 ; +#endif +} + +static int altera_sysmgr_read (struct udevice *dev, +int offset,void *buf,int size) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + + *(u32 *)buf =readl (addr); + +return 0 ; +} + +static int altera_sysmgr_write (struct udevice *dev,int offset, +const void *buf,int size) +{ +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr = priv->base_addr + offset; + +if (IS_OUT_OF_SYSMGR (addr, priv->base_addr + priv->base_size - size)) +return -EINVAL ; + +if (size !=sizeof (u32)) +return -EIO ; + +return write32 (*(u32 *)buf, addr); } + +static int altera_sysmgr_probe (struct udevice *dev) { +struct altera_sysmgr_priv *priv =dev_get_priv (dev); +fdt_addr_t addr; +fdt_size_t size; + + addr =ofnode_get_addr_size_index (dev_ofnode (dev),0 , &size); + +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + + priv->base_addr = addr; + priv->base_size = size; + +return 0 ; +} + +static const struct misc_ops altera_sysmgr_ops = { + .read = altera_sysmgr_read, + .write = altera_sysmgr_write, +}; + +static const struct udevice_id altera_sysmgr_ids[] = { + { .compatible ="altr,sys-mgr" }, + {} +}; + +U_BOOT_DRIVER (altera_sysmgr) = { + .name ="altr,sys-mgr" , + .id =UCLASS_MISC , + .of_match = altera_sysmgr_ids, + .priv_auto_alloc_size =sizeof (struct altera_sysmgr_priv ), + .probe = altera_sysmgr_probe, + .ops = &altera_sysmgr_ops, +};
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
On 3/11/20 7:35 AM, Ang, Chee Hong wrote:
[...]
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnellingreads and writes?
Any response to this?
Sorry, I missed this one
Actually I have created higher level API in ATF but I switch back to generic writes because the higher level API in ATF doesn't apply to Gen5/A10 platforms.
ATF doesn't apply to Gen5/A10 either though ?
Quoted 6 lines
Here is what I will do in my revision in system manager driver:
1) drop misc_read/misc_write and usemisc_ioctlinstead in system manager
2)misc_ioctl()will support configuring EMAC/SDMMC
3) For SoC64 running at EL2 (non-secure),misc_iotctl()will invoke the ATF's 'high level' API
4) For Gen/A10 and SoC64 running at EL3 (secure), the driver just configure the EMAC/SDMMC registers inmisc_iotcl()Is this better ?
Can't you configure everything in secure-mode and just not configure anything anymore in non-secure mode ?
Signature · 2 lines
Best regards, Marek Vasut
Ang
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
Quoted 25 lines · Chee Hong
[...]
Quoted 10 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnellingreads and writes?
Any response to this?
Sorry, I missed this one
Actually I have created higher level API in ATF but I switch back to generic writes because the higher level API in ATF doesn't apply to Gen5/A10platforms.
ATF doesn't apply to Gen5/A10 either though ?
Quoted 8 lines
Here is what I will do in my revision in system manager driver:
1) drop misc_read/misc_write and usemisc_ioctlinstead in system manager
2)misc_ioctl()will support configuring EMAC/SDMMC
3) For SoC64 running at EL2 (non-secure),misc_iotctl()will invoke the ATF's 'high level' API
4) For Gen/A10 and SoC64 running at EL3 (secure), the driver just configure the EMAC/SDMMC registers inmisc_iotcl()Is this better ?
Quoted 2 lines
Can't you configure everything in secure-mode and just not configure anything anymore in non-secure mode ?
Yes. I can move all these configurations to SPL(secure mode) and remove them from EMAC/SDMMC drivers. This will affect all platforms even Gen5/A10 even they don?t have the secure access problems. All Gen5/A10/S10/Agilex share the same EMAC/SDMMC drivers.
For EMAC driver such as 'drivers/net/dwmac_socfpga.c', moving the PHY settings into SPL will leave this EMAC driver just asserting reset to EMAC controller and nothing else. EMAC node has to be enabled for SPL device tree as well for MAC PHY configuration.
If you think it is OK to split the SDMMC clock and EMAC PHY configuration from SDMMC and EMAC drivers and put them in SPL, we can go this way.
I can just drop the 'system manager' driver and all those high level APIs in ATF.
Quoted 4 lines
--
Best regards,
Marek Vasut
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
Quoted 25 lines · Chee Hong
Quoted 25 lines · Chee Hong
[...]
Quoted 10 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnellingreads and writes?
Any response to this?
Sorry, I missed this one
Actually I have created higher level API in ATF but I switch back to generic writes because the higher level API in ATF doesn't apply to Gen5/A10platforms.
ATF doesn't apply to Gen5/A10 either though ?
Quoted 8 lines
Here is what I will do in my revision in system manager driver:
1) drop misc_read/misc_write and usemisc_ioctlinstead in system manager
2)misc_ioctl()will support configuring EMAC/SDMMC
3) For SoC64 running at EL2 (non-secure),misc_iotctl()will invoke the ATF's 'high level' API
4) For Gen/A10 and SoC64 running at EL3 (secure), the driver just configure the EMAC/SDMMC registers inmisc_iotcl()Is this better ?
Quoted 4 lines
Quoted 2 lines
Can't you configure everything in secure-mode and just not configure anything anymore in non-secure mode ?
Yes. I can move all these configurations to SPL(secure mode) and remove them from EMAC/SDMMC drivers. This will affect all platforms even Gen5/A10 even they don?t have the secure access problems.
Gen5/A10 are always in "secure" mode.
Quoted 1 line
All Gen5/A10/S10/Agilex share the same EMAC/SDMMC drivers.
Surely you can abstract this away somehow, e.g. with some function which is compiled-out on Gen5/A10, while it's compiled-in on Agilex and tells you whether you're in EL2/EL3 mode.
Quoted 6 lines
For EMAC driver such as '
drivers/net/dwmac_socfpga.c', moving the PHY settings into SPL will leave this EMAC driver just asserting reset to EMAC controller and nothing else. EMAC node has to be enabled for SPL device tree as well for MAC PHY configuration.
If you think it is OK to split the SDMMC clock and EMAC PHY configuration from SDMMC and EMAC drivers and put them in SPL, we can go this way.
I can just drop the 'system manager' driver and all those high level APIs in ATF.
If this is only about clock/PHY configuration, can't the clock/PHY driver for agilex just handle the EL2/EL3 stuff transparently ?
Signature · 2 lines
Best regards, Marek Vasut
Ang
PATCH v4 11/21 misc: altera_sysmgr: Add Altera System Manager driver
Quoted 34 lines · Chee Hong
Quoted 26 lines
Quoted 26 lines · Chee Hong
[...]
Quoted 11 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Hmm, so you're just using
misc_opsto still issue generic writes. From the discussion with Marek in the last version, I would have thought you wanted to create a higher level API instead of still tunnellingreads and writes?
Any response to this?
Sorry, I missed this one
Actually I have created higher level API in ATF but I switch back to generic writes because the higher level API in ATF doesn't apply to Gen5/A10platforms.
ATF doesn't apply to Gen5/A10 either though ?
Quoted 8 lines
Here is what I will do in my revision in system manager driver:
1) drop misc_read/misc_write and usemisc_ioctlinstead in system manager
2)misc_ioctl()will support configuring EMAC/SDMMC
3) For SoC64 running at EL2 (non-secure),misc_iotctl()will invoke the ATF's 'high level' API
4) For Gen/A10 and SoC64 running at EL3 (secure), the driver just configure the EMAC/SDMMC registers inmisc_iotcl()Is this better ?Quoted 3 lines
Quoted 2 lines
Can't you configure everything in secure-mode and just not configure anything anymore in non-secure mode ?
Yes. I can move all these configurations to SPL(secure mode) and remove them
from EMAC/SDMMC drivers.
Quoted 1 line
This will affect all platforms even Gen5/A10 even they don?t have the secure
access problems.
Quoted 7 lines
Gen5/A10 are always in "secure" mode.
Quoted 1 line
All Gen5/A10/S10/Agilex share the same EMAC/SDMMC drivers.
Surely you can abstract this away somehow, e.g. with some function which is compiled-out on Gen5/A10, while it's compiled-in on Agilex and tells you whether you're in EL2/EL3 mode.
That's right. We have Gen5/A10 always in "secure" mode and
S10/Agilex can be in either "secure" or "non-secure" mode.
All of them share the same DW MMC/MAC drivers.
In all platforms, EMAC driver only active in U-Boot proper but not SPL. This is not an issue for Gen5/A10 as SPL/U-Boot proper all run in "secure" mode.
But this is not the case for S10/Agilex, EMAC driver is active only in U-Boot proper which can be EL2 or EL3 depending whether you include ATF support. So the MAC driver has to somehow handle this PHY configuration in EL2 and EL3.
Quoted 5 lines
Quoted 3 lines
For EMAC driver such as '
drivers/net/dwmac_socfpga.c', moving the PHY settings into SPL will leave this EMAC driver just asserting reset to EMACcontroller and nothing else.
Quoted 1 line
EMAC node has to be enabled for SPL device tree as well for MAC PHY
Quoted 8 lines
configuration.
Quoted 2 lines
If you think it is OK to split the SDMMC clock and EMAC PHY configuration from SDMMC and EMAC drivers and put them in SPL, we can go
this way.
Quoted 1 line
I can just drop the 'system manager' driver and all those high level APIs in ATF.
If this is only about clock/PHY configuration, can't the clock/PHY driver for agilex just handle the EL2/EL3 stuff transparently ?
This is the clock phase settings specific to SDMMC controller. That's why it is being configured in SDMCC driver instead of clock driver. There is no PHY driver for EMAC PHY. It's current being handled in DW MAC driver 'drivers/net/dwmac_socfpga.c'.
Quoted 3 lines
--
Best regards,
Marek Vasut
PATCH v4 12/21 arch: arm: socfpga: Enable driver model for misc drivers.
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
Enable this misc driver model for 'altera_sysmgr' driver for socfpga platforms.
--- arch/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/Kconfig +2 -0
@@ -937,9 +937,11 @@ config ARCH_SOCFPGA select DM select DM_SERIAL select ENABLE_ARM_SOC_BOOT0_HOOK if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 + select MISC select OF_CONTROL select SPL_DM_RESET if DM_RESET select SPL_DM_SERIAL + select SPL_DRIVERS_MISC_SUPPORT select SPL_LIBCOMMON_SUPPORT select SPL_LIBGENERIC_SUPPORT select SPL_NAND_SUPPORT if SPL_NAND_DENALI
Signature · 1 line
2.7.4
PATCH v4 12/21 arch: arm: socfpga: Enable driver model for misc drivers.
Am 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 15 lines
From: Chee Hong Ang <[email protected]>
Enable this misc driver model for '
altera_sysmgr' driver for socfpga platforms.Signed-off-by Chee Hong Ang <[email protected]>--- arch/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)arch/arm/Kconfig +0
-0
arch/arm/Kconfig config ARCH_SOCFPGA · line 940
Quoted 4 lines
arch/arm/Kconfig +1
-0@@ -937,9 +937,11 @@ config ARCH_SOCFPGA select DM select DM_SERIAL select ENABLE_ARM_SOC_BOOT0_HOOK if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 + select MISC
Please don't 'select' this. You prevent building smaller configs that don't need it. Please use 'imply' instead.
arch/arm/Kconfig config ARCH_SOCFPGA · line 944
Quoted 4 lines
arch/arm/Kconfig +1
-0select OF_CONTROL select SPL_DM_RESET if DM_RESET select SPL_DM_SERIAL + select SPL_DRIVERS_MISC_SUPPORT
Especially this one makes gen5 SPL uneccessary large.
Regards,
Simon
Quoted 4 lines
arch/arm/Kconfig +0
-0select SPL_LIBCOMMON_SUPPORT select SPL_LIBGENERIC_SUPPORT select SPL_NAND_SUPPORT if SPL_NAND_DENALI
Ang
PATCH v4 12/21 arch: arm: socfpga: Enable driver model for misc drivers.
Quoted 11 lines
Am 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 10 lines
From: Chee Hong Ang <[email protected]>
Enable this misc driver model for '
altera_sysmgr' driver for socfpga platforms.Signed-off-by Chee Hong Ang <[email protected]>--- arch/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
Quoted 13 lines
arch/arm/Kconfig config ARCH_SOCFPGA · line 940
Quoted 10 lines
arch/arm/Kconfig index renamed from arch/arm/Kconfig +0
-08d9f7fc..4ee8ae0 100644
arch/arm/Kconfig +0
-0@@ -937,9 +937,11 @@ config ARCH_SOCFPGA select DM select DM_SERIAL select ENABLE_ARM_SOC_BOOT0_HOOK if TARGET_SOCFPGA_GEN5 ||
TARGET_SOCFPGA_ARRIA10arch/arm/Kconfig +1
-0+ select MISCPlease don't 'select' this. You prevent building smaller configs that don't need it. Please use 'imply' instead.
OK.
Quoted 7 lines
arch/arm/Kconfig config ARCH_SOCFPGA · line 944
Quoted 5 lines
arch/arm/Kconfig +1
-0select OF_CONTROL select SPL_DM_RESET if DM_RESET select SPL_DM_SERIAL + select SPL_DRIVERS_MISC_SUPPORTEspecially this one makes gen5 SPL uneccessary large.
I will use 'imply' for this as well.
Quoted 8 lines
Regards,
SimonQuoted 4 lines
arch/arm/Kconfig +0
-0select SPL_LIBCOMMON_SUPPORT select SPL_LIBGENERIC_SUPPORT select SPL_NAND_SUPPORT if SPL_NAND_DENALI
PATCH v4 13/21 mmc: dwmmc: socfpga: MMC driver access System Manager via 'altera_sysmgr'
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
MMC driver now access System Manager's SDMMC control register to set SDMMC's clock phase shift via 'altera_sysmgr' driver.
Following entry need to be specified under MMC node in device tree:
altr,sysmgr-syscon = <&sysmgr 'x' 'y' 'z'>;
x = offset of the SDMCC control register in System Manager y = start of drvsel's bit field
z = start of smplsel's bit field
Example:
altr,sysmgr-syscon = <&sysmgr 0x28 0 4>;
--- drivers/mmc/socfpga_dw_mmc.c | 63 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-)
drivers/mmc/socfpga_dw_mmc.c +58 -5
@@ -5,16 +5,17 @@#include <common.h> #include <asm/arch/clock_manager.h> -#include <asm/arch/system_manager.h> #include <clk.h> #include <dm.h> #include <dwmmc.h> #include <errno.h> #include <fdtdec.h> +#include <hang.h> #include <dm/device_compat.h> #include <linux/libfdt.h> #include <linux/err.h> #include <malloc.h> +#include <misc.h> #include <reset.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -24,6 +25,13 @@ struct socfpga_dwmci_plat {struct mmc mmc; }; +/* System Manager's SDMMC CCLK phase shift register */ +struct sysmgr_sdmmc_reg { +u32 offset; +u32 drvsel_shift; +u32 smplsel_shift; +}; +/* socfpga implmentation specific driver private data */ struct dwmci_socfpga_priv_data {struct dwmci_host host;
@@ -45,11 +53,54 @@ static void socfpga_dwmci_reset(struct udevice *dev)reset_deassert_bulk (&reset_bulk); } +static int get_sysmgr_sdmmc_reg (struct udevice *dev, +struct sysmgr_sdmmc_reg *reg) +{ +struct ofnode_phandle_args args; + +int ret =dev_read_phandle_with_args (dev,"altr,sysmgr-syscon" ,NULL , +3 ,0 , &args); +if (ret) { +dev_err (dev,"Failed to get syscon: %d\n" , ret); +return -EINVAL ; + } + +if (args.args_count !=3 ) { +dev_err (dev,"Invalid number of syscon args\n" ); +return -EINVAL ; + } + + reg->offset = args.args[0 ]; + reg->drvsel_shift = args.args[1 ]; + reg->smplsel_shift = args.args[2 ]; + +return 0 ; +} +static void socfpga_dwmci_clksel (struct dwmci_host *host) {struct dwmci_socfpga_priv_data *priv = host->priv; -u32 sdmmc_mask = ((priv->smplsel &0x7 ) <<SYSMGR_SDMMC_SMPLSEL_SHIFT ) | - ((priv->drvsel &0x7 ) <<SYSMGR_SDMMC_DRVSEL_SHIFT ); +struct sysmgr_sdmmc_reg sdmmc_reg; +struct udevice *sysmgr; +u32 sdmmc_mask; + +int ret =uclass_get_device_by_phandle (UCLASS_MISC , host->mmc->dev, +"altr,sysmgr-syscon" , &sysmgr); + +if (ret == -ENOENT ) { +debug ("%s: Could not find 'altr,sysmgr-syscon' phandle\n" , + host->mmc->dev->name); +hang (); + } + +if (get_sysmgr_sdmmc_reg (host->mmc->dev, &sdmmc_reg)) { +debug ("%s: Error reading sysmgr sdmmc reg info\n" , + host->mmc->dev->name); +hang (); + } + + sdmmc_mask = ((priv->smplsel &0x7 ) << sdmmc_reg.smplsel_shift) | + ((priv->drvsel &0x7 ) << sdmmc_reg.drvsel_shift);/* Disable SDMMC clock. */ clrbits_le32(socfpga_get_clkmgr_addr() + CLKMGR_PERPLL_EN,
@@ -57,10 +108,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 ); + +misc_write (sysmgr, sdmmc_reg.offset, &sdmmc_mask,sizeof (sdmmc_mask)); +misc_read (sysmgr, sdmmc_reg.offset, &sdmmc_mask,sizeof (sdmmc_mask));debug ("%s: SYSMGR_SDMMCGRP_CTRL_REG = 0x%x\n" , __func__, -readl (socfpga_get_sysmgr_addr () +SYSMGR_SDMMC )); + sdmmc_mask);/* Enable SDMMC clock */ setbits_le32(socfpga_get_clkmgr_addr() + CLKMGR_PERPLL_EN,
Signature · 1 line
2.7.4
PATCH v4 14/21 arch: arm: socfpga: Add 'altr, sysmgr-syscon' for MMC node in device tree
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
In device tree for all socfpga platforms, a phandle to System Manager ('altr,sysmgr-syscon') is needed for MMC node to enable the MMC driver to configure the SDMMC's clock phase shift via System Manager driver (altera_sysmgr).
This phandle specifies the offset of the SDMCC control register in System Manager, start of bit field for drvsel and start of bit field for smplsel.
--- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_cyclone5.dtsi | 1 + arch/arm/dts/socfpga_stratix10.dtsi | 1 - arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 7 +++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 2 -- 7 files changed, 11 insertions(+), 3 deletions(-)
arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +1 -0
@@ -34,6 +34,7 @@ &mmc { drvsel = <3>; smplsel = <0>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; u-boot,dm-pre-reloc; };
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +1 -0
@@ -44,6 +44,7 @@ cap-sd-highspeed; broken-cd; bus-width = <4>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; }; &eccmgr {
arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi +1 -0
@@ -20,6 +20,7 @@ }; &mmc { + altr,sysmgr-syscon = <&sysmgr 0x108 0 3>; u-boot,dm-pre-reloc; };
arch/arm/dts/socfpga_cyclone5.dtsi +1 -0
@@ -23,6 +23,7 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; + altr,sysmgr-syscon = <&sysmgr 0x108 0 3>; }; sysmgr at ffd08000 {
arch/arm/dts/socfpga_stratix10.dtsi +0 -1
@@ -228,7 +228,6 @@ interrupts = <0 96 4>; fifo-depth = <0x400>; resets = <&rst SDMMC_RESET>, <&rst SDMMC_OCP_RESET>; - u-boot,dm-pre-reloc; status = "disabled"; };
arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi +7 -0
@@ -28,6 +28,13 @@ u-boot,dm-pre-reloc; }; +&mmc { + drvsel = <3>; + smplsel = <0>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; + u-boot,dm-pre-reloc; +}; + &sysmgr { u-boot,dm-pre-reloc; };
arch/arm/dts/socfpga_stratix10_socdk.dts +0 -2
@@ -91,8 +91,6 @@ cap-mmc-highspeed; broken-cd; bus-width = <4>; - drvsel = <3>; - smplsel = <0>; }; &qspi {
Signature · 1 line
2.7.4
PATCH v4 14/21 arch: arm: socfpga: Add 'altr, sysmgr-syscon' for MMC node in device tree
Am 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 11 lines
From: Chee Hong Ang <[email protected]>
In device tree for all socfpga platforms, a phandle to System Manager ('altr,sysmgr-syscon') is needed for MMC node to enable the MMC driver to configure the SDMMC's clock phase shift via System Manager driver (
altera_sysmgr).
This phandle specifies the offset of the SDMCC control register in System Manager, start of bit field for drvsel and start of bit field for smplsel.Signed-off-by Chee Hong Ang <[email protected]>
Quoted 8 lines
--- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_cyclone5.dtsi | 1 + arch/arm/dts/socfpga_stratix10.dtsi | 1 - arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 7 +++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 2 --
This looks strange. I would have expected you add the 'syscon' entry to the base dtsi files (and to the ones in Linux, too, btw). But you're adding it to "-u-boot.dtsi" files, too. Why?
Regards,
Simon
Quoted 94 lines
7 files changed, 11 insertions(+), 3 deletions(-)arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +1
-0@@ -34,6 +34,7 @@ &mmc { drvsel = <3>; smplsel = <0>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +1
-0@@ -44,6 +44,7 @@ cap-sd-highspeed; broken-cd; bus-width = <4>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; }; &eccmgr {arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi +1
-0@@ -20,6 +20,7 @@ }; &mmc { + altr,sysmgr-syscon = <&sysmgr 0x108 0 3>; u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_cyclone5.dtsi +1
-0@@ -23,6 +23,7 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; + altr,sysmgr-syscon = <&sysmgr 0x108 0 3>; }; sysmgr at ffd08000 {arch/arm/dts/socfpga_stratix10.dtsi +0
-1@@ -228,7 +228,6 @@ interrupts = <0 96 4>; fifo-depth = <0x400>; resets = <&rst SDMMC_RESET>, <&rst SDMMC_OCP_RESET>; - u-boot,dm-pre-reloc; status = "disabled"; };arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi +7
-0@@ -28,6 +28,13 @@ u-boot,dm-pre-reloc; }; +&mmc { + drvsel = <3>; + smplsel = <0>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; + u-boot,dm-pre-reloc; +}; + &sysmgr { u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_stratix10_socdk.dts +0
-2@@ -91,8 +91,6 @@ cap-mmc-highspeed; broken-cd; bus-width = <4>; - drvsel = <3>; - smplsel = <0>; }; &qspi {
Ang
PATCH v4 14/21 arch: arm: socfpga: Add 'altr, sysmgr-syscon' for MMC node in device tree
Quoted 33 lines
-----Original Message-----
From: Simon Goldschmidt <[email protected]>
Sent: Wednesday, March 11, 2020 1:06 AM
To: Ang, Chee Hong <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Westergreen, Dalon <[email protected]>; Gong, Richard <[email protected]>
Subject: Re: [PATCH v4 14/21] arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC node in device treeAm 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 11 lines
From: Chee Hong Ang <[email protected]>
In device tree for all socfpga platforms, a phandle to System Manager ('altr,sysmgr-syscon') is needed for MMC node to enable the MMC driver to configure the SDMMC's clock phase shift via System Manager driver (
altera_sysmgr).
This phandle specifies the offset of the SDMCC control register in System Manager, start of bit field for drvsel and start of bit field for smplsel.Signed-off-by Chee Hong Ang <[email protected]>Quoted 8 lines
--- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_cyclone5.dtsi | 1 + arch/arm/dts/socfpga_stratix10.dtsi | 1 - arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 7 +++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 2 --
Quoted 3 lines
This looks strange. I would have expected you add the 'syscon' entry to the base dtsi files (and to the ones in Linux, too, btw). But you're adding it to "-u-
boot.dtsi" files, too. Why?
Where to add new device tree entry is rather confusing to me. Linux SDMMC driver doesn't set the SDMMC clock. So this only applicable to U-Boot only.
I thought "-u-boot-dtsi" is the place where we should put those device tree entries that are only applicable to U-Boot only ?
Quoted 106 lines
Regards,
SimonQuoted 60 lines
7 files changed, 11 insertions(+), 3 deletions(-)arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +1
-0@@ -34,6 +34,7 @@ &mmc { drvsel = <3>; smplsel = <0>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +1
-0@@ -44,6 +44,7 @@ cap-sd-highspeed; broken-cd; bus-width = <4>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; }; &eccmgr {arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi +1
-0@@ -20,6 +20,7 @@ }; &mmc { + altr,sysmgr-syscon = <&sysmgr 0x108 0 3>; u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_cyclone5.dtsi +1
-0@@ -23,6 +23,7 @@ bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; + altr,sysmgr-syscon = <&sysmgr 0x108 0 3>; }; sysmgr at ffd08000 {arch/arm/dts/socfpga_stratix10.dtsi +0
-0arch/arm/dts/socfpga_stratix10.dtsi line 230
Quoted 3 lines
arch/arm/dts/socfpga_stratix10.dtsi +0
-0@@ -228,7 +228,6 @@ interrupts = <0 96 4>; fifo-depth = <0x400>; resets = <&rst SDMMC_RESET>, <&rst
SDMMC_OCP_RESET>;Quoted 38 lines
arch/arm/dts/socfpga_stratix10.dtsi +0
-1- u-boot,dm-pre-reloc; status = "disabled"; };arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi +7
-0@@ -28,6 +28,13 @@ u-boot,dm-pre-reloc; }; +&mmc { + drvsel = <3>; + smplsel = <0>; + altr,sysmgr-syscon = <&sysmgr 0x28 0 4>; + u-boot,dm-pre-reloc; +}; + &sysmgr { u-boot,dm-pre-reloc; };arch/arm/dts/socfpga_stratix10_socdk.dts +0
-2@@ -91,8 +91,6 @@ cap-mmc-highspeed; broken-cd; bus-width = <4>; - drvsel = <3>; - smplsel = <0>; }; &qspi {
PATCH v4 14/21 arch: arm: socfpga: Add 'altr, sysmgr-syscon' for MMC node in device tree
Quoted 11 lines · Chee Hong
Quoted 11 lines
-----Original Message-----
From: Simon Goldschmidt <[email protected]>
Sent: Wednesday, March 11, 2020 1:06 AM
To: Ang, Chee Hong <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Westergreen, Dalon <[email protected]>; Gong, Richard <[email protected]>
Subject: Re: [PATCH v4 14/21] arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC node in device tree
Can you please fix your mailer to avoid re-adding the entire header into the message ?
Quoted 21 lines
Quoted 21 lines
Am 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 19 lines
From: Chee Hong Ang <[email protected]>
In device tree for all socfpga platforms, a phandle to System Manager ('altr,sysmgr-syscon') is needed for MMC node to enable the MMC driver to configure the SDMMC's clock phase shift via System Manager driver (
altera_sysmgr).
This phandle specifies the offset of the SDMCC control register in System Manager, start of bit field for drvsel and start of bit field for smplsel.Signed-off-by Chee Hong Ang <[email protected]>--- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_cyclone5.dtsi | 1 + arch/arm/dts/socfpga_stratix10.dtsi | 1 - arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 7 +++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 2 --
Quoted 6 lines
Quoted 3 lines
This looks strange. I would have expected you add the 'syscon' entry to the base dtsi files (and to the ones in Linux, too, btw). But you're adding it to "-u-
boot.dtsi" files, too. Why?Where to add new device tree entry is rather confusing to me. Linux SDMMC driver doesn't set the SDMMC clock. So this only applicable to U-Boot only.
DT describes hardware, so U-Boot and Linux DTs should be ideally identical. I would expect syscon, which is actual hardware, to be applicable to both U-Boot and Linux (and other OSes too) ?
Quoted 2 lines
I thought "-u-boot-dtsi" is the place where we should put those device tree entries that are only applicable to U-Boot only ?
That is more often used for things which are indeed U-Boot specific, that is nodes which have u-boot, prefix and/or hardware bits which are not yet part of Linux DT, but which _will_ be part of Linux DT once they trickle through the upstream machinery.
[...]
Signature · 2 lines
Best regards, Marek Vasut
PATCH v4 15/21 net: designware: socfpga: MAC driver access System Manager via 'altera_sysmgr'
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
MAC driver now access System Manger's EMAC0/EMAC1/EMAC2 registers to set PHY mode via 'altera_sysmgr' driver.
--- drivers/net/dwmac_socfpga.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/net/dwmac_socfpga.c +17 -20
@@ -9,6 +9,7 @@#include <asm/io.h> #include <dm.h> #include <clk.h> +#include <misc.h> #include <phy.h> #include <regmap.h> #include <reset.h>
@@ -21,16 +22,14 @@struct dwmac_socfpga_platdata {struct dw_eth_pdata dw_eth_pdata; -void *phy_intf; +fdt_addr_t phy_reg_offset;u32 reg_shift; };static int dwmac_socfpga_ofdata_to_platdata (struct udevice *dev) {struct dwmac_socfpga_platdata *pdata =dev_get_platdata (dev); -struct regmap *regmap;struct ofnode_phandle_args args; -void *range;int ret; ret = dev_read_phandle_with_args(dev, "altr,sysmgr-syscon", NULL,
@@ -45,20 +44,7 @@ static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev)return -EINVAL ; } - regmap =syscon_node_to_regmap (args.node); -if (IS_ERR (regmap)) { - ret =PTR_ERR (regmap); -dev_err (dev,"Failed to get regmap: %d\n" , ret); -return ret; - } - - range =regmap_get_range (regmap,0 ); -if (!range) { -dev_err (dev,"Failed to get regmap range\n" ); -return -ENOMEM ; - } - - pdata->phy_intf = range + args.args[0 ]; + pdata->phy_reg_offset = args.args[0 ]; pdata->reg_shift = args.args[1 ];return designware_eth_ofdata_to_platdata (dev);
@@ -69,10 +55,20 @@ static int dwmac_socfpga_probe(struct udevice *dev)struct dwmac_socfpga_platdata *pdata =dev_get_platdata (dev);struct eth_pdata *edata = &pdata->dw_eth_pdata.eth_pdata;struct reset_ctl_bulk reset_bulk; +struct udevice *sysmgr;int ret;u32 modereg;u32 modemask; + ret =uclass_get_device_by_phandle (UCLASS_MISC , dev, +"altr,sysmgr-syscon" , &sysmgr); + +if (ret == -ENOENT ) { +debug ("%s: Could not find 'altr,sysmgr-syscon' phandle\n" , + dev->name); +return -EINVAL ; + } +switch (edata->phy_interface) {case PHY_INTERFACE_MODE_MII :case PHY_INTERFACE_MODE_GMII :
@@ -97,9 +93,10 @@ 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); +misc_read (sysmgr, pdata->phy_reg_offset, &modemask,sizeof (modemask)); + modemask &= ~(SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << pdata->reg_shift); + modemask |= (modereg << pdata->reg_shift); +misc_write (sysmgr, pdata->phy_reg_offset, &modemask,sizeof (modemask));reset_release_bulk (&reset_bulk);
Signature · 1 line
2.7.4
PATCH v4 16/21 arm: socfpga: Add ATF support for Reset Manager driver
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
In non-secure mode (EL2), Reset Manager driver calls the SMC/PSCI services provided by ATF to enable/disable the SOCFPGA bridges.
--- arch/arm/mach-socfpga/reset_manager_s10.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/mach-socfpga/reset_manager_s10.c +10 -0
@@ -5,10 +5,13 @@*/ #include <common.h> +#include <hang.h> #include <asm/io.h> +#include <asm/arch/misc.h> #include <asm/arch/reset_manager.h> #include <asm/arch/system_manager.h> #include <dt-bindings/reset/altr,rst-mgr-s10.h> +#include <linux/intel-smc.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -54,6 +57,12 @@ void socfpga_per_reset_all(void)void socfpga_bridges_reset (int enable) { +#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_SPL_ATF ) +u64 arg = enable; + +if (invoke_smc (INTEL_SIP_SMC_HPS_SET_BRIDGES , &arg,1 ,NULL ,0 )) +hang (); +#else if (enable) {/* clear idle request to all bridges */ setbits_le32(socfpga_get_sysmgr_addr() +
@@ -94,6 +103,7 @@ void socfpga_bridges_reset(int enable)/* Disable NOC timeout */ writel(0, socfpga_get_sysmgr_addr() + SYSMGR_SOC64_NOC_TIMEOUT); } +#endif }/*
Signature · 1 line
2.7.4
PATCH v4 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 v4 18/21 arm: socfpga: Add ATF support to query FPGA configuration status
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
@@ -12,6 +12,7 @@#include <asm/arch/misc.h> #include <asm/arch/mailbox_s10.h> #include <asm/arch/reset_manager.h> +#include <linux/intel-smc.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -70,11 +71,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 config_status =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_STATUS_BUSY ) { +/* Send MBOX_CONFIG_STATUS to SDM */ + ret =invoke_smc (INTEL_SIP_SMC_FPGA_CONFIG_ISDONE , + &config_status,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 v4 19/21 arm: socfpga: stratix10: Add ATF support for FPGA reconfig driver
In reply to chee.hong.ang at intel.comFrom: Chee Hong Ang <[email protected]>
In non-secure mode (EL2), FPGA reconfiguration driver calls the SMC/PSCI services provided by ATF to configure the FPGA.
--- 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_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_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_STATUS_BUSY) + return ret; + else if (!xfer_count) + return INTEL_SIP_SMC_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 v4 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 v4 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
v4 cover Enable ARM Trusted Firmware for U-Boot
In reply to chee.hong.ang at intel.comAm 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 40 lines
From: "Ang, Chee Hong" <[email protected]>
v4 changes:
[PATCH v4 11/21] misc:altera_sysmgr: Add Altera System Manager
- Add System Manager driver (UCLASS_MISC) to handle secure access for SoC64[PATCH v4 13/21] mmc: dwmmc: socfpga: MMC driver access System Manager via '
altera_sysmgr'
- DW MMC driver access System Manager via the System Manager driver[PATCH v4 14/21] arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC
- DW MMC driver get DRVSEL & SMPLSEL clock settings from device tree[PATCH v4 15/21] net: designware: socfpga: MAC driver access System via '
altera_sysmgr'
- DW MAC driver access System Manager via the System Manager driverv3:
https://lists.denx.de/pipermail/u-boot/2020-February/400986.htmlThese patchsets have dependency on:
https://lists.denx.de/pipermail/u-boot/2019-September/384906.htmlChee Hong Ang (21):
configs: agilex: RemoveCONFIG_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: soc64: Remove PHY interface setup from misc arch init
misc:altera_sysmgr: Add Altera System Manager driver
arch: arm: socfpga: Enable driver model for misc drivers.
mmc: dwmmc: socfpga: MMC driver access System Manager via
'altera_sysmgr'
arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC node in device
tree
net: designware: socfpga: MAC driver access System Manager via
'altera_sysmgr'
Quoted 8 lines
arm: socfpga: Add ATF support for Reset Manager driver
arm: socfpga: stratix10: Initialize timer in SPL
arm: socfpga: Add ATF support to query FPGA configuration status
arm: socfpga: stratix10: Add ATF support for 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
Are you sure building all previously existing defconfigs keeps working with every single commit here? If not, that would break 'git bisect' in the future...
I have the feeling that things might be broken in between - escpecially since you're adding the 'old' "without ATF" defconfig in the last patch. I think it would make more sense to keep the old defconfig name, keep it building correctly throughout this series and add a "with ATF" defconfig at the end. That way, you ensure existing usages keep working.
Regards,
Simon
Quoted 38 lines
arch/arm/Kconfig | 2 +
arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 1 +
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 1 +
arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 1 +
arch/arm/dts/socfpga_cyclone5.dtsi | 1 +
arch/arm/dts/socfpga_stratix10.dtsi | 1 -
arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 7 +
arch/arm/dts/socfpga_stratix10_socdk.dts | 2 -
arch/arm/mach-socfpga/Kconfig | 2 -
arch/arm/mach-socfpga/Makefile | 2 +
arch/arm/mach-socfpga/board.c | 10 +
arch/arm/mach-socfpga/include/mach/misc.h | 3 +
arch/arm/mach-socfpga/lowlevel_init_64.S | 81 +++++
arch/arm/mach-socfpga/mailbox_s10.c | 4 +
arch/arm/mach-socfpga/misc_s10.c | 121 ++-----
arch/arm/mach-socfpga/reset_manager_s10.c | 10 +
arch/arm/mach-socfpga/timer_s10.c | 3 +-
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/misc/Makefile | 1 +
drivers/misc/altera_sysmgr.c | 115 ++++++
drivers/mmc/socfpga_dw_mmc.c | 63 +++-
drivers/net/dwmac_socfpga.c | 37 +-
include/configs/socfpga_soc64_common.h | 4 +
include/linux/intel-smc.h | 393 +++++++++++++++++++++
29 files changed, 955 insertions(+), 122 deletions(-)
create mode 100644 arch/arm/mach-socfpga/lowlevel_init_64.S
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 drivers/misc/altera_sysmgr.c
create mode 100644 include/linux/intel-smc.hAng
v4 cover Enable ARM Trusted Firmware for U-Boot
Quoted 53 lines
Am 09.03.2020 um 10:07 schrieb chee.hong.ang at intel.com:
Quoted 8 lines
From: "Ang, Chee Hong" <[email protected]>
v4 changes:
[PATCH v4 11/21] misc:altera_sysmgr: Add Altera System Manager
- Add System Manager driver (UCLASS_MISC) to handle secure access for SoC64[PATCH v4 13/21] mmc: dwmmc: socfpga: MMC driver access System
Manager via '
altera_sysmgr'Quoted 6 lines
- DW MMC driver access System Manager via the System Manager driver
[PATCH v4 14/21] arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC
- DW MMC driver get DRVSEL & SMPLSEL clock settings from device tree[PATCH v4 15/21] net: designware: socfpga: MAC driver access System via
'
altera_sysmgr'Quoted 27 lines
- DW MAC driver access System Manager via the System Manager driver
v3:
https://lists.denx.de/pipermail/u-boot/2020-February/400986.htmlThese patchsets have dependency on:
https://lists.denx.de/pipermail/u-boot/2019-September/384906.htmlChee Hong Ang (21):
configs: agilex: RemoveCONFIG_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: soc64: Remove PHY interface setup from misc arch init
misc:altera_sysmgr: Add Altera System Manager driver
arch: arm: socfpga: Enable driver model for misc drivers.
mmc: dwmmc: socfpga: MMC driver access System Manager via
'altera_sysmgr'
arch: arm: socfpga: Add 'altr,sysmgr-syscon' for MMC node in device
tree
net: designware: socfpga: MAC driver access System Manager via
'altera_sysmgr'Quoted 8 lines
arm: socfpga: Add ATF support for Reset Manager driver
arm: socfpga: stratix10: Initialize timer in SPL
arm: socfpga: Add ATF support to query FPGA configuration status
arm: socfpga: stratix10: Add ATF support for 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
Quoted 2 lines
Are you sure building all previously existing defconfigs keeps working with every single commit here? If not, that would break 'git bisect' in the future...
I will test this.
Quoted 6 lines
I have the feeling that things might be broken in between - escpecially since you're adding the 'old' "without ATF" defconfig in the last patch. I think it would make more sense to keep the old defconfig name, keep it building correctly throughout this series and add a "with ATF" defconfig at the end. That way, you ensure existing usages keep working.
OK.
Quoted 44 lines
Regards,
SimonQuoted 40 lines
arch/arm/Kconfig | 2 + arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 1 + arch/arm/dts/socfpga_cyclone5.dtsi | 1 + arch/arm/dts/socfpga_stratix10.dtsi | 1 - arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 7 + arch/arm/dts/socfpga_stratix10_socdk.dts | 2 - arch/arm/mach-socfpga/Kconfig | 2 - arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/board.c | 10 + arch/arm/mach-socfpga/include/mach/misc.h | 3 + arch/arm/mach-socfpga/lowlevel_init_64.S | 81 +++++ arch/arm/mach-socfpga/mailbox_s10.c | 4 + arch/arm/mach-socfpga/misc_s10.c | 121 ++----- arch/arm/mach-socfpga/reset_manager_s10.c | 10 + arch/arm/mach-socfpga/timer_s10.c | 3 +- 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/misc/Makefile | 1 + drivers/misc/altera_sysmgr.c | 115 ++++++ drivers/mmc/socfpga_dw_mmc.c | 63 +++- drivers/net/dwmac_socfpga.c | 37 +- include/configs/socfpga_soc64_common.h | 4 + include/linux/intel-smc.h | 393 +++++++++++++++++++++ 29 files changed, 955 insertions(+), 122 deletions(-) create mode 100644 arch/arm/mach-socfpga/lowlevel_init_64.S 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 100644drivers/misc/altera_sysmgr.ccreate mode 100644include/linux/intel-smc.h