From c989bbec1eb306e33fb5683bb59db957bab620c8 Mon Sep 17 00:00:00 2001
From: Pranav Mahesh Phansalkar <quic_pphansal@quicinc.com>
Date: Thu, 24 Oct 2024 14:45:02 +0530
Subject: [PATCH 1/2] ARM: dts: msm: Add oemvm qrtr gunyah node for tuna

Add the nodes for enable qrtr communication between primary vm and
oemvm on tuna.

This adds platform devices and vdevice descriptions to start the
qrtr gunyah transport on both primary vm and oemvm device trees. This
also adds the device tree node to configure qrtr as node id 21 on oem
vm.

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

diff --git a/qcom/tuna-oemvm.dtsi b/qcom/tuna-oemvm.dtsi
index 96d6d622..103554ce 100644
--- a/qcom/tuna-oemvm.dtsi
+++ b/qcom/tuna-oemvm.dtsi
@@ -157,6 +157,17 @@
 				};
 			};
 
+			qrtr-shm {
+				vdevice-type = "shm-doorbell";
+				generate = "/hypervisor/qrtr-shm";
+				push-compatible = "qcom,qrtr-gunyah-gen";
+				peer-default;
+				memory {
+					qcom,label = <0x8>;
+					allocate-base;
+				};
+			};
+
 			vrtc {
 				vdevice-type = "vrtc-pl031";
 				peer-default;
@@ -239,6 +250,16 @@
 		compatible = "qcom,smcinvoke";
 	};
 
+	qcom,qrtr {
+		compatible = "qcom,qrtr";
+		qcom,node-id = <21>;
+	};
+
+	qrtr-gunyah {
+		compatible = "qcom,qrtr-gunyah";
+		gunyah-label = <8>;
+	};
+
 	qtee_shmbridge {
 		compatible = "qcom,tee-shared-memory-bridge";
 		qcom,custom-bridge-size = <512>;
diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index ff413ab8..dd5b85ca 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -2519,6 +2519,14 @@
 		};
 	};
 
+
+	qcom,qrtr-gunyah-oemvm {
+		compatible = "qcom,qrtr-gunyah";
+		qcom,master;
+		gunyah-label = <8>;
+		peer-name = <4>;
+	};
+
 	trust_ui_vm_vblk0_ring: trust_ui_vm_vblk0_ring {
 		size = <0x4000>;
 		gunyah-label = <0x11>;

From a89f3f4af9d5b5c8783121a37db3a69acf47f757 Mon Sep 17 00:00:00 2001
From: Pranav Mahesh Phansalkar <quic_pphansal@quicinc.com>
Date: Thu, 24 Oct 2024 14:48:59 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Add GLINK PKT nodes for tuna

GLINK PKT provides a userspace interface to RPMSG GLINK through
character device node. Add the nodes and corresponding channel
devices to enable GLINK communication from userspace.

Change-Id: Ie880b3806843fcf57fbb2f77a2d77e24ee7359b6
Signed-off-by: Pranav Mahesh Phansalkar <quic_pphansal@quicinc.com>
---
 qcom/tuna.dtsi | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index dd5b85ca..05e3e8b2 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -1140,6 +1140,66 @@
 		};
 	};
 
+	qcom,glinkpkt {
+		compatible = "qcom,glinkpkt";
+
+		qcom,glinkpkt-at-mdm0 {
+			qcom,glinkpkt-edge = "mpss";
+			qcom,glinkpkt-ch-name = "DS";
+			qcom,glinkpkt-dev-name = "at_mdm0";
+		};
+
+		qcom,glinkpkt-apr-apps2 {
+			qcom,glinkpkt-edge = "adsp";
+			qcom,glinkpkt-ch-name = "apr_apps2";
+			qcom,glinkpkt-dev-name = "apr_apps2";
+		};
+
+		qcom,glinkpkt-data40-cntl {
+			qcom,glinkpkt-edge = "mpss";
+			qcom,glinkpkt-ch-name = "DATA40_CNTL";
+			qcom,glinkpkt-dev-name = "smdcntl8";
+		};
+
+		qcom,glinkpkt-data1 {
+			qcom,glinkpkt-edge = "mpss";
+			qcom,glinkpkt-ch-name = "DATA1";
+			qcom,glinkpkt-dev-name = "smd7";
+		};
+
+		qcom,glinkpkt-data4 {
+			qcom,glinkpkt-edge = "mpss";
+			qcom,glinkpkt-ch-name = "DATA4";
+			qcom,glinkpkt-dev-name = "smd8";
+		};
+
+		qcom,glinkpkt-data11 {
+			qcom,glinkpkt-edge = "mpss";
+			qcom,glinkpkt-ch-name = "DATA11";
+			qcom,glinkpkt-dev-name = "smd11";
+		};
+
+		qcom,glinkpkt-qmc-dma {
+			qcom,glinkpkt-edge = "mpss";
+			qcom,glinkpkt-ch-name = "QMC_DMA_LINE";
+			qcom,glinkpkt-dev-name = "qmc_dma";
+			qcom,glinkpkt-enable-ch-close;
+		};
+
+		qcom,glinkpkt-qmc-cma {
+			qcom,glinkpkt-edge = "mpss";
+			qcom,glinkpkt-ch-name = "QMC_CMA_LINE";
+			qcom,glinkpkt-dev-name = "qmc_cma";
+			qcom,glinkpkt-enable-ch-close;
+		};
+
+		qcom,glinkpkt-xpan_control {
+			qcom,glinkpkt-edge = "adsp";
+			qcom,glinkpkt-ch-name = "bt_cp_ctrl";
+			qcom,glinkpkt-dev-name = "bt_cp_ctrl";
+		};
+	};
+
 	sys-pm-vx@c320000 {
 		compatible = "qcom,sys-pm-violators", "qcom,sys-pm-tuna";
 		reg = <0xc320000 0x400>;