Commit 08231254 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman

mei: amthif: discard not read messages

commit 9d04ee11 upstream.

When a message is received and amthif client is not in reading state
the message is ignored and left dangling in the queue. This may happen
after one of the amthif host connections is closed w/o completing the
reading. Another client will pick up a wrong message on next read
attempt which will lead to link reset.
To prevent this the driver has to properly discard the message when
amthif client is not in reading state.
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b67d24b
...@@ -417,8 +417,10 @@ int mei_amthif_irq_read_msg(struct mei_cl *cl, ...@@ -417,8 +417,10 @@ int mei_amthif_irq_read_msg(struct mei_cl *cl,
dev = cl->dev; dev = cl->dev;
if (dev->iamthif_state != MEI_IAMTHIF_READING) if (dev->iamthif_state != MEI_IAMTHIF_READING) {
mei_irq_discard_msg(dev, mei_hdr);
return 0; return 0;
}
ret = mei_cl_irq_read_msg(cl, mei_hdr, cmpl_list); ret = mei_cl_irq_read_msg(cl, mei_hdr, cmpl_list);
if (ret) if (ret)
......
...@@ -76,7 +76,6 @@ static inline int mei_cl_hbm_equal(struct mei_cl *cl, ...@@ -76,7 +76,6 @@ static inline int mei_cl_hbm_equal(struct mei_cl *cl,
* @dev: mei device * @dev: mei device
* @hdr: message header * @hdr: message header
*/ */
static inline
void mei_irq_discard_msg(struct mei_device *dev, struct mei_msg_hdr *hdr) void mei_irq_discard_msg(struct mei_device *dev, struct mei_msg_hdr *hdr)
{ {
/* /*
......
...@@ -782,6 +782,8 @@ bool mei_hbuf_acquire(struct mei_device *dev); ...@@ -782,6 +782,8 @@ bool mei_hbuf_acquire(struct mei_device *dev);
bool mei_write_is_idle(struct mei_device *dev); bool mei_write_is_idle(struct mei_device *dev);
void mei_irq_discard_msg(struct mei_device *dev, struct mei_msg_hdr *hdr);
#if IS_ENABLED(CONFIG_DEBUG_FS) #if IS_ENABLED(CONFIG_DEBUG_FS)
int mei_dbgfs_register(struct mei_device *dev, const char *name); int mei_dbgfs_register(struct mei_device *dev, const char *name);
void mei_dbgfs_deregister(struct mei_device *dev); void mei_dbgfs_deregister(struct mei_device *dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment