SYSLINK: ipc - ipc recovery related patches

SYSLINK: ipc - move check for in recovery state per ipc submodule

With this approach, now each submodule can allow which ioctl
can go through when the IPC is in recovery state. It is done
by exporting a new function in ipc.

Change-Id: I3402f2f83cd3dddbdd6a0d8caf94bf061a5b981c
Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>

SYSLINK: ipc - allow some ioctl go through in recovery state

This api can go through even in recovery state:
messageq_unblock
messageq_delete
messageq_close
messageq_destroy

Change-Id: If738b58c21f1d18c3ef1ba019bb598290096d32b
Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>

SYSLINK: IPC- provide ipc start and stop notification

Enable the notification of IPC start and stop, which devh can
use to register/unregister for SYS-ERRORS.

This also includes the changes to export ipc_recovery_schedule
function. This function should be called by error handlers such
as sys error and watchdog error.

Change-Id: I436c37b9c4b74d00c771e88c480ea0e96a0268fd
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Signed-off-by: Wajahat Khan <w-khan@ti.com>

syslink: ipc: fix compilation warnings

Fixing the following compilation warning when
including ipc.h and notify_ducatidriver.h in another
module:

warning: function declaration isn't a prototype

Change-Id: Idbb0b5289a3e8406fbe0b86e70d63d55d7e3060f
Reported-by: Ricardo Neri <ricardo.neri@ti.com>
Signed-off-by: Miguel Vadillo <vadillo@ti.com>

14 files changed, 97 insertions, 12 deletions

diff --git a/arch/arm/plat-omap/include/syslink/ipc.h b/arch/arm/plat-omap/include/syslink/ipc.h
index bead3bf54e7..ceb239219b7 100644
--- a/arch/arm/plat-omap/include/syslink/ipc.h
+++ b/arch/arm/plat-omap/include/syslink/ipc.h
@@ -120,7 +120,11 @@ struct ipc_params {
 };
 
 /* IPC events. */
-#define IPC_CLOSE      0
+enum {
+        IPC_CLOSE = 0,
+        IPC_START = 1,
+        IPC_STOP = 2,
+};
 
 /* =============================================================================
  * APIs
@@ -174,4 +178,12 @@ int ipc_register_notifier(struct notifier_block *nb);
 /* Un-register for IPC events. */
 int ipc_unregister_notifier(struct notifier_block *nb);
 
+/* check if ipc is in recovery state */
+#ifdef CONFIG_SYSLINK_RECOVERY
+bool ipc_recovering(void);
+#endif
+
+/* Indicate to schedule the recovery mechanism */
+void ipc_recover_schedule(void);
+
 #endif /* ifndef _IPC_H_ */
diff --git a/arch/arm/plat-omap/include/syslink/notify_ducatidriver.h b/arch/arm/plat-omap/include/syslink/notify_ducatidriver.h
index aa805ffbb3c..81e59e6fd72 100644
--- a/arch/arm/plat-omap/include/syslink/notify_ducatidriver.h
+++ b/arch/arm/plat-omap/include/syslink/notify_ducatidriver.h
@@ -28,7 +28,7 @@
 
 #define VOLATILE volatile
 
-extern u32 get_ducati_virt_mem();
+extern u32 get_ducati_virt_mem(void);
 extern void unmap_ducati_virt_mem(u32 shm_virt_addr);
 
 
diff --git a/drivers/dsp/syslink/multicore_ipc/gatemp_ioctl.c b/drivers/dsp/syslink/multicore_ipc/gatemp_ioctl.c
index 6a56606079b..68071d92530 100644
--- a/drivers/dsp/syslink/multicore_ipc/gatemp_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/gatemp_ioctl.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
+#include <ipc.h>
 #include <gatemp.h>
 #include <gatemp_ioctl.h>
 #include <sharedregion.h>
@@ -315,6 +316,12 @@ int gatemp_ioctl(struct inode *inode, struct file *filp,
 
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/heapbufmp_ioctl.c b/drivers/dsp/syslink/multicore_ipc/heapbufmp_ioctl.c
index 1aed92d9be2..dcd8bc01cec 100644
--- a/drivers/dsp/syslink/multicore_ipc/heapbufmp_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/heapbufmp_ioctl.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
+#include <ipc.h>
 #include <sharedregion.h>
 #include <heap.h>
 #include <heapbufmp.h>
@@ -416,6 +417,12 @@ int heapbufmp_ioctl(struct inode *pinode, struct file *filp,
                         (struct ipc_process_context *)filp->private_data;
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/heapmemmp_ioctl.c b/drivers/dsp/syslink/multicore_ipc/heapmemmp_ioctl.c
index a2235fa02cb..11d73696500 100644
--- a/drivers/dsp/syslink/multicore_ipc/heapmemmp_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/heapmemmp_ioctl.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
+#include <ipc.h>
 #include <heap.h>
 #include <heapmemmp_ioctl.h>
 #include <sharedregion.h>
@@ -428,6 +429,12 @@ int heapmemmp_ioctl(struct inode *pinode, struct file *filp,
                         (struct ipc_process_context *)filp->private_data;
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
index 8cf66d27661..f7b0e8c687c 100644
--- a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
+++ b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
@@ -106,12 +106,13 @@ static void ipc_recover(struct work_struct *work)
         complete_all(&ipc_open_comp);
 }
 
-static void ipc_recover_schedule(void)
+void ipc_recover_schedule(void)
 {
         INIT_COMPLETION(ipc_open_comp);
         recover = true;
         queue_work(ipc_rec_queue, &ipc_recovery_work);
 }
+EXPORT_SYMBOL_GPL(ipc_recover_schedule);
 
 static int ipc_ducati_iommu_notifier_call(struct notifier_block *nb,
                                                 unsigned long val, void *v)
@@ -150,6 +151,11 @@ static int ipc_sysm3_rproc_notifier_call(struct notifier_block *nb,
                 return 0;
         }
 }
+
+bool ipc_recovering()
+{
+        return recover;
+}
 #endif
 
 /*
@@ -238,14 +244,6 @@ static int ipc_ioctl(struct inode *ip, struct file *filp, u32 cmd, ulong arg)
         s32 retval = 0;
         void __user *argp = (void __user *)arg;
 
-#ifdef CONFIG_SYSLINK_RECOVERY
-        if (recover) {
-                if (cmd != CMD_NOTIFY_THREADDETACH) {
-                        retval = -EIO;
-                        goto exit;
-                }
-        }
-#endif
         /* Verify the memory and ensure that it is not is kernel
              address space
         */
diff --git a/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c b/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c
index c4b68455d94..d3d266987af 100644
--- a/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 
 /* Module Headers */
+#include <ipc.h>
 #include <listmp.h>
 #include <_listmp.h>
 #include <listmp_ioctl.h>
@@ -500,6 +501,12 @@ int listmp_ioctl(struct inode *inode, struct file *filp,
                         (struct ipc_process_context *)filp->private_data;
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c b/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c
index 0d3195f06f5..d9cead76533 100644
--- a/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 
 /* Module Headers */
+#include <ipc.h>
 #include <messageq.h>
 #include <messageq_ioctl.h>
 #include <sharedregion.h>
@@ -539,6 +540,15 @@ int messageq_ioctl(struct inode *inode, struct file *filp,
                         (struct ipc_process_context *)filp->private_data;
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering() && cmd != CMD_MESSAGEQ_UNBLOCK
+                            && cmd != CMD_MESSAGEQ_DELETE
+                            && cmd != CMD_MESSAGEQ_CLOSE
+                            && cmd != CMD_MESSAGEQ_DESTROY) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/multiproc_ioctl.c b/drivers/dsp/syslink/multicore_ipc/multiproc_ioctl.c
index c36521ede49..79f6ed77b7d 100644
--- a/drivers/dsp/syslink/multicore_ipc/multiproc_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/multiproc_ioctl.c
@@ -19,6 +19,7 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <ipc.h>
 #include <multiproc.h>
 #include <multiproc_ioctl.h>
 
@@ -142,6 +143,12 @@ int multiproc_ioctl(struct inode *inode, struct file *filp,
 
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/nameserver_ioctl.c b/drivers/dsp/syslink/multicore_ipc/nameserver_ioctl.c
index da3ac2a0c4c..2eaec1308e4 100644
--- a/drivers/dsp/syslink/multicore_ipc/nameserver_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/nameserver_ioctl.c
@@ -20,6 +20,8 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+
+#include <ipc.h>
 #include <nameserver.h>
 #include <nameserver_ioctl.h>
 
@@ -545,6 +547,12 @@ int nameserver_ioctl(struct inode *inode, struct file *filp,
 
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/platform.c b/drivers/dsp/syslink/multicore_ipc/platform.c
index d71c3544dea..5ae0127faa1 100644
--- a/drivers/dsp/syslink/multicore_ipc/platform.c
+++ b/drivers/dsp/syslink/multicore_ipc/platform.c
@@ -1731,6 +1731,8 @@ int platform_start_callback(u16 proc_id, void *arg)
                 pr_err("platform_load_callback failed, status [0x%x]\n",
                         status);
 
+        ipc_notify_event(IPC_START, &proc_id);
+
         return status;
 }
 EXPORT_SYMBOL(platform_start_callback);
@@ -1788,6 +1790,8 @@ int platform_stop_callback(u16 proc_id, void *arg)
                 }
         }
 
+        ipc_notify_event(IPC_STOP, &proc_id);
+
         ipc_detach(proc_id);
 
         ipc_stop();
diff --git a/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c b/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c
index 87d3cef4ac7..53d209a256b 100644
--- a/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c
@@ -24,6 +24,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
+#include <ipc.h>
 #include <multiproc.h>
 #include <sharedregion.h>
 #include <sharedregion_ioctl.h>
@@ -435,6 +436,12 @@ int sharedregion_ioctl(struct inode *inode, struct file *filp,
                         (struct ipc_process_context *)filp->private_data;
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/multicore_ipc/sysipc_ioctl.c b/drivers/dsp/syslink/multicore_ipc/sysipc_ioctl.c
index 2653ee37757..4ee64a19b70 100644
--- a/drivers/dsp/syslink/multicore_ipc/sysipc_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/sysipc_ioctl.c
@@ -197,6 +197,12 @@ int sysipc_ioctl(struct inode *inode, struct file *filp,
                         (struct ipc_process_context *)filp->private_data;
 
         if (user == true) {
+#ifdef CONFIG_SYSLINK_RECOVERY
+                if (ipc_recovering()) {
+                        status = -EIO;
+                        goto exit;
+                }
+#endif
                 if (_IOC_DIR(cmd) & _IOC_READ)
                         status = !access_ok(VERIFY_WRITE, uarg, _IOC_SIZE(cmd));
                 else if (_IOC_DIR(cmd) & _IOC_WRITE)
diff --git a/drivers/dsp/syslink/omap_notify/drv_notify.c b/drivers/dsp/syslink/omap_notify/drv_notify.c
index efa413f48ec..aafe34667e7 100644
--- a/drivers/dsp/syslink/omap_notify/drv_notify.c
+++ b/drivers/dsp/syslink/omap_notify/drv_notify.c
@@ -28,9 +28,9 @@
 #include <linux/types.h>
 #include <linux/cdev.h>
 
-
 #include <syslink/platform_mem.h>
 #include <syslink/ipc_ioctl.h>
+#include <syslink/ipc.h>
 #include <syslink/drv_notify.h>
 #include <syslink/notify_driver.h>
 #include <syslink/notify.h>
@@ -239,6 +239,11 @@ int notify_drv_ioctl(struct inode *inode, struct file *filp, u32 cmd,
         struct ipc_process_context *pr_ctxt =
                 (struct ipc_process_context *)filp->private_data;
 
+#ifdef CONFIG_SYSLINK_RECOVERY
+        if (ipc_recovering() && user && cmd != CMD_NOTIFY_THREADDETACH)
+                return -EIO;
+#endif
+
         switch (cmd) {
         case CMD_NOTIFY_GETCONFIG:
         {