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

Commit cda9bd52 authored by Ajay Agarwal's avatar Ajay Agarwal
Browse files

usb: gadget: f_gsi: Use HW accelerated EP for RmNet IN EP 



Assign HW accelerated EP for RmNet LTE function IN endpoint.
Use the SW routed EP for DPL instead.

Change-Id: I8cb1e7aab8a46d7d8e56206c798c6e9988547b3d
Signed-off-by: default avatarAjay Agarwal <ajaya@codeaurora.org>
parent 19e4825d

drivers/usb/gadget/function/f_gsi.c

+7 −16
Original line number Diff line number Diff line
@@ -2444,7 +2444,6 @@ static int gsi_set_alt(struct usb_function *f, unsigned int intf, 
{

	struct f_gsi	 *gsi = func_to_gsi(f);

	struct f_gsi	 *gsi_rmnet_v2x = __gsi[USB_PROT_RMNET_V2X_IPA];

	struct f_gsi	 *gsi_ecm = __gsi[USB_PROT_ECM_IPA];

	struct usb_composite_dev *cdev = f->config->cdev;

	struct net_device	*net;

	int ret;
@@ -2525,21 +2524,14 @@ static int gsi_set_alt(struct usb_function *f, unsigned int intf, 
			 * Configure EPs for GSI. Note that:

			 * 1. In general, configure HW accelerated EPs for all

			 *    instances.

			 * 2. If both RmNet LTE and RmNet V2X instances are

			 *    enabled in a composition, configure HW accelerated

			 *    EPs for V2X and normal EPs for LTE.

			 * 3. If RmNet V2X, ECM and ADPL instances are enabled

			 *    in a composition, configure HW accelerated EPs in

			 *    both directions for V2X and IN direction for ECM.

			 *    Configure normal EPs for ECM OUT and ADPL.

			 * 2. If RmNet LTE(or ECM), RmNet V2X and ADPL instances

			 *    are enabled in a composition, configure HW

			 *    accelerated EPs in both directions for V2X and IN

			 *    direction for RmNet LTE(or ECM). Configure normal

			 *    EPs for RmNet LTE(or ECM) OUT and ADPL.

			 */

			switch (gsi->prot_id) {

			case USB_PROT_RMNET_IPA:

				if (!gsi_rmnet_v2x->function.fs_descriptors) {

					in_intr_num = 2;

					out_intr_num = 1;

				}

				break;

			case USB_PROT_ECM_IPA:

				/* If v2x is used then only IN/DL uses GSI EP */

				if (gsi_rmnet_v2x->function.fs_descriptors) {
@@ -2551,9 +2543,8 @@ static int gsi_set_alt(struct usb_function *f, unsigned int intf, 
				}

				break;

			case USB_PROT_DIAG_IPA:

				/* DPL to use normal EP if used with ECM+cv2x */

				if (!(gsi_ecm->function.fs_descriptors &&

					gsi_rmnet_v2x->function.fs_descriptors))

				/* DPL to use normal EP if used with cv2x */

				if (!gsi_rmnet_v2x->function.fs_descriptors)

					in_intr_num = 3;

				break;

			default: