Skip to content

Fix ARM64 guest boot under Virtualization.framework on macOS 27 #5

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
rgarcia wants to merge 1 commit into
base: ch-6.12.8-kernel-3.0
Choose a base branch
from
+5 −17
Open

Fix ARM64 guest boot under Virtualization.framework on macOS 27 #5

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@
Contains patches for:

* Support for virtio-watchdog
* Boot time performance reporting for x86_64 and aarch64
* Boot time performance reporting for x86_64

The arm64 kernel does not write to Cloud Hypervisor's boot-timing MMIO register
at `0x09000f00`: the address is unmapped on other hypervisors, including Apple's
Virtualization.framework, where the write prevents booting on macOS 27.

16 changes: 0 additions & 16 deletions arch/arm64/kernel/head.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
* x21 primary_entry() .. start_kernel() FDT pointer passed at boot in x0
*/
SYM_CODE_START(primary_entry)
bl trap_to_vmm
bl record_mmu_state
bl preserve_boot_args

Expand Down Expand Up @@ -164,21 +163,6 @@ CPU_BE( tbz x19, #SCTLR_ELx_EE_SHIFT, 1f )
ret
SYM_CODE_END(record_mmu_state)

/*
* By writing to mmio region, trap to vmm to print timestamp,
* but corrupt x7 and x8.
* 0x9000f00 is debug region of pl011
* 0x40 is the code specified in cloud hypervisor indicating the first debug
* point of kernel.
*/
SYM_CODE_START(trap_to_vmm)
movz x7, 0x0900, lsl 16
add x7, x7, 0xf00
mov x8, 0x40
str w8, [x7]
ret
SYM_CODE_END(trap_to_vmm)

/*
* Preserve the arguments passed by the bootloader in x0 .. x3
*/
Expand Down