diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2019-03-26 19:18:16 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-03-28 15:24:13 +1100 |
| commit | a31085d7d432c889e2e5ddcef55ea866797dace8 (patch) | |
| tree | 9d8a45b9df81848fc78d12886d6fbb1adc1e8773 | |
| parent | 722cf1c2ed56907fd9cc64c3f406f998d7e44992 (diff) | |
| download | blackbird-skiboot-a31085d7d432c889e2e5ddcef55ea866797dace8.tar.gz blackbird-skiboot-a31085d7d432c889e2e5ddcef55ea866797dace8.zip | |
core/i2c: Add request state tracking
Allow the submitter to track the state of an I2C request by adding
a state field to the request. This avoids the need to use a stub
completion callback in some cases.
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
| -rw-r--r-- | hw/p8-i2c.c | 1 | ||||
| -rw-r--r-- | include/i2c.h | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c index a45769c0..599614cf 100644 --- a/hw/p8-i2c.c +++ b/hw/p8-i2c.c @@ -441,6 +441,7 @@ static void p8_i2c_complete_request(struct p8_i2c_master *master, list_del(&req->link); master->state = state_idle; req->result = ret; + req->req_state = i2c_req_done; /* Schedule re-enabling of sensor cache */ if (master->occ_cache_dis) diff --git a/include/i2c.h b/include/i2c.h index a06cca0d..484176f9 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -57,6 +57,12 @@ struct i2c_request { uint32_t offset; /* Internal device offset */ uint32_t rw_len; /* Length of the data request */ void *rw_buf; /* Data request buffer */ + enum i2c_request_state { + i2c_req_new, /* un-initialised */ + i2c_req_queued, /* waiting in the queue */ + i2c_req_done, /* request has been completed */ + } req_state; + void (*completion)( /* Completion callback */ int rc, struct i2c_request *req); void *user_data; /* Client data */ @@ -68,9 +74,13 @@ struct i2c_request { extern void i2c_add_bus(struct i2c_bus *bus); extern struct i2c_bus *i2c_find_bus_by_id(uint32_t opal_id); -static inline int i2c_queue_req(struct i2c_request *req) +static inline int64_t i2c_queue_req(struct i2c_request *req) { - return req->bus->queue_req(req); + int64_t ret = req->bus->queue_req(req); + + if (!ret) + req->req_state = i2c_req_queued; + return ret; } static inline uint64_t i2c_run_req(struct i2c_request *req) |
