diff --git a/qcom/sun-oemvm.dtsi b/qcom/sun-oemvm.dtsi index f4efebdd..239f2f0e 100644 --- a/qcom/sun-oemvm.dtsi +++ b/qcom/sun-oemvm.dtsi @@ -131,22 +131,37 @@ dma-coherent; dma_base = <0x0 0x0>; memory { - qcom,label = <0x13>; + qcom,label = <0x16>; //for persist.img #address-cells = <0x2>; base = <0x0 0xFFEFC000>; }; }; + virtio-mmio@1 { + vdevice-type = "virtio-mmio"; + generate = "/virtio-mmio"; + peer-default; + vqs-num = <0x2>; + push-compatible = "virtio,mmio"; + dma-coherent; + dma_base = <0x0 0x4000>; + memory { + qcom,label = <0x13>; //for system.img + #address-cells = <0x2>; + base = <0x0 0xFFF00000>; + }; + }; + swiotlb-shm { vdevice-type = "shm"; generate = "/swiotlb"; push-compatible = "swiotlb"; peer-default; - dma_base = <0x0 0x4000>; + dma_base = <0x0 0x8000>; memory { qcom,label = <0x14>; #address-cells = <0x2>; - base = <0x0 0xFFF00000>; + base = <0x0 0xFFF04000>; }; }; diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi index 710728c3..2373b641 100644 --- a/qcom/sun.dtsi +++ b/qcom/sun.dtsi @@ -2220,6 +2220,11 @@ }; 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>; }; @@ -2231,11 +2236,16 @@ oem_vm: qcom,oem_vm { vm_name = "oemvm"; - shared-buffers-size = <0x104000>; - shared-buffers = <&oem_vm_vblk0_ring &oem_vm_swiotlb>; + 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@13 { + 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>; }; @@ -2246,7 +2256,7 @@ qcom,vmid = <49>; qcom,firmware-name = "oemvm"; memory-region = <&oem_vm_mem &vm_comm_mem>; - virtio-backends = <&oem_vm_virt_be0>; + virtio-backends = <&oem_vm_virt_be0 &oem_vm_virt_be1>; }; ufsphy_mem: ufsphy_mem@1d80000 {