2 files changed, 217 insertions, 1 deletions

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 03d567e4d00a..9ec896218feb 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -907,7 +907,13 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ehci_hcd_au1xxx_driver
 #endif
 
-#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER)
+#ifdef CONFIG_PPC_PS3
+#include "ehci-ps3.c"
+#define PS3_SYSTEM_BUS_DRIVER   ps3_ehci_sb_driver
+#endif
+
+#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+    !defined(PS3_SYSTEM_BUS_DRIVER)
 #error "missing bus glue for ehci-hcd"
 #endif
 
@@ -932,6 +938,20 @@ static int __init ehci_hcd_init(void)
 #ifdef PLATFORM_DRIVER
                 platform_driver_unregister(&PLATFORM_DRIVER);
 #endif
+                return retval;
+        }
+#endif
+
+#ifdef PS3_SYSTEM_BUS_DRIVER
+        retval = ps3_system_bus_driver_register(&PS3_SYSTEM_BUS_DRIVER);
+        if (retval < 0) {
+#ifdef PLATFORM_DRIVER
+                platform_driver_unregister(&PLATFORM_DRIVER);
+#endif
+#ifdef PCI_DRIVER
+                pci_unregister_driver(&PCI_DRIVER);
+#endif
+                return retval;
         }
 #endif
 
@@ -947,6 +967,9 @@ static void __exit ehci_hcd_cleanup(void)
 #ifdef PCI_DRIVER
         pci_unregister_driver(&PCI_DRIVER);
 #endif
+#ifdef PS3_SYSTEM_BUS_DRIVER
+        ps3_system_bus_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
+#endif
 }
 module_exit(ehci_hcd_cleanup);
 
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
new file mode 100644
index 000000000000..371f194a9d39
--- /dev/null
+++ b/drivers/usb/host/ehci-ps3.c
@@ -0,0 +1,193 @@
+/*
+ *  PS3 EHCI Host Controller driver
+ *
+ *  Copyright (C) 2006 Sony Computer Entertainment Inc.
+ *  Copyright 2006 Sony Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <asm/ps3.h>
+
+static int ps3_ehci_hc_reset(struct usb_hcd *hcd)
+{
+        int result;
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+
+        ehci->big_endian_mmio = 1;
+
+        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);
+
+        result = ehci_halt(ehci);
+
+        if (result)
+                return result;
+
+        result = ehci_init(hcd);
+
+        if (result)
+                return result;
+
+        ehci_port_power(ehci, 0);
+
+        return result;
+}
+
+static const struct hc_driver ps3_ehci_hc_driver = {
+        .description            = hcd_name,
+        .product_desc           = "PS3 EHCI Host Controller",
+        .hcd_priv_size          = sizeof(struct ehci_hcd),
+        .irq                    = ehci_irq,
+        .flags                  = HCD_MEMORY | HCD_USB2,
+        .reset                  = ps3_ehci_hc_reset,
+        .start                  = ehci_run,
+        .stop                   = ehci_stop,
+        .shutdown               = ehci_shutdown,
+        .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,
+#if defined(CONFIG_PM)
+        .bus_suspend            = ehci_bus_suspend,
+        .bus_resume             = ehci_bus_resume,
+#endif
+};
+
+#if !defined(DEBUG)
+#undef dev_dbg
+static inline int __attribute__ ((format (printf, 2, 3))) dev_dbg(
+        const struct device *_dev, const char *fmt, ...) {return 0;}
+#endif
+
+
+static int ps3_ehci_sb_probe(struct ps3_system_bus_device *dev)
+{
+        int result;
+        struct usb_hcd *hcd;
+        unsigned int virq;
+        static u64 dummy_mask = DMA_32BIT_MASK;
+
+        if (usb_disabled()) {
+                result = -ENODEV;
+                goto fail_start;
+        }
+
+        result = ps3_mmio_region_create(dev->m_region);
+
+        if (result) {
+                dev_dbg(&dev->core, "%s:%d: ps3_map_mmio_region failed\n",
+                        __func__, __LINE__);
+                result = -EPERM;
+                goto fail_mmio;
+        }
+
+        dev_dbg(&dev->core, "%s:%d: mmio mapped_addr %lxh\n", __func__,
+                __LINE__, dev->m_region->lpar_addr);
+
+        result = ps3_alloc_io_irq(dev->interrupt_id, &virq);
+
+        if (result) {
+                dev_dbg(&dev->core, "%s:%d: ps3_construct_io_irq(%d) failed.\n",
+                        __func__, __LINE__, virq);
+                result = -EPERM;
+                goto fail_irq;
+        }
+
+        dev->core.power.power_state = PMSG_ON;
+        dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */
+
+        hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev->core.bus_id);
+
+        if (!hcd) {
+                dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__,
+                        __LINE__);
+                result = -ENOMEM;
+                goto fail_create_hcd;
+        }
+
+        hcd->rsrc_start = dev->m_region->lpar_addr;
+        hcd->rsrc_len = dev->m_region->len;
+        hcd->regs = ioremap(dev->m_region->lpar_addr, dev->m_region->len);
+
+        if (!hcd->regs) {
+                dev_dbg(&dev->core, "%s:%d: ioremap failed\n", __func__,
+                        __LINE__);
+                result = -EPERM;
+                goto fail_ioremap;
+        }
+
+        dev_dbg(&dev->core, "%s:%d: hcd->rsrc_start %lxh\n", __func__, __LINE__,
+                (unsigned long)hcd->rsrc_start);
+        dev_dbg(&dev->core, "%s:%d: hcd->rsrc_len   %lxh\n", __func__, __LINE__,
+                (unsigned long)hcd->rsrc_len);
+        dev_dbg(&dev->core, "%s:%d: hcd->regs       %lxh\n", __func__, __LINE__,
+                (unsigned long)hcd->regs);
+        dev_dbg(&dev->core, "%s:%d: virq            %lu\n", __func__, __LINE__,
+                (unsigned long)virq);
+
+        ps3_system_bus_set_driver_data(dev, hcd);
+
+        result = usb_add_hcd(hcd, virq, IRQF_DISABLED);
+
+        if (result) {
+                dev_dbg(&dev->core, "%s:%d: usb_add_hcd failed (%d)\n",
+                        __func__, __LINE__, result);
+                goto fail_add_hcd;
+        }
+
+        return result;
+
+fail_add_hcd:
+        iounmap(hcd->regs);
+fail_ioremap:
+        usb_put_hcd(hcd);
+fail_create_hcd:
+        ps3_free_io_irq(virq);
+fail_irq:
+        ps3_free_mmio_region(dev->m_region);
+fail_mmio:
+fail_start:
+        return result;
+}
+
+static int ps3_ehci_sb_remove(struct ps3_system_bus_device *dev)
+{
+        struct usb_hcd *hcd =
+                (struct usb_hcd *)ps3_system_bus_get_driver_data(dev);
+
+        usb_put_hcd(hcd);
+        ps3_system_bus_set_driver_data(dev, NULL);
+
+        return 0;
+}
+
+MODULE_ALIAS("ps3-ehci");
+
+static struct ps3_system_bus_driver ps3_ehci_sb_driver = {
+        .match_id = PS3_MATCH_ID_EHCI,
+        .core = {
+                .name = "ps3-ehci-driver",
+        },
+        .probe = ps3_ehci_sb_probe,
+        .remove = ps3_ehci_sb_remove,
+};