ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 22:47:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base-nova: EFI sys-table pointer in platform info

Browse Source 
Ref #3430
This commit is contained in:
Martin Stein 2019-07-09 18:27:13 +02:00 committed by Christian Helmuth
parent b87e21a392
commit ead385dd17
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/base-nova/include/nova/syscall-generic.h
View File

@ -91,6 +91,7 @@ namespace Nova {
struct Mem_desc struct Mem_desc
{ {
enum Type { enum Type {
EFI_SYSTEM_TABLE = -7,
HYPERVISOR_LOG = -6, HYPERVISOR_LOG = -6,
FRAMEBUFFER = -5, FRAMEBUFFER = -5,
ACPI_XSDT = -4, ACPI_XSDT = -4,

9
repos/base-nova/src/core/platform.cc
View File

@ -622,6 +622,7 @@ Platform::Platform()
if (mem_desc->type == Hip::Mem_desc::ACPI_RSDT) continue; if (mem_desc->type == Hip::Mem_desc::ACPI_RSDT) continue;
if (mem_desc->type == Hip::Mem_desc::ACPI_XSDT) continue; if (mem_desc->type == Hip::Mem_desc::ACPI_XSDT) continue;
if (mem_desc->type == Hip::Mem_desc::FRAMEBUFFER) continue; if (mem_desc->type == Hip::Mem_desc::FRAMEBUFFER) continue;
if (mem_desc->type == Hip::Mem_desc::EFI_SYSTEM_TABLE) continue;
Hip::Mem_desc * mem_d = (Hip::Mem_desc *)mem_desc_base; Hip::Mem_desc * mem_d = (Hip::Mem_desc *)mem_desc_base;
for (unsigned j = 0; j < num_mem_desc; j++, mem_d++) { for (unsigned j = 0; j < num_mem_desc; j++, mem_d++) {
@ -629,6 +630,7 @@ Platform::Platform()
if (mem_d->type == Hip::Mem_desc::ACPI_RSDT) continue; if (mem_d->type == Hip::Mem_desc::ACPI_RSDT) continue;
if (mem_d->type == Hip::Mem_desc::ACPI_XSDT) continue; if (mem_d->type == Hip::Mem_desc::ACPI_XSDT) continue;
if (mem_d->type == Hip::Mem_desc::FRAMEBUFFER) continue; if (mem_d->type == Hip::Mem_desc::FRAMEBUFFER) continue;
if (mem_d->type == Hip::Mem_desc::EFI_SYSTEM_TABLE) continue;
if (mem_d == mem_desc) continue; if (mem_d == mem_desc) continue;
/* if regions are disjunct all is fine */ /* if regions are disjunct all is fine */
@ -649,11 +651,13 @@ Platform::Platform()
* From now on, it is save to use the core allocators... * From now on, it is save to use the core allocators...
*/ */
uint64_t efi_sys_tab_phy = 0UL;
uint64_t rsdt = 0UL; uint64_t rsdt = 0UL;
uint64_t xsdt = 0UL; uint64_t xsdt = 0UL;
mem_desc = (Hip::Mem_desc *)mem_desc_base; mem_desc = (Hip::Mem_desc *)mem_desc_base;
for (unsigned i = 0; i < num_mem_desc; i++, mem_desc++) { for (unsigned i = 0; i < num_mem_desc; i++, mem_desc++) {
if (mem_desc->type == Hip::Mem_desc::EFI_SYSTEM_TABLE) efi_sys_tab_phy = mem_desc->addr;
if (mem_desc->type == Hip::Mem_desc::ACPI_RSDT) rsdt = mem_desc->addr; if (mem_desc->type == Hip::Mem_desc::ACPI_RSDT) rsdt = mem_desc->addr;
if (mem_desc->type == Hip::Mem_desc::ACPI_XSDT) xsdt = mem_desc->addr; if (mem_desc->type == Hip::Mem_desc::ACPI_XSDT) xsdt = mem_desc->addr;
if (mem_desc->type != Hip::Mem_desc::MULTIBOOT_MODULE) continue; if (mem_desc->type != Hip::Mem_desc::MULTIBOOT_MODULE) continue;
@ -685,6 +689,11 @@ Platform::Platform()
"platform_info", [&] () "platform_info", [&] ()
{ {
xml.node("kernel", [&] () { xml.attribute("name", "nova"); }); xml.node("kernel", [&] () { xml.attribute("name", "nova"); });
if (efi_sys_tab_phy) {
xml.node("efi-system-table", [&] () {
xml.attribute("address", String<32>(Hex(efi_sys_tab_phy)));
});
}
xml.node("acpi", [&] () { xml.node("acpi", [&] () {
xml.attribute("revision", 2); /* XXX */ xml.attribute("revision", 2); /* XXX */