History

i2c: mv64xxx: refactor message start to ensure proper initialization

Because the offload mechanism can fall back to a standard transfer, having two seperate initialization states is unfortunate. Let's just have one state which does things consistently. This fixes a bug where some preparation was missing when the fallback happened. And it makes the code much easier to follow. To implement this, we put the check if offload is possible at the top of the offload setup function.

Wolfram Sang committed 12 years ago

Commit 79970db1 parent b28a9601 file · +14 −19Browse files

Unified · Split

drivers/i2c/busses/i2c-mv64xxx.c+14−19
@@ -97,7 +97,6 @@ enum { · 96 unmodified lines
9797 enum {
9898 MV64XXX_I2C_ACTION_INVALID,
9999 MV64XXX_I2C_ACTION_CONTINUE,
100− MV64XXX_I2C_ACTION_OFFLOAD_SEND_START,
101100 MV64XXX_I2C_ACTION_SEND_START,
102101 MV64XXX_I2C_ACTION_SEND_RESTART,
103102 MV64XXX_I2C_ACTION_OFFLOAD_RESTART,
@@ -204,6 +203,9 @@ static int mv64xxx_i2c_offload_msg(struct mv64xxx_i2c_data *drv_data) · 100 unmodified lines
204203 unsigned long ctrl_reg;
205204 struct i2c_msg *msg = drv_data->msgs;
206205
206+ if (!drv_data->offload_enabled)
207+ return -EOPNOTSUPP;
208+
207209 drv_data->msg = msg;
208210 drv_data->byte_posn = 0;
209211 drv_data->bytes_left = msg->len;
@@ -433,8 +435,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) · 223 unmodified lines
433435
434436 drv_data->msgs++;
435437 drv_data->num_msgs--;
436− if (!(drv_data->offload_enabled &&
437− mv64xxx_i2c_offload_msg(drv_data))) {
438+ if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
438439 drv_data->cntl_bits |= MV64XXX_I2C_REG_CONTROL_START;
439440 writel(drv_data->cntl_bits,
440441 drv_data->reg_base + drv_data->reg_offsets.control);
@@ -458,15 +459,14 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) · 17 unmodified lines
458459 drv_data->reg_base + drv_data->reg_offsets.control);
459460 break;
460461
461− case MV64XXX_I2C_ACTION_OFFLOAD_SEND_START:
462− if (!mv64xxx_i2c_offload_msg(drv_data))
463− break;
464− else
465− drv_data->action = MV64XXX_I2C_ACTION_SEND_START;
466− /* FALLTHRU */
467462 case MV64XXX_I2C_ACTION_SEND_START:
468− writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
469− drv_data->reg_base + drv_data->reg_offsets.control);
463+ /* Can we offload this msg ? */
464+ if (mv64xxx_i2c_offload_msg(drv_data) < 0) {
465+ /* No, switch to standard path */
466+ mv64xxx_i2c_prepare_for_io(drv_data, drv_data->msgs);
467+ writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_START,
468+ drv_data->reg_base + drv_data->reg_offsets.control);
469+ }
470470 break;
471471
472472 case MV64XXX_I2C_ACTION_SEND_ADDR_1:
@@ -625,15 +625,10 @@ mv64xxx_i2c_execute_msg(struct mv64xxx_i2c_data *drv_data, struct i2c_msg *msg, · 152 unmodified lines
625625 unsigned long flags;
626626
627627 spin_lock_irqsave(&drv_data->lock, flags);
628− if (drv_data->offload_enabled) {
629− drv_data->action = MV64XXX_I2C_ACTION_OFFLOAD_SEND_START;
630− drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_START_COND;
631− } else {
632− mv64xxx_i2c_prepare_for_io(drv_data, msg);
633628
634− drv_data->action = MV64XXX_I2C_ACTION_SEND_START;
635− drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_START_COND;
636− }
629+ drv_data->action = MV64XXX_I2C_ACTION_SEND_START;
630+ drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_START_COND;
631+
637632 drv_data->send_stop = is_last;
638633 drv_data->block = 1;
639634 mv64xxx_i2c_do_action(drv_data);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t