diff --git a/qcom/kalama-oemvm.dtsi b/qcom/kalama-oemvm.dtsi index 88853815..e7753af4 100644 --- a/qcom/kalama-oemvm.dtsi +++ b/qcom/kalama-oemvm.dtsi @@ -12,6 +12,12 @@ bootargs = "nokaslr log_buf_len=256K root=/dev/ram rw init=/init console=hvc0 loglevel=8"; }; + reserved_memory: reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + }; + cpus { #address-cells = <0x2>; #size-cells = <0x0>; @@ -74,8 +80,8 @@ memory { #address-cells = <0x2>; #size-cells = <0x0>; - base-address = <0x0 0xf8000000>; - size-min = <0x0 0x5000000>; /* 80 MB */ + base-address = <0x0 0xf8200000>; + size-min = <0x0 0x4efc000>; /* 78 MB */ }; segments { @@ -104,6 +110,34 @@ queue-depth = <0x00000008>; qcom,label = <0x1>; }; + + virtio-mmio@0 { + vdevice-type = "virtio-mmio"; + generate = "/virtio-mmio"; + peer-default; + vqs-num = <0x1>; + push-compatible = "virtio,mmio"; + dma-coherent; + dma_base = <0x0 0x0>; + memory { + qcom,label = <0x13>; + #address-cells = <0x2>; + base = <0x0 0xFFEFC000>; + }; + }; + + swiotlb-shm { + vdevice-type = "shm"; + generate = "/swiotlb"; + push-compatible = "swiotlb"; + peer-default; + dma_base = <0x0 0x4000>; + memory { + qcom,label = <0x14>; + #address-cells = <0x2>; + base = <0x0 0xFFF00000>; + }; + }; }; }; diff --git a/qcom/kalama.dtsi b/qcom/kalama.dtsi index 7495311c..4b0a0702 100644 --- a/qcom/kalama.dtsi +++ b/qcom/kalama.dtsi @@ -565,7 +565,19 @@ oem_vm_mem: oem_vm_region@f8000000 { no-map; - reg = <0x0 0xf8000000 0x0 0x5000000>; + reg = <0x0 0xf8000000 0x0 0x4efc000>; + }; + + oem_vm_vblk0_ring: oem_vm_vblk0_ring@fcefc000 { + no-map; + reg = <0x0 0xfcefc000 0x0 0x4000>; + gunyah-label = <0x13>; + }; + + oem_vm_swiotlb: oem_vm_swiotlb@fcf00000 { + no-map; + reg = <0x0 0xfcf00000 0x0 0x100000>; + gunyah-label = <0x14>; }; hyp_ext_tags_mem: hyp_ext_tags_region@fd000000 { @@ -2940,12 +2952,24 @@ shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_swiotlb>; }; + oem_vm: qcom,oem_vm@fcefc000 { + reg = <0xfcefc000 0x104000>; + vm_name = "oemvm"; + shared-buffers = <&oem_vm_vblk0_ring &oem_vm_swiotlb>; + }; + qcom,virtio_backend@0 { compatible = "qcom,virtio_backend"; qcom,vm = <&trust_ui_vm>; qcom,label = <0x11>; }; + qcom,virtio_backend@1 { + compatible = "qcom,virtio_backend"; + qcom,vm = <&oem_vm>; + qcom,label = <0x13>; + }; + llcc_pmu: llcc-pmu@24095000 { compatible = "qcom,llcc-pmu-ver2"; reg = <0x24095000 0x300>; diff --git a/qcom/waipio-oemvm.dtsi b/qcom/waipio-oemvm.dtsi index 7c8a5df3..dcf55808 100644 --- a/qcom/waipio-oemvm.dtsi +++ b/qcom/waipio-oemvm.dtsi @@ -12,6 +12,12 @@ bootargs = "nokaslr log_buf_len=256K root=/dev/ram rw init=/init console=hvc0 loglevel=8"; }; + reserved_memory: reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + }; + cpus { #address-cells = <0x2>; #size-cells = <0x0>; @@ -73,7 +79,7 @@ #address-cells = <0x2>; #size-cells = <0x0>; base-address = <0x0 0xbb000000>; - size-min = <0x0 0x5000000>; /* 122 MB */ + size-min = <0x0 0x4efc000>; /* 78 MB */ }; segments { @@ -102,6 +108,34 @@ queue-depth = <0x00000008>; qcom,label = <0x1>; }; + + virtio-mmio@0 { + vdevice-type = "virtio-mmio"; + generate = "/virtio-mmio"; + peer-default; + vqs-num = <0x1>; + push-compatible = "virtio,mmio"; + dma-coherent; + dma_base = <0x0 0x0>; + memory { + qcom,label = <0x13>; + #address-cells = <0x2>; + base = <0x0 0xFFEFC000>; + }; + }; + + swiotlb-shm { + vdevice-type = "shm"; + generate = "/swiotlb"; + push-compatible = "swiotlb"; + peer-default; + dma_base = <0x0 0x4000>; + memory { + qcom,label = <0x14>; + #address-cells = <0x2>; + base = <0x0 0xFFF00000>; + }; + }; }; }; diff --git a/qcom/waipio.dtsi b/qcom/waipio.dtsi index 5ab9bc6f..d5bbb48c 100644 --- a/qcom/waipio.dtsi +++ b/qcom/waipio.dtsi @@ -498,7 +498,19 @@ oem_vm_mem: oem_vm_region@bb000000 { no-map; - reg = <0x0 0xbb000000 0x0 0x5000000>; + reg = <0x0 0xbb000000 0x0 0x4efc000>; + }; + + oem_vm_vblk0_ring: oem_vm_vblk0_ring@bfefc000 { + no-map; + reg = <0x0 0xbfefc000 0x0 0x4000>; + gunyah-label = <0x13>; + }; + + oem_vm_swiotlb: oem_vm_swiotlb@bff00000 { + no-map; + reg = <0x0 0xbff00000 0x0 0x100000>; + gunyah-label = <0x14>; }; mte_mem: mte_region@c0000000 { @@ -3355,12 +3367,24 @@ shared-buffers = <&trust_ui_vm_vblk0_ring &trust_ui_vm_swiotlb>; }; + oem_vm: qcom,oem_vm@bfefc000 { + reg = <0xbfefc000 0x104000>; + vm_name = "oemvm"; + shared-buffers = <&oem_vm_vblk0_ring &oem_vm_swiotlb>; + }; + qcom,virtio_backend@0 { compatible = "qcom,virtio_backend"; qcom,vm = <&trust_ui_vm>; qcom,label = <0x11>; }; + qcom,virtio_backend@1 { + compatible = "qcom,virtio_backend"; + qcom,vm = <&oem_vm>; + qcom,label = <0x13>; + }; + qcom,msm_gsi { compatible = "qcom,msm_gsi"; };