Skip to content

Commit

Permalink
hw/loongarch: Add init_cmdline
Browse files Browse the repository at this point in the history
Add init_cmline and set boot_info->a0, a1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-5-gaosong@loongson.cn>
  • Loading branch information
gaosong-loongson committed Mar 7, 2024
1 parent 667e31a commit c1aa525
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 0 deletions.
19 changes: 19 additions & 0 deletions hw/loongarch/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@ static const unsigned int slave_boot_code[] = {
0x4c000020, /* jirl $r0,$r1,0 */
};

static void init_cmdline(struct loongarch_boot_info *info, void *p, void *start)
{
hwaddr cmdline_addr = (hwaddr)p - (hwaddr)start;

info->a0 = 1;
info->a1 = cmdline_addr;

memcpy(p, info->kernel_cmdline, COMMAND_LINE_SIZE);
}

static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
{
return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
Expand Down Expand Up @@ -121,6 +131,10 @@ static void reset_load_elf(void *opaque)

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;
}
cpu_set_pc(CPU(cpu), env->elf_address);
}
}
Expand Down Expand Up @@ -160,8 +174,13 @@ static void loongarch_firmware_boot(LoongArchMachineState *lams,

static void init_boot_rom(struct loongarch_boot_info *info, void *p)
{
void *start = p;

memcpy(p, &slave_boot_code, sizeof(slave_boot_code));
p += sizeof(slave_boot_code);

init_cmdline(info, p, start);
p += COMMAND_LINE_SIZE;
}

static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
Expand Down
2 changes: 2 additions & 0 deletions include/hw/loongarch/virt.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#define VIRT_GED_MEM_ADDR (VIRT_GED_EVT_ADDR + ACPI_GED_EVT_SEL_LEN)
#define VIRT_GED_REG_ADDR (VIRT_GED_MEM_ADDR + MEMORY_HOTPLUG_IO_LEN)

#define COMMAND_LINE_SIZE 512

struct LoongArchMachineState {
/*< private >*/
MachineState parent_obj;
Expand Down
2 changes: 2 additions & 0 deletions target/loongarch/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ typedef struct CPUArchState {
uint32_t mp_state;
/* Store ipistate to access from this struct */
DeviceState *ipistate;

struct loongarch_boot_info *boot_info;
#endif
} CPULoongArchState;

Expand Down

0 comments on commit c1aa525

Please sign in to comment.