msm: ipc: IPC Router updates to support QMI in the kernel
1) Move the kernel interface APIs to a separate header file.
2) Use platform device to indicate the arrival/exit of service.
3) Add kernel APIs to send and receive messages through IPC Router.
4) Clean up unused Macros, enums, header inclusion.
Change-Id: I1541e9815d104f7ea46d19c10b57c77d967bd065
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 6f6cf64..d4e8e13 100644
--- a/arch/arm/mach-msm/ipc_router.h
+++ b/arch/arm/mach-msm/ipc_router.h
@@ -18,22 +18,18 @@
#include <linux/errno.h>
#include <linux/mm.h>
#include <linux/list.h>
-#include <linux/cdev.h>
#include <linux/platform_device.h>
-#include <linux/wakelock.h>
#include <linux/msm_ipc.h>
#include <net/sock.h>
/* definitions for the R2R wire protcol */
#define IPC_ROUTER_VERSION 1
-#define IPC_ROUTER_PROCESSORS_MAX 4
#define IPC_ROUTER_CLIENT_BCAST_ID 0xffffffff
#define IPC_ROUTER_ADDRESS 0xfffffffe
#define IPC_ROUTER_NID_LOCAL 1
-#define IPC_ROUTER_NID_REMOTE 0
#define IPC_ROUTER_CTRL_CMD_DATA 1
#define IPC_ROUTER_CTRL_CMD_HELLO 2
@@ -51,8 +47,6 @@
#define IPC_ROUTER_XPRT_EVENT_OPEN 2
#define IPC_ROUTER_XPRT_EVENT_CLOSE 3
-#define NUM_NODES 2
-
#define IPC_ROUTER_INFINITY -1
#define DEFAULT_RCV_TIMEO IPC_ROUTER_INFINITY
@@ -62,11 +56,6 @@
#define ALL_INSTANCE 0xFFFFFFFF
enum {
- MSM_IPC_ROUTER_READ_CB = 0,
- MSM_IPC_ROUTER_WRITE_DONE,
-};
-
-enum {
CLIENT_PORT,
SERVER_PORT,
CONTROL_PORT,
@@ -102,10 +91,6 @@
#define IPC_ROUTER_HDR_SIZE sizeof(struct rr_header)
#define MAX_IPC_PKT_SIZE 66000
-/* internals */
-
-#define IPC_ROUTER_MAX_REMOTE_SERVERS 100
-#define MAX_WAKELOCK_NAME_SZ 32
struct rr_packet {
struct list_head list;
@@ -113,51 +98,12 @@
uint32_t length;
};
-struct msm_ipc_port {
- struct list_head list;
-
- struct msm_ipc_port_addr this_port;
- struct msm_ipc_port_name port_name;
- uint32_t type;
- unsigned flags;
- spinlock_t port_lock;
-
- struct list_head incomplete;
- struct mutex incomplete_lock;
-
- struct list_head port_rx_q;
- struct mutex port_rx_q_lock;
- char rx_wakelock_name[MAX_WAKELOCK_NAME_SZ];
- struct wake_lock port_rx_wake_lock;
- wait_queue_head_t port_rx_wait_q;
-
- int restart_state;
- spinlock_t restart_lock;
- wait_queue_head_t restart_wait;
-
- void *endpoint;
- void (*notify)(unsigned event, void *data, void *addr, void *priv);
- int (*check_send_permissions)(void *data);
-
- uint32_t num_tx;
- uint32_t num_rx;
- unsigned long num_tx_bytes;
- unsigned long num_rx_bytes;
- void *priv;
-};
-
struct msm_ipc_sock {
struct sock sk;
struct msm_ipc_port *port;
void *default_pil;
};
-enum write_data_type {
- HEADER = 1,
- PACKMARK,
- PAYLOAD,
-};
-
struct msm_ipc_router_xprt {
char *name;
uint32_t link_id;
@@ -173,8 +119,6 @@
void (*sft_close_done)(struct msm_ipc_router_xprt *xprt);
};
-extern struct completion msm_ipc_remote_router_up;
-
void msm_ipc_router_xprt_notify(struct msm_ipc_router_xprt *xprt,
unsigned event,
void *data);
@@ -185,8 +129,7 @@
struct msm_ipc_port *msm_ipc_router_create_raw_port(void *endpoint,
- void (*notify)(unsigned event, void *data,
- void *addr, void *priv),
+ void (*notify)(unsigned event, void *priv),
void *priv);
int msm_ipc_router_send_to(struct msm_ipc_port *src,
struct sk_buff_head *data,
@@ -194,27 +137,16 @@
int msm_ipc_router_read(struct msm_ipc_port *port_ptr,
struct sk_buff_head **data,
size_t buf_len);
-int msm_ipc_router_get_curr_pkt_size(struct msm_ipc_port *port_ptr);
int msm_ipc_router_bind_control_port(struct msm_ipc_port *port_ptr);
-int msm_ipc_router_lookup_server_name(struct msm_ipc_port_name *srv_name,
- struct msm_ipc_server_info *srv_info,
- int num_entries_in_array,
- uint32_t lookup_mask);
-int msm_ipc_router_close_port(struct msm_ipc_port *port_ptr);
-struct msm_ipc_port *msm_ipc_router_create_port(
- void (*notify)(unsigned event, void *data,
- void *addr, void *priv),
- void *priv);
int msm_ipc_router_recv_from(struct msm_ipc_port *port_ptr,
struct sk_buff_head **data,
struct msm_ipc_addr *src_addr,
- unsigned long timeout);
+ long timeout);
int msm_ipc_router_register_server(struct msm_ipc_port *server_port,
struct msm_ipc_addr *name);
int msm_ipc_router_unregister_server(struct msm_ipc_port *server_port);
-
int msm_ipc_router_init_sockets(void);
void msm_ipc_router_exit_sockets(void);