riscv: andes_plicsw: Fix IPI during OpenSBI invocation
PATCH 1/2 riscv: andes_plicsw: Fix IPI during OpenSBI invocation
On some AE350 boards, we need to explicitly initialize the priority registers to a non-zero value so the boot hart can instruct secondary harts to jump to OpenSBI.
This patch also updates the information about PLICSW.
--- arch/riscv/lib/andes_plicsw.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
arch/riscv/lib/andes_plicsw.c +22 -3
@@ -2,9 +2,10 @@/* * Copyright (C) 2019, Rick Chen <[email protected]> * -* U-Boot syscon driver for Andes's Platform Level Interrupt Controller (PLIC). -* The PLIC block holds memory-mapped claim and pending registers -* associated with software interrupt. +* U-Boot syscon driver for Andes' PLICSW +* The PLICSW block is an Andes-specific design for software interrupts, +* contains memory-mapped priority, enable, claim and pending registers +* similar to RISC-V PLIC. */ #include <common.h>
@@ -26,9 +27,13 @@#define ENABLE_REG (base, hart) ((ulong)(base) + 0x2000 + (hart) * 0x80)/* claim register */ #define CLAIM_REG (base, hart) ((ulong)(base) + 0x200004 + (hart) * 0x1000) +/* priority register */ +#define PRIORITY_REG (base) ((ulong)(base) + PLICSW_PRIORITY_BASE)#define ENABLE_HART_IPI (0x01010101)#define SEND_IPI_TO_HART (hart) (0x1 << (hart)) +#define PLICSW_PRIORITY_BASE 0x4 +#define PLICSW_INTERRUPT_PER_HART 0x8DECLARE_GLOBAL_DATA_PTR ;
@@ -43,9 +48,21 @@ static int enable_ipi(int hart)return 0 ; } +static void init_priority_ipi (int hart_num) +{ +uint32_t *priority = (void *)PRIORITY_REG (gd->arch.plicsw); + +for (int i =0 ; i < hart_num *PLICSW_INTERRUPT_PER_HART ; i++) { +writel (1 , &priority[i]); + } + +return ; +} +int riscv_init_ipi (void ) {int ret; +int hart_num =0 ;long *base =syscon_get_first_range (RISCV_SYSCON_PLICSW );ofnode node;struct udevice *dev;
@@ -79,8 +96,10 @@ int riscv_init_ipi(void) ret =ofnode_read_u32 (node,"reg" , ®);if (ret ==0 )enable_ipi (reg); + hart_num++; } +init_priority_ipi (hart_num);return 0 ; }
Signature · 1 line
2.34.1
PATCH 2/2 board: ae350: Add missing env variables for booti
The 'booti' command is unable to boot Image.gz due to the absence of required environment variables 'kernel_comp_addr_r' and 'kernel_comp_size'.
This commit adds these variables and reorganizes the memory layout to prevent any overlap between binaries and files.
--- include/configs/ae350.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
include/configs/ae350.h +9 -5
@@ -83,11 +83,15 @@#include <config_distro_bootcmd.h> #define CFG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x00080000\0" \ - "pxefile_addr_r=0x01f00000\0" \ - "scriptaddr=0x01f00000\0" \ - "fdt_addr_r=0x02000000\0" \ - "ramdisk_addr_r=0x02800000\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "kernel_addr_r=0x00600000\0" \ + "kernel_comp_addr_r=0x04600000\0" \ + "kernel_comp_size=0x04000000\0" \ + "pxefile_addr_r=0x08600000\0" \ + "scriptaddr=0x08700000\0" \ + "fdt_addr_r=0x08800000\0" \ + "ramdisk_addr_r=0x08900000\0" \ BOOTENV#endif /* __CONFIG_H */
Signature · 1 line
2.34.1
Re: [PATCH 2/2] board: ae350: Add missing env variables for booti
Quoted 4 lines · Yu Chien Peter Lin
The 'booti' command is unable to boot Image.gz due to the absence of required environment variables '
kernel_comp_addr_r' and 'kernel_comp_size'.
Quoted 8 lines
This commit adds these variables and reorganizes the memory layout to prevent any overlap between binaries and files.
Signed-off-by Yu Chien Peter Lin <[email protected]>--- include/configs/ae350.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
Quoted 11 lines · Yu Chien Peter Lin
On some AE350 boards, we need to explicitly initialize the priority registers to a non-zero value so the boot hart can instruct secondary harts to jump to OpenSBI.
This patch also updates the information about PLICSW.
Signed-off-by Yu Chien Peter Lin <[email protected]>--- arch/riscv/lib/andes_plicsw.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)