From 43ff2adf1a6dc054f131d47bcc95fa0bada57d2d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 14 Nov 2007 18:46:13 +0000 Subject: linux-rp: fix tosa patch name (my fault) --- packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch | 585 ---------------------- packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch | 472 +++++++++++++++++ 2 files changed, 472 insertions(+), 585 deletions(-) delete mode 100644 packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch create mode 100644 packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch diff --git a/packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch b/packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch deleted file mode 100644 index 9b8434a0bc..0000000000 --- a/packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch +++ /dev/null @@ -1,585 +0,0 @@ -Signed-off-by: Dmitry Baryshkov - -Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-14 16:58:47.637707413 +0300 -@@ -0,0 +1,530 @@ -+/* -+ * OHCI HCD(Host Controller Driver) for USB. -+ * -+ *(C) Copyright 1999 Roman Weissgaerber -+ *(C) Copyright 2000-2002 David Brownell -+ *(C) Copyright 2002 Hewlett-Packard Company -+ * -+ * Bus glue for Toshiba Mobile IO(TMIO) Controller's OHCI core -+ *(C) Copyright 2005 Chris Humbert -+ * -+ * This is known to work with the following variants: -+ * TC6393XB revision 3 (32kB SRAM) -+ * -+ * The TMIO's OHCI core DMAs through a small internal buffer that -+ * is directly addressable by the CPU. dma_declare_coherent_memory -+ * and DMA bounce buffers allow the higher-level OHCI host driver to -+ * work. However, the dma API doesn't handle dma mapping failures -+ * well(dma_sg_map() is a prime example), so it is unusable. -+ * -+ * This HC pretends be a PIO-ish controller and uses the kernel's -+ * generic allocator for the entire SRAM. Using the USB core's -+ * usb_operations, we provide hcd_buffer_alloc/free. Using the OHCI's -+ * ohci_ops, we provide memory management for OHCI's TDs and EDs. We -+ * internally queue a URB's TDs until enough dma memory is available -+ * to enqueue them with the HC. -+ * -+ * Written from sparse documentation from Toshiba and Sharp's driver -+ * for the 2.4 kernel, -+ * usb-ohci-tc6393.c(C) Copyright 2004 Lineo Solutions, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+/*-------------------------------------------------------------------------*/ -+ -+#define MAX_TMIO_USB_PORTS 2 -+static bool default_tmio_ports[MAX_TMIO_USB_PORTS]; -+module_param_array(default_tmio_ports, bool, NULL, 0644); -+MODULE_PARM_DESC(default_tmio_ports, -+ "disable specified TC6393 usb ports (default: all enabled)"); -+ -+/*-------------------------------------------------------------------------*/ -+ -+/* -+ * USB Host Controller Configuration Register -+ */ -+struct tmio_uhccr { -+ u8 x00[8]; -+ u8 revid; /* 0x08 Revision ID */ -+ u8 x01[7]; -+ u16 basel; /* 0x10 USB Control Register Base Address Low */ -+ u16 baseh; /* 0x12 USB Control Register Base Address High */ -+ u8 x02[0x2c]; -+ u8 ilme; /* 0x40 Internal Local Memory Enable */ -+ u8 x03[0x0b]; -+ u16 pm; /* 0x4c Power Management */ -+ u8 x04[2]; -+ u8 intc; /* 0x50 INT Control */ -+ u8 x05[3]; -+ u16 lmw1l; /* 0x54 Local Memory Window 1 LMADRS Low */ -+ u16 lmw1h; /* 0x56 Local Memory Window 1 LMADRS High */ -+ u16 lmw1bl; /* 0x58 Local Memory Window 1 Base Address Low */ -+ u16 lmw1bh; /* 0x5A Local Memory Window 1 Base Address High */ -+ u16 lmw2l; /* 0x5C Local Memory Window 2 LMADRS Low */ -+ u16 lmw2h; /* 0x5E Local Memory Window 2 LMADRS High */ -+ u16 lmw2bl; /* 0x60 Local Memory Window 2 Base Address Low */ -+ u16 lmw2bh; /* 0x62 Local Memory Window 2 Base Address High */ -+ u8 x06[0x98]; -+ u8 misc; /* 0xFC MISC */ -+ u8 x07[3]; -+} __attribute__((packed)); -+ -+union tmio_uhccr_pm { -+ u16 raw; -+struct { -+ unsigned gcken:1; /* D0 */ -+ unsigned ckrnen:1; /* D1 */ -+ unsigned uspw0:1; /* D2 USB Port 1 Power Disable */ -+ unsigned uspw1:1; /* D3 USB Port 2 Power Disable */ -+ unsigned x00:4; -+ unsigned pmee:1; /* D8 */ -+ unsigned x01:6; -+ unsigned pmes:1; /* D15 */ -+} __attribute__((packed)); -+} __attribute__((packed)); -+ -+/*-------------------------------------------------------------------------*/ -+ -+struct tmio_hcd { -+ struct tmio_uhccr __iomem *ccr; -+ bool disabled_ports[MAX_TMIO_USB_PORTS]; -+}; -+ -+#define hcd_to_tmio(hcd) ((struct tmio_hcd *)(hcd_to_ohci(hcd) + 1)) -+#define ohci_to_tmio(ohci) ((struct tmio_hcd *)(ohci + 1)) -+ -+/*-------------------------------------------------------------------------*/ -+ -+struct indexed_device_attribute{ -+ struct device_attribute dev_attr; -+ int index; -+}; -+#define to_indexed_dev_attr(_dev_attr) \ -+ container_of(_dev_attr, struct indexed_device_attribute, dev_attr) -+ -+#define INDEXED_ATTR(_name, _mode, _show, _store, _index) \ -+ { .dev_attr = __ATTR(_name ## _index, _mode, _show, _store), \ -+ .index = _index } -+ -+#define INDEXED_DEVICE_ATTR(_name, _mode, _show, _store, _index) \ -+struct indexed_device_attribute dev_attr_##_name ## _index \ -+ = INDEXED_ATTR(_name, _mode, _show, _store, _index) -+ -+/*-------------------------------------------------------------------------*/ -+ -+ -+static void tmio_fill_pm(struct tmio_hcd *tmio, union tmio_uhccr_pm *pm) -+{ -+ pm->raw = 0; -+ -+ pm->pmee = 1; -+ pm->pmes = 1; -+ pm->gcken = 1; -+ pm->ckrnen = 1; -+ -+ if (tmio->disabled_ports[0]) -+ pm->uspw0 = 1; -+ if (tmio->disabled_ports[1]) -+ pm->uspw1 = 1; -+} -+ -+static void tmio_stop_hc(struct device *dev) -+{ -+ struct tmio_device *tdev = dev_to_tdev(dev); -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct tmio_hcd *tmio = hcd_to_tmio(hcd); -+ struct tmio_uhccr __iomem *ccr = tmio->ccr; -+ union tmio_uhccr_pm pm = {0}; -+ -+ pm.gcken = 1; -+ pm.ckrnen = 1; -+ pm.uspw0 = 1; -+ pm.uspw1 = 1; -+ -+ iowrite8(0, &ccr->intc); -+ iowrite8(0, &ccr->ilme); -+ iowrite16(0, &ccr->basel); -+ iowrite16(0, &ccr->baseh); -+ iowrite16(pm.raw, &ccr->pm); -+ -+ tdev->ops->function(dev, 0); -+ tdev->ops->clock(dev, 0); -+} -+ -+static void tmio_start_hc(struct device *dev) -+{ -+ struct tmio_device *tdev = dev_to_tdev(dev); -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct tmio_hcd *tmio = hcd_to_tmio(hcd); -+ struct tmio_uhccr __iomem *ccr = tmio->ccr; -+ union tmio_uhccr_pm pm = {0}; -+ unsigned long base = hcd->rsrc_start; -+ -+ tmio_fill_pm(tmio, &pm); -+ -+ tdev->ops->clock(dev, 1); -+ tdev->ops->function(dev, 1); -+ -+ iowrite16(pm.raw, &ccr->pm); -+ iowrite16(base, &ccr->basel); -+ iowrite16(base >> 16, &ccr->baseh); -+ iowrite8(1, &ccr->ilme); -+ iowrite8(2, &ccr->intc); -+ -+ dev_info(dev, "revision %d @ 0x%08llx, irq %d\n", -+ ioread8(&ccr->revid), hcd->rsrc_start, hcd->irq); -+} -+ -+static ssize_t tmio_disabled_port_show(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct tmio_hcd *tmio = hcd_to_tmio(hcd); -+ int index = to_indexed_dev_attr(attr)->index; -+ return snprintf(buf, PAGE_SIZE, "%c", -+ tmio->disabled_ports[index]? 'Y': 'N'); -+} -+ -+static ssize_t tmio_disabled_port_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t count) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct tmio_hcd *tmio = hcd_to_tmio(hcd); -+ struct tmio_uhccr __iomem *ccr = tmio->ccr; -+ union tmio_uhccr_pm pm = {0}; -+ int index = to_indexed_dev_attr(attr)->index; -+ -+ if (!count) -+ return -EINVAL; -+ -+ switch (buf[0]) { -+ case 'y': case 'Y': case '1': -+ tmio->disabled_ports[index] = true; -+ break; -+ case 'n': case 'N': case '0': -+ tmio->disabled_ports[index] = false; -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ tmio_fill_pm(tmio, &pm); -+ -+ iowrite16(pm.raw, &ccr->pm); -+ -+ return 1; -+} -+ -+ -+static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, -+ tmio_disabled_port_show, tmio_disabled_port_store, 0); -+static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, -+ tmio_disabled_port_show, tmio_disabled_port_store, 1); -+ -+static int usb_hcd_tmio_probe(const struct hc_driver *driver, -+ struct device *dev) -+{ -+ struct tmio_device *tdev = dev_to_tdev(dev); -+ struct resource *config = tmio_resource_config(dev); -+ struct resource *regs = tmio_resource_control(dev); -+ struct resource *sram = tmio_resource_mem(dev); -+ struct resource *irq = tmio_resource_irq(dev); -+ struct tmio_hcd *tmio; -+ struct ohci_hcd *ohci; -+ struct usb_hcd *hcd; -+ int retval; -+ -+ if (usb_disabled()) -+ return -ENODEV; -+ -+ hcd = usb_create_hcd(driver, dev, dev->bus_id); -+ if (!hcd) { -+ retval = -ENOMEM; -+ goto err_usb_create_hcd; -+ } -+ -+ retval = request_resource(tdev->iomem, config); -+ if (retval) -+ goto err_request_config_resource; -+ -+ retval = request_resource(tdev->iomem, regs); -+ if (retval) -+ goto err_request_regs_resource; -+ -+ retval = request_resource(tdev->iomem, sram); -+ if (retval) -+ goto err_request_sram_resource; -+ -+ hcd->rsrc_start = regs->start; -+ hcd->rsrc_len = regs->end - regs->start + 1; -+ -+ tmio = hcd_to_tmio(hcd); -+ memcpy(tmio->disabled_ports, -+ default_tmio_ports, -+ sizeof(default_tmio_ports)); -+ -+ tmio->ccr = ioremap(config->start, config->end - config->start + 1); -+ if (!tmio->ccr) { -+ retval = -ENOMEM; -+ goto err_ioremap_ccr; -+ } -+ -+ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); -+ if (!hcd->regs) { -+ retval = -ENOMEM; -+ goto err_ioremap_regs; -+ } -+ -+ if (dma_declare_coherent_memory(dev, sram->start, -+ sram->start, -+ sram->end - sram->start + 1, -+ DMA_MEMORY_MAP) != DMA_MEMORY_MAP) { -+ retval = -EBUSY; -+ goto err_dma_declare; -+ } -+ -+ retval = dmabounce_register_dev(dev, 512, 4096); -+ if (retval) -+ goto err_dmabounce_register_dev; -+ -+ tmio_start_hc(dev); -+ ohci = hcd_to_ohci(hcd); -+ ohci_hcd_init(ohci); -+ -+ retval = device_create_file(dev, -+ &dev_attr_disabled_usb_port0.dev_attr); -+ retval |= device_create_file(dev, -+ &dev_attr_disabled_usb_port1.dev_attr); -+ -+ if (retval) -+ goto err_create_file; -+ -+ retval = usb_add_hcd(hcd, irq->start, IRQF_DISABLED); -+ -+ if (retval == 0) -+ return retval; -+ -+err_create_file: -+ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); -+ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); -+ -+ tmio_stop_hc(dev); -+ -+ dmabounce_unregister_dev(dev); -+err_dmabounce_register_dev: -+ dma_release_declared_memory(dev); -+err_dma_declare: -+ iounmap(hcd->regs); -+err_ioremap_regs: -+ iounmap(tmio->ccr); -+err_ioremap_ccr: -+ release_resource(sram); -+err_request_sram_resource: -+ release_resource(regs); -+err_request_regs_resource: -+ release_resource(config); -+err_request_config_resource: -+ usb_put_hcd(hcd); -+err_usb_create_hcd: -+ -+ return retval; -+} -+ -+static void usb_hcd_tmio_remove(struct usb_hcd *hcd, struct device *dev) -+{ -+ struct tmio_hcd *tmio = hcd_to_tmio(hcd); -+ -+ usb_remove_hcd(hcd); -+ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); -+ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); -+ tmio_stop_hc(dev); -+ dmabounce_unregister_dev(dev); -+ dma_release_declared_memory(dev); -+ iounmap(hcd->regs); -+ iounmap(tmio->ccr); -+ release_resource(tmio_resource_mem(dev)); -+ release_resource(tmio_resource_control(dev)); -+ release_resource(tmio_resource_config(dev)); -+ usb_put_hcd(hcd); -+} -+ -+static int __devinit -+ohci_tmio_start(struct usb_hcd *hcd) -+{ -+ struct ohci_hcd *ohci = hcd_to_ohci(hcd); -+ int retval; -+ -+ if ((retval = ohci_init(ohci)) < 0) -+ return retval; -+ -+ if ((retval = ohci_run(ohci)) < 0) { -+ err("can't start %s", hcd->self.bus_name); -+ ohci_stop(hcd); -+ return retval; -+ } -+ -+ return 0; -+} -+ -+static const struct hc_driver ohci_tmio_hc_driver = { -+ .description = hcd_name, -+ .product_desc = "TMIO OHCI USB Host Controller", -+ .hcd_priv_size = sizeof(struct ohci_hcd) + sizeof (struct tmio_hcd), -+ -+ /* generic hardware linkage */ -+ .irq = ohci_irq, -+ .flags = HCD_USB11 | HCD_MEMORY, -+ -+ /* basic lifecycle operations */ -+ .start = ohci_tmio_start, -+ .stop = ohci_stop, -+ .shutdown = ohci_shutdown, -+ -+ /* 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, -+ .hub_irq_enable = ohci_rhsc_enable, -+#ifdef CONFIG_PM -+ .bus_suspend = ohci_bus_suspend, -+ .bus_resume = ohci_bus_resume, -+#endif -+ .start_port_reset = ohci_start_port_reset, -+}; -+ -+/*-------------------------------------------------------------------------*/ -+static struct device_driver tmio_ohci; -+ -+static int -+tmio_dmabounce_check(struct device *dev, dma_addr_t dma, size_t size, void *data) -+{ -+ struct resource *sram = data; -+#ifdef DEBUG -+ printk(KERN_ERR "tmio_dmabounce_check: %08x %d\n", dma, size); -+#endif -+ -+ if (dev->driver != &tmio_ohci) -+ return 0; -+ -+ if (sram->start <= dma && dma + size <= sram->end) -+ return 0; -+ -+ return 1; -+} -+ -+static u64 dma_mask = DMA_32BIT_MASK; -+ -+static int ohci_hcd_tmio_drv_probe(struct device *dev) -+{ -+ struct resource *sram = tmio_resource_mem(dev); -+ int retval; -+ -+ dev->dma_mask = &dma_mask; -+ dev->coherent_dma_mask = DMA_32BIT_MASK; -+ -+ /* FIXME: move dmabounce checkers to tc6393 core? */ -+ dmabounce_register_checker(tmio_dmabounce_check, sram); -+ -+ retval = usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); -+ -+ if (retval == 0) -+ return retval; -+ -+ dmabounce_remove_checker(tmio_dmabounce_check, sram); -+ -+ return retval; -+} -+ -+static int ohci_hcd_tmio_drv_remove(struct device *dev) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct resource *sram = tmio_resource_mem(dev); -+ -+ usb_hcd_tmio_remove(hcd, dev); -+ -+ dev_set_drvdata(dev, NULL); -+ -+ dmabounce_remove_checker(tmio_dmabounce_check, sram); -+ -+ return 0; -+} -+ -+#ifdef CONFIG_PM -+static int ohci_hcd_tmio_drv_suspend(struct device *dev, pm_message_t state) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct ohci_hcd *ohci = hcd_to_ohci(hcd); -+ -+ if (time_before(jiffies, ohci->next_statechange)) -+ msleep(5); -+ ohci->next_statechange = jiffies; -+ -+ tmio_stop_hc(dev); -+ hcd->state = HC_STATE_SUSPENDED; -+ dev->power.power_state = PMSG_SUSPEND; -+ -+ return 0; -+} -+ -+static int ohci_hcd_tmio_drv_resume(struct device *dev) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct ohci_hcd *ohci = hcd_to_ohci(hcd); -+ -+ if (time_before(jiffies, ohci->next_statechange)) -+ msleep(5); -+ ohci->next_statechange = jiffies; -+ -+ tmio_start_hc(dev); -+ -+ dev->power.power_state = PMSG_ON; -+ usb_hcd_resume_root_hub(hcd); -+ -+ return 0; -+} -+#endif -+ -+static void usb_hcd_device_shutdown(struct device *dev) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ -+ if (hcd->driver->shutdown) -+ hcd->driver->shutdown(hcd); -+} -+ -+static struct device_driver tmio_ohci = { -+ .owner = THIS_MODULE, -+ .name = TMIO_NAME_OHCI, -+ .bus = &tmio_bus_type, -+ .probe = ohci_hcd_tmio_drv_probe, -+ .remove = ohci_hcd_tmio_drv_remove, -+ .shutdown = usb_hcd_device_shutdown, -+#ifdef CONFIG_PM -+ .suspend = ohci_hcd_tmio_drv_suspend, -+ .resume = ohci_hcd_tmio_drv_resume, -+#endif -+}; -+ -Index: linux-2.6.23/drivers/usb/host/Kconfig -=================================================================== ---- linux-2.6.23.orig/drivers/usb/host/Kconfig 2007-10-10 00:31:38.000000000 +0400 -+++ linux-2.6.23/drivers/usb/host/Kconfig 2007-11-12 13:46:53.086559913 +0300 -@@ -101,6 +101,7 @@ - depends on USB && USB_ARCH_HAS_OHCI - select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 - select I2C if ARCH_PNX4008 -+ select GENERIC_ALLOCATOR if TOSHIBA_TC6393XB - ---help--- - The Open Host Controller Interface (OHCI) is a standard for accessing - USB 1.1 host controller hardware. It does more in hardware than Intel's -Index: linux-2.6.23/drivers/usb/host/ohci-hcd.c -=================================================================== ---- linux-2.6.23.orig/drivers/usb/host/ohci-hcd.c 2007-11-12 13:46:52.894560883 +0300 -+++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-14 16:44:32.788069355 +0300 -@@ -915,6 +915,10 @@ - #define PLATFORM_DRIVER usb_hcd_pnx4008_driver - #endif - -+#ifdef CONFIG_TOSHIBA_TC6393XB -+#include "ohci-tmio.c" -+#define DEVICE_DRIVER tmio_ohci -+#endif - - #ifdef CONFIG_USB_OHCI_HCD_PPC_OF - #include "ohci-ppc-of.c" -Index: linux-2.6.23/drivers/usb/Kconfig -=================================================================== ---- linux-2.6.23.orig/drivers/usb/Kconfig 2007-10-10 00:31:38.000000000 +0400 -+++ linux-2.6.23/drivers/usb/Kconfig 2007-11-12 13:46:53.090570777 +0300 -@@ -42,6 +42,7 @@ - # MIPS: - default y if SOC_AU1X00 - # more: -+ default y if TOSHIBA_TC6393XB - default PCI - - # some non-PCI hcds implement EHCI -Index: linux-2.6.23/arch/arm/common/Kconfig -=================================================================== ---- linux-2.6.23.orig/arch/arm/common/Kconfig 2007-11-12 13:46:48.754297930 +0300 -+++ linux-2.6.23/arch/arm/common/Kconfig 2007-11-12 13:46:53.090570777 +0300 -@@ -35,3 +35,4 @@ - - config TOSHIBA_TC6393XB - bool -+ select DMABOUNCE diff --git a/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch new file mode 100644 index 0000000000..034acc7b8e --- /dev/null +++ b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch @@ -0,0 +1,472 @@ +Signed-off-by: Dmitry Baryshkov + +Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-13 01:35:13.049455112 +0300 +@@ -0,0 +1,417 @@ ++/* ++ * OHCI HCD(Host Controller Driver) for USB. ++ * ++ *(C) Copyright 1999 Roman Weissgaerber ++ *(C) Copyright 2000-2002 David Brownell ++ *(C) Copyright 2002 Hewlett-Packard Company ++ * ++ * Bus glue for Toshiba Mobile IO(TMIO) Controller's OHCI core ++ *(C) Copyright 2005 Chris Humbert ++ * ++ * This is known to work with the following variants: ++ * TC6393XB revision 3 (32kB SRAM) ++ * ++ * The TMIO's OHCI core DMAs through a small internal buffer that ++ * is directly addressable by the CPU. dma_declare_coherent_memory ++ * and DMA bounce buffers allow the higher-level OHCI host driver to ++ * work. However, the dma API doesn't handle dma mapping failures ++ * well(dma_sg_map() is a prime example), so it is unusable. ++ * ++ * This HC pretends be a PIO-ish controller and uses the kernel's ++ * generic allocator for the entire SRAM. Using the USB core's ++ * usb_operations, we provide hcd_buffer_alloc/free. Using the OHCI's ++ * ohci_ops, we provide memory management for OHCI's TDs and EDs. We ++ * internally queue a URB's TDs until enough dma memory is available ++ * to enqueue them with the HC. ++ * ++ * Written from sparse documentation from Toshiba and Sharp's driver ++ * for the 2.4 kernel, ++ * usb-ohci-tc6393.c(C) Copyright 2004 Lineo Solutions, Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++/*-------------------------------------------------------------------------*/ ++ ++/* ++ * USB Host Controller Configuration Register ++ */ ++struct tmio_uhccr { ++ u8 x00[8]; ++ u8 revid; /* 0x08 Revision ID */ ++ u8 x01[7]; ++ u16 basel; /* 0x10 USB Control Register Base Address Low */ ++ u16 baseh; /* 0x12 USB Control Register Base Address High */ ++ u8 x02[0x2c]; ++ u8 ilme; /* 0x40 Internal Local Memory Enable */ ++ u8 x03[0x0b]; ++ u16 pm; /* 0x4c Power Management */ ++ u8 x04[2]; ++ u8 intc; /* 0x50 INT Control */ ++ u8 x05[3]; ++ u16 lmw1l; /* 0x54 Local Memory Window 1 LMADRS Low */ ++ u16 lmw1h; /* 0x56 Local Memory Window 1 LMADRS High */ ++ u16 lmw1bl; /* 0x58 Local Memory Window 1 Base Address Low */ ++ u16 lmw1bh; /* 0x5A Local Memory Window 1 Base Address High */ ++ u16 lmw2l; /* 0x5C Local Memory Window 2 LMADRS Low */ ++ u16 lmw2h; /* 0x5E Local Memory Window 2 LMADRS High */ ++ u16 lmw2bl; /* 0x60 Local Memory Window 2 Base Address Low */ ++ u16 lmw2bh; /* 0x62 Local Memory Window 2 Base Address High */ ++ u8 x06[0x98]; ++ u8 misc; /* 0xFC MISC */ ++ u8 x07[3]; ++} __attribute__((packed)); ++ ++union tmio_uhccr_pm { ++ u16 raw; ++struct { ++ unsigned gcken:1; /* D0 */ ++ unsigned ckrnen:1; /* D1 */ ++ unsigned uspw1:1; /* D2 USB Port 1 Power Disable */ ++ unsigned uspw2:1; /* D3 USB Port 2 Power Disable */ ++ unsigned x00:4; ++ unsigned pmee:1; /* D8 */ ++ unsigned x01:6; ++ unsigned pmes:1; /* D15 */ ++} __attribute__((packed)); ++} __attribute__((packed)); ++ ++/*-------------------------------------------------------------------------*/ ++ ++struct tmio_hcd { ++ struct tmio_uhccr __iomem *ccr; ++}; ++ ++#define hcd_to_tmio(hcd) ((struct tmio_hcd *)(hcd_to_ohci(hcd) + 1)) ++#define ohci_to_tmio(ohci) ((struct tmio_hcd *)(ohci + 1)) ++ ++/*-------------------------------------------------------------------------*/ ++ ++static void tmio_stop_hc(struct device *dev) ++{ ++ struct tmio_device *tdev = dev_to_tdev(dev); ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct tmio_hcd *tmio = hcd_to_tmio(hcd); ++ struct tmio_uhccr __iomem *ccr = tmio->ccr; ++ union tmio_uhccr_pm pm = {0}; ++ ++ pm.gcken = 1; ++ pm.ckrnen = 1; ++ pm.uspw1 = 1; ++ pm.uspw2 = 1; ++ ++ iowrite8(0, &ccr->intc); ++ iowrite8(0, &ccr->ilme); ++ iowrite16(0, &ccr->basel); ++ iowrite16(0, &ccr->baseh); ++ iowrite16(pm.raw, &ccr->pm); ++ ++ tdev->ops->function(dev, 0); ++ tdev->ops->clock(dev, 0); ++} ++ ++static void tmio_start_hc(struct device *dev) ++{ ++ struct tmio_device *tdev = dev_to_tdev(dev); ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct tmio_hcd *tmio = hcd_to_tmio(hcd); ++ struct tmio_uhccr __iomem *ccr = tmio->ccr; ++ union tmio_uhccr_pm pm = {0}; ++ unsigned long base = hcd->rsrc_start; ++ ++ pm.pmes = 1; ++ pm.pmee = 1; ++ pm.ckrnen = 1; ++ pm.gcken = 1; ++ ++ tdev->ops->clock(dev, 1); ++ tdev->ops->function(dev, 1); ++ ++ iowrite16(pm.raw, &ccr->pm); ++ iowrite16(base, &ccr->basel); ++ iowrite16(base >> 16, &ccr->baseh); ++ iowrite8(1, &ccr->ilme); ++ iowrite8(2, &ccr->intc); ++ ++ dev_info(dev, "revision %d @ 0x%08llx, irq %d\n", ++ ioread8(&ccr->revid), hcd->rsrc_start, hcd->irq); ++} ++ ++static int usb_hcd_tmio_probe(const struct hc_driver *driver, ++ struct device *dev) ++{ ++ struct tmio_device *tdev = dev_to_tdev(dev); ++ struct resource *config = tmio_resource_config(dev); ++ struct resource *regs = tmio_resource_control(dev); ++ struct resource *sram = tmio_resource_mem(dev); ++ struct resource *irq = tmio_resource_irq(dev); ++ struct tmio_hcd *tmio; ++ struct ohci_hcd *ohci; ++ struct usb_hcd *hcd; ++ int retval; ++ ++ if (usb_disabled()) ++ return -ENODEV; ++ ++ hcd = usb_create_hcd(driver, dev, dev->bus_id); ++ if (!hcd) { ++ retval = -ENOMEM; ++ goto err_usb_create_hcd; ++ } ++ ++ retval = request_resource(tdev->iomem, config); ++ if (retval) ++ goto err_request_config_resource; ++ ++ retval = request_resource(tdev->iomem, regs); ++ if (retval) ++ goto err_request_regs_resource; ++ ++ retval = request_resource(tdev->iomem, sram); ++ if (retval) ++ goto err_request_sram_resource; ++ ++ hcd->rsrc_start = regs->start; ++ hcd->rsrc_len = regs->end - regs->start + 1; ++ ++ tmio = hcd_to_tmio(hcd); ++ ++ tmio->ccr = ioremap(config->start, config->end - config->start + 1); ++ if (!tmio->ccr) { ++ retval = -ENOMEM; ++ goto err_ioremap_ccr; ++ } ++ ++ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); ++ if (!hcd->regs) { ++ retval = -ENOMEM; ++ goto err_ioremap_regs; ++ } ++ ++ if (dma_declare_coherent_memory(dev, sram->start, ++ sram->start, ++ sram->end - sram->start + 1, ++ DMA_MEMORY_MAP) != DMA_MEMORY_MAP) { ++ retval = -EBUSY; ++ goto err_dma_declare; ++ } ++ ++ retval = dmabounce_register_dev(dev, 512, 4096); ++ if (retval) ++ goto err_dmabounce_register_dev; ++ ++ tmio_start_hc(dev); ++ ohci = hcd_to_ohci(hcd); ++ ohci_hcd_init(ohci); ++ ++ retval = usb_add_hcd(hcd, irq->start, IRQF_DISABLED); ++ ++ if (retval == 0) ++ return retval; ++ ++ tmio_stop_hc(dev); ++ ++ dmabounce_unregister_dev(dev); ++err_dmabounce_register_dev: ++ dma_release_declared_memory(dev); ++err_dma_declare: ++ iounmap(hcd->regs); ++err_ioremap_regs: ++ iounmap(tmio->ccr); ++err_ioremap_ccr: ++ release_resource(sram); ++err_request_sram_resource: ++ release_resource(regs); ++err_request_regs_resource: ++ release_resource(config); ++err_request_config_resource: ++ usb_put_hcd(hcd); ++err_usb_create_hcd: ++ ++ return retval; ++} ++ ++static void usb_hcd_tmio_remove(struct usb_hcd *hcd, struct device *dev) ++{ ++ struct tmio_hcd *tmio = hcd_to_tmio(hcd); ++ ++ usb_remove_hcd(hcd); ++ tmio_stop_hc(dev); ++ dmabounce_unregister_dev(dev); ++ dma_release_declared_memory(dev); ++ iounmap(hcd->regs); ++ iounmap(tmio->ccr); ++ release_resource(tmio_resource_mem(dev)); ++ release_resource(tmio_resource_control(dev)); ++ release_resource(tmio_resource_config(dev)); ++ usb_put_hcd(hcd); ++} ++ ++static int __devinit ++ohci_tmio_start(struct usb_hcd *hcd) ++{ ++ struct ohci_hcd *ohci = hcd_to_ohci(hcd); ++ int retval; ++ ++ if ((retval = ohci_init(ohci)) < 0) ++ return retval; ++ ++ if ((retval = ohci_run(ohci)) < 0) { ++ err("can't start %s", hcd->self.bus_name); ++ ohci_stop(hcd); ++ return retval; ++ } ++ ++ return 0; ++} ++ ++static const struct hc_driver ohci_tmio_hc_driver = { ++ .description = hcd_name, ++ .product_desc = "TMIO OHCI USB Host Controller", ++ .hcd_priv_size = sizeof(struct ohci_hcd) + sizeof (struct tmio_hcd), ++ ++ /* generic hardware linkage */ ++ .irq = ohci_irq, ++ .flags = HCD_USB11 | HCD_MEMORY, ++ ++ /* basic lifecycle operations */ ++ .start = ohci_tmio_start, ++ .stop = ohci_stop, ++ .shutdown = ohci_shutdown, ++ ++ /* 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, ++ .hub_irq_enable = ohci_rhsc_enable, ++#ifdef CONFIG_PM ++ .bus_suspend = ohci_bus_suspend, ++ .bus_resume = ohci_bus_resume, ++#endif ++ .start_port_reset = ohci_start_port_reset, ++}; ++ ++/*-------------------------------------------------------------------------*/ ++static struct device_driver tmio_ohci; ++ ++static int ++tmio_dmabounce_check(struct device *dev, dma_addr_t dma, size_t size, void *data) ++{ ++ struct resource *sram = data; ++#ifdef DEBUG ++ printk(KERN_ERR "tmio_dmabounce_check: %08x %d\n", dma, size); ++#endif ++ ++ if (dev->driver != &tmio_ohci) ++ return 0; ++ ++ if (sram->start <= dma && dma + size <= sram->end) ++ return 0; ++ ++ return 1; ++} ++ ++static u64 dma_mask = DMA_32BIT_MASK; ++ ++static int ohci_hcd_tmio_drv_probe(struct device *dev) ++{ ++ struct resource *sram = tmio_resource_mem(dev); ++ ++ dev->dma_mask = &dma_mask; ++ dev->coherent_dma_mask = DMA_32BIT_MASK; ++ ++ dmabounce_register_checker(tmio_dmabounce_check, sram); ++ ++ return usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); ++} ++ ++static int ohci_hcd_tmio_drv_remove(struct device *dev) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct resource *sram = tmio_resource_mem(dev); ++ ++ usb_hcd_tmio_remove(hcd, dev); ++ ++ dev_set_drvdata(dev, NULL); ++ ++ dmabounce_remove_checker(tmio_dmabounce_check, sram); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_PM ++static int ohci_hcd_tmio_drv_suspend(struct device *dev, pm_message_t state) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct ohci_hcd *ohci = hcd_to_ohci(hcd); ++ ++ if (time_before(jiffies, ohci->next_statechange)) ++ msleep(5); ++ ohci->next_statechange = jiffies; ++ ++ tmio_stop_hc(dev); ++ hcd->state = HC_STATE_SUSPENDED; ++ dev->power.power_state = PMSG_SUSPEND; ++ ++ return 0; ++} ++ ++static int ohci_hcd_tmio_drv_resume(struct device *dev) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct ohci_hcd *ohci = hcd_to_ohci(hcd); ++ ++ if (time_before(jiffies, ohci->next_statechange)) ++ msleep(5); ++ ohci->next_statechange = jiffies; ++ ++ tmio_start_hc(dev); ++ ++ dev->power.power_state = PMSG_ON; ++ usb_hcd_resume_root_hub(hcd); ++ ++ return 0; ++} ++#endif ++ ++static void usb_hcd_device_shutdown(struct device *dev) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ ++ if (hcd->driver->shutdown) ++ hcd->driver->shutdown(hcd); ++} ++ ++static struct device_driver tmio_ohci = { ++ .owner = THIS_MODULE, ++ .name = TMIO_NAME_OHCI, ++ .bus = &tmio_bus_type, ++ .probe = ohci_hcd_tmio_drv_probe, ++ .remove = ohci_hcd_tmio_drv_remove, ++ .shutdown = usb_hcd_device_shutdown, ++#ifdef CONFIG_PM ++ .suspend = ohci_hcd_tmio_drv_suspend, ++ .resume = ohci_hcd_tmio_drv_resume, ++#endif ++}; ++ +Index: linux-2.6.23/drivers/usb/host/Kconfig +=================================================================== +--- linux-2.6.23.orig/drivers/usb/host/Kconfig 2007-10-10 00:31:38.000000000 +0400 ++++ linux-2.6.23/drivers/usb/host/Kconfig 2007-11-12 13:46:53.086559913 +0300 +@@ -101,6 +101,7 @@ + depends on USB && USB_ARCH_HAS_OHCI + select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 + select I2C if ARCH_PNX4008 ++ select GENERIC_ALLOCATOR if TOSHIBA_TC6393XB + ---help--- + The Open Host Controller Interface (OHCI) is a standard for accessing + USB 1.1 host controller hardware. It does more in hardware than Intel's +Index: linux-2.6.23/drivers/usb/host/ohci-hcd.c +=================================================================== +--- linux-2.6.23.orig/drivers/usb/host/ohci-hcd.c 2007-11-12 13:46:52.894560883 +0300 ++++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-13 01:03:53.950798640 +0300 +@@ -915,6 +915,10 @@ + #define PLATFORM_DRIVER usb_hcd_pnx4008_driver + #endif + ++#ifdef CONFIG_TOSHIBA_TC6393XB ++#include "ohci-tmio.c" ++#define DEVICE_DRIVER tmio_ohci ++#endif + + #ifdef CONFIG_USB_OHCI_HCD_PPC_OF + #include "ohci-ppc-of.c" +Index: linux-2.6.23/drivers/usb/Kconfig +=================================================================== +--- linux-2.6.23.orig/drivers/usb/Kconfig 2007-10-10 00:31:38.000000000 +0400 ++++ linux-2.6.23/drivers/usb/Kconfig 2007-11-12 13:46:53.090570777 +0300 +@@ -42,6 +42,7 @@ + # MIPS: + default y if SOC_AU1X00 + # more: ++ default y if TOSHIBA_TC6393XB + default PCI + + # some non-PCI hcds implement EHCI +Index: linux-2.6.23/arch/arm/common/Kconfig +=================================================================== +--- linux-2.6.23.orig/arch/arm/common/Kconfig 2007-11-12 13:46:48.754297930 +0300 ++++ linux-2.6.23/arch/arm/common/Kconfig 2007-11-12 13:46:53.090570777 +0300 +@@ -35,3 +35,4 @@ + + config TOSHIBA_TC6393XB + bool ++ select DMABOUNCE -- cgit v1.2.3