mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 10:31:48 +00:00
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>
239 lines
6.4 KiB
C
239 lines
6.4 KiB
C
/*
|
|
* EHCI HCD (Host Controller Driver) for USB.
|
|
*
|
|
* Bus Glue for Xilinx EHCI core on the of_platform bus
|
|
*
|
|
* Copyright (c) 2009 Xilinx, Inc.
|
|
*
|
|
* Based on "ehci-ppc-of.c" by Valentine Barshak <vbarshak@ru.mvista.com>
|
|
* and "ehci-ppc-soc.c" by Stefan Roese <sr@denx.de>
|
|
* and "ohci-ppc-of.c" by Sylvain Munaut <tnt@246tNt.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/signal.h>
|
|
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of_address.h>
|
|
|
|
/**
|
|
* ehci_xilinx_port_handed_over - hand the port out if failed to enable it
|
|
* @hcd: Pointer to the usb_hcd device to which the host controller bound
|
|
* @portnum:Port number to which the device is attached.
|
|
*
|
|
* This function is used as a place to tell the user that the Xilinx USB host
|
|
* controller does support LS devices. And in an HS only configuration, it
|
|
* does not support FS devices either. It is hoped that this can help a
|
|
* confused user.
|
|
*
|
|
* There are cases when the host controller fails to enable the port due to,
|
|
* for example, insufficient power that can be supplied to the device from
|
|
* the USB bus. In those cases, the messages printed here are not helpful.
|
|
*/
|
|
static int ehci_xilinx_port_handed_over(struct usb_hcd *hcd, int portnum)
|
|
{
|
|
dev_warn(hcd->self.controller, "port %d cannot be enabled\n", portnum);
|
|
if (hcd->has_tt) {
|
|
dev_warn(hcd->self.controller,
|
|
"Maybe you have connected a low speed device?\n");
|
|
|
|
dev_warn(hcd->self.controller,
|
|
"We do not support low speed devices\n");
|
|
} else {
|
|
dev_warn(hcd->self.controller,
|
|
"Maybe your device is not a high speed device?\n");
|
|
dev_warn(hcd->self.controller,
|
|
"The USB host controller does not support full speed "
|
|
"nor low speed devices\n");
|
|
dev_warn(hcd->self.controller,
|
|
"You can reconfigure the host controller to have "
|
|
"full speed support\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static const struct hc_driver ehci_xilinx_of_hc_driver = {
|
|
.description = hcd_name,
|
|
.product_desc = "OF EHCI",
|
|
.hcd_priv_size = sizeof(struct ehci_hcd),
|
|
|
|
/*
|
|
* generic hardware linkage
|
|
*/
|
|
.irq = ehci_irq,
|
|
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
|
|
|
|
/*
|
|
* basic lifecycle operations
|
|
*/
|
|
.reset = ehci_setup,
|
|
.start = ehci_run,
|
|
.stop = ehci_stop,
|
|
.shutdown = ehci_shutdown,
|
|
|
|
/*
|
|
* 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,
|
|
#ifdef CONFIG_PM
|
|
.bus_suspend = ehci_bus_suspend,
|
|
.bus_resume = ehci_bus_resume,
|
|
#endif
|
|
.relinquish_port = NULL,
|
|
.port_handed_over = ehci_xilinx_port_handed_over,
|
|
|
|
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
|
|
};
|
|
|
|
/**
|
|
* ehci_hcd_xilinx_of_probe - Probe method for the USB host controller
|
|
* @op: pointer to the platform_device bound to the host controller
|
|
*
|
|
* This function requests resources and sets up appropriate properties for the
|
|
* host controller. Because the Xilinx USB host controller can be configured
|
|
* as HS only or HS/FS only, it checks the configuration in the device tree
|
|
* entry, and sets an appropriate value for hcd->has_tt.
|
|
*/
|
|
static int ehci_hcd_xilinx_of_probe(struct platform_device *op)
|
|
{
|
|
struct device_node *dn = op->dev.of_node;
|
|
struct usb_hcd *hcd;
|
|
struct ehci_hcd *ehci;
|
|
struct resource res;
|
|
int irq;
|
|
int rv;
|
|
int *value;
|
|
|
|
if (usb_disabled())
|
|
return -ENODEV;
|
|
|
|
dev_dbg(&op->dev, "initializing XILINX-OF USB Controller\n");
|
|
|
|
rv = of_address_to_resource(dn, 0, &res);
|
|
if (rv)
|
|
return rv;
|
|
|
|
hcd = usb_create_hcd(&ehci_xilinx_of_hc_driver, &op->dev,
|
|
"XILINX-OF USB");
|
|
if (!hcd)
|
|
return -ENOMEM;
|
|
|
|
hcd->rsrc_start = res.start;
|
|
hcd->rsrc_len = resource_size(&res);
|
|
|
|
irq = irq_of_parse_and_map(dn, 0);
|
|
if (!irq) {
|
|
printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__);
|
|
rv = -EBUSY;
|
|
goto err_irq;
|
|
}
|
|
|
|
hcd->regs = devm_ioremap_resource(&op->dev, &res);
|
|
if (IS_ERR(hcd->regs)) {
|
|
rv = PTR_ERR(hcd->regs);
|
|
goto err_irq;
|
|
}
|
|
|
|
ehci = hcd_to_ehci(hcd);
|
|
|
|
/* This core always has big-endian register interface and uses
|
|
* big-endian memory descriptors.
|
|
*/
|
|
ehci->big_endian_mmio = 1;
|
|
ehci->big_endian_desc = 1;
|
|
|
|
/* Check whether the FS support option is selected in the hardware.
|
|
*/
|
|
value = (int *)of_get_property(dn, "xlnx,support-usb-fs", NULL);
|
|
if (value && (*value == 1)) {
|
|
ehci_dbg(ehci, "USB host controller supports FS devices\n");
|
|
hcd->has_tt = 1;
|
|
} else {
|
|
ehci_dbg(ehci,
|
|
"USB host controller is HS only\n");
|
|
hcd->has_tt = 0;
|
|
}
|
|
|
|
/* Debug registers are at the first 0x100 region
|
|
*/
|
|
ehci->caps = hcd->regs + 0x100;
|
|
|
|
rv = usb_add_hcd(hcd, irq, 0);
|
|
if (rv == 0)
|
|
return 0;
|
|
|
|
err_irq:
|
|
usb_put_hcd(hcd);
|
|
|
|
return rv;
|
|
}
|
|
|
|
/**
|
|
* ehci_hcd_xilinx_of_remove - shutdown hcd and release resources
|
|
* @op: pointer to platform_device structure that is to be removed
|
|
*
|
|
* Remove the hcd structure, and release resources that has been requested
|
|
* during probe.
|
|
*/
|
|
static int ehci_hcd_xilinx_of_remove(struct platform_device *op)
|
|
{
|
|
struct usb_hcd *hcd = platform_get_drvdata(op);
|
|
|
|
dev_dbg(&op->dev, "stopping XILINX-OF USB Controller\n");
|
|
|
|
usb_remove_hcd(hcd);
|
|
|
|
usb_put_hcd(hcd);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id ehci_hcd_xilinx_of_match[] = {
|
|
{.compatible = "xlnx,xps-usb-host-1.00.a",},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, ehci_hcd_xilinx_of_match);
|
|
|
|
static struct platform_driver ehci_hcd_xilinx_of_driver = {
|
|
.probe = ehci_hcd_xilinx_of_probe,
|
|
.remove = ehci_hcd_xilinx_of_remove,
|
|
.shutdown = usb_hcd_platform_shutdown,
|
|
.driver = {
|
|
.name = "xilinx-of-ehci",
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = ehci_hcd_xilinx_of_match,
|
|
},
|
|
};
|