Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1293957

[char-misc-next v2 5/7] mei: bus: whitelist the watchdog client

Show all headers | View raw

The iAMT WD client has to be whitelisted sice it has two connections
and is filtered out by number_of_connections fixup.
Also the API has changed for BDW and SKL but firmware haven't updated
the protocol version.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
---
V2: resend
 drivers/misc/mei/bus-fixup.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
index b2d2a6ea576c..b87323f4bb14 100644
--- a/drivers/misc/mei/bus-fixup.c
+++ b/drivers/misc/mei/bus-fixup.c
@@ -35,6 +35,9 @@ static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;
 #define MEI_UUID_NFC_HCI UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50, \
 			0x94, 0xd4, 0x50, 0x26, 0x67, 0x23, 0x77, 0x5c)
 
+#define MEI_UUID_WD UUID_LE(0x05B79A6F, 0x4628, 0x4D7F, \
+			    0x89, 0x9D, 0xA9, 0x15, 0x14, 0xCB, 0x32, 0xAB)
+
 #define MEI_UUID_ANY NULL_UUID_LE
 
 /**
@@ -66,6 +69,31 @@ static void blacklist(struct mei_cl_device *cldev)
 	cldev->do_match = 0;
 }
 
+/**
+ * mei_wd - wd client on the bus, change protocol version
+ *   as the API has changed.
+ *
+ * @cldev: me clients device
+ */
+#if IS_ENABLED(CONFIG_INTEL_MEI_ME)
+#include <linux/pci.h>
+#include "hw-me-regs.h"
+static void mei_wd(struct mei_cl_device *cldev)
+{
+	struct pci_dev *pdev = to_pci_dev(cldev->dev.parent);
+
+	dev_dbg(&cldev->dev, "running hook %s\n", __func__);
+	if (pdev->device == MEI_DEV_ID_WPT_LP ||
+	    pdev->device == MEI_DEV_ID_SPT ||
+	    pdev->device == MEI_DEV_ID_SPT_H)
+		cldev->me_cl->props.protocol_version = 0x2;
+
+	cldev->do_match = 1;
+}
+#else
+static inline void mei_wd(struct mei_cl_device *cldev) {}
+#endif /* CONFIG_INTEL_MEI_ME */
+
 struct mei_nfc_cmd {
 	u8 command;
 	u8 status;
@@ -280,6 +308,7 @@ static struct mei_fixup {
 	MEI_FIXUP(MEI_UUID_ANY, number_of_connections),
 	MEI_FIXUP(MEI_UUID_NFC_INFO, blacklist),
 	MEI_FIXUP(MEI_UUID_NFC_HCI, mei_nfc),
+	MEI_FIXUP(MEI_UUID_WD, mei_wd),
 };
 
 /**
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[char-misc-next v2 0/7] mei: create proper iAMT watchdog driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 2/7] mei: wd: drop the watchdog code from the core mei driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 1/7] mei: drop nfc leftovers from the mei driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device only if required Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device  only if required Guenter Roeck <linux@roeck-us.net> - 2015-12-18 18:00 +0100
      RE: [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device  only if required "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 13:30 +0100
        Re: [char-misc-next v2 6/7] watchdog: mei_wdt: register wd device  only if required Guenter Roeck <linux@roeck-us.net> - 2015-12-20 19:20 +0100
  [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device on event Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device on  event Guenter Roeck <linux@roeck-us.net> - 2015-12-18 18:10 +0100
      Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device  on event One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> - 2015-12-18 18:30 +0100
        Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device on  event Guenter Roeck <linux@roeck-us.net> - 2015-12-18 19:00 +0100
          Re: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device  on event One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> - 2015-12-18 19:20 +0100
            RE: [char-misc-next v2 7/7] watchdog: mei_wdt: re-register device  on event "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 14:00 +0100
  [char-misc-next v2 5/7] mei: bus: whitelist the watchdog client Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
  [char-misc-next v2 3/7] watchdog: mei_wdt: implement MEI iAMT watchdog driver Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next v2 3/7] watchdog: mei_wdt: implement MEI iAMT  watchdog driver Guenter Roeck <linux@roeck-us.net> - 2015-12-18 17:40 +0100
  [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry Tomas Winkler <tomas.winkler@intel.com> - 2015-12-17 16:00 +0100
    Re: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry Guenter Roeck <linux@roeck-us.net> - 2015-12-18 17:50 +0100
      RE: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 10:50 +0100
        Re: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry Guenter Roeck <linux@roeck-us.net> - 2015-12-20 11:50 +0100
          RE: [char-misc-next 4/7] watchdog: mei_wdt: add status debugfs entry "Winkler, Tomas" <tomas.winkler@intel.com> - 2015-12-20 13:00 +0100

csiph-web