pull-loongarch-20250918
-----BEGIN PGP SIGNATURE----- iLMEAAEIAB0WIQTKRzxE1qCcGJoZP81FK5aFKyaCFgUCaMvTpQAKCRBFK5aFKyaC Fkk0BACDkaQa6jDON8aLcTFcwpIlrnblqlYo6EK7TaGqpI866EhTX09BscRF5bvp 3JtGARKy5a6s5GJ64KItIl4n5Z6xvt4ME1KjyqeUTpD99c7J1krgxl6+W/NthK/K cLbSnlfvcw/L6KfIsGP6i2F6Y+riyZf6OYMc9IF/xFEAIMKJyA== =EgXn -----END PGP SIGNATURE----- Merge tag 'pull-loongarch-20250918' of https://github.com/gaosong715/qemu into staging pull-loongarch-20250918 # -----BEGIN PGP SIGNATURE----- # # iLMEAAEIAB0WIQTKRzxE1qCcGJoZP81FK5aFKyaCFgUCaMvTpQAKCRBFK5aFKyaC # Fkk0BACDkaQa6jDON8aLcTFcwpIlrnblqlYo6EK7TaGqpI866EhTX09BscRF5bvp # 3JtGARKy5a6s5GJ64KItIl4n5Z6xvt4ME1KjyqeUTpD99c7J1krgxl6+W/NthK/K # cLbSnlfvcw/L6KfIsGP6i2F6Y+riyZf6OYMc9IF/xFEAIMKJyA== # =EgXn # -----END PGP SIGNATURE----- # gpg: Signature made Thu 18 Sep 2025 02:40:53 AM PDT # gpg: using RSA key CA473C44D6A09C189A193FCD452B96852B268216 # gpg: Good signature from "Song Gao <gaosong@loongson.cn>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: CA47 3C44 D6A0 9C18 9A19 3FCD 452B 9685 2B26 8216 * tag 'pull-loongarch-20250918' of https://github.com/gaosong715/qemu: hw/loongarch/virt: Register reset interface with cpu plug callback hw/loongarch/virt: Remove unnecessay pre-boot setting with BSP hw/loongarch/virt: Add BSP support with aux boot code Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
e7c1e8043a
3 changed files with 36 additions and 41 deletions
|
|
@ -35,13 +35,19 @@ struct loongarch_linux_hdr {
|
|||
uint32_t pe_header_offset;
|
||||
} QEMU_PACKED;
|
||||
|
||||
static const unsigned int slave_boot_code[] = {
|
||||
static const unsigned int aux_boot_code[] = {
|
||||
/* Configure reset ebase. */
|
||||
0x0400302c, /* csrwr $t0, LOONGARCH_CSR_EENTRY */
|
||||
|
||||
/* Disable interrupt. */
|
||||
0x0380100c, /* ori $t0, $zero,0x4 */
|
||||
0x04000180, /* csrxchg $zero, $t0, LOONGARCH_CSR_CRMD */
|
||||
0x03400000, /* nop */
|
||||
|
||||
0x0400800c, /* csrrd $t0, LOONGARCH_CSR_CPUNUM */
|
||||
0x034ffd8c, /* andi $t0, $t0, 0x3ff */
|
||||
0x0015000d, /* move $t1, $zero */
|
||||
0x5800718d, /* beq $t0, $t1, 112 */
|
||||
|
||||
/* Clear mailbox. */
|
||||
0x1400002d, /* lu12i.w $t1, 1(0x1) */
|
||||
|
|
@ -81,6 +87,26 @@ static const unsigned int slave_boot_code[] = {
|
|||
0x06480dac, /* iocsrrd.d $t0, $t1 */
|
||||
0x00150181, /* move $ra, $t0 */
|
||||
0x4c000020, /* jirl $zero, $ra,0 */
|
||||
/* BSP Core */
|
||||
0x03400000, /* nop */
|
||||
0x1800000d, /* pcaddi $t1, 0 */
|
||||
0x28c0a1a4, /* ld.d $a0, $t1, 40 */
|
||||
0x1800000d, /* pcaddi $t1, 0 */
|
||||
0x28c0a1a5, /* ld.d $a1, $t1, 40 */
|
||||
0x1800000d, /* pcaddi $t1, 0 */
|
||||
0x28c0a1a6, /* ld.d $a2, $t1, 40 */
|
||||
0x1800000d, /* pcaddi $t1, 0 */
|
||||
0x28c0a1ac, /* ld.d $t0, $t1, 40 */
|
||||
0x00150181, /* move $ra, $t0 */
|
||||
0x4c000020, /* jirl $zero, $ra,0 */
|
||||
0x00000000, /* .dword 0 A0 */
|
||||
0x00000000,
|
||||
0x00000000, /* .dword 0 A1 */
|
||||
0x00000000,
|
||||
0x00000000, /* .dword 0 A2 */
|
||||
0x00000000,
|
||||
0x00000000, /* .dword 0 PC */
|
||||
0x00000000,
|
||||
};
|
||||
|
||||
static inline void *guidcpy(void *dst, const void *src)
|
||||
|
|
@ -324,22 +350,6 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
|
|||
return kernel_entry;
|
||||
}
|
||||
|
||||
static void reset_load_elf(void *opaque)
|
||||
{
|
||||
LoongArchCPU *cpu = opaque;
|
||||
CPULoongArchState *env = &cpu->env;
|
||||
|
||||
cpu_reset(CPU(cpu));
|
||||
if (env->load_elf) {
|
||||
if (cpu == LOONGARCH_CPU(first_cpu)) {
|
||||
env->gpr[4] = env->boot_info->a0;
|
||||
env->gpr[5] = env->boot_info->a1;
|
||||
env->gpr[6] = env->boot_info->a2;
|
||||
}
|
||||
cpu_set_pc(CPU(cpu), env->elf_address);
|
||||
}
|
||||
}
|
||||
|
||||
static void fw_cfg_add_kernel_info(struct loongarch_boot_info *info,
|
||||
FWCfgState *fw_cfg)
|
||||
{
|
||||
|
|
@ -389,8 +399,7 @@ static void loongarch_direct_kernel_boot(MachineState *ms,
|
|||
{
|
||||
void *p, *bp;
|
||||
int64_t kernel_addr = VIRT_FLASH0_BASE;
|
||||
LoongArchCPU *lacpu;
|
||||
CPUState *cs;
|
||||
uint64_t *data;
|
||||
|
||||
if (info->kernel_filename) {
|
||||
kernel_addr = load_kernel_info(info);
|
||||
|
|
@ -408,20 +417,14 @@ static void loongarch_direct_kernel_boot(MachineState *ms,
|
|||
|
||||
/* Load slave boot code at pflash0 . */
|
||||
void *boot_code = g_malloc0(VIRT_FLASH0_SIZE);
|
||||
memcpy(boot_code, &slave_boot_code, sizeof(slave_boot_code));
|
||||
memcpy(boot_code, &aux_boot_code, sizeof(aux_boot_code));
|
||||
data = (uint64_t *)(boot_code + sizeof(aux_boot_code));
|
||||
*(data - 4) = cpu_to_le64(info->a0);
|
||||
*(data - 3) = cpu_to_le64(info->a1);
|
||||
*(data - 2) = cpu_to_le64(info->a2);
|
||||
*(data - 1) = cpu_to_le64(kernel_addr);
|
||||
rom_add_blob_fixed("boot_code", boot_code, VIRT_FLASH0_SIZE, VIRT_FLASH0_BASE);
|
||||
|
||||
CPU_FOREACH(cs) {
|
||||
lacpu = LOONGARCH_CPU(cs);
|
||||
lacpu->env.load_elf = true;
|
||||
if (cs == first_cpu) {
|
||||
lacpu->env.elf_address = kernel_addr;
|
||||
} else {
|
||||
lacpu->env.elf_address = VIRT_FLASH0_BASE;
|
||||
}
|
||||
lacpu->env.boot_info = info;
|
||||
}
|
||||
|
||||
g_free(boot_code);
|
||||
g_free(bp);
|
||||
}
|
||||
|
|
@ -429,12 +432,6 @@ static void loongarch_direct_kernel_boot(MachineState *ms,
|
|||
void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
|
||||
{
|
||||
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(ms);
|
||||
int i;
|
||||
|
||||
/* register reset function */
|
||||
for (i = 0; i < ms->smp.cpus; i++) {
|
||||
qemu_register_reset(reset_load_elf, LOONGARCH_CPU(qemu_get_cpu(i)));
|
||||
}
|
||||
|
||||
info->kernel_filename = ms->kernel_filename;
|
||||
info->kernel_cmdline = ms->kernel_cmdline;
|
||||
|
|
|
|||
|
|
@ -1014,6 +1014,7 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_dev,
|
|||
/* Notify acpi ged CPU removed */
|
||||
hotplug_handler_unplug(HOTPLUG_HANDLER(lvms->acpi_ged), dev, &error_abort);
|
||||
|
||||
qemu_unregister_resettable(OBJECT(dev));
|
||||
cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);
|
||||
cpu_slot->cpu = NULL;
|
||||
}
|
||||
|
|
@ -1038,6 +1039,7 @@ static void virt_cpu_plug(HotplugHandler *hotplug_dev,
|
|||
&error_abort);
|
||||
}
|
||||
|
||||
qemu_register_resettable(OBJECT(dev));
|
||||
cpu_slot = virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id);
|
||||
cpu_slot->cpu = CPU(dev);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -387,11 +387,7 @@ typedef struct CPUArchState {
|
|||
#endif
|
||||
|
||||
AddressSpace *address_space_iocsr;
|
||||
bool load_elf;
|
||||
uint64_t elf_address;
|
||||
uint32_t mp_state;
|
||||
|
||||
struct loongarch_boot_info *boot_info;
|
||||
#endif
|
||||
} CPULoongArchState;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue