Skip to content

Commit

Permalink
usb: musb: gadget: do not poke with gadget's list_head
Browse files Browse the repository at this point in the history 
struct usb_request's list_head is supposed to be
used only by gadget drivers, but musb is abusing
that. Give struct musb_request its own list_head
and prevent musb from poking into other driver's
business.

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Feb 17, 2011
1 parent 63eed2b commit ad1adb8
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 31 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/musb/musb_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ struct musb_hw_ep {
#endif
};

static inline struct usb_request *next_in_request(struct musb_hw_ep *hw_ep)
static inline struct musb_request *next_in_request(struct musb_hw_ep *hw_ep)
{
#ifdef CONFIG_USB_GADGET_MUSB_HDRC
return next_request(&hw_ep->ep_in);
Expand All @@ -337,7 +337,7 @@ static inline struct usb_request *next_in_request(struct musb_hw_ep *hw_ep)
#endif
}

static inline struct usb_request *next_out_request(struct musb_hw_ep *hw_ep)
static inline struct musb_request *next_out_request(struct musb_hw_ep *hw_ep)
{
#ifdef CONFIG_USB_GADGET_MUSB_HDRC
return next_request(&hw_ep->ep_out);
Expand Down
37 changes: 20 additions & 17 deletions drivers/usb/musb/musb_gadget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ __acquires(ep->musb->lock)

req = to_musb_request(request);

list_del(&request->list);
list_del(&req->list);
if (req->request.status == -EINPROGRESS)
req->request.status = status;
musb = req->musb;
Expand Down Expand Up @@ -251,9 +251,8 @@ static void nuke(struct musb_ep *ep, const int status)
ep->dma = NULL;
}

while (!list_empty(&(ep->req_list))) {
req = container_of(ep->req_list.next, struct musb_request,
request.list);
while (!list_empty(&ep->req_list)) {
req = list_first_entry(&ep->req_list, struct musb_request, list);
musb_g_giveback(ep, &req->request, status);
}
}
Expand Down Expand Up @@ -485,14 +484,16 @@ static void txstate(struct musb *musb, struct musb_request *req)
void musb_g_tx(struct musb *musb, u8 epnum)
{
u16 csr;
struct musb_request *req;
struct usb_request *request;
u8 __iomem *mbase = musb->mregs;
struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_in;
void __iomem *epio = musb->endpoints[epnum].regs;
struct dma_channel *dma;

musb_ep_select(mbase, epnum);
request = next_request(musb_ep);
req = next_request(musb_ep);
request = &req->request;

csr = musb_readw(epio, MUSB_TXCSR);
DBG(4, "<== %s, txcsr %04x\n", musb_ep->end_point.name, csr);
Expand Down Expand Up @@ -571,15 +572,15 @@ void musb_g_tx(struct musb *musb, u8 epnum)

if (request->actual == request->length) {
musb_g_giveback(musb_ep, request, 0);
request = musb_ep->desc ? next_request(musb_ep) : NULL;
if (!request) {
req = musb_ep->desc ? next_request(musb_ep) : NULL;
if (!req) {
DBG(4, "%s idle now\n",
musb_ep->end_point.name);
return;
}
}

txstate(musb, to_musb_request(request));
txstate(musb, req);
}
}

Expand Down Expand Up @@ -821,6 +822,7 @@ static void rxstate(struct musb *musb, struct musb_request *req)
void musb_g_rx(struct musb *musb, u8 epnum)
{
u16 csr;
struct musb_request *req;
struct usb_request *request;
void __iomem *mbase = musb->mregs;
struct musb_ep *musb_ep;
Expand All @@ -835,10 +837,12 @@ void musb_g_rx(struct musb *musb, u8 epnum)

musb_ep_select(mbase, epnum);

request = next_request(musb_ep);
if (!request)
req = next_request(musb_ep);
if (!req)
return;

request = &req->request;

csr = musb_readw(epio, MUSB_RXCSR);
dma = is_dma_capable() ? musb_ep->dma : NULL;

Expand Down Expand Up @@ -914,15 +918,15 @@ void musb_g_rx(struct musb *musb, u8 epnum)
#endif
musb_g_giveback(musb_ep, request, 0);

request = next_request(musb_ep);
if (!request)
req = next_request(musb_ep);
if (!req)
return;
}
#if defined(CONFIG_USB_INVENTRA_DMA) || defined(CONFIG_USB_TUSB_OMAP_DMA)
exit:
#endif
/* Analyze request */
rxstate(musb, to_musb_request(request));
rxstate(musb, req);
}

/* ------------------------------------------------------------ */
Expand Down Expand Up @@ -1171,7 +1175,6 @@ struct usb_request *musb_alloc_request(struct usb_ep *ep, gfp_t gfp_flags)
return NULL;
}

INIT_LIST_HEAD(&request->request.list);
request->request.dma = DMA_ADDR_INVALID;
request->epnum = musb_ep->current_epnum;
request->ep = musb_ep;
Expand Down Expand Up @@ -1257,10 +1260,10 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
}

/* add request to the list */
list_add_tail(&(request->request.list), &(musb_ep->req_list));
list_add_tail(&request->list, &musb_ep->req_list);

/* it this is the head of the queue, start i/o ... */
if (!musb_ep->busy && &request->request.list == musb_ep->req_list.next)
if (!musb_ep->busy && &request->list == musb_ep->req_list.next)
musb_ep_restart(musb, request);

cleanup:
Expand Down Expand Up @@ -1349,7 +1352,7 @@ static int musb_gadget_set_halt(struct usb_ep *ep, int value)

musb_ep_select(mbase, epnum);

request = to_musb_request(next_request(musb_ep));
request = next_request(musb_ep);
if (value) {
if (request) {
DBG(3, "request in progress, cannot halt %s\n",
Expand Down
7 changes: 5 additions & 2 deletions drivers/usb/musb/musb_gadget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#ifndef __MUSB_GADGET_H
#define __MUSB_GADGET_H

#include <linux/list.h>

enum buffer_map_state {
UN_MAPPED = 0,
PRE_MAPPED,
Expand All @@ -43,6 +45,7 @@ enum buffer_map_state {

struct musb_request {
struct usb_request request;
struct list_head list;
struct musb_ep *ep;
struct musb *musb;
u8 tx; /* endpoint direction */
Expand Down Expand Up @@ -94,13 +97,13 @@ static inline struct musb_ep *to_musb_ep(struct usb_ep *ep)
return ep ? container_of(ep, struct musb_ep, end_point) : NULL;
}

static inline struct usb_request *next_request(struct musb_ep *ep)
static inline struct musb_request *next_request(struct musb_ep *ep)
{
struct list_head *queue = &ep->req_list;

if (list_empty(queue))
return NULL;
return container_of(queue->next, struct usb_request, list);
return container_of(queue->next, struct musb_request, list);
}

extern void musb_g_tx(struct musb *musb, u8 epnum);
Expand Down
24 changes: 14 additions & 10 deletions drivers/usb/musb/musb_gadget_ep0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,7 @@ __acquires(musb->lock)
}

/* Maybe start the first request in the queue */
request = to_musb_request(
next_request(musb_ep));
request = next_request(musb_ep);
if (!musb_ep->busy && request) {
DBG(3, "restarting the request\n");
musb_ep_restart(musb, request);
Expand Down Expand Up @@ -491,10 +490,12 @@ __acquires(musb->lock)
static void ep0_rxstate(struct musb *musb)
{
void __iomem *regs = musb->control_ep->regs;
struct musb_request *request;
struct usb_request *req;
u16 count, csr;

req = next_ep0_request(musb);
request = next_ep0_request(musb);
req = &request->request;

/* read packet and ack; or stall because of gadget driver bug:
* should have provided the rx buffer before setup() returned.
Expand Down Expand Up @@ -544,17 +545,20 @@ static void ep0_rxstate(struct musb *musb)
static void ep0_txstate(struct musb *musb)
{
void __iomem *regs = musb->control_ep->regs;
struct usb_request *request = next_ep0_request(musb);
struct musb_request *req = next_ep0_request(musb);
struct usb_request *request;
u16 csr = MUSB_CSR0_TXPKTRDY;
u8 *fifo_src;
u8 fifo_count;

if (!request) {
if (!req) {
/* WARN_ON(1); */
DBG(2, "odd; csr0 %04x\n", musb_readw(regs, MUSB_CSR0));
return;
}

request = &req->request;

/* load the data */
fifo_src = (u8 *) request->buf + request->actual;
fifo_count = min((unsigned) MUSB_EP0_FIFOSIZE,
Expand Down Expand Up @@ -598,7 +602,7 @@ static void ep0_txstate(struct musb *musb)
static void
musb_read_setup(struct musb *musb, struct usb_ctrlrequest *req)
{
struct usb_request *r;
struct musb_request *r;
void __iomem *regs = musb->control_ep->regs;

musb_read_fifo(&musb->endpoints[0], sizeof *req, (u8 *)req);
Expand All @@ -616,7 +620,7 @@ musb_read_setup(struct musb *musb, struct usb_ctrlrequest *req)
/* clean up any leftover transfers */
r = next_ep0_request(musb);
if (r)
musb_g_ep0_giveback(musb, r);
musb_g_ep0_giveback(musb, &r->request);

/* For zero-data requests we want to delay the STATUS stage to
* avoid SETUPEND errors. If we read data (OUT), delay accepting
Expand Down Expand Up @@ -758,11 +762,11 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb)
case MUSB_EP0_STAGE_STATUSOUT:
/* end of sequence #1: write to host (TX state) */
{
struct usb_request *req;
struct musb_request *req;

req = next_ep0_request(musb);
if (req)
musb_g_ep0_giveback(musb, req);
musb_g_ep0_giveback(musb, &req->request);
}

/*
Expand Down Expand Up @@ -961,7 +965,7 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags)
}

/* add request to the list */
list_add_tail(&(req->request.list), &(ep->req_list));
list_add_tail(&req->list, &ep->req_list);

DBG(3, "queue to %s (%s), length=%d\n",
ep->name, ep->is_in ? "IN/TX" : "OUT/RX",
Expand Down

0 comments on commit ad1adb8

Please sign in to comment.