linux-mips
[Top] [All Lists]

[PATCH] EHCI bus glue for on-chip PMC MSP USB controller

To: "gregkh @ suse . de" <gregkh@suse.de>, "dbrownell @ users . sourceforge . net" <dbrownell@users.sourceforge.net>, "stern @ rowland . harvard . edu" <stern@rowland.harvard.edu>, "pkondeti @ codeaurora . org" <pkondeti@codeaurora.org>, "jacob . jun . pan @ intel . com" <jacob.jun.pan@intel.com>, "linux-usb @ vger . kernel . org" <linux-usb@vger.kernel.org>, "alek . du @ intel . com" <alek.du@intel.com>, "linux-kernel @ vger . kernel . org" <linux-kernel@vger.kernel.org>, "gadiyar @ ti . com" <gadiyar@ti.com>, "ralf @ linux-mips . org" <ralf@linux-mips.org>, "linux-mips @ linux-mips . org" <linux-mips@linux-mips.org>, Greg KH <greg@kroah.com>
Subject: [PATCH] EHCI bus glue for on-chip PMC MSP USB controller
From: "Anoop P.A" <anoop.pa@gmail.com>
Date: Thu, 24 Feb 2011 19:26:28 +0530
Cc: anoop.pa@gmail.com
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=D6VPBR6eyW0Yha2bLZxwllLYiYihlX/iW5Q7BhKY4XM=; b=M9lnlWBqbf8hPJkla9NjqsheJhkbzhf8R6H5VXdncicOjX8bU0QcpdFZJVArNRV2rG dXFYpcVw3QfQl/cd5svniWn8X+KySZctbufTw+WPWmYPewHu7TQbNc72t2Z4Fl4gEHMc 0WT0raVy9v0+zu+q5o6SI9JMMepF9NXukc2Mw=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=khaNjy9LVpzX8mLJODDkxz+Ly6Pcv2byPVQQftUUl+5h3PKwgyiUDVXj+eNmsqs1bo foL0cD8VqJ6tUSJ5kvLJ3udj4NIA2wmt1dEKM8j7xC+brJnt02tTp94oY4UlXpftBnS+ 0b6qYPz6yWWHjI18R7dHGEkW1/kmUva/EDRcs=
In-reply-to: <20110224110138.GA28665@bicker>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20110224110138.GA28665@bicker>
Sender: linux-mips-bounce@linux-mips.org
From: Anoop <paanoop1@paanoop1-desktop.(none)>

This patch add bus glue for USB controller commonly found in PMC-Sierra MSP71xx 
family of SoC's.

Signed-off-by: Anoop P A <anoop.pa@gmail.com>
---
Changes.
ehci-pmcmsp.c is based on latest ehci-pci.c.Addressed some stylistic issue 
pointed by Greg.
Removed tdi reset quirk following the suggestion from Matthieu.
Removed power management code as it seems to be problematic.Removed some 
unwanted functions following the suggestions of Dan.

 drivers/usb/host/Kconfig       |   15 ++-
 drivers/usb/host/ehci-hcd.c    |    5 +
 drivers/usb/host/ehci-pmcmsp.c |  383 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 401 insertions(+), 2 deletions(-)
 create mode 100644 drivers/usb/host/ehci-pmcmsp.c

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 0e6afa2..0401ec0 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -91,17 +91,28 @@ config USB_EHCI_TT_NEWSCHED
 
          If unsure, say Y.
 
+config USB_EHCI_HCD_PMC_MSP
+       tristate "EHCI support for on-chip PMC MSP71xx USB controller"
+       depends on USB_EHCI_HCD && MSP_HAS_USB
+       default n
+       select USB_EHCI_BIG_ENDIAN_DESC
+       select USB_EHCI_BIG_ENDIAN_MMIO
+       ---help---
+               Enables support for the onchip USB controller on the 
PMC_MSP7100 Family SoC's.
+               If unsure, say N.
+
 config USB_EHCI_BIG_ENDIAN_MMIO
        bool
        depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || \
                                    ARCH_IXP4XX || XPS_USB_HCD_XILINX || \
-                                   PPC_MPC512x || CPU_CAVIUM_OCTEON)
+                                   PPC_MPC512x || CPU_CAVIUM_OCTEON || \
+                                   PMC_MSP)
        default y
 
 config USB_EHCI_BIG_ENDIAN_DESC
        bool
        depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX 
|| \
-                                   PPC_MPC512x)
+                                   PPC_MPC512x || PMC_MSP)
        default y
 
 config XPS_USB_HCD_XILINX
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index cbf451a..196050a 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1250,6 +1250,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER                ehci_msm_driver
 #endif
 
+#ifdef CONFIG_USB_EHCI_HCD_PMC_MSP
+#include "ehci-pmcmsp.c"
+#define        PLATFORM_DRIVER         ehci_hcd_msp_driver
+#endif
+
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
     !defined(XILINX_OF_PLATFORM_DRIVER)
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
new file mode 100644
index 0000000..a216864
--- /dev/null
+++ b/drivers/usb/host/ehci-pmcmsp.c
@@ -0,0 +1,383 @@
+/*
+ * PMC MSP EHCI (Host Controller Driver) for USB.
+ *
+ * (C) Copyright 2006-2010 PMC-Sierra Inc
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ */
+
+/* includes */
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/usb.h>
+#include <msp_usb.h>
+
+/* stream disable*/
+#define USB_CTRL_MODE_STREAM_DISABLE   0x10
+
+/* threshold */
+#define USB_CTRL_FIFO_THRESH           0x00300000
+
+/* register offset for usb_mode */
+#define USB_EHCI_REG_USB_MODE          0x68
+
+/* register offset for usb fifo */
+#define USB_EHCI_REG_USB_FIFO          0x24
+
+/* register offset for usb status */
+#define USB_EHCI_REG_USB_STATUS                0x44
+
+/* serial/parallel transceiver */
+#define USB_EHCI_REG_BIT_STAT_STS      (1<<29)
+
+/* TWI USB0 host device pin */
+#define MSP_PIN_USB0_HOST_DEV          49
+
+/* TWI USB1 host device pin */
+#define MSP_PIN_USB1_HOST_DEV          50
+
+
+static void usb_hcd_tdi_set_mode(struct ehci_hcd *ehci)
+{
+       u8 *base;
+       u8 *statreg;
+       u8 *fiforeg;
+       u32 val;
+       struct ehci_regs *reg_base = ehci->regs;
+
+       /* get register base */
+       base = (u8 *)reg_base + USB_EHCI_REG_USB_MODE;
+       statreg = (u8 *)reg_base + USB_EHCI_REG_USB_STATUS;
+       fiforeg = (u8 *)reg_base + USB_EHCI_REG_USB_FIFO;
+
+       /* Disable controller mode stream */
+       val = ehci_readl(ehci, (u32 *)base);
+       ehci_writel(ehci, (val | USB_CTRL_MODE_STREAM_DISABLE),
+                       (u32 *)base);
+
+       /* clear STS to select parallel transceiver interface */
+       val = ehci_readl(ehci, (u32 *)statreg);
+       val = val & ~USB_EHCI_REG_BIT_STAT_STS;
+       ehci_writel(ehci, val, (u32 *)statreg);
+
+       /* write to set the proper fifo threshold */
+       ehci_writel(ehci, USB_CTRL_FIFO_THRESH, (u32 *)fiforeg);
+
+       /* set TWI GPIO USB_HOST_DEV pin high */
+       gpio_direction_output(MSP_PIN_USB0_HOST_DEV, 1);
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+       gpio_direction_output(MSP_PIN_USB1_HOST_DEV, 1);
+#endif
+}
+
+/* called during probe() after chip reset completes */
+static int ehci_msp_setup(struct usb_hcd *hcd)
+{
+       struct ehci_hcd         *ehci = hcd_to_ehci(hcd);
+       int                     retval;
+       ehci->big_endian_mmio = 1;
+       ehci->big_endian_desc = 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");
+
+       /* cache this readonly data; minimize chip reads */
+       ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+       hcd->has_tt = 1;
+
+       retval = ehci_halt(ehci);
+       if (retval)
+               return retval;
+
+       ehci_reset(ehci);
+
+       /* data structure init */
+       retval = ehci_init(hcd);
+       if (retval)
+               return retval;
+
+       usb_hcd_tdi_set_mode(ehci);
+       ehci_port_power(ehci, 0);
+
+       return retval;
+}
+
+
+/* configure so an HC device and id are always provided
+ * always called with process context; sleeping is OK
+ */
+
+static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
+{
+       struct resource *res;
+       struct platform_device *pdev = &dev->dev;
+       u32 res_len;
+       int retval;
+
+       /* MAB register space */
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       if (res == NULL)
+               return -ENOMEM;
+       res_len = res->end - res->start + 1;
+       if (!request_mem_region(res->start, res_len, "mab regs"))
+               return -EBUSY;
+
+       dev->mab_regs = ioremap_nocache(res->start, res_len);
+       if (dev->mab_regs == NULL) {
+               retval = -ENOMEM;
+               goto err1;
+       }
+
+       /* MSP USB register space */
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+       if (res == NULL) {
+               retval = -ENOMEM;
+               goto err2;
+       }
+       res_len = res->end - res->start + 1;
+       if (!request_mem_region(res->start, res_len, "usbid regs")) {
+               retval = -EBUSY;
+               goto err2;
+       }
+       dev->usbid_regs = ioremap_nocache(res->start, res_len);
+       if (dev->usbid_regs == NULL) {
+               retval = -ENOMEM;
+               goto err3;
+       }
+
+       return 0;
+err3:
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+       res_len = res->end - res->start + 1;
+       release_mem_region(res->start, res_len);
+err2:
+       iounmap(dev->mab_regs);
+err1:
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       res_len = res->end - res->start + 1;
+       release_mem_region(res->start, res_len);
+       dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n");
+       return retval;
+}
+
+/**
+ * usb_hcd_msp_probe - initialize PMC MSP-based HCDs
+ * Context: !in_interrupt()
+ *
+ * Allocates basic resources for this USB host controller, and
+ * then invokes the start() method for the HCD associated with it
+ * through the hotplug entry's driver_data.
+ *
+ */
+int usb_hcd_msp_probe(const struct hc_driver *driver,
+                         struct platform_device *dev)
+{
+       int retval;
+       struct usb_hcd *hcd;
+       struct resource *res;
+       struct ehci_hcd         *ehci ;
+
+       hcd = usb_create_hcd(driver, &dev->dev, "pmcmsp");
+       if (!hcd)
+               return -ENOMEM;
+
+       res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+       if (res == NULL) {
+               pr_debug("No IOMEM resource info for %s.\n", dev->name);
+               retval = -ENOMEM;
+               goto err1;
+       }
+       hcd->rsrc_start = res->start;
+       hcd->rsrc_len = res->end - res->start + 1;
+       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) {
+               retval = -EBUSY;
+               goto err1;
+       }
+       hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
+       if (!hcd->regs) {
+               pr_debug("ioremap failed");
+               retval = -ENOMEM;
+               goto err2;
+       }
+
+       res = platform_get_resource(dev, IORESOURCE_IRQ, 0);
+       if (res == NULL) {
+               dev_err(&dev->dev, "No IRQ resource info for %s.\n", dev->name);
+               retval = -ENOMEM;
+               goto err3;
+       }
+
+       /* Map non-EHCI register spaces */
+       retval = usb_hcd_msp_map_regs(to_mspusb_device(dev));
+       if (retval != 0)
+               goto err3;
+
+       ehci = hcd_to_ehci(hcd);
+       ehci->big_endian_mmio = 1;
+       ehci->big_endian_desc = 1;
+
+
+       retval = usb_add_hcd(hcd, res->start, IRQF_SHARED);
+       if (retval == 0)
+               return 0;
+
+       usb_remove_hcd(hcd);
+err3:
+       iounmap(hcd->regs);
+err2:
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err1:
+       usb_put_hcd(hcd);
+
+       return retval;
+}
+
+
+
+/**
+ * usb_hcd_msp_remove - shutdown processing for PMC MSP-based HCDs
+ * @dev: USB Host Controller being removed
+ * Context: !in_interrupt()
+ *
+ * Reverses the effect of usb_hcd_msp_probe(), first invoking
+ * the HCD's stop() method.  It is always called from a thread
+ * context, normally "rmmod", "apmd", or something similar.
+ *
+ * may be called without controller electrically present
+ * may be called with controller, bus, and devices active
+ */
+void usb_hcd_msp_remove(struct usb_hcd *hcd, struct platform_device *dev)
+{
+       usb_remove_hcd(hcd);
+       iounmap(hcd->regs);
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+       usb_put_hcd(hcd);
+}
+
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+/*
+ * Wrapper around the main ehci_irq.  Since both USB host controllers are
+ * sharing the same IRQ, need to first determine whether we're the intended
+ * recipient of this interrupt.
+ */
+static irqreturn_t ehci_msp_irq(struct usb_hcd *hcd)
+{
+       u32 int_src;
+       struct device *dev = hcd->self.controller;
+       struct platform_device *pdev;
+       struct mspusb_device *mdev;
+       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+       /* need to reverse-map a couple of containers to get our device */
+       pdev = to_platform_device(dev);
+       mdev = to_mspusb_device(pdev);
+
+       /* Check to see if this interrupt is for this host controller */
+       int_src = ehci_readl(ehci, &mdev->mab_regs->int_stat);
+       if (int_src & (1 << pdev->id))
+               return ehci_irq(hcd);
+
+       /* Not for this device */
+       return IRQ_NONE;
+}
+#endif /* DUAL_USB */
+
+static const struct hc_driver ehci_msp_hc_driver = {
+       .description =          hcd_name,
+       .product_desc =         "PMC MSP EHCI",
+       .hcd_priv_size =        sizeof(struct ehci_hcd),
+
+       /*
+        * generic hardware linkage
+        */
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+       .irq =                  ehci_msp_irq,
+#else
+       .irq =                  ehci_irq,
+#endif
+       .flags =                HCD_MEMORY | HCD_USB2,
+
+       /*
+        * basic lifecycle operations
+        */
+       .reset =                ehci_msp_setup,
+       .start =                ehci_run,
+       .shutdown               = ehci_shutdown,
+       .start                  = ehci_run,
+       .stop                   = ehci_stop,
+
+       /*
+        * 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 int ehci_hcd_msp_drv_probe(struct platform_device *pdev)
+{
+       int ret;
+
+       pr_debug("In ehci_hcd_msp_drv_probe");
+
+       if (usb_disabled())
+               return -ENODEV;
+
+       gpio_request(MSP_PIN_USB0_HOST_DEV, "USB0_HOST_DEV_GPIO");
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+       gpio_request(MSP_PIN_USB1_HOST_DEV, "USB1_HOST_DEV_GPIO");
+#endif
+
+       ret = usb_hcd_msp_probe(&ehci_msp_hc_driver, pdev);
+
+       return ret;
+}
+
+static int ehci_hcd_msp_drv_remove(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+       usb_hcd_msp_remove(hcd, pdev);
+
+       /* free TWI GPIO USB_HOST_DEV pin */
+       gpio_free(MSP_PIN_USB0_HOST_DEV);
+#ifdef CONFIG_MSP_HAS_DUAL_USB
+       gpio_free(MSP_PIN_USB1_HOST_DEV);
+#endif
+
+       return 0;
+}
+
+MODULE_ALIAS("pmcmsp-ehci");
+
+static struct platform_driver ehci_hcd_msp_driver = {
+       .probe          = ehci_hcd_msp_drv_probe,
+       .remove         = ehci_hcd_msp_drv_remove,
+       .driver         = {
+               .name   = "pmcmsp-ehci",
+               .owner  = THIS_MODULE,
+       },
+};
-- 
1.7.0.4


<Prev in Thread] Current Thread [Next in Thread>