mei: revamp mei reset state machine
Subsystems (2)
PATCH v2 3/4 mei: revamp mei reset state machine
1. MEI_DEV_RESETTING device state spans only hardware reset flow while starting dev state is saved into a local variable for further reference, this let us to reduce big if statements in case we are trying to avoid nested resets
2. During initializations if the reset ended in MEI_DEV_DISABLED device state we bail out with -ENODEV
3. Remove redundant interrupts_enabled parameter as this can be deduced from the starting dev_state
4. mei_reset propagates error code to the caller
5. Add mei_restart function to wrap the pci resume
Signed-off-by Tomas Winkler <[email protected]>
Signed-off-by Alexander Usyskin <[email protected]>
---
V2: rebased
drivers/misc/mei/hbm.c | 2 +- drivers/misc/mei/hw-me.c | 10 +-- drivers/misc/mei/init.c | 209 ++++++++++++++++++++++++++----------------- drivers/misc/mei/interrupt.c | 13 +-- drivers/misc/mei/mei_dev.h | 3 +- drivers/misc/mei/pci-me.c | 10 +-- 6 files changed, 143 insertions(+), 104 deletions(-)
drivers/misc/mei/hbm.c +1 -1
@@ -763,7 +763,7 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr)return -EPROTO ; } - dev->dev_state =MEI_DEV_DISABLED ; + dev->dev_state =MEI_DEV_POWER_DOWN ;dev_info (&dev->pdev->dev,"hbm: stop response: resetting.\n" );/* force the reset */ return -EPROTO ;
drivers/misc/mei/hw-me.c +3 -7
@@ -185,7 +185,7 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable)mei_me_reg_write (hw,H_CSR , hcsr); -if (dev->dev_state ==MEI_DEV_POWER_DOWN ) +if (intr_enable == false)mei_me_hw_reset_release (dev);return 0 ;
@@ -482,11 +482,7 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)mei_clear_interrupts (dev);/* check if ME wants a reset */ -if (!mei_hw_is_ready (dev) && - dev->dev_state !=MEI_DEV_RESETTING && - dev->dev_state !=MEI_DEV_INITIALIZING && - dev->dev_state !=MEI_DEV_POWER_DOWN && - dev->dev_state !=MEI_DEV_POWER_UP ) { +if (!mei_hw_is_ready (dev) && dev->dev_state !=MEI_DEV_RESETTING ) {dev_warn (&dev->pdev->dev,"FW not ready: resetting.\n" );schedule_work (&dev->reset_work); goto end;
@@ -514,7 +510,7 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)break ;dev_dbg (&dev->pdev->dev,"slots to read = %08x\n" , slots); rets =mei_irq_read_handler (dev, &complete_list, &slots); -if (rets) { +if (rets && dev->dev_state !=MEI_DEV_RESETTING ) {schedule_work (&dev->reset_work); goto end; }
drivers/misc/mei/init.c +126 -83
283 lines not on this page · raw message
drivers/misc/mei/interrupt.c +7 -6
@@ -560,7 +560,7 @@ void mei_timer(struct work_struct *work)if (--dev->init_clients_timer ==0 ) {dev_err (&dev->pdev->dev,"timer: init clients timeout hbm_state = %d.\n" , dev->hbm_state); -mei_reset (dev,1 ); +mei_reset (dev); goto out; } }
@@ -573,8 +573,8 @@ void mei_timer(struct work_struct *work)list_for_each_entry_safe (cl_pos, cl_next, &dev->file_list, link) {if (cl_pos->timer_count) {if (--cl_pos->timer_count ==0 ) { -dev_err (&dev->pdev->dev,"reset: connect/disconnect timeout.\n" ); -mei_reset (dev,1 ); +dev_err (&dev->pdev->dev,"timer: connect/disconnect timeout.\n" ); +mei_reset (dev); goto out; } }
@@ -582,8 +582,8 @@ void mei_timer(struct work_struct *work)if (dev->iamthif_stall_timer) {if (--dev->iamthif_stall_timer ==0 ) { -dev_err (&dev->pdev->dev,"reset: amthif hanged.\n" ); -mei_reset (dev,1 ); +dev_err (&dev->pdev->dev,"timer: amthif hanged.\n" ); +mei_reset (dev); dev->iamthif_msg_buf_size =0 ; dev->iamthif_msg_buf_index =0 ; dev->iamthif_canceled = false;
@@ -636,7 +636,8 @@ void mei_timer(struct work_struct *work) } } out: -schedule_delayed_work (&dev->timer_work,2 *HZ ); +if (dev->dev_state !=MEI_DEV_DISABLED ) +schedule_delayed_work (&dev->timer_work,2 *HZ );mutex_unlock (&dev->device_lock); }
drivers/misc/mei/mei_dev.h +2 -1
@@ -472,8 +472,9 @@ static inline u32 mei_slots2data(int slots)* mei init function prototypes */ void mei_device_init (struct mei_device *dev); -void mei_reset (struct mei_device *dev,int interrupts); +int mei_reset (struct mei_device *dev);int mei_start (struct mei_device *dev); +int mei_restart (struct mei_device *dev);void mei_stop (struct mei_device *dev);void mei_cancel_work (struct mei_device *dev);
drivers/misc/mei/pci-me.c +4 -6
@@ -321,16 +321,14 @@ static int mei_me_pci_resume(struct device *device)return err; } -mutex_lock (&dev->device_lock); - dev->dev_state =MEI_DEV_POWER_UP ; -mei_clear_interrupts (dev); -mei_reset (dev,1 ); -mutex_unlock (&dev->device_lock); + err =mei_restart (dev); +if (err) +return err;/* Start timer if stopped in suspend */ schedule_delayed_work (&dev->timer_work,HZ ); -return err; +return 0 ; } static SIMPLE_DEV_PM_OPS(mei_me_pm_ops, mei_me_pci_suspend, mei_me_pci_resume);#define MEI_ME_PM_OPS (&mei_me_pm_ops)
Signature · 1 line
1.8.4.2
PATCH v2 4/4 mei: limit the number of consecutive resets
give up reseting after 3 unsuccessful tries
Signed-off-by Tomas Winkler <[email protected]>
Signed-off-by Alexander Usyskin <[email protected]>
---
V2: rebased
drivers/misc/mei/client.c | 1 + drivers/misc/mei/init.c | 10 ++++++++++ drivers/misc/mei/mei_dev.h | 7 +++++++ 3 files changed, 18 insertions(+)
drivers/misc/mei/client.c +1 -0
@@ -370,6 +370,7 @@ void mei_host_client_init(struct work_struct *work) } dev->dev_state =MEI_DEV_ENABLED ; + dev->reset_count =0 ;mutex_unlock (&dev->device_lock); }
drivers/misc/mei/init.c +10 -0
@@ -89,6 +89,13 @@ int mei_reset(struct mei_device *dev) interrupts_enabled = state !=MEI_DEV_POWER_DOWN ; dev->dev_state =MEI_DEV_RESETTING ; + dev->reset_count++; +if (dev->reset_count >MEI_MAX_CONSEC_RESET ) { +dev_err (&dev->pdev->dev,"reset: reached maximal consecutive resets: disabling the device\n" ); + dev->dev_state =MEI_DEV_DISABLED ; +return -ENODEV ; + } + ret =mei_hw_reset (dev, interrupts_enabled);/* fall through and remove the sw state even if hw reset has failed */
@@ -169,6 +176,7 @@ int mei_start(struct mei_device *dev)dev_dbg (&dev->pdev->dev,"reset in start the mei device.\n" ); dev->dev_state =MEI_DEV_INITIALIZING ; + dev->reset_count =0 ;mei_reset (dev);if (dev->dev_state ==MEI_DEV_DISABLED ) {
@@ -224,6 +232,7 @@ int mei_restart(struct mei_device *dev)mei_clear_interrupts (dev); dev->dev_state =MEI_DEV_POWER_UP ; + dev->reset_count =0 ; err =mei_reset (dev);
@@ -285,6 +294,7 @@ void mei_device_init(struct mei_device *dev)init_waitqueue_head (&dev->wait_recvd_msg);init_waitqueue_head (&dev->wait_stop_wd); dev->dev_state =MEI_DEV_INITIALIZING ; + dev->reset_count =0 ;mei_io_list_init (&dev->read_list);mei_io_list_init (&dev->write_list);
drivers/misc/mei/mei_dev.h +7 -0
@@ -61,6 +61,11 @@ extern const uuid_le mei_wd_guid;#define MEI_CLIENTS_MAX 256/* +* maximum number of consecutive resets +*/ +#define MEI_MAX_CONSEC_RESET 3 + +/* * Number of File descriptors/handles * that can be opened to the driver. *
@@ -327,6 +332,7 @@ struct mei_cl_device {/** * struct mei_device - MEI private device struct +* @reset_count - limits the number of consecutive resets * @hbm_state - state of host bus message protocol * @mem_addr - mem mapped base register address
@@ -370,6 +376,7 @@ struct mei_device {/* * mei device states */ +unsigned long reset_count;enum mei_dev_state dev_state;enum mei_hbm_state hbm_state;u16 init_clients_timer;
Signature · 1 line
1.8.4.2