From nobody Tue Nov 26 07:31:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709825384242278.94993248566743; Thu, 7 Mar 2024 07:29:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riFg4-0006CG-V2; Thu, 07 Mar 2024 10:29:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riFft-00067n-A9 for qemu-devel@nongnu.org; Thu, 07 Mar 2024 10:28:50 -0500 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riFfm-0005dk-Ry for qemu-devel@nongnu.org; Thu, 07 Mar 2024 10:28:48 -0500 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8Dxfeso3ellDPgVAA--.54054S3; Thu, 07 Mar 2024 23:28:40 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxdMwk3ellNlBQAA--.33344S6; Thu, 07 Mar 2024 23:28:39 +0800 (CST) From: Song Gao To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PULL v2 04/17] hw/loongarch: Add init_cmdline Date: Thu, 7 Mar 2024 23:28:22 +0800 Message-Id: <20240307152835.299233-5-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240307152835.299233-1-gaosong@loongson.cn> References: <20240307152835.299233-1-gaosong@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8DxdMwk3ellNlBQAA--.33344S6 X-CM-SenderInfo: 5jdr20tqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=gaosong@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1709825384959100003 Content-Type: text/plain; charset="utf-8" Add init_cmline and set boot_info->a0, a1 Signed-off-by: Song Gao Message-Id: <20240301093839.663947-5-gaosong@loongson.cn> --- hw/loongarch/boot.c | 19 +++++++++++++++++++ include/hw/loongarch/virt.h | 2 ++ target/loongarch/cpu.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 2f398260af..897d4636b6 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -62,6 +62,16 @@ static const unsigned int slave_boot_code[] =3D { 0x4c000020, /* jirl $r0,$r1,0 */ }; =20 +static void init_cmdline(struct loongarch_boot_info *info, void *p, void *= start) +{ + hwaddr cmdline_addr =3D (hwaddr)p - (hwaddr)start; + + info->a0 =3D 1; + info->a1 =3D 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); @@ -121,6 +131,10 @@ static void reset_load_elf(void *opaque) =20 cpu_reset(CPU(cpu)); if (env->load_elf) { + if (cpu =3D=3D LOONGARCH_CPU(first_cpu)) { + env->gpr[4] =3D env->boot_info->a0; + env->gpr[5] =3D env->boot_info->a1; + } cpu_set_pc(CPU(cpu), env->elf_address); } } @@ -160,8 +174,13 @@ static void loongarch_firmware_boot(LoongArchMachineSt= ate *lams, =20 static void init_boot_rom(struct loongarch_boot_info *info, void *p) { + void *start =3D p; + memcpy(p, &slave_boot_code, sizeof(slave_boot_code)); p +=3D sizeof(slave_boot_code); + + init_cmdline(info, p, start); + p +=3D COMMAND_LINE_SIZE; } =20 static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) 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) =20 +#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; =20 --=20 2.34.1