diff options
| author |   Tomas Winkler <tomas.winkler@intel.com> | 2013-04-18 23:03:48 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-19 10:58:21 -0700 |
| commit | 9b0d5efc421ac79d9a6d97c681eff93288093784 (patch) | |
| tree | fcde453f66d5eb63dcea84ba9e04f9381ecd1e08 /drivers/misc/mei/mei_dev.h | |
| parent | Revert "drivers/scsi: use module_pcmcia_driver() in pcmcia drivers" (diff) | |
| download | linux-dev-9b0d5efc421ac79d9a6d97c681eff93288093784.tar.xz linux-dev-9b0d5efc421ac79d9a6d97c681eff93288093784.zip | |
mei: revamp hbm state machine
1. Rename init_clients_state to hbm_state and use
MEI_HBM_ prefix for HBM states
2. Remove recvd_msg and use hbm state for synchronizing
hbm protocol has successful start.
We can wake up the hbm event from start response handler
and remove the hack from the interrupt thread
3. mei_hbm_start_wait function encapsulate start completion
waiting
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index cd5b6d4bbbd4..56dee56ab9cc 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h @@ -25,6 +25,7 @@ #include "hw.h" #include "hw-me-regs.h" +#include "hbm.h" /* * watch dog definition @@ -104,13 +105,6 @@ enum mei_dev_state { const char *mei_dev_state_str(int state); -/* init clients states*/ -enum mei_init_clients_states { - MEI_START_MESSAGE = 0, - MEI_ENUM_CLIENTS_MESSAGE, - MEI_CLIENT_PROPERTIES_MESSAGE -}; - enum iamthif_states { MEI_IAMTHIF_IDLE, MEI_IAMTHIF_WRITING, @@ -338,6 +332,7 @@ struct mei_cl_device { /** * struct mei_device - MEI private device struct + * @hbm_state - state of host bus message protocol * @mem_addr - mem mapped base register address * @hbuf_depth - depth of hardware host/write buffer is slots @@ -370,8 +365,6 @@ struct mei_device { struct delayed_work timer_work; /* MEI timer delayed work (timeouts) */ bool recvd_hw_ready; - bool recvd_msg; - /* * waiting queue for receive message from FW */ @@ -383,7 +376,7 @@ struct mei_device { * mei device states */ enum mei_dev_state dev_state; - enum mei_init_clients_states init_clients_state; + enum mei_hbm_state hbm_state; u16 init_clients_timer; unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; /* control messages */ |