Merge "ARM: dts: msm: add audio ion vm dev on msm8996 vplatform"

2 files changed, 121 insertions, 1 deletions

diff --git a/include/linux/qdsp6v2/apr.h b/include/linux/qdsp6v2/apr.h
index 29deb3ca5ac7..adcdbcbc5907 100644
--- a/include/linux/qdsp6v2/apr.h
+++ b/include/linux/qdsp6v2/apr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -137,6 +137,10 @@ struct apr_svc {
 	struct mutex m_lock;
 	spinlock_t w_lock;
 	uint8_t pkt_owner;
+#ifdef CONFIG_MSM_QDSP6_APRV2_VM
+	uint16_t vm_dest_svc;
+	uint32_t vm_handle;
+#endif
 };
 
 struct apr_client {
diff --git a/include/linux/qdsp6v2/aprv2_vm.h b/include/linux/qdsp6v2/aprv2_vm.h
new file mode 100644
index 000000000000..d16ea12d62b5
--- /dev/null
+++ b/include/linux/qdsp6v2/aprv2_vm.h
@@ -0,0 +1,116 @@
+/* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef __APRV2_VM_H__
+#define __APRV2_VM_H__
+
+#define APRV2_VM_MAX_DNS_SIZE (31)
+  /* Includes NULL character. */
+#define APRV2_VM_PKT_SERVICE_ID_MASK (0x00FF)
+  /* Bitmask of the service ID field. */
+
+/* Packet Structure Definition */
+struct aprv2_vm_packet_t {
+	uint32_t header;
+	uint16_t src_addr;
+	uint16_t src_port;
+	uint16_t dst_addr;
+	uint16_t dst_port;
+	uint32_t token;
+	uint32_t opcode;
+};
+
+/**
+ * In order to send command/event via MM HAB, the following buffer
+ * format shall be followed, where the buffer is provided to the
+ * HAB send API.
+ * |-----cmd_id or evt_id -----| <- 32 bit, e.g. APRV2_VM_CMDID_REGISTER
+ * |-----cmd payload ----------| e.g. aprv2_vm_cmd_register_t
+ * | ...                       |
+ *
+ * In order to receive a command response or event ack, the following
+ * buffer format shall be followed, where the buffer is provided to
+ * the HAB receive API.
+ * |-----cmd response ---------| e.g. aprv2_vm_cmd_register_rsp_t
+ * | ...                       |
+ */
+
+/* Registers a service with the backend APR driver. */
+#define APRV2_VM_CMDID_REGISTER          (0x00000001)
+
+struct aprv2_vm_cmd_register_t {
+	uint32_t name_size;
+    /**< The service name string size in bytes. */
+	char name[APRV2_VM_MAX_DNS_SIZE];
+    /**<
+     * The service name string to register.
+     *
+     * A NULL name means the service does not have a name.
+     */
+	uint16_t addr;
+    /**<
+     *  The address to register.
+     *
+     * A zero value means to auto-generate a free dynamic address.
+     * A non-zero value means to directly use the statically assigned address.
+     */
+};
+
+struct aprv2_vm_cmd_register_rsp_t {
+	int32_t status;
+    /**< The status of registration. */
+	uint32_t handle;
+    /**< The registered service handle. */
+	uint16_t addr;
+    /**< The actual registered address. */
+};
+
+#define APRV2_VM_CMDID_DEREGISTER        (0x00000002)
+
+struct aprv2_vm_cmd_deregister_t {
+	uint32_t handle;
+    /**< The registered service handle. */
+};
+
+struct aprv2_vm_cmd_deregister_rsp_t {
+	int32_t status;
+    /**< The status of de-registration. */
+};
+
+#define APRV2_VM_CMDID_ASYNC_SEND        (0x00000003)
+
+struct aprv2_vm_cmd_async_send_t {
+	uint32_t handle;
+    /**< The registered service handle. */
+	struct aprv2_vm_packet_t pkt_header;
+    /**< The packet header. */
+    /* The apr packet payload follows */
+};
+
+struct aprv2_vm_cmd_async_send_rsp_t {
+	int32_t status;
+    /**< The status of send. */
+};
+
+#define APRV2_VM_EVT_RX_PKT_AVAILABLE    (0x00000004)
+
+struct aprv2_vm_evt_rx_pkt_available_t {
+	struct aprv2_vm_packet_t pkt_header;
+    /**< The packet header. */
+    /* The apr packet payload follows */
+};
+
+struct aprv2_vm_ack_rx_pkt_available_t {
+	int32_t status;
+};
+
+#endif /* __APRV2_VM_H__ */