Merge "ARM: dts: msm: Enable virtio-mem device on PineappleVM"

qcom/msm-arm-smmu-pineapple-vm.dtsi

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	vm-config {
+		vdevices {
+			vsmmu@15000000 {
+				vdevice-type = "vsmmu-v2";
+				smmu-handle = <0x15000000>;
+				num-cbs = <0x6>;
+				num-smrs = <0xe>;
+				patch = "/soc/apps-smmu@15000000";
+			};
+		};
+	};
+};
+
+&soc {
+	apps_smmu: apps-smmu@15000000 {
+		/*
+		 * reg, #global-interrupts & interrupts  properties will
+		 * be added dynamically by bootloader.
+		 */
+		compatible = "qcom,qsmmu-v500", "qcom,virt-smmu";
+		#iommu-cells = <2>;
+		qcom,use-3-lvl-tables;
+		dma-coherent;
+		qcom,actlr =
+			/* Camera SBI*/
+			<0x0848 0x0000 0x00000103>,
+
+			/* Camera IFE, SFE, IPE, BPS, CDM IPE, CDM IFE, CDM BPS, ICP */
+			<0x0808 0x1020 0x00000001>,
+			<0x1841 0x0000 0x00000001>,
+			<0x1861 0x0000 0x00000001>,
+			<0x1881 0x0000 0x00000001>,
+			<0x18c2 0x0000 0x00000001>,
+
+			/* Camera CRE */
+			<0x18e8 0x0000 0x00000103>,
+
+			/* Compute */
+			<0x0c0b 0x0000 0x00000303>,
+
+			/* Display */
+			<0x1c03 0x0000 0x00000001>,
+			<0x1c04 0x0002 0x00000001>,
+
+			/* EVA */
+			<0x1920 0x0000 0x00000103>;
+	};
+};

qcom/pineapple-vm.dtsi

@@ -179,6 +179,15 @@
 				};
 			};
 
+			mem-buf-message-queue-pair {
+				vdevice-type = "message-queue-pair";
+				generate = "/hypervisor/membuf-msgq-pair";
+				message-size = <0x000000f0>;
+				queue-depth = <0x00000008>;
+				peer-default;
+				qcom,label = <0x0000001>;
+			};
+
 			gpiomem0 {
 				vdevice-type = "iomem";
 				patch = "/soc/tlmm-vm-mem-access";
@@ -190,7 +199,6 @@
 					allocate-base;
 				};
 			};
-
 		};
 	};
 
@@ -270,4 +278,24 @@
 		clock-frequency = <19200000>;
 	};
 
+	qcom,mem-buf {
+		compatible = "qcom,mem-buf";
+		qcom,mem-buf-capabilities = "consumer";
+		qcom,vmid = <45>;
+	};
+
+	qcom,mem-buf-msgq {
+		compatible = "qcom,mem-buf-msgq";
+	};
+
+	virtio_mem_device {
+		compatible = "qcom,virtio-mem";
+		/* Must be memory_block_size_bytes() aligned */
+		qcom,max-size = <0x0 0x10000000>;
+		qcom,ipa-range = <0x0 0x0 0xf 0xffffffff>;
+		qcom,block-size = <0x400000>;
+	};
 };
+
+#include "msm-arm-smmu-pineapple-vm.dtsi"
+#include "pineapple-vm-dma-heaps.dtsi"