scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-08 16:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

lm4: Update i2c handler to use task_wait_event_mask

Browse Source 
BUG=chrome-os-partner:27180
BRANCH=rambi
TEST=Verify i2c devices are still working (battery, charger)

Change-Id: I9dc70454df35be9c9be3d9020c8dc3b760de5e07
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/191301
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
ChromeOS Developer
2014-03-22 14:04:25 -07:00
committed by chrome-internal-fetch
parent d9bd95200f
commit e2e2f5d848
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
chip/lm4/i2c.c
View File

@@ -167,7 +167,6 @@ int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size,
struct i2c_port_data *pd = pdata + port;
uint32_t reg_mcs = LM4_I2C_MCS(port);
int events = 0;
int other_events = 0;
if (out_size == 0 && in_size == 0)
return EC_SUCCESS;
@@ -224,35 +223,12 @@ int i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size,
task_trigger_irq(i2c_irqs[port]);
/* Wait for transfer complete or timeout */
while (!(events & (TASK_EVENT_I2C_IDLE | TASK_EVENT_TIMER))) {
/*
* We could be clever and track how long we were actually
* asleep, and wait for the remainder if we were woken up
* for some other event. But that would consume additional
* stack space and processing time for the infrequent case
* of an I2C timeout, so isn't worth it.
*/
events = task_wait_event(I2C_TIMEOUT_US);
/*
* We want to wait here quietly until the transaction is
* complete, but we don't want to lose any pending events that
* will be needed by the task that started the I2C transaction
* in the first place. So we save them up and restore them on
* completion or timeout. See the usleep() implementation for a
* similar situation.
*/
other_events |= events &
~(TASK_EVENT_I2C_IDLE | TASK_EVENT_TIMER);
}
events = task_wait_event_mask(TASK_EVENT_I2C_IDLE, I2C_TIMEOUT_US);
/* Disable interrupts */
LM4_I2C_MIMR(port) = 0x00;
pd->task_waiting = TASK_ID_INVALID;
/* Restore any events that we saw while waiting */
task_set_event(task_get_current(), other_events, 0);
/* Handle timeout */
if (events & TASK_EVENT_TIMER)
pd->err = EC_ERROR_TIMEOUT;