From nobody Sat Sep 21 04:32:30 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 1705578527378368.2687514565947; Thu, 18 Jan 2024 03:48:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQQsG-0005MG-Oh; Thu, 18 Jan 2024 06:47:56 -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 1rQQro-0005C5-CZ for qemu-devel@nongnu.org; Thu, 18 Jan 2024 06:47:28 -0500 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQQrj-0004kC-Mm for qemu-devel@nongnu.org; Thu, 18 Jan 2024 06:47:28 -0500 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8Bx3+vJD6llh54BAA--.7745S3; Thu, 18 Jan 2024 19:47:21 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxXs3HD6llrW8IAA--.40089S9; Thu, 18 Jan 2024 19:47:21 +0800 (CST) From: Song Gao To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, richard.henderson@linaro.org, philmd@linaro.org, maobibo@loongson.cn, zhaotianrui@loongson.cn, lixianglai@loongson.cn Subject: [RESEND PATCH v4 07/17] hw/loongarch: Init efi_initrd table Date: Thu, 18 Jan 2024 19:31:13 +0800 Message-Id: <20240118113123.1672939-8-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240118113123.1672939-1-gaosong@loongson.cn> References: <20240118113123.1672939-1-gaosong@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8BxXs3HD6llrW8IAA--.40089S9 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: 1705578529667100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Song Gao Message-Id: <20231227080821.3216113-8-gaosong@loongson.cn> --- include/hw/loongarch/boot.h | 9 +++++++++ hw/loongarch/boot.c | 23 +++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h index 7ad25080c5..ce47056608 100644 --- a/include/hw/loongarch/boot.h +++ b/include/hw/loongarch/boot.h @@ -30,6 +30,10 @@ typedef struct { EFI_GUID(0x800f683f, 0xd08b, 0x423a, 0xa2, 0x93, \ 0x96, 0x5c, 0x3c, 0x6f, 0xe2, 0xb4) =20 +#define LINUX_EFI_INITRD_MEDIA_GUID \ + EFI_GUID(0x5568e427, 0x68fc, 0x4f3d, 0xac, 0x74, \ + 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68) + struct efi_config_table { efi_guid_t guid; uint64_t *ptr; @@ -83,6 +87,11 @@ struct efi_boot_memmap { efi_memory_desc_t map[32]; }; =20 +struct efi_initrd { + uint64_t base; + uint64_t size; +}; + struct loongarch_boot_info { uint64_t ram_size; const char *kernel_filename; diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index c086070bc8..6f56d4fd91 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -14,6 +14,9 @@ #include "qemu/error-report.h" #include "sysemu/reset.h" =20 +ram_addr_t initrd_offset; +uint64_t initrd_size; + static const unsigned int slave_boot_code[] =3D { /* Configure reset ebase. */ 0x0400302c, /* csrwr $r12,0xc */ @@ -93,6 +96,21 @@ static void init_efi_boot_memmap(struct efi_system_table= *systab, } } =20 +static void init_efi_initrd_table(struct efi_system_table *systab, + void *p, void *start) +{ + efi_guid_t tbl_guid =3D LINUX_EFI_INITRD_MEDIA_GUID; + struct efi_initrd *initrd_table =3D p; + + /* efi_configuration_table 2 */ + guidcpy(&systab->tables[1].guid, &tbl_guid); + systab->tables[1].table =3D (struct efi_configuration_table *)(p - sta= rt); + systab->nr_tables =3D 2; + + initrd_table->base =3D initrd_offset; + initrd_table->size =3D initrd_size; +} + static void init_systab(struct loongarch_boot_info *info, void *p, void *s= tart) { void *bp_tables_start; @@ -116,6 +134,8 @@ static void init_systab(struct loongarch_boot_info *inf= o, void *p, void *start) init_efi_boot_memmap(systab, p, start); p +=3D ROUND_UP(sizeof(struct efi_boot_memmap) + sizeof(efi_memory_desc_t) * memmap_entries, 64); + init_efi_initrd_table(systab, p, start); + p +=3D ROUND_UP(sizeof(struct efi_initrd), 64); =20 systab->tables =3D (struct efi_configuration_table *)(bp_tables_start = - start); } @@ -137,8 +157,7 @@ static uint64_t cpu_loongarch_virt_to_phys(void *opaque= , uint64_t addr) =20 static int64_t load_kernel_info(struct loongarch_boot_info *info) { - uint64_t kernel_entry, kernel_low, kernel_high, initrd_size; - ram_addr_t initrd_offset; + uint64_t kernel_entry, kernel_low, kernel_high; ssize_t kernel_size; =20 kernel_size =3D load_elf(info->kernel_filename, NULL, --=20 2.25.1