| Message ID | 20240307164835.300412-8-gaosong@loongson.cn |
|---|---|
| State | New |
| Headers | show |
| Series | Add boot LoongArch elf kernel with FDT | expand |
Hi Song, On 7/3/24 17:48, Song Gao wrote: > 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 2896c1ea40..6126a37858 100644 > --- a/hw/loongarch/boot.c > +++ b/hw/loongarch/boot.c > @@ -15,6 +15,9 @@ > #include "sysemu/reset.h" > #include "sysemu/qtest.h" > > +ram_addr_t initrd_offset; > +uint64_t initrd_size; Where is that used? > static const unsigned int slave_boot_code[] = { > /* Configure reset ebase. */ > 0x0400302c, /* csrwr $r12,0xc */ > @@ -94,6 +97,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; > @@ -117,6 +135,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); > } > @@ -138,8 +158,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 f71c693f43..ddcb279874 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;
On 2024/3/8 上午12:48, Song Gao wrote: > 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 2896c1ea40..6126a37858 100644 > --- a/hw/loongarch/boot.c > +++ b/hw/loongarch/boot.c > @@ -15,6 +15,9 @@ > #include "sysemu/reset.h" > #include "sysemu/qtest.h" > > +ram_addr_t initrd_offset; > +uint64_t initrd_size; > + > static const unsigned int slave_boot_code[] = { > /* Configure reset ebase. */ > 0x0400302c, /* csrwr $r12,0xc */ > @@ -94,6 +97,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; > @@ -117,6 +135,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); > } > @@ -138,8 +158,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 f71c693f43..ddcb279874 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; > Reviewed-by: Bibo Mao <maobibo@loongson.cn>
在 2024/3/8 16:36, Philippe Mathieu-Daudé 写道: > Hi Song, > > On 7/3/24 17:48, Song Gao wrote: >> 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 2896c1ea40..6126a37858 100644 >> --- a/hw/loongarch/boot.c >> +++ b/hw/loongarch/boot.c >> @@ -15,6 +15,9 @@ >> #include "sysemu/reset.h" >> #include "sysemu/qtest.h" >> +ram_addr_t initrd_offset; >> +uint64_t initrd_size; > > Where is that used? > patch1 load_kernel_info() and patch7 init_efi_initrd_table() Thanks. Song Gao >> static const unsigned int slave_boot_code[] = { >> /* Configure reset ebase. */ >> 0x0400302c, /* csrwr $r12,0xc */ >> @@ -94,6 +97,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; >> @@ -117,6 +135,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); >> } >> @@ -138,8 +158,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 f71c693f43..ddcb279874 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;
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 2896c1ea40..6126a37858 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -15,6 +15,9 @@ #include "sysemu/reset.h" #include "sysemu/qtest.h" +ram_addr_t initrd_offset; +uint64_t initrd_size; + static const unsigned int slave_boot_code[] = { /* Configure reset ebase. */ 0x0400302c, /* csrwr $r12,0xc */ @@ -94,6 +97,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; @@ -117,6 +135,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); } @@ -138,8 +158,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 f71c693f43..ddcb279874 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;
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(-)