SYSLINK:ipc-de-couple sysmanager from Proc module

This patch de-couples SysManager calls from Proc module.
Added new SysManger calls that get invoked from user
space.
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

arch/arm/plat-omap/include/syslink/ipc_ioctl.h

@@ -37,7 +37,7 @@ enum ipc_command_count {
 	MESSAGEQ_CMD_NOS = 17,
 	MESSAGEQ_TRANSPORTSHM_CMD_NOS = 9,
 	NAMESERVERREMOTENOTIFY_CMD_NOS = 8,
-	SYSMGR_CMD_NOS = 2,
+	SYSMGR_CMD_NOS = 5,
 	SYSMEMMGR_CMD_NOS = 6
 };
 

arch/arm/plat-omap/include/syslink/sysmgr_ioctl.h

@@ -40,7 +40,10 @@
 /* IOCTL command numbers for sysmgr */
 enum sysmgr_drv_cmd {
 	SYSMGR_SETUP = SYSMGR_BASE_CMD,
-	SYSMGR_DESTROY
+	SYSMGR_DESTROY,
+	SYSMGR_LOADCALLBACK,
+	SYSMGR_STARTCALLBACK,
+	SYSMGR_STOPCALLBACK
 };
 
 /* Command for sysmgr_setup */
@@ -53,6 +56,21 @@ enum sysmgr_drv_cmd {
 			_IOWR(SYSMGR_IOC_MAGIC, SYSMGR_DESTROY, \
 			struct sysmgr_cmd_args)
 
+/* Command for load callback */
+#define CMD_SYSMGR_LOADCALLBACK \
+			_IOWR(SYSMGR_IOC_MAGIC, SYSMGR_LOADCALLBACK, \
+			struct sysmgr_cmd_args)
+
+/* Command for load callback */
+#define CMD_SYSMGR_STARTCALLBACK \
+			_IOWR(SYSMGR_IOC_MAGIC, SYSMGR_STARTCALLBACK, \
+			struct sysmgr_cmd_args)
+
+/* Command for stop callback */
+#define CMD_SYSMGR_STOPCALLBACK \
+			_IOWR(SYSMGR_IOC_MAGIC, SYSMGR_STOPCALLBACK, \
+			struct sysmgr_cmd_args)
+
 
 /*  ----------------------------------------------------------------------------
  *  Command arguments for sysmgr
@@ -64,6 +82,8 @@ struct sysmgr_cmd_args {
 		struct {
 			struct sysmgr_config *config;
 		} setup;
+
+		int proc_id;
 	} args;
 
 	s32 api_status;

drivers/dsp/syslink/multicore_ipc/sysmgr_ioctl.c

@@ -28,7 +28,7 @@
 /* Module Headers */
 #include <sysmgr.h>
 #include <sysmgr_ioctl.h>
-
+#include <platform.h>
 /*
  * ======== sysmgr_ioctl_setup ========
  *  Purpose:
@@ -103,6 +103,25 @@ int sysmgr_ioctl(struct inode *inode, struct file *filp,
 		os_status = sysmgr_ioctl_destroy(&cargs);
 		break;
 
+	case CMD_SYSMGR_LOADCALLBACK:
+#if defined CONFIG_SYSLINK_USE_SYSMGR
+		platform_load_callback((void *)(cargs.args.proc_id));
+		cargs.api_status = 0;
+#endif
+		break;
+
+	case CMD_SYSMGR_STARTCALLBACK:
+#if defined CONFIG_SYSLINK_USE_SYSMGR
+		platform_start_callback((void *)(cargs.args.proc_id));
+		cargs.api_status = 0;
+#endif
+		break;
+
+	case CMD_SYSMGR_STOPCALLBACK:
+#if defined CONFIG_SYSLINK_USE_SYSMGR
+		platform_stop_callback((void *)(cargs.args.proc_id));
+#endif
+		break;
 	default:
 		WARN_ON(cmd);
 		os_status = -ENOTTY;

drivers/dsp/syslink/procmgr/procmgr.c

@@ -25,11 +25,6 @@
 #include "procdefs.h"
 #include "processor.h"
 #include <syslink/atomic_linux.h>
-#if defined CONFIG_SYSLINK_USE_SYSMGR
-#include <sysmgr.h>
-#include <platform.h>
-#endif /* if defined (CONFIG_SYSLINK_USE_SYSMGR) */
-
 
 /* ================================
  *  Macros and types
@@ -583,9 +578,6 @@ int proc_mgr_start(void *handle, u32 entry_point,
 		proc_mgr_get_start_params(handle, &tmp_params);
 		params = &tmp_params;
 	}
-#if defined CONFIG_SYSLINK_USE_SYSMGR
-	platform_load_callback((void *)params->proc_id); /*  FIXME */
-#endif
 	WARN_ON(mutex_lock_interruptible(proc_mgr_obj_state.gate_handle));
 	memcpy(&(proc_mgr_handle->start_params), params,
 					sizeof(struct proc_mgr_start_params));
@@ -595,13 +587,6 @@ int proc_mgr_start(void *handle, u32 entry_point,
 						entry_point, &proc_params);
 
 	mutex_unlock(proc_mgr_obj_state.gate_handle);
-#if defined CONFIG_SYSLINK_USE_SYSMGR
-	if (retval == 0) {
-		/* TBD: should be removed when notify local is implemepented */
-		platform_start_callback((void *)params->proc_id);
-	}
-#endif /* defined (CONFIG_SYSLINK_USE_SYSMGR)*/
-
 	return retval;;
 }
 EXPORT_SYMBOL(proc_mgr_start);
@@ -629,11 +614,6 @@ int proc_mgr_stop(void *handle, struct proc_mgr_stop_params *params)
 		return -EFAULT;
 	}
 	BUG_ON(handle == NULL);
-#if defined CONFIG_SYSLINK_USE_SYSMGR
-	/* TBD: should be removed when notify local is implemepented */
-	platform_stop_callback((void *)params->proc_id);
-#endif /* #if defined (CONFIG_SYSLINK_USE_SYSMGR) */
-
 	WARN_ON(mutex_lock_interruptible(proc_mgr_obj_state.gate_handle));
 	proc_params.params = params;
 	retval = processor_stop(proc_mgr_handle->proc_handle,