Merge "msm: ipa: Cache CNE event" (d14a930f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/ipa/ipa_v2/ipa.c

+24 −4

Original line number	Diff line number	Diff line
		@@ -531,7 +531,7 @@ static void ipa_wan_msg_free_cb(void *buff, u32 len, u32 type)
		kfree(buff);
		}

		static int ipa_send_wan_msg(unsigned long usr_param, uint8_t msg_type)
		static int ipa_send_wan_msg(unsigned long usr_param, uint8_t msg_type, bool is_cache)
		{
		int retval;
		struct ipa_wan_msg *wan_msg;
		@@ -559,6 +559,25 @@ static int ipa_send_wan_msg(unsigned long usr_param, uint8_t msg_type)
		return retval;
		}

		if (is_cache) {
		mutex_lock(&ipa_ctx->ipa_cne_evt_lock);

		/* cache the cne event */
		memcpy(&ipa_ctx->ipa_cne_evt_req_cache[
		ipa_ctx->num_ipa_cne_evt_req].wan_msg,
		wan_msg,
		sizeof(struct ipa_wan_msg));

		memcpy(&ipa_ctx->ipa_cne_evt_req_cache[
		ipa_ctx->num_ipa_cne_evt_req].msg_meta,
		&msg_meta,
		sizeof(struct ipa_msg_meta));

		ipa_ctx->num_ipa_cne_evt_req++;
		ipa_ctx->num_ipa_cne_evt_req %= IPA_MAX_NUM_REQ_CACHE;
		mutex_unlock(&ipa_ctx->ipa_cne_evt_lock);
		}

		return 0;
		}

		@@ -1328,21 +1347,21 @@ static long ipa_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
		}
		break;
		case IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_ADD:
		retval = ipa_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_ADD);
		retval = ipa_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_ADD, true);
		if (retval) {
		IPAERR("ipa_send_wan_msg failed: %d\n", retval);
		break;
		}
		break;
		case IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_DEL:
		retval = ipa_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_DEL);
		retval = ipa_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_DEL, true);
		if (retval) {
		IPAERR("ipa_send_wan_msg failed: %d\n", retval);
		break;
		}
		break;
		case IPA_IOC_NOTIFY_WAN_EMBMS_CONNECTED:
		retval = ipa_send_wan_msg(arg, WAN_EMBMS_CONNECT);
		retval = ipa_send_wan_msg(arg, WAN_EMBMS_CONNECT, false);
		if (retval) {
		IPAERR("ipa_send_wan_msg failed: %d\n", retval);
		break;
		@@ -4169,6 +4188,7 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p,

		mutex_init(&ipa_ctx->lock);
		mutex_init(&ipa_ctx->nat_mem.lock);
		mutex_init(&ipa_ctx->ipa_cne_evt_lock);

		idr_init(&ipa_ctx->ipa_idr);
		spin_lock_init(&ipa_ctx->idr_lock);

drivers/platform/msm/ipa/ipa_v2/ipa_i.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,9 @@

		#define IPA_MAX_STATUS_STAT_NUM 30


		#define IPA_MAX_NUM_REQ_CACHE 10

		#define IPADBG(fmt, args...) \
		pr_debug(DRV_NAME " %s:%d " fmt, __func__, __LINE__, ## args)
		#define IPAERR(fmt, args...) \
		@@ -968,6 +971,11 @@ struct ipacm_client_info {
		bool uplink;
		};

		struct ipa_cne_evt {
		struct ipa_wan_msg wan_msg;
		struct ipa_msg_meta msg_meta;
		};

		/**
		* struct ipa_context - IPA context
		* @class: pointer to the struct class
		@@ -1164,6 +1172,9 @@ struct ipa_context {
		u32 ipa_rx_min_timeout_usec;
		u32 ipa_rx_max_timeout_usec;
		u32 ipa_polling_iteration;
		struct ipa_cne_evt ipa_cne_evt_req_cache[IPA_MAX_NUM_REQ_CACHE];
		int num_ipa_cne_evt_req;
		struct mutex ipa_cne_evt_lock;
		};

		/**

drivers/platform/msm/ipa/ipa_v3/ipa.c

+24 −4

Original line number	Diff line number	Diff line
		@@ -540,7 +540,7 @@ static void ipa3_wan_msg_free_cb(void *buff, u32 len, u32 type)
		kfree(buff);
		}

		static int ipa3_send_wan_msg(unsigned long usr_param, uint8_t msg_type)
		static int ipa3_send_wan_msg(unsigned long usr_param, uint8_t msg_type, bool is_cache)
		{
		int retval;
		struct ipa_wan_msg *wan_msg;
		@@ -568,6 +568,25 @@ static int ipa3_send_wan_msg(unsigned long usr_param, uint8_t msg_type)
		return retval;
		}

		if (is_cache) {
		mutex_lock(&ipa3_ctx->ipa_cne_evt_lock);

		/* cache the cne event */
		memcpy(&ipa3_ctx->ipa_cne_evt_req_cache[
		ipa3_ctx->num_ipa_cne_evt_req].wan_msg,
		wan_msg,
		sizeof(struct ipa_wan_msg));

		memcpy(&ipa3_ctx->ipa_cne_evt_req_cache[
		ipa3_ctx->num_ipa_cne_evt_req].msg_meta,
		&msg_meta,
		sizeof(struct ipa_msg_meta));

		ipa3_ctx->num_ipa_cne_evt_req++;
		ipa3_ctx->num_ipa_cne_evt_req %= IPA_MAX_NUM_REQ_CACHE;
		mutex_unlock(&ipa3_ctx->ipa_cne_evt_lock);
		}

		return 0;
		}

		@@ -1524,21 +1543,21 @@ static long ipa3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
		}
		break;
		case IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_ADD:
		retval = ipa3_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_ADD);
		retval = ipa3_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_ADD, true);
		if (retval) {
		IPAERR("ipa3_send_wan_msg failed: %d\n", retval);
		break;
		}
		break;
		case IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_DEL:
		retval = ipa3_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_DEL);
		retval = ipa3_send_wan_msg(arg, WAN_UPSTREAM_ROUTE_DEL, true);
		if (retval) {
		IPAERR("ipa3_send_wan_msg failed: %d\n", retval);
		break;
		}
		break;
		case IPA_IOC_NOTIFY_WAN_EMBMS_CONNECTED:
		retval = ipa3_send_wan_msg(arg, WAN_EMBMS_CONNECT);
		retval = ipa3_send_wan_msg(arg, WAN_EMBMS_CONNECT, false);
		if (retval) {
		IPAERR("ipa3_send_wan_msg failed: %d\n", retval);
		break;
		@@ -4877,6 +4896,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
		mutex_init(&ipa3_ctx->lock);
		mutex_init(&ipa3_ctx->nat_mem.lock);
		mutex_init(&ipa3_ctx->q6_proxy_clk_vote_mutex);
		mutex_init(&ipa3_ctx->ipa_cne_evt_lock);

		idr_init(&ipa3_ctx->ipa_idr);
		spin_lock_init(&ipa3_ctx->idr_lock);

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,8 @@

		#define IPA_IPC_LOG_PAGES 50

		#define IPA_MAX_NUM_REQ_CACHE 10

		#define IPADBG(fmt, args...) \
		do { \
		pr_debug(DRV_NAME " %s:%d " fmt, __func__, __LINE__, ## args);\
		@@ -1088,6 +1090,11 @@ struct ipa_hw_stats {
		struct ipa_hw_stats_drop drop;
		};

		struct ipa_cne_evt {
		struct ipa_wan_msg wan_msg;
		struct ipa_msg_meta msg_meta;
		};

		/**
		* struct ipa3_context - IPA context
		* @class: pointer to the struct class
		@@ -1304,6 +1311,9 @@ struct ipa3_context {
		struct ipa_tz_unlock_reg_info *ipa_tz_unlock_reg;
		struct ipa_dma_task_info dma_task_info;
		struct ipa_hw_stats hw_stats;
		struct ipa_cne_evt ipa_cne_evt_req_cache[IPA_MAX_NUM_REQ_CACHE];
		int num_ipa_cne_evt_req;
		struct mutex ipa_cne_evt_lock;
		};

		struct ipa3_plat_drv_res {