Skip to content

L
linux
Commit 593bef6c authored by Darius Augulis's avatar Darius Augulis Committed by Greg Kroah-Hartman
Browse files
Options

USB: imx_udc: Fix IMX UDC gadget code style 

Fix code style errors in IMX UDC Gadget.
Signed-off-by: default avatarDarius Augulis <augulis.darius@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8f182e5d
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 36 deletions
drivers/usb/gadget/imx_udc.c
View file @ 593bef6c
/* /*
* driver/usb/gadget/imx_udc.c * driver/usb/gadget/imx_udc.c
* *
* Copyright (C) 2005 Mike Lee(eemike@gmail.com) * Copyright (C) 2005 Mike Lee <eemike@gmail.com>
* Copyright (C) 2008 Darius Augulis <augulis.darius@gmail.com> * Copyright (C) 2008 Darius Augulis <augulis.darius@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -51,7 +51,8 @@ void ep0_chg_stat(const char *label, struct imx_udc_struct *imx_usb, ...@@ -51,7 +51,8 @@ void ep0_chg_stat(const char *label, struct imx_udc_struct *imx_usb,
void imx_udc_enable(struct imx_udc_struct *imx_usb) void imx_udc_enable(struct imx_udc_struct *imx_usb)
{ {
int temp = __raw_readl(imx_usb->base + USB_CTRL); int temp = __raw_readl(imx_usb->base + USB_CTRL);
__raw_writel(temp | CTRL_FE_ENA | CTRL_AFE_ENA, imx_usb->base + USB_CTRL); __raw_writel(temp | CTRL_FE_ENA | CTRL_AFE_ENA,
imx_usb->base + USB_CTRL);
imx_usb->gadget.speed = USB_SPEED_FULL; imx_usb->gadget.speed = USB_SPEED_FULL;
} }
...@@ -126,7 +127,8 @@ void imx_udc_config(struct imx_udc_struct *imx_usb) ...@@ -126,7 +127,8 @@ void imx_udc_config(struct imx_udc_struct *imx_usb)
for (j = 0; j < 5; j++) { for (j = 0; j < 5; j++) {
__raw_writeb(ep_conf[j], __raw_writeb(ep_conf[j],
imx_usb->base + USB_DDAT); imx_usb->base + USB_DDAT);
do {} while (__raw_readl(imx_usb->base + USB_DADR) do {} while (__raw_readl(imx_usb->base
+ USB_DADR)
& DADR_BSY); & DADR_BSY);
} }
} }
...@@ -183,7 +185,8 @@ void imx_udc_init_ep(struct imx_udc_struct *imx_usb) ...@@ -183,7 +185,8 @@ void imx_udc_init_ep(struct imx_udc_struct *imx_usb)
temp = (EP_DIR(imx_ep) << 7) | (max << 5) temp = (EP_DIR(imx_ep) << 7) | (max << 5)
| (imx_ep->bmAttributes << 3); | (imx_ep->bmAttributes << 3);
__raw_writel(temp, imx_usb->base + USB_EP_STAT(i)); __raw_writel(temp, imx_usb->base + USB_EP_STAT(i));
__raw_writel(temp | EPSTAT_FLUSH, imx_usb->base + USB_EP_STAT(i)); __raw_writel(temp | EPSTAT_FLUSH,
imx_usb->base + USB_EP_STAT(i));
D_INI(imx_usb->dev, "<%s> ep%d_stat %08x\n", __func__, i, D_INI(imx_usb->dev, "<%s> ep%d_stat %08x\n", __func__, i,
__raw_readl(imx_usb->base + USB_EP_STAT(i))); __raw_readl(imx_usb->base + USB_EP_STAT(i)));
} }
...@@ -278,15 +281,18 @@ void imx_ep_stall(struct imx_ep_struct *imx_ep) ...@@ -278,15 +281,18 @@ void imx_ep_stall(struct imx_ep_struct *imx_ep)
struct imx_udc_struct *imx_usb = imx_ep->imx_usb; struct imx_udc_struct *imx_usb = imx_ep->imx_usb;
int temp, i; int temp, i;
D_ERR(imx_usb->dev, "<%s> Forced stall on %s\n", __func__, imx_ep->ep.name); D_ERR(imx_usb->dev,
"<%s> Forced stall on %s\n", __func__, imx_ep->ep.name);
imx_flush(imx_ep); imx_flush(imx_ep);
/* Special care for ep0 */ /* Special care for ep0 */
if (!EP_NO(imx_ep)) { if (!EP_NO(imx_ep)) {
temp = __raw_readl(imx_usb->base + USB_CTRL); temp = __raw_readl(imx_usb->base + USB_CTRL);
__raw_writel(temp | CTRL_CMDOVER | CTRL_CMDERROR, imx_usb->base + USB_CTRL); __raw_writel(temp | CTRL_CMDOVER | CTRL_CMDERROR,
do { } while (__raw_readl(imx_usb->base + USB_CTRL) & CTRL_CMDOVER); imx_usb->base + USB_CTRL);
do { } while (__raw_readl(imx_usb->base + USB_CTRL)
& CTRL_CMDOVER);
temp = __raw_readl(imx_usb->base + USB_CTRL); temp = __raw_readl(imx_usb->base + USB_CTRL);
__raw_writel(temp & ~CTRL_CMDERROR, imx_usb->base + USB_CTRL); __raw_writel(temp & ~CTRL_CMDERROR, imx_usb->base + USB_CTRL);
} }
...@@ -296,7 +302,8 @@ void imx_ep_stall(struct imx_ep_struct *imx_ep) ...@@ -296,7 +302,8 @@ void imx_ep_stall(struct imx_ep_struct *imx_ep)
imx_usb->base + USB_EP_STAT(EP_NO(imx_ep))); imx_usb->base + USB_EP_STAT(EP_NO(imx_ep)));
for (i = 0; i < 100; i ++) { for (i = 0; i < 100; i ++) {
temp = __raw_readl(imx_usb->base + USB_EP_STAT(EP_NO(imx_ep))); temp = __raw_readl(imx_usb->base
+ USB_EP_STAT(EP_NO(imx_ep)));
if (!(temp & EPSTAT_STALL)) if (!(temp & EPSTAT_STALL))
break; break;
udelay(20); udelay(20);
...@@ -325,7 +332,8 @@ static int imx_udc_wakeup(struct usb_gadget *_gadget) ...@@ -325,7 +332,8 @@ static int imx_udc_wakeup(struct usb_gadget *_gadget)
******************************************************************************* *******************************************************************************
*/ */
static void ep_add_request(struct imx_ep_struct *imx_ep, struct imx_request *req) static void ep_add_request(struct imx_ep_struct *imx_ep,
struct imx_request *req)
{ {
if (unlikely(!req)) if (unlikely(!req))
return; return;
...@@ -334,7 +342,8 @@ static void ep_add_request(struct imx_ep_struct *imx_ep, struct imx_request *req ...@@ -334,7 +342,8 @@ static void ep_add_request(struct imx_ep_struct *imx_ep, struct imx_request *req
list_add_tail(&req->queue, &imx_ep->queue); list_add_tail(&req->queue, &imx_ep->queue);
} }
static void ep_del_request(struct imx_ep_struct *imx_ep, struct imx_request *req) static void ep_del_request(struct imx_ep_struct *imx_ep,
struct imx_request *req)
{ {
if (unlikely(!req)) if (unlikely(!req))
return; return;
...@@ -343,7 +352,8 @@ static void ep_del_request(struct imx_ep_struct *imx_ep, struct imx_request *req ...@@ -343,7 +352,8 @@ static void ep_del_request(struct imx_ep_struct *imx_ep, struct imx_request *req
req->in_use = 0; req->in_use = 0;
} }
static void done(struct imx_ep_struct *imx_ep, struct imx_request *req, int status) static void done(struct imx_ep_struct *imx_ep,
struct imx_request *req, int status)
{ {
ep_del_request(imx_ep, req); ep_del_request(imx_ep, req);
...@@ -494,7 +504,8 @@ static int write_fifo(struct imx_ep_struct *imx_ep, struct imx_request *req) ...@@ -494,7 +504,8 @@ static int write_fifo(struct imx_ep_struct *imx_ep, struct imx_request *req)
__func__, imx_ep->ep.name, req, __func__, imx_ep->ep.name, req,
completed ? "completed" : "not completed"); completed ? "completed" : "not completed");
if (!EP_NO(imx_ep)) if (!EP_NO(imx_ep))
ep0_chg_stat(__func__, imx_ep->imx_usb, EP0_IDLE); ep0_chg_stat(__func__,
imx_ep->imx_usb, EP0_IDLE);
} }
} }
...@@ -586,7 +597,8 @@ static void handle_ep0_devreq(struct imx_udc_struct *imx_usb) ...@@ -586,7 +597,8 @@ static void handle_ep0_devreq(struct imx_udc_struct *imx_usb)
"<%s> no setup packet received\n", __func__); "<%s> no setup packet received\n", __func__);
goto stall; goto stall;
} }
u.word[i] = __raw_readl(imx_usb->base + USB_EP_FDAT(EP_NO(imx_ep))); u.word[i] = __raw_readl(imx_usb->base
+ USB_EP_FDAT(EP_NO(imx_ep)));
} }
temp = imx_ep_empty(imx_ep); temp = imx_ep_empty(imx_ep);
...@@ -785,8 +797,10 @@ static int imx_ep_queue ...@@ -785,8 +797,10 @@ static int imx_ep_queue
/* Debug */ /* Debug */
D_REQ(imx_usb->dev, "<%s> ep%d %s request for [%d] bytes\n", D_REQ(imx_usb->dev, "<%s> ep%d %s request for [%d] bytes\n",
__func__, EP_NO(imx_ep), __func__, EP_NO(imx_ep),
((!EP_NO(imx_ep) && imx_ep->imx_usb->ep0state == EP0_IN_DATA_PHASE) ((!EP_NO(imx_ep) && imx_ep->imx_usb->ep0state
|| (EP_NO(imx_ep) && EP_DIR(imx_ep))) ? "IN" : "OUT", usb_req->length); == EP0_IN_DATA_PHASE)
|| (EP_NO(imx_ep) && EP_DIR(imx_ep)))
? "IN" : "OUT", usb_req->length);
dump_req(__func__, imx_ep, usb_req); dump_req(__func__, imx_ep, usb_req);
if (imx_ep->stopped) { if (imx_ep->stopped) {
...@@ -1061,7 +1075,8 @@ static irqreturn_t imx_udc_irq(int irq, void *dev) ...@@ -1061,7 +1075,8 @@ static irqreturn_t imx_udc_irq(int irq, void *dev)
/* Config setup */ /* Config setup */
if (imx_usb->cfg != cfg) { if (imx_usb->cfg != cfg) {
D_REQ(imx_usb->dev, "<%s> Change config start\n",__func__); D_REQ(imx_usb->dev,
"<%s> Change config start\n", __func__);
u.bRequest = USB_REQ_SET_CONFIGURATION; u.bRequest = USB_REQ_SET_CONFIGURATION;
u.bRequestType = USB_DIR_OUT | u.bRequestType = USB_DIR_OUT |
USB_TYPE_STANDARD | USB_TYPE_STANDARD |
...@@ -1073,11 +1088,13 @@ static irqreturn_t imx_udc_irq(int irq, void *dev) ...@@ -1073,11 +1088,13 @@ static irqreturn_t imx_udc_irq(int irq, void *dev)
imx_usb->set_config = 1; imx_usb->set_config = 1;
imx_usb->driver->setup(&imx_usb->gadget, &u); imx_usb->driver->setup(&imx_usb->gadget, &u);
imx_usb->set_config = 0; imx_usb->set_config = 0;
D_REQ(imx_usb->dev, "<%s> Change config done\n",__func__); D_REQ(imx_usb->dev,
"<%s> Change config done\n", __func__);
} }
if (imx_usb->intf != intf || imx_usb->alt != alt) { if (imx_usb->intf != intf || imx_usb->alt != alt) {
D_REQ(imx_usb->dev, "<%s> Change interface start\n",__func__); D_REQ(imx_usb->dev,
"<%s> Change interface start\n", __func__);
u.bRequest = USB_REQ_SET_INTERFACE; u.bRequest = USB_REQ_SET_INTERFACE;
u.bRequestType = USB_DIR_OUT | u.bRequestType = USB_DIR_OUT |
USB_TYPE_STANDARD | USB_TYPE_STANDARD |
...@@ -1090,7 +1107,8 @@ static irqreturn_t imx_udc_irq(int irq, void *dev) ...@@ -1090,7 +1107,8 @@ static irqreturn_t imx_udc_irq(int irq, void *dev)
imx_usb->set_config = 1; imx_usb->set_config = 1;
imx_usb->driver->setup(&imx_usb->gadget, &u); imx_usb->driver->setup(&imx_usb->gadget, &u);
imx_usb->set_config = 0; imx_usb->set_config = 0;
D_REQ(imx_usb->dev, "<%s> Change interface done\n",__func__); D_REQ(imx_usb->dev,
"<%s> Change interface done\n", __func__);
} }
} }
...@@ -1102,7 +1120,8 @@ static irqreturn_t imx_udc_irq(int irq, void *dev) ...@@ -1102,7 +1120,8 @@ static irqreturn_t imx_udc_irq(int irq, void *dev)
*/ */
if (imx_usb->ep0state == EP0_IDLE) { if (imx_usb->ep0state == EP0_IDLE) {
temp = __raw_readl(imx_usb->base + USB_CTRL); temp = __raw_readl(imx_usb->base + USB_CTRL);
__raw_writel(temp | CTRL_CMDOVER, imx_usb->base + USB_CTRL); __raw_writel(temp | CTRL_CMDOVER,
imx_usb->base + USB_CTRL);
} }
} }
......
drivers/usb/gadget/imx_udc.h
View file @ 593bef6c
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
/* Helper macros */ /* Helper macros */
#define EP_NO(ep) ((ep->bEndpointAddress) & ~USB_DIR_IN) /* IN:1, OUT:0 */ #define EP_NO(ep) ((ep->bEndpointAddress) & ~USB_DIR_IN) /* IN:1, OUT:0 */
#define EP_DIR(ep) ((ep->bEndpointAddress) & USB_DIR_IN ? 1 : 0) #define EP_DIR(ep) ((ep->bEndpointAddress) & USB_DIR_IN ? 1 : 0)
#define irq_to_ep(irq) (((irq) >= USBD_INT0) || ((irq) <= USBD_INT6) ? ((irq) - USBD_INT0) : (USBD_INT6)) /*should not happen*/ #define irq_to_ep(irq) (((irq) >= USBD_INT0) || ((irq) <= USBD_INT6) \
? ((irq) - USBD_INT0) : (USBD_INT6)) /*should not happen*/
#define ep_to_irq(ep) (EP_NO((ep)) + USBD_INT0) #define ep_to_irq(ep) (EP_NO((ep)) + USBD_INT0)
#define IMX_USB_NB_EP 6 #define IMX_USB_NB_EP 6
...@@ -88,8 +89,8 @@ struct imx_udc_struct { ...@@ -88,8 +89,8 @@ struct imx_udc_struct {
#define USB_EP_FDAT3(x) (0x3F + (x*0x30)) /* USB FIFO data */ #define USB_EP_FDAT3(x) (0x3F + (x*0x30)) /* USB FIFO data */
#define USB_EP_FSTAT(x) (0x40 + (x*0x30)) /* USB FIFO status */ #define USB_EP_FSTAT(x) (0x40 + (x*0x30)) /* USB FIFO status */
#define USB_EP_FCTRL(x) (0x44 + (x*0x30)) /* USB FIFO control */ #define USB_EP_FCTRL(x) (0x44 + (x*0x30)) /* USB FIFO control */
#define USB_EP_LRFP(x) (0x48 + (x*0x30)) /* USB last read frame pointer */ #define USB_EP_LRFP(x) (0x48 + (x*0x30)) /* USB last rd f. pointer */
#define USB_EP_LWFP(x) (0x4C + (x*0x30)) /* USB last write frame pointer */ #define USB_EP_LWFP(x) (0x4C + (x*0x30)) /* USB last wr f. pointer */
#define USB_EP_FALRM(x) (0x50 + (x*0x30)) /* USB FIFO alarm */ #define USB_EP_FALRM(x) (0x50 + (x*0x30)) /* USB FIFO alarm */
#define USB_EP_FRDP(x) (0x54 + (x*0x30)) /* USB FIFO read pointer */ #define USB_EP_FRDP(x) (0x54 + (x*0x30)) /* USB FIFO read pointer */
#define USB_EP_FWRP(x) (0x58 + (x*0x30)) /* USB FIFO write pointer */ #define USB_EP_FWRP(x) (0x58 + (x*0x30)) /* USB FIFO write pointer */
...@@ -228,7 +229,8 @@ struct imx_udc_struct { ...@@ -228,7 +229,8 @@ struct imx_udc_struct {
#endif /* DEBUG_IRQ */ #endif /* DEBUG_IRQ */
#ifdef DEBUG_EPIRQ #ifdef DEBUG_EPIRQ
static void dump_ep_intr(const char *label, int nr, int irqreg, struct device *dev) static void dump_ep_intr(const char *label, int nr, int irqreg,
struct device *dev)
{ {
dev_dbg(dev, "<%s> EP%d_INTR=[%s%s%s%s%s%s%s%s%s]\n", label, nr, dev_dbg(dev, "<%s> EP%d_INTR=[%s%s%s%s%s%s%s%s%s]\n", label, nr,
(irqreg & EPINTR_FIFO_FULL) ? " full" : "", (irqreg & EPINTR_FIFO_FULL) ? " full" : "",
...@@ -246,7 +248,8 @@ struct imx_udc_struct { ...@@ -246,7 +248,8 @@ struct imx_udc_struct {
#endif /* DEBUG_IRQ */ #endif /* DEBUG_IRQ */
#ifdef DEBUG_DUMP #ifdef DEBUG_DUMP
static void dump_usb_stat(const char *label, struct imx_udc_struct *imx_usb) static void dump_usb_stat(const char *label,
struct imx_udc_struct *imx_usb)
{ {
int temp = __raw_readl(imx_usb->base + USB_STAT); int temp = __raw_readl(imx_usb->base + USB_STAT);
...@@ -259,12 +262,15 @@ struct imx_udc_struct { ...@@ -259,12 +262,15 @@ struct imx_udc_struct {
(temp & STAT_ALTSET)); (temp & STAT_ALTSET));
} }
static void dump_ep_stat(const char *label, struct imx_ep_struct *imx_ep) static void dump_ep_stat(const char *label,
struct imx_ep_struct *imx_ep)
{ {
int temp = __raw_readl(imx_ep->imx_usb->base + USB_EP_INTR(EP_NO(imx_ep))); int temp = __raw_readl(imx_ep->imx_usb->base
+ USB_EP_INTR(EP_NO(imx_ep)));
dev_dbg(imx_ep->imx_usb->dev, dev_dbg(imx_ep->imx_usb->dev,
"<%s> EP%d_INTR=[%s%s%s%s%s%s%s%s%s]\n", label, EP_NO(imx_ep), "<%s> EP%d_INTR=[%s%s%s%s%s%s%s%s%s]\n",
label, EP_NO(imx_ep),
(temp & EPINTR_FIFO_FULL) ? " full" : "", (temp & EPINTR_FIFO_FULL) ? " full" : "",
(temp & EPINTR_FIFO_EMPTY) ? " fempty" : "", (temp & EPINTR_FIFO_EMPTY) ? " fempty" : "",
(temp & EPINTR_FIFO_ERROR) ? " ferr" : "", (temp & EPINTR_FIFO_ERROR) ? " ferr" : "",
...@@ -275,18 +281,22 @@ struct imx_udc_struct { ...@@ -275,18 +281,22 @@ struct imx_udc_struct {
(temp & EPINTR_DEVREQ) ? " devreq" : "", (temp & EPINTR_DEVREQ) ? " devreq" : "",
(temp & EPINTR_EOT) ? " eot" : ""); (temp & EPINTR_EOT) ? " eot" : "");
temp = __raw_readl(imx_ep->imx_usb->base + USB_EP_STAT(EP_NO(imx_ep))); temp = __raw_readl(imx_ep->imx_usb->base
+ USB_EP_STAT(EP_NO(imx_ep)));
dev_dbg(imx_ep->imx_usb->dev, dev_dbg(imx_ep->imx_usb->dev,
"<%s> EP%d_STAT=[%s%s bcount=%d]\n", label, EP_NO(imx_ep), "<%s> EP%d_STAT=[%s%s bcount=%d]\n",
label, EP_NO(imx_ep),
(temp & EPSTAT_SIP) ? " sip" : "", (temp & EPSTAT_SIP) ? " sip" : "",
(temp & EPSTAT_STALL) ? " stall" : "", (temp & EPSTAT_STALL) ? " stall" : "",
(temp & EPSTAT_BCOUNT) >> 16); (temp & EPSTAT_BCOUNT) >> 16);
temp = __raw_readl(imx_ep->imx_usb->base + USB_EP_FSTAT(EP_NO(imx_ep))); temp = __raw_readl(imx_ep->imx_usb->base
+ USB_EP_FSTAT(EP_NO(imx_ep)));
dev_dbg(imx_ep->imx_usb->dev, dev_dbg(imx_ep->imx_usb->dev,
"<%s> EP%d_FSTAT=[%s%s%s%s%s%s%s]\n", label, EP_NO(imx_ep), "<%s> EP%d_FSTAT=[%s%s%s%s%s%s%s]\n",
label, EP_NO(imx_ep),
(temp & FSTAT_ERR) ? " ferr" : "", (temp & FSTAT_ERR) ? " ferr" : "",
(temp & FSTAT_UF) ? " funder" : "", (temp & FSTAT_UF) ? " funder" : "",
(temp & FSTAT_OF) ? " fover" : "", (temp & FSTAT_OF) ? " fover" : "",
...@@ -296,19 +306,23 @@ struct imx_udc_struct { ...@@ -296,19 +306,23 @@ struct imx_udc_struct {
(temp & FSTAT_EMPTY) ? " fempty" : ""); (temp & FSTAT_EMPTY) ? " fempty" : "");
} }
static void dump_req(const char *label, struct imx_ep_struct *imx_ep, struct usb_request *req) static void dump_req(const char *label, struct imx_ep_struct *imx_ep,
struct usb_request *req)
{ {
int i; int i;
if (!req || !req->buf) { if (!req || !req->buf) {
dev_dbg(imx_ep->imx_usb->dev, "<%s> req or req buf is free\n", label); dev_dbg(imx_ep->imx_usb->dev,
"<%s> req or req buf is free\n", label);
return; return;
} }
if ((!EP_NO(imx_ep) && imx_ep->imx_usb->ep0state == EP0_IN_DATA_PHASE) if ((!EP_NO(imx_ep) && imx_ep->imx_usb->ep0state
== EP0_IN_DATA_PHASE)
|| (EP_NO(imx_ep) && EP_DIR(imx_ep))) { || (EP_NO(imx_ep) && EP_DIR(imx_ep))) {
dev_dbg(imx_ep->imx_usb->dev, "<%s> request dump <", label); dev_dbg(imx_ep->imx_usb->dev,
"<%s> request dump <", label);
for (i = 0; i < req->length; i++) for (i = 0; i < req->length; i++)
printk("%02x-", *((u8 *)req->buf + i)); printk("%02x-", *((u8 *)req->buf + i));
printk(">\n"); printk(">\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7