All of lore.kernel.org
 help / color / mirror / Atom feed
From: Song Gao <gaosong@loongson.cn>
To: qemu-devel@nongnu.org, maobibo@loongson.cn
Cc: richard.henderson@linaro.org, peter.maydell@linaro.org,
	philmd@linaro.org, zltjiangshi@gmail.com
Subject: [PATCH v7 04/17] hw/loongarch: Add init_cmdline
Date: Fri, 26 Apr 2024 17:15:38 +0800	[thread overview]
Message-ID: <20240426091551.2397867-5-gaosong@loongson.cn> (raw)
In-Reply-To: <20240426091551.2397867-1-gaosong@loongson.cn>

Add init_cmline and set boot_info->a0, a1

Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Message-Id: <20240307164835.300412-5-gaosong@loongson.cn>
---
 include/hw/loongarch/virt.h |  2 ++
 target/loongarch/cpu.h      |  2 ++
 hw/loongarch/boot.c         | 30 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index cf2f2bfb19..d7a074d69f 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -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;
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index ec37579fd6..ce02ef3979 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -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;
 
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index d1a8434127..aca5ad388e 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -63,6 +63,16 @@ static const unsigned int slave_boot_code[] = {
     0x4c000020,   /* jirl       $zero, $ra,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);
@@ -122,6 +132,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);
     }
 }
@@ -159,8 +173,17 @@ static void loongarch_firmware_boot(LoongArchMachineState *lams,
     fw_cfg_add_kernel_info(info, lams->fw_cfg);
 }
 
+static void init_boot_rom(struct loongarch_boot_info *info, void *p)
+{
+    void *start = p;
+
+    init_cmdline(info, p, start);
+    p += COMMAND_LINE_SIZE;
+}
+
 static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
 {
+    void *p, *bp;
     int64_t kernel_addr = 0;
     LoongArchCPU *lacpu;
     CPUState *cs;
@@ -174,6 +197,12 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
         }
     }
 
+    /* Load cmdline and system tables at [0 - 1 MiB] */
+    p = g_malloc0(1 * MiB);
+    bp = p;
+    init_boot_rom(info, p);
+    rom_add_blob_fixed_as("boot_info", bp, 1 * MiB, 0, &address_space_memory);
+
     /* Load slave boot code at pflash0 . */
     void *boot_code = g_malloc0(VIRT_FLASH0_SIZE);
     memcpy(boot_code, &slave_boot_code, sizeof(slave_boot_code));
@@ -191,6 +220,7 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
     }
 
     g_free(boot_code);
+    g_free(bp);
 }
 
 void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
-- 
2.25.1



  parent reply	other threads:[~2024-04-26  9:34 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-26  9:15 [PATCH v7 00/17] Add boot LoongArch elf kernel with FDT Song Gao
2024-04-26  9:15 ` [PATCH v7 01/17] hw/loongarch: Move boot functions to boot.c Song Gao
2024-04-26  9:15 ` [PATCH v7 02/17] hw/loongarch: Add load initrd Song Gao
2024-04-26  9:15 ` [PATCH v7 03/17] hw/loongarch: Add slave cpu boot_code Song Gao
2024-04-28  1:15   ` maobibo
2024-04-28  7:15     ` gaosong
2024-04-26  9:15 ` Song Gao [this message]
2024-04-26  9:15 ` [PATCH v7 05/17] hw/loongarch: Init efi_system_table Song Gao
2024-04-26  9:15 ` [PATCH v7 06/17] hw/loongarch: Init efi_boot_memmap table Song Gao
2024-04-28  1:34   ` maobibo
2024-04-28  7:19     ` gaosong
2024-04-26  9:15 ` [PATCH v7 07/17] hw/loongarch: Init efi_initrd table Song Gao
2024-04-26  9:15 ` [PATCH v7 08/17] hw/loongarch: Init efi_fdt table Song Gao
2024-04-26  9:15 ` [PATCH v7 09/17] hw/loongarch: Fix fdt memory node wrong 'reg' Song Gao
2024-04-26  9:15 ` [PATCH v7 10/17] hw/loongarch: fdt adds cpu interrupt controller node Song Gao
2024-04-26  9:15 ` [PATCH v7 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller Song Gao
2024-04-26  9:15 ` [PATCH v7 12/17] hw/loongarch: fdt adds pch_pic Controller Song Gao
2024-04-26  9:15 ` [PATCH v7 13/17] hw/loongarch: fdt adds pch_msi Controller Song Gao
2024-04-26  9:15 ` [PATCH v7 14/17] hw/loongarch: fdt adds pcie irq_map node Song Gao
2024-04-26  9:15 ` [PATCH v7 15/17] hw/loongarch: fdt remove unused irqchip node Song Gao
2024-04-26  9:15 ` [PATCH v7 16/17] hw/loongarch: Add cells missing from uart node Song Gao
2024-04-26  9:15 ` [PATCH v7 17/17] hw/loongarch: Add cells missing from rtc node Song Gao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240426091551.2397867-5-gaosong@loongson.cn \
    --to=gaosong@loongson.cn \
    --cc=maobibo@loongson.cn \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=zltjiangshi@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.