This adds support to ehci-hcd for the ehci host function of the USB20 ssb core
in the Broadcom BCM5354. That core implements both ehci and ohci. The support
is implemented as a library or extension to the ohci-ssb support in the
ohci-hcd driver and is not standalone. The ehci-hcd driver must load before the
ohci-hcd driver.
Signed-off-by: Steve Brown <[EMAIL PROTECTED]>
Cc: Michael Buesch <[EMAIL PROTECTED]>
---
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index e4868eb..5ed16ad 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -27,6 +27,10 @@ define usbdep
DEPENDS:=kmod-usb-core $(1)
endef
+define usb2dep
+ SUBMENU:=$(USB_MENU)
+ DEPENDS:=kmod-usb-core +kmod-usb-ohci $(1)
+endef
define KernelPackage/usb-core
SUBMENU:=$(USB_MENU)
@@ -110,7 +114,7 @@ endef
define KernelPackage/usb-ohci/2.6
# KCONFIG:=CONFIG_USB_OHCI_HCD
FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
- AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
+ AUTOLOAD:=$(call AutoLoad,51,ohci-hcd)
endef
define KernelPackage/usb-ohci/description
@@ -136,7 +140,7 @@ $(eval $(call KernelPackage,usb-adm5120))
define KernelPackage/usb2
- $(call usbdep,)
+ $(call usb2dep,)
TITLE:=Support for USB2 controllers
KCONFIG:=CONFIG_USB_EHCI_HCD
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
diff --git a/target/linux/brcm47xx/config-2.6.25 b/target/linux/brcm47xx/config-2.6.25
index 6ddcd22..720d961 100644
--- a/target/linux/brcm47xx/config-2.6.25
+++ b/target/linux/brcm47xx/config-2.6.25
@@ -257,10 +257,13 @@ CONFIG_TICK_ONESHOT=y
CONFIG_TRAD_SIGNALS=y
CONFIG_USB=m
# CONFIG_USB_ACM is not set
+CONFIG_EXPERIMENTAL=y
CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD_SSB=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_VGASTATE is not set
diff --git a/target/linux/brcm47xx/patches-2.6.25/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.25/270-ehci-ssb.patch
new file mode 100644
index 0000000..c56252a
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.25/270-ehci-ssb.patch
@@ -0,0 +1,386 @@
+diff -ur --exclude='*.cmd' --exclude='*.order' --exclude='*.mod.c' ../openwrt/build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/ehci-hcd.c build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/ehci-hcd.c
+--- linux-2.6.25.4/drivers/usb/host/ehci-hcd.c 2008-05-15 08:00:12.000000000 -0700
++++ linux-2.6.25.4/drivers/usb/host/ehci-hcd.c 2008-06-08 13:30:31.000000000 -0700
+@@ -1043,8 +1043,16 @@
+ #define PLATFORM_DRIVER ixp4xx_ehci_driver
+ #endif
+
+-#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+- !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
++#ifdef CONFIG_USB_EHCI_HCD_SSB
++#include "ehci-ssb.c"
++#define SSB_EHCI_DRIVER ssb_ehci_driver
++#endif
++
++#if !defined(PCI_DRIVER) && \
++ !defined(PLATFORM_DRIVER) && \
++ !defined(PS3_SYSTEM_BUS_DRIVER) && \
++ !defined(OF_PLATFORM_DRIVER) && \
++ !defined(SSB_EHCI_DRIVER)
+ #error "missing bus glue for ehci-hcd"
+ #endif
+
+@@ -1086,6 +1094,7 @@
+ if (retval < 0)
+ goto clean3;
+ #endif
++
+ return retval;
+
+ #ifdef OF_PLATFORM_DRIVER
+diff -ur --exclude='*.cmd' --exclude='*.order' --exclude='*.mod.c' ../openwrt/build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/ehci-ssb.c build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/ehci-ssb.c
+--- /dev/null 2008-06-08 15:35:18.000000000 -0700
++++ linux-2.6.25.4/drivers/usb/host/ehci-ssb.c 2008-06-09 03:28:39.000000000 -0700
+@@ -0,0 +1,201 @@
++/*
++ * Sonics Silicon Backplane
++ * Broadcom USB-core EHCI driver (SSB bus glue)
++ *
++ * Copyright 2007 Steven Brown <[EMAIL PROTECTED]>
++ *
++ * Derived from the OHCI-SSB driver
++ * Copyright 2007 Michael Buesch <[EMAIL PROTECTED]>
++ *
++ * Derived from the EHCI-PCI driver
++ * Copyright (c) 2000-2004 by David Brownell
++ *
++ * Derived from the OHCI-PCI driver
++ * Copyright 1999 Roman Weissgaerber
++ * Copyright 2000-2002 David Brownell
++ * Copyright 1999 Linus Torvalds
++ * Copyright 1999 Gregory P. Smith
++ *
++ * Derived from the USBcore related parts of Broadcom-SB
++ * Copyright 2005 Broadcom Corporation
++ *
++ * Licensed under the GNU/GPL. See COPYING for details.
++ */
++#include <linux/ssb/ssb.h>
++
++#define SSB_OHCI_TMSLOW_HOSTMODE (1 << 29)
++
++struct ssb_ehci_device {
++ struct ehci_hcd ehci; /* _must_ be at the beginning. */
++
++ u32 enable_flags;
++};
++
++static inline
++struct ssb_ehci_device *hcd_to_ssb_ehci(struct usb_hcd *hcd)
++{
++ return (struct ssb_ehci_device *)(hcd->hcd_priv);
++}
++
++
++static int ssb_ehci_reset(struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++ int err;
++
++ ehci->caps = hcd->regs;
++ ehci->regs = hcd->regs +
++ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
++
++ dbg_hcs_params(ehci, "reset");
++ dbg_hcc_params(ehci, "reset");
++
++ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
++
++ err = ehci_halt(ehci);
++
++ if (err)
++ return err;
++
++ err = ehci_init(hcd);
++
++ if (err)
++ return err;
++
++ ehci_port_power(ehci, 0);
++
++ return err;
++}
++
++static int ssb_ehci_start(struct usb_hcd *hcd)
++{
++ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++ int err;
++
++ err = ehci_run(hcd);
++ if (err < 0) {
++ ehci_err(ehci, "can't start\n");
++ ehci_stop(hcd);
++ }
++
++ return err;
++}
++
++#ifdef CONFIG_PM
++static int ssb_ehci_hcd_suspend(struct usb_hcd *hcd, pm_message_t message)
++{
++ struct ssb_ehci_device *ehcidev = hcd_to_ssb_ehci(hcd);
++ struct ehci_hcd *ehci = &ehcidev->ehci;
++ unsigned long flags;
++
++ spin_lock_irqsave(&ehci->lock, flags);
++
++ ehci_writel(ehci, EHCI_INTR_MIE, &ehci->regs->intrdisable);
++ ehci_readl(ehci, &ehci->regs->intrdisable); /* commit write */
++
++ /* make sure snapshot being resumed re-enumerates everything */
++ if (message.event == PM_EVENT_PRETHAW)
++ ehci_usb_reset(ehci);
++
++ clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
++
++ spin_unlock_irqrestore(&ehci->lock, flags);
++ return 0;
++}
++
++static int ssb_ehci_hcd_resume(struct usb_hcd *hcd)
++{
++ set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
++ usb_hcd_resume_root_hub(hcd);
++ return 0;
++}
++#endif /* CONFIG_PM */
++
++static const struct hc_driver ssb_ehci_hc_driver = {
++ .description = "ssb-usb-ehci",
++ .product_desc = "SSB EHCI Controller",
++ .hcd_priv_size = sizeof(struct ssb_ehci_device),
++
++ .irq = ehci_irq,
++ .flags = HCD_MEMORY | HCD_USB2,
++
++ .reset = ssb_ehci_reset,
++ .start = ssb_ehci_start,
++ .stop = ehci_stop,
++ .shutdown = ehci_shutdown,
++
++#ifdef CONFIG_PM
++ .suspend = ssb_ehci_hcd_suspend,
++ .resume = ssb_ehci_hcd_resume,
++#endif
++
++ .urb_enqueue = ehci_urb_enqueue,
++ .urb_dequeue = ehci_urb_dequeue,
++ .endpoint_disable = ehci_endpoint_disable,
++
++ .get_frame_number = ehci_get_frame,
++
++ .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
++
++};
++
++static void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd)
++{
++
++ usb_remove_hcd(hcd);
++ iounmap(hcd->regs);
++ usb_put_hcd(hcd);
++}
++EXPORT_SYMBOL_GPL(ssb_ehci_detach);
++
++static int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **ehci_hcd)
++{
++ struct ssb_ehci_device *ehcidev;
++ struct usb_hcd *hcd;
++ int err = -ENOMEM;
++ u32 tmp, flags = 0;
++
++ hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
++ dev->dev->bus_id);
++ if (!hcd)
++ goto err_dev_disable;
++
++ ehcidev = hcd_to_ssb_ehci(hcd);
++ ehcidev->enable_flags = flags;
++ tmp = ssb_read32(dev, SSB_ADMATCH0);
++ hcd->rsrc_start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */
++ hcd->rsrc_len = 0x100; /* ehci reg block size */
++ /*
++ * start & size modified per sbutils.c
++ */
++ hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
++ if (!hcd->regs)
++ goto err_put_hcd;
++ err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED | IRQF_DISABLED);
++ if (err)
++ goto err_iounmap;
++
++ *ehci_hcd = hcd;
++
++ return err;
++
++err_iounmap:
++ iounmap(hcd->regs);
++err_put_hcd:
++ usb_put_hcd(hcd);
++err_dev_disable:
++ ssb_device_disable(dev, flags);
++ return err;
++}
++EXPORT_SYMBOL_GPL(ssb_ehci_attach);
++
++static const struct ssb_device_id ssb_ehci_table[] = {
++ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
++ SSB_DEVTABLE_END
++};
++MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
+diff -ur --exclude='*.cmd' --exclude='*.order' --exclude='*.mod.c' ../openwrt/build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/Kconfig build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/Kconfig
+--- linux-2.6.25.4/drivers/usb/host/Kconfig 2008-05-15 08:00:12.000000000 -0700
++++ linux-2.6.25.4/drivers/usb/host/Kconfig 2008-06-07 14:11:37.000000000 -0700
+@@ -83,6 +83,19 @@
+ Enables support for the USB controller present on the PowerPC
+ OpenFirmware platform bus.
+
++config USB_EHCI_HCD_SSB
++ bool "EHCI support for Broadcom SSB EHCI core"
++ depends on USB_EHCI_HCD && SSB && EXPERIMENTAL
++ default n
++ ---help---
++ Support for the Sonics Silicon Backplane (SSB) attached
++ Broadcom USB EHCI core.
++
++ This device is present in some embedded devices with
++ Broadcom based SSB bus.
++
++ If unsure, say N.
++
+ config USB_ISP116X_HCD
+ tristate "ISP116X HCD support"
+ depends on USB
+diff -ur --exclude='*.cmd' --exclude='*.order' --exclude='*.mod.c' ../openwrt/build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/ohci-ssb.c build_dir/linux-brcm47xx/linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
+--- linux-2.6.25.4/drivers/usb/host/ohci-ssb.c 2008-06-08 15:21:27.000000000 -0700
++++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c 2008-06-09 03:31:34.000000000 -0700
+@@ -17,6 +17,8 @@
+ */
+ #include <linux/ssb/ssb.h>
+
++extern int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **hcd);
++extern void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd);
+
+ #define SSB_OHCI_TMSLOW_HOSTMODE (1 << 29)
+
+@@ -24,6 +26,7 @@
+ struct ohci_hcd ohci; /* _must_ be at the beginning. */
+
+ u32 enable_flags;
++ struct usb_hcd *ehci_hcd;
+ };
+
+ static inline
+@@ -128,13 +131,25 @@
+ static void ssb_ohci_detach(struct ssb_device *dev)
+ {
+ struct usb_hcd *hcd = ssb_get_drvdata(dev);
++#ifdef CONFIG_USB_EHCI_HCD_SSB
++ struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
++#endif
+
+ usb_remove_hcd(hcd);
+ iounmap(hcd->regs);
+ usb_put_hcd(hcd);
++
++#ifdef CONFIG_USB_EHCI_HCD_SSB
++ /*
++ * Also detach ehci function
++ */
++ if (dev->id.coreid == SSB_DEV_USB20_HOST)
++ ssb_ehci_detach(dev, ohcidev->ehci_hcd);
++#endif
+ ssb_device_disable(dev, 0);
+ }
+
++
+ static int ssb_ohci_attach(struct ssb_device *dev)
+ {
+ struct ssb_ohci_device *ohcidev;
+@@ -164,18 +179,17 @@
+ *
+ * 1. Since the core supports both OHCI and EHCI functions, it must
+ * only be reset once.
+- *
++ *
+ * 2. In addition to the standard SB reset sequence, the Host Control
+ * Register must be programmed to bring the USB core and various
+- * phy components out of reset.
++ * phy components out of reset.
+ */
+
+ else if (dev->id.coreid == SSB_DEV_USB20_HOST) {
+-#warning FIX ME need test for core being up & exit
+ ssb_device_enable(dev, 0);
+ ssb_write32(dev, 0x200, 0x7ff);
+ udelay(1);
+- if (dev->id.revision == 1) { // bug in rev 1
++ if (dev->id.revision == 1) { /* bug in rev 1 */
+
+ /* Change Flush control reg */
+ tmp = ssb_read32(dev, 0x400);
+@@ -191,18 +205,17 @@
+ tmp = ssb_read32(dev, 0x304);
+ printk("USB20H shim: 0x%0x\n", tmp);
+ }
+- }
+- else
++ } else
+ ssb_device_enable(dev, 0);
+
+- /*
+- * Set dma mask - 32 bit mask is just an assumption
+- */
+- if (ssb_dma_set_mask(dev, DMA_32BIT_MASK))
+- return -EOPNOTSUPP;
++ /*
++ * Set dma mask - 32 bit mask is just an assumption
++ */
++ if (ssb_dma_set_mask(dev, DMA_32BIT_MASK))
++ return -EOPNOTSUPP;
+
+ hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
+- dev->dev->bus_id);
++ dev->dev->bus_id);
+ if (!hcd)
+ goto err_dev_disable;
+ ohcidev = hcd_to_ssb_ohci(hcd);
+@@ -220,6 +233,14 @@
+
+ ssb_set_drvdata(dev, hcd);
+
++#ifdef CONFIG_USB_EHCI_HCD_SSB
++ /*
++ * attach ehci function in this core
++ */
++ if (dev->id.coreid == SSB_DEV_USB20_HOST)
++ err = ssb_ehci_attach(dev, &(ohcidev->ehci_hcd));
++#endif
++
+ return err;
+
+ err_iounmap:
+@@ -231,8 +252,9 @@
+ return err;
+ }
+
++
+ static int ssb_ohci_probe(struct ssb_device *dev,
+- const struct ssb_device_id *id)
++ const struct ssb_device_id *id)
+ {
+ int err;
+ u16 chipid_top;
+@@ -267,7 +289,6 @@
+ static int ssb_ohci_suspend(struct ssb_device *dev, pm_message_t state)
+ {
+ ssb_device_disable(dev, 0);
+-
+ return 0;
+ }
+
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
