usb: dwc2: move debugfs code to a separate file
authorMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Wed, 29 Apr 2015 20:08:59 +0000 (22:08 +0200)
committerFelipe Balbi <balbi@ti.com>
Wed, 29 Apr 2015 20:18:25 +0000 (15:18 -0500)
Prepare to add more debug code. Moreover, don't save dentry * for
each file in struct dwc2_hsotg as clean up is done with
debugfs_remove_recursive(). s3c_hsotg_delete_debug() is removed
altogether for the same reason.

Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/dwc2/Makefile
drivers/usb/dwc2/core.h
drivers/usb/dwc2/debug.h [new file with mode: 0644]
drivers/usb/dwc2/debugfs.c [new file with mode: 0644]
drivers/usb/dwc2/gadget.c
drivers/usb/dwc2/platform.c

index f07b425eaff382b0f8403beaec15117ae42335a6..324fbb40aa05be7ee7074aa572272c76d0dc4d27 100644 (file)
@@ -13,6 +13,10 @@ ifneq ($(filter y,$(CONFIG_USB_DWC2_PERIPHERAL) $(CONFIG_USB_DWC2_DUAL_ROLE)),)
        dwc2-y                          += gadget.o
 endif
 
+ifneq ($(CONFIG_DEBUG_FS),)
+       dwc2-y                          += debugfs.o
+endif
+
 # NOTE: The previous s3c-hsotg peripheral mode only driver has been moved to
 # this location and renamed gadget.c. When building for dynamically linked
 # modules, dwc2.ko will get built for host mode, peripheral mode, and dual-role
index 836c012c770788d2d7e23109660d621939dff86b..3695c6f073a5beb7dd5e4cc884e6ea6c031bbda4 100644 (file)
@@ -615,9 +615,6 @@ struct dwc2_hsotg {
        enum dwc2_lx_state lx_state;
 
        struct dentry *debug_root;
-       struct dentry *debug_file;
-       struct dentry *debug_testmode;
-       struct dentry *debug_fifo;
 
        /* DWC OTG HW Release versions */
 #define DWC2_CORE_REV_2_71a    0x4f54271a
@@ -1005,6 +1002,7 @@ extern void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
                bool reset);
 extern void s3c_hsotg_core_connect(struct dwc2_hsotg *hsotg);
 extern void s3c_hsotg_disconnect(struct dwc2_hsotg *dwc2);
+extern int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);
 #else
 static inline int s3c_hsotg_remove(struct dwc2_hsotg *dwc2)
 { return 0; }
@@ -1018,6 +1016,9 @@ static inline void s3c_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
                bool reset) {}
 static inline void s3c_hsotg_core_connect(struct dwc2_hsotg *hsotg) {}
 static inline void s3c_hsotg_disconnect(struct dwc2_hsotg *dwc2) {}
+static inline int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg,
+                                                       int testmode)
+{ return 0; }
 #endif
 
 #if IS_ENABLED(CONFIG_USB_DWC2_HOST) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
diff --git a/drivers/usb/dwc2/debug.h b/drivers/usb/dwc2/debug.h
new file mode 100644 (file)
index 0000000..12dbd1d
--- /dev/null
@@ -0,0 +1,27 @@
+/**
+ * debug.h - Designware USB2 DRD controller debug header
+ *
+ * Copyright (C) 2015 Intel Corporation
+ * Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2  of
+ * the License as published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+#include "core.h"
+
+#ifdef CONFIG_DEBUG_FS
+extern int dwc2_debugfs_init(struct dwc2_hsotg *);
+extern void dwc2_debugfs_exit(struct dwc2_hsotg *);
+#else
+static inline int dwc2_debugfs_init(struct dwc2_hsotg *hsotg)
+{  return 0;  }
+static inline void dwc2_debugfs_exit(struct dwc2_hsotg *hsotg)
+{  }
+#endif
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
new file mode 100644 (file)
index 0000000..e57e554
--- /dev/null
@@ -0,0 +1,416 @@
+/**
+ * debugfs.c - Designware USB2 DRD controller debugfs
+ *
+ * Copyright (C) 2015 Intel Corporation
+ * Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2  of
+ * the License as published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+#include <linux/spinlock.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+#include <linux/uaccess.h>
+
+#include "core.h"
+#include "debug.h"
+
+#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \
+       IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
+/**
+ * testmode_write - debugfs: change usb test mode
+ * @seq: The seq file to write to.
+ * @v: Unused parameter.
+ *
+ * This debugfs entry modify the current usb test mode.
+ */
+static ssize_t testmode_write(struct file *file, const char __user *ubuf, size_t
+               count, loff_t *ppos)
+{
+       struct seq_file         *s = file->private_data;
+       struct dwc2_hsotg       *hsotg = s->private;
+       unsigned long           flags;
+       u32                     testmode = 0;
+       char                    buf[32];
+
+       if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+               return -EFAULT;
+
+       if (!strncmp(buf, "test_j", 6))
+               testmode = TEST_J;
+       else if (!strncmp(buf, "test_k", 6))
+               testmode = TEST_K;
+       else if (!strncmp(buf, "test_se0_nak", 12))
+               testmode = TEST_SE0_NAK;
+       else if (!strncmp(buf, "test_packet", 11))
+               testmode = TEST_PACKET;
+       else if (!strncmp(buf, "test_force_enable", 17))
+               testmode = TEST_FORCE_EN;
+       else
+               testmode = 0;
+
+       spin_lock_irqsave(&hsotg->lock, flags);
+       s3c_hsotg_set_test_mode(hsotg, testmode);
+       spin_unlock_irqrestore(&hsotg->lock, flags);
+       return count;
+}
+
+/**
+ * testmode_show - debugfs: show usb test mode state
+ * @seq: The seq file to write to.
+ * @v: Unused parameter.
+ *
+ * This debugfs entry shows which usb test mode is currently enabled.
+ */
+static int testmode_show(struct seq_file *s, void *unused)
+{
+       struct dwc2_hsotg *hsotg = s->private;
+       unsigned long flags;
+       int dctl;
+
+       spin_lock_irqsave(&hsotg->lock, flags);
+       dctl = readl(hsotg->regs + DCTL);
+       dctl &= DCTL_TSTCTL_MASK;
+       dctl >>= DCTL_TSTCTL_SHIFT;
+       spin_unlock_irqrestore(&hsotg->lock, flags);
+
+       switch (dctl) {
+       case 0:
+               seq_puts(s, "no test\n");
+               break;
+       case TEST_J:
+               seq_puts(s, "test_j\n");
+               break;
+       case TEST_K:
+               seq_puts(s, "test_k\n");
+               break;
+       case TEST_SE0_NAK:
+               seq_puts(s, "test_se0_nak\n");
+               break;
+       case TEST_PACKET:
+               seq_puts(s, "test_packet\n");
+               break;
+       case TEST_FORCE_EN:
+               seq_puts(s, "test_force_enable\n");
+               break;
+       default:
+               seq_printf(s, "UNKNOWN %d\n", dctl);
+       }
+
+       return 0;
+}
+
+static int testmode_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, testmode_show, inode->i_private);
+}
+
+static const struct file_operations testmode_fops = {
+       .owner          = THIS_MODULE,
+       .open           = testmode_open,
+       .write          = testmode_write,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+/**
+ * state_show - debugfs: show overall driver and device state.
+ * @seq: The seq file to write to.
+ * @v: Unused parameter.
+ *
+ * This debugfs entry shows the overall state of the hardware and
+ * some general information about each of the endpoints available
+ * to the system.
+ */
+static int state_show(struct seq_file *seq, void *v)
+{
+       struct dwc2_hsotg *hsotg = seq->private;
+       void __iomem *regs = hsotg->regs;
+       int idx;
+
+       seq_printf(seq, "DCFG=0x%08x, DCTL=0x%08x, DSTS=0x%08x\n",
+                readl(regs + DCFG),
+                readl(regs + DCTL),
+                readl(regs + DSTS));
+
+       seq_printf(seq, "DIEPMSK=0x%08x, DOEPMASK=0x%08x\n",
+                  readl(regs + DIEPMSK), readl(regs + DOEPMSK));
+
+       seq_printf(seq, "GINTMSK=0x%08x, GINTSTS=0x%08x\n",
+                  readl(regs + GINTMSK),
+                  readl(regs + GINTSTS));
+
+       seq_printf(seq, "DAINTMSK=0x%08x, DAINT=0x%08x\n",
+                  readl(regs + DAINTMSK),
+                  readl(regs + DAINT));
+
+       seq_printf(seq, "GNPTXSTS=0x%08x, GRXSTSR=%08x\n",
+                  readl(regs + GNPTXSTS),
+                  readl(regs + GRXSTSR));
+
+       seq_puts(seq, "\nEndpoint status:\n");
+
+       for (idx = 0; idx < hsotg->num_of_eps; idx++) {
+               u32 in, out;
+
+               in = readl(regs + DIEPCTL(idx));
+               out = readl(regs + DOEPCTL(idx));
+
+               seq_printf(seq, "ep%d: DIEPCTL=0x%08x, DOEPCTL=0x%08x",
+                          idx, in, out);
+
+               in = readl(regs + DIEPTSIZ(idx));
+               out = readl(regs + DOEPTSIZ(idx));
+
+               seq_printf(seq, ", DIEPTSIZ=0x%08x, DOEPTSIZ=0x%08x",
+                          in, out);
+
+               seq_puts(seq, "\n");
+       }
+
+       return 0;
+}
+
+static int state_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, state_show, inode->i_private);
+}
+
+static const struct file_operations state_fops = {
+       .owner          = THIS_MODULE,
+       .open           = state_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+/**
+ * fifo_show - debugfs: show the fifo information
+ * @seq: The seq_file to write data to.
+ * @v: Unused parameter.
+ *
+ * Show the FIFO information for the overall fifo and all the
+ * periodic transmission FIFOs.
+ */
+static int fifo_show(struct seq_file *seq, void *v)
+{
+       struct dwc2_hsotg *hsotg = seq->private;
+       void __iomem *regs = hsotg->regs;
+       u32 val;
+       int idx;
+
+       seq_puts(seq, "Non-periodic FIFOs:\n");
+       seq_printf(seq, "RXFIFO: Size %d\n", readl(regs + GRXFSIZ));
+
+       val = readl(regs + GNPTXFSIZ);
+       seq_printf(seq, "NPTXFIFO: Size %d, Start 0x%08x\n",
+                  val >> FIFOSIZE_DEPTH_SHIFT,
+                  val & FIFOSIZE_DEPTH_MASK);
+
+       seq_puts(seq, "\nPeriodic TXFIFOs:\n");
+
+       for (idx = 1; idx < hsotg->num_of_eps; idx++) {
+               val = readl(regs + DPTXFSIZN(idx));
+
+               seq_printf(seq, "\tDPTXFIFO%2d: Size %d, Start 0x%08x\n", idx,
+                          val >> FIFOSIZE_DEPTH_SHIFT,
+                          val & FIFOSIZE_STARTADDR_MASK);
+       }
+
+       return 0;
+}
+
+static int fifo_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, fifo_show, inode->i_private);
+}
+
+static const struct file_operations fifo_fops = {
+       .owner          = THIS_MODULE,
+       .open           = fifo_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static const char *decode_direction(int is_in)
+{
+       return is_in ? "in" : "out";
+}
+
+/**
+ * ep_show - debugfs: show the state of an endpoint.
+ * @seq: The seq_file to write data to.
+ * @v: Unused parameter.
+ *
+ * This debugfs entry shows the state of the given endpoint (one is
+ * registered for each available).
+ */
+static int ep_show(struct seq_file *seq, void *v)
+{
+       struct s3c_hsotg_ep *ep = seq->private;
+       struct dwc2_hsotg *hsotg = ep->parent;
+       struct s3c_hsotg_req *req;
+       void __iomem *regs = hsotg->regs;
+       int index = ep->index;
+       int show_limit = 15;
+       unsigned long flags;
+
+       seq_printf(seq, "Endpoint index %d, named %s,  dir %s:\n",
+                  ep->index, ep->ep.name, decode_direction(ep->dir_in));
+
+       /* first show the register state */
+
+       seq_printf(seq, "\tDIEPCTL=0x%08x, DOEPCTL=0x%08x\n",
+                  readl(regs + DIEPCTL(index)),
+                  readl(regs + DOEPCTL(index)));
+
+       seq_printf(seq, "\tDIEPDMA=0x%08x, DOEPDMA=0x%08x\n",
+                  readl(regs + DIEPDMA(index)),
+                  readl(regs + DOEPDMA(index)));
+
+       seq_printf(seq, "\tDIEPINT=0x%08x, DOEPINT=0x%08x\n",
+                  readl(regs + DIEPINT(index)),
+                  readl(regs + DOEPINT(index)));
+
+       seq_printf(seq, "\tDIEPTSIZ=0x%08x, DOEPTSIZ=0x%08x\n",
+                  readl(regs + DIEPTSIZ(index)),
+                  readl(regs + DOEPTSIZ(index)));
+
+       seq_puts(seq, "\n");
+       seq_printf(seq, "mps %d\n", ep->ep.maxpacket);
+       seq_printf(seq, "total_data=%ld\n", ep->total_data);
+
+       seq_printf(seq, "request list (%p,%p):\n",
+                  ep->queue.next, ep->queue.prev);
+
+       spin_lock_irqsave(&hsotg->lock, flags);
+
+       list_for_each_entry(req, &ep->queue, queue) {
+               if (--show_limit < 0) {
+                       seq_puts(seq, "not showing more requests...\n");
+                       break;
+               }
+
+               seq_printf(seq, "%c req %p: %d bytes @%p, ",
+                          req == ep->req ? '*' : ' ',
+                          req, req->req.length, req->req.buf);
+               seq_printf(seq, "%d done, res %d\n",
+                          req->req.actual, req->req.status);
+       }
+
+       spin_unlock_irqrestore(&hsotg->lock, flags);
+
+       return 0;
+}
+
+static int ep_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, ep_show, inode->i_private);
+}
+
+static const struct file_operations ep_fops = {
+       .owner          = THIS_MODULE,
+       .open           = ep_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+/**
+ * s3c_hsotg_create_debug - create debugfs directory and files
+ * @hsotg: The driver state
+ *
+ * Create the debugfs files to allow the user to get information
+ * about the state of the system. The directory name is created
+ * with the same name as the device itself, in case we end up
+ * with multiple blocks in future systems.
+ */
+static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg)
+{
+       struct dentry *root;
+       struct dentry *file;
+       unsigned epidx;
+
+       root = hsotg->debug_root;
+
+       /* create general state file */
+
+       file = debugfs_create_file("state", S_IRUGO, root, hsotg, &state_fops);
+       if (IS_ERR(file))
+               dev_err(hsotg->dev, "%s: failed to create state\n", __func__);
+
+       file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root, hsotg,
+                                                       &testmode_fops);
+       if (IS_ERR(file))
+               dev_err(hsotg->dev, "%s: failed to create testmode\n",
+                               __func__);
+
+       file = debugfs_create_file("fifo", S_IRUGO, root, hsotg, &fifo_fops);
+       if (IS_ERR(file))
+               dev_err(hsotg->dev, "%s: failed to create fifo\n", __func__);
+
+       /* Create one file for each out endpoint */
+       for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) {
+               struct s3c_hsotg_ep *ep;
+
+               ep = hsotg->eps_out[epidx];
+               if (ep) {
+                       file = debugfs_create_file(ep->name, S_IRUGO,
+                                                         root, ep, &ep_fops);
+                       if (IS_ERR(file))
+                               dev_err(hsotg->dev, "failed to create %s debug file\n",
+                                       ep->name);
+               }
+       }
+       /* Create one file for each in endpoint. EP0 is handled with out eps */
+       for (epidx = 1; epidx < hsotg->num_of_eps; epidx++) {
+               struct s3c_hsotg_ep *ep;
+
+               ep = hsotg->eps_in[epidx];
+               if (ep) {
+                       file = debugfs_create_file(ep->name, S_IRUGO,
+                                                         root, ep, &ep_fops);
+                       if (IS_ERR(file))
+                               dev_err(hsotg->dev, "failed to create %s debug file\n",
+                                       ep->name);
+               }
+       }
+}
+#else
+static inline void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg) {}
+#endif
+
+/* s3c_hsotg_delete_debug is removed as cleanup in done in dwc2_debugfs_exit */
+
+int dwc2_debugfs_init(struct dwc2_hsotg *hsotg)
+{
+       int                     ret;
+
+       hsotg->debug_root = debugfs_create_dir(dev_name(hsotg->dev), NULL);
+       if (!hsotg->debug_root) {
+               ret = -ENOMEM;
+               goto err0;
+       }
+
+       /* Add gadget debugfs nodes */
+       s3c_hsotg_create_debug(hsotg);
+err0:
+       return ret;
+}
+EXPORT_SYMBOL_GPL(dwc2_debugfs_init);
+
+void dwc2_debugfs_exit(struct dwc2_hsotg *hsotg)
+{
+       debugfs_remove_recursive(hsotg->debug_root);
+       hsotg->debug_root = NULL;
+}
+EXPORT_SYMBOL_GPL(dwc2_debugfs_exit);
index 6a30887082cd9d40eee84de06de8a55e85c9d8ca..bed56dc27fdcd29c0562dfd93429054a9125f2c7 100644 (file)
@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <linux/debugfs.h>
 #include <linux/mutex.h>
 #include <linux/seq_file.h>
 #include <linux/delay.h>
@@ -35,7 +34,6 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/phy.h>
 #include <linux/platform_data/s3c-hsotg.h>
-#include <linux/uaccess.h>
 
 #include "core.h"
 #include "hw.h"
@@ -894,7 +892,7 @@ static struct s3c_hsotg_ep *ep_from_windex(struct dwc2_hsotg *hsotg,
  * @testmode: requested usb test mode
  * Enable usb Test Mode requested by the Host.
  */
-static int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode)
+int s3c_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode)
 {
        int dctl = readl(hsotg->regs + DCTL);
 
@@ -3391,404 +3389,6 @@ static void s3c_hsotg_dump(struct dwc2_hsotg *hsotg)
 #endif
 }
 
-/**
- * testmode_write - debugfs: change usb test mode
- * @seq: The seq file to write to.
- * @v: Unused parameter.
- *
- * This debugfs entry modify the current usb test mode.
- */
-static ssize_t testmode_write(struct file *file, const char __user *ubuf, size_t
-               count, loff_t *ppos)
-{
-       struct seq_file         *s = file->private_data;
-       struct dwc2_hsotg       *hsotg = s->private;
-       unsigned long           flags;
-       u32                     testmode = 0;
-       char                    buf[32];
-
-       if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
-               return -EFAULT;
-
-       if (!strncmp(buf, "test_j", 6))
-               testmode = TEST_J;
-       else if (!strncmp(buf, "test_k", 6))
-               testmode = TEST_K;
-       else if (!strncmp(buf, "test_se0_nak", 12))
-               testmode = TEST_SE0_NAK;
-       else if (!strncmp(buf, "test_packet", 11))
-               testmode = TEST_PACKET;
-       else if (!strncmp(buf, "test_force_enable", 17))
-               testmode = TEST_FORCE_EN;
-       else
-               testmode = 0;
-
-       spin_lock_irqsave(&hsotg->lock, flags);
-       s3c_hsotg_set_test_mode(hsotg, testmode);
-       spin_unlock_irqrestore(&hsotg->lock, flags);
-       return count;
-}
-
-/**
- * testmode_show - debugfs: show usb test mode state
- * @seq: The seq file to write to.
- * @v: Unused parameter.
- *
- * This debugfs entry shows which usb test mode is currently enabled.
- */
-static int testmode_show(struct seq_file *s, void *unused)
-{
-       struct dwc2_hsotg *hsotg = s->private;
-       unsigned long flags;
-       int dctl;
-
-       spin_lock_irqsave(&hsotg->lock, flags);
-       dctl = readl(hsotg->regs + DCTL);
-       dctl &= DCTL_TSTCTL_MASK;
-       dctl >>= DCTL_TSTCTL_SHIFT;
-       spin_unlock_irqrestore(&hsotg->lock, flags);
-
-       switch (dctl) {
-       case 0:
-               seq_puts(s, "no test\n");
-               break;
-       case TEST_J:
-               seq_puts(s, "test_j\n");
-               break;
-       case TEST_K:
-               seq_puts(s, "test_k\n");
-               break;
-       case TEST_SE0_NAK:
-               seq_puts(s, "test_se0_nak\n");
-               break;
-       case TEST_PACKET:
-               seq_puts(s, "test_packet\n");
-               break;
-       case TEST_FORCE_EN:
-               seq_puts(s, "test_force_enable\n");
-               break;
-       default:
-               seq_printf(s, "UNKNOWN %d\n", dctl);
-       }
-
-       return 0;
-}
-
-static int testmode_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, testmode_show, inode->i_private);
-}
-
-static const struct file_operations testmode_fops = {
-       .owner          = THIS_MODULE,
-       .open           = testmode_open,
-       .write          = testmode_write,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-/**
- * state_show - debugfs: show overall driver and device state.
- * @seq: The seq file to write to.
- * @v: Unused parameter.
- *
- * This debugfs entry shows the overall state of the hardware and
- * some general information about each of the endpoints available
- * to the system.
- */
-static int state_show(struct seq_file *seq, void *v)
-{
-       struct dwc2_hsotg *hsotg = seq->private;
-       void __iomem *regs = hsotg->regs;
-       int idx;
-
-       seq_printf(seq, "DCFG=0x%08x, DCTL=0x%08x, DSTS=0x%08x\n",
-                readl(regs + DCFG),
-                readl(regs + DCTL),
-                readl(regs + DSTS));
-
-       seq_printf(seq, "DIEPMSK=0x%08x, DOEPMASK=0x%08x\n",
-                  readl(regs + DIEPMSK), readl(regs + DOEPMSK));
-
-       seq_printf(seq, "GINTMSK=0x%08x, GINTSTS=0x%08x\n",
-                  readl(regs + GINTMSK),
-                  readl(regs + GINTSTS));
-
-       seq_printf(seq, "DAINTMSK=0x%08x, DAINT=0x%08x\n",
-                  readl(regs + DAINTMSK),
-                  readl(regs + DAINT));
-
-       seq_printf(seq, "GNPTXSTS=0x%08x, GRXSTSR=%08x\n",
-                  readl(regs + GNPTXSTS),
-                  readl(regs + GRXSTSR));
-
-       seq_puts(seq, "\nEndpoint status:\n");
-
-       for (idx = 0; idx < hsotg->num_of_eps; idx++) {
-               u32 in, out;
-
-               in = readl(regs + DIEPCTL(idx));
-               out = readl(regs + DOEPCTL(idx));
-
-               seq_printf(seq, "ep%d: DIEPCTL=0x%08x, DOEPCTL=0x%08x",
-                          idx, in, out);
-
-               in = readl(regs + DIEPTSIZ(idx));
-               out = readl(regs + DOEPTSIZ(idx));
-
-               seq_printf(seq, ", DIEPTSIZ=0x%08x, DOEPTSIZ=0x%08x",
-                          in, out);
-
-               seq_puts(seq, "\n");
-       }
-
-       return 0;
-}
-
-static int state_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, state_show, inode->i_private);
-}
-
-static const struct file_operations state_fops = {
-       .owner          = THIS_MODULE,
-       .open           = state_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-/**
- * fifo_show - debugfs: show the fifo information
- * @seq: The seq_file to write data to.
- * @v: Unused parameter.
- *
- * Show the FIFO information for the overall fifo and all the
- * periodic transmission FIFOs.
- */
-static int fifo_show(struct seq_file *seq, void *v)
-{
-       struct dwc2_hsotg *hsotg = seq->private;
-       void __iomem *regs = hsotg->regs;
-       u32 val;
-       int idx;
-
-       seq_puts(seq, "Non-periodic FIFOs:\n");
-       seq_printf(seq, "RXFIFO: Size %d\n", readl(regs + GRXFSIZ));
-
-       val = readl(regs + GNPTXFSIZ);
-       seq_printf(seq, "NPTXFIFO: Size %d, Start 0x%08x\n",
-                  val >> FIFOSIZE_DEPTH_SHIFT,
-                  val & FIFOSIZE_DEPTH_MASK);
-
-       seq_puts(seq, "\nPeriodic TXFIFOs:\n");
-
-       for (idx = 1; idx < hsotg->num_of_eps; idx++) {
-               val = readl(regs + DPTXFSIZN(idx));
-
-               seq_printf(seq, "\tDPTXFIFO%2d: Size %d, Start 0x%08x\n", idx,
-                          val >> FIFOSIZE_DEPTH_SHIFT,
-                          val & FIFOSIZE_STARTADDR_MASK);
-       }
-
-       return 0;
-}
-
-static int fifo_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, fifo_show, inode->i_private);
-}
-
-static const struct file_operations fifo_fops = {
-       .owner          = THIS_MODULE,
-       .open           = fifo_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-
-static const char *decode_direction(int is_in)
-{
-       return is_in ? "in" : "out";
-}
-
-/**
- * ep_show - debugfs: show the state of an endpoint.
- * @seq: The seq_file to write data to.
- * @v: Unused parameter.
- *
- * This debugfs entry shows the state of the given endpoint (one is
- * registered for each available).
- */
-static int ep_show(struct seq_file *seq, void *v)
-{
-       struct s3c_hsotg_ep *ep = seq->private;
-       struct dwc2_hsotg *hsotg = ep->parent;
-       struct s3c_hsotg_req *req;
-       void __iomem *regs = hsotg->regs;
-       int index = ep->index;
-       int show_limit = 15;
-       unsigned long flags;
-
-       seq_printf(seq, "Endpoint index %d, named %s,  dir %s:\n",
-                  ep->index, ep->ep.name, decode_direction(ep->dir_in));
-
-       /* first show the register state */
-
-       seq_printf(seq, "\tDIEPCTL=0x%08x, DOEPCTL=0x%08x\n",
-                  readl(regs + DIEPCTL(index)),
-                  readl(regs + DOEPCTL(index)));
-
-       seq_printf(seq, "\tDIEPDMA=0x%08x, DOEPDMA=0x%08x\n",
-                  readl(regs + DIEPDMA(index)),
-                  readl(regs + DOEPDMA(index)));
-
-       seq_printf(seq, "\tDIEPINT=0x%08x, DOEPINT=0x%08x\n",
-                  readl(regs + DIEPINT(index)),
-                  readl(regs + DOEPINT(index)));
-
-       seq_printf(seq, "\tDIEPTSIZ=0x%08x, DOEPTSIZ=0x%08x\n",
-                  readl(regs + DIEPTSIZ(index)),
-                  readl(regs + DOEPTSIZ(index)));
-
-       seq_puts(seq, "\n");
-       seq_printf(seq, "mps %d\n", ep->ep.maxpacket);
-       seq_printf(seq, "total_data=%ld\n", ep->total_data);
-
-       seq_printf(seq, "request list (%p,%p):\n",
-                  ep->queue.next, ep->queue.prev);
-
-       spin_lock_irqsave(&hsotg->lock, flags);
-
-       list_for_each_entry(req, &ep->queue, queue) {
-               if (--show_limit < 0) {
-                       seq_puts(seq, "not showing more requests...\n");
-                       break;
-               }
-
-               seq_printf(seq, "%c req %p: %d bytes @%p, ",
-                          req == ep->req ? '*' : ' ',
-                          req, req->req.length, req->req.buf);
-               seq_printf(seq, "%d done, res %d\n",
-                          req->req.actual, req->req.status);
-       }
-
-       spin_unlock_irqrestore(&hsotg->lock, flags);
-
-       return 0;
-}
-
-static int ep_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, ep_show, inode->i_private);
-}
-
-static const struct file_operations ep_fops = {
-       .owner          = THIS_MODULE,
-       .open           = ep_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-/**
- * s3c_hsotg_create_debug - create debugfs directory and files
- * @hsotg: The driver state
- *
- * Create the debugfs files to allow the user to get information
- * about the state of the system. The directory name is created
- * with the same name as the device itself, in case we end up
- * with multiple blocks in future systems.
- */
-static void s3c_hsotg_create_debug(struct dwc2_hsotg *hsotg)
-{
-       struct dentry *root;
-       unsigned epidx;
-
-       root = debugfs_create_dir(dev_name(hsotg->dev), NULL);
-       hsotg->debug_root = root;
-       if (IS_ERR(root)) {
-               dev_err(hsotg->dev, "cannot create debug root\n");
-               return;
-       }
-
-       /* create general state file */
-
-       hsotg->debug_file = debugfs_create_file("state", S_IRUGO, root,
-                                               hsotg, &state_fops);
-
-       if (IS_ERR(hsotg->debug_file))
-               dev_err(hsotg->dev, "%s: failed to create state\n", __func__);
-
-       hsotg->debug_testmode = debugfs_create_file("testmode",
-                                       S_IRUGO | S_IWUSR, root,
-                                       hsotg, &testmode_fops);
-
-       if (IS_ERR(hsotg->debug_testmode))
-               dev_err(hsotg->dev, "%s: failed to create testmode\n",
-                               __func__);
-
-       hsotg->debug_fifo = debugfs_create_file("fifo", S_IRUGO, root,
-                                               hsotg, &fifo_fops);
-
-       if (IS_ERR(hsotg->debug_fifo))
-               dev_err(hsotg->dev, "%s: failed to create fifo\n", __func__);
-
-       /* Create one file for each out endpoint */
-       for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) {
-               struct s3c_hsotg_ep *ep;
-
-               ep = hsotg->eps_out[epidx];
-               if (ep) {
-                       ep->debugfs = debugfs_create_file(ep->name, S_IRUGO,
-                                                         root, ep, &ep_fops);
-
-                       if (IS_ERR(ep->debugfs))
-                               dev_err(hsotg->dev, "failed to create %s debug file\n",
-                                       ep->name);
-               }
-       }
-       /* Create one file for each in endpoint. EP0 is handled with out eps */
-       for (epidx = 1; epidx < hsotg->num_of_eps; epidx++) {
-               struct s3c_hsotg_ep *ep;
-
-               ep = hsotg->eps_in[epidx];
-               if (ep) {
-                       ep->debugfs = debugfs_create_file(ep->name, S_IRUGO,
-                                                         root, ep, &ep_fops);
-
-                       if (IS_ERR(ep->debugfs))
-                               dev_err(hsotg->dev, "failed to create %s debug file\n",
-                                       ep->name);
-               }
-       }
-}
-
-/**
- * s3c_hsotg_delete_debug - cleanup debugfs entries
- * @hsotg: The driver state
- *
- * Cleanup (remove) the debugfs files for use on module exit.
- */
-static void s3c_hsotg_delete_debug(struct dwc2_hsotg *hsotg)
-{
-       unsigned epidx;
-
-       for (epidx = 0; epidx < hsotg->num_of_eps; epidx++) {
-               if (hsotg->eps_in[epidx])
-                       debugfs_remove(hsotg->eps_in[epidx]->debugfs);
-               if (hsotg->eps_out[epidx])
-                       debugfs_remove(hsotg->eps_out[epidx]->debugfs);
-       }
-
-       debugfs_remove(hsotg->debug_file);
-       debugfs_remove(hsotg->debug_testmode);
-       debugfs_remove(hsotg->debug_fifo);
-       debugfs_remove(hsotg->debug_root);
-}
-
 #ifdef CONFIG_OF
 static void s3c_hsotg_of_probe(struct dwc2_hsotg *hsotg)
 {
@@ -4028,8 +3628,6 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq)
        if (ret)
                goto err_supplies;
 
-       s3c_hsotg_create_debug(hsotg);
-
        s3c_hsotg_dump(hsotg);
 
        return 0;
@@ -4050,7 +3648,6 @@ EXPORT_SYMBOL_GPL(dwc2_gadget_init);
 int s3c_hsotg_remove(struct dwc2_hsotg *hsotg)
 {
        usb_del_gadget_udc(&hsotg->gadget);
-       s3c_hsotg_delete_debug(hsotg);
        clk_disable_unprepare(hsotg->clk);
 
        return 0;
index 185663e0b5f439af16065989a27ae74cc31a59b6..4fb058b03eaf0e8645e87d45da9ab3ac26893cc2 100644 (file)
@@ -47,6 +47,7 @@
 
 #include "core.h"
 #include "hcd.h"
+#include "debug.h"
 
 static const char dwc2_driver_name[] = "dwc2";
 
@@ -121,6 +122,7 @@ static int dwc2_driver_remove(struct platform_device *dev)
 {
        struct dwc2_hsotg *hsotg = platform_get_drvdata(dev);
 
+       dwc2_debugfs_exit(hsotg);
        if (hsotg->hcd_enabled)
                dwc2_hcd_remove(hsotg);
        if (hsotg->gadget_enabled)
@@ -256,6 +258,8 @@ static int dwc2_driver_probe(struct platform_device *dev)
 
        platform_set_drvdata(dev, hsotg);
 
+       dwc2_debugfs_init(hsotg);
+
        return retval;
 }