mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips/bootloader: Allow bl_gen_jump_kernel to optionally set register

Browse Source 
When one of the $sp/$a[0..3] register is already set, we might
want bl_gen_jump_kernel() to NOT set it again. Pass a boolean
argument for each register, to allow to optionally set them.

Tested-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221026191821.28167-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2022-10-26 21:18:19 +02:00
parent 3c43fc333b
commit 36d7487b2a
4 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/mips/bootloader.c
View File

@ -165,15 +165,29 @@ void bl_gen_jump_to(uint32_t **p, target_ulong jump_addr)
bl_gen_nop(p); /* delay slot */
}
void bl_gen_jump_kernel(uint32_t **p, target_ulong sp, target_ulong a0,
target_ulong a1, target_ulong a2, target_ulong a3,
void bl_gen_jump_kernel(uint32_t **p,
bool set_sp, target_ulong sp,
bool set_a0, target_ulong a0,
bool set_a1, target_ulong a1,
bool set_a2, target_ulong a2,
bool set_a3, target_ulong a3,
target_ulong kernel_addr)
{
if (set_sp) {
bl_gen_load_ulong(p, BL_REG_SP, sp);
}
if (set_a0) {
bl_gen_load_ulong(p, BL_REG_A0, a0);
}
if (set_a1) {
bl_gen_load_ulong(p, BL_REG_A1, a1);
}
if (set_a2) {
bl_gen_load_ulong(p, BL_REG_A2, a2);
}
if (set_a3) {
bl_gen_load_ulong(p, BL_REG_A3, a3);
}
bl_gen_jump_to(p, kernel_addr);
}

5
hw/mips/boston.c
View File

@ -352,7 +352,10 @@ static void gen_firmware(uint32_t *p, hwaddr kernel_entry, hwaddr fdt_addr)
* a2/$6 = 0
* a3/$7 = 0
*/
bl_gen_jump_kernel(&p, 0, (int32_t)-2, fdt_addr, 0, 0, kernel_entry);
bl_gen_jump_kernel(&p,
true, 0, true, (int32_t)-2,
true, fdt_addr, true, 0, true, 0,
kernel_entry);
}
static const void *boston_fdt_filter(void *opaque, const void *fdt_orig,

8
hw/mips/fuloong2e.c
View File

@ -179,8 +179,12 @@ static void write_bootloader(CPUMIPSState *env, uint8_t *base,
/* Second part of the bootloader */
p = (uint32_t *)(base + 0x040);
bl_gen_jump_kernel(&p, ENVP_VADDR - 64, 2, ENVP_VADDR, ENVP_VADDR + 8,
loaderparams.ram_size, kernel_addr);
bl_gen_jump_kernel(&p,
true, ENVP_VADDR - 64,
true, 2, true, ENVP_VADDR,
true, ENVP_VADDR + 8,
true, loaderparams.ram_size,
kernel_addr);
}
static void main_cpu_reset(void *opaque)

8
include/hw/mips/bootloader.h
View File

@ -12,8 +12,12 @@
#include "exec/cpu-defs.h"
void bl_gen_jump_to(uint32_t **p, target_ulong jump_addr);
void bl_gen_jump_kernel(uint32_t **p, target_ulong sp, target_ulong a0,
target_ulong a1, target_ulong a2, target_ulong a3,
void bl_gen_jump_kernel(uint32_t **p,
bool set_sp, target_ulong sp,
bool set_a0, target_ulong a0,
bool set_a1, target_ulong a1,
bool set_a2, target_ulong a2,
bool set_a3, target_ulong a3,
target_ulong kernel_addr);
void bl_gen_write_ulong(uint32_t **p, target_ulong addr, target_ulong val);
void bl_gen_write_u32(uint32_t **p, target_ulong addr, uint32_t val);