drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[zion] Remove temp PCI Memory Object create function.

Browse source 
Pass the PCI memory space to the yellowstone init process instead.
This commit is contained in:
Drew Galbraith 2023-08-01 17:13:16 -07:00
parent c70b5b0753
commit 8f84f8c3ca
9 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
zion/loader/init_loader.cpp
View file

@ -3,6 +3,7 @@
#include <glacier/memory/ref_ptr.h>
#include <glacier/string/string.h>
#include "boot/acpi.h"
#include "boot/boot_info.h"
#include "debug/debug.h"
#include "include/zcall.h"
@ -127,6 +128,16 @@ void WriteInitProgram(glcr::RefPtr<Port> port, glcr::String name, uint64_t id) {
MakeRefCounted<Capability>(prog_vmmo, ZC_READ | ZC_WRITE));
}
glcr::ErrorCode WritePciVmmo(glcr::RefPtr<Port> port, uint64_t id) {
ASSIGN_OR_RETURN(PcieConfiguration config, GetPciExtendedConfiguration());
auto vmmo =
glcr::MakeRefCounted<FixedMemoryObject>(config.base, config.offset);
port->WriteKernel(id, MakeRefCounted<Capability>(vmmo, ZC_READ | ZC_WRITE));
return glcr::OK;
}
} // namespace
void LoadInitProgram() {
@ -147,6 +158,10 @@ void LoadInitProgram() {
WriteInitProgram(port, "/sys/denali", Z_BOOT_DENALI_VMMO);
WriteInitProgram(port, "/sys/victoriafalls", Z_BOOT_VICTORIA_FALLS_VMMO);
if (WritePciVmmo(port, Z_BOOT_PCI_VMMO) != glcr::OK) {
panic("Failed to provide PCI info to init.");
}
// Start process.
const limine_file& init_prog = GetInitProgram("/sys/yellowstone");
uint64_t entry = LoadElfProgram(