diff options
author | Frederick Mayle <fmayle@google.com> | 2024-05-15 17:57:49 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-15 17:57:49 +0000 |
commit | 84a6ae187a975754ce0df1b00c5671841b099274 (patch) | |
tree | fc2dc73b5c543ab8a429d89b8484764b38f2faf6 | |
parent | 3fedfd337f674df5a233ef990f73f3606789fd4d (diff) | |
parent | f2eec5cadae6d3bd3f71d1129304489e947f1b8e (diff) | |
download | crosvm-84a6ae187a975754ce0df1b00c5671841b099274.tar.gz |
Merge "hypervisor: gunyah: Mark shm devices as optional" into main
-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()) |