Merge "USB: dwc3-msm: Disable DBM endpoint in msm_ep_unconfig if no req queued" (83009919) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/dwc3/dbm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ static int find_matching_dbm_ep(struct dbm *dbm, u8 usb_ep)
		if (dbm->ep_num_mapping[i] == usb_ep)
		return i;

		pr_err("%s: No DBM EP matches USB EP %d", __func__, usb_ep);
		pr_debug("%s: No DBM EP matches USB EP %d", __func__, usb_ep);
		return -ENODEV; /* Not found */
		}

		@@ -385,7 +385,7 @@ int dbm_ep_unconfig(struct dbm *dbm, u8 usb_ep)
		dbm_ep = find_matching_dbm_ep(dbm, usb_ep);

		if (dbm_ep < 0) {
		pr_err("usb ep index %d has no corresponding dbm ep\n", usb_ep);
		pr_debug("usb ep index %d has no corespondng dbm ep\n", usb_ep);
		return -ENODEV;
		}

+21 −0

Original line number	Diff line number	Diff line
		@@ -1436,6 +1436,27 @@ int msm_ep_unconfig(struct usb_ep *ep)
		* Do HERE more usb endpoint un-configurations
		* which are specific to MSM.
		*/
		if (!mdwc->dbm \|\| (dep->endpoint.ep_type == EP_TYPE_GSI))
		return 0;

		if (dep->busy_slot == dep->free_slot && list_empty(&dep->request_list)
		&& list_empty(&dep->req_queued)) {
		dev_dbg(mdwc->dev,
		"%s: request is not queued, disable DBM ep for ep %s\n",
		__func__, ep->name);
		/* Unconfigure dbm ep */
		dbm_ep_unconfig(mdwc->dbm, dep->number);

		/*
		* If this is the last endpoint we unconfigured, than reset also
		* the event buffers; unless unconfiguring the ep due to lpm,
		* in which case the event buffer only gets reset during the
		* block reset.
		*/
		if (0 == dbm_get_num_of_eps_configured(mdwc->dbm) &&
		!dbm_reset_ep_after_lpm(mdwc->dbm))
		dbm_event_buffer_config(mdwc->dbm, 0, 0, 0);
		}

		return 0;
		}