]> err.no Git - linux-2.6/blobdiff - drivers/net/wireless/rt2x00/rt2x00debug.c
rt2x00: trim skb_frame_desc to 32 bytes
[linux-2.6] / drivers / net / wireless / rt2x00 / rt2x00debug.c
index b44a9f4b9b7f85ba776f81cd2d764497ac73f2f7..bd92cb8e68e059131ef70674b46188d84fea917f 100644 (file)
@@ -1,5 +1,5 @@
 /*
-       Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
+       Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
        <http://rt2x00.serialmonkey.com>
 
        This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 #include "rt2x00lib.h"
 #include "rt2x00dump.h"
 
-#define PRINT_LINE_LEN_MAX 32
+#define MAX_LINE_LENGTH 64
 
 struct rt2x00debug_intf {
        /*
@@ -60,8 +60,9 @@ struct rt2x00debug_intf {
         *     - eeprom offset/value files
         *     - bbp offset/value files
         *     - rf offset/value files
-        *   - frame dump folder
+        *   - queue folder
         *     - frame dump file
+        *     - queue stats file
         */
        struct dentry *driver_folder;
        struct dentry *driver_entry;
@@ -76,8 +77,9 @@ struct rt2x00debug_intf {
        struct dentry *bbp_val_entry;
        struct dentry *rf_off_entry;
        struct dentry *rf_val_entry;
-       struct dentry *frame_folder;
-       struct dentry *frame_dump_entry;
+       struct dentry *queue_folder;
+       struct dentry *queue_frame_dump_entry;
+       struct dentry *queue_stats_entry;
 
        /*
         * The frame dump file only allows a single reader,
@@ -113,10 +115,10 @@ struct rt2x00debug_intf {
 };
 
 void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
-                           struct sk_buff *skb)
+                           enum rt2x00_dump_type type, struct sk_buff *skb)
 {
        struct rt2x00debug_intf *intf = rt2x00dev->debugfs_intf;
-       struct skb_desc *desc = get_skb_desc(skb);
+       struct skb_frame_desc *desc = get_skb_frame_desc(skb);
        struct sk_buff *skbcopy;
        struct rt2x00dump_hdr *dump_hdr;
        struct timeval timestamp;
@@ -146,8 +148,8 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
        dump_hdr->chip_rt = cpu_to_le16(rt2x00dev->chip.rt);
        dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);
        dump_hdr->chip_rev = cpu_to_le32(rt2x00dev->chip.rev);
-       dump_hdr->type = cpu_to_le16(desc->frame_type);
-       dump_hdr->ring_index = desc->ring->queue_idx;
+       dump_hdr->type = cpu_to_le16(type);
+       dump_hdr->queue_index = desc->entry->queue->qid;
        dump_hdr->entry_index = desc->entry->entry_idx;
        dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
        dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);
@@ -186,7 +188,7 @@ static int rt2x00debug_file_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int rt2x00debug_open_ring_dump(struct inode *inode, struct file *file)
+static int rt2x00debug_open_queue_dump(struct inode *inode, struct file *file)
 {
        struct rt2x00debug_intf *intf = inode->i_private;
        int retval;
@@ -203,7 +205,7 @@ static int rt2x00debug_open_ring_dump(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int rt2x00debug_release_ring_dump(struct inode *inode, struct file *file)
+static int rt2x00debug_release_queue_dump(struct inode *inode, struct file *file)
 {
        struct rt2x00debug_intf *intf = inode->i_private;
 
@@ -214,10 +216,10 @@ static int rt2x00debug_release_ring_dump(struct inode *inode, struct file *file)
        return rt2x00debug_file_release(inode, file);
 }
 
-static ssize_t rt2x00debug_read_ring_dump(struct file *file,
-                                         char __user *buf,
-                                         size_t length,
-                                         loff_t *offset)
+static ssize_t rt2x00debug_read_queue_dump(struct file *file,
+                                          char __user *buf,
+                                          size_t length,
+                                          loff_t *offset)
 {
        struct rt2x00debug_intf *intf = file->private_data;
        struct sk_buff *skb;
@@ -248,8 +250,8 @@ exit:
        return status;
 }
 
-static unsigned int rt2x00debug_poll_ring_dump(struct file *file,
-                                              poll_table *wait)
+static unsigned int rt2x00debug_poll_queue_dump(struct file *file,
+                                               poll_table *wait)
 {
        struct rt2x00debug_intf *intf = file->private_data;
 
@@ -261,12 +263,68 @@ static unsigned int rt2x00debug_poll_ring_dump(struct file *file,
        return 0;
 }
 
-static const struct file_operations rt2x00debug_fop_ring_dump = {
+static const struct file_operations rt2x00debug_fop_queue_dump = {
        .owner          = THIS_MODULE,
-       .read           = rt2x00debug_read_ring_dump,
-       .poll           = rt2x00debug_poll_ring_dump,
-       .open           = rt2x00debug_open_ring_dump,
-       .release        = rt2x00debug_release_ring_dump,
+       .read           = rt2x00debug_read_queue_dump,
+       .poll           = rt2x00debug_poll_queue_dump,
+       .open           = rt2x00debug_open_queue_dump,
+       .release        = rt2x00debug_release_queue_dump,
+};
+
+static ssize_t rt2x00debug_read_queue_stats(struct file *file,
+                                           char __user *buf,
+                                           size_t length,
+                                           loff_t *offset)
+{
+       struct rt2x00debug_intf *intf = file->private_data;
+       struct data_queue *queue;
+       unsigned long irqflags;
+       unsigned int lines = 1 + intf->rt2x00dev->data_queues;
+       size_t size;
+       char *data;
+       char *temp;
+
+       if (*offset)
+               return 0;
+
+       data = kzalloc(lines * MAX_LINE_LENGTH, GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       temp = data +
+           sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdone\tcrypto\n");
+
+       queue_for_each(intf->rt2x00dev, queue) {
+               spin_lock_irqsave(&queue->lock, irqflags);
+
+               temp += sprintf(temp, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", queue->qid,
+                               queue->count, queue->limit, queue->length,
+                               queue->index[Q_INDEX],
+                               queue->index[Q_INDEX_DONE],
+                               queue->index[Q_INDEX_CRYPTO]);
+
+               spin_unlock_irqrestore(&queue->lock, irqflags);
+       }
+
+       size = strlen(data);
+       size = min(size, length);
+
+       if (copy_to_user(buf, data, size)) {
+               kfree(data);
+               return -EFAULT;
+       }
+
+       kfree(data);
+
+       *offset += size;
+       return size;
+}
+
+static const struct file_operations rt2x00debug_fop_queue_stats = {
+       .owner          = THIS_MODULE,
+       .read           = rt2x00debug_read_queue_stats,
+       .open           = rt2x00debug_file_open,
+       .release        = rt2x00debug_file_release,
 };
 
 #define RT2X00DEBUGFS_OPS_READ(__name, __format, __type)       \
@@ -386,7 +444,7 @@ static struct dentry *rt2x00debug_create_file_driver(const char *name,
 {
        char *data;
 
-       data = kzalloc(3 * PRINT_LINE_LEN_MAX, GFP_KERNEL);
+       data = kzalloc(3 * MAX_LINE_LENGTH, GFP_KERNEL);
        if (!data)
                return NULL;
 
@@ -409,7 +467,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
        const struct rt2x00debug *debug = intf->debug;
        char *data;
 
-       data = kzalloc(8 * PRINT_LINE_LEN_MAX, GFP_KERNEL);
+       data = kzalloc(8 * MAX_LINE_LENGTH, GFP_KERNEL);
        if (!data)
                return NULL;
 
@@ -496,20 +554,24 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
 
 #undef RT2X00DEBUGFS_CREATE_REGISTER_ENTRY
 
-       intf->frame_folder =
-           debugfs_create_dir("frame", intf->driver_folder);
-       if (IS_ERR(intf->frame_folder))
+       intf->queue_folder =
+           debugfs_create_dir("queue", intf->driver_folder);
+       if (IS_ERR(intf->queue_folder))
                goto exit;
 
-       intf->frame_dump_entry =
-           debugfs_create_file("dump", S_IRUGO, intf->frame_folder,
-                               intf, &rt2x00debug_fop_ring_dump);
-       if (IS_ERR(intf->frame_dump_entry))
+       intf->queue_frame_dump_entry =
+           debugfs_create_file("dump", S_IRUGO, intf->queue_folder,
+                               intf, &rt2x00debug_fop_queue_dump);
+       if (IS_ERR(intf->queue_frame_dump_entry))
                goto exit;
 
        skb_queue_head_init(&intf->frame_dump_skbqueue);
        init_waitqueue_head(&intf->frame_dump_waitqueue);
 
+       intf->queue_stats_entry =
+           debugfs_create_file("queue", S_IRUGO, intf->queue_folder,
+                               intf, &rt2x00debug_fop_queue_stats);
+
        return;
 
 exit:
@@ -528,8 +590,9 @@ void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
 
        skb_queue_purge(&intf->frame_dump_skbqueue);
 
-       debugfs_remove(intf->frame_dump_entry);
-       debugfs_remove(intf->frame_folder);
+       debugfs_remove(intf->queue_stats_entry);
+       debugfs_remove(intf->queue_frame_dump_entry);
+       debugfs_remove(intf->queue_folder);
        debugfs_remove(intf->rf_val_entry);
        debugfs_remove(intf->rf_off_entry);
        debugfs_remove(intf->bbp_val_entry);