korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: udc: net2280: Remove function ep_stall

Browse Source 
irqs_superspeed calls ep_stall instead of set/clear_halt, due to a
workaround for SS seqnum. Create a function with the workaround and
call set/clear_halt instead.

This way we can compare the code of super/normal speed and it is easier
to follow the code.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Ricardo Ribalda Delgado 2014-11-28 14:50:54 +01:00 committed by Felipe Balbi
parent 5d1b6840fd
commit e0cbb04627
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/usb/gadget/udc/net2280.c
View File

@ -2632,38 +2632,19 @@ restore_data_eps:
return; return;
} }
static void ep_stall(struct net2280_ep *ep, int stall) static void ep_clear_seqnum(struct net2280_ep *ep)
{ {
struct net2280 *dev = ep->dev; struct net2280 *dev = ep->dev;
u32 val; u32 val;
static const u32 ep_pl[9] = { 0, 3, 4, 7, 8, 2, 5, 6, 9 }; static const u32 ep_pl[9] = { 0, 3, 4, 7, 8, 2, 5, 6, 9 };
if (stall) { val = readl(&dev->plregs->pl_ep_ctrl) & ~0x1f;
writel(BIT(SET_ENDPOINT_HALT) | val |= ep_pl[ep->num];
/* BIT(SET_NAK_PACKETS) | */ writel(val, &dev->plregs->pl_ep_ctrl);
BIT(CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE), val |= BIT(SEQUENCE_NUMBER_RESET);
&ep->regs->ep_rsp); writel(val, &dev->plregs->pl_ep_ctrl);
} else {
if (dev->gadget.speed == USB_SPEED_SUPER) {
/*
* Workaround for SS SeqNum not cleared via
* Endpoint Halt (Clear) bit. select endpoint
*/
val = readl(&dev->plregs->pl_ep_ctrl);
val = (val & ~0x1f) | ep_pl[ep->num];
writel(val, &dev->plregs->pl_ep_ctrl);
val |= BIT(SEQUENCE_NUMBER_RESET); return;
writel(val, &dev->plregs->pl_ep_ctrl);
}
val = readl(&ep->regs->ep_rsp);
val |= BIT(CLEAR_ENDPOINT_HALT) |
BIT(CLEAR_ENDPOINT_TOGGLE);
writel(val,
/* | BIT(CLEAR_NAK_PACKETS),*/
&ep->regs->ep_rsp);
val = readl(&ep->regs->ep_rsp);
}
} }
static void handle_stat0_irqs_superspeed(struct net2280 *dev, static void handle_stat0_irqs_superspeed(struct net2280 *dev,
@ -2764,7 +2745,12 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
if (w_value != USB_ENDPOINT_HALT) if (w_value != USB_ENDPOINT_HALT)
goto do_stall3; goto do_stall3;
ep_vdbg(dev, "%s clear halt\n", e->ep.name); ep_vdbg(dev, "%s clear halt\n", e->ep.name);
ep_stall(e, false); /*
* Workaround for SS SeqNum not cleared via
* Endpoint Halt (Clear) bit. select endpoint
*/
ep_clear_seqnum(e);
clear_halt(e);
if (!list_empty(&e->queue) && e->td_dma) if (!list_empty(&e->queue) && e->td_dma)
restart_dma(e); restart_dma(e);
allow_status(ep); allow_status(ep);
@ -2828,7 +2814,7 @@ static void handle_stat0_irqs_superspeed(struct net2280 *dev,
else { else {
if (ep->dma) if (ep->dma)
ep_stop_dma(ep); ep_stop_dma(ep);
ep_stall(ep, true); set_halt(ep);
} }
allow_status_338x(ep); allow_status_338x(ep);
break; break;
@ -2857,7 +2843,7 @@ do_stall3:
r.bRequestType, r.bRequest, tmp); r.bRequestType, r.bRequest, tmp);
dev->protocol_stall = 1; dev->protocol_stall = 1;
/* TD 9.9 Halt Endpoint test. TD 9.22 Set feature test */ /* TD 9.9 Halt Endpoint test. TD 9.22 Set feature test */
ep_stall(ep, true); set_halt(ep);
} }
next_endpoints3: next_endpoints3: