Revert "Revert "msm: ipc: Trigger loading only the default subsystem""
This reverts commit 1d6f8ccdc86055ea87c6cbb08a3a60d767f167b3. This
patch brings back original commit 0424710ca8fa552977b82454607bb3c04a70cf66.
There has been a race condition in GSS boot up, which is masked by
APPs IPC Router loading the GSS early during the bootup process. The
original commit disables APPs IPC Router loading the GSS. Hence there
is a small delay in GSS getting loaded by the GSS driver. This exposed
the race condition and caused the GSS to crash and the target to freeze.
So the original commit is reverted to allow the GSS bootup issue to be
fixed. Now that the GSS boot up issue is fixed, the original commit is
brought back.
CRs-Fixed: 345316
Change-Id: I33a0dbcbf4dd25dba1d4b383759f5119af947311
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
diff --git a/arch/arm/mach-msm/ipc_router.h b/arch/arm/mach-msm/ipc_router.h
index 462543e..a90be23 100644
--- a/arch/arm/mach-msm/ipc_router.h
+++ b/arch/arm/mach-msm/ipc_router.h
@@ -138,7 +138,7 @@
struct msm_ipc_sock {
struct sock sk;
struct msm_ipc_port *port;
- void *modem_pil;
+ void *default_pil;
};
enum write_data_type {
@@ -206,4 +206,15 @@
int msm_ipc_router_init_sockets(void);
void msm_ipc_router_exit_sockets(void);
+#if defined CONFIG_MSM_IPC_ROUTER_SMD_XPRT
+extern void *msm_ipc_load_default_node(void);
+
+extern void msm_ipc_unload_default_node(void *pil);
+#else
+static inline void *msm_ipc_load_default_node(void)
+{ return NULL; }
+
+static inline void msm_ipc_unload_default_node(void *pil) { }
+#endif
+
#endif