hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'chipidea-stable' into usb-linus 

Chipidea patches for 3.6

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-09-12 11:12:31 -07:00
parent ba9edaa468 db89960e50
commit 38bb2ca69d
1 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/usb/chipidea/udc.c
View File

@ -78,8 +78,7 @@ static inline int ep_to_bit(struct ci13xxx *ci, int n)
} }
/** /**
* hw_device_state: enables/disables interrupts & starts/stops device (execute * hw_device_state: enables/disables interrupts (execute without interruption)
* without interruption)
* @dma: 0 => disable, !0 => enable and set dma engine * @dma: 0 => disable, !0 => enable and set dma engine
* *
* This function returns an error code * This function returns an error code
@ -91,9 +90,7 @@ static int hw_device_state(struct ci13xxx *ci, u32 dma)
/* interrupt, error, port change, reset, sleep/suspend */ /* interrupt, error, port change, reset, sleep/suspend */
hw_write(ci, OP_USBINTR, ~0, hw_write(ci, OP_USBINTR, ~0,
USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI); USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI);
hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);
} else { } else {
hw_write(ci, OP_USBCMD, USBCMD_RS, 0);
hw_write(ci, OP_USBINTR, ~0, 0); hw_write(ci, OP_USBINTR, ~0, 0);
} }
return 0; return 0;
@ -774,10 +771,7 @@ __acquires(mEp->lock)
{ {
struct ci13xxx_req *mReq, *mReqTemp; struct ci13xxx_req *mReq, *mReqTemp;
struct ci13xxx_ep *mEpTemp = mEp; struct ci13xxx_ep *mEpTemp = mEp;
int uninitialized_var(retval); int retval = 0;
if (list_empty(&mEp->qh.queue))
return -EINVAL;
list_for_each_entry_safe(mReq, mReqTemp, &mEp->qh.queue, list_for_each_entry_safe(mReq, mReqTemp, &mEp->qh.queue,
queue) { queue) {
@ -1420,6 +1414,21 @@ static int ci13xxx_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
return -ENOTSUPP; return -ENOTSUPP;
} }
/* Change Data+ pullup status
* this func is used by usb_gadget_connect/disconnet
*/
static int ci13xxx_pullup(struct usb_gadget *_gadget, int is_on)
{
struct ci13xxx *ci = container_of(_gadget, struct ci13xxx, gadget);
if (is_on)
hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);
else
hw_write(ci, OP_USBCMD, USBCMD_RS, 0);
return 0;
}
static int ci13xxx_start(struct usb_gadget *gadget, static int ci13xxx_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver); struct usb_gadget_driver *driver);
static int ci13xxx_stop(struct usb_gadget *gadget, static int ci13xxx_stop(struct usb_gadget *gadget,
@ -1432,6 +1441,7 @@ static int ci13xxx_stop(struct usb_gadget *gadget,
static const struct usb_gadget_ops usb_gadget_ops = { static const struct usb_gadget_ops usb_gadget_ops = {
.vbus_session = ci13xxx_vbus_session, .vbus_session = ci13xxx_vbus_session,
.wakeup = ci13xxx_wakeup, .wakeup = ci13xxx_wakeup,
.pullup = ci13xxx_pullup,
.vbus_draw = ci13xxx_vbus_draw, .vbus_draw = ci13xxx_vbus_draw,
.udc_start = ci13xxx_start, .udc_start = ci13xxx_start,
.udc_stop = ci13xxx_stop, .udc_stop = ci13xxx_stop,
@ -1455,7 +1465,12 @@ static int init_eps(struct ci13xxx *ci)
mEp->ep.name = mEp->name; mEp->ep.name = mEp->name;
mEp->ep.ops = &usb_ep_ops; mEp->ep.ops = &usb_ep_ops;
mEp->ep.maxpacket = CTRL_PAYLOAD_MAX; /*
* for ep0: maxP defined in desc, for other
* eps, maxP is set by epautoconfig() called
* by gadget layer
*/
mEp->ep.maxpacket = (unsigned short)~0;
INIT_LIST_HEAD(&mEp->qh.queue); INIT_LIST_HEAD(&mEp->qh.queue);
mEp->qh.ptr = dma_pool_alloc(ci->qh_pool, GFP_KERNEL, mEp->qh.ptr = dma_pool_alloc(ci->qh_pool, GFP_KERNEL,
@ -1475,6 +1490,7 @@ static int init_eps(struct ci13xxx *ci)
else else
ci->ep0in = mEp; ci->ep0in = mEp;
mEp->ep.maxpacket = CTRL_PAYLOAD_MAX;
continue; continue;
} }
@ -1484,6 +1500,17 @@ static int init_eps(struct ci13xxx *ci)
return retval; return retval;
} }
static void destroy_eps(struct ci13xxx *ci)
{
int i;
for (i = 0; i < ci->hw_ep_max; i++) {
struct ci13xxx_ep *mEp = &ci->ci13xxx_ep[i];
dma_pool_free(ci->qh_pool, mEp->qh.ptr, mEp->qh.dma);
}
}
/** /**
* ci13xxx_start: register a gadget driver * ci13xxx_start: register a gadget driver
* @gadget: our gadget * @gadget: our gadget
@ -1691,7 +1718,7 @@ static int udc_start(struct ci13xxx *ci)
if (ci->platdata->flags & CI13XXX_REQUIRE_TRANSCEIVER) { if (ci->platdata->flags & CI13XXX_REQUIRE_TRANSCEIVER) {
if (ci->transceiver == NULL) { if (ci->transceiver == NULL) {
retval = -ENODEV; retval = -ENODEV;
goto free_pools; goto destroy_eps;
} }
} }
@ -1729,7 +1756,7 @@ static int udc_start(struct ci13xxx *ci)
remove_trans: remove_trans:
if (!IS_ERR_OR_NULL(ci->transceiver)) { if (!IS_ERR_OR_NULL(ci->transceiver)) {
otg_set_peripheral(ci->transceiver->otg, &ci->gadget); otg_set_peripheral(ci->transceiver->otg, NULL);
if (ci->global_phy) if (ci->global_phy)
usb_put_phy(ci->transceiver); usb_put_phy(ci->transceiver);
} }
@ -1742,6 +1769,8 @@ unreg_device:
put_transceiver: put_transceiver:
if (!IS_ERR_OR_NULL(ci->transceiver) && ci->global_phy) if (!IS_ERR_OR_NULL(ci->transceiver) && ci->global_phy)
usb_put_phy(ci->transceiver); usb_put_phy(ci->transceiver);
destroy_eps:
destroy_eps(ci);
free_pools: free_pools:
dma_pool_destroy(ci->td_pool); dma_pool_destroy(ci->td_pool);
free_qh_pool: free_qh_pool:
@ -1756,18 +1785,12 @@ free_qh_pool:
*/ */
static void udc_stop(struct ci13xxx *ci) static void udc_stop(struct ci13xxx *ci)
{ {
int i;
if (ci == NULL) if (ci == NULL)
return; return;
usb_del_gadget_udc(&ci->gadget); usb_del_gadget_udc(&ci->gadget);
for (i = 0; i < ci->hw_ep_max; i++) { destroy_eps(ci);
struct ci13xxx_ep *mEp = &ci->ci13xxx_ep[i];
dma_pool_free(ci->qh_pool, mEp->qh.ptr, mEp->qh.dma);
}
dma_pool_destroy(ci->td_pool); dma_pool_destroy(ci->td_pool);
dma_pool_destroy(ci->qh_pool); dma_pool_destroy(ci->qh_pool);