2005-04-17 00:20:36 +02:00
|
|
|
/*
|
2007-11-12 18:38:51 +01:00
|
|
|
* Driver for the i2c controller on the Marvell line of host bridges
|
|
|
|
* (e.g, gt642[46]0, mv643[46]0, mv644[46]0, and Orion SoC family).
|
2005-04-17 00:20:36 +02:00
|
|
|
*
|
|
|
|
* Author: Mark A. Greer <mgreer@mvista.com>
|
|
|
|
*
|
|
|
|
* 2005 (c) MontaVista, Software, Inc. This file is licensed under
|
|
|
|
* the terms of the GNU General Public License version 2. This program
|
|
|
|
* is licensed "as is" without any warranty of any kind, whether express
|
|
|
|
* or implied.
|
|
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/i2c.h>
|
|
|
|
#include <linux/interrupt.h>
|
2007-11-12 18:38:51 +01:00
|
|
|
#include <linux/mv643xx_i2c.h>
|
2005-10-29 20:07:23 +02:00
|
|
|
#include <linux/platform_device.h>
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <asm/io.h>
|
|
|
|
|
|
|
|
/* Register defines */
|
|
|
|
#define MV64XXX_I2C_REG_SLAVE_ADDR 0x00
|
|
|
|
#define MV64XXX_I2C_REG_DATA 0x04
|
|
|
|
#define MV64XXX_I2C_REG_CONTROL 0x08
|
|
|
|
#define MV64XXX_I2C_REG_STATUS 0x0c
|
|
|
|
#define MV64XXX_I2C_REG_BAUD 0x0c
|
|
|
|
#define MV64XXX_I2C_REG_EXT_SLAVE_ADDR 0x10
|
|
|
|
#define MV64XXX_I2C_REG_SOFT_RESET 0x1c
|
|
|
|
|
|
|
|
#define MV64XXX_I2C_REG_CONTROL_ACK 0x00000004
|
|
|
|
#define MV64XXX_I2C_REG_CONTROL_IFLG 0x00000008
|
|
|
|
#define MV64XXX_I2C_REG_CONTROL_STOP 0x00000010
|
|
|
|
#define MV64XXX_I2C_REG_CONTROL_START 0x00000020
|
|
|
|
#define MV64XXX_I2C_REG_CONTROL_TWSIEN 0x00000040
|
|
|
|
#define MV64XXX_I2C_REG_CONTROL_INTEN 0x00000080
|
|
|
|
|
|
|
|
/* Ctlr status values */
|
|
|
|
#define MV64XXX_I2C_STATUS_BUS_ERR 0x00
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_START 0x08
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_REPEAT_START 0x10
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_WR_ADDR_ACK 0x18
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_WR_ADDR_NO_ACK 0x20
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_WR_ACK 0x28
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_WR_NO_ACK 0x30
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_LOST_ARB 0x38
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_RD_ADDR_ACK 0x40
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_RD_ADDR_NO_ACK 0x48
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_RD_DATA_ACK 0x50
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_RD_DATA_NO_ACK 0x58
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_WR_ADDR_2_ACK 0xd0
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_WR_ADDR_2_NO_ACK 0xd8
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_RD_ADDR_2_ACK 0xe0
|
|
|
|
#define MV64XXX_I2C_STATUS_MAST_RD_ADDR_2_NO_ACK 0xe8
|
|
|
|
#define MV64XXX_I2C_STATUS_NO_STATUS 0xf8
|
|
|
|
|
|
|
|
/* Driver states */
|
|
|
|
enum {
|
|
|
|
MV64XXX_I2C_STATE_INVALID,
|
|
|
|
MV64XXX_I2C_STATE_IDLE,
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_START_COND,
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_ADDR_1_ACK,
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK,
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK,
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Driver actions */
|
|
|
|
enum {
|
|
|
|
MV64XXX_I2C_ACTION_INVALID,
|
|
|
|
MV64XXX_I2C_ACTION_CONTINUE,
|
|
|
|
MV64XXX_I2C_ACTION_SEND_START,
|
|
|
|
MV64XXX_I2C_ACTION_SEND_ADDR_1,
|
|
|
|
MV64XXX_I2C_ACTION_SEND_ADDR_2,
|
|
|
|
MV64XXX_I2C_ACTION_SEND_DATA,
|
|
|
|
MV64XXX_I2C_ACTION_RCV_DATA,
|
|
|
|
MV64XXX_I2C_ACTION_RCV_DATA_STOP,
|
|
|
|
MV64XXX_I2C_ACTION_SEND_STOP,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct mv64xxx_i2c_data {
|
|
|
|
int irq;
|
|
|
|
u32 state;
|
|
|
|
u32 action;
|
2005-12-18 17:22:01 +01:00
|
|
|
u32 aborting;
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 cntl_bits;
|
|
|
|
void __iomem *reg_base;
|
|
|
|
u32 reg_base_p;
|
2007-11-12 18:38:51 +01:00
|
|
|
u32 reg_size;
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 addr1;
|
|
|
|
u32 addr2;
|
|
|
|
u32 bytes_left;
|
|
|
|
u32 byte_posn;
|
|
|
|
u32 block;
|
|
|
|
int rc;
|
|
|
|
u32 freq_m;
|
|
|
|
u32 freq_n;
|
|
|
|
wait_queue_head_t waitq;
|
|
|
|
spinlock_t lock;
|
|
|
|
struct i2c_msg *msg;
|
|
|
|
struct i2c_adapter adapter;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
*
|
|
|
|
* Finite State Machine & Interrupt Routines
|
|
|
|
*
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
2007-08-14 18:37:14 +02:00
|
|
|
|
|
|
|
/* Reset hardware and initialize FSM */
|
|
|
|
static void
|
|
|
|
mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data)
|
|
|
|
{
|
|
|
|
writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SOFT_RESET);
|
|
|
|
writel((((drv_data->freq_m & 0xf) << 3) | (drv_data->freq_n & 0x7)),
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_BAUD);
|
|
|
|
writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SLAVE_ADDR);
|
|
|
|
writel(0, drv_data->reg_base + MV64XXX_I2C_REG_EXT_SLAVE_ADDR);
|
|
|
|
writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_IDLE;
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
static void
|
|
|
|
mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* If state is idle, then this is likely the remnants of an old
|
|
|
|
* operation that driver has given up on or the user has killed.
|
|
|
|
* If so, issue the stop condition and go to idle.
|
|
|
|
*/
|
|
|
|
if (drv_data->state == MV64XXX_I2C_STATE_IDLE) {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The status from the ctlr [mostly] tells us what to do next */
|
|
|
|
switch (status) {
|
|
|
|
/* Start condition interrupt */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_START: /* 0x08 */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_REPEAT_START: /* 0x10 */
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_ADDR_1;
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_ADDR_1_ACK;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Performing a write */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_WR_ADDR_ACK: /* 0x18 */
|
|
|
|
if (drv_data->msg->flags & I2C_M_TEN) {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_ADDR_2;
|
|
|
|
drv_data->state =
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHRU */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_WR_ADDR_2_ACK: /* 0xd0 */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_WR_ACK: /* 0x28 */
|
2005-12-18 17:22:01 +01:00
|
|
|
if ((drv_data->bytes_left == 0)
|
|
|
|
|| (drv_data->aborting
|
|
|
|
&& (drv_data->byte_posn != 0))) {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP;
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_IDLE;
|
|
|
|
} else {
|
2005-04-17 00:20:36 +02:00
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_DATA;
|
|
|
|
drv_data->state =
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK;
|
|
|
|
drv_data->bytes_left--;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Performing a read */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_RD_ADDR_ACK: /* 40 */
|
|
|
|
if (drv_data->msg->flags & I2C_M_TEN) {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_ADDR_2;
|
|
|
|
drv_data->state =
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHRU */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_RD_ADDR_2_ACK: /* 0xe0 */
|
|
|
|
if (drv_data->bytes_left == 0) {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP;
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_IDLE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* FALLTHRU */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_RD_DATA_ACK: /* 0x50 */
|
|
|
|
if (status != MV64XXX_I2C_STATUS_MAST_RD_DATA_ACK)
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_CONTINUE;
|
|
|
|
else {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_RCV_DATA;
|
|
|
|
drv_data->bytes_left--;
|
|
|
|
}
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA;
|
|
|
|
|
2005-12-18 17:22:01 +01:00
|
|
|
if ((drv_data->bytes_left == 1) || drv_data->aborting)
|
2005-04-17 00:20:36 +02:00
|
|
|
drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_ACK;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_RD_DATA_NO_ACK: /* 0x58 */
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_RCV_DATA_STOP;
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_IDLE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_WR_ADDR_NO_ACK: /* 0x20 */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_WR_NO_ACK: /* 30 */
|
|
|
|
case MV64XXX_I2C_STATUS_MAST_RD_ADDR_NO_ACK: /* 48 */
|
|
|
|
/* Doesn't seem to be a device at other end */
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP;
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_IDLE;
|
|
|
|
drv_data->rc = -ENODEV;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
dev_err(&drv_data->adapter.dev,
|
|
|
|
"mv64xxx_i2c_fsm: Ctlr Error -- state: 0x%x, "
|
|
|
|
"status: 0x%x, addr: 0x%x, flags: 0x%x\n",
|
|
|
|
drv_data->state, status, drv_data->msg->addr,
|
|
|
|
drv_data->msg->flags);
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP;
|
2007-08-14 18:37:14 +02:00
|
|
|
mv64xxx_i2c_hw_init(drv_data);
|
2005-04-17 00:20:36 +02:00
|
|
|
drv_data->rc = -EIO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
|
|
|
|
{
|
|
|
|
switch(drv_data->action) {
|
|
|
|
case MV64XXX_I2C_ACTION_CONTINUE:
|
|
|
|
writel(drv_data->cntl_bits,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_ACTION_SEND_START:
|
|
|
|
writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_ACTION_SEND_ADDR_1:
|
|
|
|
writel(drv_data->addr1,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_DATA);
|
|
|
|
writel(drv_data->cntl_bits,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_ACTION_SEND_ADDR_2:
|
|
|
|
writel(drv_data->addr2,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_DATA);
|
|
|
|
writel(drv_data->cntl_bits,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_ACTION_SEND_DATA:
|
|
|
|
writel(drv_data->msg->buf[drv_data->byte_posn++],
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_DATA);
|
|
|
|
writel(drv_data->cntl_bits,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_ACTION_RCV_DATA:
|
|
|
|
drv_data->msg->buf[drv_data->byte_posn++] =
|
|
|
|
readl(drv_data->reg_base + MV64XXX_I2C_REG_DATA);
|
|
|
|
writel(drv_data->cntl_bits,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_ACTION_RCV_DATA_STOP:
|
|
|
|
drv_data->msg->buf[drv_data->byte_posn++] =
|
|
|
|
readl(drv_data->reg_base + MV64XXX_I2C_REG_DATA);
|
|
|
|
drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
|
|
|
|
writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
drv_data->block = 0;
|
|
|
|
wake_up_interruptible(&drv_data->waitq);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MV64XXX_I2C_ACTION_INVALID:
|
|
|
|
default:
|
|
|
|
dev_err(&drv_data->adapter.dev,
|
|
|
|
"mv64xxx_i2c_do_action: Invalid action: %d\n",
|
|
|
|
drv_data->action);
|
|
|
|
drv_data->rc = -EIO;
|
|
|
|
/* FALLTHRU */
|
|
|
|
case MV64XXX_I2C_ACTION_SEND_STOP:
|
|
|
|
drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN;
|
|
|
|
writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
|
|
|
|
drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);
|
|
|
|
drv_data->block = 0;
|
|
|
|
wake_up_interruptible(&drv_data->waitq);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-07 12:00:13 +02:00
|
|
|
static irqreturn_t
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:55:46 +02:00
|
|
|
mv64xxx_i2c_intr(int irq, void *dev_id)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct mv64xxx_i2c_data *drv_data = dev_id;
|
|
|
|
unsigned long flags;
|
|
|
|
u32 status;
|
2009-09-07 12:00:13 +02:00
|
|
|
irqreturn_t rc = IRQ_NONE;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
spin_lock_irqsave(&drv_data->lock, flags);
|
|
|
|
while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) &
|
|
|
|
MV64XXX_I2C_REG_CONTROL_IFLG) {
|
|
|
|
status = readl(drv_data->reg_base + MV64XXX_I2C_REG_STATUS);
|
|
|
|
mv64xxx_i2c_fsm(drv_data, status);
|
|
|
|
mv64xxx_i2c_do_action(drv_data);
|
|
|
|
rc = IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&drv_data->lock, flags);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
*
|
|
|
|
* I2C Msg Execution Routines
|
|
|
|
*
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
|
|
|
|
struct i2c_msg *msg)
|
|
|
|
{
|
|
|
|
u32 dir = 0;
|
|
|
|
|
|
|
|
drv_data->msg = msg;
|
|
|
|
drv_data->byte_posn = 0;
|
|
|
|
drv_data->bytes_left = msg->len;
|
2005-12-18 17:22:01 +01:00
|
|
|
drv_data->aborting = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
drv_data->rc = 0;
|
|
|
|
drv_data->cntl_bits = MV64XXX_I2C_REG_CONTROL_ACK |
|
|
|
|
MV64XXX_I2C_REG_CONTROL_INTEN | MV64XXX_I2C_REG_CONTROL_TWSIEN;
|
|
|
|
|
|
|
|
if (msg->flags & I2C_M_RD)
|
|
|
|
dir = 1;
|
|
|
|
|
|
|
|
if (msg->flags & I2C_M_TEN) {
|
|
|
|
drv_data->addr1 = 0xf0 | (((u32)msg->addr & 0x300) >> 7) | dir;
|
|
|
|
drv_data->addr2 = (u32)msg->addr & 0xff;
|
|
|
|
} else {
|
|
|
|
drv_data->addr1 = ((u32)msg->addr & 0x7f) << 1 | dir;
|
|
|
|
drv_data->addr2 = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data)
|
|
|
|
{
|
|
|
|
long time_left;
|
|
|
|
unsigned long flags;
|
|
|
|
char abort = 0;
|
|
|
|
|
|
|
|
time_left = wait_event_interruptible_timeout(drv_data->waitq,
|
2009-03-28 21:34:43 +01:00
|
|
|
!drv_data->block, drv_data->adapter.timeout);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
spin_lock_irqsave(&drv_data->lock, flags);
|
|
|
|
if (!time_left) { /* Timed out */
|
|
|
|
drv_data->rc = -ETIMEDOUT;
|
|
|
|
abort = 1;
|
|
|
|
} else if (time_left < 0) { /* Interrupted/Error */
|
|
|
|
drv_data->rc = time_left; /* errno value */
|
|
|
|
abort = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (abort && drv_data->block) {
|
2005-12-18 17:22:01 +01:00
|
|
|
drv_data->aborting = 1;
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock_irqrestore(&drv_data->lock, flags);
|
|
|
|
|
|
|
|
time_left = wait_event_timeout(drv_data->waitq,
|
2009-03-28 21:34:43 +01:00
|
|
|
!drv_data->block, drv_data->adapter.timeout);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-12-18 17:22:01 +01:00
|
|
|
if ((time_left <= 0) && drv_data->block) {
|
2005-04-17 00:20:36 +02:00
|
|
|
drv_data->state = MV64XXX_I2C_STATE_IDLE;
|
|
|
|
dev_err(&drv_data->adapter.dev,
|
2005-12-18 17:22:01 +01:00
|
|
|
"mv64xxx: I2C bus locked, block: %d, "
|
|
|
|
"time_left: %d\n", drv_data->block,
|
|
|
|
(int)time_left);
|
2007-08-14 18:37:14 +02:00
|
|
|
mv64xxx_i2c_hw_init(drv_data);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
} else
|
|
|
|
spin_unlock_irqrestore(&drv_data->lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
mv64xxx_i2c_execute_msg(struct mv64xxx_i2c_data *drv_data, struct i2c_msg *msg)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&drv_data->lock, flags);
|
|
|
|
mv64xxx_i2c_prepare_for_io(drv_data, msg);
|
|
|
|
|
|
|
|
if (unlikely(msg->flags & I2C_M_NOSTART)) { /* Skip start/addr phases */
|
|
|
|
if (drv_data->msg->flags & I2C_M_RD) {
|
|
|
|
/* No action to do, wait for slave to send a byte */
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_CONTINUE;
|
|
|
|
drv_data->state =
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA;
|
|
|
|
} else {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_DATA;
|
|
|
|
drv_data->state =
|
|
|
|
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK;
|
|
|
|
drv_data->bytes_left--;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
drv_data->action = MV64XXX_I2C_ACTION_SEND_START;
|
|
|
|
drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_START_COND;
|
|
|
|
}
|
|
|
|
|
|
|
|
drv_data->block = 1;
|
|
|
|
mv64xxx_i2c_do_action(drv_data);
|
|
|
|
spin_unlock_irqrestore(&drv_data->lock, flags);
|
|
|
|
|
|
|
|
mv64xxx_i2c_wait_for_completion(drv_data);
|
|
|
|
return drv_data->rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
*
|
|
|
|
* I2C Core Support Routines (Interface to higher level I2C code)
|
|
|
|
*
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
static u32
|
|
|
|
mv64xxx_i2c_functionality(struct i2c_adapter *adap)
|
|
|
|
{
|
|
|
|
return I2C_FUNC_I2C | I2C_FUNC_10BIT_ADDR | I2C_FUNC_SMBUS_EMUL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
|
|
|
|
{
|
|
|
|
struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
|
2005-09-02 21:25:47 +02:00
|
|
|
int i, rc;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
for (i=0; i<num; i++)
|
2005-09-02 21:25:47 +02:00
|
|
|
if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) < 0)
|
|
|
|
return rc;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-09-02 21:25:47 +02:00
|
|
|
return num;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2006-09-03 22:39:46 +02:00
|
|
|
static const struct i2c_algorithm mv64xxx_i2c_algo = {
|
2005-04-17 00:20:36 +02:00
|
|
|
.master_xfer = mv64xxx_i2c_xfer,
|
|
|
|
.functionality = mv64xxx_i2c_functionality,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
*****************************************************************************
|
|
|
|
*
|
|
|
|
* Driver Interface & Early Init Routines
|
|
|
|
*
|
|
|
|
*****************************************************************************
|
|
|
|
*/
|
|
|
|
static int __devinit
|
|
|
|
mv64xxx_i2c_map_regs(struct platform_device *pd,
|
|
|
|
struct mv64xxx_i2c_data *drv_data)
|
|
|
|
{
|
2007-11-12 18:38:51 +01:00
|
|
|
int size;
|
|
|
|
struct resource *r = platform_get_resource(pd, IORESOURCE_MEM, 0);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-11-12 18:38:51 +01:00
|
|
|
if (!r)
|
|
|
|
return -ENODEV;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-06-14 00:20:36 +02:00
|
|
|
size = resource_size(r);
|
2007-11-12 18:38:51 +01:00
|
|
|
|
|
|
|
if (!request_mem_region(r->start, size, drv_data->adapter.name))
|
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
drv_data->reg_base = ioremap(r->start, size);
|
|
|
|
drv_data->reg_base_p = r->start;
|
|
|
|
drv_data->reg_size = size;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-03-03 14:43:47 +01:00
|
|
|
static void
|
2005-04-17 00:20:36 +02:00
|
|
|
mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data)
|
|
|
|
{
|
|
|
|
if (drv_data->reg_base) {
|
|
|
|
iounmap(drv_data->reg_base);
|
2007-11-12 18:38:51 +01:00
|
|
|
release_mem_region(drv_data->reg_base_p, drv_data->reg_size);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
drv_data->reg_base = NULL;
|
|
|
|
drv_data->reg_base_p = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __devinit
|
2005-11-09 23:32:44 +01:00
|
|
|
mv64xxx_i2c_probe(struct platform_device *pd)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct mv64xxx_i2c_data *drv_data;
|
2005-11-09 23:32:44 +01:00
|
|
|
struct mv64xxx_i2c_pdata *pdata = pd->dev.platform_data;
|
2005-04-17 00:20:36 +02:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
if ((pd->id != 0) || !pdata)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2005-10-17 23:09:43 +02:00
|
|
|
drv_data = kzalloc(sizeof(struct mv64xxx_i2c_data), GFP_KERNEL);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!drv_data)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (mv64xxx_i2c_map_regs(pd, drv_data)) {
|
|
|
|
rc = -ENODEV;
|
|
|
|
goto exit_kfree;
|
|
|
|
}
|
|
|
|
|
2005-12-18 17:22:01 +01:00
|
|
|
strlcpy(drv_data->adapter.name, MV64XXX_I2C_CTLR_NAME " adapter",
|
2007-05-01 23:26:28 +02:00
|
|
|
sizeof(drv_data->adapter.name));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
init_waitqueue_head(&drv_data->waitq);
|
|
|
|
spin_lock_init(&drv_data->lock);
|
|
|
|
|
|
|
|
drv_data->freq_m = pdata->freq_m;
|
|
|
|
drv_data->freq_n = pdata->freq_n;
|
|
|
|
drv_data->irq = platform_get_irq(pd, 0);
|
2006-01-19 18:56:29 +01:00
|
|
|
if (drv_data->irq < 0) {
|
|
|
|
rc = -ENXIO;
|
|
|
|
goto exit_unmap_regs;
|
|
|
|
}
|
2007-02-13 22:09:03 +01:00
|
|
|
drv_data->adapter.dev.parent = &pd->dev;
|
2005-04-17 00:20:36 +02:00
|
|
|
drv_data->adapter.algo = &mv64xxx_i2c_algo;
|
|
|
|
drv_data->adapter.owner = THIS_MODULE;
|
2008-07-14 22:38:29 +02:00
|
|
|
drv_data->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
|
2009-03-28 21:34:43 +01:00
|
|
|
drv_data->adapter.timeout = msecs_to_jiffies(pdata->timeout);
|
2007-07-12 14:12:29 +02:00
|
|
|
drv_data->adapter.nr = pd->id;
|
2005-11-09 23:32:44 +01:00
|
|
|
platform_set_drvdata(pd, drv_data);
|
2005-04-17 00:20:36 +02:00
|
|
|
i2c_set_adapdata(&drv_data->adapter, drv_data);
|
|
|
|
|
2007-01-05 17:54:05 +01:00
|
|
|
mv64xxx_i2c_hw_init(drv_data);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,
|
2005-12-16 20:08:43 +01:00
|
|
|
MV64XXX_I2C_CTLR_NAME, drv_data)) {
|
|
|
|
dev_err(&drv_data->adapter.dev,
|
|
|
|
"mv64xxx: Can't register intr handler irq: %d\n",
|
|
|
|
drv_data->irq);
|
2005-04-17 00:20:36 +02:00
|
|
|
rc = -EINVAL;
|
|
|
|
goto exit_unmap_regs;
|
2007-07-12 14:12:29 +02:00
|
|
|
} else if ((rc = i2c_add_numbered_adapter(&drv_data->adapter)) != 0) {
|
2005-12-16 20:08:43 +01:00
|
|
|
dev_err(&drv_data->adapter.dev,
|
|
|
|
"mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
|
2005-04-17 00:20:36 +02:00
|
|
|
goto exit_free_irq;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
exit_free_irq:
|
|
|
|
free_irq(drv_data->irq, drv_data);
|
|
|
|
exit_unmap_regs:
|
|
|
|
mv64xxx_i2c_unmap_regs(drv_data);
|
|
|
|
exit_kfree:
|
|
|
|
kfree(drv_data);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __devexit
|
2005-11-09 23:32:44 +01:00
|
|
|
mv64xxx_i2c_remove(struct platform_device *dev)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2005-11-09 23:32:44 +01:00
|
|
|
struct mv64xxx_i2c_data *drv_data = platform_get_drvdata(dev);
|
2005-04-17 00:20:36 +02:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = i2c_del_adapter(&drv_data->adapter);
|
|
|
|
free_irq(drv_data->irq, drv_data);
|
|
|
|
mv64xxx_i2c_unmap_regs(drv_data);
|
|
|
|
kfree(drv_data);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-11-09 23:32:44 +01:00
|
|
|
static struct platform_driver mv64xxx_i2c_driver = {
|
2005-04-17 00:20:36 +02:00
|
|
|
.probe = mv64xxx_i2c_probe,
|
2009-03-03 14:43:47 +01:00
|
|
|
.remove = __devexit_p(mv64xxx_i2c_remove),
|
2005-11-09 23:32:44 +01:00
|
|
|
.driver = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.name = MV64XXX_I2C_CTLR_NAME,
|
|
|
|
},
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
static int __init
|
|
|
|
mv64xxx_i2c_init(void)
|
|
|
|
{
|
2005-11-09 23:32:44 +01:00
|
|
|
return platform_driver_register(&mv64xxx_i2c_driver);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit
|
|
|
|
mv64xxx_i2c_exit(void)
|
|
|
|
{
|
2005-11-09 23:32:44 +01:00
|
|
|
platform_driver_unregister(&mv64xxx_i2c_driver);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
module_init(mv64xxx_i2c_init);
|
|
|
|
module_exit(mv64xxx_i2c_exit);
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Mark A. Greer <mgreer@mvista.com>");
|
|
|
|
MODULE_DESCRIPTION("Marvell mv64xxx host bridge i2c ctlr driver");
|
|
|
|
MODULE_LICENSE("GPL");
|