[char-misc 0/2] mei; updates for 4.18-rc2

[char-misc 0/2] mei; updates for 4.18-rc2

[Tomas Winkler]

A bug for long lasting regression and trivial cleanup.
Hope this can make its way to 4.18.

Alexander Usyskin (2):
  mei: remove unused MEI_IAMTHIF_STALL_TIMER define
  mei: discard messages from not connected client during power down.

 drivers/misc/mei/hw.h        | 2 --
 drivers/misc/mei/interrupt.c | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
2.14.4

[char-misc 1/2] mei: remove unused MEI_IAMTHIF_STALL_TIMER define

[Tomas Winkler]

From: Alexander Usyskin <alexander.usyskin@intel.com>

MEI_IAMTHIF_STALL_TIMER is unused now and can be safely removed.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/hw.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/misc/mei/hw.h b/drivers/misc/mei/hw.h
index 5c8286b40b62..3b325d955fbe 100644
--- a/drivers/misc/mei/hw.h
+++ b/drivers/misc/mei/hw.h
@@ -28,8 +28,6 @@
 #define MEI_CL_CONNECT_TIMEOUT     15  /* HPS: Client Connect Timeout */
 #define MEI_CLIENTS_INIT_TIMEOUT   15  /* HPS: Clients Enumeration Timeout */
 
-#define MEI_IAMTHIF_STALL_TIMER    12  /* HPS */
-
 #define MEI_PGI_TIMEOUT             1  /* PG Isolation time response 1 sec */
 #define MEI_D0I3_TIMEOUT            5  /* D0i3 set/unset max response time */
 #define MEI_HBM_TIMEOUT             1  /* 1 second */
-- 
2.14.4

Re: [char-misc 1/2] mei: remove unused MEI_IAMTHIF_STALL_TIMER define

[Greg Kroah-Hartman]

On Thu, Jun 07, 2018 at 12:31:47AM +0300, Tomas Winkler wrote:
> From: Alexander Usyskin <alexander.usyskin@intel.com>
> 
> MEI_IAMTHIF_STALL_TIMER is unused now and can be safely removed.
> 
> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
>  drivers/misc/mei/hw.h | 2 --
>  1 file changed, 2 deletions(-)

Not a regression fix :(

RE: [char-misc 1/2] mei: remove unused MEI_IAMTHIF_STALL_TIMER define

[Winkler, Tomas]

> 
> On Thu, Jun 07, 2018 at 12:31:47AM +0300, Tomas Winkler wrote:
> > From: Alexander Usyskin <alexander.usyskin@intel.com>
> >
> > MEI_IAMTHIF_STALL_TIMER is unused now and can be safely removed.
> >
> > Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > ---
> >  drivers/misc/mei/hw.h | 2 --
> >  1 file changed, 2 deletions(-)
> 
> Not a regression fix :(

No problem, please merge to next.
Thanks
Tomas

Re: [char-misc 1/2] mei: remove unused MEI_IAMTHIF_STALL_TIMER define

[Greg Kroah-Hartman]

On Tue, Jul 03, 2018 at 11:28:12AM +0000, Winkler, Tomas wrote:
> 
> > 
> > On Thu, Jun 07, 2018 at 12:31:47AM +0300, Tomas Winkler wrote:
> > > From: Alexander Usyskin <alexander.usyskin@intel.com>
> > >
> > > MEI_IAMTHIF_STALL_TIMER is unused now and can be safely removed.
> > >
> > > Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
> > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > ---
> > >  drivers/misc/mei/hw.h | 2 --
> > >  1 file changed, 2 deletions(-)
> > 
> > Not a regression fix :(
> 
> No problem, please merge to next.

Already done! :)

[char-misc 2/2] mei: discard messages from not connected client during power down.

[Tomas Winkler]

From: Alexander Usyskin <alexander.usyskin@intel.com>

This fixes regression introduced by
commit 8d52af6795c0 ("mei: speed up the power down flow")

In power down or suspend flow a message can still be received
from the FW because the clients fake disconnection.
In normal case we interpret messages w/o destination as corrupted
and link reset is performed in order to clean the channel,
but during power down link reset is already in progress resulting
in endless loop. To resolve the issue under power down flow we
discard messages silently.

Cc: <stable@vger.kernel.org> 4.16+
Fixes: 8d52af6795c0 ("mei: speed up the power down flow")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199541
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/interrupt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index b0b8f18a85e3..6649f0d56d2f 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -310,8 +310,11 @@ int mei_irq_read_handler(struct mei_device *dev,
 	if (&cl->link == &dev->file_list) {
 		/* A message for not connected fixed address clients
 		 * should be silently discarded
+		 * On power down client may be force cleaned,
+		 * silently discard such messages
 		 */
-		if (hdr_is_fixed(mei_hdr)) {
+		if (hdr_is_fixed(mei_hdr) ||
+		    dev->dev_state == MEI_DEV_POWER_DOWN) {
 			mei_irq_discard_msg(dev, mei_hdr);
 			ret = 0;
 			goto reset_slots;
-- 
2.14.4