forked from Minki/linux
428aac8a81
All 4 transfer types can work well on EHCI HCD after switching to run URB giveback in tasklet context, so mark all HCD drivers to support it. Also we don't need to release ehci->lock during URB giveback any more. >From below test results on 3 machines(2 ARM and one x86), time consumed by EHCI interrupt handler droped much without performance loss. 1 test description 1.1 mass storage performance test: - run below command 10 times and compute the average performance dd if=/dev/sdN iflag=direct of=/dev/null bs=200M count=1 - two usb mass storage device: A: sandisk extreme USB 3.0 16G(used in test case 1 & case 2) B: kingston DataTraveler G2 4GB(only used in test case 2) 1.2 uvc function test: - run one simple capture program in the below link http://kernel.ubuntu.com/~ming/up/capture.c - capture format 640*480 and results in High Bandwidth mode on the uvc device: Z-Star 0x0ac8/0x3450 - on T410(x86) laptop, also use guvcview to watch video capture/playback 1.3 about test2 and test4 - both two devices involved are tested concurrently by above test items 1.4 how to compute irq time(the time consumed by ehci_irq) - use trace points of irq:irq_handler_entry and irq:irq_handler_exit 1.5 kernel 3.10.0-rc3-next-20130528 1.6 test machines Pandaboard A1: ARM CortexA9 dural core Arndale board: ARM CortexA15 dural core T410: i5 CPU 2.67GHz quad core 2 test result 2.1 test case1: single mass storage device performance test -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 25.280(avg:145,max:772) | 25.540(avg:14, max:75) Arndale board: 29.700(avg:33, max:129) | 29.700(avg:10, max:50) T410: 34.430(avg:17, max:154*)| 34.660(avg:12, max:155) --------------------------------------------------------------------- 2.2 test case2: two mass storage devices' performance test -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 15.840/15.580(avg:158,max:1216) | 16.500/16.160(avg:15,max:139) Arndale board: 17.370/16.220(avg:33 max:234) | 17.480/16.200(avg:11, max:91) T410: 21.180/19.820(avg:18 max:160) | 21.220/19.880(avg:11, max:149) --------------------------------------------------------------------- 2.3 test case3: one uvc streaming test - uvc device works well(on x86, luvcview can be used too and has same result with uvc capture) -------------------------------------------------------------------- upstream | patched irq time(us) | irq time(us) -------------------------------------------------------------------- Pandaboard A1: (avg:445, max:873) | (avg:33, max:44) Arndale board: (avg:316, max:630) | (avg:20, max:27) T410: (avg:39, max:107) | (avg:10, max:65) --------------------------------------------------------------------- 2.4 test case4: one uvc streaming plus one mass storage device test -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 20.340(avg:259,max:1704)| 20.390(avg:24, max:101) Arndale board: 23.460(avg:124,max:726) | 23.370(avg:15, max:52) T410: 28.520(avg:27, max:169) | 28.630(avg:13, max:160) --------------------------------------------------------------------- 2.5 test case5: read single mass storage device with small transfer - run below command 10 times and compute the average speed dd if=/dev/sdN iflag=direct of=/dev/null bs=4K count=4000 1), test device A: -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 6.5(avg:21, max:64) | 6.5(avg:10, max:24) Arndale board: 8.13(avg:12, max:23) | 8.06(avg:7, max:17) T410: 6.66(avg:13, max:131) | 6.84(avg:11, max:149) --------------------------------------------------------------------- 2), test device B: -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 5.5(avg:21,max:43) | 5.49(avg:10, max:24) Arndale board: 5.9(avg:12, max:22) | 5.9(avg:7, max:17) T410: 5.48(avg:13, max:155) | 5.48(avg:7, max:140) --------------------------------------------------------------------- * On T410, sometimes read ehci status register in ehci_irq takes more than 100us, and the problem has been reported on the link: http://marc.info/?t=137065867300001&r=1&w=2 Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
369 lines
8.6 KiB
C
369 lines
8.6 KiB
C
/*
|
|
* PMC MSP EHCI (Host Controller Driver) for USB.
|
|
*
|
|
* (C) Copyright 2006-2010 PMC-Sierra Inc
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
*/
|
|
|
|
/* includes */
|
|
#include <linux/platform_device.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/usb.h>
|
|
#include <msp_usb.h>
|
|
|
|
/* stream disable*/
|
|
#define USB_CTRL_MODE_STREAM_DISABLE 0x10
|
|
|
|
/* threshold */
|
|
#define USB_CTRL_FIFO_THRESH 0x00300000
|
|
|
|
/* register offset for usb_mode */
|
|
#define USB_EHCI_REG_USB_MODE 0x68
|
|
|
|
/* register offset for usb fifo */
|
|
#define USB_EHCI_REG_USB_FIFO 0x24
|
|
|
|
/* register offset for usb status */
|
|
#define USB_EHCI_REG_USB_STATUS 0x44
|
|
|
|
/* serial/parallel transceiver */
|
|
#define USB_EHCI_REG_BIT_STAT_STS (1<<29)
|
|
|
|
/* TWI USB0 host device pin */
|
|
#define MSP_PIN_USB0_HOST_DEV 49
|
|
|
|
/* TWI USB1 host device pin */
|
|
#define MSP_PIN_USB1_HOST_DEV 50
|
|
|
|
|
|
static void usb_hcd_tdi_set_mode(struct ehci_hcd *ehci)
|
|
{
|
|
u8 *base;
|
|
u8 *statreg;
|
|
u8 *fiforeg;
|
|
u32 val;
|
|
struct ehci_regs *reg_base = ehci->regs;
|
|
|
|
/* get register base */
|
|
base = (u8 *)reg_base + USB_EHCI_REG_USB_MODE;
|
|
statreg = (u8 *)reg_base + USB_EHCI_REG_USB_STATUS;
|
|
fiforeg = (u8 *)reg_base + USB_EHCI_REG_USB_FIFO;
|
|
|
|
/* Disable controller mode stream */
|
|
val = ehci_readl(ehci, (u32 *)base);
|
|
ehci_writel(ehci, (val | USB_CTRL_MODE_STREAM_DISABLE),
|
|
(u32 *)base);
|
|
|
|
/* clear STS to select parallel transceiver interface */
|
|
val = ehci_readl(ehci, (u32 *)statreg);
|
|
val = val & ~USB_EHCI_REG_BIT_STAT_STS;
|
|
ehci_writel(ehci, val, (u32 *)statreg);
|
|
|
|
/* write to set the proper fifo threshold */
|
|
ehci_writel(ehci, USB_CTRL_FIFO_THRESH, (u32 *)fiforeg);
|
|
|
|
/* set TWI GPIO USB_HOST_DEV pin high */
|
|
gpio_direction_output(MSP_PIN_USB0_HOST_DEV, 1);
|
|
#ifdef CONFIG_MSP_HAS_DUAL_USB
|
|
gpio_direction_output(MSP_PIN_USB1_HOST_DEV, 1);
|
|
#endif
|
|
}
|
|
|
|
/* called during probe() after chip reset completes */
|
|
static int ehci_msp_setup(struct usb_hcd *hcd)
|
|
{
|
|
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
|
int retval;
|
|
|
|
ehci->big_endian_mmio = 1;
|
|
ehci->big_endian_desc = 1;
|
|
|
|
ehci->caps = hcd->regs;
|
|
hcd->has_tt = 1;
|
|
|
|
retval = ehci_setup(hcd);
|
|
if (retval)
|
|
return retval;
|
|
|
|
usb_hcd_tdi_set_mode(ehci);
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
/* configure so an HC device and id are always provided
|
|
* always called with process context; sleeping is OK
|
|
*/
|
|
|
|
static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
|
|
{
|
|
struct resource *res;
|
|
struct platform_device *pdev = &dev->dev;
|
|
u32 res_len;
|
|
int retval;
|
|
|
|
/* MAB register space */
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
if (res == NULL)
|
|
return -ENOMEM;
|
|
res_len = resource_size(res);
|
|
if (!request_mem_region(res->start, res_len, "mab regs"))
|
|
return -EBUSY;
|
|
|
|
dev->mab_regs = ioremap_nocache(res->start, res_len);
|
|
if (dev->mab_regs == NULL) {
|
|
retval = -ENOMEM;
|
|
goto err1;
|
|
}
|
|
|
|
/* MSP USB register space */
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
|
|
if (res == NULL) {
|
|
retval = -ENOMEM;
|
|
goto err2;
|
|
}
|
|
res_len = resource_size(res);
|
|
if (!request_mem_region(res->start, res_len, "usbid regs")) {
|
|
retval = -EBUSY;
|
|
goto err2;
|
|
}
|
|
dev->usbid_regs = ioremap_nocache(res->start, res_len);
|
|
if (dev->usbid_regs == NULL) {
|
|
retval = -ENOMEM;
|
|
goto err3;
|
|
}
|
|
|
|
return 0;
|
|
err3:
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
|
|
res_len = resource_size(res);
|
|
release_mem_region(res->start, res_len);
|
|
err2:
|
|
iounmap(dev->mab_regs);
|
|
err1:
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
res_len = resource_size(res);
|
|
release_mem_region(res->start, res_len);
|
|
dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n");
|
|
return retval;
|
|
}
|
|
|
|
/**
|
|
* usb_hcd_msp_probe - initialize PMC MSP-based HCDs
|
|
* Context: !in_interrupt()
|
|
*
|
|
* Allocates basic resources for this USB host controller, and
|
|
* then invokes the start() method for the HCD associated with it
|
|
* through the hotplug entry's driver_data.
|
|
*
|
|
*/
|
|
int usb_hcd_msp_probe(const struct hc_driver *driver,
|
|
struct platform_device *dev)
|
|
{
|
|
int retval;
|
|
struct usb_hcd *hcd;
|
|
struct resource *res;
|
|
struct ehci_hcd *ehci ;
|
|
|
|
hcd = usb_create_hcd(driver, &dev->dev, "pmcmsp");
|
|
if (!hcd)
|
|
return -ENOMEM;
|
|
|
|
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
|
if (res == NULL) {
|
|
pr_debug("No IOMEM resource info for %s.\n", dev->name);
|
|
retval = -ENOMEM;
|
|
goto err1;
|
|
}
|
|
hcd->rsrc_start = res->start;
|
|
hcd->rsrc_len = resource_size(res);
|
|
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) {
|
|
retval = -EBUSY;
|
|
goto err1;
|
|
}
|
|
hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
|
|
if (!hcd->regs) {
|
|
pr_debug("ioremap failed");
|
|
retval = -ENOMEM;
|
|
goto err2;
|
|
}
|
|
|
|
res = platform_get_resource(dev, IORESOURCE_IRQ, 0);
|
|
if (res == NULL) {
|
|
dev_err(&dev->dev, "No IRQ resource info for %s.\n", dev->name);
|
|
retval = -ENOMEM;
|
|
goto err3;
|
|
}
|
|
|
|
/* Map non-EHCI register spaces */
|
|
retval = usb_hcd_msp_map_regs(to_mspusb_device(dev));
|
|
if (retval != 0)
|
|
goto err3;
|
|
|
|
ehci = hcd_to_ehci(hcd);
|
|
ehci->big_endian_mmio = 1;
|
|
ehci->big_endian_desc = 1;
|
|
|
|
|
|
retval = usb_add_hcd(hcd, res->start, IRQF_SHARED);
|
|
if (retval == 0)
|
|
return 0;
|
|
|
|
usb_remove_hcd(hcd);
|
|
err3:
|
|
iounmap(hcd->regs);
|
|
err2:
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
err1:
|
|
usb_put_hcd(hcd);
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
* usb_hcd_msp_remove - shutdown processing for PMC MSP-based HCDs
|
|
* @dev: USB Host Controller being removed
|
|
* Context: !in_interrupt()
|
|
*
|
|
* Reverses the effect of usb_hcd_msp_probe(), first invoking
|
|
* the HCD's stop() method. It is always called from a thread
|
|
* context, normally "rmmod", "apmd", or something similar.
|
|
*
|
|
* may be called without controller electrically present
|
|
* may be called with controller, bus, and devices active
|
|
*/
|
|
void usb_hcd_msp_remove(struct usb_hcd *hcd, struct platform_device *dev)
|
|
{
|
|
usb_remove_hcd(hcd);
|
|
iounmap(hcd->regs);
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
usb_put_hcd(hcd);
|
|
}
|
|
|
|
#ifdef CONFIG_MSP_HAS_DUAL_USB
|
|
/*
|
|
* Wrapper around the main ehci_irq. Since both USB host controllers are
|
|
* sharing the same IRQ, need to first determine whether we're the intended
|
|
* recipient of this interrupt.
|
|
*/
|
|
static irqreturn_t ehci_msp_irq(struct usb_hcd *hcd)
|
|
{
|
|
u32 int_src;
|
|
struct device *dev = hcd->self.controller;
|
|
struct platform_device *pdev;
|
|
struct mspusb_device *mdev;
|
|
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
|
/* need to reverse-map a couple of containers to get our device */
|
|
pdev = to_platform_device(dev);
|
|
mdev = to_mspusb_device(pdev);
|
|
|
|
/* Check to see if this interrupt is for this host controller */
|
|
int_src = ehci_readl(ehci, &mdev->mab_regs->int_stat);
|
|
if (int_src & (1 << pdev->id))
|
|
return ehci_irq(hcd);
|
|
|
|
/* Not for this device */
|
|
return IRQ_NONE;
|
|
}
|
|
#endif /* DUAL_USB */
|
|
|
|
static const struct hc_driver ehci_msp_hc_driver = {
|
|
.description = hcd_name,
|
|
.product_desc = "PMC MSP EHCI",
|
|
.hcd_priv_size = sizeof(struct ehci_hcd),
|
|
|
|
/*
|
|
* generic hardware linkage
|
|
*/
|
|
#ifdef CONFIG_MSP_HAS_DUAL_USB
|
|
.irq = ehci_msp_irq,
|
|
#else
|
|
.irq = ehci_irq,
|
|
#endif
|
|
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
|
|
|
|
/*
|
|
* basic lifecycle operations
|
|
*/
|
|
.reset = ehci_msp_setup,
|
|
.shutdown = ehci_shutdown,
|
|
.start = ehci_run,
|
|
.stop = ehci_stop,
|
|
|
|
/*
|
|
* managing i/o requests and associated device resources
|
|
*/
|
|
.urb_enqueue = ehci_urb_enqueue,
|
|
.urb_dequeue = ehci_urb_dequeue,
|
|
.endpoint_disable = ehci_endpoint_disable,
|
|
.endpoint_reset = ehci_endpoint_reset,
|
|
|
|
/*
|
|
* scheduling support
|
|
*/
|
|
.get_frame_number = ehci_get_frame,
|
|
|
|
/*
|
|
* root hub support
|
|
*/
|
|
.hub_status_data = ehci_hub_status_data,
|
|
.hub_control = ehci_hub_control,
|
|
.bus_suspend = ehci_bus_suspend,
|
|
.bus_resume = ehci_bus_resume,
|
|
.relinquish_port = ehci_relinquish_port,
|
|
.port_handed_over = ehci_port_handed_over,
|
|
|
|
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
|
|
};
|
|
|
|
static int ehci_hcd_msp_drv_probe(struct platform_device *pdev)
|
|
{
|
|
int ret;
|
|
|
|
pr_debug("In ehci_hcd_msp_drv_probe");
|
|
|
|
if (usb_disabled())
|
|
return -ENODEV;
|
|
|
|
gpio_request(MSP_PIN_USB0_HOST_DEV, "USB0_HOST_DEV_GPIO");
|
|
#ifdef CONFIG_MSP_HAS_DUAL_USB
|
|
gpio_request(MSP_PIN_USB1_HOST_DEV, "USB1_HOST_DEV_GPIO");
|
|
#endif
|
|
|
|
ret = usb_hcd_msp_probe(&ehci_msp_hc_driver, pdev);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int ehci_hcd_msp_drv_remove(struct platform_device *pdev)
|
|
{
|
|
struct usb_hcd *hcd = platform_get_drvdata(pdev);
|
|
|
|
usb_hcd_msp_remove(hcd, pdev);
|
|
|
|
/* free TWI GPIO USB_HOST_DEV pin */
|
|
gpio_free(MSP_PIN_USB0_HOST_DEV);
|
|
#ifdef CONFIG_MSP_HAS_DUAL_USB
|
|
gpio_free(MSP_PIN_USB1_HOST_DEV);
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
MODULE_ALIAS("pmcmsp-ehci");
|
|
|
|
static struct platform_driver ehci_hcd_msp_driver = {
|
|
.probe = ehci_hcd_msp_drv_probe,
|
|
.remove = ehci_hcd_msp_drv_remove,
|
|
.driver = {
|
|
.name = "pmcmsp-ehci",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|