[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/17] hw/loongarch: Init efi_initrd table
From: |
Song Gao |
Subject: |
[PATCH v3 07/17] hw/loongarch: Init efi_initrd table |
Date: |
Wed, 27 Dec 2023 16:08:11 +0800 |
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/boot.c | 24 ++++++++++++++++++++++--
include/hw/loongarch/boot.h | 9 +++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 4103fb2781..387602d669 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -15,6 +15,9 @@
#include "sysemu/reset.h"
#include <asm-generic/setup.h>
+ram_addr_t initrd_offset;
+uint64_t initrd_size;
+
static unsigned int slave_boot_code[] = {
/* Configure reset ebase. */
0x0400302c, /* csrwr $r12,0xc */
@@ -97,6 +100,23 @@ static void init_efi_boot_memmap(struct efi_system_table
*systab,
sizeof(efi_memory_desc_t) * memmap_entries, 64);
}
+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;
+
+ p += ROUND_UP(sizeof(struct efi_initrd), 64);
+}
+
static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
{
void *bp_tables_start;
@@ -118,6 +138,7 @@ static void init_systab(struct loongarch_boot_info *info,
void *p, void *start)
bp_tables_start = p;
init_efi_boot_memmap(systab, p, start);
+ init_efi_initrd_table(systab, p, start);
systab->tables = (struct efi_configuration_table *)(bp_tables_start -
start);
}
@@ -139,8 +160,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.25.1
- [PATCH v3 00/17] Add boot LoongArch elf kernel with FDT, Song Gao, 2023/12/27
- [PATCH v3 04/17] hw/loongarch: Add init_cmdline, Song Gao, 2023/12/27
- [PATCH v3 08/17] hw/loongarch: Init efi_fdt table, Song Gao, 2023/12/27
- [PATCH v3 02/17] hw/loongarch: Add load initrd, Song Gao, 2023/12/27
- [PATCH v3 10/17] hw/loongarch: fdt adds cpu interrupt controller node, Song Gao, 2023/12/27
- [PATCH v3 06/17] hw/loongarch: Init efi_boot_memmap table, Song Gao, 2023/12/27
- [PATCH v3 05/17] hw/loongarch: Init efi_system_table, Song Gao, 2023/12/27
- [PATCH v3 07/17] hw/loongarch: Init efi_initrd table,
Song Gao <=
- [PATCH v3 09/17] hw/loongarch: Fix fdt memory node wrong 'reg', Song Gao, 2023/12/27
- [PATCH v3 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller, Song Gao, 2023/12/27
- [PATCH v3 01/17] hw/loongarch: Move boot fucntions to boot.c, Song Gao, 2023/12/27
- [PATCH v3 03/17] hw/loongarch: Add slave cpu boot_code, Song Gao, 2023/12/27
- [PATCH v3 14/17] hw/loongarch: fdt adds pcie irq_map node, Song Gao, 2023/12/27
- [PATCH v3 16/17] hw/loongarch: Add cells missing from uart node, Song Gao, 2023/12/27