| Message ID | 20240426091551.2397867-4-gaosong@loongson.cn |
|---|---|
| State | New |
| Headers | show |
| Series | Add boot LoongArch elf kernel with FDT | expand |
On 2024/4/26 下午5:15, Song Gao wrote: Message text is missing here :( > Signed-off-by: Song Gao <gaosong@loongson.cn> > Message-Id: <20240307164835.300412-4-gaosong@loongson.cn> It is strange that there is "Message-Id:" string. Is it required here? The others look good to me, especially when bootrom for AP is put at BIOS flash area. Regards Bibo Mao > --- > hw/loongarch/boot.c | 62 ++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 61 insertions(+), 1 deletion(-) > > diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c > index a9522d6912..d1a8434127 100644 > --- a/hw/loongarch/boot.c > +++ b/hw/loongarch/boot.c > @@ -15,6 +15,54 @@ > #include "sysemu/reset.h" > #include "sysemu/qtest.h" > > +static const unsigned int slave_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 */ > + > + /* Clear mailbox. */ > + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ > + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ > + 0x06481da0, /* iocsrwr.d $zero, $t1 */ > + > + /* Enable IPI interrupt. */ > + 0x1400002c, /* lu12i.w $t0, 1(0x1) */ > + 0x0400118c, /* csrxchg $t0, $t0, LOONGARCH_CSR_ECFG */ > + 0x02fffc0c, /* addi.d $t0, $r0,-1(0xfff) */ > + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ > + 0x038011ad, /* ori $t1, $t1, CORE_EN_OFF */ > + 0x064819ac, /* iocsrwr.w $t0, $t1 */ > + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ > + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ > + > + /* Wait for wakeup <.L11>: */ > + 0x06488000, /* idle 0x0 */ > + 0x03400000, /* andi $zero, $zero, 0x0 */ > + 0x064809ac, /* iocsrrd.w $t0, $t1 */ > + 0x43fff59f, /* beqz $t0, -12(0x7ffff4) # 48 <.L11> */ > + > + /* Read and clear IPI interrupt. */ > + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ > + 0x064809ac, /* iocsrrd.w $t0, $t1 */ > + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ > + 0x038031ad, /* ori $t1, $t1, CORE_CLEAR_OFF */ > + 0x064819ac, /* iocsrwr.w $t0, $t1 */ > + > + /* Disable IPI interrupt. */ > + 0x1400002c, /* lu12i.w $t0, 1(0x1) */ > + 0x04001180, /* csrxchg $zero, $t0, LOONGARCH_CSR_ECFG */ > + > + /* Read mail buf and jump to specified entry */ > + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ > + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ > + 0x06480dac, /* iocsrrd.d $t0, $t1 */ > + 0x00150181, /* move $ra, $t0 */ > + 0x4c000020, /* jirl $zero, $ra,0 */ > +}; > + > static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr) > { > return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS); > @@ -126,11 +174,23 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) > } > } > > + /* Load slave boot code at pflash0 . */ > + void *boot_code = g_malloc0(VIRT_FLASH0_SIZE); > + memcpy(boot_code, &slave_boot_code, sizeof(slave_boot_code)); > + 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; > - lacpu->env.elf_address = kernel_addr; > + 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); > } > > void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info) >
在 2024/4/28 上午9:15, maobibo 写道: > > > On 2024/4/26 下午5:15, Song Gao wrote: > > Message text is missing here :( > >> Signed-off-by: Song Gao <gaosong@loongson.cn> >> Message-Id: <20240307164835.300412-4-gaosong@loongson.cn> > It is strange that there is "Message-Id:" string. Is it required here? > Message_ID helps to find the original email and see more comments. Here we can not add it, but it is required in QEMU PR. Thanks. Song Gao > The others look good to me, especially when bootrom for AP is put at > BIOS flash area. > > Regards > Bibo Mao > >> --- >> hw/loongarch/boot.c | 62 ++++++++++++++++++++++++++++++++++++++++++++- >> 1 file changed, 61 insertions(+), 1 deletion(-) >> >> diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c >> index a9522d6912..d1a8434127 100644 >> --- a/hw/loongarch/boot.c >> +++ b/hw/loongarch/boot.c >> @@ -15,6 +15,54 @@ >> #include "sysemu/reset.h" >> #include "sysemu/qtest.h" >> +static const unsigned int slave_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 */ >> + >> + /* Clear mailbox. */ >> + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ >> + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ >> + 0x06481da0, /* iocsrwr.d $zero, $t1 */ >> + >> + /* Enable IPI interrupt. */ >> + 0x1400002c, /* lu12i.w $t0, 1(0x1) */ >> + 0x0400118c, /* csrxchg $t0, $t0, LOONGARCH_CSR_ECFG */ >> + 0x02fffc0c, /* addi.d $t0, $r0,-1(0xfff) */ >> + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ >> + 0x038011ad, /* ori $t1, $t1, CORE_EN_OFF */ >> + 0x064819ac, /* iocsrwr.w $t0, $t1 */ >> + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ >> + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ >> + >> + /* Wait for wakeup <.L11>: */ >> + 0x06488000, /* idle 0x0 */ >> + 0x03400000, /* andi $zero, $zero, 0x0 */ >> + 0x064809ac, /* iocsrrd.w $t0, $t1 */ >> + 0x43fff59f, /* beqz $t0, -12(0x7ffff4) # 48 <.L11> */ >> + >> + /* Read and clear IPI interrupt. */ >> + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ >> + 0x064809ac, /* iocsrrd.w $t0, $t1 */ >> + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ >> + 0x038031ad, /* ori $t1, $t1, CORE_CLEAR_OFF */ >> + 0x064819ac, /* iocsrwr.w $t0, $t1 */ >> + >> + /* Disable IPI interrupt. */ >> + 0x1400002c, /* lu12i.w $t0, 1(0x1) */ >> + 0x04001180, /* csrxchg $zero, $t0, LOONGARCH_CSR_ECFG */ >> + >> + /* Read mail buf and jump to specified entry */ >> + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ >> + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ >> + 0x06480dac, /* iocsrrd.d $t0, $t1 */ >> + 0x00150181, /* move $ra, $t0 */ >> + 0x4c000020, /* jirl $zero, $ra,0 */ >> +}; >> + >> static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t >> addr) >> { >> return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS); >> @@ -126,11 +174,23 @@ static void loongarch_direct_kernel_boot(struct >> loongarch_boot_info *info) >> } >> } >> + /* Load slave boot code at pflash0 . */ >> + void *boot_code = g_malloc0(VIRT_FLASH0_SIZE); >> + memcpy(boot_code, &slave_boot_code, sizeof(slave_boot_code)); >> + 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; >> - lacpu->env.elf_address = kernel_addr; >> + 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); >> } >> void loongarch_load_kernel(MachineState *ms, struct >> loongarch_boot_info *info) >>
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index a9522d6912..d1a8434127 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -15,6 +15,54 @@ #include "sysemu/reset.h" #include "sysemu/qtest.h" +static const unsigned int slave_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 */ + + /* Clear mailbox. */ + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ + 0x06481da0, /* iocsrwr.d $zero, $t1 */ + + /* Enable IPI interrupt. */ + 0x1400002c, /* lu12i.w $t0, 1(0x1) */ + 0x0400118c, /* csrxchg $t0, $t0, LOONGARCH_CSR_ECFG */ + 0x02fffc0c, /* addi.d $t0, $r0,-1(0xfff) */ + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ + 0x038011ad, /* ori $t1, $t1, CORE_EN_OFF */ + 0x064819ac, /* iocsrwr.w $t0, $t1 */ + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ + + /* Wait for wakeup <.L11>: */ + 0x06488000, /* idle 0x0 */ + 0x03400000, /* andi $zero, $zero, 0x0 */ + 0x064809ac, /* iocsrrd.w $t0, $t1 */ + 0x43fff59f, /* beqz $t0, -12(0x7ffff4) # 48 <.L11> */ + + /* Read and clear IPI interrupt. */ + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ + 0x064809ac, /* iocsrrd.w $t0, $t1 */ + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ + 0x038031ad, /* ori $t1, $t1, CORE_CLEAR_OFF */ + 0x064819ac, /* iocsrwr.w $t0, $t1 */ + + /* Disable IPI interrupt. */ + 0x1400002c, /* lu12i.w $t0, 1(0x1) */ + 0x04001180, /* csrxchg $zero, $t0, LOONGARCH_CSR_ECFG */ + + /* Read mail buf and jump to specified entry */ + 0x1400002d, /* lu12i.w $t1, 1(0x1) */ + 0x038081ad, /* ori $t1, $t1, CORE_BUF_20 */ + 0x06480dac, /* iocsrrd.d $t0, $t1 */ + 0x00150181, /* move $ra, $t0 */ + 0x4c000020, /* jirl $zero, $ra,0 */ +}; + static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr) { return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS); @@ -126,11 +174,23 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) } } + /* Load slave boot code at pflash0 . */ + void *boot_code = g_malloc0(VIRT_FLASH0_SIZE); + memcpy(boot_code, &slave_boot_code, sizeof(slave_boot_code)); + 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; - lacpu->env.elf_address = kernel_addr; + 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); } void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
Signed-off-by: Song Gao <gaosong@loongson.cn> Message-Id: <20240307164835.300412-4-gaosong@loongson.cn> --- hw/loongarch/boot.c | 62 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-)