Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 04:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board: ns3: add api to save boot parameters passed from BL31

Browse source 
Add API to save boot parameters passed from BL31

Use assembly implementation of save_boot_params instead of c function.
Because generally ATF does not set up SP_EL2 on exiting.
Thus, usage of a C function immediately after exiting with no stack
setup done by ATF explicitly, may cause SP_EL2 to be not sane,
which in turn causes a crash if this boot was not lucky to get
an SP_EL2 in valid range. Replace C implementation with assembly one
which does not use stack this early, and let u-boot to set up its stack
later.

Signed-off-by: Abhishek Shah <abhishek.shah@broadcom.com>
Signed-off-by: Rajesh Ravi <rajesh.ravi@broadcom.com>
Signed-off-by: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Abhishek Shah 2020-07-15 22:48:59 +05:30 • committed by Tom Rini
parent 69d8acc30b
commit ef7192e404
3 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/cpu/armv8/bcmns3/lowlevel.S
View file

@ -87,3 +87,12 @@ ENTRY(__asm_flush_l3_dcache)
mov lr, x29 mov lr, x29
ret ret
ENDPROC(__asm_flush_l3_dcache) ENDPROC(__asm_flush_l3_dcache)
ENTRY(save_boot_params)
/*
* void set_boot_params(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3)
*/
adr x4, bl33_info
str x0, [x4]
b save_boot_params_ret
ENDPROC(save_boot_params)

26
arch/arm/include/asm/arch-bcmns3/bl33_info.h Normal file
View file

@ -0,0 +1,26 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2020 Broadcom.
*
*/
#ifndef BL33_INFO_H
#define BL33_INFO_H
#include <asm/io.h>
/* Increase version number each time this file is modified */
#define BL33_INFO_VERSION 1
struct chip_info {
unsigned int chip_id;
unsigned int rev_id;
};
struct bl33_info {
unsigned int version;
struct chip_info chip;
};
extern struct bl33_info *bl33_info;
#endif

10
board/broadcom/bcmns3/ns3.c
View file

@ -8,6 +8,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
#include <asm/arch-bcmns3/bl33_info.h>
static struct mm_region ns3_mem_map[] = { static struct mm_region ns3_mem_map[] = {
{ {
@ -33,8 +34,17 @@ struct mm_region *mem_map = ns3_mem_map;
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/*
* Force the bl33_info to the data-section, as .bss will not be valid
* when save_boot_params is invoked.
*/
struct bl33_info *bl33_info __section(".data");
int board_init(void) int board_init(void)
{ {
if (bl33_info->version != BL33_INFO_VERSION)
printf("*** warning: ATF BL31 and U-Boot not in sync! ***\n");
return 0; return 0;
} }