Merge "USB: dwc3-msm: Perform DBM config/unconfig under spinlock protection" (6f681a62) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/dbm.c

+4 −20

Original line number	Diff line number	Diff line
		@@ -192,7 +192,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 */
		}

		@@ -312,9 +312,6 @@ int dbm_ep_config(struct dbm *dbm, u8 usb_ep, u8 bam_pipe, bool producer,
		return -ENODEV;
		}

		/* First, reset the dbm endpoint */
		ep_soft_reset(dbm, dbm_ep, 0);

		/* Set ioc bit for dbm_ep if needed */
		msm_dbm_write_reg_field(dbm, DBM_DBG_CNFG,
		DBM_ENABLE_IOC_MASK & 1 << dbm_ep, ioc ? 1 : 0);
		@@ -381,7 +378,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;
		}

		@@ -391,23 +388,10 @@ int dbm_ep_unconfig(struct dbm *dbm, u8 usb_ep)
		data &= (~0x1);
		msm_dbm_write_ep_reg(dbm, DBM_EP_CFG, dbm_ep, data);

		/* Reset the dbm endpoint */
		ep_soft_reset(dbm, dbm_ep, true);
		/*
		* The necessary delay between asserting and deasserting the dbm ep
		* reset is based on the number of active endpoints. If there is more
		* than one endpoint, a 1 msec delay is required. Otherwise, a shorter
		* delay will suffice.
		*
		* As this function can be called in atomic context, sleeping variants
		* for delay are not possible - albeit a 1ms delay.
		* ep_soft_reset is not required during disconnect as pipe reset on
		* next connect will take care of the same.
		*/
		if (dbm_get_num_of_eps_configured(dbm) > 1)
		udelay(1000);
		else
		udelay(10);
		ep_soft_reset(dbm, dbm_ep, false);

		return 0;
		}

drivers/usb/dwc3/dwc3-msm.c

+123 −70

Original line number	Diff line number	Diff line
		@@ -697,59 +697,90 @@ static int dwc3_msm_ep_queue(struct usb_ep *ep,
		struct dwc3_msm_req_complete *req_complete;
		unsigned long flags;
		int ret = 0, size;
		u8 bam_pipe;
		bool producer;
		bool disable_wb;
		bool internal_mem;
		bool ioc;
		bool superspeed;

		/*
		* We must obtain the lock of the dwc3 core driver,
		* including disabling interrupts, so we will be sure
		* that we are the only ones that configure the HW device
		* core and ensure that we queuing the request will finish
		* as soon as possible so we will release back the lock.
		*/
		spin_lock_irqsave(&dwc->lock, flags);
		if (!dep->endpoint.desc) {
		dev_err(mdwc->dev,
		"%s: trying to queue request %p to disabled ep %s\n",
		__func__, request, ep->name);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EPERM;
		}

		if (!mdwc->original_ep_ops[dep->number]) {
		dev_err(mdwc->dev,
		"ep [%s,%d] was unconfigured as msm endpoint\n",
		ep->name, dep->number);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EINVAL;
		}

		if (!request) {
		dev_err(mdwc->dev, "%s: request is NULL\n", __func__);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EINVAL;
		}

		if (!(request->udc_priv & MSM_SPS_MODE)) {
		/* Not SPS mode, call original queue */
		dev_vdbg(mdwc->dev, "%s: not sps mode, use regular queue\n",
		dev_err(mdwc->dev, "%s: sps mode is not set\n",
		__func__);

		return (mdwc->original_ep_ops[dep->number])->queue(ep,
		request,
		gfp_flags);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EINVAL;
		}

		/* HW restriction regarding TRB size (8KB) */
		if (req->request.length < 0x2000) {
		dev_err(mdwc->dev, "%s: Min TRB size is 8KB\n", __func__);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EINVAL;
		}

		if (dep->number == 0 \|\| dep->number == 1) {
		dev_err(mdwc->dev,
		"%s: trying to queue dbm request %p to control ep %s\n",
		__func__, request, ep->name);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EPERM;
		}

		if (dep->trb_dequeue != dep->trb_enqueue
		\|\| !list_empty(&dep->pending_list)
		\|\| !list_empty(&dep->started_list)) {
		dev_err(mdwc->dev,
		"%s: trying to queue dbm request %p tp ep %s\n",
		__func__, request, ep->name);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EPERM;
		}
		dep->trb_dequeue = 0;
		dep->trb_enqueue = 0;

		/*
		* Override req->complete function, but before doing that,
		* store it's original pointer in the req_complete_list.
		*/
		req_complete = kzalloc(sizeof(*req_complete), gfp_flags);
		if (!req_complete)

		if (!req_complete) {
		dev_err(mdwc->dev, "%s: not enough memory\n", __func__);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -ENOMEM;
		}

		req_complete->req = request;
		req_complete->orig_complete = request->complete;
		list_add_tail(&req_complete->list_item, &mdwc->req_complete_list);
		request->complete = dwc3_msm_req_complete_func;

		/*
		* Configure the DBM endpoint
		*/
		bam_pipe = request->udc_priv & MSM_PIPE_ID_MASK;
		producer = ((request->udc_priv & MSM_PRODUCER) ? true : false);
		disable_wb = ((request->udc_priv & MSM_DISABLE_WB) ? true : false);
		internal_mem = ((request->udc_priv & MSM_INTERNAL_MEM) ? true : false);
		ioc = ((request->udc_priv & MSM_ETD_IOC) ? true : false);

		ret = dbm_ep_config(mdwc->dbm, dep->number, bam_pipe, producer,
		disable_wb, internal_mem, ioc);
		if (ret < 0) {
		dev_err(mdwc->dev,
		"error %d after calling dbm_ep_config\n", ret);
		return ret;
		}

		dev_vdbg(dwc->dev, "%s: queing request %p to ep %s length %d\n",
		__func__, request, ep->name, request->length);
		size = dwc3_msm_read_reg(mdwc->base, DWC3_GEVNTSIZ(0));
		@@ -758,44 +789,6 @@ static int dwc3_msm_ep_queue(struct usb_ep *ep,
		dwc3_msm_read_reg(mdwc->base, DWC3_GEVNTADRHI(0)),
		DWC3_GEVNTSIZ_SIZE(size));

		/*
		* We must obtain the lock of the dwc3 core driver,
		* including disabling interrupts, so we will be sure
		* that we are the only ones that configure the HW device
		* core and ensure that we queuing the request will finish
		* as soon as possible so we will release back the lock.
		*/
		spin_lock_irqsave(&dwc->lock, flags);
		if (!dep->endpoint.desc) {
		dev_err(mdwc->dev,
		"%s: trying to queue request %p to disabled ep %s\n",
		__func__, request, ep->name);
		ret = -EPERM;
		goto err;
		}

		if (dep->number == 0 \|\| dep->number == 1) {
		dev_err(mdwc->dev,
		"%s: trying to queue dbm request %p to control ep %s\n",
		__func__, request, ep->name);
		ret = -EPERM;
		goto err;
		}


		if (dep->trb_dequeue != dep->trb_enqueue \|\|
		!list_empty(&dep->pending_list)
		\|\| !list_empty(&dep->started_list)) {
		dev_err(mdwc->dev,
		"%s: trying to queue dbm request %p tp ep %s\n",
		__func__, request, ep->name);
		ret = -EPERM;
		goto err;
		} else {
		dep->trb_dequeue = 0;
		dep->trb_enqueue = 0;
		}

		ret = __dwc3_msm_ep_queue(dep, req);
		if (ret < 0) {
		dev_err(mdwc->dev,
		@@ -1471,37 +1464,68 @@ static int dwc3_msm_gsi_ep_op(struct usb_ep *ep,
		*
		* @return int - 0 on success, negetive on error.
		*/
		int msm_ep_config(struct usb_ep *ep)
		int msm_ep_config(struct usb_ep ep, struct usb_request request)
		{
		struct dwc3_ep *dep = to_dwc3_ep(ep);
		struct dwc3 *dwc = dep->dwc;
		struct dwc3_msm *mdwc = dev_get_drvdata(dwc->dev->parent);
		struct usb_ep_ops *new_ep_ops;
		int ret = 0;
		u8 bam_pipe;
		bool producer;
		bool disable_wb;
		bool internal_mem;
		bool ioc;
		unsigned long flags;


		spin_lock_irqsave(&dwc->lock, flags);
		/* Save original ep ops for future restore*/
		if (mdwc->original_ep_ops[dep->number]) {
		dev_err(mdwc->dev,
		"ep [%s,%d] already configured as msm endpoint\n",
		ep->name, dep->number);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EPERM;
		}
		mdwc->original_ep_ops[dep->number] = ep->ops;

		/* Set new usb ops as we like */
		new_ep_ops = kzalloc(sizeof(struct usb_ep_ops), GFP_ATOMIC);
		if (!new_ep_ops)
		if (!new_ep_ops) {
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -ENOMEM;
		}

		(new_ep_ops) = (ep->ops);
		new_ep_ops->queue = dwc3_msm_ep_queue;
		new_ep_ops->gsi_ep_op = dwc3_msm_gsi_ep_op;
		ep->ops = new_ep_ops;

		if (!mdwc->dbm \|\| !request \|\| (dep->endpoint.ep_type == EP_TYPE_GSI)) {
		spin_unlock_irqrestore(&dwc->lock, flags);
		return 0;
		}

		/*
		* Do HERE more usb endpoint configurations
		* which are specific to MSM.
		* Configure the DBM endpoint if required.
		*/
		bam_pipe = request->udc_priv & MSM_PIPE_ID_MASK;
		producer = ((request->udc_priv & MSM_PRODUCER) ? true : false);
		disable_wb = ((request->udc_priv & MSM_DISABLE_WB) ? true : false);
		internal_mem = ((request->udc_priv & MSM_INTERNAL_MEM) ? true : false);
		ioc = ((request->udc_priv & MSM_ETD_IOC) ? true : false);

		ret = dbm_ep_config(mdwc->dbm, dep->number, bam_pipe, producer,
		disable_wb, internal_mem, ioc);
		if (ret < 0) {
		dev_err(mdwc->dev,
		"error %d after calling dbm_ep_config\n", ret);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return ret;
		}

		spin_unlock_irqrestore(&dwc->lock, flags);

		return 0;
		}
		@@ -1522,12 +1546,15 @@ int msm_ep_unconfig(struct usb_ep *ep)
		struct dwc3 *dwc = dep->dwc;
		struct dwc3_msm *mdwc = dev_get_drvdata(dwc->dev->parent);
		struct usb_ep_ops *old_ep_ops;
		unsigned long flags;

		spin_lock_irqsave(&dwc->lock, flags);
		/* Restore original ep ops */
		if (!mdwc->original_ep_ops[dep->number]) {
		dev_err(mdwc->dev,
		"ep [%s,%d] was not configured as msm endpoint\n",
		ep->name, dep->number);
		spin_unlock_irqrestore(&dwc->lock, flags);
		return -EINVAL;
		}
		old_ep_ops = (struct usb_ep_ops *)ep->ops;
		@@ -1539,6 +1566,32 @@ 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)) {
		spin_unlock_irqrestore(&dwc->lock, flags);
		return 0;
		}

		if (dep->trb_dequeue == dep->trb_enqueue
		&& list_empty(&dep->pending_list)
		&& list_empty(&dep->started_list)) {
		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 (dbm_get_num_of_eps_configured(mdwc->dbm) == 0 &&
		!dbm_reset_ep_after_lpm(mdwc->dbm))
		dbm_event_buffer_config(mdwc->dbm, 0, 0, 0);
		}

		spin_unlock_irqrestore(&dwc->lock, flags);

		return 0;
		}

drivers/usb/gadget/function/f_gsi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2380,7 +2380,7 @@ static int gsi_update_function_bind_params(struct f_gsi *gsi,
		if (!ep)
		goto fail;
		gsi->d_port.in_ep = ep;
		msm_ep_config(gsi->d_port.in_ep);
		msm_ep_config(gsi->d_port.in_ep, NULL);
		ep->driver_data = cdev; /* claim */
		}

		@@ -2390,7 +2390,7 @@ static int gsi_update_function_bind_params(struct f_gsi *gsi,
		if (!ep)
		goto fail;
		gsi->d_port.out_ep = ep;
		msm_ep_config(gsi->d_port.out_ep);
		msm_ep_config(gsi->d_port.out_ep, NULL);
		ep->driver_data = cdev; /* claim */
		}

drivers/usb/gadget/function/u_data_ipa.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -477,7 +477,7 @@ static void ipa_data_connect_work(struct work_struct *w)
		configure_fifo(port->usb_bam_type,
		port->src_connection_idx,
		port->port_usb->out);
		ret = msm_ep_config(gport->out);
		ret = msm_ep_config(gport->out, port->rx_req);
		if (ret) {
		pr_err("msm_ep_config() failed for OUT EP\n");
		spin_unlock_irqrestore(&port->port_lock, flags);
		@@ -502,7 +502,7 @@ static void ipa_data_connect_work(struct work_struct *w)
		port->tx_req->udc_priv = sps_params;
		configure_fifo(port->usb_bam_type,
		port->dst_connection_idx, gport->in);
		ret = msm_ep_config(gport->in);
		ret = msm_ep_config(gport->in, port->tx_req);
		if (ret) {
		pr_err("msm_ep_config() failed for IN EP\n");
		spin_unlock_irqrestore(&port->port_lock, flags);

drivers/usb/gadget/function/u_qdss.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -131,11 +131,12 @@ int set_qdss_data_connection(struct f_qdss *qdss, int enable)

		static int init_data(struct usb_ep *ep)
		{
		struct f_qdss *qdss = ep->driver_data;
		int res = 0;

		pr_debug("init_data\n");

		res = msm_ep_config(ep);
		res = msm_ep_config(ep, qdss->endless_req);
		if (res)
		pr_err("msm_ep_config failed\n");