lkml.org 
[lkml]   [2014]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [char-misc 3/4] mei: revamp mei reset state machine
On Wed, Jan 08, 2014 at 08:19:23PM +0200, Tomas Winkler wrote:
> 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 <tomas.winkler@intel.com>
> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
> ---
> drivers/misc/mei/hbm.c | 2 +-
> drivers/misc/mei/hw-me.c | 10 +--
> drivers/misc/mei/init.c | 210 ++++++++++++++++++++++++++-----------------
> 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(+), 105 deletions(-)

This patch fails to apply to my tree:

checking file drivers/misc/mei/hbm.c
checking file drivers/misc/mei/hw-me.c
checking file drivers/misc/mei/init.c
Hunk #3 FAILED at 85.
Hunk #4 succeeded at 119 (offset -1 lines).
Hunk #5 succeeded at 246 (offset -1 lines).
Hunk #6 succeeded at 267 (offset -1 lines).
1 out of 6 hunks FAILED
checking file drivers/misc/mei/interrupt.c
checking file drivers/misc/mei/mei_dev.h
checking file drivers/misc/mei/pci-me.c

Care to fix it up and resend?

thanks,

greg k-h


\
 
 \ /
  Last update: 2014-01-09 01:01    [W:0.050 / U:0.708 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site