aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2015-07-23 08:08:44 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 20:24:16 -0400
commit5b6dca29b416d8992d52d814aa4be5d7fc97799d (patch)
tree2a9e3900806877aa5aef003891977f267f4a6a92
parent71ce789115f878a07e4a6c43d6006cea6aee1078 (diff)
mei: bus: blacklist the nfc info client
Blacklist nfc info client which is only used for retrieval of the NFC radio version Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mei/bus-fixup.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
index 865e33bcd226..696918a6fa4f 100644
--- a/drivers/misc/mei/bus-fixup.c
+++ b/drivers/misc/mei/bus-fixup.c
@@ -27,8 +27,23 @@
27#include "mei_dev.h" 27#include "mei_dev.h"
28#include "client.h" 28#include "client.h"
29 29
30#define MEI_UUID_NFC_INFO UUID_LE(0xd2de1625, 0x382d, 0x417d, \
31 0x48, 0xa4, 0xef, 0xab, 0xba, 0x8a, 0x12, 0x06)
32
30#define MEI_UUID_ANY NULL_UUID_LE 33#define MEI_UUID_ANY NULL_UUID_LE
31 34
35/**
36 * blacklist - blacklist a client from the bus
37 *
38 * @cldev: me clients device
39 */
40static void blacklist(struct mei_cl_device *cldev)
41{
42 dev_dbg(&cldev->dev, "running hook %s on %pUl\n",
43 __func__, mei_me_cl_uuid(cldev->me_cl));
44 cldev->do_match = 0;
45}
46
32struct mei_nfc_cmd { 47struct mei_nfc_cmd {
33 u8 command; 48 u8 command;
34 u8 status; 49 u8 status;
@@ -120,9 +135,7 @@ const uuid_le mei_nfc_guid = UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50,
120 0x94, 0xd4, 0x50, 0x26, 135 0x94, 0xd4, 0x50, 0x26,
121 0x67, 0x23, 0x77, 0x5c); 136 0x67, 0x23, 0x77, 0x5c);
122 137
123static const uuid_le mei_nfc_info_guid = UUID_LE(0xd2de1625, 0x382d, 0x417d, 138static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;
124 0x48, 0xa4, 0xef, 0xab,
125 0xba, 0x8a, 0x12, 0x06);
126 139
127/* Vendors */ 140/* Vendors */
128#define MEI_NFC_VENDOR_INSIDE 0x00 141#define MEI_NFC_VENDOR_INSIDE 0x00
@@ -421,7 +434,9 @@ static struct mei_fixup {
421 434
422 const uuid_le uuid; 435 const uuid_le uuid;
423 void (*hook)(struct mei_cl_device *cldev); 436 void (*hook)(struct mei_cl_device *cldev);
424} mei_fixups[] = {}; 437} mei_fixups[] = {
438 MEI_FIXUP(MEI_UUID_NFC_INFO, blacklist),
439};
425 440
426/** 441/**
427 * mei_cl_dev_fixup - run fixup handlers 442 * mei_cl_dev_fixup - run fixup handlers