X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fw1%2Fw1_int.c;h=357a2e0f637a1d7270e247d146c00131d4374f62;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=291a6d1a83f6fe4516655cf28ec77b35e3533506;hpb=5fc42a6ed0ec81088c37caadb45898ae6cd0ad2c;p=linux-2.6.git diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 291a6d1a8..357a2e0f6 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -1,8 +1,8 @@ /* - * w1_int.c + * w1_int.c * * Copyright (c) 2004 Evgeniy Polyakov - * + * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,24 +21,19 @@ #include #include +#include +#include #include "w1.h" #include "w1_log.h" +#include "w1_netlink.h" +#include "w1_int.h" static u32 w1_ids = 1; -extern struct device_driver w1_driver; -extern struct bus_type w1_bus_type; -extern struct device w1_device; -extern struct device_attribute w1_master_attribute; -extern int w1_max_slave_count; -extern struct list_head w1_masters; -extern spinlock_t w1_mlock; - -extern int w1_process(void *); - -struct w1_master * w1_alloc_dev(u32 id, int slave_count, - struct device_driver *driver, struct device *device) +static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, + struct device_driver *driver, + struct device *device) { struct w1_master *dev; int err; @@ -49,7 +44,7 @@ struct w1_master * w1_alloc_dev(u32 id, int slave_count, dev = kmalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL); if (!dev) { printk(KERN_ERR - "Failed to allocate %d bytes for new w1 device.\n", + "Failed to allocate %zd bytes for new w1 device.\n", sizeof(struct w1_master)); return NULL; } @@ -58,22 +53,19 @@ struct w1_master * w1_alloc_dev(u32 id, int slave_count, dev->bus_master = (struct w1_bus_master *)(dev + 1); - dev->owner = THIS_MODULE; - dev->max_slave_count = slave_count; - dev->slave_count = 0; - dev->attempts = 0; - dev->kpid = -1; - dev->initialized = 0; - dev->id = id; + dev->owner = THIS_MODULE; + dev->max_slave_count = slave_count; + dev->slave_count = 0; + dev->attempts = 0; + dev->initialized = 0; + dev->id = id; + dev->slave_ttl = slave_ttl; + dev->search_count = -1; /* continual scan */ atomic_set(&dev->refcnt, 2); INIT_LIST_HEAD(&dev->slist); - init_MUTEX(&dev->mutex); - - init_waitqueue_head(&dev->kwait); - init_completion(&dev->dev_released); - init_completion(&dev->dev_exited); + mutex_init(&dev->mutex); memcpy(&dev->dev, device, sizeof(struct device)); snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), @@ -82,22 +74,11 @@ struct w1_master * w1_alloc_dev(u32 id, int slave_count, dev->driver = driver; - dev->groups = 23; dev->seq = 1; - dev->nls = netlink_kernel_create(NETLINK_NFLOG, NULL); - if (!dev->nls) { - printk(KERN_ERR "Failed to create new netlink socket(%u).\n", - NETLINK_NFLOG); - memset(dev, 0, sizeof(struct w1_master)); - kfree(dev); - dev = NULL; - } err = device_register(&dev->dev); if (err) { printk(KERN_ERR "Failed to register master device. err=%d\n", err); - if (dev->nls->sk_socket) - sock_release(dev->nls->sk_socket); memset(dev, 0, sizeof(struct w1_master)); kfree(dev); dev = NULL; @@ -106,34 +87,38 @@ struct w1_master * w1_alloc_dev(u32 id, int slave_count, return dev; } -void w1_free_dev(struct w1_master *dev) +static void w1_free_dev(struct w1_master *dev) { device_unregister(&dev->dev); - if (dev->nls->sk_socket) - sock_release(dev->nls->sk_socket); - memset(dev, 0, sizeof(struct w1_master) + sizeof(struct w1_bus_master)); - kfree(dev); } int w1_add_master_device(struct w1_bus_master *master) { struct w1_master *dev; int retval = 0; + struct w1_netlink_msg msg; - dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, &w1_driver, &w1_device); + /* validate minimum functionality */ + if (!(master->touch_bit && master->reset_bus) && + !(master->write_bit && master->read_bit)) { + printk(KERN_ERR "w1_add_master_device: invalid function set\n"); + return(-EINVAL); + } + + dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_master_driver, &w1_master_device); if (!dev) return -ENOMEM; - dev->kpid = kernel_thread(&w1_process, dev, 0); - if (dev->kpid < 0) { + dev->thread = kthread_run(&w1_process, dev, "%s", dev->name); + if (IS_ERR(dev->thread)) { + retval = PTR_ERR(dev->thread); dev_err(&dev->dev, "Failed to create new kernel thread. err=%d\n", - dev->kpid); - retval = dev->kpid; + retval); goto err_out_free_dev; } - retval = device_create_file(&dev->dev, &w1_master_attribute); + retval = w1_create_master_attributes(dev); if (retval) goto err_out_kill_thread; @@ -141,20 +126,19 @@ int w1_add_master_device(struct w1_bus_master *master) dev->initialized = 1; - spin_lock(&w1_mlock); + mutex_lock(&w1_mlock); list_add(&dev->w1_master_entry, &w1_masters); - spin_unlock(&w1_mlock); + mutex_unlock(&w1_mlock); + + memset(&msg, 0, sizeof(msg)); + msg.id.mst.id = dev->id; + msg.type = W1_MASTER_ADD; + w1_netlink_send(dev, &msg); return 0; err_out_kill_thread: - dev->need_exit = 1; - if (kill_proc(dev->kpid, SIGTERM, 1)) - dev_err(&dev->dev, - "Failed to send signal to w1 kernel thread %d.\n", - dev->kpid); - wait_for_completion(&dev->dev_exited); - + kthread_stop(dev->thread); err_out_free_dev: w1_free_dev(dev); @@ -163,17 +147,23 @@ err_out_free_dev: void __w1_remove_master_device(struct w1_master *dev) { - int err; + struct w1_netlink_msg msg; - dev->need_exit = 1; - err = kill_proc(dev->kpid, SIGTERM, 1); - if (err) - dev_err(&dev->dev, - "%s: Failed to send signal to w1 kernel thread %d.\n", - __func__, dev->kpid); + set_bit(W1_MASTER_NEED_EXIT, &dev->flags); + kthread_stop(dev->thread); + + while (atomic_read(&dev->refcnt)) { + dev_info(&dev->dev, "Waiting for %s to become free: refcnt=%d.\n", + dev->name, atomic_read(&dev->refcnt)); + + if (msleep_interruptible(1000)) + flush_signals(current); + } - while (atomic_read(&dev->refcnt)) - schedule_timeout(10); + memset(&msg, 0, sizeof(msg)); + msg.id.mst.id = dev->id; + msg.type = W1_MASTER_REMOVE; + w1_netlink_send(dev, &msg); w1_free_dev(dev); } @@ -181,10 +171,8 @@ void __w1_remove_master_device(struct w1_master *dev) void w1_remove_master_device(struct w1_bus_master *bm) { struct w1_master *dev = NULL; - struct list_head *ent, *n; - list_for_each_safe(ent, n, &w1_masters) { - dev = list_entry(ent, struct w1_master, w1_master_entry); + list_for_each_entry(dev, &w1_masters, w1_master_entry) { if (!dev->initialized) continue; @@ -200,8 +188,5 @@ void w1_remove_master_device(struct w1_bus_master *bm) __w1_remove_master_device(dev); } -EXPORT_SYMBOL(w1_alloc_dev); -EXPORT_SYMBOL(w1_free_dev); EXPORT_SYMBOL(w1_add_master_device); EXPORT_SYMBOL(w1_remove_master_device); -EXPORT_SYMBOL(__w1_remove_master_device);