DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qup_i2c: Fix for multiple write transactions

Browse Source 
When a transaction consists of multiple write requests, combine them
only when the addresses of the writes are the same.

Change-Id: I35089d7b3936acf2de28f075734da84069b83fb3
Signed-off-by: Harini Jayaraman <harinij@codeaurora.org>
This commit is contained in:
Harini Jayaraman
2011-11-02 12:12:03 -06:00
parent 5e568b70d7
commit be7e45d97a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/i2c/busses/i2c-qup.c
View File

@@ -477,7 +477,7 @@ qup_issue_write(struct qup_i2c_dev *dev, struct i2c_msg *msg, int rem,
addr) << 16), addr) << 16),
dev->base + QUP_OUT_FIFO_BASE); dev->base + QUP_OUT_FIFO_BASE);
qup_verify_fifo(dev, *carry_over | QUP_OUT_DATA << 16 | qup_verify_fifo(dev, *carry_over | QUP_OUT_START << 16 |
addr << 16, (uint32_t)dev->base + addr << 16, (uint32_t)dev->base +
QUP_OUT_FIFO_BASE + (*idx) - 2, 0); QUP_OUT_FIFO_BASE + (*idx) - 2, 0);
} else } else
@@ -541,14 +541,15 @@ qup_issue_write(struct qup_i2c_dev *dev, struct i2c_msg *msg, int rem,
QUP_OUT_FIFO_BASE + (*idx), 0); QUP_OUT_FIFO_BASE + (*idx), 0);
*idx += 2; *idx += 2;
} else if (next->flags == 0 && dev->pos == msg->len - 1 } else if (next->flags == 0 && dev->pos == msg->len - 1
&& *idx < (dev->wr_sz*2)) { && *idx < (dev->wr_sz*2) &&
(next->addr != msg->addr)) {
/* Last byte of an intermittent write */ /* Last byte of an intermittent write */
writel_relaxed((last_entry | writel_relaxed((QUP_OUT_STOP |
msg->buf[dev->pos]), msg->buf[dev->pos]),
dev->base + QUP_OUT_FIFO_BASE); dev->base + QUP_OUT_FIFO_BASE);
qup_verify_fifo(dev, qup_verify_fifo(dev,
last_entry | msg->buf[dev->pos], QUP_OUT_STOP | msg->buf[dev->pos],
(uint32_t)dev->base + (uint32_t)dev->base +
QUP_OUT_FIFO_BASE + (*idx), 0); QUP_OUT_FIFO_BASE + (*idx), 0);
*idx += 2; *idx += 2;
@@ -605,7 +606,7 @@ qup_set_wr_mode(struct qup_i2c_dev *dev, int rem)
struct i2c_msg *next = NULL; struct i2c_msg *next = NULL;
if (rem > 1) if (rem > 1)
next = dev->msg + 1; next = dev->msg + 1;
while (rem > 1 && next->flags == 0) { while (rem > 1 && next->flags == 0 && (next->addr == dev->msg->addr)) {
len += next->len + 1; len += next->len + 1;
next = next + 1; next = next + 1;
rem--; rem--;