From 21ec84a2152195ed5d6c9658075f96dc84d56445 Mon Sep 17 00:00:00 2001
From: Pranav Mahesh Phansalkar <quic_pphansal@quicinc.com>
Date: Thu, 24 Oct 2024 15:48:47 +0530
Subject: [PATCH 1/2] ARM: dts: msm: Add qrtr gunyah tuivm node on tuna SoC

Add qrtr gunyah tuivm node to enable communication between
PVM and TUIVM.

Change-Id: If1eebed90a484ef42803fec74629042b04d7a0db
Signed-off-by: Pranav Mahesh Phansalkar <quic_pphansal@quicinc.com>
---
 qcom/tuna-vm.dtsi | 15 +++++++++++++++
 qcom/tuna.dtsi    |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/qcom/tuna-vm.dtsi b/qcom/tuna-vm.dtsi
index 814a1852..ded612a5 100644
--- a/qcom/tuna-vm.dtsi
+++ b/qcom/tuna-vm.dtsi
@@ -290,6 +290,16 @@
 				peer-default;
 			};
 
+			qrtr-shm {
+				vdevice-type = "shm-doorbell";
+				generate = "/hypervisor/qrtr-shm";
+				push-compatible = "qcom,qrtr-gunyah-gen";
+				peer-default;
+				memory {
+					qcom,label = <0x3>;
+					allocate-base;
+				};
+			};
 		};
 	};
 
@@ -426,6 +436,11 @@
 		qcom,support-hypervisor;
 	};
 
+	qrtr-gunyah {
+		compatible = "qcom,qrtr-gunyah";
+		gunyah-label = <3>;
+	};
+
 	qti,smmu-proxy {
 		compatible = "smmu-proxy-receiver";
 	};
diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index e0d24717..c6ec32b8 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -2691,6 +2691,13 @@
 		ext-label = <0x7>;
 	};
 
+	qcom,qrtr-gunyah-tuivm {
+		compatible = "qcom,qrtr-gunyah";
+		qcom,master;
+		gunyah-label = <3>;
+		peer-name = <2>;
+	};
+
 	qcom,pmic_glink_log {
 		compatible = "qcom,qti-pmic-glink";
 		qcom,pmic-glink-channel = "PMIC_LOGS_ADSP_APPS";

From 062d9202aaa97b0adf2cc8b2513e4a5f7e4315ae Mon Sep 17 00:00:00 2001
From: Pranav Mahesh Phansalkar <quic_pphansal@quicinc.com>
Date: Thu, 24 Oct 2024 16:59:33 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Add nodes for qmsgq gunyah on tuna

Add the device nodes on tuna oemvm and tuivm to enable qmsgq socket
communication over gunyah message queues.

Change-Id: I42be6dabb313e914691945521962cff53f969a02
Signed-off-by: Pranav Mahesh Phansalkar <quic_pphansal@quicinc.com>
---
 qcom/tuna-oemvm.dtsi | 14 ++++++++++++++
 qcom/tuna-vm.dtsi    | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/qcom/tuna-oemvm.dtsi b/qcom/tuna-oemvm.dtsi
index bdd5e6a1..65a85567 100644
--- a/qcom/tuna-oemvm.dtsi
+++ b/qcom/tuna-oemvm.dtsi
@@ -214,6 +214,15 @@
 				qcom,label = <0xe>;
 				peer-default;
 			};
+
+			msgqsock-msgq-pair {
+				vdevice-type = "message-queue-pair";
+				generate = "/hypervisor/msgqsock-msgq-pair";
+				message-size = <0xf0>;
+				queue-depth = <0x8>;
+				peer = "vm-name:qcom,trustedvm";
+				qcom,label = <0x3>;
+			};
 		};
 	};
 
@@ -317,6 +326,11 @@
 		gunyah-label = <8>;
 	};
 
+	qmsgq-gunyah {
+		compatible = "qcom,qmsgq-gh";
+		msgq-label = <3>;
+	};
+
 	qtee_shmbridge {
 		compatible = "qcom,tee-shared-memory-bridge";
 		qcom,custom-bridge-size = <512>;
diff --git a/qcom/tuna-vm.dtsi b/qcom/tuna-vm.dtsi
index ded612a5..342a226e 100644
--- a/qcom/tuna-vm.dtsi
+++ b/qcom/tuna-vm.dtsi
@@ -300,6 +300,16 @@
 					allocate-base;
 				};
 			};
+
+			msgqsock-msgq {
+				vdevice-type = "message-queue-pair";
+				generate = "/hypervisor/msgqsock-msgq-pair";
+				message-size = <0xf0>;
+				queue-depth = <0x8>;
+				peer = "vm-name:qcom,oemvm";
+				qcom,label = <0x3>;
+			};
+
 		};
 	};
 
@@ -445,6 +455,11 @@
 		compatible = "smmu-proxy-receiver";
 	};
 
+	qmsgq-gunyah {
+		compatible = "qcom,qmsgq-gh";
+		msgq-label = <3>;
+	};
+
 	qti,smmu-proxy-camera-cb {
 		compatible = "smmu-proxy-cb";
 		qti,cb-id = <QTI_SMMU_PROXY_CAMERA_CB>;