USB: OHCI: make ohci-pci a separate driver
This patch splits the PCI portion of ohci-hcd out into its own separate driver module, called ohci-pci. The major point of difficulty lies in ohci-pci's many vendor- and device-specific workarounds. Some of them have to be applied before calling ohci_start() some after, which necessitates a fair amount of code motion. The other platform drivers require much smaller changes. The complete sb800_prefetch() function moved to ohci-q.c,because its only related to ohci-pci driver. USB_OHCI_HCD_PCI symbol no longer dependence on STB03xxx, PPC_MPC52xx and USB_OHCI_HCD_PPC_OF that's what removed. V2: - few specific content of pci related code in ohci_pci_start function has been moved to ohci_pci_reset and rest of the generic code is written in ohci_start of ohci-hcd.c file. V3: - ohci_restart() has been called in ohci_pci_reset() function for to reset the ohci pci. V4: -sb800_prefetch() moved to ohci-q.c,because its only related to ohci-pci. -no longer _creating_ CONFIG_USB_OHCI_PCI,creating CONFIG_USB_OHCI_HCD_PCI. -overrides renamed with pci_override,its giving proper meaning. V5: -sb800_prefetch() moved to pci-quirks.c,because its only related to pci. V6: -sb800_prefetch() function has been moved to pci-quirks.c made as separate patch in 2/3. -Most of the generic ohci pci changes moved in 2/3 patch,now this is complete ohci-pci separation patch. V7: -Unrelated include file has been removed from ohci.h file. V8: -USB_OHCI_HCD_PCI symbol does not dependence on STB03xxx, PPC_MPC52xx and USB_OHCI_HCD_PPC_OF. Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
2621d0119e
Коммит
c1117afb85
|
@ -357,7 +357,7 @@ config USB_FUSBH200_HCD
|
|||
module will be called fusbh200-hcd.
|
||||
|
||||
config USB_OHCI_HCD
|
||||
tristate "OHCI HCD support"
|
||||
tristate "OHCI HCD (USB 1.1) support"
|
||||
depends on USB_ARCH_HAS_OHCI
|
||||
select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
|
||||
depends on USB_ISP1301 || !ARCH_LPC32XX
|
||||
|
@ -426,8 +426,8 @@ config USB_OHCI_HCD_PPC_OF
|
|||
default USB_OHCI_HCD_PPC_OF_BE || USB_OHCI_HCD_PPC_OF_LE
|
||||
|
||||
config USB_OHCI_HCD_PCI
|
||||
bool "OHCI support for PCI-bus USB controllers"
|
||||
depends on PCI && (STB03xxx || PPC_MPC52xx || USB_OHCI_HCD_PPC_OF)
|
||||
tristate "OHCI support for PCI-bus USB controllers"
|
||||
depends on PCI
|
||||
default y
|
||||
select USB_OHCI_LITTLE_ENDIAN
|
||||
---help---
|
||||
|
|
|
@ -37,7 +37,10 @@ obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
|
|||
obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
|
||||
obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
|
||||
obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o
|
||||
|
||||
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
|
||||
obj-$(CONFIG_USB_OHCI_HCD_PCI) += ohci-pci.o
|
||||
|
||||
obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
|
||||
obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
|
||||
obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o
|
||||
|
|
|
@ -1172,11 +1172,6 @@ MODULE_AUTHOR (DRIVER_AUTHOR);
|
|||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE ("GPL");
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
#include "ohci-pci.c"
|
||||
#define PCI_DRIVER ohci_pci_driver
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_SA1111)
|
||||
#include "ohci-sa1111.c"
|
||||
#define SA1111_DRIVER ohci_hcd_sa1111_driver
|
||||
|
@ -1272,7 +1267,7 @@ MODULE_LICENSE ("GPL");
|
|||
#define PLATFORM_DRIVER ohci_platform_driver
|
||||
#endif
|
||||
|
||||
#if !defined(PCI_DRIVER) && \
|
||||
#if !IS_ENABLED(CONFIG_USB_OHCI_HCD_PCI) && \
|
||||
!defined(PLATFORM_DRIVER) && \
|
||||
!defined(OMAP1_PLATFORM_DRIVER) && \
|
||||
!defined(OMAP3_PLATFORM_DRIVER) && \
|
||||
|
@ -1347,12 +1342,6 @@ static int __init ohci_hcd_mod_init(void)
|
|||
goto error_sa1111;
|
||||
#endif
|
||||
|
||||
#ifdef PCI_DRIVER
|
||||
retval = pci_register_driver(&PCI_DRIVER);
|
||||
if (retval < 0)
|
||||
goto error_pci;
|
||||
#endif
|
||||
|
||||
#ifdef SM501_OHCI_DRIVER
|
||||
retval = platform_driver_register(&SM501_OHCI_DRIVER);
|
||||
if (retval < 0)
|
||||
|
@ -1446,10 +1435,6 @@ static int __init ohci_hcd_mod_init(void)
|
|||
platform_driver_unregister(&SM501_OHCI_DRIVER);
|
||||
error_sm501:
|
||||
#endif
|
||||
#ifdef PCI_DRIVER
|
||||
pci_unregister_driver(&PCI_DRIVER);
|
||||
error_pci:
|
||||
#endif
|
||||
#ifdef SA1111_DRIVER
|
||||
sa1111_driver_unregister(&SA1111_DRIVER);
|
||||
error_sa1111:
|
||||
|
@ -1514,9 +1499,6 @@ static void __exit ohci_hcd_mod_exit(void)
|
|||
#ifdef SM501_OHCI_DRIVER
|
||||
platform_driver_unregister(&SM501_OHCI_DRIVER);
|
||||
#endif
|
||||
#ifdef PCI_DRIVER
|
||||
pci_unregister_driver(&PCI_DRIVER);
|
||||
#endif
|
||||
#ifdef SA1111_DRIVER
|
||||
sa1111_driver_unregister(&SA1111_DRIVER);
|
||||
#endif
|
||||
|
|
|
@ -14,12 +14,19 @@
|
|||
* This file is licenced under the GPL.
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_PCI
|
||||
#error "This file is PCI bus glue. CONFIG_PCI must be defined."
|
||||
#endif
|
||||
|
||||
#include <linux/pci.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/usb/hcd.h>
|
||||
|
||||
#include "ohci.h"
|
||||
#include "pci-quirks.h"
|
||||
|
||||
#define DRIVER_DESC "OHCI PCI platform driver"
|
||||
|
||||
static const char hcd_name[] = "ohci-pci";
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
@ -229,10 +236,10 @@ static const struct pci_device_id ohci_pci_quirks[] = {
|
|||
static int ohci_pci_reset (struct usb_hcd *hcd)
|
||||
{
|
||||
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
||||
struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
|
||||
int ret = 0;
|
||||
|
||||
if (hcd->self.controller) {
|
||||
struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
|
||||
const struct pci_device_id *quirk_id;
|
||||
|
||||
quirk_id = pci_match_id(ohci_pci_quirks, pdev);
|
||||
|
@ -242,94 +249,25 @@ static int ohci_pci_reset (struct usb_hcd *hcd)
|
|||
ret = quirk(hcd);
|
||||
}
|
||||
}
|
||||
if (ret == 0) {
|
||||
ohci_hcd_init (ohci);
|
||||
return ohci_init (ohci);
|
||||
}
|
||||
|
||||
if (ret == 0)
|
||||
ret = ohci_setup(hcd);
|
||||
/*
|
||||
* After ohci setup RWC may not be set for add-in PCI cards.
|
||||
* This transfers PCI PM wakeup capabilities.
|
||||
*/
|
||||
if (device_can_wakeup(&pdev->dev))
|
||||
ohci->hc_control |= OHCI_CTRL_RWC;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct hc_driver __read_mostly ohci_pci_hc_driver;
|
||||
|
||||
static int ohci_pci_start (struct usb_hcd *hcd)
|
||||
{
|
||||
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
||||
int ret;
|
||||
|
||||
#ifdef CONFIG_PM /* avoid warnings about unused pdev */
|
||||
if (hcd->self.controller) {
|
||||
struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
|
||||
|
||||
/* RWC may not be set for add-in PCI cards, since boot
|
||||
* firmware probably ignored them. This transfers PCI
|
||||
* PM wakeup capabilities.
|
||||
*/
|
||||
if (device_can_wakeup(&pdev->dev))
|
||||
ohci->hc_control |= OHCI_CTRL_RWC;
|
||||
}
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
ret = ohci_run (ohci);
|
||||
if (ret < 0) {
|
||||
ohci_err (ohci, "can't start\n");
|
||||
ohci_stop (hcd);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static const struct hc_driver ohci_pci_hc_driver = {
|
||||
.description = hcd_name,
|
||||
.product_desc = "OHCI Host Controller",
|
||||
.hcd_priv_size = sizeof(struct ohci_hcd),
|
||||
|
||||
/*
|
||||
* generic hardware linkage
|
||||
*/
|
||||
.irq = ohci_irq,
|
||||
.flags = HCD_MEMORY | HCD_USB11,
|
||||
|
||||
/*
|
||||
* basic lifecycle operations
|
||||
*/
|
||||
static const struct ohci_driver_overrides pci_overrides __initconst = {
|
||||
.product_desc = "OHCI PCI host controller",
|
||||
.reset = ohci_pci_reset,
|
||||
.start = ohci_pci_start,
|
||||
.stop = ohci_stop,
|
||||
.shutdown = ohci_shutdown,
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
.pci_suspend = ohci_suspend,
|
||||
.pci_resume = ohci_resume,
|
||||
#endif
|
||||
|
||||
/*
|
||||
* managing i/o requests and associated device resources
|
||||
*/
|
||||
.urb_enqueue = ohci_urb_enqueue,
|
||||
.urb_dequeue = ohci_urb_dequeue,
|
||||
.endpoint_disable = ohci_endpoint_disable,
|
||||
|
||||
/*
|
||||
* scheduling support
|
||||
*/
|
||||
.get_frame_number = ohci_get_frame,
|
||||
|
||||
/*
|
||||
* root hub support
|
||||
*/
|
||||
.hub_status_data = ohci_hub_status_data,
|
||||
.hub_control = ohci_hub_control,
|
||||
#ifdef CONFIG_PM
|
||||
.bus_suspend = ohci_bus_suspend,
|
||||
.bus_resume = ohci_bus_resume,
|
||||
#endif
|
||||
.start_port_reset = ohci_start_port_reset,
|
||||
};
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
static const struct pci_device_id pci_ids [] = { {
|
||||
/* handle any USB OHCI controller */
|
||||
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
|
||||
|
@ -357,3 +295,24 @@ static struct pci_driver ohci_pci_driver = {
|
|||
},
|
||||
#endif
|
||||
};
|
||||
|
||||
static int __init ohci_pci_init(void)
|
||||
{
|
||||
if (usb_disabled())
|
||||
return -ENODEV;
|
||||
|
||||
pr_info("%s: " DRIVER_DESC "\n", hcd_name);
|
||||
|
||||
ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides);
|
||||
return pci_register_driver(&ohci_pci_driver);
|
||||
}
|
||||
module_init(ohci_pci_init);
|
||||
|
||||
static void __exit ohci_pci_cleanup(void)
|
||||
{
|
||||
pci_unregister_driver(&ohci_pci_driver);
|
||||
}
|
||||
module_exit(ohci_pci_cleanup);
|
||||
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
Загрузка…
Ссылка в новой задаче