Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:pzskc383
kernel
linux-2.6.34-moorestown-usb-otg-client-driver-3...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File linux-2.6.34-moorestown-usb-otg-client-driver-3.0.patch of Package kernel
From 3a3765c5e08a022d090e7d31d8f1dcc316126bd7 Mon Sep 17 00:00:00 2001 From: Xiaochen Shen <xiaochen.shen@intel.com> Date: Thu, 7 Jan 2010 21:52:41 +0800 Subject: [PATCH 084/104] USB OTG Client driver Beta-3.0 patch Part 1: USB OTG Client Controller driver This is a full patch against 2.6.31.6 upstream kernel Main changes in Beta-3.0: * Fix sighting 3469216: Copy 5M files fails from windows XP to MID (with RNDIS gadget) via WinSCP and USB utility * Fix sighting 3452427: Usage Model: File transfer from desktop Pc to Moorestown fail with error msg "Host is down" * Fix dQH and dTD sram allocation issue Main changes in Beta-2.0: * Support dynamic gadget switch function with built-in MSG/RNDIS/still image gadgets * Remove redundant gadget driver disconnect in function usb_gadget_unregister_driver() * Change Max power capability from 100mA to 500mA in function langwell_udc_maxpower() Enable the drivers in kernel: Device Drivers --> USB support --> USB Gadget Support --> USB Peripheral Controller (Intel Langwell USB Device Controller) Dynamic Gadget Switch Support USB Gadget Drivers (Built-in Gadgets for MRSTN) Kernel config: * No change from Beta build 1229: * Make sure turn on following configs: CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_LANGWELL=y CONFIG_USB_LANGWELL=y CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_GADGET_DYNAMIC_SWITCH=y CONFIG_USB_GADGET_UTIL=y CONFIG_USB_MRSTN_GADGETS=y CONFIG_USB_ETH_RNDIS=y Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com> --- drivers/usb/gadget/langwell_udc.c | 691 +++++++++++++++++++++++++++---------- drivers/usb/gadget/langwell_udc.h | 17 +- include/linux/usb/langwell_udc.h | 13 + 3 files changed, 543 insertions(+), 178 deletions(-) diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c index a391351..5fb8e10 100644 --- a/drivers/usb/gadget/langwell_udc.c +++ b/drivers/usb/gadget/langwell_udc.c @@ -54,12 +54,18 @@ #define DRIVER_DESC "Intel Langwell USB Device Controller driver" -#define DRIVER_VERSION "16 May 2009" +#define DRIVER_VERSION "Jan 6, 2010" static const char driver_name[] = "langwell_udc"; static const char driver_desc[] = DRIVER_DESC; +/* module parameters */ +static unsigned int sram_force_off; +module_param(sram_force_off, bool, S_IRUGO); +MODULE_PARM_DESC(sram_force_off, "1-force SRAM off; 0-SRAM on"); + + /* controller device global variable */ static struct langwell_udc *the_controller; @@ -74,6 +80,15 @@ langwell_ep0_desc = { }; +#ifdef CONFIG_USB_GADGET_DYNAMIC_SWITCH +/* the names of gadget driver which can be switched in built-in kernel */ +static const char *const g_driver_name[3] = { + "g_ether", + "g_file_storage", + "g_still_image", +}; +#endif + /*-------------------------------------------------------------------------*/ /* debugging */ @@ -114,104 +129,76 @@ static inline void print_all_registers(struct langwell_udc *dev) int i; /* Capability Registers */ - printk(KERN_DEBUG "Capability Registers (offset: " - "0x%04x, length: 0x%08x)\n", - CAP_REG_OFFSET, - (u32)sizeof(struct langwell_cap_regs)); - printk(KERN_DEBUG "caplength=0x%02x\n", - readb(&dev->cap_regs->caplength)); - printk(KERN_DEBUG "hciversion=0x%04x\n", - readw(&dev->cap_regs->hciversion)); - printk(KERN_DEBUG "hcsparams=0x%08x\n", - readl(&dev->cap_regs->hcsparams)); - printk(KERN_DEBUG "hccparams=0x%08x\n", - readl(&dev->cap_regs->hccparams)); - printk(KERN_DEBUG "dciversion=0x%04x\n", - readw(&dev->cap_regs->dciversion)); - printk(KERN_DEBUG "dccparams=0x%08x\n", - readl(&dev->cap_regs->dccparams)); + DBG(dev, "Capability Registers (offset: 0x%04x, length: 0x%08x)\n", + CAP_REG_OFFSET, (u32)sizeof(struct langwell_cap_regs)); + DBG(dev, "caplength=0x%02x\n", readb(&dev->cap_regs->caplength)); + DBG(dev, "hciversion=0x%04x\n", readw(&dev->cap_regs->hciversion)); + DBG(dev, "hcsparams=0x%08x\n", readl(&dev->cap_regs->hcsparams)); + DBG(dev, "hccparams=0x%08x\n", readl(&dev->cap_regs->hccparams)); + DBG(dev, "dciversion=0x%04x\n", readw(&dev->cap_regs->dciversion)); + DBG(dev, "dccparams=0x%08x\n", readl(&dev->cap_regs->dccparams)); /* Operational Registers */ - printk(KERN_DEBUG "Operational Registers (offset: " - "0x%04x, length: 0x%08x)\n", - OP_REG_OFFSET, - (u32)sizeof(struct langwell_op_regs)); - printk(KERN_DEBUG "extsts=0x%08x\n", - readl(&dev->op_regs->extsts)); - printk(KERN_DEBUG "extintr=0x%08x\n", - readl(&dev->op_regs->extintr)); - printk(KERN_DEBUG "usbcmd=0x%08x\n", - readl(&dev->op_regs->usbcmd)); - printk(KERN_DEBUG "usbsts=0x%08x\n", - readl(&dev->op_regs->usbsts)); - printk(KERN_DEBUG "usbintr=0x%08x\n", - readl(&dev->op_regs->usbintr)); - printk(KERN_DEBUG "frindex=0x%08x\n", - readl(&dev->op_regs->frindex)); - printk(KERN_DEBUG "ctrldssegment=0x%08x\n", + DBG(dev, "Operational Registers (offset: 0x%04x, length: 0x%08x)\n", + OP_REG_OFFSET, (u32)sizeof(struct langwell_op_regs)); + DBG(dev, "extsts=0x%08x\n", readl(&dev->op_regs->extsts)); + DBG(dev, "extintr=0x%08x\n", readl(&dev->op_regs->extintr)); + DBG(dev, "usbcmd=0x%08x\n", readl(&dev->op_regs->usbcmd)); + DBG(dev, "usbsts=0x%08x\n", readl(&dev->op_regs->usbsts)); + DBG(dev, "usbintr=0x%08x\n", readl(&dev->op_regs->usbintr)); + DBG(dev, "frindex=0x%08x\n", readl(&dev->op_regs->frindex)); + DBG(dev, "ctrldssegment=0x%08x\n", readl(&dev->op_regs->ctrldssegment)); - printk(KERN_DEBUG "deviceaddr=0x%08x\n", - readl(&dev->op_regs->deviceaddr)); - printk(KERN_DEBUG "endpointlistaddr=0x%08x\n", + DBG(dev, "deviceaddr=0x%08x\n", readl(&dev->op_regs->deviceaddr)); + DBG(dev, "endpointlistaddr=0x%08x\n", readl(&dev->op_regs->endpointlistaddr)); - printk(KERN_DEBUG "ttctrl=0x%08x\n", - readl(&dev->op_regs->ttctrl)); - printk(KERN_DEBUG "burstsize=0x%08x\n", - readl(&dev->op_regs->burstsize)); - printk(KERN_DEBUG "txfilltuning=0x%08x\n", - readl(&dev->op_regs->txfilltuning)); - printk(KERN_DEBUG "txttfilltuning=0x%08x\n", + DBG(dev, "ttctrl=0x%08x\n", readl(&dev->op_regs->ttctrl)); + DBG(dev, "burstsize=0x%08x\n", readl(&dev->op_regs->burstsize)); + DBG(dev, "txfilltuning=0x%08x\n", readl(&dev->op_regs->txfilltuning)); + DBG(dev, "txttfilltuning=0x%08x\n", readl(&dev->op_regs->txttfilltuning)); - printk(KERN_DEBUG "ic_usb=0x%08x\n", - readl(&dev->op_regs->ic_usb)); - printk(KERN_DEBUG "ulpi_viewport=0x%08x\n", + DBG(dev, "ic_usb=0x%08x\n", readl(&dev->op_regs->ic_usb)); + DBG(dev, "ulpi_viewport=0x%08x\n", readl(&dev->op_regs->ulpi_viewport)); - printk(KERN_DEBUG "configflag=0x%08x\n", - readl(&dev->op_regs->configflag)); - printk(KERN_DEBUG "portsc1=0x%08x\n", - readl(&dev->op_regs->portsc1)); - printk(KERN_DEBUG "devlc=0x%08x\n", - readl(&dev->op_regs->devlc)); - printk(KERN_DEBUG "otgsc=0x%08x\n", - readl(&dev->op_regs->otgsc)); - printk(KERN_DEBUG "usbmode=0x%08x\n", - readl(&dev->op_regs->usbmode)); - printk(KERN_DEBUG "endptnak=0x%08x\n", - readl(&dev->op_regs->endptnak)); - printk(KERN_DEBUG "endptnaken=0x%08x\n", - readl(&dev->op_regs->endptnaken)); - printk(KERN_DEBUG "endptsetupstat=0x%08x\n", + DBG(dev, "configflag=0x%08x\n", readl(&dev->op_regs->configflag)); + DBG(dev, "portsc1=0x%08x\n", readl(&dev->op_regs->portsc1)); + DBG(dev, "devlc=0x%08x\n", readl(&dev->op_regs->devlc)); + DBG(dev, "otgsc=0x%08x\n", readl(&dev->op_regs->otgsc)); + DBG(dev, "usbmode=0x%08x\n", readl(&dev->op_regs->usbmode)); + DBG(dev, "endptnak=0x%08x\n", readl(&dev->op_regs->endptnak)); + DBG(dev, "endptnaken=0x%08x\n", readl(&dev->op_regs->endptnaken)); + DBG(dev, "endptsetupstat=0x%08x\n", readl(&dev->op_regs->endptsetupstat)); - printk(KERN_DEBUG "endptprime=0x%08x\n", - readl(&dev->op_regs->endptprime)); - printk(KERN_DEBUG "endptflush=0x%08x\n", - readl(&dev->op_regs->endptflush)); - printk(KERN_DEBUG "endptstat=0x%08x\n", - readl(&dev->op_regs->endptstat)); - printk(KERN_DEBUG "endptcomplete=0x%08x\n", + DBG(dev, "endptprime=0x%08x\n", readl(&dev->op_regs->endptprime)); + DBG(dev, "endptflush=0x%08x\n", readl(&dev->op_regs->endptflush)); + DBG(dev, "endptstat=0x%08x\n", readl(&dev->op_regs->endptstat)); + DBG(dev, "endptcomplete=0x%08x\n", readl(&dev->op_regs->endptcomplete)); for (i = 0; i < dev->ep_max / 2; i++) { - printk(KERN_DEBUG "endptctrl[%d]=0x%08x\n", + DBG(dev, "endptctrl[%d]=0x%08x\n", i, readl(&dev->op_regs->endptctrl[i])); } } +#else + +#define print_all_registers(dev) do { } while (0) + #endif /* VERBOSE */ /*-------------------------------------------------------------------------*/ -#define DIR_STRING(bAddress) (((bAddress) & USB_DIR_IN) ? "in" : "out") +#define is_in(ep) (((ep)->ep_num == 0) ? ((ep)->dev->ep0_dir == \ + USB_DIR_IN) : (usb_endpoint_dir_in((ep)->desc))) -#define is_in(ep) (((ep)->ep_num == 0) ? ((ep)->dev->ep0_dir == \ - USB_DIR_IN) : ((ep)->desc->bEndpointAddress \ - & USB_DIR_IN) == USB_DIR_IN) +#define DIR_STRING(ep) (is_in(ep) ? "in" : "out") #ifdef DEBUG -static char *type_string(u8 bmAttributes) +static char *type_string(const struct usb_endpoint_descriptor *desc) { - switch ((bmAttributes) & USB_ENDPOINT_XFERTYPE_MASK) { + switch (usb_endpoint_type(desc)) { case USB_ENDPOINT_XFER_BULK: return "bulk"; case USB_ENDPOINT_XFER_ISOC: @@ -274,11 +261,13 @@ static void ep0_reset(struct langwell_udc *dev) ep->dqh->dqh_ios = 1; ep->dqh->dqh_mpl = EP0_MAX_PKT_SIZE; - /* FIXME: enable ep0-in HW zero length termination select */ + /* enable ep0-in HW zero length termination select */ if (is_in(ep)) ep->dqh->dqh_zlt = 0; ep->dqh->dqh_mult = 0; + ep->dqh->dtd_next = DTD_TERM; + /* configure ep0 control registers */ ep_reset(&dev->ep[0], 0, i, USB_ENDPOINT_XFER_CONTROL); } @@ -300,7 +289,7 @@ static int langwell_ep_enable(struct usb_ep *_ep, struct langwell_ep *ep; u16 max = 0; unsigned long flags; - int retval = 0; + int i, retval = 0; unsigned char zlt, ios = 0, mult = 0; ep = container_of(_ep, struct langwell_ep, ep); @@ -326,7 +315,7 @@ static int langwell_ep_enable(struct usb_ep *_ep, * sanity check type, direction, address, and then * initialize the endpoint capabilities fields in dQH */ - switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) { + switch (usb_endpoint_type(desc)) { case USB_ENDPOINT_XFER_CONTROL: ios = 1; break; @@ -386,28 +375,31 @@ static int langwell_ep_enable(struct usb_ep *_ep, spin_lock_irqsave(&dev->lock, flags); - /* configure endpoint capabilities in dQH */ - ep->dqh->dqh_ios = ios; - ep->dqh->dqh_mpl = cpu_to_le16(max); - ep->dqh->dqh_zlt = zlt; - ep->dqh->dqh_mult = mult; - ep->ep.maxpacket = max; ep->desc = desc; ep->stopped = 0; - ep->ep_num = desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; + ep->ep_num = usb_endpoint_num(desc); /* ep_type */ - ep->ep_type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; + ep->ep_type = usb_endpoint_type(desc); /* configure endpoint control registers */ ep_reset(ep, ep->ep_num, is_in(ep), ep->ep_type); + /* configure endpoint capabilities in dQH */ + i = ep->ep_num * 2 + is_in(ep); + ep->dqh = &dev->ep_dqh[i]; + ep->dqh->dqh_ios = ios; + ep->dqh->dqh_mpl = cpu_to_le16(max); + ep->dqh->dqh_zlt = zlt; + ep->dqh->dqh_mult = mult; + ep->dqh->dtd_next = DTD_TERM; + DBG(dev, "enabled %s (ep%d%s-%s), max %04x\n", _ep->name, ep->ep_num, - DIR_STRING(desc->bEndpointAddress), - type_string(desc->bmAttributes), + DIR_STRING(ep), + type_string(desc), max); spin_unlock_irqrestore(&dev->lock, flags); @@ -617,7 +609,7 @@ static int queue_dtd(struct langwell_ep *ep, struct langwell_request *req) VDBG(dev, "%s\n", ep->name); else /* ep0 */ - VDBG(dev, "%s-%s\n", ep->name, is_in(ep) ? "in" : "out"); + VDBG(dev, "%s-%s\n", ep->name, DIR_STRING(ep)); VDBG(dev, "ep_dqh[%d] addr: 0x%08x\n", i, (u32)&(dev->ep_dqh[i])); @@ -667,6 +659,9 @@ static int queue_dtd(struct langwell_ep *ep, struct langwell_request *req) dqh->dtd_status &= dtd_status; VDBG(dev, "dqh->dtd_status = 0x%x\n", dqh->dtd_status); + /* ensure that updates to the dQH will occure before priming */ + wmb(); + /* write 1 to endptprime register to PRIME endpoint */ bit_mask = is_in(ep) ? (1 << (ep->ep_num + 16)) : (1 << ep->ep_num); VDBG(dev, "endprime bit_mask = 0x%08x\n", bit_mask); @@ -805,7 +800,7 @@ static int langwell_ep_queue(struct usb_ep *_ep, struct usb_request *_req, req->ep = ep; VDBG(dev, "---> %s()\n", __func__); - if (ep->desc->bmAttributes == USB_ENDPOINT_XFER_ISOC) { + if (usb_endpoint_xfer_isoc(ep->desc)) { if (req->req.length > ep->ep.maxpacket) return -EMSGSIZE; is_iso = 1; @@ -844,7 +839,7 @@ static int langwell_ep_queue(struct usb_ep *_ep, struct usb_request *_req, DBG(dev, "%s queue req %p, len %u, buf %p, dma 0x%08x\n", _ep->name, - _req, _req->length, _req->buf, _req->dma); + _req, _req->length, _req->buf, (int)_req->dma); _req->status = -EINPROGRESS; _req->actual = 0; @@ -1024,8 +1019,7 @@ static int langwell_ep_set_halt(struct usb_ep *_ep, int value) if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN) return -ESHUTDOWN; - if (ep->desc && (ep->desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) - == USB_ENDPOINT_XFER_ISOC) + if (usb_endpoint_xfer_isoc(ep->desc)) return -EOPNOTSUPP; spin_lock_irqsave(&dev->lock, flags); @@ -1094,7 +1088,7 @@ static void langwell_ep_fifo_flush(struct usb_ep *_ep) return; } - VDBG(dev, "%s-%s fifo flush\n", _ep->name, is_in(ep) ? "in" : "out"); + VDBG(dev, "%s-%s fifo flush\n", _ep->name, DIR_STRING(ep)); /* flush endpoint buffer */ if (ep->ep_num == 0) @@ -1181,6 +1175,7 @@ static int langwell_wakeup(struct usb_gadget *_gadget) { struct langwell_udc *dev; u32 portsc1, devlc; + u8 devlc_byte2; unsigned long flags; if (!_gadget) @@ -1189,9 +1184,11 @@ static int langwell_wakeup(struct usb_gadget *_gadget) dev = container_of(_gadget, struct langwell_udc, gadget); VDBG(dev, "---> %s()\n", __func__); - /* Remote Wakeup feature not enabled by host */ - if (!dev->remote_wakeup) + /* remote wakeup feature not enabled by host */ + if (!dev->remote_wakeup) { + INFO(dev, "remote wakeup is disabled\n"); return -ENOTSUPP; + } spin_lock_irqsave(&dev->lock, flags); @@ -1201,23 +1198,25 @@ static int langwell_wakeup(struct usb_gadget *_gadget) return 0; } - /* LPM L1 to L0, remote wakeup */ - if (dev->lpm && dev->lpm_state == LPM_L1) { - portsc1 |= PORTS_SLP; - writel(portsc1, &dev->op_regs->portsc1); - } - - /* force port resume */ - if (dev->usb_state == USB_STATE_SUSPENDED) { - portsc1 |= PORTS_FPR; - writel(portsc1, &dev->op_regs->portsc1); - } + /* LPM L1 to L0 or legacy remote wakeup */ + if (dev->lpm && dev->lpm_state == LPM_L1) + INFO(dev, "LPM L1 to L0 remote wakeup\n"); + else + INFO(dev, "device remote wakeup\n"); /* exit PHY low power suspend */ devlc = readl(&dev->op_regs->devlc); VDBG(dev, "devlc = 0x%08x\n", devlc); devlc &= ~LPM_PHCD; - writel(devlc, &dev->op_regs->devlc); + /* FIXME: workaround for Langwell A1/A2 sighting */ + devlc_byte2 = (devlc >> 16) & 0xff; + writeb(devlc_byte2, (u8 *)&dev->op_regs->devlc + 2); + devlc = readl(&dev->op_regs->devlc); + VDBG(dev, "exit PHY low power suspend, devlc = 0x%08x\n", devlc); + + /* force port resume */ + portsc1 |= PORTS_FPR; + writel(portsc1, &dev->op_regs->portsc1); spin_unlock_irqrestore(&dev->lock, flags); @@ -1346,6 +1345,7 @@ static const struct usb_gadget_ops langwell_ops = { static int langwell_udc_reset(struct langwell_udc *dev) { u32 usbcmd, usbmode, devlc, endpointlistaddr; + u8 devlc_byte0, devlc_byte2; unsigned long timeout; if (!dev) @@ -1390,9 +1390,16 @@ static int langwell_udc_reset(struct langwell_udc *dev) /* if support USB LPM, ACK all LPM token */ if (dev->lpm) { devlc = readl(&dev->op_regs->devlc); + VDBG(dev, "devlc = 0x%08x\n", devlc); + /* FIXME: workaround for Langwell A1/A2 sighting */ devlc &= ~LPM_STL; /* don't STALL LPM token */ devlc &= ~LPM_NYT_ACK; /* ACK LPM token */ - writel(devlc, &dev->op_regs->devlc); + devlc_byte0 = devlc & 0xff; + devlc_byte2 = (devlc >> 16) & 0xff; + writeb(devlc_byte0, (u8 *)&dev->op_regs->devlc); + writeb(devlc_byte2, (u8 *)&dev->op_regs->devlc + 2); + devlc = readl(&dev->op_regs->devlc); + VDBG(dev, "ACK LPM token, devlc = 0x%08x\n", devlc); } /* fill endpointlistaddr register */ @@ -1449,8 +1456,6 @@ static int eps_reinit(struct langwell_udc *dev) INIT_LIST_HEAD(&ep->queue); list_add_tail(&ep->ep.ep_list, &dev->gadget.ep_list); - - ep->dqh = &dev->ep_dqh[i]; } VDBG(dev, "<--- %s()\n", __func__); @@ -1539,20 +1544,92 @@ static void stop_activity(struct langwell_udc *dev, /*-------------------------------------------------------------------------*/ -/* device "function" sysfs attribute file */ -static ssize_t show_function(struct device *_dev, +#ifdef CONFIG_USB_GADGET_DYNAMIC_SWITCH +/* device "g_driver" sysfs attribute file */ +static ssize_t show_g_driver(struct device *_dev, struct device_attribute *attr, char *buf) { struct langwell_udc *dev = the_controller; - if (!dev->driver || !dev->driver->function - || strlen(dev->driver->function) > PAGE_SIZE) + if (!dev->driver || !dev->driver->driver.name + || strlen(dev->driver->driver.name) > PAGE_SIZE) return 0; - return scnprintf(buf, PAGE_SIZE, "%s\n", dev->driver->function); + return scnprintf(buf, PAGE_SIZE, "%s\n", dev->driver->driver.name); } -static DEVICE_ATTR(function, S_IRUGO, show_function, NULL); +static ssize_t store_g_driver(struct device *_dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + struct langwell_udc *dev = the_controller; + struct usb_gadget_driver *g_driver = NULL; + int i; + ssize_t rc = count; + u32 tmp_reg; + DBG(dev, "---> %s()\n", __func__); + + /* check mode if it is in Device mode */ + tmp_reg = readl(&dev->op_regs->usbmode); + if (MODE_CM(tmp_reg) != MODE_DEVICE) { + WARNING(dev, "gadget can be switched only in device mode\n"); + return -EPERM; + } + + /* check mode if Device function is active */ + tmp_reg = readl(&dev->op_regs->usbcmd); + tmp_reg &= CMD_RUNSTOP; + if (!tmp_reg) { + WARNING(dev, "client controller is not running\n"); + return -EPERM; + } + + if (count > 0 && buf[count-1] == '\n') + ((char *) buf)[count-1] = 0; + + DBG(dev, "buf: %s\n", buf); + + /* find the gadget driver which can be switched in built-in kernel */ + if (count > 0 && buf[0]) { + for (i = 0; i < 3; i++) { + if (!strcmp(g_driver_name[i], buf)) { + g_driver = dev->g_driver[i]; + break; + } + } + } + + if (g_driver) { + /* Check g_driver on switch support */ + if (!g_driver->init) { + WARNING(dev, "switch gadget is not support\n"); + return -EINVAL; + } + + if (dev->driver && dev->driver->exit) { + INFO(dev, "unload current g_driver\n"); + dev->driver->exit(); + } else { + WARNING(dev, "ERR: no exit entry\n"); + return -EINVAL; + } + + g_driver->driver.bus = NULL; + dev->driver = g_driver; + dev->gadget.dev.driver = &g_driver->driver; + + dev->switch_flag = 1; + + INFO(dev, "load new g_driver\n"); + + dev->driver->init(); + } else + rc = -EINVAL; + + DBG(dev, "<--- %s()\n", __func__); + return rc; +} +static DEVICE_ATTR(g_driver, S_IRUGO | S_IWUSR, show_g_driver, store_g_driver); +#endif /* device "langwell_udc" sysfs attribute file */ static ssize_t show_langwell_udc(struct device *_dev, @@ -1659,13 +1736,15 @@ static ssize_t show_langwell_udc(struct device *_dev, "Over-current Change: %s\n" "Port Enable/Disable Change: %s\n" "Port Enabled/Disabled: %s\n" - "Current Connect Status: %s\n\n", + "Current Connect Status: %s\n" + "LPM Suspend Status: %s\n\n", (tmp_reg & PORTS_PR) ? "Reset" : "Not Reset", (tmp_reg & PORTS_SUSP) ? "Suspend " : "Not Suspend", (tmp_reg & PORTS_OCC) ? "Detected" : "No", (tmp_reg & PORTS_PEC) ? "Changed" : "Not Changed", (tmp_reg & PORTS_PE) ? "Enable" : "Not Correct", - (tmp_reg & PORTS_CCS) ? "Attached" : "Not Attached"); + (tmp_reg & PORTS_CCS) ? "Attached" : "Not Attached", + (tmp_reg & PORTS_SLP) ? "LPM L1" : "LPM L0"); size -= t; next += t; @@ -1676,7 +1755,7 @@ static ssize_t show_langwell_udc(struct device *_dev, "Serial Transceiver : %d\n" "Port Speed: %s\n" "Port Force Full Speed Connenct: %s\n" - "PHY Low Power Suspend Clock Disable: %s\n" + "PHY Low Power Suspend Clock: %s\n" "BmAttributes: %d\n\n", LPM_PTS(tmp_reg), (tmp_reg & LPM_STS) ? 1 : 0, @@ -1797,6 +1876,40 @@ static ssize_t show_langwell_udc(struct device *_dev, static DEVICE_ATTR(langwell_udc, S_IRUGO, show_langwell_udc, NULL); +/* device "remote_wakeup" sysfs attribute file */ +static ssize_t store_remote_wakeup(struct device *_dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + struct langwell_udc *dev = the_controller; +#if defined(CONFIG_USB_DEBUG) + unsigned long flags; +#endif + ssize_t rc = count; + + if (count > 2) + return -EINVAL; + + if (count > 0 && buf[count-1] == '\n') + ((char *) buf)[count-1] = 0; + + if (buf[0] != '1') + return -EINVAL; + +#if defined(CONFIG_USB_DEBUG) + /* force remote wakeup enabled in case gadget driver doesn't support */ + spin_lock_irqsave(&dev->lock, flags); + dev->remote_wakeup = 1; + dev->dev_status |= (1 << USB_DEVICE_REMOTE_WAKEUP); + spin_unlock_irqrestore(&dev->lock, flags); +#endif + + langwell_wakeup(&dev->gadget); + + return rc; +} +static DEVICE_ATTR(remote_wakeup, S_IWUSR, NULL, store_remote_wakeup); + + /*-------------------------------------------------------------------------*/ /* @@ -1811,6 +1924,10 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) { struct langwell_udc *dev = the_controller; unsigned long flags; +#ifdef CONFIG_USB_GADGET_DYNAMIC_SWITCH + int support = 0; + int i; +#endif int retval; if (!dev) @@ -1818,8 +1935,31 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) DBG(dev, "---> %s()\n", __func__); + if (unlikely(!driver || !driver->bind)) + return -EINVAL; + +#ifdef CONFIG_USB_GADGET_DYNAMIC_SWITCH + if (!dev->switch_flag) { + for (i = 0; i < 3; i++) { + if (!strcmp(g_driver_name[i], driver->driver.name)) { + dev->g_driver[i] = driver; + support = 1; + break; + } + } + + if (!support) { + WARNING(dev, "do not support this gadget\n"); + return -EINVAL; + } + + if (dev->driver) + return 0; + } +#else if (dev->driver) return -EBUSY; +#endif spin_lock_irqsave(&dev->lock, flags); @@ -1839,34 +1979,24 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) return retval; } - retval = device_create_file(&dev->pdev->dev, &dev_attr_function); - if (retval) - goto err_unbind; - dev->usb_state = USB_STATE_ATTACHED; dev->ep0_state = WAIT_FOR_SETUP; dev->ep0_dir = USB_DIR_OUT; + /* bind OTG transceiver */ + if (dev->transceiver) + (void)otg_set_peripheral(dev->transceiver, &dev->gadget); + /* enable interrupt and set controller to run state */ if (dev->got_irq) langwell_udc_start(dev); VDBG(dev, "After langwell_udc_start(), print all registers:\n"); -#ifdef VERBOSE print_all_registers(dev); -#endif INFO(dev, "register driver: %s\n", driver->driver.name); - VDBG(dev, "<--- %s()\n", __func__); - return 0; - -err_unbind: - driver->unbind(&dev->gadget); - dev->gadget.dev.driver = NULL; - dev->driver = NULL; - DBG(dev, "<--- %s()\n", __func__); - return retval; + return 0; } EXPORT_SYMBOL(usb_gadget_register_driver); @@ -1882,7 +2012,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) DBG(dev, "---> %s()\n", __func__); - if (unlikely(!driver || !driver->bind || !driver->unbind)) + if (unlikely(!driver || !driver->unbind || !driver->disconnect)) return -EINVAL; /* unbind OTG transceiver */ @@ -1908,8 +2038,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) dev->gadget.dev.driver = NULL; dev->driver = NULL; - device_remove_file(&dev->pdev->dev, &dev_attr_function); - INFO(dev, "unregistered driver '%s'\n", driver->driver.name); DBG(dev, "<--- %s()\n", __func__); return 0; @@ -1917,6 +2045,55 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) EXPORT_SYMBOL(usb_gadget_unregister_driver); +/* gets the maximum power consumption */ +int langwell_udc_maxpower(int *mA) +{ + struct langwell_udc *dev = the_controller; + u32 usbmode, portsc1, usbcmd; + + /* fatal error */ + if (!dev) { + *mA = 0; + return -EOTGFAIL; + } + + DBG(dev, "---> %s()\n", __func__); + + /* contrller is not in device mode */ + usbmode = readl(&dev->op_regs->usbmode); + if (MODE_CM(usbmode) != MODE_DEVICE) { + *mA = 0; + return -EOTGNODEVICE; + } + + /* can't get maximum power */ + usbcmd = readl(&dev->op_regs->usbcmd); + if (!(usbcmd & CMD_RUNSTOP)) { + *mA = 0; + return -EOTGCHARGER; + } + + /* disconnect to USB host */ + portsc1 = readl(&dev->op_regs->portsc1); + if (!(portsc1 & PORTS_CCS)) { + *mA = 0; + return -EOTGDISCONN; + } + + /* set max power capability */ + *mA = CONFIG_USB_GADGET_VBUS_DRAW; + + if ((*mA < 8) || (*mA > 500)) { + *mA = 0; + return -EOTGINVAL; + } + + DBG(dev, "<--- %s()\n", __func__); + return 0; +} +EXPORT_SYMBOL(langwell_udc_maxpower); + + /*-------------------------------------------------------------------------*/ /* @@ -2113,8 +2290,7 @@ static void get_status(struct langwell_udc *dev, u8 request_type, u16 value, if ((request_type & USB_RECIP_MASK) == USB_RECIP_DEVICE) { /* get device status */ - status_data = 1 << USB_DEVICE_SELF_POWERED; - status_data |= dev->remote_wakeup << USB_DEVICE_REMOTE_WAKEUP; + status_data = dev->dev_status; } else if ((request_type & USB_RECIP_MASK) == USB_RECIP_INTERFACE) { /* get interface status */ status_data = 0; @@ -2129,6 +2305,8 @@ static void get_status(struct langwell_udc *dev, u8 request_type, u16 value, status_data = ep_is_stall(epn) << USB_ENDPOINT_HALT; } + DBG(dev, "get status data: 0x%04x\n", status_data); + dev->ep0_dir = USB_DIR_IN; /* borrow the per device status_req */ @@ -2247,22 +2425,37 @@ static void handle_setup_packet(struct langwell_udc *dev, } else if ((setup->bRequestType & (USB_RECIP_MASK | USB_TYPE_MASK)) == (USB_RECIP_DEVICE | USB_TYPE_STANDARD)) { - if (!gadget_is_otg(&dev->gadget)) + rc = 0; + switch (wValue) { + case USB_DEVICE_REMOTE_WAKEUP: + if (setup->bRequest == USB_REQ_SET_FEATURE) { + dev->remote_wakeup = 1; + dev->dev_status |= (1 << wValue); + } else { + dev->remote_wakeup = 0; + dev->dev_status &= ~(1 << wValue); + } break; - else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) { + case USB_DEVICE_B_HNP_ENABLE: dev->gadget.b_hnp_enable = 1; #ifdef OTG_TRANSCEIVER if (!dev->lotg->otg.default_a) dev->lotg->hsm.b_hnp_enable = 1; #endif - } else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT) + dev->dev_status |= (1 << wValue); + break; + case USB_DEVICE_A_HNP_SUPPORT: dev->gadget.a_hnp_support = 1; - else if (setup->bRequest == - USB_DEVICE_A_ALT_HNP_SUPPORT) + dev->dev_status |= (1 << wValue); + break; + case USB_DEVICE_A_ALT_HNP_SUPPORT: dev->gadget.a_alt_hnp_support = 1; - else + dev->dev_status |= (1 << wValue); break; - rc = 0; + default: + rc = -EOPNOTSUPP; + break; + } } else break; @@ -2387,7 +2580,7 @@ static int process_ep_req(struct langwell_udc *dev, int index, } else { /* transfers completed with errors */ if (dtd_status & DTD_STS_ACTIVE) { - DBG(dev, "request not completed\n"); + DBG(dev, "dTD status ACTIVE dQH[%d]\n", index); retval = 1; return retval; } else if (dtd_status & DTD_STS_HALTED) { @@ -2586,18 +2779,14 @@ static void handle_port_change(struct langwell_udc *dev) /* LPM L0 to L1 */ if (dev->lpm && dev->lpm_state == LPM_L0) if (portsc1 & PORTS_SUSP && portsc1 & PORTS_SLP) { - INFO(dev, "LPM L0 to L1\n"); - dev->lpm_state = LPM_L1; + INFO(dev, "LPM L0 to L1\n"); + dev->lpm_state = LPM_L1; } /* LPM L1 to L0, force resume or remote wakeup finished */ if (dev->lpm && dev->lpm_state == LPM_L1) if (!(portsc1 & PORTS_SUSP)) { - if (portsc1 & PORTS_SLP) - INFO(dev, "LPM L1 to L0, force resume\n"); - else - INFO(dev, "LPM L1 to L0, remote wakeup\n"); - + INFO(dev, "LPM L1 to L0\n"); dev->lpm_state = LPM_L0; } @@ -2634,7 +2823,10 @@ static void handle_usb_reset(struct langwell_udc *dev) dev->ep0_dir = USB_DIR_OUT; dev->ep0_state = WAIT_FOR_SETUP; - dev->remote_wakeup = 0; /* default to 0 on reset */ + + /* remote wakeup reset to 0 when the device is reset */ + dev->remote_wakeup = 0; + dev->dev_status = 1 << USB_DEVICE_SELF_POWERED; dev->gadget.b_hnp_enable = 0; dev->gadget.a_hnp_support = 0; dev->gadget.a_alt_hnp_support = 0; @@ -2699,6 +2891,7 @@ static void handle_usb_reset(struct langwell_udc *dev) static void handle_bus_suspend(struct langwell_udc *dev) { u32 devlc; + u8 devlc_byte2; DBG(dev, "---> %s()\n", __func__); dev->resume_state = dev->usb_state; @@ -2706,7 +2899,8 @@ static void handle_bus_suspend(struct langwell_udc *dev) #ifdef OTG_TRANSCEIVER if (dev->lotg->otg.default_a) { - if (dev->lotg->hsm.b_bus_suspend_vld == 1) { + /* ignore host LPM capability checking during enumeration */ + if (dev->lotg->hsm.b_bus_suspend_vld == 2) { dev->lotg->hsm.b_bus_suspend = 1; /* notify transceiver the state changes */ if (spin_trylock(&dev->lotg->wq_lock)) { @@ -2741,7 +2935,11 @@ static void handle_bus_suspend(struct langwell_udc *dev) devlc = readl(&dev->op_regs->devlc); VDBG(dev, "devlc = 0x%08x\n", devlc); devlc |= LPM_PHCD; - writel(devlc, &dev->op_regs->devlc); + /* FIXME: workaround for Langwell A1/A2 sighting */ + devlc_byte2 = (devlc >> 16) & 0xff; + writeb(devlc_byte2, (u8 *)&dev->op_regs->devlc + 2); + devlc = readl(&dev->op_regs->devlc); + VDBG(dev, "enter PHY low power suspend, devlc = 0x%08x\n", devlc); DBG(dev, "<--- %s()\n", __func__); } @@ -2750,6 +2948,7 @@ static void handle_bus_suspend(struct langwell_udc *dev) static void handle_bus_resume(struct langwell_udc *dev) { u32 devlc; + u8 devlc_byte2; DBG(dev, "---> %s()\n", __func__); dev->usb_state = dev->resume_state; @@ -2759,7 +2958,11 @@ static void handle_bus_resume(struct langwell_udc *dev) devlc = readl(&dev->op_regs->devlc); VDBG(dev, "devlc = 0x%08x\n", devlc); devlc &= ~LPM_PHCD; - writel(devlc, &dev->op_regs->devlc); + /* FIXME: workaround for Langwell A1/A2 sighting */ + devlc_byte2 = (devlc >> 16) & 0xff; + writeb(devlc_byte2, (u8 *)&dev->op_regs->devlc + 2); + devlc = readl(&dev->op_regs->devlc); + VDBG(dev, "exit PHY low power suspend, devlc = 0x%08x\n", devlc); #ifdef OTG_TRANSCEIVER if (dev->lotg->otg.default_a == 0) @@ -2898,6 +3101,50 @@ static void gadget_release(struct device *_dev) } +/* enable SRAM caching if SRAM detected */ +static void sram_init(struct langwell_udc *dev) +{ + struct pci_dev *pdev = dev->pdev; + + DBG(dev, "---> %s()\n", __func__); + + dev->sram_addr = pci_resource_start(pdev, 1); + dev->sram_size = pci_resource_len(pdev, 1); + INFO(dev, "Found private SRAM at %x size:%x\n", + dev->sram_addr, dev->sram_size); + dev->got_sram = 1; + + if (pci_request_region(pdev, 1, kobject_name(&pdev->dev.kobj))) { + WARNING(dev, "SRAM request failed\n"); + dev->got_sram = 0; + } else if (!dma_declare_coherent_memory(&pdev->dev, dev->sram_addr, + dev->sram_addr, dev->sram_size, DMA_MEMORY_MAP)) { + WARNING(dev, "SRAM DMA declare failed\n"); + pci_release_region(pdev, 1); + dev->got_sram = 0; + } + + DBG(dev, "<--- %s()\n", __func__); +} + + +/* release SRAM caching */ +static void sram_deinit(struct langwell_udc *dev) +{ + struct pci_dev *pdev = dev->pdev; + + DBG(dev, "---> %s()\n", __func__); + + dma_release_declared_memory(&pdev->dev); + pci_release_region(pdev, 1); + + dev->got_sram = 0; + + INFO(dev, "release SRAM caching\n"); + DBG(dev, "<--- %s()\n", __func__); +} + + /* tear down the binding between this driver and the pci device */ static void langwell_udc_remove(struct pci_dev *pdev) { @@ -2910,19 +3157,25 @@ static void langwell_udc_remove(struct pci_dev *pdev) dev->done = &done; - /* free memory allocated in probe */ +#ifndef OTG_TRANSCEIVER + /* free dTD dma_pool and dQH */ if (dev->dtd_pool) dma_pool_destroy(dev->dtd_pool); + if (dev->ep_dqh) + dma_free_coherent(&pdev->dev, dev->ep_dqh_size, + dev->ep_dqh, dev->ep_dqh_dma); + + /* release SRAM caching */ + if (dev->has_sram && dev->got_sram) + sram_deinit(dev); +#endif + if (dev->status_req) { kfree(dev->status_req->req.buf); kfree(dev->status_req); } - if (dev->ep_dqh) - dma_free_coherent(&pdev->dev, dev->ep_dqh_size, - dev->ep_dqh, dev->ep_dqh_dma); - kfree(dev->ep); /* diable IRQ handler */ @@ -2954,6 +3207,10 @@ static void langwell_udc_remove(struct pci_dev *pdev) device_unregister(&dev->gadget.dev); device_remove_file(&pdev->dev, &dev_attr_langwell_udc); + device_remove_file(&pdev->dev, &dev_attr_remote_wakeup); +#ifdef CONFIG_USB_GADGET_DYNAMIC_SWITCH + device_remove_file(&pdev->dev, &dev_attr_g_driver); +#endif #ifndef OTG_TRANSCEIVER pci_set_drvdata(pdev, NULL); @@ -2976,9 +3233,9 @@ static int langwell_udc_probe(struct pci_dev *pdev, struct langwell_udc *dev; #ifndef OTG_TRANSCEIVER unsigned long resource, len; + size_t size; #endif void __iomem *base = NULL; - size_t size; int retval; if (the_controller) { @@ -3049,7 +3306,15 @@ static int langwell_udc_probe(struct pci_dev *pdev, goto error; } + dev->has_sram = (sram_force_off) ? 0 : 1; + dev->got_sram = 0; + VDBG(dev, "dev->has_sram: %d\n", dev->has_sram); + #ifndef OTG_TRANSCEIVER + /* enable SRAM caching if detected */ + if (dev->has_sram && !dev->got_sram) + sram_init(dev); + INFO(dev, "irq %d, io mem: 0x%08lx, len: 0x%08lx, pci mem 0x%p\n", pdev->irq, resource, len, base); /* enables bus-mastering for device dev */ @@ -3094,6 +3359,7 @@ static int langwell_udc_probe(struct pci_dev *pdev, goto error; } +#ifndef OTG_TRANSCEIVER /* allocate device dQH memory */ size = dev->ep_max * sizeof(struct langwell_dqh); VDBG(dev, "orig size = %d\n", size); @@ -3112,6 +3378,7 @@ static int langwell_udc_probe(struct pci_dev *pdev, } dev->ep_dqh_size = size; VDBG(dev, "ep_dqh_size = %d\n", dev->ep_dqh_size); +#endif /* initialize ep0 status request structure */ dev->status_req = kzalloc(sizeof(struct langwell_request), GFP_KERNEL); @@ -3129,7 +3396,10 @@ static int langwell_udc_probe(struct pci_dev *pdev, dev->resume_state = USB_STATE_NOTATTACHED; dev->usb_state = USB_STATE_POWERED; dev->ep0_dir = USB_DIR_OUT; - dev->remote_wakeup = 0; /* default to 0 on reset */ + + /* remote wakeup reset to 0 when the device is reset */ + dev->remote_wakeup = 0; + dev->dev_status = 1 << USB_DEVICE_SELF_POWERED; #ifndef OTG_TRANSCEIVER /* reset device controller */ @@ -3159,7 +3429,6 @@ static int langwell_udc_probe(struct pci_dev *pdev, #ifndef OTG_TRANSCEIVER /* reset ep0 dQH and endptctrl */ ep0_reset(dev); -#endif /* create dTD dma_pool resource */ dev->dtd_pool = dma_pool_create("langwell_dtd", @@ -3172,6 +3441,7 @@ static int langwell_udc_probe(struct pci_dev *pdev, retval = -ENOMEM; goto error; } +#endif /* done */ INFO(dev, "%s\n", driver_desc); @@ -3183,9 +3453,7 @@ static int langwell_udc_probe(struct pci_dev *pdev, INFO(dev, "Support USB LPM: %s\n", dev->lpm ? "Yes" : "No"); VDBG(dev, "After langwell_udc_probe(), print all registers:\n"); -#ifdef VERBOSE print_all_registers(dev); -#endif the_controller = dev; @@ -3197,9 +3465,26 @@ static int langwell_udc_probe(struct pci_dev *pdev, if (retval) goto error; + retval = device_create_file(&pdev->dev, &dev_attr_remote_wakeup); + if (retval) + goto error_attr1; + +#ifdef CONFIG_USB_GADGET_DYNAMIC_SWITCH + dev->switch_flag = 0; + retval = device_create_file(&pdev->dev, &dev_attr_g_driver); + if (retval) + goto error_attr2; +#endif + VDBG(dev, "<--- %s()\n", __func__); return 0; +#ifdef CONFIG_USB_GADGET_DYNAMIC_SWITCH +error_attr2: + device_remove_file(&pdev->dev, &dev_attr_remote_wakeup); +#endif +error_attr1: + device_remove_file(&pdev->dev, &dev_attr_langwell_udc); error: if (dev) { DBG(dev, "<--- %s()\n", __func__); @@ -3215,6 +3500,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state) { struct langwell_udc *dev = the_controller; u32 devlc; + u8 devlc_byte2; DBG(dev, "---> %s()\n", __func__); @@ -3226,10 +3512,21 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state) free_irq(pdev->irq, dev); dev->got_irq = 0; - /* save PCI state */ pci_save_state(pdev); + /* free dTD dma_pool and dQH */ + if (dev->dtd_pool) + dma_pool_destroy(dev->dtd_pool); + + if (dev->ep_dqh) + dma_free_coherent(&pdev->dev, dev->ep_dqh_size, + dev->ep_dqh, dev->ep_dqh_dma); + + /* release SRAM caching */ + if (dev->has_sram && dev->got_sram) + sram_deinit(dev); + /* set device power state */ pci_set_power_state(pdev, PCI_D3hot); @@ -3237,7 +3534,11 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state) devlc = readl(&dev->op_regs->devlc); VDBG(dev, "devlc = 0x%08x\n", devlc); devlc |= LPM_PHCD; - writel(devlc, &dev->op_regs->devlc); + /* FIXME: workaround for Langwell A1/A2 sighting */ + devlc_byte2 = (devlc >> 16) & 0xff; + writeb(devlc_byte2, (u8 *)&dev->op_regs->devlc + 2); + devlc = readl(&dev->op_regs->devlc); + VDBG(dev, "enter PHY low power suspend, devlc = 0x%08x\n", devlc); DBG(dev, "<--- %s()\n", __func__); return 0; @@ -3249,6 +3550,8 @@ static int langwell_udc_resume(struct pci_dev *pdev) { struct langwell_udc *dev = the_controller; u32 devlc; + u8 devlc_byte2; + size_t size; DBG(dev, "---> %s()\n", __func__); @@ -3256,19 +3559,55 @@ static int langwell_udc_resume(struct pci_dev *pdev) devlc = readl(&dev->op_regs->devlc); VDBG(dev, "devlc = 0x%08x\n", devlc); devlc &= ~LPM_PHCD; - writel(devlc, &dev->op_regs->devlc); + /* FIXME: workaround for Langwell A1/A2 sighting */ + devlc_byte2 = (devlc >> 16) & 0xff; + writeb(devlc_byte2, (u8 *)&dev->op_regs->devlc + 2); + devlc = readl(&dev->op_regs->devlc); + VDBG(dev, "exit PHY low power suspend, devlc = 0x%08x\n", devlc); /* set device D0 power state */ pci_set_power_state(pdev, PCI_D0); + /* enable SRAM caching if detected */ + if (dev->has_sram && !dev->got_sram) + sram_init(dev); + + /* allocate device dQH memory */ + size = dev->ep_max * sizeof(struct langwell_dqh); + VDBG(dev, "orig size = %d\n", size); + if (size < DQH_ALIGNMENT) + size = DQH_ALIGNMENT; + else if ((size % DQH_ALIGNMENT) != 0) { + size += DQH_ALIGNMENT + 1; + size &= ~(DQH_ALIGNMENT - 1); + } + dev->ep_dqh = dma_alloc_coherent(&pdev->dev, size, + &dev->ep_dqh_dma, GFP_KERNEL); + if (!dev->ep_dqh) { + ERROR(dev, "allocate dQH memory failed\n"); + return -ENOMEM; + } + dev->ep_dqh_size = size; + VDBG(dev, "ep_dqh_size = %d\n", dev->ep_dqh_size); + + /* create dTD dma_pool resource */ + dev->dtd_pool = dma_pool_create("langwell_dtd", + &dev->pdev->dev, + sizeof(struct langwell_dtd), + DTD_ALIGNMENT, + DMA_BOUNDARY); + + if (!dev->dtd_pool) + return -ENOMEM; + /* restore PCI state */ pci_restore_state(pdev); /* enable IRQ handler */ - if (request_irq(pdev->irq, langwell_irq, IRQF_SHARED, driver_name, dev) - != 0) { + if (request_irq(pdev->irq, langwell_irq, IRQF_SHARED, + driver_name, dev) != 0) { ERROR(dev, "request interrupt %d failed\n", pdev->irq); - return -1; + return -EBUSY; } dev->got_irq = 1; diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h index 9719934..4eaa87e 100644 --- a/drivers/usb/gadget/langwell_udc.h +++ b/drivers/usb/gadget/langwell_udc.h @@ -174,7 +174,7 @@ enum lpm_state { struct langwell_udc { /* each pci device provides one gadget, several endpoints */ struct usb_gadget gadget; - spinlock_t lock; /* device lock */ + spinlock_t lock; /* device lock */ struct langwell_ep *ep; struct usb_gadget_driver *driver; struct otg_transceiver *transceiver; @@ -199,7 +199,10 @@ struct langwell_udc { vbus_active:1, suspended:1, stopped:1, - lpm:1; /* LPM capability */ + lpm:1, /* LPM capability */ + has_sram:1, /* SRAM caching */ + got_sram:1, + switch_flag; /* pci state used to access those endpoints */ struct pci_dev *pdev; @@ -224,5 +227,15 @@ struct langwell_udc { /* make sure release() is done */ struct completion *done; + + /* for private SRAM caching */ + unsigned int sram_addr; + unsigned int sram_size; + + /* device status data for get_status request */ + u16 dev_status; + + /* gadget driver array which can be switched in built-in kernel */ + struct usb_gadget_driver *g_driver[3]; }; diff --git a/include/linux/usb/langwell_udc.h b/include/linux/usb/langwell_udc.h index c949178..fe2c698 100644 --- a/include/linux/usb/langwell_udc.h +++ b/include/linux/usb/langwell_udc.h @@ -306,5 +306,18 @@ struct langwell_op_regs { #define EPCTRL_RXS BIT(0) /* RX endpoint STALL */ } __attribute__ ((packed)); + +/* export function declaration */ + +/* gets the maximum power consumption */ +extern int langwell_udc_maxpower(int *mA); + +/* return errors of langwell_udc_maxpower() */ +#define EOTGFAIL 1 +#define EOTGNODEVICE 2 +#define EOTGCHARGER 3 +#define EOTGDISCONN 4 +#define EOTGINVAL 5 + #endif /* __LANGWELL_UDC_H */ -- 1.6.2.5
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
