Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
qctecmdr 2019-12-10 07:14:55 -08:00 • committed by Gerrit - the friendly Code Review server
commit 041ae774be
2 changed files with 35 additions and 3 deletions
drivers/usb
dwc3
dwc3-msm.c
gadget/function
f_gsi.c

25
drivers/usb/dwc3/dwc3-msm.c
View file

@ -1504,6 +1504,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;
@ -1512,12 +1517,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);
@ -1530,6 +1545,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:
@ -1537,6 +1557,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;

13
drivers/usb/gadget/function/f_gsi.c
View file

@ -843,8 +843,10 @@ static int gsi_ep_enable(struct f_gsi *gsi)
return ret;
log_event_dbg("%s: Enable IN ep", __func__);
usb_gsi_ep_op(gsi->d_port.in_ep,
&gsi->d_port.in_request, GSI_EP_OP_CONFIG);
ret = usb_gsi_ep_op(gsi->d_port.in_ep,
&gsi->d_port.in_request, GSI_EP_OP_CONFIG);
if (ret)
return ret;
}
if (gsi->d_port.out_ep && !gsi->d_port.out_ep->desc) {
@ -854,8 +856,13 @@ static int gsi_ep_enable(struct f_gsi *gsi)
return ret;
log_event_dbg("%s: Enable OUT ep", __func__);
usb_gsi_ep_op(gsi->d_port.out_ep,
ret = usb_gsi_ep_op(gsi->d_port.out_ep,
&gsi->d_port.out_request, GSI_EP_OP_CONFIG);
if (ret) {
usb_gsi_ep_op(gsi->d_port.in_ep,
&gsi->d_port.in_request, GSI_EP_OP_DISABLE);
return ret;
}
}
return 0;