Skip to content

feat(aarch64): Fall back to detecting kernel at linux,initrd-start #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gelbpunkt wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −4
Open

feat(aarch64): Fall back to detecting kernel at linux,initrd-start #607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/arch/aarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ pub fn find_kernel() -> &'static [u8] {
Fdt::from_ptr(ptr::with_exposed_provenance(DEVICE_TREE as usize))
.expect(".fdt file has invalid header")
};

let module_start = fdt
.find_node("/chosen")
.unwrap()
Expand All @@ -71,12 +72,20 @@ pub fn find_kernel() -> &'static [u8] {
} else {
value.parse().unwrap()
}
})
.unwrap();
});

let initrd_start = fdt
.find_node("/chosen")
.unwrap()
.properties()
.find(|prop| prop.name == "linux,initrd-start")
.map(|prop| usize::from_be_bytes(prop.value.try_into().unwrap()));

let kernel_start = module_start.or(initrd_start).unwrap();

let header = unsafe {
&*core::mem::transmute::<*const u8, *const Header>(ptr::with_exposed_provenance(
module_start,
kernel_start,
))
};

Expand All @@ -96,7 +105,7 @@ pub fn find_kernel() -> &'static [u8] {

unsafe {
core::slice::from_raw_parts(
ptr::with_exposed_provenance(module_start),
ptr::with_exposed_provenance(kernel_start),
file_size.try_into().unwrap(),
)
}
Expand Down