2005-04-16 18:20:36 -04:00
|
|
|
|
/* i2c-core.c - a device driver for the iic-bus interface */
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
/* Copyright (C) 1995-99 Simon G. Vogl
|
|
|
|
|
|
|
|
|
|
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., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
|
|
/* With some changes from Ky<4B>sti M<>lkki <kmalkki@cc.hut.fi>.
|
|
|
|
|
All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and
|
|
|
|
|
Jean Delvare <khali@linux-fr.org> */
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/errno.h>
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
#include <linux/i2c.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/idr.h>
|
|
|
|
|
#include <linux/seq_file.h>
|
2005-10-29 14:07:23 -04:00
|
|
|
|
#include <linux/platform_device.h>
|
2006-01-11 04:50:26 -05:00
|
|
|
|
#include <linux/mutex.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static LIST_HEAD(adapters);
|
|
|
|
|
static LIST_HEAD(drivers);
|
2006-01-11 04:50:26 -05:00
|
|
|
|
static DEFINE_MUTEX(core_lists);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
static DEFINE_IDR(i2c_adapter_idr);
|
|
|
|
|
|
|
|
|
|
/* match always succeeds, as we want the probe() to tell if we really accept this match */
|
|
|
|
|
static int i2c_device_match(struct device *dev, struct device_driver *drv)
|
|
|
|
|
{
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int i2c_bus_suspend(struct device * dev, pm_message_t state)
|
|
|
|
|
{
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
|
|
if (dev->driver && dev->driver->suspend)
|
2005-10-28 12:52:56 -04:00
|
|
|
|
rc = dev->driver->suspend(dev, state);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int i2c_bus_resume(struct device * dev)
|
|
|
|
|
{
|
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
|
|
if (dev->driver && dev->driver->resume)
|
2005-10-28 12:52:56 -04:00
|
|
|
|
rc = dev->driver->resume(dev);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int i2c_device_probe(struct device *dev)
|
|
|
|
|
{
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int i2c_device_remove(struct device *dev)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-05 09:37:50 -05:00
|
|
|
|
struct bus_type i2c_bus_type = {
|
|
|
|
|
.name = "i2c",
|
|
|
|
|
.match = i2c_device_match,
|
|
|
|
|
.probe = i2c_device_probe,
|
|
|
|
|
.remove = i2c_device_remove,
|
|
|
|
|
.suspend = i2c_bus_suspend,
|
|
|
|
|
.resume = i2c_bus_resume,
|
|
|
|
|
};
|
|
|
|
|
|
2005-07-20 17:03:50 -04:00
|
|
|
|
void i2c_adapter_dev_release(struct device *dev)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
|
|
|
|
struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
|
|
|
|
|
complete(&adap->dev_released);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-20 17:03:50 -04:00
|
|
|
|
struct device_driver i2c_adapter_driver = {
|
2005-10-17 16:54:45 -04:00
|
|
|
|
.owner = THIS_MODULE,
|
2005-04-16 18:20:36 -04:00
|
|
|
|
.name = "i2c_adapter",
|
|
|
|
|
.bus = &i2c_bus_type,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void i2c_adapter_class_dev_release(struct class_device *dev)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
|
|
|
|
|
complete(&adap->class_dev_released);
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-20 17:03:50 -04:00
|
|
|
|
struct class i2c_adapter_class = {
|
2005-10-17 16:54:45 -04:00
|
|
|
|
.owner = THIS_MODULE,
|
2005-04-16 18:20:36 -04:00
|
|
|
|
.name = "i2c-adapter",
|
|
|
|
|
.release = &i2c_adapter_class_dev_release,
|
|
|
|
|
};
|
|
|
|
|
|
2005-05-17 06:42:58 -04:00
|
|
|
|
static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
|
|
|
|
struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
|
|
|
|
|
return sprintf(buf, "%s\n", adap->name);
|
|
|
|
|
}
|
|
|
|
|
static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void i2c_client_release(struct device *dev)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
|
|
|
complete(&client->released);
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-17 06:42:58 -04:00
|
|
|
|
static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
|
|
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
|
|
|
return sprintf(buf, "%s\n", client->name);
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-10 15:21:31 -05:00
|
|
|
|
/*
|
2006-12-10 15:21:31 -05:00
|
|
|
|
* We can't use the DEVICE_ATTR() macro here, as we used the same name for
|
|
|
|
|
* an i2c adapter attribute (above).
|
2005-04-16 18:20:36 -04:00
|
|
|
|
*/
|
2006-12-10 15:21:31 -05:00
|
|
|
|
static struct device_attribute dev_attr_client_name =
|
|
|
|
|
__ATTR(name, S_IRUGO, &show_client_name, NULL);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ---------------------------------------------------
|
2006-12-10 15:21:31 -05:00
|
|
|
|
* registering functions
|
|
|
|
|
* ---------------------------------------------------
|
2005-04-16 18:20:36 -04:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* -----
|
|
|
|
|
* i2c_add_adapter is called from within the algorithm layer,
|
|
|
|
|
* when a new hw adapter registers. A new device is register to be
|
|
|
|
|
* available for clients.
|
|
|
|
|
*/
|
|
|
|
|
int i2c_add_adapter(struct i2c_adapter *adap)
|
|
|
|
|
{
|
|
|
|
|
int id, res = 0;
|
|
|
|
|
struct list_head *item;
|
|
|
|
|
struct i2c_driver *driver;
|
|
|
|
|
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_lock(&core_lists);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
if (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0) {
|
|
|
|
|
res = -ENOMEM;
|
|
|
|
|
goto out_unlock;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-28 00:21:30 -04:00
|
|
|
|
res = idr_get_new(&i2c_adapter_idr, adap, &id);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
if (res < 0) {
|
|
|
|
|
if (res == -EAGAIN)
|
|
|
|
|
res = -ENOMEM;
|
|
|
|
|
goto out_unlock;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
adap->nr = id & MAX_ID_MASK;
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_init(&adap->bus_lock);
|
|
|
|
|
mutex_init(&adap->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
list_add_tail(&adap->list,&adapters);
|
|
|
|
|
INIT_LIST_HEAD(&adap->clients);
|
|
|
|
|
|
|
|
|
|
/* Add the adapter to the driver core.
|
|
|
|
|
* If the parent pointer is not set up,
|
|
|
|
|
* we add this adapter to the host bus.
|
|
|
|
|
*/
|
|
|
|
|
if (adap->dev.parent == NULL)
|
|
|
|
|
adap->dev.parent = &platform_bus;
|
|
|
|
|
sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
|
|
|
|
|
adap->dev.driver = &i2c_adapter_driver;
|
|
|
|
|
adap->dev.release = &i2c_adapter_dev_release;
|
2006-08-15 12:26:30 -04:00
|
|
|
|
res = device_register(&adap->dev);
|
|
|
|
|
if (res)
|
|
|
|
|
goto out_list;
|
|
|
|
|
res = device_create_file(&adap->dev, &dev_attr_name);
|
|
|
|
|
if (res)
|
|
|
|
|
goto out_unregister;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
/* Add this adapter to the i2c_adapter class */
|
|
|
|
|
memset(&adap->class_dev, 0x00, sizeof(struct class_device));
|
|
|
|
|
adap->class_dev.dev = &adap->dev;
|
|
|
|
|
adap->class_dev.class = &i2c_adapter_class;
|
|
|
|
|
strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
|
2006-08-15 12:26:30 -04:00
|
|
|
|
res = class_device_register(&adap->class_dev);
|
|
|
|
|
if (res)
|
|
|
|
|
goto out_remove_name;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
|
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
/* inform drivers of new adapters */
|
|
|
|
|
list_for_each(item,&drivers) {
|
|
|
|
|
driver = list_entry(item, struct i2c_driver, list);
|
2005-11-26 14:28:06 -05:00
|
|
|
|
if (driver->attach_adapter)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
/* We ignore the return code; if it fails, too bad */
|
|
|
|
|
driver->attach_adapter(adap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out_unlock:
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_unlock(&core_lists);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return res;
|
2006-08-15 12:26:30 -04:00
|
|
|
|
|
|
|
|
|
out_remove_name:
|
|
|
|
|
device_remove_file(&adap->dev, &dev_attr_name);
|
|
|
|
|
out_unregister:
|
|
|
|
|
init_completion(&adap->dev_released); /* Needed? */
|
|
|
|
|
device_unregister(&adap->dev);
|
|
|
|
|
wait_for_completion(&adap->dev_released);
|
|
|
|
|
out_list:
|
|
|
|
|
list_del(&adap->list);
|
|
|
|
|
idr_remove(&i2c_adapter_idr, adap->nr);
|
|
|
|
|
goto out_unlock;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int i2c_del_adapter(struct i2c_adapter *adap)
|
|
|
|
|
{
|
|
|
|
|
struct list_head *item, *_n;
|
|
|
|
|
struct i2c_adapter *adap_from_list;
|
|
|
|
|
struct i2c_driver *driver;
|
|
|
|
|
struct i2c_client *client;
|
|
|
|
|
int res = 0;
|
|
|
|
|
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_lock(&core_lists);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
/* First make sure that this adapter was ever added */
|
|
|
|
|
list_for_each_entry(adap_from_list, &adapters, list) {
|
|
|
|
|
if (adap_from_list == adap)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (adap_from_list != adap) {
|
2005-07-31 13:02:53 -04:00
|
|
|
|
pr_debug("i2c-core: attempting to delete unregistered "
|
|
|
|
|
"adapter [%s]\n", adap->name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
res = -EINVAL;
|
|
|
|
|
goto out_unlock;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list_for_each(item,&drivers) {
|
|
|
|
|
driver = list_entry(item, struct i2c_driver, list);
|
|
|
|
|
if (driver->detach_adapter)
|
|
|
|
|
if ((res = driver->detach_adapter(adap))) {
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_err(&adap->dev, "detach_adapter failed "
|
2005-11-26 14:34:05 -05:00
|
|
|
|
"for driver [%s]\n",
|
|
|
|
|
driver->driver.name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
goto out_unlock;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* detach any active clients. This must be done first, because
|
2005-05-19 15:40:38 -04:00
|
|
|
|
* it can fail; in which case we give up. */
|
2005-04-16 18:20:36 -04:00
|
|
|
|
list_for_each_safe(item, _n, &adap->clients) {
|
|
|
|
|
client = list_entry(item, struct i2c_client, list);
|
|
|
|
|
|
|
|
|
|
if ((res=client->driver->detach_client(client))) {
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_err(&adap->dev, "detach_client failed for client "
|
|
|
|
|
"[%s] at address 0x%02x\n", client->name,
|
2005-04-16 18:20:36 -04:00
|
|
|
|
client->addr);
|
|
|
|
|
goto out_unlock;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* clean up the sysfs representation */
|
|
|
|
|
init_completion(&adap->dev_released);
|
|
|
|
|
init_completion(&adap->class_dev_released);
|
|
|
|
|
class_device_unregister(&adap->class_dev);
|
|
|
|
|
device_remove_file(&adap->dev, &dev_attr_name);
|
|
|
|
|
device_unregister(&adap->dev);
|
|
|
|
|
list_del(&adap->list);
|
|
|
|
|
|
|
|
|
|
/* wait for sysfs to drop all references */
|
|
|
|
|
wait_for_completion(&adap->dev_released);
|
|
|
|
|
wait_for_completion(&adap->class_dev_released);
|
|
|
|
|
|
|
|
|
|
/* free dynamically allocated bus id */
|
|
|
|
|
idr_remove(&i2c_adapter_idr, adap->nr);
|
|
|
|
|
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
out_unlock:
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_unlock(&core_lists);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* -----
|
|
|
|
|
* What follows is the "upwards" interface: commands for talking to clients,
|
|
|
|
|
* which implement the functions to access the physical information of the
|
|
|
|
|
* chips.
|
|
|
|
|
*/
|
|
|
|
|
|
2005-12-06 18:33:15 -05:00
|
|
|
|
int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
|
|
|
|
struct list_head *item;
|
|
|
|
|
struct i2c_adapter *adapter;
|
2006-02-05 17:28:21 -05:00
|
|
|
|
int res;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
/* add the driver to the list of i2c drivers in the driver core */
|
2005-12-06 18:33:15 -05:00
|
|
|
|
driver->driver.owner = owner;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
driver->driver.bus = &i2c_bus_type;
|
|
|
|
|
|
|
|
|
|
res = driver_register(&driver->driver);
|
|
|
|
|
if (res)
|
2006-02-05 17:28:21 -05:00
|
|
|
|
return res;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2006-02-05 17:28:21 -05:00
|
|
|
|
mutex_lock(&core_lists);
|
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
list_add_tail(&driver->list,&drivers);
|
2005-11-26 14:34:05 -05:00
|
|
|
|
pr_debug("i2c-core: driver [%s] registered\n", driver->driver.name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
/* now look for instances of driver on our adapters */
|
2005-11-26 14:28:06 -05:00
|
|
|
|
if (driver->attach_adapter) {
|
2005-04-16 18:20:36 -04:00
|
|
|
|
list_for_each(item,&adapters) {
|
|
|
|
|
adapter = list_entry(item, struct i2c_adapter, list);
|
|
|
|
|
driver->attach_adapter(adapter);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_unlock(&core_lists);
|
2006-02-05 17:28:21 -05:00
|
|
|
|
return 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
2005-12-06 18:33:15 -05:00
|
|
|
|
EXPORT_SYMBOL(i2c_register_driver);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
int i2c_del_driver(struct i2c_driver *driver)
|
|
|
|
|
{
|
|
|
|
|
struct list_head *item1, *item2, *_n;
|
|
|
|
|
struct i2c_client *client;
|
|
|
|
|
struct i2c_adapter *adap;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
int res = 0;
|
|
|
|
|
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_lock(&core_lists);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
/* Have a look at each adapter, if clients of this driver are still
|
2006-12-10 15:21:31 -05:00
|
|
|
|
* attached. If so, detach them to be able to kill the driver
|
2005-04-16 18:20:36 -04:00
|
|
|
|
* afterwards.
|
|
|
|
|
*/
|
|
|
|
|
list_for_each(item1,&adapters) {
|
|
|
|
|
adap = list_entry(item1, struct i2c_adapter, list);
|
|
|
|
|
if (driver->detach_adapter) {
|
|
|
|
|
if ((res = driver->detach_adapter(adap))) {
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_err(&adap->dev, "detach_adapter failed "
|
2005-11-26 14:34:05 -05:00
|
|
|
|
"for driver [%s]\n",
|
|
|
|
|
driver->driver.name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
goto out_unlock;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
list_for_each_safe(item2, _n, &adap->clients) {
|
|
|
|
|
client = list_entry(item2, struct i2c_client, list);
|
|
|
|
|
if (client->driver != driver)
|
|
|
|
|
continue;
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_dbg(&adap->dev, "detaching client [%s] "
|
|
|
|
|
"at 0x%02x\n", client->name,
|
|
|
|
|
client->addr);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
if ((res = driver->detach_client(client))) {
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_err(&adap->dev, "detach_client "
|
|
|
|
|
"failed for client [%s] at "
|
|
|
|
|
"0x%02x\n", client->name,
|
2005-04-16 18:20:36 -04:00
|
|
|
|
client->addr);
|
|
|
|
|
goto out_unlock;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
driver_unregister(&driver->driver);
|
|
|
|
|
list_del(&driver->list);
|
2005-11-26 14:34:05 -05:00
|
|
|
|
pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
out_unlock:
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_unlock(&core_lists);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr)
|
|
|
|
|
{
|
|
|
|
|
struct list_head *item;
|
|
|
|
|
struct i2c_client *client;
|
|
|
|
|
|
|
|
|
|
list_for_each(item,&adapter->clients) {
|
|
|
|
|
client = list_entry(item, struct i2c_client, list);
|
|
|
|
|
if (client->addr == addr)
|
|
|
|
|
return -EBUSY;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i2c_check_addr(struct i2c_adapter *adapter, int addr)
|
|
|
|
|
{
|
|
|
|
|
int rval;
|
|
|
|
|
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_lock(&adapter->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
rval = __i2c_check_addr(adapter, addr);
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_unlock(&adapter->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
return rval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i2c_attach_client(struct i2c_client *client)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_adapter *adapter = client->adapter;
|
2006-08-15 12:26:30 -04:00
|
|
|
|
int res = 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_lock(&adapter->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
if (__i2c_check_addr(client->adapter, client->addr)) {
|
2006-08-15 12:26:30 -04:00
|
|
|
|
res = -EBUSY;
|
|
|
|
|
goto out_unlock;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
list_add_tail(&client->list,&adapter->clients);
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-11-26 15:00:54 -05:00
|
|
|
|
client->usage_count = 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
client->dev.parent = &client->adapter->dev;
|
|
|
|
|
client->dev.driver = &client->driver->driver;
|
|
|
|
|
client->dev.bus = &i2c_bus_type;
|
|
|
|
|
client->dev.release = &i2c_client_release;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
|
|
|
|
|
"%d-%04x", i2c_adapter_id(adapter), client->addr);
|
2005-07-31 13:02:53 -04:00
|
|
|
|
dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
|
|
|
|
|
client->name, client->dev.bus_id);
|
2006-08-15 12:26:30 -04:00
|
|
|
|
res = device_register(&client->dev);
|
|
|
|
|
if (res)
|
|
|
|
|
goto out_list;
|
|
|
|
|
res = device_create_file(&client->dev, &dev_attr_client_name);
|
|
|
|
|
if (res)
|
|
|
|
|
goto out_unregister;
|
|
|
|
|
mutex_unlock(&adapter->clist_lock);
|
2006-09-30 11:18:59 -04:00
|
|
|
|
|
|
|
|
|
if (adapter->client_register) {
|
|
|
|
|
if (adapter->client_register(client)) {
|
|
|
|
|
dev_dbg(&adapter->dev, "client_register "
|
|
|
|
|
"failed for client [%s] at 0x%02x\n",
|
|
|
|
|
client->name, client->addr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
2006-08-15 12:26:30 -04:00
|
|
|
|
|
|
|
|
|
out_unregister:
|
|
|
|
|
init_completion(&client->released); /* Needed? */
|
|
|
|
|
device_unregister(&client->dev);
|
|
|
|
|
wait_for_completion(&client->released);
|
|
|
|
|
out_list:
|
|
|
|
|
list_del(&client->list);
|
|
|
|
|
dev_err(&adapter->dev, "Failed to attach i2c client %s at 0x%02x "
|
|
|
|
|
"(%d)\n", client->name, client->addr, res);
|
2006-09-30 11:18:59 -04:00
|
|
|
|
out_unlock:
|
|
|
|
|
mutex_unlock(&adapter->clist_lock);
|
|
|
|
|
return res;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int i2c_detach_client(struct i2c_client *client)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_adapter *adapter = client->adapter;
|
|
|
|
|
int res = 0;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-11-26 15:00:54 -05:00
|
|
|
|
if (client->usage_count > 0) {
|
2005-07-27 16:14:49 -04:00
|
|
|
|
dev_warn(&client->dev, "Client [%s] still busy, "
|
|
|
|
|
"can't detach\n", client->name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return -EBUSY;
|
2005-07-27 16:14:49 -04:00
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
if (adapter->client_unregister) {
|
|
|
|
|
res = adapter->client_unregister(client);
|
|
|
|
|
if (res) {
|
|
|
|
|
dev_err(&client->dev,
|
2005-07-29 15:15:29 -04:00
|
|
|
|
"client_unregister [%s] failed, "
|
|
|
|
|
"client not detached\n", client->name);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_lock(&adapter->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
list_del(&client->list);
|
|
|
|
|
init_completion(&client->released);
|
|
|
|
|
device_remove_file(&client->dev, &dev_attr_client_name);
|
|
|
|
|
device_unregister(&client->dev);
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_unlock(&adapter->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
wait_for_completion(&client->released);
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int i2c_inc_use_client(struct i2c_client *client)
|
|
|
|
|
{
|
|
|
|
|
|
2005-11-26 14:34:05 -05:00
|
|
|
|
if (!try_module_get(client->driver->driver.owner))
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return -ENODEV;
|
|
|
|
|
if (!try_module_get(client->adapter->owner)) {
|
2005-11-26 14:34:05 -05:00
|
|
|
|
module_put(client->driver->driver.owner);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void i2c_dec_use_client(struct i2c_client *client)
|
|
|
|
|
{
|
2005-11-26 14:34:05 -05:00
|
|
|
|
module_put(client->driver->driver.owner);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
module_put(client->adapter->owner);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i2c_use_client(struct i2c_client *client)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = i2c_inc_use_client(client);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2005-11-26 15:00:54 -05:00
|
|
|
|
client->usage_count++;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i2c_release_client(struct i2c_client *client)
|
|
|
|
|
{
|
2005-11-26 15:00:54 -05:00
|
|
|
|
if (!client->usage_count) {
|
|
|
|
|
pr_debug("i2c-core: %s used one too many times\n",
|
|
|
|
|
__FUNCTION__);
|
|
|
|
|
return -EPERM;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-11-26 15:00:54 -05:00
|
|
|
|
client->usage_count--;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
i2c_dec_use_client(client);
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
|
|
|
|
|
{
|
|
|
|
|
struct list_head *item;
|
|
|
|
|
struct i2c_client *client;
|
|
|
|
|
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_lock(&adap->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
list_for_each(item,&adap->clients) {
|
|
|
|
|
client = list_entry(item, struct i2c_client, list);
|
2005-11-26 14:34:05 -05:00
|
|
|
|
if (!try_module_get(client->driver->driver.owner))
|
2005-04-16 18:20:36 -04:00
|
|
|
|
continue;
|
|
|
|
|
if (NULL != client->driver->command) {
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_unlock(&adap->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
client->driver->command(client,cmd,arg);
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_lock(&adap->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
2005-11-26 14:34:05 -05:00
|
|
|
|
module_put(client->driver->driver.owner);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_unlock(&adap->clist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int __init i2c_init(void)
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
retval = bus_register(&i2c_bus_type);
|
|
|
|
|
if (retval)
|
|
|
|
|
return retval;
|
|
|
|
|
retval = driver_register(&i2c_adapter_driver);
|
|
|
|
|
if (retval)
|
|
|
|
|
return retval;
|
|
|
|
|
return class_register(&i2c_adapter_class);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void __exit i2c_exit(void)
|
|
|
|
|
{
|
|
|
|
|
class_unregister(&i2c_adapter_class);
|
|
|
|
|
driver_unregister(&i2c_adapter_driver);
|
|
|
|
|
bus_unregister(&i2c_bus_type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
subsys_initcall(i2c_init);
|
|
|
|
|
module_exit(i2c_exit);
|
|
|
|
|
|
|
|
|
|
/* ----------------------------------------------------
|
|
|
|
|
* the functional interface to the i2c busses.
|
|
|
|
|
* ----------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (adap->algo->master_xfer) {
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
for (ret = 0; ret < num; ret++) {
|
|
|
|
|
dev_dbg(&adap->dev, "master_xfer[%d] %c, addr=0x%02x, "
|
|
|
|
|
"len=%d\n", ret, msgs[ret].flags & I2C_M_RD ?
|
|
|
|
|
'R' : 'W', msgs[ret].addr, msgs[ret].len);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-12-10 15:21:30 -05:00
|
|
|
|
mutex_lock_nested(&adap->bus_lock, adap->level);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
ret = adap->algo->master_xfer(adap,msgs,num);
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_unlock(&adap->bus_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
} else {
|
|
|
|
|
dev_dbg(&adap->dev, "I2C level transfers not supported\n");
|
|
|
|
|
return -ENOSYS;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
struct i2c_adapter *adap=client->adapter;
|
|
|
|
|
struct i2c_msg msg;
|
|
|
|
|
|
2005-05-07 16:58:46 -04:00
|
|
|
|
msg.addr = client->addr;
|
|
|
|
|
msg.flags = client->flags & I2C_M_TEN;
|
|
|
|
|
msg.len = count;
|
|
|
|
|
msg.buf = (char *)buf;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-05-07 16:58:46 -04:00
|
|
|
|
ret = i2c_transfer(adap, &msg, 1);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
2005-05-07 16:58:46 -04:00
|
|
|
|
/* If everything went ok (i.e. 1 msg transmitted), return #bytes
|
|
|
|
|
transmitted, else error code. */
|
|
|
|
|
return (ret == 1) ? count : ret;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_adapter *adap=client->adapter;
|
|
|
|
|
struct i2c_msg msg;
|
|
|
|
|
int ret;
|
2005-05-07 16:58:46 -04:00
|
|
|
|
|
|
|
|
|
msg.addr = client->addr;
|
|
|
|
|
msg.flags = client->flags & I2C_M_TEN;
|
|
|
|
|
msg.flags |= I2C_M_RD;
|
|
|
|
|
msg.len = count;
|
|
|
|
|
msg.buf = buf;
|
|
|
|
|
|
|
|
|
|
ret = i2c_transfer(adap, &msg, 1);
|
|
|
|
|
|
|
|
|
|
/* If everything went ok (i.e. 1 msg transmitted), return #bytes
|
|
|
|
|
transmitted, else error code. */
|
|
|
|
|
return (ret == 1) ? count : ret;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int i2c_control(struct i2c_client *client,
|
|
|
|
|
unsigned int cmd, unsigned long arg)
|
|
|
|
|
{
|
|
|
|
|
int ret = 0;
|
|
|
|
|
struct i2c_adapter *adap = client->adapter;
|
|
|
|
|
|
|
|
|
|
dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
|
|
|
|
|
switch (cmd) {
|
|
|
|
|
case I2C_RETRIES:
|
|
|
|
|
adap->retries = arg;
|
|
|
|
|
break;
|
|
|
|
|
case I2C_TIMEOUT:
|
|
|
|
|
adap->timeout = arg;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (adap->algo->algo_control!=NULL)
|
|
|
|
|
ret = adap->algo->algo_control(adap,cmd,arg);
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ----------------------------------------------------
|
|
|
|
|
* the i2c address scanning function
|
|
|
|
|
* Will not work for 10-bit addresses!
|
|
|
|
|
* ----------------------------------------------------
|
|
|
|
|
*/
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
|
|
|
|
|
int (*found_proc) (struct i2c_adapter *, int, int))
|
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
/* Make sure the address is valid */
|
|
|
|
|
if (addr < 0x03 || addr > 0x77) {
|
|
|
|
|
dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
|
|
|
|
|
addr);
|
|
|
|
|
return -EINVAL;
|
2005-07-31 15:20:43 -04:00
|
|
|
|
}
|
|
|
|
|
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
/* Skip if already in use */
|
|
|
|
|
if (i2c_check_addr(adapter, addr))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Make sure there is something at this address, unless forced */
|
2005-08-09 14:28:10 -04:00
|
|
|
|
if (kind < 0) {
|
|
|
|
|
if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
|
|
|
|
|
I2C_SMBUS_QUICK, NULL) < 0)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* prevent 24RF08 corruption */
|
|
|
|
|
if ((addr & ~0x0f) == 0x50)
|
|
|
|
|
i2c_smbus_xfer(adapter, addr, 0, 0, 0,
|
|
|
|
|
I2C_SMBUS_QUICK, NULL);
|
|
|
|
|
}
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
|
|
|
|
|
/* Finally call the custom detection function */
|
|
|
|
|
err = found_proc(adapter, addr, kind);
|
|
|
|
|
/* -ENODEV can be returned if there is a chip at the given address
|
|
|
|
|
but it isn't supported by this chip driver. We catch it here as
|
|
|
|
|
this isn't an error. */
|
2006-09-03 16:25:04 -04:00
|
|
|
|
if (err == -ENODEV)
|
|
|
|
|
err = 0;
|
|
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
|
dev_warn(&adapter->dev, "Client creation failed at 0x%x (%d)\n",
|
|
|
|
|
addr, err);
|
|
|
|
|
return err;
|
2005-07-31 15:20:43 -04:00
|
|
|
|
}
|
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
int i2c_probe(struct i2c_adapter *adapter,
|
|
|
|
|
struct i2c_client_address_data *address_data,
|
|
|
|
|
int (*found_proc) (struct i2c_adapter *, int, int))
|
|
|
|
|
{
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
int i, err;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
int adap_id = i2c_adapter_id(adapter);
|
|
|
|
|
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
/* Force entries are done first, and are not affected by ignore
|
|
|
|
|
entries */
|
|
|
|
|
if (address_data->forces) {
|
|
|
|
|
unsigned short **forces = address_data->forces;
|
|
|
|
|
int kind;
|
|
|
|
|
|
|
|
|
|
for (kind = 0; forces[kind]; kind++) {
|
|
|
|
|
for (i = 0; forces[kind][i] != I2C_CLIENT_END;
|
|
|
|
|
i += 2) {
|
|
|
|
|
if (forces[kind][i] == adap_id
|
|
|
|
|
|| forces[kind][i] == ANY_I2C_BUS) {
|
|
|
|
|
dev_dbg(&adapter->dev, "found force "
|
|
|
|
|
"parameter for adapter %d, "
|
|
|
|
|
"addr 0x%02x, kind %d\n",
|
|
|
|
|
adap_id, forces[kind][i + 1],
|
|
|
|
|
kind);
|
|
|
|
|
err = i2c_probe_address(adapter,
|
|
|
|
|
forces[kind][i + 1],
|
|
|
|
|
kind, found_proc);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
2005-09-25 10:50:06 -04:00
|
|
|
|
/* Stop here if we can't use SMBUS_QUICK */
|
|
|
|
|
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
|
|
|
|
|
if (address_data->probe[0] == I2C_CLIENT_END
|
|
|
|
|
&& address_data->normal_i2c[0] == I2C_CLIENT_END)
|
2006-12-10 15:21:31 -05:00
|
|
|
|
return 0;
|
2005-09-25 10:50:06 -04:00
|
|
|
|
|
|
|
|
|
dev_warn(&adapter->dev, "SMBus Quick command not supported, "
|
|
|
|
|
"can't probe for chips\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
/* Probe entries are done second, and are not affected by ignore
|
|
|
|
|
entries either */
|
|
|
|
|
for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
|
|
|
|
|
if (address_data->probe[i] == adap_id
|
|
|
|
|
|| address_data->probe[i] == ANY_I2C_BUS) {
|
|
|
|
|
dev_dbg(&adapter->dev, "found probe parameter for "
|
|
|
|
|
"adapter %d, addr 0x%02x\n", adap_id,
|
|
|
|
|
address_data->probe[i + 1]);
|
|
|
|
|
err = i2c_probe_address(adapter,
|
|
|
|
|
address_data->probe[i + 1],
|
|
|
|
|
-1, found_proc);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
/* Normal entries are done last, unless shadowed by an ignore entry */
|
|
|
|
|
for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
|
|
|
|
|
int j, ignore;
|
|
|
|
|
|
|
|
|
|
ignore = 0;
|
|
|
|
|
for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
|
|
|
|
|
j += 2) {
|
|
|
|
|
if ((address_data->ignore[j] == adap_id ||
|
|
|
|
|
address_data->ignore[j] == ANY_I2C_BUS)
|
|
|
|
|
&& address_data->ignore[j + 1]
|
|
|
|
|
== address_data->normal_i2c[i]) {
|
|
|
|
|
dev_dbg(&adapter->dev, "found ignore "
|
|
|
|
|
"parameter for adapter %d, "
|
|
|
|
|
"addr 0x%02x\n", adap_id,
|
|
|
|
|
address_data->ignore[j + 1]);
|
2006-07-01 11:01:59 -04:00
|
|
|
|
ignore = 1;
|
|
|
|
|
break;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
if (ignore)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
continue;
|
|
|
|
|
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
|
|
|
|
|
"addr 0x%02x\n", adap_id,
|
|
|
|
|
address_data->normal_i2c[i]);
|
|
|
|
|
err = i2c_probe_address(adapter, address_data->normal_i2c[i],
|
|
|
|
|
-1, found_proc);
|
|
|
|
|
if (err)
|
|
|
|
|
return err;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
[PATCH] I2C: Rewrite i2c_probe
i2c_probe was quite complex and slow, so I rewrote it in a more
efficient and hopefully clearer way.
Note that this slightly changes the way the module parameters are
handled. This shouldn't change anything for the most common cases
though.
For one thing, the function now respects the order of the parameters
for address probing. It used to always do lower addresses first. The
new approach gives the user more control.
For another, ignore addresses don't overrule probe addresses anymore.
This could have been restored the way it was at the cost of a few more
lines of code, but I don't think it's worth it. Both lists are given
as module parameters, so a user would be quite silly to specify the
same addresses in both lists. The normal addresses list is the only
one that isn't controlled by a module parameter, thus is the only one
the user may reasonably want to remove an address from.
Another significant change is the fact that i2c_probe() will no more
stop when a detection function returns -ENODEV. Just because a driver
found a chip it doesn't support isn't a valid reason to stop all
probings for this one driver. This closes the long standing lm_sensors
ticket #1807.
http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1807
I updated the documentation accordingly.
In terms of algorithmic complexity, the new code is way better. If
I is the ignore address count, P the probe address count, N the
normal address count and F the force address count, the old code
was doing 128 * (F + I + P + N) iterations max, while the new code
does F + P + ((I+1) * N) iterations max. For the most common case
where F, I and P are empty, this is down from 128 * N to N.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-08-09 14:17:55 -04:00
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct i2c_adapter* i2c_get_adapter(int id)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_adapter *adapter;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_lock(&core_lists);
|
2005-06-28 00:21:30 -04:00
|
|
|
|
adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
|
|
|
|
|
if (adapter && !try_module_get(adapter->owner))
|
|
|
|
|
adapter = NULL;
|
|
|
|
|
|
2006-01-11 04:50:26 -05:00
|
|
|
|
mutex_unlock(&core_lists);
|
2005-06-28 00:21:30 -04:00
|
|
|
|
return adapter;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void i2c_put_adapter(struct i2c_adapter *adap)
|
|
|
|
|
{
|
|
|
|
|
module_put(adap->owner);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The SMBus parts */
|
|
|
|
|
|
2006-12-10 15:21:31 -05:00
|
|
|
|
#define POLY (0x1070U << 3)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
static u8
|
|
|
|
|
crc8(u16 data)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
for(i = 0; i < 8; i++) {
|
2006-12-10 15:21:31 -05:00
|
|
|
|
if (data & 0x8000)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
data = data ^ POLY;
|
|
|
|
|
data = data << 1;
|
|
|
|
|
}
|
|
|
|
|
return (u8)(data >> 8);
|
|
|
|
|
}
|
|
|
|
|
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
/* Incremental CRC8 over count bytes in the array pointed to by p */
|
|
|
|
|
static u8 i2c_smbus_pec(u8 crc, u8 *p, size_t count)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for(i = 0; i < count; i++)
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
crc = crc8((crc ^ p[i]) << 8);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return crc;
|
|
|
|
|
}
|
|
|
|
|
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
/* Assume a 7-bit address, which is reasonable for SMBus */
|
|
|
|
|
static u8 i2c_smbus_msg_pec(u8 pec, struct i2c_msg *msg)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
/* The address will be sent first */
|
|
|
|
|
u8 addr = (msg->addr << 1) | !!(msg->flags & I2C_M_RD);
|
|
|
|
|
pec = i2c_smbus_pec(pec, &addr, 1);
|
|
|
|
|
|
|
|
|
|
/* The data buffer follows */
|
|
|
|
|
return i2c_smbus_pec(pec, msg->buf, msg->len);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
/* Used for write only transactions */
|
|
|
|
|
static inline void i2c_smbus_add_pec(struct i2c_msg *msg)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
msg->buf[msg->len] = i2c_smbus_msg_pec(0, msg);
|
|
|
|
|
msg->len++;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
/* Return <0 on CRC error
|
|
|
|
|
If there was a write before this read (most cases) we need to take the
|
|
|
|
|
partial CRC from the write part into account.
|
|
|
|
|
Note that this function does modify the message (we need to decrease the
|
|
|
|
|
message length to hide the CRC byte from the caller). */
|
|
|
|
|
static int i2c_smbus_check_pec(u8 cpec, struct i2c_msg *msg)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
u8 rpec = msg->buf[--msg->len];
|
|
|
|
|
cpec = i2c_smbus_msg_pec(cpec, msg);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
if (rpec != cpec) {
|
|
|
|
|
pr_debug("i2c-core: Bad PEC 0x%02x vs. 0x%02x\n",
|
|
|
|
|
rpec, cpec);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2006-12-10 15:21:31 -05:00
|
|
|
|
return 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_write_quick(struct i2c_client *client, u8 value)
|
|
|
|
|
{
|
|
|
|
|
return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
2006-12-10 15:21:31 -05:00
|
|
|
|
value,0,I2C_SMBUS_QUICK,NULL);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_read_byte(struct i2c_client *client)
|
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
|
|
|
|
if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
|
|
|
|
I2C_SMBUS_READ,0,I2C_SMBUS_BYTE, &data))
|
|
|
|
|
return -1;
|
|
|
|
|
else
|
2006-09-03 16:24:00 -04:00
|
|
|
|
return data.byte;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value)
|
|
|
|
|
{
|
|
|
|
|
return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, NULL);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command)
|
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
|
|
|
|
if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
|
|
|
|
I2C_SMBUS_READ,command, I2C_SMBUS_BYTE_DATA,&data))
|
|
|
|
|
return -1;
|
|
|
|
|
else
|
2006-09-03 16:24:00 -04:00
|
|
|
|
return data.byte;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value)
|
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
|
|
|
|
data.byte = value;
|
|
|
|
|
return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
|
|
|
|
I2C_SMBUS_WRITE,command,
|
|
|
|
|
I2C_SMBUS_BYTE_DATA,&data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command)
|
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
|
|
|
|
if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
|
|
|
|
I2C_SMBUS_READ,command, I2C_SMBUS_WORD_DATA, &data))
|
|
|
|
|
return -1;
|
|
|
|
|
else
|
2006-09-03 16:24:00 -04:00
|
|
|
|
return data.word;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
|
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
|
|
|
|
data.word = value;
|
|
|
|
|
return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
|
|
|
|
I2C_SMBUS_WRITE,command,
|
|
|
|
|
I2C_SMBUS_WORD_DATA,&data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
|
2006-06-12 15:42:20 -04:00
|
|
|
|
u8 length, const u8 *values)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
2006-01-18 17:14:55 -05:00
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
if (length > I2C_SMBUS_BLOCK_MAX)
|
|
|
|
|
length = I2C_SMBUS_BLOCK_MAX;
|
|
|
|
|
data.block[0] = length;
|
2006-01-18 17:14:55 -05:00
|
|
|
|
memcpy(&data.block[1], values, length);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
|
|
|
|
I2C_SMBUS_WRITE,command,
|
|
|
|
|
I2C_SMBUS_BLOCK_DATA,&data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns the number of read bytes */
|
|
|
|
|
s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
|
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
2006-01-18 17:14:55 -05:00
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
|
|
|
|
|
I2C_SMBUS_READ,command,
|
|
|
|
|
I2C_SMBUS_I2C_BLOCK_DATA,&data))
|
|
|
|
|
return -1;
|
2006-01-18 17:14:55 -05:00
|
|
|
|
|
|
|
|
|
memcpy(values, &data.block[1], data.block[0]);
|
|
|
|
|
return data.block[0];
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
|
2006-01-08 23:19:18 -05:00
|
|
|
|
s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, u8 command,
|
2006-06-12 15:42:20 -04:00
|
|
|
|
u8 length, const u8 *values)
|
2006-01-08 23:19:18 -05:00
|
|
|
|
{
|
|
|
|
|
union i2c_smbus_data data;
|
|
|
|
|
|
|
|
|
|
if (length > I2C_SMBUS_BLOCK_MAX)
|
|
|
|
|
length = I2C_SMBUS_BLOCK_MAX;
|
|
|
|
|
data.block[0] = length;
|
|
|
|
|
memcpy(data.block + 1, values, length);
|
|
|
|
|
return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
|
|
|
|
|
I2C_SMBUS_WRITE, command,
|
|
|
|
|
I2C_SMBUS_I2C_BLOCK_DATA, &data);
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-10 15:21:31 -05:00
|
|
|
|
/* Simulate a SMBus command using the i2c protocol
|
2005-04-16 18:20:36 -04:00
|
|
|
|
No checking of parameters is done! */
|
2006-12-10 15:21:31 -05:00
|
|
|
|
static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
|
2005-04-16 18:20:36 -04:00
|
|
|
|
unsigned short flags,
|
2006-12-10 15:21:31 -05:00
|
|
|
|
char read_write, u8 command, int size,
|
2005-04-16 18:20:36 -04:00
|
|
|
|
union i2c_smbus_data * data)
|
|
|
|
|
{
|
|
|
|
|
/* So we need to generate a series of msgs. In the case of writing, we
|
|
|
|
|
need to use only one message; when reading, we need two. We initialize
|
|
|
|
|
most things with sane defaults, to keep the code below somewhat
|
|
|
|
|
simpler. */
|
2005-09-25 11:01:11 -04:00
|
|
|
|
unsigned char msgbuf0[I2C_SMBUS_BLOCK_MAX+3];
|
|
|
|
|
unsigned char msgbuf1[I2C_SMBUS_BLOCK_MAX+2];
|
2005-04-16 18:20:36 -04:00
|
|
|
|
int num = read_write == I2C_SMBUS_READ?2:1;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
struct i2c_msg msg[2] = { { addr, flags, 1, msgbuf0 },
|
2005-04-16 18:20:36 -04:00
|
|
|
|
{ addr, flags | I2C_M_RD, 0, msgbuf1 }
|
|
|
|
|
};
|
|
|
|
|
int i;
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
u8 partial_pec = 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
msgbuf0[0] = command;
|
|
|
|
|
switch(size) {
|
|
|
|
|
case I2C_SMBUS_QUICK:
|
|
|
|
|
msg[0].len = 0;
|
|
|
|
|
/* Special case: The read/write field is used as data */
|
|
|
|
|
msg[0].flags = flags | (read_write==I2C_SMBUS_READ)?I2C_M_RD:0;
|
|
|
|
|
num = 1;
|
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_BYTE:
|
|
|
|
|
if (read_write == I2C_SMBUS_READ) {
|
|
|
|
|
/* Special case: only a read! */
|
|
|
|
|
msg[0].flags = I2C_M_RD | flags;
|
|
|
|
|
num = 1;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_BYTE_DATA:
|
|
|
|
|
if (read_write == I2C_SMBUS_READ)
|
|
|
|
|
msg[1].len = 1;
|
|
|
|
|
else {
|
|
|
|
|
msg[0].len = 2;
|
|
|
|
|
msgbuf0[1] = data->byte;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_WORD_DATA:
|
|
|
|
|
if (read_write == I2C_SMBUS_READ)
|
|
|
|
|
msg[1].len = 2;
|
|
|
|
|
else {
|
|
|
|
|
msg[0].len=3;
|
|
|
|
|
msgbuf0[1] = data->word & 0xff;
|
2006-09-03 16:24:00 -04:00
|
|
|
|
msgbuf0[2] = data->word >> 8;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_PROC_CALL:
|
|
|
|
|
num = 2; /* Special case */
|
|
|
|
|
read_write = I2C_SMBUS_READ;
|
|
|
|
|
msg[0].len = 3;
|
|
|
|
|
msg[1].len = 2;
|
|
|
|
|
msgbuf0[1] = data->word & 0xff;
|
2006-09-03 16:24:00 -04:00
|
|
|
|
msgbuf0[2] = data->word >> 8;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_BLOCK_DATA:
|
|
|
|
|
if (read_write == I2C_SMBUS_READ) {
|
|
|
|
|
dev_err(&adapter->dev, "Block read not supported "
|
|
|
|
|
"under I2C emulation!\n");
|
|
|
|
|
return -1;
|
|
|
|
|
} else {
|
|
|
|
|
msg[0].len = data->block[0] + 2;
|
|
|
|
|
if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 2) {
|
|
|
|
|
dev_err(&adapter->dev, "smbus_access called with "
|
|
|
|
|
"invalid block write size (%d)\n",
|
|
|
|
|
data->block[0]);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-09-25 11:01:11 -04:00
|
|
|
|
for (i = 1; i < msg[0].len; i++)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
msgbuf0[i] = data->block[i-1];
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_BLOCK_PROC_CALL:
|
|
|
|
|
dev_dbg(&adapter->dev, "Block process call not supported "
|
|
|
|
|
"under I2C emulation!\n");
|
|
|
|
|
return -1;
|
|
|
|
|
case I2C_SMBUS_I2C_BLOCK_DATA:
|
|
|
|
|
if (read_write == I2C_SMBUS_READ) {
|
2005-10-07 18:15:59 -04:00
|
|
|
|
msg[1].len = I2C_SMBUS_BLOCK_MAX;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
} else {
|
|
|
|
|
msg[0].len = data->block[0] + 1;
|
2005-10-07 18:15:59 -04:00
|
|
|
|
if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 1) {
|
2005-04-16 18:20:36 -04:00
|
|
|
|
dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "
|
|
|
|
|
"invalid block write size (%d)\n",
|
|
|
|
|
data->block[0]);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
for (i = 1; i <= data->block[0]; i++)
|
|
|
|
|
msgbuf0[i] = data->block[i];
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
dev_err(&adapter->dev, "smbus_access called with invalid size (%d)\n",
|
|
|
|
|
size);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
i = ((flags & I2C_CLIENT_PEC) && size != I2C_SMBUS_QUICK
|
|
|
|
|
&& size != I2C_SMBUS_I2C_BLOCK_DATA);
|
|
|
|
|
if (i) {
|
|
|
|
|
/* Compute PEC if first message is a write */
|
|
|
|
|
if (!(msg[0].flags & I2C_M_RD)) {
|
2006-12-10 15:21:31 -05:00
|
|
|
|
if (num == 1) /* Write only */
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
i2c_smbus_add_pec(&msg[0]);
|
|
|
|
|
else /* Write followed by read */
|
|
|
|
|
partial_pec = i2c_smbus_msg_pec(0, &msg[0]);
|
|
|
|
|
}
|
|
|
|
|
/* Ask for PEC if last message is a read */
|
|
|
|
|
if (msg[num-1].flags & I2C_M_RD)
|
2006-12-10 15:21:31 -05:00
|
|
|
|
msg[num-1].len++;
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
}
|
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
if (i2c_transfer(adapter, msg, num) < 0)
|
|
|
|
|
return -1;
|
|
|
|
|
|
[PATCH] i2c: SMBus PEC support rewrite, 2 of 3
This is my rewrite of the SMBus PEC support. The original
implementation was known to have bugs (credits go to Hideki Iwamoto
for reporting many of them recently), and was incomplete due to a
conceptual limitation.
The rewrite affects only software PEC. Hardware PEC needs very little
code and is mostly untouched.
Technically, both implementations differ in that the original one
was emulating PEC in software by modifying the contents of an
i2c_smbus_data union (changing the transaction to a different type),
while the new one works one level lower, on i2c_msg structures (working
on message contents). Due to the definition of the i2c_smbus_data union,
not all SMBus transactions could be handled (at least not without
changing the definition of this union, which would break user-space
compatibility), and those which could had to be implemented
individually. At the opposite, adding PEC to an i2c_msg structure
can be done on any SMBus transaction with common code.
Advantages of the new implementation:
* It's about twice as small (from ~136 lines before to ~70 now, only
counting i2c-core, including blank and comment lines). The memory
used by i2c-core is down by ~640 bytes (~3.5%).
* Easier to validate, less tricky code. The code being common to all
transactions by design, the risk that a bug can stay uncovered is
lower.
* All SMBus transactions have PEC support in I2C emulation mode
(providing the non-PEC transaction is also implemented). Transactions
which have no emulation code right now will get PEC support for free
when they finally get implemented.
* Allows for code simplifications in header files and bus drivers
(patch follows).
Drawbacks (I guess there had to be at least one):
* PEC emulation for non-PEC capable non-I2C SMBus masters was dropped.
It was based on SMBus tricks and doesn't quite fit in the new design.
I don't think it's really a problem, as the benefit was certainly
not worth the additional complexity, but it's only fair that I at
least mention it.
Lastly, let's note that the new implementation does slightly affect
compatibility (both in kernel and user-space), but doesn't actually
break it. Some defines will be dropped, but the code can always be
changed in a way that will work with both the old and the new
implementations. It shouldn't be a problem as there doesn't seem to be
many users of SMBus PEC to date anyway.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-10-26 15:28:55 -04:00
|
|
|
|
/* Check PEC if last message is a read */
|
|
|
|
|
if (i && (msg[num-1].flags & I2C_M_RD)) {
|
|
|
|
|
if (i2c_smbus_check_pec(partial_pec, &msg[num-1]) < 0)
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
if (read_write == I2C_SMBUS_READ)
|
|
|
|
|
switch(size) {
|
|
|
|
|
case I2C_SMBUS_BYTE:
|
|
|
|
|
data->byte = msgbuf0[0];
|
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_BYTE_DATA:
|
|
|
|
|
data->byte = msgbuf1[0];
|
|
|
|
|
break;
|
2006-12-10 15:21:31 -05:00
|
|
|
|
case I2C_SMBUS_WORD_DATA:
|
2005-04-16 18:20:36 -04:00
|
|
|
|
case I2C_SMBUS_PROC_CALL:
|
|
|
|
|
data->word = msgbuf1[0] | (msgbuf1[1] << 8);
|
|
|
|
|
break;
|
|
|
|
|
case I2C_SMBUS_I2C_BLOCK_DATA:
|
|
|
|
|
/* fixed at 32 for now */
|
2005-10-07 18:15:59 -04:00
|
|
|
|
data->block[0] = I2C_SMBUS_BLOCK_MAX;
|
|
|
|
|
for (i = 0; i < I2C_SMBUS_BLOCK_MAX; i++)
|
2005-04-16 18:20:36 -04:00
|
|
|
|
data->block[i+1] = msgbuf1[i];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
|
2006-12-10 15:21:31 -05:00
|
|
|
|
char read_write, u8 command, int size,
|
2005-04-16 18:20:36 -04:00
|
|
|
|
union i2c_smbus_data * data)
|
|
|
|
|
{
|
|
|
|
|
s32 res;
|
|
|
|
|
|
|
|
|
|
flags &= I2C_M_TEN | I2C_CLIENT_PEC;
|
|
|
|
|
|
|
|
|
|
if (adapter->algo->smbus_xfer) {
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_lock(&adapter->bus_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
res = adapter->algo->smbus_xfer(adapter,addr,flags,read_write,
|
|
|
|
|
command,size,data);
|
2006-01-18 17:16:04 -05:00
|
|
|
|
mutex_unlock(&adapter->bus_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
} else
|
|
|
|
|
res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,
|
|
|
|
|
command,size,data);
|
|
|
|
|
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-07-20 17:03:50 -04:00
|
|
|
|
/* Next four are needed by i2c-isa */
|
|
|
|
|
EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
|
|
|
|
|
EXPORT_SYMBOL_GPL(i2c_adapter_driver);
|
|
|
|
|
EXPORT_SYMBOL_GPL(i2c_adapter_class);
|
|
|
|
|
EXPORT_SYMBOL_GPL(i2c_bus_type);
|
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
|
EXPORT_SYMBOL(i2c_add_adapter);
|
|
|
|
|
EXPORT_SYMBOL(i2c_del_adapter);
|
|
|
|
|
EXPORT_SYMBOL(i2c_del_driver);
|
|
|
|
|
EXPORT_SYMBOL(i2c_attach_client);
|
|
|
|
|
EXPORT_SYMBOL(i2c_detach_client);
|
|
|
|
|
EXPORT_SYMBOL(i2c_use_client);
|
|
|
|
|
EXPORT_SYMBOL(i2c_release_client);
|
|
|
|
|
EXPORT_SYMBOL(i2c_clients_command);
|
|
|
|
|
EXPORT_SYMBOL(i2c_check_addr);
|
|
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(i2c_master_send);
|
|
|
|
|
EXPORT_SYMBOL(i2c_master_recv);
|
|
|
|
|
EXPORT_SYMBOL(i2c_control);
|
|
|
|
|
EXPORT_SYMBOL(i2c_transfer);
|
|
|
|
|
EXPORT_SYMBOL(i2c_get_adapter);
|
|
|
|
|
EXPORT_SYMBOL(i2c_put_adapter);
|
|
|
|
|
EXPORT_SYMBOL(i2c_probe);
|
|
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_xfer);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_write_quick);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_read_byte);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_write_byte);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_read_byte_data);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_write_byte_data);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_read_word_data);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_write_word_data);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_write_block_data);
|
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
|
2006-01-08 23:19:18 -05:00
|
|
|
|
EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
|
|
|
|
|
MODULE_DESCRIPTION("I2C-Bus main module");
|
|
|
|
|
MODULE_LICENSE("GPL");
|