[char-misc-next 00/18] mei: fixes and code consolidation

[char-misc-next 00/18] mei: fixes and code consolidation

[Tomas Winkler]

Alexander Usyskin (3):
  mei: make device disabled on stop unconditionally
  mei: me: change power gating function name conventions
  mei: fix function names and format in KDoc

Tomas Winkler (15):
  mei: revamp me clients list handling
  mei: me: use io register wrappers consistently
  mei: me: add io register tracing
  mei: fix device reset on mei_cl_irq_read_msg allocation failure
  mei: iamthif: fix device reset on mei_amthif_irq_read_msg
  mei: iamthif: remove useless iamthif_ioctl variable
  mei: iamthif: send flow control as a regular client
  mei: iamthif: use client write functions
  mei: iamthif: use regular client read functions
  mei: use only one buffer in callback
  mei: always initialize the callback with the intended operation type
  mei: add mei_cl_alloc_linked function
  mei: simplify io callback disposal
  mei: allow read concurrency
  mei: bus: call device disable handler prior to disconnection

 drivers/misc/mei/Makefile    |   3 +
 drivers/misc/mei/amthif.c    | 398 +++++++++++++-----------------------
 drivers/misc/mei/bus.c       |  99 ++++-----
 drivers/misc/mei/client.c    | 471 ++++++++++++++++++++++++++++---------------
 drivers/misc/mei/client.h    |  24 ++-
 drivers/misc/mei/debugfs.c   |  21 +-
 drivers/misc/mei/hbm.c       |   8 +-
 drivers/misc/mei/hw-me.c     | 170 +++++++++-------
 drivers/misc/mei/hw-me.h     |   4 +-
 drivers/misc/mei/hw-txe.c    |   2 +-
 drivers/misc/mei/init.c      |   4 +-
 drivers/misc/mei/interrupt.c | 171 +++++++---------
 drivers/misc/mei/main.c      | 105 +++-------
 drivers/misc/mei/mei-trace.c |  25 +++
 drivers/misc/mei/mei-trace.h |  74 +++++++
 drivers/misc/mei/mei_dev.h   |  40 ++--
 drivers/misc/mei/nfc.c       |  43 ++--
 drivers/misc/mei/pci-me.c    |   4 +-
 drivers/misc/mei/pci-txe.c   |   4 +-
 drivers/misc/mei/wd.c        |  18 +-
 20 files changed, 874 insertions(+), 814 deletions(-)
 create mode 100644 drivers/misc/mei/mei-trace.c
 create mode 100644 drivers/misc/mei/mei-trace.h

-- 
1.9.3

[char-misc-next 01/18] mei: make device disabled on stop unconditionally

[Tomas Winkler]

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

Set the internal device state to to disabled after hardware reset in stop flow.
This will cover cases when driver was not brought to disabled state because of
an error and in stop flow we wish not to retry the reset.

Cc: <stable@vger.kernel.org> #3.10+
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/init.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 9306219d5675..6ad049a08e4d 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -341,6 +341,8 @@ void mei_stop(struct mei_device *dev)
 
 	dev->dev_state = MEI_DEV_POWER_DOWN;
 	mei_reset(dev);
+	/* move device to disabled state unconditionally */
+	dev->dev_state = MEI_DEV_DISABLED;
 
 	mutex_unlock(&dev->device_lock);
 
-- 
1.9.3