mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
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>
284 lines
7.6 KiB
C
284 lines
7.6 KiB
C
/*
|
|
* driver for the i2c-tiny-usb adapter - 1.0
|
|
* http://www.harbaum.org/till/i2c_tiny_usb
|
|
*
|
|
* Copyright (C) 2006-2007 Till Harbaum (Till@Harbaum.org)
|
|
*
|
|
* 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, version 2.
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/types.h>
|
|
|
|
/* include interfaces to usb layer */
|
|
#include <linux/usb.h>
|
|
|
|
/* include interface to i2c layer */
|
|
#include <linux/i2c.h>
|
|
|
|
/* commands via USB, must match command ids in the firmware */
|
|
#define CMD_ECHO 0
|
|
#define CMD_GET_FUNC 1
|
|
#define CMD_SET_DELAY 2
|
|
#define CMD_GET_STATUS 3
|
|
|
|
#define CMD_I2C_IO 4
|
|
#define CMD_I2C_IO_BEGIN (1<<0)
|
|
#define CMD_I2C_IO_END (1<<1)
|
|
|
|
/* i2c bit delay, default is 10us -> 100kHz max
|
|
(in practice, due to additional delays in the i2c bitbanging
|
|
code this results in a i2c clock of about 50kHz) */
|
|
static unsigned short delay = 10;
|
|
module_param(delay, ushort, 0);
|
|
MODULE_PARM_DESC(delay, "bit delay in microseconds "
|
|
"(default is 10us for 100kHz max)");
|
|
|
|
static int usb_read(struct i2c_adapter *adapter, int cmd,
|
|
int value, int index, void *data, int len);
|
|
|
|
static int usb_write(struct i2c_adapter *adapter, int cmd,
|
|
int value, int index, void *data, int len);
|
|
|
|
/* ----- begin of i2c layer ---------------------------------------------- */
|
|
|
|
#define STATUS_IDLE 0
|
|
#define STATUS_ADDRESS_ACK 1
|
|
#define STATUS_ADDRESS_NAK 2
|
|
|
|
static int usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num)
|
|
{
|
|
unsigned char status;
|
|
struct i2c_msg *pmsg;
|
|
int i;
|
|
|
|
dev_dbg(&adapter->dev, "master xfer %d messages:\n", num);
|
|
|
|
for (i = 0 ; i < num ; i++) {
|
|
int cmd = CMD_I2C_IO;
|
|
|
|
if (i == 0)
|
|
cmd |= CMD_I2C_IO_BEGIN;
|
|
|
|
if (i == num-1)
|
|
cmd |= CMD_I2C_IO_END;
|
|
|
|
pmsg = &msgs[i];
|
|
|
|
dev_dbg(&adapter->dev,
|
|
" %d: %s (flags %d) %d bytes to 0x%02x\n",
|
|
i, pmsg->flags & I2C_M_RD ? "read" : "write",
|
|
pmsg->flags, pmsg->len, pmsg->addr);
|
|
|
|
/* and directly send the message */
|
|
if (pmsg->flags & I2C_M_RD) {
|
|
/* read data */
|
|
if (usb_read(adapter, cmd,
|
|
pmsg->flags, pmsg->addr,
|
|
pmsg->buf, pmsg->len) != pmsg->len) {
|
|
dev_err(&adapter->dev,
|
|
"failure reading data\n");
|
|
return -EREMOTEIO;
|
|
}
|
|
} else {
|
|
/* write data */
|
|
if (usb_write(adapter, cmd,
|
|
pmsg->flags, pmsg->addr,
|
|
pmsg->buf, pmsg->len) != pmsg->len) {
|
|
dev_err(&adapter->dev,
|
|
"failure writing data\n");
|
|
return -EREMOTEIO;
|
|
}
|
|
}
|
|
|
|
/* read status */
|
|
if (usb_read(adapter, CMD_GET_STATUS, 0, 0, &status, 1) != 1) {
|
|
dev_err(&adapter->dev, "failure reading status\n");
|
|
return -EREMOTEIO;
|
|
}
|
|
|
|
dev_dbg(&adapter->dev, " status = %d\n", status);
|
|
if (status == STATUS_ADDRESS_NAK)
|
|
return -EREMOTEIO;
|
|
}
|
|
|
|
return i;
|
|
}
|
|
|
|
static u32 usb_func(struct i2c_adapter *adapter)
|
|
{
|
|
__le32 func;
|
|
|
|
/* get functionality from adapter */
|
|
if (usb_read(adapter, CMD_GET_FUNC, 0, 0, &func, sizeof(func)) !=
|
|
sizeof(func)) {
|
|
dev_err(&adapter->dev, "failure reading functionality\n");
|
|
return 0;
|
|
}
|
|
|
|
return le32_to_cpu(func);
|
|
}
|
|
|
|
/* This is the actual algorithm we define */
|
|
static const struct i2c_algorithm usb_algorithm = {
|
|
.master_xfer = usb_xfer,
|
|
.functionality = usb_func,
|
|
};
|
|
|
|
/* ----- end of i2c layer ------------------------------------------------ */
|
|
|
|
/* ----- begin of usb layer ---------------------------------------------- */
|
|
|
|
/*
|
|
* Initially the usb i2c interface uses a vid/pid pair donated by
|
|
* Future Technology Devices International Ltd., later a pair was
|
|
* bought from EZPrototypes
|
|
*/
|
|
static const struct usb_device_id i2c_tiny_usb_table[] = {
|
|
{ USB_DEVICE(0x0403, 0xc631) }, /* FTDI */
|
|
{ USB_DEVICE(0x1c40, 0x0534) }, /* EZPrototypes */
|
|
{ } /* Terminating entry */
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(usb, i2c_tiny_usb_table);
|
|
|
|
/* Structure to hold all of our device specific stuff */
|
|
struct i2c_tiny_usb {
|
|
struct usb_device *usb_dev; /* the usb device for this device */
|
|
struct usb_interface *interface; /* the interface for this device */
|
|
struct i2c_adapter adapter; /* i2c related things */
|
|
};
|
|
|
|
static int usb_read(struct i2c_adapter *adapter, int cmd,
|
|
int value, int index, void *data, int len)
|
|
{
|
|
struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data;
|
|
|
|
/* do control transfer */
|
|
return usb_control_msg(dev->usb_dev, usb_rcvctrlpipe(dev->usb_dev, 0),
|
|
cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE |
|
|
USB_DIR_IN, value, index, data, len, 2000);
|
|
}
|
|
|
|
static int usb_write(struct i2c_adapter *adapter, int cmd,
|
|
int value, int index, void *data, int len)
|
|
{
|
|
struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data;
|
|
|
|
/* do control transfer */
|
|
return usb_control_msg(dev->usb_dev, usb_sndctrlpipe(dev->usb_dev, 0),
|
|
cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
|
|
value, index, data, len, 2000);
|
|
}
|
|
|
|
static void i2c_tiny_usb_free(struct i2c_tiny_usb *dev)
|
|
{
|
|
usb_put_dev(dev->usb_dev);
|
|
kfree(dev);
|
|
}
|
|
|
|
static int i2c_tiny_usb_probe(struct usb_interface *interface,
|
|
const struct usb_device_id *id)
|
|
{
|
|
struct i2c_tiny_usb *dev;
|
|
int retval = -ENOMEM;
|
|
u16 version;
|
|
|
|
dev_dbg(&interface->dev, "probing usb device\n");
|
|
|
|
/* allocate memory for our device state and initialize it */
|
|
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
|
if (dev == NULL) {
|
|
dev_err(&interface->dev, "Out of memory\n");
|
|
goto error;
|
|
}
|
|
|
|
dev->usb_dev = usb_get_dev(interface_to_usbdev(interface));
|
|
dev->interface = interface;
|
|
|
|
/* save our data pointer in this interface device */
|
|
usb_set_intfdata(interface, dev);
|
|
|
|
version = le16_to_cpu(dev->usb_dev->descriptor.bcdDevice);
|
|
dev_info(&interface->dev,
|
|
"version %x.%02x found at bus %03d address %03d\n",
|
|
version >> 8, version & 0xff,
|
|
dev->usb_dev->bus->busnum, dev->usb_dev->devnum);
|
|
|
|
/* setup i2c adapter description */
|
|
dev->adapter.owner = THIS_MODULE;
|
|
dev->adapter.class = I2C_CLASS_HWMON;
|
|
dev->adapter.algo = &usb_algorithm;
|
|
dev->adapter.algo_data = dev;
|
|
snprintf(dev->adapter.name, sizeof(dev->adapter.name),
|
|
"i2c-tiny-usb at bus %03d device %03d",
|
|
dev->usb_dev->bus->busnum, dev->usb_dev->devnum);
|
|
|
|
if (usb_write(&dev->adapter, CMD_SET_DELAY, delay, 0, NULL, 0) != 0) {
|
|
dev_err(&dev->adapter.dev,
|
|
"failure setting delay to %dus\n", delay);
|
|
retval = -EIO;
|
|
goto error;
|
|
}
|
|
|
|
dev->adapter.dev.parent = &dev->interface->dev;
|
|
|
|
/* and finally attach to i2c layer */
|
|
i2c_add_adapter(&dev->adapter);
|
|
|
|
/* inform user about successful attachment to i2c layer */
|
|
dev_info(&dev->adapter.dev, "connected i2c-tiny-usb device\n");
|
|
|
|
return 0;
|
|
|
|
error:
|
|
if (dev)
|
|
i2c_tiny_usb_free(dev);
|
|
|
|
return retval;
|
|
}
|
|
|
|
static void i2c_tiny_usb_disconnect(struct usb_interface *interface)
|
|
{
|
|
struct i2c_tiny_usb *dev = usb_get_intfdata(interface);
|
|
|
|
i2c_del_adapter(&dev->adapter);
|
|
usb_set_intfdata(interface, NULL);
|
|
i2c_tiny_usb_free(dev);
|
|
|
|
dev_dbg(&interface->dev, "disconnected\n");
|
|
}
|
|
|
|
static struct usb_driver i2c_tiny_usb_driver = {
|
|
.name = "i2c-tiny-usb",
|
|
.probe = i2c_tiny_usb_probe,
|
|
.disconnect = i2c_tiny_usb_disconnect,
|
|
.id_table = i2c_tiny_usb_table,
|
|
};
|
|
|
|
static int __init usb_i2c_tiny_usb_init(void)
|
|
{
|
|
/* register this driver with the USB subsystem */
|
|
return usb_register(&i2c_tiny_usb_driver);
|
|
}
|
|
|
|
static void __exit usb_i2c_tiny_usb_exit(void)
|
|
{
|
|
/* deregister this driver with the USB subsystem */
|
|
usb_deregister(&i2c_tiny_usb_driver);
|
|
}
|
|
|
|
module_init(usb_i2c_tiny_usb_init);
|
|
module_exit(usb_i2c_tiny_usb_exit);
|
|
|
|
/* ----- end of usb layer ------------------------------------------------ */
|
|
|
|
MODULE_AUTHOR("Till Harbaum <Till@Harbaum.org>");
|
|
MODULE_DESCRIPTION("i2c-tiny-usb driver v1.0");
|
|
MODULE_LICENSE("GPL");
|