Merge "usb: f_gsi: Add error checking for PREPARE_TRBS and STARTXFER ops" (4df27821) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/usb/dwc3/dwc3-msm.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -936,6 +936,11 @@ static int gsi_startxfer_for_ep(struct usb_ep *ep)
		struct dwc3_ep *dep = to_dwc3_ep(ep);
		struct dwc3 *dwc = dep->dwc;

		if (!(dep->flags & DWC3_EP_ENABLED)) {
		dbg_log_string("ep:%s disabled\n", ep->name);
		return -ESHUTDOWN;
		}

		memset(&params, 0, sizeof(params));
		params.param0 = GSI_TRB_ADDR_BIT_53_MASK \| GSI_TRB_ADDR_BIT_55_MASK;
		params.param0 \|= (ep->ep_intr_num << 16);
		@@ -1111,6 +1116,11 @@ static int gsi_prepare_trbs(struct usb_ep ep, struct usb_gsi_request req)
		struct scatterlist *sg;
		struct sg_table *sgt;

		if (!(dep->flags & DWC3_EP_ENABLED)) {
		dbg_log_string("ep:%s disabled\n", ep->name);
		return -ESHUTDOWN;
		}

		dep->trb_pool = dma_zalloc_coherent(dwc->sysdev,
		num_trbs * sizeof(struct dwc3_trb),
		&dep->trb_pool_dma, GFP_KERNEL);

+28 −4

Original line number	Diff line number	Diff line
		@@ -552,10 +552,22 @@ static int ipa_connect_channels(struct gsi_data_port *d_port)
		struct ipa_req_chan_out_params ipa_out_channel_out_params;

		log_event_dbg("%s: USB GSI IN OPS", __func__);
		usb_gsi_ep_op(d_port->in_ep, &d_port->in_request,
		ret = usb_gsi_ep_op(d_port->in_ep, &d_port->in_request,
		GSI_EP_OP_PREPARE_TRBS);
		usb_gsi_ep_op(d_port->in_ep, &d_port->in_request,
		if (ret) {
		log_event_err("%s: GSI_EP_OP_PREPARE_TRBS failed: %d\n",
		__func__, ret);
		return ret;
		}

		ret = usb_gsi_ep_op(d_port->in_ep, &d_port->in_request,
		GSI_EP_OP_STARTXFER);
		if (ret) {
		log_event_err("%s: GSI_EP_OP_STARTXFER failed: %d\n",
		__func__, ret);
		return ret;
		}

		d_port->in_xfer_rsc_index = usb_gsi_ep_op(d_port->in_ep, NULL,
		GSI_EP_OP_GET_XFER_IDX);

		@@ -596,10 +608,22 @@ static int ipa_connect_channels(struct gsi_data_port *d_port)

		if (d_port->out_ep) {
		log_event_dbg("%s: USB GSI OUT OPS", __func__);
		usb_gsi_ep_op(d_port->out_ep, &d_port->out_request,
		ret = usb_gsi_ep_op(d_port->out_ep, &d_port->out_request,
		GSI_EP_OP_PREPARE_TRBS);
		usb_gsi_ep_op(d_port->out_ep, &d_port->out_request,
		if (ret) {
		log_event_err("%s: GSI_EP_OP_PREPARE_TRBS failed: %d\n",
		__func__, ret);
		return ret;
		}

		ret = usb_gsi_ep_op(d_port->out_ep, &d_port->out_request,
		GSI_EP_OP_STARTXFER);
		if (ret) {
		log_event_err("%s: GSI_EP_OP_STARTXFER failed: %d\n",
		__func__, ret);
		return ret;
		}

		d_port->out_xfer_rsc_index =
		usb_gsi_ep_op(d_port->out_ep,
		NULL, GSI_EP_OP_GET_XFER_IDX);