diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-16 01:03:12 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-16 01:03:12 +0000 |
| commit | 561aca7953bd6b02ca4af806aec049e682dc087c (patch) | |
| tree | fc2dc73b5c543ab8a429d89b8484764b38f2faf6 | |
| parent | eb7c7b9318dc38f5dcf843549b6880474e45b944 (diff) | |
| parent | 84a6ae187a975754ce0df1b00c5671841b099274 (diff) | |
| download | crosvm-sdk-release.tar.gz | |
Snap for 11847757 from 84a6ae187a975754ce0df1b00c5671841b099274 to sdk-releasesdk-release
Change-Id: Ie22cabae6455fd4ac43085766da246fb6032a893
| -rw-r--r-- | hypervisor/src/gunyah/aarch64.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hypervisor/src/gunyah/aarch64.rs b/hypervisor/src/gunyah/aarch64.rs index c40c36394..2bf7557c7 100644 --- a/hypervisor/src/gunyah/aarch64.rs +++ b/hypervisor/src/gunyah/aarch64.rs @@ -39,6 +39,10 @@ fn fdt_create_shm_device( shm_node.set_prop("peer-default", ())?; shm_node.set_prop("dma_base", 0u64)?; let mem_node = shm_node.subnode_mut("memory")?; + // We have to add the shm device for RM to accept the swiotlb memparcel. + // Memparcel is only used on android14-6.1. Once android14-6.1 is EOL + // we should be able to remove all the times we call fdt_create_shm_device() + mem_node.set_prop("optional", ())?; mem_node.set_prop("label", index)?; mem_node.set_prop("#address-cells", 2u32)?; mem_node.set_prop("base", guest_addr.offset()) |