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

Commit d171201f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: f_gsi: Add module param to change the OUT aggregation"

parents bced92b0 c60d0113

drivers/usb/gadget/function/f_gsi.c

+18 −8
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ module_param(gsi_in_aggr_size, uint, S_IRUGO | S_IWUSR); 
MODULE_PARM_DESC(gsi_in_aggr_size,

		"Aggr size of bus transfer to host");



static unsigned int ul_aggr_size = GSI_OUT_BUFF_SIZE;

module_param(ul_aggr_size, uint, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(ul_aggr_size,

		"Max size of bus transfer to device");

static unsigned int gsi_out_aggr_size;

module_param(gsi_out_aggr_size, uint, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(gsi_out_aggr_size,

		"Aggr size of bus transfer to device");



static unsigned int num_in_bufs = GSI_NUM_IN_BUFFERS;

module_param(num_in_bufs, uint, S_IRUGO | S_IWUSR);
@@ -495,6 +495,12 @@ static int ipa_connect_channels(struct gsi_data_port *d_port) 
	conn_params->ipa_to_usb_xferrscidx_valid = true;

	conn_params->teth_prot = gsi->prot_id;

	conn_params->teth_prot_params.max_xfer_size_bytes_to_dev = 23700;

	if (gsi_out_aggr_size)

		conn_params->teth_prot_params.max_xfer_size_bytes_to_dev

				= gsi_out_aggr_size;

	else

		conn_params->teth_prot_params.max_xfer_size_bytes_to_dev

				= d_port->out_aggr_size;

	if (gsi_in_aggr_size)

		conn_params->teth_prot_params.max_xfer_size_bytes_to_host

					= gsi_in_aggr_size;
@@ -2488,7 +2494,8 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		gsi->d_port.in_aggr_size = GSI_IN_RNDIS_AGGR_SIZE;

		info.in_req_num_buf = num_in_bufs;

		info.out_req_buf_len = ul_aggr_size;

		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_AGGR_SIZE;

		info.out_req_num_buf = num_out_bufs;

		info.notify_buf_len = sizeof(struct usb_cdc_notification);
@@ -2553,7 +2560,8 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		gsi->d_port.in_aggr_size = GSI_IN_MBIM_AGGR_SIZE;

		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		info.in_req_num_buf = num_in_bufs;

		info.out_req_buf_len = 0x4000;

		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_MBIM_BUF_LEN;

		info.out_req_num_buf = num_out_bufs;

		info.notify_buf_len = sizeof(struct usb_cdc_notification);

		mbim_gsi_desc.wMaxSegmentSize = cpu_to_le16(0x800);
@@ -2591,7 +2599,8 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		gsi->d_port.in_aggr_size = GSI_IN_RMNET_AGGR_SIZE;

		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		info.in_req_num_buf = num_in_bufs;

		info.out_req_buf_len = 16384;

		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_RMNET_BUF_LEN;

		info.out_req_num_buf = num_out_bufs;

		info.notify_buf_len = sizeof(struct usb_cdc_notification);

		break;
@@ -2620,7 +2629,8 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		gsi->d_port.in_aggr_size = GSI_IN_ECM_AGGR_SIZE;

		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		info.in_req_num_buf = num_in_bufs;

		info.out_req_buf_len = 2048;

		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_ECM_BUF_LEN;

		info.out_req_num_buf = num_out_bufs;

		info.notify_buf_len = GSI_CTRL_NOTIFY_BUFF_LEN;

include/linux/usb/f_gsi.h

+6 −1
Original line number Diff line number Diff line
@@ -23,13 +23,17 @@ 
#define GSI_NUM_IN_BUFFERS 7

#define GSI_IN_BUFF_SIZE 2048

#define GSI_NUM_OUT_BUFFERS 7

#define GSI_OUT_BUFF_SIZE 24576

#define GSI_OUT_AGGR_SIZE 24576



#define GSI_IN_RNDIS_AGGR_SIZE 9216

#define GSI_IN_MBIM_AGGR_SIZE 16384

#define GSI_IN_RMNET_AGGR_SIZE 16384

#define GSI_IN_ECM_AGGR_SIZE 2048



#define GSI_OUT_MBIM_BUF_LEN 16384

#define GSI_OUT_RMNET_BUF_LEN 16384

#define GSI_OUT_ECM_BUF_LEN 2048



#define GSI_IPA_READY_TIMEOUT 5000



#define ETH_ADDR_STR_LEN 14
@@ -182,6 +186,7 @@ struct gsi_data_port { 
	u16 in_last_trb_addr;

	u16 cdc_filter;

	u32 in_aggr_size;

	u32 out_aggr_size;



	bool ipa_ready;

	bool net_ready_trigger;