Merge "ARM: dts: msm: Add trustedvm and oemvm support for Kera"

This commit is contained in:
QCTECMDR Service
2024-10-18 15:35:05 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -1159,6 +1159,104 @@
#reset-cells = <1>;
};
trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring {
size = <0x4000>;
gunyah-label = <0x11>;
};
trust_ui_vm_vblk1_ring: trust_ui_vm_vblk1_ring {
size = <0x4000>;
gunyah-label = <0x10>;
};
trust_ui_vm_vsock_ring: trust_ui_vm_vsock_ring {
size = <0xc000>;
gunyah-label = <0x15>;
};
trust_ui_vm_swiotlb: trust_ui_vm_swiotlb {
size = <0x400000>;
gunyah-label = <0x12>;
};
trust_ui_vm: qcom,trust_ui_vm {
vm_name = "trustedvm";
shared-buffers-size = <0x414000>;
shared-buffers = <&trust_ui_vm_vblk0_ring
&trust_ui_vm_vblk1_ring
&trust_ui_vm_vsock_ring
&trust_ui_vm_swiotlb>;
};
trust_ui_vm_virt_be0: trust_ui_vm_virt_be0@11 {
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x11>;
};
trust_ui_vm_virt_be1: trust_ui_vm_virt_be1@10 {
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x10>;
};
trust_ui_vm_virt_be2: trust_ui_vm_virt_be2@15 {
qcom,vm = <&trust_ui_vm>;
qcom,label = <0x15>;
};
gh-secure-vm-loader@0 {
compatible = "qcom,gh-secure-vm-loader";
qcom,pas-id = <28>;
qcom,vmid = <45>;
qcom,firmware-name = "trustedvm";
qcom,keep-running;
memory-region = <&trust_ui_vm_mem &vm_comm_mem>;
virtio-backends = <&trust_ui_vm_virt_be0
&trust_ui_vm_virt_be1
&trust_ui_vm_virt_be2>;
};
oem_vm_vblk0_ring: oem_vm_vblk0_ring {
size = <0x4000>;
gunyah-label = <0x16>;
};
oem_vm_vblk1_ring: oem_vm_vblk1_ring {
size = <0x4000>;
gunyah-label = <0x13>;
};
oem_vm_swiotlb: oem_vm_swiotlb {
size = <0x100000>;
gunyah-label = <0x14>;
};
oem_vm: qcom,oem_vm {
vm_name = "oemvm";
shared-buffers-size = <0x108000>;
shared-buffers = <&oem_vm_vblk0_ring &oem_vm_vblk1_ring &oem_vm_swiotlb>;
};
oem_vm_virt_be0: oem_vm_virt_be0@16 {
qcom,vm = <&oem_vm>;
qcom,label = <0x16>;
};
oem_vm_virt_be1: oem_vm_virt_be1@13 {
qcom,vm = <&oem_vm>;
qcom,label = <0x13>;
};
gh-secure-vm-loader@1 {
compatible = "qcom,gh-secure-vm-loader";
qcom,pas-id = <34>;
qcom,vmid = <49>;
qcom,firmware-name = "oemvm";
qcom,keep-running;
memory-region = <&oem_vm_mem &vm_comm_mem>;
virtio-backends = <&oem_vm_virt_be0 &oem_vm_virt_be1>;
};
gh-secure-vm-loader@2 {
compatible = "qcom,gh-secure-vm-loader";
qcom,pas-id = <35>;
@@ -1341,6 +1439,28 @@
reg = <0x0 0x81c60000 0x0 0x20000>;
};
trust_ui_vm_mem: trust_ui_vm_region@f3800000 {
compatible = "shared-dma-pool";
reg = <0x0 0xf3800000 0x0 0x4400000>;
reusable;
alignment = <0x0 0x400000>;
};
oem_vm_mem: oem_vm_region@f7c00000 {
compatible = "shared-dma-pool";
reg = <0x0 0xf7c00000 0x0 0x4c00000>;
reusable;
alignment = <0x0 0x400000>;
};
vm_comm_mem: vm_comm_mem_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0x0 0x800000>;
};
adsp_mem_heap: adsp_heap_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;