Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-22 22:53:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

m1n1.hv.HV: Upload ADT late to allow user overrides

Browse source 
Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2021-06-22 02:02:06 +09:00
parent 94f5c29c9f
commit cf00bedade
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
proxyclient/m1n1/hv.py
View file

@ -1081,7 +1081,7 @@ class HV(Reloadable):
self.phys_base = phys_base = guest_base = self.u.heap_top self.phys_base = phys_base = guest_base = self.u.heap_top
guest_base += 16 << 20 # ensure guest starts within a 16MB aligned region of mapped RAM guest_base += 16 << 20 # ensure guest starts within a 16MB aligned region of mapped RAM
adt_base = guest_base self.adt_base = guest_base
guest_base += align(self.u.ba.devtree_size) guest_base += align(self.u.ba.devtree_size)
tc_base = guest_base tc_base = guest_base
guest_base += align(tc_size) guest_base += align(tc_size)
@ -1112,19 +1112,15 @@ class HV(Reloadable):
print(f"Adjusting addresses in ADT...") print(f"Adjusting addresses in ADT...")
self.adt["chosen"]["memory-map"].SEPFW = (guest_base + sepfw_off, sepfw_length) self.adt["chosen"]["memory-map"].SEPFW = (guest_base + sepfw_off, sepfw_length)
self.adt["chosen"]["memory-map"].TrustCache = (tc_base, tc_size) self.adt["chosen"]["memory-map"].TrustCache = (tc_base, tc_size)
self.adt["chosen"]["memory-map"].DeviceTree = (adt_base, align(self.u.ba.devtree_size)) self.adt["chosen"]["memory-map"].DeviceTree = (self.adt_base, align(self.u.ba.devtree_size))
self.adt["chosen"]["memory-map"].BootArgs = (guest_base + self.bootargs_off, bootargs_size) self.adt["chosen"]["memory-map"].BootArgs = (guest_base + self.bootargs_off, bootargs_size)
adt_blob = self.adt.build()
print(f"Uploading ADT (0x{len(adt_blob):x} bytes)...")
self.iface.writemem(adt_base, adt_blob)
print(f"Setting up bootargs at 0x{guest_base + self.bootargs_off:x}...") print(f"Setting up bootargs at 0x{guest_base + self.bootargs_off:x}...")
self.tba.mem_size = mem_size self.tba.mem_size = mem_size
self.tba.phys_base = phys_base self.tba.phys_base = phys_base
self.tba.virt_base = 0xfffffe0010000000 + (phys_base & (32 * 1024 * 1024 - 1)) self.tba.virt_base = 0xfffffe0010000000 + (phys_base & (32 * 1024 * 1024 - 1))
self.tba.devtree = adt_base - phys_base + self.tba.virt_base self.tba.devtree = self.adt_base - phys_base + self.tba.virt_base
self.tba.top_of_kernel_data = guest_base + image_size self.tba.top_of_kernel_data = guest_base + image_size
self.sym_offset = macho.vmin - guest_base + self.tba.phys_base - self.tba.virt_base self.sym_offset = macho.vmin - guest_base + self.tba.phys_base - self.tba.virt_base
@ -1173,6 +1169,10 @@ class HV(Reloadable):
print("Updating page tables...") print("Updating page tables...")
self.pt_update() self.pt_update()
adt_blob = self.adt.build()
print(f"Uploading ADT (0x{len(adt_blob):x} bytes)...")
self.iface.writemem(self.adt_base, adt_blob)
print("Improving logo...") print("Improving logo...")
self.p.fb_improve_logo() self.p.fb_improve_logo()