pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new memory layout for pVM firmware. 

Moved data memory to just above pVM firmware image, rather than an
arbitrary location higher in RAM.

Bug: 223166344
Test: ran with patched crosvm
Change-Id: I4fc92edf7752352bc962169b009d052ddd07479d
This commit is contained in:
Andrew Walbran 2022-04-28 15:05:16 +00:00
parent 1b5ec6fb13
commit ebd40c8ccb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pvmfw/idmap.S
View File

@ -44,9 +44,9 @@ idmap:
.fill 509, 8, 0x0 // 509 GB of remaining VA space
/* level 2 */
0: .fill 511, 8, 0x0
.quad .L_BLOCK_MEM_XIP | 0x7fe00000 // pVM firmware image
0: .fill 510, 8, 0x0
.quad .L_BLOCK_MEM_XIP | 0x7fc00000 // pVM firmware image
.quad .L_BLOCK_MEM | 0x7fe00000 // Writable memory for stack, heap &c.
1: .quad .L_BLOCK_RO | 0x80000000 // DT provided by VMM
.quad .L_BLOCK_RO | 0x80200000 // 2 MB of DRAM containing payload image
.quad .L_BLOCK_MEM | 0x80400000 // Writable memory for stack, heap &c.
.fill 509, 8, 0x0
.fill 510, 8, 0x0

4
pvmfw/image.ld
View File

@ -16,7 +16,7 @@
MEMORY
{
image : ORIGIN = 0x7fe00000, LENGTH = 2M
image : ORIGIN = 0x7fc00000, LENGTH = 2M
writable_data : ORIGIN = 0x7fe00000, LENGTH = 2M
dtb_region : ORIGIN = 0x80000000, LENGTH = 2M
writable_data : ORIGIN = 0x80400000, LENGTH = 2M
}