Merge "usb: f_gsi: Clean up low memory buffer size/depth definitions" (6a7f9fe1) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/gadget/function/f_gsi.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -3010,15 +3010,9 @@ static int gsi_bind(struct usb_configuration c, struct usb_function f)
		info.ss_desc_hdr = gsi_eth_ss_function;
		info.in_epname = "gsi-epin";
		info.out_epname = "gsi-epout";
		#ifdef CONFIG_USB_LOW_MEM_VARIANT
		info.in_req_buf_len = GSI_IN_BUFF_SIZE;
		gsi->d_port.in_aggr_size = GSI_IN_LOW_MEM_RNDIS_AGGR_SIZE;
		info.in_req_num_buf = GSI_NUM_IN_BUFFERS;
		#else
		info.in_req_buf_len = GSI_IN_RNDIS_BUFF_SIZE;
		gsi->d_port.in_aggr_size = GSI_IN_RNDIS_AGGR_SIZE;
		info.in_req_num_buf = GSI_NUM_IN_RNDIS_BUFFERS;
		#endif
		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;
		info.out_req_buf_len = GSI_OUT_AGGR_SIZE;
		info.out_req_num_buf = GSI_NUM_OUT_BUFFERS;
		@@ -3196,15 +3190,9 @@ static int gsi_bind(struct usb_configuration c, struct usb_function f)
		info.in_epname = "gsi-epin";
		info.out_epname = "gsi-epout";
		gsi->d_port.in_aggr_size = GSI_IN_RMNET_AGGR_SIZE;
		#ifdef CONFIG_USB_LOW_MEM_VARIANT
		info.in_req_buf_len = GSI_IN_BUFF_SIZE;
		info.in_req_num_buf = GSI_NUM_IN_BUFFERS;
		info.out_req_buf_len = GSI_OUT_LOW_MEM_RMNET_BUF_LEN;
		#else
		info.in_req_buf_len = GSI_IN_RMNET_BUFF_SIZE;
		info.in_req_num_buf = GSI_NUM_IN_RMNET_BUFFERS;
		info.out_req_buf_len = GSI_OUT_RMNET_BUF_LEN;
		#endif
		gsi->d_port.out_aggr_size = GSI_OUT_AGGR_SIZE;
		info.out_req_num_buf = GSI_NUM_OUT_BUFFERS;
		info.notify_buf_len = sizeof(struct usb_cdc_notification);

+18 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,24 @@
		#define GSI_IN_RMNET_AGGR_SIZE 16384
		#define GSI_ECM_AGGR_SIZE 2048

		#define GSI_IN_LOW_MEM_RNDIS_AGGR_SIZE 9216
		#define GSI_OUT_LOW_MEM_RMNET_BUF_LEN 16384
		#ifdef CONFIG_USB_LOW_MEM_VARIANT
		# undef GSI_IN_RNDIS_BUFF_SIZE
		# define GSI_IN_RNDIS_BUFF_SIZE GSI_IN_BUFF_SIZE
		# undef GSI_IN_RNDIS_AGGR_SIZE
		# define GSI_IN_RNDIS_AGGR_SIZE 9216
		# undef GSI_NUM_IN_RNDIS_BUFFERS
		# define GSI_NUM_IN_RNDIS_BUFFERS GSI_NUM_IN_BUFFERS

		# undef GSI_IN_RMNET_BUFF_SIZE
		# define GSI_IN_RMNET_BUFF_SIZE GSI_IN_BUFF_SIZE
		# undef GSI_NUM_IN_RMNET_BUFFERS
		# define GSI_NUM_IN_RMNET_BUFFERS GSI_NUM_IN_BUFFERS
		# undef GSI_OUT_RMNET_BUF_LEN
		# define GSI_OUT_RMNET_BUF_LEN 16384

		# undef GSI_NUM_IN_DPL_BUFFERS
		# define GSI_NUM_IN_DPL_BUFFERS 15
		#endif

		#define GSI_OUT_MBIM_BUF_LEN 16384
		#define GSI_OUT_RMNET_BUF_LEN 31744