From patchwork Tue Apr 16 06:04:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: manjunath.goudar@linaro.org X-Patchwork-Id: 16140 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-gg0-f200.google.com (mail-gg0-f200.google.com [209.85.161.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 73DDF2395D for ; Tue, 16 Apr 2013 06:05:22 +0000 (UTC) Received: by mail-gg0-f200.google.com with SMTP id i2sf213239ggn.7 for ; Mon, 15 Apr 2013 23:04:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=XcJm7o2C9IFqoH2f29oqGqkLOlrcvUvqtbsOZQhNVmE=; b=KKf47RC9LaLRR4ukNPASwIRHineppem1u3RuI6/ZFU9PYfd9+kGZ34QJzk5AuajvPb YlagRobcDFFvQ0KoE+f4rqgxksn9rJCrc1QSVHh8pGjJu6+ciL8i4zTzmm9bXaQZ5P+e 3bpViYR9H9s5f/abmYq9zhwd82lHRvzaNX8ZBJHWdNP2BOi6uHxbBa4DxK0YHX/Inz4b jrNtgpvPTqRvGXfM9v5ESnE1y4XIuKEBo+LQm7VqTQNDTsEbx0CEY7eviDb6Vg0/T/Dt aTGScmK3nWPTGeW4ofTIMmSmOrzYVWfjDeJGBu7tiqtKkAowpDQ18gRzfyPdlRpR/XZS Pjhg== X-Received: by 10.224.217.195 with SMTP id hn3mr946272qab.5.1366092290055; Mon, 15 Apr 2013 23:04:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.130.227 with SMTP id oh3ls171492qeb.57.gmail; Mon, 15 Apr 2013 23:04:49 -0700 (PDT) X-Received: by 10.52.159.6 with SMTP id wy6mr484865vdb.18.1366092289905; Mon, 15 Apr 2013 23:04:49 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id ex4si379888vdb.53.2013.04.15.23.04.49 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Apr 2013 23:04:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id m1so105272ves.34 for ; Mon, 15 Apr 2013 23:04:49 -0700 (PDT) X-Received: by 10.52.71.4 with SMTP id q4mr492689vdu.8.1366092289598; Mon, 15 Apr 2013 23:04:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp8533veb; Mon, 15 Apr 2013 23:04:48 -0700 (PDT) X-Received: by 10.66.245.75 with SMTP id xm11mr1753654pac.40.1366092288483; Mon, 15 Apr 2013 23:04:48 -0700 (PDT) Received: from mail-da0-x230.google.com (mail-da0-x230.google.com [2607:f8b0:400e:c00::230]) by mx.google.com with ESMTPS id tr3si744727pbc.228.2013.04.15.23.04.48 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Apr 2013 23:04:48 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c00::230 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=2607:f8b0:400e:c00::230; Received: by mail-da0-f48.google.com with SMTP id p8so88263dan.35 for ; Mon, 15 Apr 2013 23:04:47 -0700 (PDT) X-Received: by 10.66.252.6 with SMTP id zo6mr1729310pac.100.1366092287879; Mon, 15 Apr 2013 23:04:47 -0700 (PDT) Received: from manjunath-Latitude-E6420.LGE.NET ([203.247.149.152]) by mx.google.com with ESMTPS id ra9sm1252434pab.16.2013.04.15.23.04.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Apr 2013 23:04:47 -0700 (PDT) From: manjunath.goudar@linaro.org To: manjunath.goudar@linaro.org Cc: arnd@linaro.org, patches@linaro.org Subject: [REF PATCH 2/2] USB: OHCI: make ohci-pci a separate driver Date: Tue, 16 Apr 2013 11:34:28 +0530 Message-Id: <516ce9ff.c98b420a.1599.5b3d@mx.google.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366092268-4458-1-git-send-email-y> References: <1366092268-4458-1-git-send-email-y> X-Gm-Message-State: ALoCoQkPdvXQsqaA4FlQZKCOeDwDxNK1tsGEXEP7yfaCFG4ojvH90ew/ESRk+0nhEpTu/FuWQlUh X-Original-Sender: manjunath.goudar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Manjunath Goudar This patch splits the PCI portion of ohci-hcd out into its own separate driver module, called ohci-pci. Consistently with the current practice, the decision whether to build this module is not user-configurable. If OHCI_PCI are enabled then the module will be built, always. Signed-off-by: Manjunath Goudar Cc: Arnd Bergmann Cc: Greg KH Cc: Alan Stern Cc: linux-usb@vger.kernel.org --- drivers/usb/host/Kconfig | 5 +++ drivers/usb/host/Makefile | 1 + drivers/usb/host/ohci-hcd.c | 31 +-------------- drivers/usb/host/ohci-mem.c | 1 - drivers/usb/host/ohci-pci.c | 93 ++++++++++++++++++++----------------------- drivers/usb/host/ohci.h | 6 ++- 6 files changed, 56 insertions(+), 81 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 7a1a248..8bd53e2 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -333,6 +333,11 @@ config USB_ISP1362_HCD To compile this driver as a module, choose M here: the module will be called isp1362-hcd. +config USB_OHCI_PCI + tristate "OHCI PCI support" + depends on USB_OHCI_HCD + default y + config USB_OHCI_HCD tristate "OHCI HCD support" depends on USB && USB_ARCH_HAS_OHCI diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 58c14c1..39ddcca 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -41,6 +41,7 @@ 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_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 diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 073917c..391a2d5 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -78,24 +78,13 @@ static const char hcd_name [] = "ohci_hcd"; #include "ohci.h" #include "pci-quirks.h" -static void ohci_dump (struct ohci_hcd *ohci, int verbose); - -#ifdef CONFIG_PCI -static void sb800_prefetch(struct ohci_hcd *ohci, int on); -#else -static inline void sb800_prefetch(struct ohci_hcd *ohci, int on) -{ - return; -} -#endif - +static void ohci_dump(struct ohci_hcd *ohci, int verbose); #include "ohci-hub.c" #include "ohci-dbg.c" #include "ohci-mem.c" #include "ohci-q.c" - /* * On architectures with edge-triggered interrupts we must never return * IRQ_NONE. @@ -585,7 +574,6 @@ int ohci_init(struct ohci_hcd *ohci) return ret; } EXPORT_SYMBOL_GPL(ohci_init); - /*-------------------------------------------------------------------------*/ /* Start an OHCI controller, set the BUS operational @@ -1148,11 +1136,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 @@ -1248,7 +1231,7 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ohci_platform_driver #endif -#if !defined(PCI_DRIVER) && \ +#if !IS_ENABLED(CONFIG_USB_OHCI_PCI) && \ !defined(PLATFORM_DRIVER) && \ !defined(OMAP1_PLATFORM_DRIVER) && \ !defined(OMAP3_PLATFORM_DRIVER) && \ @@ -1323,12 +1306,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) @@ -1422,10 +1399,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: diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c index 1a4dede..f98727f 100644 --- a/drivers/usb/host/ohci-mem.c +++ b/drivers/usb/host/ohci-mem.c @@ -30,7 +30,6 @@ void ohci_hcd_init (struct ohci_hcd *ohci) INIT_LIST_HEAD (&ohci->pending); } EXPORT_SYMBOL_GPL(ohci_hcd_init); - /*-------------------------------------------------------------------------*/ static int ohci_mem_init (struct ohci_hcd *ohci) diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 951514e..a313305 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -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 #include +#include +#include +#include +#include +#include + +#include "ohci.h" +#include "pci-quirks.h" + +#define DRIVER_DESC "OHCI PCI platform driver" + +static const char hcd_name[] = "ohci-pci"; /*-------------------------------------------------------------------------*/ @@ -175,7 +182,7 @@ static int ohci_quirk_amd700(struct usb_hcd *hcd) return 0; } -static void sb800_prefetch(struct ohci_hcd *ohci, int on) +void sb800_prefetch(struct ohci_hcd *ohci, int on) { struct pci_dev *pdev; u16 misc; @@ -187,6 +194,7 @@ static void sb800_prefetch(struct ohci_hcd *ohci, int on) else pci_write_config_word(pdev, 0x50, misc | 0x0300); } +EXPORT_SYMBOL_GPL(sb800_prefetch); /* List of quirks for OHCI */ static const struct pci_device_id ohci_pci_quirks[] = { @@ -299,57 +307,21 @@ static int ohci_pci_start (struct usb_hcd *hcd) /*-------------------------------------------------------------------------*/ -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 - */ - .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, +#define ohci_suspend NULL +#define ohci_resume NULL #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, +static struct hc_driver __read_mostly ohci_pci_hc_driver; - /* - * 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 ohci_driver_overrides overrides = { + .product_desc = "OHCI PCI host controller", + .reset = ohci_pci_reset, + .start = ohci_pci_start, }; -/*-------------------------------------------------------------------------*/ - - static const struct pci_device_id pci_ids [] = { { /* handle any USB OHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0), @@ -377,3 +349,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, &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"); diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index c7adb9c..9917ec0 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -440,6 +440,7 @@ static inline int quirk_amdprefetch(struct ohci_hcd *ohci) { return ohci->flags & OHCI_QUIRK_AMD_PREFETCH; } +extern void sb800_prefetch(struct ohci_hcd *ohci, int on); #else static inline int quirk_nec(struct ohci_hcd *ohci) { @@ -457,6 +458,10 @@ static inline int quirk_amdprefetch(struct ohci_hcd *ohci) { return 0; } +static void sb800_prefetch(struct ohci_hcd *ohci, int on) +{ + return 0; +} #endif /* convert between an hcd pointer and the corresponding ohci_hcd */ @@ -734,7 +739,6 @@ extern int ohci_init (struct ohci_hcd *ohci); extern void ohci_stop (struct usb_hcd *hcd); extern void ohci_hcd_init (struct ohci_hcd *ohci); extern int ohci_run (struct ohci_hcd *ohci); - #if defined(CONFIG_PM) || defined(CONFIG_PCI) extern int ohci_restart (struct ohci_hcd *ohci); #endif