Merge "msm: ipa: add L2TP/VLAN messaging" (faf5d3ec) · Commits · e / devices / android_kernel_fairphone_FP3

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,10 @@ const char *ipa_event_name[] = {
		__stringify(IPA_QUOTA_REACH),
		__stringify(IPA_SSR_BEFORE_SHUTDOWN),
		__stringify(IPA_SSR_AFTER_POWERUP),
		__stringify(ADD_VLAN_IFACE),
		__stringify(DEL_VLAN_IFACE),
		__stringify(ADD_L2TP_VLAN_MAPPING),
		__stringify(DEL_L2TP_VLAN_MAPPING)
		};

		const char *ipa_hdr_l2_type_name[] = {

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

+112 −0

Original line number	Diff line number	Diff line
		@@ -546,6 +546,90 @@ static int ipa3_send_wan_msg(unsigned long usr_param, uint8_t msg_type)
		return 0;
		}

		static void ipa3_vlan_l2tp_msg_free_cb(void *buff, u32 len, u32 type)
		{
		if (!buff) {
		IPAERR("Null buffer\n");
		return;
		}

		if (type != ADD_VLAN_IFACE &&
		type != DEL_VLAN_IFACE &&
		type != ADD_L2TP_VLAN_MAPPING &&
		type != DEL_L2TP_VLAN_MAPPING) {
		IPAERR("Wrong type given. buff %pK type %d\n", buff, type);
		return;
		}

		kfree(buff);
		}

		static int ipa3_send_vlan_l2tp_msg(unsigned long usr_param, uint8_t msg_type)
		{
		int retval;
		struct ipa_ioc_vlan_iface_info *vlan_info;
		struct ipa_ioc_l2tp_vlan_mapping_info *mapping_info;
		struct ipa_msg_meta msg_meta;

		if (msg_type == ADD_VLAN_IFACE \|\|
		msg_type == DEL_VLAN_IFACE) {
		vlan_info = kzalloc(sizeof(struct ipa_ioc_vlan_iface_info),
		GFP_KERNEL);
		if (!vlan_info) {
		IPAERR("no memory\n");
		return -ENOMEM;
		}

		if (copy_from_user((u8 )vlan_info, (void __user )usr_param,
		sizeof(struct ipa_ioc_vlan_iface_info))) {
		kfree(vlan_info);
		return -EFAULT;
		}

		memset(&msg_meta, 0, sizeof(msg_meta));
		msg_meta.msg_type = msg_type;
		msg_meta.msg_len = sizeof(struct ipa_ioc_vlan_iface_info);
		retval = ipa3_send_msg(&msg_meta, vlan_info,
		ipa3_vlan_l2tp_msg_free_cb);
		if (retval) {
		IPAERR("ipa3_send_msg failed: %d\n", retval);
		kfree(vlan_info);
		return retval;
		}
		} else if (msg_type == ADD_L2TP_VLAN_MAPPING \|\|
		msg_type == DEL_L2TP_VLAN_MAPPING) {
		mapping_info = kzalloc(sizeof(struct
		ipa_ioc_l2tp_vlan_mapping_info), GFP_KERNEL);
		if (!mapping_info) {
		IPAERR("no memory\n");
		return -ENOMEM;
		}

		if (copy_from_user((u8 *)mapping_info,
		(void __user *)usr_param,
		sizeof(struct ipa_ioc_l2tp_vlan_mapping_info))) {
		kfree(mapping_info);
		return -EFAULT;
		}

		memset(&msg_meta, 0, sizeof(msg_meta));
		msg_meta.msg_type = msg_type;
		msg_meta.msg_len = sizeof(struct
		ipa_ioc_l2tp_vlan_mapping_info);
		retval = ipa3_send_msg(&msg_meta, mapping_info,
		ipa3_vlan_l2tp_msg_free_cb);
		if (retval) {
		IPAERR("ipa3_send_msg failed: %d\n", retval);
		kfree(mapping_info);
		return retval;
		}
		} else {
		IPAERR("Unexpected event\n");
		return -EFAULT;
		}

		return 0;
		}

		static long ipa3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
		{
		@@ -1530,6 +1614,34 @@ static long ipa3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
		}
		break;

		case IPA_IOC_ADD_VLAN_IFACE:
		if (ipa3_send_vlan_l2tp_msg(arg, ADD_VLAN_IFACE)) {
		retval = -EFAULT;
		break;
		}
		break;

		case IPA_IOC_DEL_VLAN_IFACE:
		if (ipa3_send_vlan_l2tp_msg(arg, DEL_VLAN_IFACE)) {
		retval = -EFAULT;
		break;
		}
		break;

		case IPA_IOC_ADD_L2TP_VLAN_MAPPING:
		if (ipa3_send_vlan_l2tp_msg(arg, ADD_L2TP_VLAN_MAPPING)) {
		retval = -EFAULT;
		break;
		}
		break;

		case IPA_IOC_DEL_L2TP_VLAN_MAPPING:
		if (ipa3_send_vlan_l2tp_msg(arg, DEL_L2TP_VLAN_MAPPING)) {
		retval = -EFAULT;
		break;
		}
		break;

		default: /* redundant, as cmd was checked against MAXNR */
		IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
		return -ENOTTY;

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,10 @@ const char *ipa3_event_name[] = {
		__stringify(IPA_QUOTA_REACH),
		__stringify(IPA_SSR_BEFORE_SHUTDOWN),
		__stringify(IPA_SSR_AFTER_POWERUP),
		__stringify(ADD_VLAN_IFACE),
		__stringify(DEL_VLAN_IFACE),
		__stringify(ADD_L2TP_VLAN_MAPPING),
		__stringify(DEL_L2TP_VLAN_MAPPING)
		};

		const char *ipa3_hdr_l2_type_name[] = {

include/uapi/linux/msm_ipa.h

+55 −3

Original line number	Diff line number	Diff line
		@@ -69,8 +69,12 @@
		#define IPA_IOCTL_ADD_FLT_RULE_AFTER 44
		#define IPA_IOCTL_GET_HW_VERSION 45
		#define IPA_IOCTL_ADD_RT_RULE_EXT 46
		#define IPA_IOCTL_NAT_MODIFY_PDN 47
		#define IPA_IOCTL_MAX 48
		#define IPA_IOCTL_ADD_VLAN_IFACE 47
		#define IPA_IOCTL_DEL_VLAN_IFACE 48
		#define IPA_IOCTL_ADD_L2TP_VLAN_MAPPING 49
		#define IPA_IOCTL_DEL_L2TP_VLAN_MAPPING 50
		#define IPA_IOCTL_NAT_MODIFY_PDN 51
		#define IPA_IOCTL_MAX 52

		/**
		* max size of the header to be inserted
		@@ -452,7 +456,16 @@ enum ipa_ssr_event {
		IPA_SSR_EVENT_MAX
		};

		#define IPA_EVENT_MAX_NUM ((int)IPA_SSR_EVENT_MAX)
		enum ipa_vlan_l2tp_event {
		ADD_VLAN_IFACE = IPA_SSR_EVENT_MAX,
		DEL_VLAN_IFACE,
		ADD_L2TP_VLAN_MAPPING,
		DEL_L2TP_VLAN_MAPPING,
		IPA_VLAN_L2TP_EVENT_MAX,
		};

		#define IPA_EVENT_MAX_NUM (IPA_VLAN_L2TP_EVENT_MAX)
		#define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)

		/**
		* enum ipa_rm_resource_name - IPA RM clients identification names
		@@ -1445,6 +1458,30 @@ struct ipa_ioc_nat_pdn_entry {
		uint32_t dst_metadata;
		};

		/**
		* struct ipa_ioc_vlan_iface_info - add vlan interface
		* @name: interface name
		* @vlan_id: VLAN ID
		*/
		struct ipa_ioc_vlan_iface_info {
		char name[IPA_RESOURCE_NAME_MAX];
		uint8_t vlan_id;
		};

		/**
		* struct ipa_ioc_l2tp_vlan_mapping_info - l2tp->vlan mapping info
		* @iptype: l2tp tunnel IP type
		* @l2tp_iface_name: l2tp interface name
		* @l2tp_session_id: l2tp session id
		* @vlan_iface_name: vlan interface name
		*/
		struct ipa_ioc_l2tp_vlan_mapping_info {
		enum ipa_ip_type iptype;
		char l2tp_iface_name[IPA_RESOURCE_NAME_MAX];
		uint8_t l2tp_session_id;
		char vlan_iface_name[IPA_RESOURCE_NAME_MAX];
		};

		/**
		* struct ipa_msg_meta - Format of the message meta-data.
		* @msg_type: the type of the message
		@@ -1722,6 +1759,21 @@ enum ipacm_client_enum {
		IPA_IOCTL_GET_HW_VERSION, \
		enum ipa_hw_type *)

		#define IPA_IOC_ADD_VLAN_IFACE _IOWR(IPA_IOC_MAGIC, \
		IPA_IOCTL_ADD_VLAN_IFACE, \
		struct ipa_ioc_vlan_iface_info *)

		#define IPA_IOC_DEL_VLAN_IFACE _IOWR(IPA_IOC_MAGIC, \
		IPA_IOCTL_DEL_VLAN_IFACE, \
		struct ipa_ioc_vlan_iface_info *)

		#define IPA_IOC_ADD_L2TP_VLAN_MAPPING _IOWR(IPA_IOC_MAGIC, \
		IPA_IOCTL_ADD_L2TP_VLAN_MAPPING, \
		struct ipa_ioc_l2tp_vlan_mapping_info *)

		#define IPA_IOC_DEL_L2TP_VLAN_MAPPING _IOWR(IPA_IOC_MAGIC, \
		IPA_IOCTL_DEL_L2TP_VLAN_MAPPING, \
		struct ipa_ioc_l2tp_vlan_mapping_info *)
		/*
		* unique magic number of the Tethering bridge ioctls
		*/