diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-01-12 00:36:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-13 14:57:21 -0800 |
| commit | 6adb8efb024a7e413b93b22848fc13395b1a438a (patch) | |
| tree | 42791bdf2275ff60421470df499c00850a6b052c /drivers/misc/mei/init.c | |
| parent | 33ec0826314734fc4f3c9bf37d12e98063339b31 (diff) | |
mei: limit the number of consecutive resets
give up reseting after 3 unsuccessful tries
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/init.c')
| -rw-r--r-- | drivers/misc/mei/init.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c index 059133d8cac..cdd31c2a2a2 100644 --- a/drivers/misc/mei/init.c +++ b/drivers/misc/mei/init.c @@ -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); |