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

Commit 91c94bf5 authored by Pratham Pratap's avatar Pratham Pratap Committed by Gerrit - the friendly Code Review server
Browse files

usb: f_gsi: Avoid gsi ep operations if run/stop is cleared 



The GSI operations for GSI_EP_OP_PREPARE_TRBS and GSI_EP_OP_STARTXFER
should not proceed if run/stop is cleared. Since ipa_work_handler runs
in worqueue context there might be a race between run/stop STARTXFER
and ENDXFER which can lead to SMMU fault. This change add checks to
avoid gsi ep operations when run/stop is cleared.

Change-Id: I9f64dee7020aec9cccfde8d247c0b53d9cc1f234
Signed-off-by: default avatarPratham Pratap <prathampratap@codeaurora.org>
parent 6404500c

drivers/usb/dwc3/dwc3-msm.c

+25 −0
Original line number Diff line number Diff line
@@ -1519,6 +1519,11 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep, 


	switch (op) {

	case GSI_EP_OP_PREPARE_TRBS:

		if (!dwc->pullups_connected) {

			dbg_log_string("No Pullup\n");

			return -ESHUTDOWN;

		}



		request = (struct usb_gsi_request *)op_data;

		ret = gsi_prepare_trbs(ep, request);

		break;
@@ -1527,12 +1532,22 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep, 
		gsi_free_trbs(ep, request);

		break;

	case GSI_EP_OP_CONFIG:

		if (!dwc->pullups_connected) {

			dbg_log_string("No Pullup\n");

			return -ESHUTDOWN;

		}



		request = (struct usb_gsi_request *)op_data;

		spin_lock_irqsave(&dwc->lock, flags);

		gsi_configure_ep(ep, request);

		spin_unlock_irqrestore(&dwc->lock, flags);

		break;

	case GSI_EP_OP_STARTXFER:

		if (!dwc->pullups_connected) {

			dbg_log_string("No Pullup\n");

			return -ESHUTDOWN;

		}



		spin_lock_irqsave(&dwc->lock, flags);

		ret = gsi_startxfer_for_ep(ep);

		spin_unlock_irqrestore(&dwc->lock, flags);
@@ -1545,6 +1560,11 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep, 
		gsi_store_ringbase_dbl_info(ep, request);

		break;

	case GSI_EP_OP_ENABLE_GSI:

		if (!dwc->pullups_connected) {

			dbg_log_string("No Pullup\n");

			return -ESHUTDOWN;

		}



		gsi_enable(ep);

		break;

	case GSI_EP_OP_GET_CH_INFO:
@@ -1552,6 +1572,11 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep, 
		gsi_get_channel_info(ep, ch_info);

		break;

	case GSI_EP_OP_RING_DB:

		if (!dwc->pullups_connected) {

			dbg_log_string("No Pullup\n");

			return -ESHUTDOWN;

		}



		request = (struct usb_gsi_request *)op_data;

		gsi_ring_db(ep, request);

		break;