From b957615498ad81e87f01126e979c73fe0b65ac3f Mon Sep 17 00:00:00 2001
From: Hrishabh Rajput <quic_hrishabh@quicinc.com>
Date: Fri, 5 Apr 2024 17:14:20 +0530
Subject: [PATCH] ARM: dts: msm: Add support for persist on sun-oemvm

Add shared memory to support persist on sun-oemvm.

Change-Id: Ic7f97ac2da114e56ef297d74f4a8d70fb27987e7
Signed-off-by: Hrishabh Rajput <quic_hrishabh@quicinc.com>
---
 qcom/sun-oemvm.dtsi | 21 ++++++++++++++++++---
 qcom/sun.dtsi       | 18 ++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/qcom/sun-oemvm.dtsi b/qcom/sun-oemvm.dtsi
index 7973e6ae..d8f4eee6 100644
--- a/qcom/sun-oemvm.dtsi
+++ b/qcom/sun-oemvm.dtsi
@@ -125,22 +125,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 2b03afd7..208b45a7 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -2229,6 +2229,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>;
 	};
@@ -2240,11 +2245,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>;
 	};
@@ -2255,7 +2265,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 {