| Message ID | 1364507705-22012-3-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 29, 2013 at 3:25 AM, Arnd Bergmann <arnd@arndb.de> wrote: > From: Manjunath Goudar <manjunath.goudar@linaro.org> > > Separate the SPEAr host controller driver from ehci-hcd host code > so that it can be built as a separate driver module. > This work is part of enabling multi-platform kernels on ARM; > however, note that other changes are still needed before SPEAr can be > booted with a multi-platform kernel, but they are queued in the > arm-soc tree for 3.10. > > With the infrastructure added by Alan Stern in patch 3e0232039 > "USB: EHCI: prepare to make ehci-hcd a library module", we can > avoid this problem by turning a bus glue into a separate > module, as we do here for the SPEAr bus glue. > > In V3: > -Detailed commit message added here about why this patch is required. > -Eliminated ehci_spear_setup routine beacuse hcd registers > directly setting in spear_ehci_hcd_drv_probe function. > -spear_overrides struct initialized. > -Eliminate struct ehci_hcd ehci from struct spear_ehci,to enable SPEAr clock > uses directly usb_hcd *hcd in spear_start_ehci function. > -to_spear_ehci() macro modified for spear_ehci. > > In V2: > Replaced spear as SPEAr everywhere, leaving functions/variables/config options. > > Signed-off-by: Deepak Saxena <dsaxena@linaro.org> > Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Acked-by: Viresh Kumar <viresh.linux@gmail.com> This version has changed from what i Acked, but it still looks fine. Thanks. Viresh
On Thu, 28 Mar 2013, Arnd Bergmann wrote: > From: Manjunath Goudar <manjunath.goudar@linaro.org> > > Separate the SPEAr host controller driver from ehci-hcd host code > so that it can be built as a separate driver module. > This work is part of enabling multi-platform kernels on ARM; > however, note that other changes are still needed before SPEAr can be > booted with a multi-platform kernel, but they are queued in the > arm-soc tree for 3.10. > > With the infrastructure added by Alan Stern in patch 3e0232039 > "USB: EHCI: prepare to make ehci-hcd a library module", we can > avoid this problem by turning a bus glue into a separate > module, as we do here for the SPEAr bus glue. > > In V3: > -Detailed commit message added here about why this patch is required. > -Eliminated ehci_spear_setup routine beacuse hcd registers > directly setting in spear_ehci_hcd_drv_probe function. Fix the grammar, please. > -spear_overrides struct initialized. > -Eliminate struct ehci_hcd ehci from struct spear_ehci,to enable SPEAr clock > uses directly usb_hcd *hcd in spear_start_ehci function. > -to_spear_ehci() macro modified for spear_ehci. > > In V2: > Replaced spear as SPEAr everywhere, leaving functions/variables/config options. ... > @@ -34,49 +45,7 @@ static void spear_stop_ehci(struct spear_ehci *ehci) > clk_disable_unprepare(ehci->clk); > } > > -static int ehci_spear_setup(struct usb_hcd *hcd) > -{ > - struct ehci_hcd *ehci = hcd_to_ehci(hcd); > - > - /* registers start at offset 0x0 */ > - ehci->caps = hcd->regs; This line never got moved into spear_ehci_hcd_drv_probe(). > @@ -161,7 +130,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) > goto err_put_hcd; > } > > - ehci = (struct spear_ehci *)hcd_to_ehci(hcd); > + ehci = to_spear_ehci(hcd); > ehci->clk = usbh_clk; I strongly believe that the name "ehci" should be reserved for variables of type struct ehci_hcd. Here and in the start, stop, and remove routines, please use "spear_ehci" as the name for a variable of type struct spear_ehci. Or whatever else you want -- just don't call it "ehci" or "ehci_p". Alan Stern
On Friday 29 March 2013, Alan Stern wrote: > On Thu, 28 Mar 2013, Arnd Bergmann wrote: > > > From: Manjunath Goudar <manjunath.goudar@linaro.org> > > > > Separate the SPEAr host controller driver from ehci-hcd host code > > so that it can be built as a separate driver module. > > This work is part of enabling multi-platform kernels on ARM; > > however, note that other changes are still needed before SPEAr can be > > booted with a multi-platform kernel, but they are queued in the > > arm-soc tree for 3.10. > > > > With the infrastructure added by Alan Stern in patch 3e0232039 > > "USB: EHCI: prepare to make ehci-hcd a library module", we can > > avoid this problem by turning a bus glue into a separate > > module, as we do here for the SPEAr bus glue. > > > > In V3: > > -Detailed commit message added here about why this patch is required. > > -Eliminated ehci_spear_setup routine beacuse hcd registers > > directly setting in spear_ehci_hcd_drv_probe function. > > Fix the grammar, please. Done. I agree some of this is hardly legible. Manjunath, I can teach you about device drivers and submission procedures, but I cannot teach you basic English. If necessary, find someone to proofread your emails. > > -static int ehci_spear_setup(struct usb_hcd *hcd) > > -{ > > - struct ehci_hcd *ehci = hcd_to_ehci(hcd); > > - > > - /* registers start at offset 0x0 */ > > - ehci->caps = hcd->regs; > > This line never got moved into spear_ehci_hcd_drv_probe(). Ah, I missed it. Thanks for looking at this more carefully than I did. > > @@ -161,7 +130,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) > > goto err_put_hcd; > > } > > > > - ehci = (struct spear_ehci *)hcd_to_ehci(hcd); > > + ehci = to_spear_ehci(hcd); > > ehci->clk = usbh_clk; > > I strongly believe that the name "ehci" should be reserved for > variables of type struct ehci_hcd. Here and in the start, stop, and > remove routines, please use "spear_ehci" as the name for a variable of > type struct spear_ehci. Or whatever else you want -- just don't call > it "ehci" or "ehci_p". Ok, renamed to "sehci" in lack of a better idea. I noticed this before, but I did not ask Manjunath to fix it because it was a preexisting mistake in the driver. Arnd
On Saturday 30 March 2013, Arnd Bergmann wrote: > > > In V3: > > > -Detailed commit message added here about why this patch is required. > > > -Eliminated ehci_spear_setup routine beacuse hcd registers > > > directly setting in spear_ehci_hcd_drv_probe function. > > > > Fix the grammar, please. > > Done. I agree some of this is hardly legible. > I realized later that the other patches have similarly screwed up changelogs. I'll send a new version once you've commented on v4, so in case there is anything else I missed I'm not spamming everyone another time. Arnd
On Sun, 31 Mar 2013, Arnd Bergmann wrote: > On Saturday 30 March 2013, Arnd Bergmann wrote: > > > > In V3: > > > > -Detailed commit message added here about why this patch is required. > > > > -Eliminated ehci_spear_setup routine beacuse hcd registers > > > > directly setting in spear_ehci_hcd_drv_probe function. > > > > > > Fix the grammar, please. > > > > Done. I agree some of this is hardly legible. > > > > I realized later that the other patches have similarly screwed up > changelogs. I'll send a new version once you've commented on v4, > so in case there is anything else I missed I'm not spamming everyone > another time. I still haven't checked the details of the last patch in the series (the OHCI changes). However, for patches 1/6 - 5/6: Acked-by: Alan Stern <stern@rowland.harvard.edu>
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index d89b7ad..12fb83e 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -173,6 +173,14 @@ config USB_EHCI_HCD_ORION Armada 370. This is different from the EHCI implementation on Marvell's mobile PXA and MMP SoC, see USB_EHCI_MV for those. +config USB_EHCI_HCD_SPEAR + tristate "Support for ST SPEAr on-chip EHCI USB controller" + depends on USB_EHCI_HCD && PLAT_SPEAR + default y + ---help--- + Enables support for the on-chip EHCI controller on + ST SPEAr chips. + config USB_EHCI_MSM bool "Support for MSM on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_MSM diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 9492f50..3e02471 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o obj-$(CONFIG_USB_EHCI_HCD_OMAP) += ehci-omap.o obj-$(CONFIG_USB_EHCI_HCD_ORION) += ehci-orion.o +obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 1f97268..c8c70a1 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1264,11 +1264,6 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_octeon_driver #endif -#ifdef CONFIG_PLAT_SPEAR -#include "ehci-spear.c" -#define PLATFORM_DRIVER spear_ehci_hcd_driver -#endif - #ifdef CONFIG_USB_EHCI_MSM #include "ehci-msm.c" #define PLATFORM_DRIVER ehci_msm_driver @@ -1315,6 +1310,7 @@ MODULE_LICENSE ("GPL"); !IS_ENABLED(CONFIG_USB_EHCI_MXC) && \ !IS_ENABLED(CONFIG_USB_EHCI_HCD_OMAP) && \ !IS_ENABLED(CONFIG_USB_EHCI_HCD_ORION) && \ + !IS_ENABLED(CONFIG_USB_EHCI_HCD_SPEAR) && \ !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && \ !defined(OF_PLATFORM_DRIVER) && \ diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c index 210bb67..d3a5859 100644 --- a/drivers/usb/host/ehci-spear.c +++ b/drivers/usb/host/ehci-spear.c @@ -1,5 +1,5 @@ /* -* Driver for EHCI HCD on SPEAR SOC +* Driver for EHCI HCD on SPEAr SOC * * Copyright (C) 2010 ST Micro Electronics, * Deepak Sikri <deepak.sikri@st.com> @@ -12,17 +12,28 @@ */ #include <linux/clk.h> +#include <linux/dma-mapping.h> +#include <linux/io.h> #include <linux/jiffies.h> +#include <linux/kernel.h> +#include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm.h> +#include <linux/usb.h> +#include <linux/usb/hcd.h> + +#include "ehci.h" + +#define DRIVER_DESC "EHCI SPEAr driver" + +static const char hcd_name[] = "SPEAr-ehci"; struct spear_ehci { - struct ehci_hcd ehci; struct clk *clk; }; -#define to_spear_ehci(hcd) (struct spear_ehci *)hcd_to_ehci(hcd) +#define to_spear_ehci(hcd) (struct spear_ehci *)(hcd_to_ehci(hcd)->priv) static void spear_start_ehci(struct spear_ehci *ehci) { @@ -34,49 +45,7 @@ static void spear_stop_ehci(struct spear_ehci *ehci) clk_disable_unprepare(ehci->clk); } -static int ehci_spear_setup(struct usb_hcd *hcd) -{ - struct ehci_hcd *ehci = hcd_to_ehci(hcd); - - /* registers start at offset 0x0 */ - ehci->caps = hcd->regs; - - return ehci_setup(hcd); -} - -static const struct hc_driver ehci_spear_hc_driver = { - .description = hcd_name, - .product_desc = "SPEAr EHCI", - .hcd_priv_size = sizeof(struct spear_ehci), - - /* generic hardware linkage */ - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, - - /* basic lifecycle operations */ - .reset = ehci_spear_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, - .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 struct hc_driver __read_mostly ehci_spear_hc_driver; #ifdef CONFIG_PM_SLEEP static int ehci_spear_drv_suspend(struct device *dev) @@ -161,7 +130,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev) goto err_put_hcd; } - ehci = (struct spear_ehci *)hcd_to_ehci(hcd); + ehci = to_spear_ehci(hcd); ehci->clk = usbh_clk; spear_start_ehci(ehci); @@ -216,4 +185,29 @@ static struct platform_driver spear_ehci_hcd_driver = { } }; +static const struct ehci_driver_overrides spear_overrides __initdata = { + .extra_priv_size = sizeof(struct spear_ehci), +}; + +static int __init ehci_spear_init(void) +{ + if (usb_disabled()) + return -ENODEV; + + pr_info("%s: " DRIVER_DESC "\n", hcd_name); + + ehci_init_driver(&ehci_spear_hc_driver, &spear_overrides); + return platform_driver_register(&spear_ehci_hcd_driver); +} +module_init(ehci_spear_init); + +static void __exit ehci_spear_cleanup(void) +{ + platform_driver_unregister(&spear_ehci_hcd_driver); +} +module_exit(ehci_spear_cleanup); + +MODULE_DESCRIPTION(DRIVER_DESC); MODULE_ALIAS("platform:spear-ehci"); +MODULE_AUTHOR("Deepak Sikri"); +MODULE_LICENSE("GPL");