mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
251 lines
6.2 KiB
C
251 lines
6.2 KiB
C
/*
|
|
* w1_int.c
|
|
*
|
|
* Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
|
|
*
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/list.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/kthread.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "w1.h"
|
|
#include "w1_log.h"
|
|
#include "w1_netlink.h"
|
|
#include "w1_int.h"
|
|
|
|
static int w1_search_count = -1; /* Default is continual scan */
|
|
module_param_named(search_count, w1_search_count, int, 0);
|
|
|
|
static int w1_enable_pullup = 1;
|
|
module_param_named(enable_pullup, w1_enable_pullup, int, 0);
|
|
|
|
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;
|
|
|
|
/*
|
|
* We are in process context(kernel thread), so can sleep.
|
|
*/
|
|
dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
|
|
if (!dev) {
|
|
printk(KERN_ERR
|
|
"Failed to allocate %zd bytes for new w1 device.\n",
|
|
sizeof(struct w1_master));
|
|
return NULL;
|
|
}
|
|
|
|
|
|
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->initialized = 0;
|
|
dev->id = id;
|
|
dev->slave_ttl = slave_ttl;
|
|
dev->search_count = w1_search_count;
|
|
dev->enable_pullup = w1_enable_pullup;
|
|
|
|
/* 1 for w1_process to decrement
|
|
* 1 for __w1_remove_master_device to decrement
|
|
*/
|
|
atomic_set(&dev->refcnt, 2);
|
|
|
|
INIT_LIST_HEAD(&dev->slist);
|
|
mutex_init(&dev->mutex);
|
|
|
|
memcpy(&dev->dev, device, sizeof(struct device));
|
|
dev_set_name(&dev->dev, "w1_bus_master%u", dev->id);
|
|
snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id);
|
|
|
|
dev->driver = driver;
|
|
|
|
dev->seq = 1;
|
|
|
|
err = device_register(&dev->dev);
|
|
if (err) {
|
|
printk(KERN_ERR "Failed to register master device. err=%d\n", err);
|
|
memset(dev, 0, sizeof(struct w1_master));
|
|
kfree(dev);
|
|
dev = NULL;
|
|
}
|
|
|
|
return dev;
|
|
}
|
|
|
|
static void w1_free_dev(struct w1_master *dev)
|
|
{
|
|
device_unregister(&dev->dev);
|
|
}
|
|
|
|
int w1_add_master_device(struct w1_bus_master *master)
|
|
{
|
|
struct w1_master *dev, *entry;
|
|
int retval = 0;
|
|
struct w1_netlink_msg msg;
|
|
int id, found;
|
|
|
|
/* validate minimum functionality */
|
|
if (!(master->touch_bit && master->reset_bus) &&
|
|
!(master->write_bit && master->read_bit) &&
|
|
!(master->write_byte && master->read_byte && master->reset_bus)) {
|
|
printk(KERN_ERR "w1_add_master_device: invalid function set\n");
|
|
return(-EINVAL);
|
|
}
|
|
/* While it would be electrically possible to make a device that
|
|
* generated a strong pullup in bit bang mode, only hardare that
|
|
* controls 1-wire time frames are even expected to support a strong
|
|
* pullup. w1_io.c would need to support calling set_pullup before
|
|
* the last write_bit operation of a w1_write_8 which it currently
|
|
* doesn't.
|
|
*/
|
|
if (!master->write_byte && !master->touch_bit && master->set_pullup) {
|
|
printk(KERN_ERR "w1_add_master_device: set_pullup requires "
|
|
"write_byte or touch_bit, disabling\n");
|
|
master->set_pullup = NULL;
|
|
}
|
|
|
|
/* Lock until the device is added (or not) to w1_masters. */
|
|
mutex_lock(&w1_mlock);
|
|
/* Search for the first available id (starting at 1). */
|
|
id = 0;
|
|
do {
|
|
++id;
|
|
found = 0;
|
|
list_for_each_entry(entry, &w1_masters, w1_master_entry) {
|
|
if (entry->id == id) {
|
|
found = 1;
|
|
break;
|
|
}
|
|
}
|
|
} while (found);
|
|
|
|
dev = w1_alloc_dev(id, w1_max_slave_count, w1_max_slave_ttl,
|
|
&w1_master_driver, &w1_master_device);
|
|
if (!dev) {
|
|
mutex_unlock(&w1_mlock);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
retval = w1_create_master_attributes(dev);
|
|
if (retval) {
|
|
mutex_unlock(&w1_mlock);
|
|
goto err_out_free_dev;
|
|
}
|
|
|
|
memcpy(dev->bus_master, master, sizeof(struct w1_bus_master));
|
|
|
|
dev->initialized = 1;
|
|
|
|
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",
|
|
retval);
|
|
mutex_unlock(&w1_mlock);
|
|
goto err_out_rm_attr;
|
|
}
|
|
|
|
list_add(&dev->w1_master_entry, &w1_masters);
|
|
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;
|
|
|
|
#if 0 /* Thread cleanup code, not required currently. */
|
|
err_out_kill_thread:
|
|
kthread_stop(dev->thread);
|
|
#endif
|
|
err_out_rm_attr:
|
|
w1_destroy_master_attributes(dev);
|
|
err_out_free_dev:
|
|
w1_free_dev(dev);
|
|
|
|
return retval;
|
|
}
|
|
|
|
void __w1_remove_master_device(struct w1_master *dev)
|
|
{
|
|
struct w1_netlink_msg msg;
|
|
struct w1_slave *sl, *sln;
|
|
|
|
kthread_stop(dev->thread);
|
|
|
|
mutex_lock(&w1_mlock);
|
|
list_del(&dev->w1_master_entry);
|
|
mutex_unlock(&w1_mlock);
|
|
|
|
mutex_lock(&dev->mutex);
|
|
list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry)
|
|
w1_slave_detach(sl);
|
|
w1_destroy_master_attributes(dev);
|
|
mutex_unlock(&dev->mutex);
|
|
atomic_dec(&dev->refcnt);
|
|
|
|
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);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
void w1_remove_master_device(struct w1_bus_master *bm)
|
|
{
|
|
struct w1_master *dev, *found = NULL;
|
|
|
|
list_for_each_entry(dev, &w1_masters, w1_master_entry) {
|
|
if (!dev->initialized)
|
|
continue;
|
|
|
|
if (dev->bus_master->data == bm->data) {
|
|
found = dev;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!found) {
|
|
printk(KERN_ERR "Device doesn't exist.\n");
|
|
return;
|
|
}
|
|
|
|
__w1_remove_master_device(found);
|
|
}
|
|
|
|
EXPORT_SYMBOL(w1_add_master_device);
|
|
EXPORT_SYMBOL(w1_remove_master_device);
|