lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / target / linux / adm5120 / files / drivers / usb / host / adm5120-dbg.c

diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c
index 17d4ad4..a6eb67c 100644 (file)
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c
@@ -1,10 +1,16 @@
 /*
 /*

- * OHCI HCD (Host Controller Driver) for USB.
+ * ADM5120 HCD (Host Controller Driver) for USB

  *
  *

- * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
- * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>
+ *
+ * This file was derived from: drivers/usb/host/ohci-dbg.c
+ *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ *   (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ *
+ *  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.

  *
  *

- * This file is licenced under the GPL.

  */
 
 /*-------------------------------------------------------------------------*/
  */
 
 /*-------------------------------------------------------------------------*/


@@ -76,20 +82,20 @@ static inline char *td_togglestring(u32 info)
  * small: 0) header + data packets 1) just header
  */
 static void __attribute__((unused))
  * small: 0) header + data packets 1) just header
  */
 static void __attribute__((unused))

-urb_print(struct admhcd *ahcd, struct urb *urb, char * str, int small)
+urb_print(struct admhcd *ahcd, struct urb *urb, char *str, int small, int status)

 {
        unsigned int pipe = urb->pipe;
 
        if (!urb->dev || !urb->dev->bus) {
 {
        unsigned int pipe = urb->pipe;
 
        if (!urb->dev || !urb->dev->bus) {

-               admhc_dbg("%s URB: no dev", str);
+               admhc_dbg(ahcd, "%s URB: no dev", str);

                return;
        }
 
 #ifndef        ADMHC_VERBOSE_DEBUG
                return;
        }
 
 #ifndef        ADMHC_VERBOSE_DEBUG

-       if (urb->status != 0)
+       if (status != 0)

 #endif
        admhc_dbg(ahcd, "URB-%s %p dev=%d ep=%d%s-%s flags=%x len=%d/%d "
 #endif
        admhc_dbg(ahcd, "URB-%s %p dev=%d ep=%d%s-%s flags=%x len=%d/%d "

-                       "stat=%d",
+                       "stat=%d\n",

                        str,
                        urb,
                        usb_pipedevice (pipe),
                        str,
                        urb,
                        usb_pipedevice (pipe),


@@ -99,7 +105,7 @@ urb_print(struct admhcd *ahcd, struct urb *urb, char * str, int small)
                        urb->transfer_flags,
                        urb->actual_length,
                        urb->transfer_buffer_length,
                        urb->transfer_flags,
                        urb->actual_length,
                        urb->transfer_buffer_length,

-                       urb->status);
+                       status);

 
 #ifdef ADMHC_VERBOSE_DEBUG
        if (!small) {
 
 #ifdef ADMHC_VERBOSE_DEBUG
        if (!small) {


@@ -112,14 +118,14 @@ urb_print(struct admhcd *ahcd, struct urb *urb, char * str, int small)
                        printk ("\n");
                }
                if (urb->transfer_buffer_length > 0 && urb->transfer_buffer) {
                        printk ("\n");
                }
                if (urb->transfer_buffer_length > 0 && urb->transfer_buffer) {

-                       printk(KERN_DEBUG __FILE__ ": data(%d/%d):",
+                       admhc_dbg(ahcd, "data(%d/%d):",

                                urb->actual_length,
                                urb->transfer_buffer_length);
                        len = usb_pipeout(pipe)?
                                                urb->transfer_buffer_length: urb->actual_length;
                        for (i = 0; i < 16 && i < len; i++)
                                urb->actual_length,
                                urb->transfer_buffer_length);
                        len = usb_pipeout(pipe)?
                                                urb->transfer_buffer_length: urb->actual_length;
                        for (i = 0; i < 16 && i < len; i++)

-                               printk (" %02x", ((__u8 *) urb->transfer_buffer) [i]);
-                       admhc_dbg("%s stat:%d\n", i < len? "...": "", urb->status);
+                               printk(" %02x", ((__u8 *)urb->transfer_buffer)[i]);
+                       printk("%s stat:%d\n", i < len? "...": "", status);

                }
        }
 #endif /* ADMHC_VERBOSE_DEBUG */
                }
        }
 #endif /* ADMHC_VERBOSE_DEBUG */


@@ -363,7 +369,8 @@ admhc_dump_ed(const struct admhcd *ahcd, const char *label,
 
 #else /* ifdef DEBUG */
 
 
 #else /* ifdef DEBUG */
 

-static inline void urb_print(struct urb * urb, char * str, int small) {}
+static inline void urb_print(struct admhcd *ahcd, struct urb * urb, char * str,
+       int small) {}

 static inline void admhc_dump_ed(const struct admhcd *ahcd, const char *label,
        const struct ed *ed, int verbose) {}
 static inline void admhc_dump_td(const struct admhcd *ahcd, const char *label,
 static inline void admhc_dump_ed(const struct admhcd *ahcd, const char *label,
        const struct ed *ed, int verbose) {}
 static inline void admhc_dump_td(const struct admhcd *ahcd, const char *label,


@@ -383,6 +390,42 @@ static inline void remove_debug_files(struct admhcd *bus) { }
 
 #else
 
 
 #else
 

+static int debug_async_open(struct inode *, struct file *);
+static int debug_periodic_open(struct inode *, struct file *);
+static int debug_registers_open(struct inode *, struct file *);
+static int debug_async_open(struct inode *, struct file *);
+static ssize_t debug_output(struct file*, char __user*, size_t, loff_t*);
+static int debug_close(struct inode *, struct file *);
+
+static const struct file_operations debug_async_fops = {
+       .owner          = THIS_MODULE,
+       .open           = debug_async_open,
+       .read           = debug_output,
+       .release        = debug_close,
+};
+static const struct file_operations debug_periodic_fops = {
+       .owner          = THIS_MODULE,
+       .open           = debug_periodic_open,
+       .read           = debug_output,
+       .release        = debug_close,
+};
+static const struct file_operations debug_registers_fops = {
+       .owner          = THIS_MODULE,
+       .open           = debug_registers_open,
+       .read           = debug_output,
+       .release        = debug_close,
+};
+
+static struct dentry *admhc_debug_root;
+
+struct debug_buffer {
+       ssize_t (*fill_func)(struct debug_buffer *);    /* fill method */
+       struct device *dev;
+       struct mutex mutex;     /* protect filling of buffer */
+       size_t count;           /* number of characters filled into buffer */
+       char *page;
+};
+

 static ssize_t
 show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
 {
 static ssize_t
 show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
 {


@@ -448,8 +491,7 @@ show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
        return count - size;
 }
 
        return count - size;
 }
 

-static ssize_t
-show_async(struct class_device *class_dev, char *buf)
+static ssize_t fill_async_buffer(struct debug_buffer *buf)

 {
        struct usb_bus          *bus;
        struct usb_hcd          *hcd;
 {
        struct usb_bus          *bus;
        struct usb_hcd          *hcd;


@@ -457,24 +499,22 @@ show_async(struct class_device *class_dev, char *buf)
        size_t                  temp;
        unsigned long           flags;
 
        size_t                  temp;
        unsigned long           flags;
 

-       bus = class_get_devdata(class_dev);
+       bus = dev_get_drvdata(buf->dev);

        hcd = bus_to_hcd(bus);
        ahcd = hcd_to_admhcd(hcd);
 
        /* display control and bulk lists together, for simplicity */
        spin_lock_irqsave(&ahcd->lock, flags);
        hcd = bus_to_hcd(bus);
        ahcd = hcd_to_admhcd(hcd);
 
        /* display control and bulk lists together, for simplicity */
        spin_lock_irqsave(&ahcd->lock, flags);

-       temp = show_list(ahcd, buf, PAGE_SIZE, ahcd->ed_head);
+       temp = show_list(ahcd, buf->page, buf->count, ahcd->ed_head);

        spin_unlock_irqrestore(&ahcd->lock, flags);
 
        return temp;
 }
        spin_unlock_irqrestore(&ahcd->lock, flags);
 
        return temp;
 }

-static CLASS_DEVICE_ATTR(async, S_IRUGO, show_async, NULL);

 
 
 #define DBG_SCHED_LIMIT 64
 
 
 
 #define DBG_SCHED_LIMIT 64
 

-static ssize_t
-show_periodic(struct class_device *class_dev, char *buf)
+static ssize_t fill_periodic_buffer(struct debug_buffer *buf)

 {
        struct usb_bus          *bus;
        struct usb_hcd          *hcd;
 {
        struct usb_bus          *bus;
        struct usb_hcd          *hcd;


@@ -489,10 +529,10 @@ show_periodic(struct class_device *class_dev, char *buf)
                return 0;
        seen_count = 0;
 
                return 0;
        seen_count = 0;
 

-       bus = class_get_devdata(class_dev);
+       bus = dev_get_drvdata(buf->dev);

        hcd = bus_to_hcd(bus);
        ahcd = hcd_to_admhcd(hcd);
        hcd = bus_to_hcd(bus);
        ahcd = hcd_to_admhcd(hcd);

-       next = buf;
+       next = buf->page;

        size = PAGE_SIZE;
 
        temp = scnprintf(next, size, "size = %d\n", NUM_INTS);
        size = PAGE_SIZE;
 
        temp = scnprintf(next, size, "size = %d\n", NUM_INTS);


@@ -567,13 +607,11 @@ show_periodic(struct class_device *class_dev, char *buf)
 
        return PAGE_SIZE - size;
 }
 
        return PAGE_SIZE - size;
 }

-static CLASS_DEVICE_ATTR(periodic, S_IRUGO, show_periodic, NULL);

 
 
 #undef DBG_SCHED_LIMIT
 
 
 
 #undef DBG_SCHED_LIMIT
 

-static ssize_t
-show_registers(struct class_device *class_dev, char *buf)
+static ssize_t fill_registers_buffer(struct debug_buffer *buf)

 {
        struct usb_bus          *bus;
        struct usb_hcd          *hcd;
 {
        struct usb_bus          *bus;
        struct usb_hcd          *hcd;


@@ -584,11 +622,11 @@ show_registers(struct class_device *class_dev, char *buf)
        char                    *next;
        u32                     rdata;
 
        char                    *next;
        u32                     rdata;
 

-       bus = class_get_devdata(class_dev);
+       bus = dev_get_drvdata(buf->dev);

        hcd = bus_to_hcd(bus);
        ahcd = hcd_to_admhcd(hcd);
        regs = ahcd->regs;
        hcd = bus_to_hcd(bus);
        ahcd = hcd_to_admhcd(hcd);
        regs = ahcd->regs;

-       next = buf;
+       next = buf->page;

        size = PAGE_SIZE;
 
        spin_lock_irqsave(&ahcd->lock, flags);
        size = PAGE_SIZE;
 
        spin_lock_irqsave(&ahcd->lock, flags);


@@ -649,30 +687,156 @@ done:
        spin_unlock_irqrestore(&ahcd->lock, flags);
        return PAGE_SIZE - size;
 }
        spin_unlock_irqrestore(&ahcd->lock, flags);
        return PAGE_SIZE - size;
 }

-static CLASS_DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);

 
 
 
 

-static inline void create_debug_files (struct admhcd *ahcd)
+static struct debug_buffer *alloc_buffer(struct device *dev,
+                               ssize_t (*fill_func)(struct debug_buffer *))

 {
 {

-       struct class_device *cldev = admhcd_to_hcd(ahcd)->self.class_dev;
-       int retval;
+       struct debug_buffer *buf;

 
 

-       retval = class_device_create_file(cldev, &class_device_attr_async);
-       retval = class_device_create_file(cldev, &class_device_attr_periodic);
-       retval = class_device_create_file(cldev, &class_device_attr_registers);
-       admhc_dbg(ahcd, "created debug files\n");
+       buf = kzalloc(sizeof(struct debug_buffer), GFP_KERNEL);
+
+       if (buf) {
+               buf->dev = dev;
+               buf->fill_func = fill_func;
+               mutex_init(&buf->mutex);
+       }
+
+       return buf;
+}
+
+static int fill_buffer(struct debug_buffer *buf)
+{
+       int ret = 0;
+
+       if (!buf->page)
+               buf->page = (char *)get_zeroed_page(GFP_KERNEL);
+
+       if (!buf->page) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       ret = buf->fill_func(buf);
+
+       if (ret >= 0) {
+               buf->count = ret;
+               ret = 0;
+       }
+
+out:
+       return ret;
+}
+
+static ssize_t debug_output(struct file *file, char __user *user_buf,
+                       size_t len, loff_t *offset)
+{
+       struct debug_buffer *buf = file->private_data;
+       int ret = 0;
+
+       mutex_lock(&buf->mutex);
+       if (buf->count == 0) {
+               ret = fill_buffer(buf);
+               if (ret != 0) {
+                       mutex_unlock(&buf->mutex);
+                       goto out;
+               }
+       }
+       mutex_unlock(&buf->mutex);
+
+       ret = simple_read_from_buffer(user_buf, len, offset,
+                                       buf->page, buf->count);
+
+out:
+       return ret;

 }
 
 }
 

-static inline void remove_debug_files (struct admhcd *ahcd)
+static int debug_close(struct inode *inode, struct file *file)

 {
 {

-       struct class_device *cldev = admhcd_to_hcd(ahcd)->self.class_dev;
+       struct debug_buffer *buf = file->private_data;
+
+       if (buf) {
+               if (buf->page)
+                       free_page((unsigned long)buf->page);
+               kfree(buf);
+       }

 
 

-       class_device_remove_file(cldev, &class_device_attr_async);
-       class_device_remove_file(cldev, &class_device_attr_periodic);
-       class_device_remove_file(cldev, &class_device_attr_registers);
+       return 0;
+}
+
+static int debug_async_open(struct inode *inode, struct file *file)
+{
+       file->private_data = alloc_buffer(inode->i_private, fill_async_buffer);
+
+       return file->private_data ? 0 : -ENOMEM;
+}
+
+static int debug_periodic_open(struct inode *inode, struct file *file)
+{
+       file->private_data = alloc_buffer(inode->i_private,
+                                               fill_periodic_buffer);
+
+       return file->private_data ? 0 : -ENOMEM;
+}
+
+static int debug_registers_open(struct inode *inode, struct file *file)
+{
+       file->private_data = alloc_buffer(inode->i_private,
+                                               fill_registers_buffer);
+
+       return file->private_data ? 0 : -ENOMEM;
+}
+
+static inline void create_debug_files(struct admhcd *ahcd)
+{
+       struct usb_bus *bus = &admhcd_to_hcd(ahcd)->self;
+       struct device *dev = bus->dev;
+
+       ahcd->debug_dir = debugfs_create_dir(bus->bus_name, admhc_debug_root);
+       if (!ahcd->debug_dir)
+               goto dir_error;
+
+       ahcd->debug_async = debugfs_create_file("async", S_IRUGO,
+                                               ahcd->debug_dir, dev,
+                                               &debug_async_fops);
+       if (!ahcd->debug_async)
+               goto async_error;
+
+       ahcd->debug_periodic = debugfs_create_file("periodic", S_IRUGO,
+                                               ahcd->debug_dir, dev,
+                                               &debug_periodic_fops);
+       if (!ahcd->debug_periodic)
+               goto periodic_error;
+
+       ahcd->debug_registers = debugfs_create_file("registers", S_IRUGO,
+                                               ahcd->debug_dir, dev,
+                                               &debug_registers_fops);
+       if (!ahcd->debug_registers)
+               goto registers_error;
+
+       admhc_dbg(ahcd, "created debug files\n");
+       return;
+
+registers_error:
+       debugfs_remove(ahcd->debug_periodic);
+periodic_error:
+       debugfs_remove(ahcd->debug_async);
+async_error:
+       debugfs_remove(ahcd->debug_dir);
+dir_error:
+       ahcd->debug_periodic = NULL;
+       ahcd->debug_async = NULL;
+       ahcd->debug_dir = NULL;
+}
+
+static inline void remove_debug_files(struct admhcd *ahcd)
+{
+       debugfs_remove(ahcd->debug_registers);
+       debugfs_remove(ahcd->debug_periodic);
+       debugfs_remove(ahcd->debug_async);
+       debugfs_remove(ahcd->debug_dir);

 }
 
 #endif
 
 /*-------------------------------------------------------------------------*/
 }
 
 #endif
 
 /*-------------------------------------------------------------------------*/

-