uwb: improved MAS allocator and reservation conflict handling

[safe/jmp/linux-2.6] / drivers / uwb / uwb-debug.c

diff --git a/drivers/uwb/uwb-debug.c b/drivers/uwb/uwb-debug.c
index 217ebaa..89b2e6a 100644 (file)
--- a/drivers/uwb/uwb-debug.c
+++ b/drivers/uwb/uwb-debug.c
@@ -33,8 +33,6 @@
 #include <linux/seq_file.h>
 
 #include <linux/uwb/debug-cmd.h>
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
 
 #include "uwb-internal.h"
 
@@ -84,29 +82,21 @@ struct uwb_dbg {
        struct dentry *reservations_f;
        struct dentry *accept_f;
        struct dentry *drp_avail_f;
+       spinlock_t list_lock;
 };
 
 static struct dentry *root_dir;
 
 static void uwb_dbg_rsv_cb(struct uwb_rsv *rsv)
 {
-       struct uwb_rc *rc = rsv->rc;
-       struct device *dev = &rc->uwb_dev.dev;
-       struct uwb_dev_addr devaddr;
-       char owner[UWB_ADDR_STRSIZE], target[UWB_ADDR_STRSIZE];
-
-       uwb_dev_addr_print(owner, sizeof(owner), &rsv->owner->dev_addr);
-       if (rsv->target.type == UWB_RSV_TARGET_DEV)
-               devaddr = rsv->target.dev->dev_addr;
-       else
-               devaddr = rsv->target.devaddr;
-       uwb_dev_addr_print(target, sizeof(target), &devaddr);
+       struct uwb_dbg *dbg = rsv->pal_priv;
 
-       dev_dbg(dev, "debug: rsv %s -> %s: %s\n",
-               owner, target, uwb_rsv_state_str(rsv->state));
+       uwb_rsv_dump("debug", rsv);
 
        if (rsv->state == UWB_RSV_STATE_NONE) {
+               spin_lock(&dbg->list_lock);
                list_del(&rsv->pal_node);
+               spin_unlock(&dbg->list_lock);
                uwb_rsv_destroy(rsv);
        }
 }
@@ -124,26 +114,27 @@ static int cmd_rsv_establish(struct uwb_rc *rc,
        if (target == NULL)
                return -ENODEV;
 
-       rsv = uwb_rsv_create(rc, uwb_dbg_rsv_cb, NULL);
+       rsv = uwb_rsv_create(rc, uwb_dbg_rsv_cb, rc->dbg);
        if (rsv == NULL) {
                uwb_dev_put(target);
                return -ENOMEM;
        }
 
-       rsv->owner       = &rc->uwb_dev;
-       rsv->target.type = UWB_RSV_TARGET_DEV;
-       rsv->target.dev  = target;
-       rsv->type        = cmd->type;
-       rsv->max_mas     = cmd->max_mas;
-       rsv->min_mas     = cmd->min_mas;
-       rsv->sparsity    = cmd->sparsity;
+       rsv->target.type  = UWB_RSV_TARGET_DEV;
+       rsv->target.dev   = target;
+       rsv->type         = cmd->type;
+       rsv->max_mas      = cmd->max_mas;
+       rsv->min_mas      = cmd->min_mas;
+       rsv->max_interval = cmd->max_interval;
 
        ret = uwb_rsv_establish(rsv);
        if (ret)
                uwb_rsv_destroy(rsv);
-       else
+       else {
+               spin_lock(&(rc->dbg)->list_lock);
                list_add_tail(&rsv->pal_node, &rc->dbg->rsvs);
-
+               spin_unlock(&(rc->dbg)->list_lock);
+       }
        return ret;
 }
 
@@ -153,17 +144,24 @@ static int cmd_rsv_terminate(struct uwb_rc *rc,
        struct uwb_rsv *rsv, *found = NULL;
        int i = 0;
 
+       spin_lock(&(rc->dbg)->list_lock);
+
        list_for_each_entry(rsv, &rc->dbg->rsvs, pal_node) {
                if (i == cmd->index) {
                        found = rsv;
+                       uwb_rsv_get(found);
                        break;
                }
                i++;
        }
+
+       spin_unlock(&(rc->dbg)->list_lock);
+
        if (!found)
                return -EINVAL;
 
        uwb_rsv_terminate(found);
+       uwb_rsv_put(found);
 
        return 0;
 }
@@ -192,8 +190,8 @@ static ssize_t command_write(struct file *file, const char __user *buf,
 {
        struct uwb_rc *rc = file->private_data;
        struct uwb_dbg_cmd cmd;
-       int ret;
-
+       int ret = 0;
+       
        if (len != sizeof(struct uwb_dbg_cmd))
                return -EINVAL;
 
@@ -213,6 +211,12 @@ static ssize_t command_write(struct file *file, const char __user *buf,
        case UWB_DBG_CMD_IE_RM:
                ret = cmd_ie_rm(rc, &cmd.ie_rm);
                break;
+       case UWB_DBG_CMD_RADIO_START:
+               ret = uwb_radio_start(&rc->dbg->pal);
+               break;
+       case UWB_DBG_CMD_RADIO_STOP:
+               uwb_radio_stop(&rc->dbg->pal);
+               break;
        default:
                return -EINVAL;
        }
@@ -306,12 +310,24 @@ static struct file_operations drp_avail_fops = {
        .owner   = THIS_MODULE,
 };
 
+static void uwb_dbg_channel_changed(struct uwb_pal *pal, int channel)
+{
+       struct device *dev = &pal->rc->uwb_dev.dev;
+
+       if (channel > 0)
+               dev_info(dev, "debug: channel %d started\n", channel);
+       else
+               dev_info(dev, "debug: channel stopped\n");
+}
+
 static void uwb_dbg_new_rsv(struct uwb_pal *pal, struct uwb_rsv *rsv)
 {
        struct uwb_dbg *dbg = container_of(pal, struct uwb_dbg, pal);
 
        if (dbg->accept) {
+               spin_lock(&dbg->list_lock);
                list_add_tail(&rsv->pal_node, &dbg->rsvs);
+               spin_unlock(&dbg->list_lock);
                uwb_rsv_accept(rsv, uwb_dbg_rsv_cb, dbg);
        }
 }
@@ -327,10 +343,14 @@ void uwb_dbg_add_rc(struct uwb_rc *rc)
                return;
 
        INIT_LIST_HEAD(&rc->dbg->rsvs);
+       spin_lock_init(&(rc->dbg)->list_lock);
 
        uwb_pal_init(&rc->dbg->pal);
+       rc->dbg->pal.rc = rc;
+       rc->dbg->pal.channel_changed = uwb_dbg_channel_changed;
        rc->dbg->pal.new_rsv = uwb_dbg_new_rsv;
-       uwb_pal_register(rc, &rc->dbg->pal);
+       uwb_pal_register(&rc->dbg->pal);
+
        if (root_dir) {
                rc->dbg->root_d = debugfs_create_dir(dev_name(&rc->uwb_dev.dev),
                                                     root_dir);
@@ -364,7 +384,7 @@ void uwb_dbg_del_rc(struct uwb_rc *rc)
                uwb_rsv_terminate(rsv);
        }
 
-       uwb_pal_unregister(rc, &rc->dbg->pal);
+       uwb_pal_unregister(&rc->dbg->pal);
 
        if (root_dir) {
                debugfs_remove(rc->dbg->drp_avail_f);
@@ -390,3 +410,16 @@ void uwb_dbg_exit(void)
 {
        debugfs_remove(root_dir);
 }
+
+/**
+ * uwb_dbg_create_pal_dir - create a debugfs directory for a PAL
+ * @pal: The PAL.
+ */
+struct dentry *uwb_dbg_create_pal_dir(struct uwb_pal *pal)
+{
+       struct uwb_rc *rc = pal->rc;
+
+       if (root_dir && rc->dbg && rc->dbg->root_d && pal->name)
+               return debugfs_create_dir(pal->name, rc->dbg->root_d);
+       return NULL;
+}