Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d465dc11 authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan
Browse files

soc: qcom: dfc: ancillary info 



Added parsing of ancillary info in the flow control indications
so that flow disable will not be applied to ancillary queues if
the flag is true.

CRs-fixed: 2305006
Change-Id: I3b1d1ad46c4f1ceefc42ec3c08918913128c5c5a
Acked-by: default avatarWeiyi Chen <weiyic@qti.qualcomm.com>
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent 19a85100

drivers/soc/qcom/dfc_qmi.c

+133 −9
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/dfc.h>



#define DFC_IS_ANCILLARY(type) ((type) != AF_INET && (type) != AF_INET6)



#define DFC_MAX_BEARERS_V01 16

#define DFC_MAX_QOS_ID_V01 2
@@ -79,7 +81,7 @@ static void dfc_do_burst_flow_control(struct work_struct *work); 
#define QMI_DFC_INDICATION_REGISTER_RESP_V01_MAX_MSG_LEN 7



#define QMI_DFC_FLOW_STATUS_IND_V01 0x0022

#define QMI_DFC_FLOW_STATUS_IND_V01_MAX_MSG_LEN 424

#define QMI_DFC_FLOW_STATUS_IND_V01_MAX_MSG_LEN 540



struct dfc_bind_client_req_msg_v01 {

	u8 ep_id_valid;
@@ -234,12 +236,74 @@ static struct qmi_elem_info dfc_flow_status_info_type_v01_ei[] = { 
	},

};



struct dfc_ancillary_info_type_v01 {

	u8 subs_id;

	u8 mux_id;

	u8 bearer_id;

	u32 reserved;

};



static struct qmi_elem_info dfc_ancillary_info_type_v01_ei[] = {

	{

		.data_type	= QMI_UNSIGNED_1_BYTE,

		.elem_len	= 1,

		.elem_size	= sizeof(u8),

		.is_array	= NO_ARRAY,

		.tlv_type	= QMI_COMMON_TLV_TYPE,

		.offset		= offsetof(struct

					   dfc_ancillary_info_type_v01,

					   subs_id),

		.ei_array	= NULL,

	},

	{

		.data_type	= QMI_UNSIGNED_1_BYTE,

		.elem_len	= 1,

		.elem_size	= sizeof(u8),

		.is_array	= NO_ARRAY,

		.tlv_type	= QMI_COMMON_TLV_TYPE,

		.offset		= offsetof(struct

					   dfc_ancillary_info_type_v01,

					   mux_id),

		.ei_array	= NULL,

	},

	{

		.data_type	= QMI_UNSIGNED_1_BYTE,

		.elem_len	= 1,

		.elem_size	= sizeof(u8),

		.is_array	= NO_ARRAY,

		.tlv_type	= QMI_COMMON_TLV_TYPE,

		.offset		= offsetof(struct

					   dfc_ancillary_info_type_v01,

					   bearer_id),

		.ei_array	= NULL,

	},

	{

		.data_type	= QMI_UNSIGNED_4_BYTE,

		.elem_len	= 1,

		.elem_size	= sizeof(u32),

		.is_array	= NO_ARRAY,

		.tlv_type	= QMI_COMMON_TLV_TYPE,

		.offset		= offsetof(struct

					   dfc_ancillary_info_type_v01,

					   reserved),

		.ei_array	= NULL,

	},

	{

		.data_type	= QMI_EOTI,

		.is_array	= NO_ARRAY,

		.tlv_type	= QMI_COMMON_TLV_TYPE,

	},

};



struct dfc_flow_status_ind_msg_v01 {

	u8 flow_status_valid;

	u8 flow_status_len;

	struct dfc_flow_status_info_type_v01 flow_status[DFC_MAX_BEARERS_V01];

	u8 eod_ack_reqd_valid;

	u8 eod_ack_reqd;

	u8 ancillary_info_valid;

	u8 ancillary_info_len;

	struct dfc_ancillary_info_type_v01 ancillary_info[DFC_MAX_BEARERS_V01];

};



struct dfc_svc_ind {
@@ -400,6 +464,40 @@ static struct qmi_elem_info dfc_flow_status_ind_v01_ei[] = { 
					   eod_ack_reqd),

		.ei_array	= NULL,

	},

	{

		.data_type	= QMI_OPT_FLAG,

		.elem_len	= 1,

		.elem_size	= sizeof(u8),

		.is_array	= NO_ARRAY,

		.tlv_type	= 0x12,

		.offset		= offsetof(struct

					   dfc_flow_status_ind_msg_v01,

					   ancillary_info_valid),

		.ei_array	= NULL,

	},

	{

		.data_type	= QMI_DATA_LEN,

		.elem_len	= 1,

		.elem_size	= sizeof(u8),

		.is_array	= NO_ARRAY,

		.tlv_type	= 0x12,

		.offset		= offsetof(struct

					   dfc_flow_status_ind_msg_v01,

					   ancillary_info_len),

		.ei_array	= NULL,

	},

	{

		.data_type	= QMI_STRUCT,

		.elem_len	= DFC_MAX_BEARERS_V01,

		.elem_size	= sizeof(struct

					 dfc_ancillary_info_type_v01),

		.is_array	= VAR_LEN_ARRAY,

		.tlv_type	= 0x12,

		.offset		= offsetof(struct

					   dfc_flow_status_ind_msg_v01,

					   ancillary_info),

		.ei_array	= dfc_ancillary_info_type_v01_ei,

	},

	{

		.data_type	= QMI_EOTI,

		.is_array	= NO_ARRAY,
@@ -587,6 +685,13 @@ static int dfc_bearer_flow_ctl(struct net_device *dev, 
		itm = list_entry(p, struct rmnet_flow_map, list);



		if (itm->bearer_id == bearer->bearer_id) {

			/*

			 * Do not flow disable ancillary q if ancillary is true

			 */

			if (bearer->ancillary && enable == 0 &&

					DFC_IS_ANCILLARY(itm->ip_type))

				continue;



			qlen = qmi_rmnet_flow_control(dev, itm->tcm_handle,

						    enable);

			trace_dfc_qmi_tc(dev->name, itm->bearer_id,
@@ -605,7 +710,7 @@ static int dfc_bearer_flow_ctl(struct net_device *dev, 
}



static int dfc_all_bearer_flow_ctl(struct net_device *dev,

				struct qos_info *qos, u8 ack_req,

				struct qos_info *qos, u8 ack_req, u32 ancillary,

				struct dfc_flow_status_info_type_v01 *fc_info)

{

	struct list_head *p;
@@ -621,6 +726,7 @@ static int dfc_all_bearer_flow_ctl(struct net_device *dev, 
			qmi_rmnet_grant_per(bearer_itm->grant_size);

		bearer_itm->seq = fc_info->seq_num;

		bearer_itm->ack_req = ack_req;

		bearer_itm->ancillary = ancillary;

	}



	enable = fc_info->num_bytes > 0 ? 1 : 0;
@@ -641,7 +747,7 @@ static int dfc_all_bearer_flow_ctl(struct net_device *dev, 
}



static int dfc_update_fc_map(struct net_device *dev, struct qos_info *qos,

			     u8 ack_req,

			     u8 ack_req, u32 ancillary,

			     struct dfc_flow_status_info_type_v01 *fc_info)

{

	struct rmnet_bearer_map *itm = NULL;
@@ -659,6 +765,7 @@ static int dfc_update_fc_map(struct net_device *dev, struct qos_info *qos, 
		itm->grant_thresh = qmi_rmnet_grant_per(itm->grant_size);

		itm->seq = fc_info->seq_num;

		itm->ack_req = ack_req;

		itm->ancillary = ancillary;



		if (action != -1)

			rc = dfc_bearer_flow_ctl(dev, itm, qos);
@@ -672,13 +779,14 @@ static int dfc_update_fc_map(struct net_device *dev, struct qos_info *qos, 
static void dfc_do_burst_flow_control(struct work_struct *work)

{

	struct dfc_svc_ind *svc_ind = (struct dfc_svc_ind *)work;

	struct dfc_flow_status_ind_msg_v01 *ind =

		(struct dfc_flow_status_ind_msg_v01 *)&svc_ind->dfc_info;

	struct dfc_flow_status_ind_msg_v01 *ind = &svc_ind->dfc_info;

	struct net_device *dev;

	struct qos_info *qos;

	struct dfc_flow_status_info_type_v01 *flow_status;

	struct dfc_ancillary_info_type_v01 *ai;

	u8 ack_req = ind->eod_ack_reqd_valid ? ind->eod_ack_reqd : 0;

	int i;

	u32 ancillary;

	int i, j;



	if (unlikely(svc_ind->data->restart_state)) {

		kfree(svc_ind);
@@ -689,12 +797,27 @@ static void dfc_do_burst_flow_control(struct work_struct *work) 


	for (i = 0; i < ind->flow_status_len; i++) {

		flow_status = &ind->flow_status[i];



		ancillary = 0;

		if (ind->ancillary_info_valid) {

			for (j = 0; j < ind->ancillary_info_len; j++) {

				ai = &ind->ancillary_info[j];

				if (ai->mux_id == flow_status->mux_id &&

				    ai->bearer_id == flow_status->bearer_id) {

					ancillary = ai->reserved;

					break;

				}

			}

		}



		trace_dfc_flow_ind(svc_ind->data->index,

				   i, flow_status->mux_id,

				   flow_status->bearer_id,

				   flow_status->num_bytes,

				   flow_status->seq_num,

				   ack_req);

				   ack_req,

				   ancillary);



		dev = rmnet_get_rmnet_dev(svc_ind->data->rmnet_port,

					  flow_status->mux_id);

		if (!dev)
@@ -708,9 +831,10 @@ static void dfc_do_burst_flow_control(struct work_struct *work) 


		if (unlikely(flow_status->bearer_id == 0xFF))

			dfc_all_bearer_flow_ctl(

				dev, qos, ack_req, flow_status);

				dev, qos, ack_req, ancillary, flow_status);

		else

			dfc_update_fc_map(dev, qos, ack_req, flow_status);

			dfc_update_fc_map(

				dev, qos, ack_req, ancillary, flow_status);



		spin_unlock_bh(&qos->qos_lock);

	}

drivers/soc/qcom/qmi_rmnet.c

+1 −0
Original line number Diff line number Diff line
@@ -533,6 +533,7 @@ void qmi_rmnet_enable_all_flows(struct net_device *dev) 
		bearer->grant_thresh = qmi_rmnet_grant_per(DEFAULT_GRANT);

		bearer->seq = 0;

		bearer->ack_req = 0;

		bearer->ancillary = 0;

		do_wake = 1;

	}

drivers/soc/qcom/qmi_rmnet_i.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct rmnet_bearer_map { 
	u8  ack_req;

	u32 grant_before_ps;

	u16 seq_before_ps;

	u32 ancillary;

};



struct svc_info {

include/trace/events/dfc.h

+8 −5
Original line number Diff line number Diff line
@@ -55,9 +55,10 @@ TRACE_EVENT(dfc_qmi_tc, 
TRACE_EVENT(dfc_flow_ind,



	TP_PROTO(int src, int idx, u8 mux_id, u8 bearer_id, u32 grant,

		 u16 seq_num, u8 ack_req),

		 u16 seq_num, u8 ack_req, u32 ancillary),



	TP_ARGS(src, idx, mux_id, bearer_id, grant, seq_num, ack_req),

	TP_ARGS(src, idx, mux_id, bearer_id, grant, seq_num, ack_req,

		ancillary),



	TP_STRUCT__entry(

		__field(int, src)
@@ -67,6 +68,7 @@ TRACE_EVENT(dfc_flow_ind, 
		__field(u32, grant)

		__field(u16, seq)

		__field(u8, ack_req)

		__field(u32, ancillary)

	),



	TP_fast_assign(
@@ -77,12 +79,13 @@ TRACE_EVENT(dfc_flow_ind, 
		__entry->grant = grant;

		__entry->seq = seq_num;

		__entry->ack_req = ack_req;

		__entry->ancillary = ancillary;

	),



	TP_printk("src=%d idx[%d]: mux_id=%u bearer_id=%u grant=%u "

		  "seq_num=%u ack_req=%u",

	TP_printk("src=%d [%d]: mid=%u bid=%u grant=%u seq=%u ack=%u anc=%u",

		__entry->src, __entry->idx, __entry->mid, __entry->bid,

		__entry->grant, __entry->seq, __entry->ack_req)

		__entry->grant, __entry->seq, __entry->ack_req,

		__entry->ancillary)

);



TRACE_EVENT(dfc_flow_check,