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

Commit b54cd788 authored by Mayank Rana's avatar Mayank Rana
Browse files

usb: gsi: Remove module param related USB IN/OUT TRBs 



dma_pool_create() API is used with alignment factor 2 as USB GSI
wrapper expects TRB ring where number of TRBs are in power of 2.
If passed number of IN/OUT buffer(i.e. TRBs) count is not as power
of 2, it would result into crash. Hence resolve this issue by
removing these module params.

Also remove aggregation size related module param and new change
shall add this functionality with proper check using configfs
attributes for each USB GSI function.

Change-Id: I9e262c9d2a66d09a3dcbe632bf3f91db3de08633
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent 010ff9e0

drivers/usb/gadget/function/f_gsi.c

+11 −39
Original line number Diff line number Diff line
@@ -14,26 +14,6 @@ 
#include "f_gsi.h"

#include "rndis.h"



static unsigned int gsi_in_aggr_size;

module_param(gsi_in_aggr_size, uint, 0644);

MODULE_PARM_DESC(gsi_in_aggr_size,

		"Aggr size of bus transfer to host");



static unsigned int gsi_out_aggr_size;

module_param(gsi_out_aggr_size, uint, 0644);

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, 0644);

MODULE_PARM_DESC(num_in_bufs,

		"Number of IN buffers");



static unsigned int num_out_bufs = GSI_NUM_OUT_BUFFERS;

module_param(num_out_bufs, uint, 0644);

MODULE_PARM_DESC(num_out_bufs,

		"Number of OUT buffers");



static bool qti_packet_debug;

module_param(qti_packet_debug, bool, 0644);

MODULE_PARM_DESC(qti_packet_debug, "Print QTI Packet's Raw Data");
@@ -384,16 +364,8 @@ 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;

	else

	conn_params->teth_prot_params.max_xfer_size_bytes_to_host

					= d_port->in_aggr_size;

	conn_params->teth_prot_params.max_packet_number_to_dev =
@@ -2478,10 +2450,10 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.out_epname = "gsi-epout";

		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.in_req_num_buf = GSI_NUM_IN_BUFFERS;

		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.out_req_num_buf = GSI_NUM_OUT_BUFFERS;

		info.notify_buf_len = sizeof(struct usb_cdc_notification);



		params = rndis_register(gsi_rndis_response_available, gsi,
@@ -2546,10 +2518,10 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.out_epname = "gsi-epout";

		gsi->d_port.in_aggr_size = GSI_IN_MBIM_AGGR_SIZE;

		info.in_req_buf_len = GSI_IN_MBIM_AGGR_SIZE;

		info.in_req_num_buf = num_in_bufs;

		info.in_req_num_buf = GSI_NUM_IN_BUFFERS;

		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.out_req_num_buf = GSI_NUM_OUT_BUFFERS;

		info.notify_buf_len = sizeof(struct usb_cdc_notification);

		mbim_gsi_desc.wMaxSegmentSize = cpu_to_le16(0x800);
@@ -2587,10 +2559,10 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.out_epname = "gsi-epout";

		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.in_req_num_buf = GSI_NUM_IN_BUFFERS;

		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.out_req_num_buf = GSI_NUM_OUT_BUFFERS;

		info.notify_buf_len = sizeof(struct usb_cdc_notification);

		break;

	case IPA_USB_ECM:
@@ -2619,10 +2591,10 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.out_epname = "gsi-epout";

		gsi->d_port.in_aggr_size = GSI_ECM_AGGR_SIZE;

		info.in_req_buf_len = GSI_IN_BUFF_SIZE;

		info.in_req_num_buf = num_in_bufs;

		info.in_req_num_buf = GSI_NUM_IN_BUFFERS;

		gsi->d_port.out_aggr_size = GSI_ECM_AGGR_SIZE;

		info.out_req_buf_len = GSI_OUT_ECM_BUF_LEN;

		info.out_req_num_buf = num_out_bufs;

		info.out_req_num_buf = GSI_NUM_OUT_BUFFERS;

		info.notify_buf_len = GSI_CTRL_NOTIFY_BUFF_LEN;



		/* export host's Ethernet address in CDC format */
@@ -2655,7 +2627,7 @@ static int gsi_bind(struct usb_configuration *c, struct usb_function *f) 
		info.in_epname = "gsi-epin";

		info.out_epname = "";

		info.in_req_buf_len = 16384;

		info.in_req_num_buf = num_in_bufs;

		info.in_req_num_buf = GSI_NUM_IN_BUFFERS;

		info.notify_buf_len = sizeof(struct usb_cdc_notification);

		break;

	default: