USB: UHCI: Add support for GRLIB GRUSBHC controller
This patch adds support for the UHCI part of the GRLIB GRUSBHC controller found on some LEON/GRLIB SoCs. The UHCI HCD previously only supported controllers connected over PCI. This patch adds support for the first non-PCI UHCI HC. I have tried to replicate the solution used in ehci-hcd.c. Tested on GR-LEON4-ITX board (LEON4/GRLIB with GRUSBHC) and x86 with Intel UHCI HC. Signed-off-by: Jan Andersson <jan@gaisler.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jan Andersson
Greg Kroah-Hartman
Родитель
d3219d1c4c
Коммит
3db7739c80
|
|
@ -396,7 +396,7 @@ config USB_OHCI_LITTLE_ENDIAN
|
|||
|
||||
config USB_UHCI_HCD
|
||||
tristate "UHCI HCD (most Intel and VIA) support"
|
||||
depends on USB && PCI
|
||||
depends on USB && (PCI || SPARC_LEON)
|
||||
---help---
|
||||
The Universal Host Controller Interface is a standard by Intel for
|
||||
accessing the USB hardware in the PC (which is also called the USB
|
||||
|
|
@ -405,7 +405,8 @@ config USB_UHCI_HCD
|
|||
with Intel PCI chipsets (like intel 430TX, 440FX, 440LX, 440BX,
|
||||
i810, i820) conform to this standard. Also all VIA PCI chipsets
|
||||
(like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro
|
||||
133). If unsure, say Y.
|
||||
133) and LEON/GRLIB SoCs with the GRUSBHC controller.
|
||||
If unsure, say Y.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called uhci-hcd.
|
||||
|
|
@ -413,6 +414,7 @@ config USB_UHCI_HCD
|
|||
config USB_UHCI_SUPPORT_NON_PCI_HC
|
||||
bool
|
||||
depends on USB_UHCI_HCD
|
||||
default y if SPARC_LEON
|
||||
|
||||
config USB_FHCI_HCD
|
||||
tristate "Freescale QE USB Host Controller support"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,194 @@
|
|||
/*
|
||||
* UHCI HCD (Host Controller Driver) for GRLIB GRUSBHC
|
||||
*
|
||||
* Copyright (c) 2011 Jan Andersson <jan@gaisler.com>
|
||||
*
|
||||
* This file is based on UHCI PCI HCD:
|
||||
* (C) Copyright 1999 Linus Torvalds
|
||||
* (C) Copyright 1999-2002 Johannes Erdfelt, johannes@erdfelt.com
|
||||
* (C) Copyright 1999 Randy Dunlap
|
||||
* (C) Copyright 1999 Georg Acher, acher@in.tum.de
|
||||
* (C) Copyright 1999 Deti Fliegl, deti@fliegl.de
|
||||
* (C) Copyright 1999 Thomas Sailer, sailer@ife.ee.ethz.ch
|
||||
* (C) Copyright 1999 Roman Weissgaerber, weissg@vienna.at
|
||||
* (C) Copyright 2000 Yggdrasil Computing, Inc. (port of new PCI interface
|
||||
* support from usb-ohci.c by Adam Richter, adam@yggdrasil.com).
|
||||
* (C) Copyright 1999 Gregory P. Smith (from usb-ohci.c)
|
||||
* (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
|
||||
*/
|
||||
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_platform.h>
|
||||
|
||||
static int uhci_grlib_init(struct usb_hcd *hcd)
|
||||
{
|
||||
struct uhci_hcd *uhci = hcd_to_uhci(hcd);
|
||||
|
||||
uhci->rh_numports = uhci_count_ports(hcd);
|
||||
|
||||
/* Set up pointers to to generic functions */
|
||||
uhci->reset_hc = uhci_generic_reset_hc;
|
||||
uhci->check_and_reset_hc = uhci_generic_check_and_reset_hc;
|
||||
/* No special actions need to be taken for the functions below */
|
||||
uhci->configure_hc = NULL;
|
||||
uhci->resume_detect_interrupts_are_broken = NULL;
|
||||
uhci->global_suspend_mode_is_broken = NULL;
|
||||
|
||||
/* Reset if the controller isn't already safely quiescent. */
|
||||
check_and_reset_hc(uhci);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct hc_driver uhci_grlib_hc_driver = {
|
||||
.description = hcd_name,
|
||||
.product_desc = "GRLIB GRUSBHC UHCI Host Controller",
|
||||
.hcd_priv_size = sizeof(struct uhci_hcd),
|
||||
|
||||
/* Generic hardware linkage */
|
||||
.irq = uhci_irq,
|
||||
.flags = HCD_MEMORY | HCD_USB11,
|
||||
|
||||
/* Basic lifecycle operations */
|
||||
.reset = uhci_grlib_init,
|
||||
.start = uhci_start,
|
||||
#ifdef CONFIG_PM
|
||||
.pci_suspend = NULL,
|
||||
.pci_resume = NULL,
|
||||
.bus_suspend = uhci_rh_suspend,
|
||||
.bus_resume = uhci_rh_resume,
|
||||
#endif
|
||||
.stop = uhci_stop,
|
||||
|
||||
.urb_enqueue = uhci_urb_enqueue,
|
||||
.urb_dequeue = uhci_urb_dequeue,
|
||||
|
||||
.endpoint_disable = uhci_hcd_endpoint_disable,
|
||||
.get_frame_number = uhci_hcd_get_frame_number,
|
||||
|
||||
.hub_status_data = uhci_hub_status_data,
|
||||
.hub_control = uhci_hub_control,
|
||||
};
|
||||
|
||||
|
||||
static int __devinit uhci_hcd_grlib_probe(struct platform_device *op)
|
||||
{
|
||||
struct device_node *dn = op->dev.of_node;
|
||||
struct usb_hcd *hcd;
|
||||
struct uhci_hcd *uhci = NULL;
|
||||
struct resource res;
|
||||
int irq;
|
||||
int rv;
|
||||
|
||||
if (usb_disabled())
|
||||
return -ENODEV;
|
||||
|
||||
dev_dbg(&op->dev, "initializing GRUSBHC UHCI USB Controller\n");
|
||||
|
||||
rv = of_address_to_resource(dn, 0, &res);
|
||||
if (rv)
|
||||
return rv;
|
||||
|
||||
/* usb_create_hcd requires dma_mask != NULL */
|
||||
op->dev.dma_mask = &op->dev.coherent_dma_mask;
|
||||
hcd = usb_create_hcd(&uhci_grlib_hc_driver, &op->dev,
|
||||
"GRUSBHC UHCI USB");
|
||||
if (!hcd)
|
||||
return -ENOMEM;
|
||||
|
||||
hcd->rsrc_start = res.start;
|
||||
hcd->rsrc_len = res.end - res.start + 1;
|
||||
|
||||
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
|
||||
printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
|
||||
rv = -EBUSY;
|
||||
goto err_rmr;
|
||||
}
|
||||
|
||||
irq = irq_of_parse_and_map(dn, 0);
|
||||
if (irq == NO_IRQ) {
|
||||
printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__);
|
||||
rv = -EBUSY;
|
||||
goto err_irq;
|
||||
}
|
||||
|
||||
hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
|
||||
if (!hcd->regs) {
|
||||
printk(KERN_ERR "%s: ioremap failed\n", __FILE__);
|
||||
rv = -ENOMEM;
|
||||
goto err_ioremap;
|
||||
}
|
||||
|
||||
uhci = hcd_to_uhci(hcd);
|
||||
|
||||
uhci->regs = hcd->regs;
|
||||
|
||||
rv = usb_add_hcd(hcd, irq, 0);
|
||||
if (rv)
|
||||
goto err_uhci;
|
||||
|
||||
return 0;
|
||||
|
||||
err_uhci:
|
||||
iounmap(hcd->regs);
|
||||
err_ioremap:
|
||||
irq_dispose_mapping(irq);
|
||||
err_irq:
|
||||
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
||||
err_rmr:
|
||||
usb_put_hcd(hcd);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
static int uhci_hcd_grlib_remove(struct platform_device *op)
|
||||
{
|
||||
struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
|
||||
|
||||
dev_set_drvdata(&op->dev, NULL);
|
||||
|
||||
dev_dbg(&op->dev, "stopping GRLIB GRUSBHC UHCI USB Controller\n");
|
||||
|
||||
usb_remove_hcd(hcd);
|
||||
|
||||
iounmap(hcd->regs);
|
||||
irq_dispose_mapping(hcd->irq);
|
||||
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
||||
|
||||
usb_put_hcd(hcd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Make sure the controller is quiescent and that we're not using it
|
||||
* any more. This is mainly for the benefit of programs which, like kexec,
|
||||
* expect the hardware to be idle: not doing DMA or generating IRQs.
|
||||
*
|
||||
* This routine may be called in a damaged or failing kernel. Hence we
|
||||
* do not acquire the spinlock before shutting down the controller.
|
||||
*/
|
||||
static void uhci_hcd_grlib_shutdown(struct platform_device *op)
|
||||
{
|
||||
struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
|
||||
|
||||
uhci_hc_died(hcd_to_uhci(hcd));
|
||||
}
|
||||
|
||||
static const struct of_device_id uhci_hcd_grlib_of_match[] = {
|
||||
{ .name = "GAISLER_UHCI", },
|
||||
{ .name = "01_027", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, uhci_hcd_grlib_of_match);
|
||||
|
||||
|
||||
static struct platform_driver uhci_grlib_driver = {
|
||||
.probe = uhci_hcd_grlib_probe,
|
||||
.remove = uhci_hcd_grlib_remove,
|
||||
.shutdown = uhci_hcd_grlib_shutdown,
|
||||
.driver = {
|
||||
.name = "grlib-uhci",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = uhci_hcd_grlib_of_match,
|
||||
},
|
||||
};
|
||||
|
|
@ -831,7 +831,19 @@ static int uhci_count_ports(struct usb_hcd *hcd)
|
|||
|
||||
static const char hcd_name[] = "uhci_hcd";
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
#include "uhci-pci.c"
|
||||
#define PCI_DRIVER uhci_pci_driver
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SPARC_LEON
|
||||
#include "uhci-grlib.c"
|
||||
#define PLATFORM_DRIVER uhci_grlib_driver
|
||||
#endif
|
||||
|
||||
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER)
|
||||
#error "missing bus glue for uhci-hcd"
|
||||
#endif
|
||||
|
||||
static int __init uhci_hcd_init(void)
|
||||
{
|
||||
|
|
@ -858,13 +870,27 @@ static int __init uhci_hcd_init(void)
|
|||
if (!uhci_up_cachep)
|
||||
goto up_failed;
|
||||
|
||||
retval = pci_register_driver(&uhci_pci_driver);
|
||||
if (retval)
|
||||
goto init_failed;
|
||||
#ifdef PLATFORM_DRIVER
|
||||
retval = platform_driver_register(&PLATFORM_DRIVER);
|
||||
if (retval < 0)
|
||||
goto clean0;
|
||||
#endif
|
||||
|
||||
#ifdef PCI_DRIVER
|
||||
retval = pci_register_driver(&PCI_DRIVER);
|
||||
if (retval < 0)
|
||||
goto clean1;
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
init_failed:
|
||||
#ifdef PCI_DRIVER
|
||||
clean1:
|
||||
#endif
|
||||
#ifdef PLATFORM_DRIVER
|
||||
platform_driver_unregister(&PLATFORM_DRIVER);
|
||||
clean0:
|
||||
#endif
|
||||
kmem_cache_destroy(uhci_up_cachep);
|
||||
|
||||
up_failed:
|
||||
|
|
@ -881,7 +907,12 @@ errbuf_failed:
|
|||
|
||||
static void __exit uhci_hcd_cleanup(void)
|
||||
{
|
||||
pci_unregister_driver(&uhci_pci_driver);
|
||||
#ifdef PLATFORM_DRIVER
|
||||
platform_driver_unregister(&PLATFORM_DRIVER);
|
||||
#endif
|
||||
#ifdef PCI_DRIVER
|
||||
pci_unregister_driver(&PCI_DRIVER);
|
||||
#endif
|
||||
kmem_cache_destroy(uhci_up_cachep);
|
||||
debugfs_remove(uhci_debugfs_root);
|
||||
kfree(errbuf);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче