From: Song Gao <gaosong@loongson.cn>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Song Gao <gaosong@loongson.cn>
Subject: [PULL 07/17] hw/loongarch: Init efi_initrd table
Date: Thu, 7 Mar 2024 22:51:57 +0800 [thread overview]
Message-ID: <20240307145207.247913-8-gaosong@loongson.cn> (raw)
In-Reply-To: <20240307145207.247913-1-gaosong@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-8-gaosong@loongson.cn>
---
hw/loongarch/boot.c | 23 +++++++++++++++++++++--
include/hw/loongarch/boot.h | 9 +++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
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"
+ram_addr_t initrd_offset;
+uint64_t initrd_size;
+
static const unsigned int slave_boot_code[] = {
/* Configure reset ebase. */
0x0400302c, /* csrwr $r12,0xc */
@@ -93,6 +96,21 @@ static void init_efi_boot_memmap(struct efi_system_table *systab,
}
}
+static void init_efi_initrd_table(struct efi_system_table *systab,
+ void *p, void *start)
+{
+ efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID;
+ struct efi_initrd *initrd_table = p;
+
+ /* efi_configuration_table 2 */
+ guidcpy(&systab->tables[1].guid, &tbl_guid);
+ systab->tables[1].table = (struct efi_configuration_table *)(p - start);
+ systab->nr_tables = 2;
+
+ initrd_table->base = initrd_offset;
+ initrd_table->size = initrd_size;
+}
+
static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
{
void *bp_tables_start;
@@ -116,6 +134,8 @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
init_efi_boot_memmap(systab, p, start);
p += ROUND_UP(sizeof(struct efi_boot_memmap) +
sizeof(efi_memory_desc_t) * memmap_entries, 64);
+ init_efi_initrd_table(systab, p, start);
+ p += ROUND_UP(sizeof(struct efi_initrd), 64);
systab->tables = (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)
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;
kernel_size = load_elf(info->kernel_filename, NULL,
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)
+#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];
};
+struct efi_initrd {
+ uint64_t base;
+ uint64_t size;
+};
+
struct loongarch_boot_info {
uint64_t ram_size;
const char *kernel_filename;
--
2.34.1
next prev parent reply other threads:[~2024-03-07 14:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 14:51 [PULL 00/17] loongarch-to-apply queue Song Gao
2024-03-07 14:51 ` [PULL 01/17] hw/loongarch: Move boot fucntions to boot.c Song Gao
2024-03-07 14:51 ` [PULL 02/17] hw/loongarch: Add load initrd Song Gao
2024-03-07 14:51 ` [PULL 03/17] hw/loongarch: Add slave cpu boot_code Song Gao
2024-03-07 14:51 ` [PULL 04/17] hw/loongarch: Add init_cmdline Song Gao
2024-03-07 14:51 ` [PULL 05/17] hw/loongarch: Init efi_system_table Song Gao
2024-03-07 14:51 ` [PULL 06/17] hw/loongarch: Init efi_boot_memmap table Song Gao
2024-03-07 14:51 ` Song Gao [this message]
2024-03-07 14:51 ` [PULL 08/17] hw/loongarch: Init efi_fdt table Song Gao
2024-03-07 14:51 ` [PULL 09/17] hw/loongarch: Fix fdt memory node wrong 'reg' Song Gao
2024-03-07 14:52 ` [PULL 10/17] hw/loongarch: fdt adds cpu interrupt controller node Song Gao
2024-03-07 14:52 ` [PULL 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller Song Gao
2024-03-07 14:52 ` [PULL 12/17] hw/loongarch: fdt adds pch_pic Controller Song Gao
2024-03-07 14:52 ` [PULL 13/17] hw/loongarch: fdt adds pch_msi Controller Song Gao
2024-03-07 14:52 ` [PULL 14/17] hw/loongarch: fdt adds pcie irq_map node Song Gao
2024-03-07 14:52 ` [PULL 15/17] hw/loongarch: fdt remove unused irqchip node Song Gao
2024-03-07 15:22 ` [PULL 00/17] loongarch-to-apply queue gaosong
2024-03-07 15:23 ` Peter Maydell
2024-03-07 15:25 ` Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2024-04-28 8:51 Song Gao
2024-04-28 8:51 ` [PULL 07/17] hw/loongarch: Init efi_initrd table 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=20240307145207.247913-8-gaosong@loongson.cn \
--to=gaosong@loongson.cn \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).