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

Commit 0c9c36dd authored by Ajay Agarwal's avatar Ajay Agarwal Committed by Manu Gautam
Browse files

usb: gadget: f_gsi: use accelerated EP for ECM IN with cv2x 



Driver supports platforms that have three hardware accelerated
USB GSI endpoints.
RMNET cv2x always uses accelerated EPs, and if enabled with
RMNET LTE then HW accelerated EPs are used for cv2x and normal
EPs for LTE. And 3rd accelerated EP is used for ADPL.
If ECM is enabled with RMNET cv2x then configure HW accelerated
EP for ECM IN and normal EPs for ECM OUT and ADPL.

Change-Id: Ib9ac9f055e246005f096a249c54cc417e45d8538
Signed-off-by: default avatarAjay Agarwal <ajaya@codeaurora.org>
Signed-off-by: default avatarManu Gautam <mgautam@codeaurora.org>
parent 0118f8ac

drivers/usb/gadget/function/f_gsi.c

+44 −18
Original line number Diff line number Diff line
@@ -2429,9 +2429,12 @@ 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;

	int in_intr_num = 0;

	int out_intr_num = 0;



	log_event_dbg("intf=%u, alt=%u", intf, alt);
@@ -2504,21 +2507,49 @@ static int gsi_set_alt(struct usb_function *f, unsigned int intf, 
			}



			/*

			 * Configure EPs for GSI. Note that when both RmNet LTE

			 * (or ECM) and RmNet V2X instances are enabled in a

			 * composition, configure HW accelerated EPs for V2X

			 * instance and normal EPs for LTE (or ECM).

			 * 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.

			 */

			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) {

					in_intr_num = 3;

					out_intr_num = 0;

				} else {

					in_intr_num = 2;

					out_intr_num = 1;

				}

				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))

					in_intr_num = 3;

				break;

			default:

				in_intr_num = 2;

				out_intr_num = 1;

			}



			/* gsi_configure_ep required only for GSI-IPA EPs */

			if (gsi->d_port.in_ep &&

				gsi->prot_id <= USB_PROT_RMNET_V2X_IPA) {

				if (gsi->prot_id == USB_PROT_DIAG_IPA)

					gsi->d_port.in_ep->ep_intr_num = 3;

				else if ((gsi->prot_id == USB_PROT_RMNET_IPA ||

					 gsi->prot_id == USB_PROT_ECM_IPA) &&

					 gsi_rmnet_v2x->function.fs_descriptors)

					gsi->d_port.in_ep->ep_intr_num = 0;

				else

					gsi->d_port.in_ep->ep_intr_num = 2;

				gsi->d_port.in_ep->ep_intr_num = in_intr_num;

				usb_gsi_ep_op(gsi->d_port.in_ep,

					&gsi->d_port.in_request,

						GSI_EP_OP_CONFIG);
@@ -2526,12 +2557,7 @@ static int gsi_set_alt(struct usb_function *f, unsigned int intf, 


			if (gsi->d_port.out_ep &&

				gsi->prot_id <= USB_PROT_RMNET_V2X_IPA) {

				if ((gsi->prot_id == USB_PROT_RMNET_IPA ||

				     gsi->prot_id == USB_PROT_ECM_IPA) &&

				     gsi_rmnet_v2x->function.fs_descriptors)

					gsi->d_port.out_ep->ep_intr_num = 0;

				else

					gsi->d_port.out_ep->ep_intr_num = 1;

				gsi->d_port.out_ep->ep_intr_num = out_intr_num;

				usb_gsi_ep_op(gsi->d_port.out_ep,

					&gsi->d_port.out_request,

						GSI_EP_OP_CONFIG);